d3dxof: Remove unnecessary includes.

And move the remaining common ones to d3dxof_private.h, as is usual practice with d3d dlls.

d3dxof: Remove unnecessary includes.
f0e6bc35 · Zebediah Figura · Alexandre Julliard · c66eb79e · f0e6bc35 · f0e6bc35
Commit f0e6bc35 authored Sep 06, 2023 by Zebediah Figura Committed by Alexandre Julliard Sep 13, 2023
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 42 deletions

d3dxof.c dlls/d3dxof/d3dxof.c +0 -10

d3dxof_private.h dlls/d3dxof/d3dxof_private.h +3 -3

main.c dlls/d3dxof/main.c +0 -18

parsing.c dlls/d3dxof/parsing.c +0 -11

No files found.
--- 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);

--- 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

--- 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);


--- 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);