Include rpc*.h/windows.h/ole2.h just like windows.

include/comcat.h

@@ -1,13 +1,14 @@
-#ifndef __WINE_COMCAT_H
-#define __WINE_COMCAT_H
-
+#ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
-
 #ifndef COM_NO_WINDOWS_H
 #include "windows.h"
 #include "ole2.h"
 #endif
+#endif
+
+#ifndef __WINE_COMCAT_H
+#define __WINE_COMCAT_H
 
 #include "unknwn.h"
 

include/docobj.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_DOCOBJ_H
 #define __WINE_DOCOBJ_H
 

include/oaidl.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_OAIDL_H
 #define __WINE_OAIDL_H
 

include/objidl.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_OBJIDL_H
 #define __WINE_OBJIDL_H
 

include/ocidl.h

@@ -1,10 +1,14 @@
-#ifndef __WINE_OCIDL_H
-#define __WINE_OCIDL_H
-
-#if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
 #include "windows.h"
 #include "ole2.h"
 #endif
+#endif
+
+#ifndef __WINE_OCIDL_H
+#define __WINE_OCIDL_H
 
 #include "wine/obj_base.h"
 

include/oleidl.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_OLEIDL_H
 #define __WINE_OLEIDL_H
 

include/rpc.h

@@ -2,13 +2,13 @@
  *    RPC interface
  *
  */
-#ifndef __WINE_RPC_H
-#define __WINE_RPC_H
-
 #if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
 #include "windows.h"
 #endif
 
+#ifndef __WINE_RPC_H
+#define __WINE_RPC_H
+
 #define __RPC_FAR
 #define __RPC_API  WINAPI
 #define __RPC_USER WINAPI

include/servprov.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_SERVPROV_H
 #define __WINE_SERVPROV_H
 

include/strmif.h

@@ -1,3 +1,12 @@
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_STRMIF_H_
 #define __WINE_STRMIF_H_
 

include/unknwn.h

@@ -1,13 +1,14 @@
-#ifndef __WINE_UNKNWN_H
-#define __WINE_UNKNWN_H
-
+#ifndef __WINE__
 #include "rpc.h"
 #include "rpcndr.h"
-
-#if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
+#ifndef COM_NO_WINDOWS_H
 #include "windows.h"
 #include "ole2.h"
 #endif
+#endif
+
+#ifndef __WINE_UNKNWN_H
+#define __WINE_UNKNWN_H
 
 #include "wine/obj_base.h"
 

include/urlmon.h

@@ -2,6 +2,15 @@
  * urlmon.h
  */
 
+#ifndef __WINE__
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif
+#endif
+
 #ifndef __WINE_URLMON_H
 #define __WINE_URLMON_H