diff --git a/include/fmt/core.h b/include/fmt/core.h
index c88439be..8b4c6319 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -192,12 +192,7 @@
 #endif
 
 #if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
-#  if FMT_MSC_VER
-#    define FMT_NO_W4275 __pragma(warning(suppress : 4275))
-#  else
-#    define FMT_NO_W4275
-#  endif
-#  define FMT_CLASS_API FMT_NO_W4275
+#  define FMT_CLASS_API FMT_SUPPRESS_MSC_WARNING(4275)
 #  ifdef FMT_EXPORT
 #    define FMT_API __declspec(dllexport)
 #    define FMT_EXTERN_TEMPLATE_API FMT_API
@@ -205,8 +200,7 @@
 #    define FMT_API __declspec(dllimport)
 #    define FMT_EXTERN_TEMPLATE_API FMT_API
 #  endif
-#endif
-#ifndef FMT_CLASS_API
+#else
 #  define FMT_CLASS_API
 #endif
 #ifndef FMT_API
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 20d69351..9060dc94 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -189,7 +189,7 @@ inline uint32_t clz(uint32_t x) {
   // Static analysis complains about using uninitialized data
   // "r", but the only way that can happen is if "x" is 0,
   // which the callers guarantee to not happen.
-#  pragma warning(suppress : 6102)
+  FMT_SUPPRESS_MSC_WARNING(6102)
   return 31 - r;
 }
 #  define FMT_BUILTIN_CLZ(n) internal::clz(n)
@@ -214,7 +214,7 @@ inline uint32_t clzll(uint64_t x) {
   // Static analysis complains about using uninitialized data
   // "r", but the only way that can happen is if "x" is 0,
   // which the callers guarantee to not happen.
-#  pragma warning(suppress : 6102)
+  FMT_SUPPRESS_MSC_WARNING(6102)
   return 63 - r;
 }
 #  define FMT_BUILTIN_CLZLL(n) internal::clzll(n)