[MAPI32]

* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61776

reactos/dll/win32/mapi32/mapi32_main.c

@@ -20,8 +20,6 @@
 
 #include "precomp.h"
 
-#include <mapix.h>
-
 DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0;
 DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;
 

reactos/dll/win32/mapi32/precomp.h

@@ -1,7 +1,7 @@
 #ifndef _MAPI32_PCH_
 #define _MAPI32_PCH_
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -16,14 +16,15 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
+#include <mapi.h>
 #include <mapival.h>
-#include <mapiutil.h>
-
-#include <wine/unicode.h>
+#include <shlwapi.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+#include <wine/unicode.h>
 
 #include "util.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+
 #endif /* _MAPI32_PCH_ */

reactos/dll/win32/mapi32/prop.c

@@ -20,7 +20,6 @@
 
 #include "precomp.h"
 
-#include <shlwapi.h>
 #include <wine/list.h>
 
 BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);

reactos/dll/win32/mapi32/stubs.c

@@ -1,13 +1,4 @@
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <mapix.h>
-
-#include <reactos/debug.h>
+#include "precomp.h"
 
 typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;
 
@@ -109,4 +100,3 @@ FixMAPI(void)
     UNIMPLEMENTED;
     return E_NOTIMPL;
 }
-

reactos/dll/win32/mapi32/util.c

@@ -22,9 +22,7 @@
 #include "precomp.h"
 
 #include <stdio.h>
-
 #include <winternl.h>
-#include <shlwapi.h>
 #include <xcmc.h>
 #include <msi.h>
 

reactos/dll/win32/mapi32/util.h

@@ -19,12 +19,8 @@
  */
 
 #ifndef _MAPI_UTIL_H
-
 #define _MAPI_UTIL_H
 
-#include <mapi.h>
-//#include <mapix.h>
-
 extern void load_mapi_providers(void) DECLSPEC_HIDDEN;
 extern void unload_mapi_providers(void) DECLSPEC_HIDDEN;
 
@@ -65,4 +61,4 @@ typedef struct MAPI_FUNCTIONS {
 extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN;
 extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN;
 
-#endif
+#endif /* _MAPI_UTIL_H */