diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index fdf744a6d83..268111750b4 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -1157,25 +1157,6 @@ sub _generate_config_h($) {
 	print OUT "\n";
     }
 
-    print OUT "#define X_DISPLAY_MISSING 1\n";
-    print OUT "\n";
-
-    print OUT "/* Define to a macro to generate an assembly function directive */\n";
-    print OUT "#define __ASM_FUNC(name) \"\"\n";
-    print OUT "\n";
-
-    print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n";
-    print OUT "#define __ASM_NAME(name) name\n";
-    print OUT "\n";
-
-    print OUT "/* Define to the assembler keyword used to specify a word value */\n";
-    print OUT "#define __ASM_SHORT \".short\"\n";
-    print OUT "\n";
-
-    print OUT "/* Define to the assembler keyword used to specify an ASCII string */\n";
-    print OUT "#define __ASM_STRING \".string\"\n";
-    print OUT "\n";
-
     print OUT "/* Define to the address where bug reports for this package should be sent. */\n";
     print OUT "#define PACKAGE_BUGREPORT \"\"\n";
     print OUT "\n";
@@ -1196,5 +1177,16 @@ sub _generate_config_h($) {
     print OUT "#define PACKAGE_VERSION \"YYYYMMDD\"\n";
     print OUT "\n";
 
+    print OUT "#define X_DISPLAY_MISSING 1\n";
+    print OUT "\n";
+
+    print OUT "/* Define to a macro to generate an assembly function directive */\n";
+    print OUT "#define __ASM_FUNC(name) \"\"\n";
+    print OUT "\n";
+
+    print OUT "/* Define to a macro to generate an assembly name from a C symbol */\n";
+    print OUT "#define __ASM_NAME(name) name\n";
+    print OUT "\n";
+
     close(OUT);
 }