diff --git a/include/fmt/base.h b/include/fmt/base.h
index 9bb9f633..b83303fa 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -2465,7 +2465,6 @@ inline void vprint_mojibake(FILE*, string_view, const format_args&, bool) {}
 }  // namespace detail
 
 // The main public API.
-FMT_BEGIN_EXPORT
 
 template <typename Char>
 FMT_CONSTEXPR void parse_context<Char>::do_check_arg_id(int arg_id) {
@@ -2484,6 +2483,8 @@ FMT_CONSTEXPR void parse_context<Char>::check_dynamic_spec(int arg_id) {
     static_cast<compile_parse_context<Char>*>(this)->check_dynamic_spec(arg_id);
 }
 
+FMT_BEGIN_EXPORT
+
 // An output iterator that appends to a buffer. It is used instead of
 // back_insert_iterator to reduce symbol sizes and avoid <iterator> dependency.
 template <typename T> class basic_appender {
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 5f83aad0..122b62b5 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -196,7 +196,7 @@ FMT_END_NAMESPACE
 #  endif
 #endif
 
-#if FMT_MSC_VERSION
+#if FMT_MSC_VERSION && !defined(FMT_MODULE)
 #  include <intrin.h>  // _BitScanReverse[64], _BitScanForward[64], _umul128
 #endif