From 92cf82554d2c87dd0bf063ab2f998cab8eb7368b Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Dec 2013 18:16:01 +0000
Subject: [PATCH] [FUSION] * Move some inclusions to the main header. * Set the
 default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header. CORE-7716

svn path=/trunk/; revision=61357
---
 reactos/dll/win32/fusion/asmcache.c   | 25 +------------------------
 reactos/dll/win32/fusion/asmenum.c    | 21 ---------------------
 reactos/dll/win32/fusion/asmname.c    | 23 ++---------------------
 reactos/dll/win32/fusion/assembly.c   | 17 +----------------
 reactos/dll/win32/fusion/fusion.c     | 19 +------------------
 reactos/dll/win32/fusion/fusionpriv.h | 24 ++++++++++++++++++++----
 6 files changed, 25 insertions(+), 104 deletions(-)

diff --git a/reactos/dll/win32/fusion/asmcache.c b/reactos/dll/win32/fusion/asmcache.c
index 2b02390f497..fd1cbf4ae78 100644
--- a/reactos/dll/win32/fusion/asmcache.c
+++ b/reactos/dll/win32/fusion/asmcache.c
@@ -18,32 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winver.h"
-//#include "wincrypt.h"
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "dbghelp.h"
-//#include "ole2.h"
-#include <fusion.h>
-#include <corerror.h>
-
 #include "fusionpriv.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(fusion);
+#include <corerror.h>
 
 static const WCHAR cache_mutex_nameW[] =
     {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};
diff --git a/reactos/dll/win32/fusion/asmenum.c b/reactos/dll/win32/fusion/asmenum.c
index 23ed47b1949..42c7ca25e93 100644
--- a/reactos/dll/win32/fusion/asmenum.c
+++ b/reactos/dll/win32/fusion/asmenum.c
@@ -18,31 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "guiddef.h"
-#include <fusion.h>
-//#include "corerror.h"
 #include "fusionpriv.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include <wine/list.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(fusion);
-
 typedef struct _tagASMNAME
 {
     struct list entry;
diff --git a/reactos/dll/win32/fusion/asmname.c b/reactos/dll/win32/fusion/asmname.c
index 019d0e5dad3..afba6859a52 100644
--- a/reactos/dll/win32/fusion/asmname.c
+++ b/reactos/dll/win32/fusion/asmname.c
@@ -18,29 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define INITGUID
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "guiddef.h"
-#include <fusion.h>
-#include <corerror.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "fusionpriv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(fusion);
+#include <assert.h>
+#include <corerror.h>
 
 typedef struct {
     IAssemblyName IAssemblyName_iface;
diff --git a/reactos/dll/win32/fusion/assembly.c b/reactos/dll/win32/fusion/assembly.c
index 514efb0089d..1159d9612ad 100644
--- a/reactos/dll/win32/fusion/assembly.c
+++ b/reactos/dll/win32/fusion/assembly.c
@@ -18,27 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "fusionpriv.h"
 
-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winver.h>
 #include <wincrypt.h>
 #include <dbghelp.h>
-#include <ole2.h>
-#include <fusion.h>
 #include <corhdr.h>
 
-#include "fusionpriv.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 #define TableFromToken(tk) (TypeFromToken(tk) >> 24)
 #define TokenFromTable(idx) (idx << 24)
 
diff --git a/reactos/dll/win32/fusion/fusion.c b/reactos/dll/win32/fusion/fusion.c
index c8d3fad95da..acd5e6443d2 100644
--- a/reactos/dll/win32/fusion/fusion.c
+++ b/reactos/dll/win32/fusion/fusion.c
@@ -18,24 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <fusion.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(fusion);
-
+#include "fusionpriv.h"
 
 /******************************************************************
  *  InitializeFusion   (FUSION.@)
diff --git a/reactos/dll/win32/fusion/fusionpriv.h b/reactos/dll/win32/fusion/fusionpriv.h
index db89154803e..cf8a228d952 100644
--- a/reactos/dll/win32/fusion/fusionpriv.h
+++ b/reactos/dll/win32/fusion/fusionpriv.h
@@ -21,12 +21,28 @@
 #ifndef __WINE_FUSION_PRIVATE__
 #define __WINE_FUSION_PRIVATE__
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#define INITGUID
+
+#include <windef.h>
+#include <winbase.h>
 #include <winver.h>
+#include <ole2.h>
+#include <fusion.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(fusion);
 
 #include <pshpack1.h>