From: Zebediah Figura zfigura@codeweavers.com
And move the remaining common ones to d3dxof_private.h, as is usual practice with d3d dlls. --- dlls/d3dxof/d3dxof.c | 10 ---------- dlls/d3dxof/d3dxof_private.h | 6 +++--- dlls/d3dxof/main.c | 18 ------------------ dlls/d3dxof/parsing.c | 11 ----------- 4 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 41614d117fe..9ed02e1bdf9 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index ff29261b608..babc37085e8 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -21,15 +21,15 @@ #ifndef __D3DXOF_PRIVATE_INCLUDED__ #define __D3DXOF_PRIVATE_INCLUDED__
+#define COBJMACROS #include <stdarg.h>
#include "windef.h" #include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" #include "dxfile.h"
+#include "wine/debug.h" + #define MAX_NAME_LEN 40 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 080545c4387..a3a3358dbd4 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" - -#include "ole2.h" -#include "rpcproxy.h" -#include "uuids.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c853060dea1..c87517c0f15 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" -#include "winternl.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);