ddraw: Remove unused / redundant includes.

diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c
index a8a324217bee9ccd1a62c48017d102075b5c71c6..25e71fa6660b6b4547a404351aabb6507cf3f9ef 100644 (file)
--- a/dlls/ddraw/clipper.c
+++ b/dlls/ddraw/clipper.c
@@ -20,23 +20,10 @@
  */
 
 #include "config.h"
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "ddraw.h"
-#include "winerror.h"
+#include "wine/port.h"
 
 #include "ddraw_private.h"
 
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 /*****************************************************************************

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 6f060e77150187a745e66e9d00f1d8d5a2ffc8f5..55753c4fcd6834cbe530a889ba789b0935ee63b6 100644 (file)
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -23,25 +23,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 990d4f773db39f96386660acf143764256cb8683..fe65b79d2165f609c1257ddb206d1d3eb89f4c37 100644 (file)
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -19,24 +19,22 @@
 #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
 #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
 
-/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */
+#include <assert.h>
+#define COBJMACROS
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+#include "wine/debug.h"
 
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
 #include "winbase.h"
-#include "wtypes.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "ddraw.h"
-#include "ddrawi.h"
-#include "d3d.h"
 
-#include "wine/list.h"
+#include "d3d.h"
+#include "ddraw.h"
 #ifdef DDRAW_INIT_GUID
 #include "initguid.h"
 #endif
+#include "wine/list.h"
 #include "wine/wined3d.h"
 
 extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN;

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 25ff428693de57297aa1557233e50b0caa8bde59..bb046b430de52b41629579f8bd71d05272069c4b 100644 (file)
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -30,25 +30,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);

diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index 04f856a781f56545b1ac7ccd6f8529712886e50d..9f08976150ef5ae5d45595a3a2f024f09378aae0 100644 (file)
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -23,25 +23,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
 

diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c
index dd41ffed65b1341865d51e5359f6f25299ba987c..9726d862b1b10c8b91a1c0f805187893f9bc4874 100644 (file)
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@@ -21,23 +21,6 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/debug.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
 
 #include "ddraw_private.h"
 

diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 7292ed887e5ce47226cc4ecbceed58acff3060b1..0fccec74d9993e0bae1b7fec733a96ef16dde4a7 100644 (file)
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -26,28 +26,13 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/debug.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
+#define DDRAW_INIT_GUID
+#include "ddraw_private.h"
 
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
 #include "wine/exception.h"
 #include "winreg.h"
 
-#include "ddraw.h"
-#include "d3d.h"
-
-#define DDRAW_INIT_GUID
-#include "ddraw_private.h"
-
 static typeof(WineDirect3DCreate) *pWineDirect3DCreate;
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 3c5dc1d9190ae999bbe477e7a4e190c8c3a4f5c8..68da7ff6712e96a5abf8e6d5a8f74fa5bae317df 100644 (file)
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -22,25 +22,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);

diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c
index 9ef0a7ce031835146d237ffc64e6633a54680dc2..2937ec666859e7a1b7b4b6ff535aeadf6ff94b38 100644 (file)
--- a/dlls/ddraw/palette.c
+++ b/dlls/ddraw/palette.c
@@ -18,13 +18,7 @@
  */
 
 #include "config.h"
-#include "winerror.h"
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include <assert.h>
-#include <string.h>
+#include "wine/port.h"
 
 #include "ddraw_private.h"
 

diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c
index 473152ed74061f941016a762974764df3ca8af44..2d8f51919137668c195633d5c6c03b539729e41c 100644 (file)
--- a/dlls/ddraw/parent.c
+++ b/dlls/ddraw/parent.c
@@ -23,23 +23,6 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/debug.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
 
 #include "ddraw_private.h"
 

diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c
index 6ab75d12043fb7fe4ed30657f9872a2d94f2d918..52a6fb77bda0f96e20719c4106e5fdf08ab5848d 100644 (file)
--- a/dlls/ddraw/regsvr.c
+++ b/dlls/ddraw/regsvr.c
@@ -18,20 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <string.h>
+#include "config.h"
+#include "wine/port.h"
 
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winerror.h"
-
-#include "ddraw.h"
-
-#include "wine/debug.h"
+#include "ddraw_private.h"
 #include "wine/unicode.h"
+#include "winreg.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 8f23ab1f7df129e15e06f5ec1f66bb0d6727174a..46c166ace3a08e3999786d5ad019f169e8f42658 100644 (file)
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -26,25 +26,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index ed8b480a79e764d8f34858c984b25c82ab25159b..89234c1bc4e0f10f2f7f4128dbe4de6c63a6a154 100644 (file)
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -22,11 +22,9 @@
  */
 
 #include "config.h"
-
-#define NONAMELESSUNION
+#include "wine/port.h"
 
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index f16cf1243927af0c7fd161e5d04df62ddcab6ac8..fc02660b53fdf168c773ef1523d10fd7043db5e0 100644 (file)
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -21,23 +21,6 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/debug.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
 
 #include "ddraw_private.h"
 

diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 403463b061c4a40ac7a87d7e1a5cbba06edcb1a4..56572e3f8a30140979375da489c17ebad5482763 100644 (file)
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -22,25 +22,7 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "wine/exception.h"
-
-#include "ddraw.h"
-#include "d3d.h"
-
 #include "ddraw_private.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d7);