d3dx9: Cleanup header includes.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/d3dx9_36/animation.c

@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/core.c

@@ -17,16 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "config.h"
+#include "wine/port.h"
 
-#define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-#include "d3dx9_36_private.h"
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/d3dx9_36_main.c

@@ -22,16 +22,9 @@
 
 #include "config.h"
 #include "wine/port.h"
+
 #include "initguid.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
+#include "d3dx9_private.h"
 
 /***********************************************************************
  * DllMain.

dlls/d3dx9_36/d3dx9_private.h

@@ -19,15 +19,13 @@
  *
  */
 
-#ifndef __WINE_D3DX9_36_PRIVATE_H
-#define __WINE_D3DX9_36_PRIVATE_H
+#ifndef __WINE_D3DX9_PRIVATE_H
+#define __WINE_D3DX9_PRIVATE_H
 
-#include <stdarg.h>
+#define NONAMELESSUNION
+#include "wine/debug.h"
 
 #define COBJMACROS
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 #include "d3dx9.h"
 
 #define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
@@ -110,4 +108,4 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
 void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
         const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
 
-#endif /* __WINE_D3DX9_36_PRIVATE_H */
+#endif /* __WINE_D3DX9_PRIVATE_H */

dlls/d3dx9_36/effect.c

@@ -19,13 +19,8 @@
 
 #include "config.h"
 #include "wine/port.h"
-#define NONAMELESSUNION
-#include "wine/debug.h"
-#include "wine/unicode.h"
 
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9_36_private.h"
+#include "d3dx9_private.h"
 #include "d3dcompiler.h"
 
 /* Constants for special INT/FLOAT conversation */

dlls/d3dx9_36/font.c

@@ -20,9 +20,8 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include "wine/debug.h"
+#include "d3dx9_private.h"
 #include "wine/unicode.h"
-#include "d3dx9_36_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/line.c

@@ -17,8 +17,10 @@
  *
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/math.c

@@ -22,16 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-
 #include "config.h"
 #include "wine/port.h"
 
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9_36_private.h"
-
-#include "wine/debug.h"
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/mesh.c

@@ -27,23 +27,18 @@
 #include "config.h"
 #include "wine/port.h"
 
-#define COBJMACROS
-#define NONAMELESSUNION
 #include <assert.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9.h"
+
+#include "d3dx9_private.h"
 #undef MAKE_DDHRESULT
 #include "dxfile.h"
 #include "rmxfguid.h"
 #include "rmxftmpl.h"
-#include "wine/debug.h"
 #include "wine/unicode.h"
 #include "wine/list.h"
-#include "d3dx9_36_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/render.c

@@ -17,8 +17,10 @@
  *
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/shader.c

@@ -21,14 +21,9 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "objbase.h"
+#include "d3dx9_private.h"
 #include "d3dcommon.h"
 #include "d3dcompiler.h"
-#include "d3dx9_36_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/skin.c

@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/sprite.c

@@ -17,8 +17,10 @@
  *
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/surface.c

@@ -18,9 +18,10 @@
  *
  */
 
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 #include "initguid.h"
 #include "ole2.h"

dlls/d3dx9_36/texture.c

@@ -19,9 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/unicode.h"
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/util.c

@@ -17,8 +17,10 @@
  *
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/volume.c

@@ -16,8 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 

dlls/d3dx9_36/xfile.c

@@ -17,10 +17,10 @@
  *
  */
 
-#include "wine/debug.h"
+#include "config.h"
+#include "wine/port.h"
 
-#define COBJMACROS
-#include "d3dx9.h"
+#include "d3dx9_private.h"
 #include "d3dx9xof.h"
 #undef MAKE_DDHRESULT
 #include "dxfile.h"