From 7799255500a3d1924390350b3275d1a36c69b91a Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 20 Jan 2014 11:18:23 +0000
Subject: [PATCH] [D3DXOF] * Move some inclusions to the main header. * Remove
 inclusions and definitions that already exist in the main header. * Improve
 header inclusions. CORE-7716

svn path=/trunk/; revision=61715
---
 reactos/dll/directx/wine/d3dxof/d3dxof.c      | 11 ----------
 .../dll/directx/wine/d3dxof/d3dxof_private.h  | 21 ++++++++++++-------
 reactos/dll/directx/wine/d3dxof/main.c        | 18 +---------------
 reactos/dll/directx/wine/d3dxof/mszip.c       |  8 +++----
 reactos/dll/directx/wine/d3dxof/parsing.c     | 11 ----------
 5 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/reactos/dll/directx/wine/d3dxof/d3dxof.c b/reactos/dll/directx/wine/d3dxof/d3dxof.c
index f72617068f4..0cab8277874 100644
--- a/reactos/dll/directx/wine/d3dxof/d3dxof.c
+++ b/reactos/dll/directx/wine/d3dxof/d3dxof.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#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/reactos/dll/directx/wine/d3dxof/d3dxof_private.h b/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
index cf33ed21cea..efe990ab2ad 100644
--- a/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
+++ b/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
@@ -21,14 +21,21 @@
 #ifndef __D3DXOF_PRIVATE_INCLUDED__
 #define __D3DXOF_PRIVATE_INCLUDED__
 
-#include <stdarg.h>
+#include <config.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dxfile.h"
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <dxfile.h>
+
+#include <wine/debug.h>
 
 #define MAX_NAME_LEN 40
 #define MAX_ARRAY_DIM 4
diff --git a/reactos/dll/directx/wine/d3dxof/main.c b/reactos/dll/directx/wine/d3dxof/main.c
index 48ee22bb60f..103c771c91c 100644
--- a/reactos/dll/directx/wine/d3dxof/main.c
+++ b/reactos/dll/directx/wine/d3dxof/main.c
@@ -18,25 +18,9 @@
  * 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"
+#include <rpcproxy.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
diff --git a/reactos/dll/directx/wine/d3dxof/mszip.c b/reactos/dll/directx/wine/d3dxof/mszip.c
index 179661634f7..a16e6af468c 100644
--- a/reactos/dll/directx/wine/d3dxof/mszip.c
+++ b/reactos/dll/directx/wine/d3dxof/mszip.c
@@ -23,13 +23,13 @@
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-
-#include "wine/debug.h"
+#include <windef.h>
+#include <winbase.h>
 
 #include "mszip.h"
 
+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
 THOSE_ZIP_CONSTS;
diff --git a/reactos/dll/directx/wine/d3dxof/parsing.c b/reactos/dll/directx/wine/d3dxof/parsing.c
index fa992ced71e..224c83db294 100644
--- a/reactos/dll/directx/wine/d3dxof/parsing.c
+++ b/reactos/dll/directx/wine/d3dxof/parsing.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#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_parsing);