diff --git a/src/ca65/error.h b/src/ca65/error.h
index 776053678..c6fb4f44e 100644
--- a/src/ca65/error.h
+++ b/src/ca65/error.h
@@ -38,6 +38,12 @@
 
 
 
+#if defined( __MINGW32__)
+#  pragma GCC diagnostic ignored "-Wformat"
+#endif
+
+
+
 /* common */
 #include "attrib.h"
 #include "coll.h"
diff --git a/src/common/xsprintf.h b/src/common/xsprintf.h
index 7408177a5..c6ceb723c 100644
--- a/src/common/xsprintf.h
+++ b/src/common/xsprintf.h
@@ -41,11 +41,7 @@
  * and precision to such a StrBuf, but *not* using %p would bring up a warning
  * about a wrong argument type each time. Maybe gcc will one day allow custom
  * format specifiers and we can change this ...
- * However this cheat doesn't work with MinGW as there's no support for %m :-(
  */
-#if defined( __MINGW32__)
-#  pragma GCC diagnostic ignored "-Wformat"
-#endif