[FUSION]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61764

reactos/dll/win32/fusion/CMakeLists.txt

@@ -15,7 +15,7 @@ list(APPEND SOURCE
 
 add_library(fusion SHARED ${SOURCE} version.rc)
 set_module_type(fusion win32dll)
-target_link_libraries(fusion wine)
+target_link_libraries(fusion uuid wine)
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

reactos/dll/win32/fusion/asmcache.c

@@ -20,8 +20,6 @@
 
 #include "fusionpriv.h"
 
-#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};
 

reactos/dll/win32/fusion/asmname.c

@@ -21,7 +21,7 @@
 #include "fusionpriv.h"
 
 #include <assert.h>
-#include <corerror.h>
+#include <winuser.h>
 
 typedef struct {
     IAssemblyName IAssemblyName_iface;

reactos/dll/win32/fusion/fusionpriv.h

@@ -31,13 +31,12 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#define INITGUID
-
 #include <windef.h>
 #include <winbase.h>
 #include <winver.h>
-#include <ole2.h>
+#include <objbase.h>
 #include <fusion.h>
+#include <corerror.h>
 
 #include <wine/unicode.h>