Include rpc*.h/windows.h/ole2.h just like windows.
diff --git a/include/comcat.h b/include/comcat.h
index 2d8563d..f9e042d 100644
--- a/include/comcat.h
+++ b/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"
diff --git a/include/docobj.h b/include/docobj.h
index afa4be1..04b26e7 100644
--- a/include/docobj.h
+++ b/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
diff --git a/include/oaidl.h b/include/oaidl.h
index 8d28601..d2b9291 100644
--- a/include/oaidl.h
+++ b/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
diff --git a/include/objidl.h b/include/objidl.h
index a89858b..e4fa1eb 100644
--- a/include/objidl.h
+++ b/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
diff --git a/include/ocidl.h b/include/ocidl.h
index 192e657..9750614 100644
--- a/include/ocidl.h
+++ b/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"
diff --git a/include/oleidl.h b/include/oleidl.h
index 9be7af4..4a705d5 100644
--- a/include/oleidl.h
+++ b/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
diff --git a/include/rpc.h b/include/rpc.h
index 51928a3..1d0c7ab 100644
--- a/include/rpc.h
+++ b/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
diff --git a/include/servprov.h b/include/servprov.h
index ae10c8f..de0a90e 100644
--- a/include/servprov.h
+++ b/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
diff --git a/include/strmif.h b/include/strmif.h
index 1055dda..fce9b49 100644
--- a/include/strmif.h
+++ b/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_
diff --git a/include/unknwn.h b/include/unknwn.h
index 1090c0c..94cc0da 100644
--- a/include/unknwn.h
+++ b/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"
diff --git a/include/urlmon.h b/include/urlmon.h
index 8029f6a..74687f5 100644
--- a/include/urlmon.h
+++ b/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
