Header files must not include config.h.

dlls/d3d8/basetexture.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/cubetexture.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/d3d8_main.c

@@ -16,6 +16,8 @@
  *
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/d3d8/d3d8_private.h

@@ -21,8 +21,11 @@
 #ifndef __WINE_D3DX8_PRIVATE_H
 #define __WINE_D3DX8_PRIVATE_H
 
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
 /* THIS FILE MUST NOT CONTAIN X11 or MESA DEFINES */
-#include "config.h"
 #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */
 #include <GL/gl.h>
 #include <GL/glx.h>

dlls/d3d8/indexbuffer.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/resource.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/shader.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/stateblock.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/surface.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/swapchain.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/texture.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/vertexbuffer.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/volume.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/volumetexture.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
 
 #include "windef.h"
 #include "winbase.h"

dlls/d3d8/vshaderdeclaration.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ddraw/d3ddevice/main.h

@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 /* This is defined here so as to be able to put them in 'drivers' */
 
 void InitDefaultStateBlock(STATEBLOCK* lpStateBlock, int version);

dlls/ddraw/direct3d/main.h

@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 /* This is defined here so as to be able to put them in 'drivers' */
 
 HRESULT WINAPI

dlls/dmusic/dmusic_private.h

@@ -20,7 +20,6 @@
 #ifndef __WINE_DMUSIC_PRIVATE_H
 #define __WINE_DMUSIC_PRIVATE_H
 
-#include "config.h"
 #include "windef.h"
 #include "wine/debug.h"
 #include "winbase.h"