diff --git a/configure.ac b/configure.ac
index ca3d038ea23..07ee2f0881e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2527,9 +2527,11 @@ esac
 
 dnl **** Generate output files ****
 
-AH_TOP([#ifndef WINE_CROSSTEST
-#define __WINE_CONFIG_H])
-AH_BOTTOM([#endif /* WINE_CROSSTEST */])
+AH_TOP([#ifndef __WINE_CONFIG_H
+#define __WINE_CONFIG_H
+#ifndef WINE_CROSSTEST])
+AH_BOTTOM([#endif /* WINE_CROSSTEST */
+#endif /* __WINE_CONFIG_H */])
 
 AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
 
diff --git a/include/config.h.in b/include/config.h.in
index e7b189829c2..014c78a658d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -1,7 +1,8 @@
 /* include/config.h.in.  Generated from configure.ac by autoheader.  */
 
-#ifndef WINE_CROSSTEST
+#ifndef __WINE_CONFIG_H
 #define __WINE_CONFIG_H
+#ifndef WINE_CROSSTEST
 
 /* Define to a function attribute for Microsoft hotpatch assembly prefix. */
 #undef DECLSPEC_HOTPATCH
@@ -1366,3 +1367,4 @@
 #endif
 
 #endif /* WINE_CROSSTEST */
+#endif /* __WINE_CONFIG_H */