From d2cb1d14264f7420bbbd4b2d4e100d715a649ff5 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Wed, 18 Jul 2001 20:04:08 +0000
Subject: [PATCH] Include rpc*.h/windows.h/ole2.h just like windows.

---
 include/comcat.h   |  9 +++++----
 include/docobj.h   |  9 +++++++++
 include/oaidl.h    |  9 +++++++++
 include/objidl.h   |  9 +++++++++
 include/ocidl.h    | 12 ++++++++----
 include/oleidl.h   |  9 +++++++++
 include/rpc.h      |  6 +++---
 include/servprov.h |  9 +++++++++
 include/strmif.h   |  9 +++++++++
 include/unknwn.h   | 11 ++++++-----
 include/urlmon.h   |  9 +++++++++
 11 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/include/comcat.h b/include/comcat.h
index 2d8563d114c..f9e042d2cbe 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 afa4be1215d..04b26e705fb 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 8d2860124e4..d2b92914e15 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 a89858b0ed7..e4fa1ebd5ea 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 192e65799b6..9750614d384 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 9be7af4a385..4a705d555f3 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 51928a33cf4..1d0c7ab4f18 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 ae10c8f7a16..de0a90e3a5a 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 1055ddaddf0..fce9b499af4 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 1090c0cd528..94cc0daab7d 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 8029f6ad9ed..74687f5c98d 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