Index: include/oaidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oaidl.h,v
retrieving revision 1.5
diff -u -r1.5 oaidl.h
--- include/oaidl.h	18 Jul 2001 20:04:08 -0000	1.5
+++ include/oaidl.h	19 Nov 2002 22:42:20 -0000
@@ -10,12 +10,15 @@
 #ifndef __WINE_OAIDL_H
 #define __WINE_OAIDL_H
 
-#include "ole2.h"
-#include "objidl.h"
-
-#include "wine/obj_base.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
 
+#define __WINE_INCLUDE_OBJIDL
+#include "objidl.h"
+#undef __WINE_INCLUDE_OBJIDL
 /* the following depend only on obj_base.h */
 #include "wine/obj_oleaut.h"
+#include "wine/obj_errorinfo.h"
 
 #endif /* _WINE_OAIDL_H */
Index: include/objbase.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/objbase.h,v
retrieving revision 1.21
diff -u -r1.21 objbase.h
--- include/objbase.h	23 Aug 2002 22:47:30 -0000	1.21
+++ include/objbase.h	19 Nov 2002 22:42:20 -0000
@@ -3,24 +3,9 @@
 
 #define _OBJBASE_H_
 
-#include "unknwn.h"
-
-/* the following depend only on obj_base.h */
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_channel.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_storage.h"
-
-/* the following depend on obj_storage.h */
-#include "wine/obj_marshal.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_propertystorage.h"
-
-/* the following depend on obj_moniker.h */
-#include "wine/obj_dataobject.h"
-
-#include "wine/obj_dragdrop.h"
+#define __WINE_INCLUDE_OBJIDL
+#include "objidl.h"
+#undef __WINE_INCLUDE_OBJIDL
 
 #ifndef RC_INVOKED
 /* For compatibility only, at least for now */
Index: include/objidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/objidl.h,v
retrieving revision 1.6
diff -u -r1.6 objidl.h
--- include/objidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/objidl.h	19 Nov 2002 23:08:12 -0000
@@ -10,8 +10,11 @@
 #ifndef __WINE_OBJIDL_H
 #define __WINE_OBJIDL_H
 
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OBJIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
 
-#include "wine/obj_base.h"
+#include "unknwn.h"
 
 /* the following depend only on obj_base.h */
 #include "wine/obj_misc.h"
Index: include/ocidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/ocidl.h,v
retrieving revision 1.6
diff -u -r1.6 ocidl.h
--- include/ocidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/ocidl.h	19 Nov 2002 22:42:20 -0000
@@ -10,10 +10,14 @@
 #ifndef __WINE_OCIDL_H
 #define __WINE_OCIDL_H
 
-#include "wine/obj_base.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
+
+#define __WINE_INCLUDE_OLEIDL
+#include "oleidl.h"
+#undef __WINE_INCLUDE_OLEIDL
 
-/* the following depend only on obj_base.h */
-#include "wine/obj_storage.h"
 #include "wine/obj_oleaut.h"
 #include "wine/obj_olefont.h"
 #include "wine/obj_picture.h"
Index: include/ole2.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/ole2.h,v
retrieving revision 1.35
diff -u -r1.35 ole2.h
--- include/ole2.h	23 Aug 2002 22:47:30 -0000	1.35
+++ include/ole2.h	19 Nov 2002 22:42:21 -0000
@@ -8,17 +8,10 @@
 #include "windef.h"
 #include "winerror.h"
 #include "objbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_oleobj.h"
-#include "wine/obj_oleview.h"
-#ifndef __WINE__
+#define __WINE_INCLUDE_OLEIDL
 #include "oleidl.h"
+#undef __WINE_INCLUDE_OLEIDL
+#ifndef __WINE__
 #include "oleauto.h"
 #endif
 struct tagMSG;
Index: include/oleauto.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oleauto.h,v
retrieving revision 1.43
diff -u -r1.43 oleauto.h
--- include/oleauto.h	23 Aug 2002 22:47:30 -0000	1.43
+++ include/oleauto.h	19 Nov 2002 22:42:21 -0000
@@ -2,14 +2,9 @@
 #define __WINE_OLEAUTO_H
 
 #include "winbase.h"
-#include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_errorinfo.h"
-
-#ifndef __WINE__
+#define __WINE_INCLUDE_OAIDL
 #include "oaidl.h"
-#endif
+#undef __WINE_INCLUDE_OAIDL
 
 #ifdef __cplusplus
 extern "C" {
Index: include/olectl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/olectl.h,v
retrieving revision 1.14
diff -u -r1.14 olectl.h
--- include/olectl.h	23 Aug 2002 22:47:30 -0000	1.14
+++ include/olectl.h	19 Nov 2002 22:42:21 -0000
@@ -2,7 +2,9 @@
 #define __WINE_OLECTL_H
 
 #include "windef.h"
+#define __WINE_INCLUDE_OCIDL
 #include "ocidl.h"
+#undef __WINE_INCLUDE_OCIDL
 
 #ifdef __cplusplus
 extern "C" {
Index: include/oleidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oleidl.h,v
retrieving revision 1.6
diff -u -r1.6 oleidl.h
--- include/oleidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/oleidl.h	19 Nov 2002 23:08:40 -0000
@@ -10,27 +10,16 @@
 #ifndef __WINE_OLEIDL_H
 #define __WINE_OLEIDL_H
 
-
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-
-/* the following depend only on obj_base.h */
-#include "wine/obj_storage.h"
-
-/* the following depend on obj_storage.h */
-#include "wine/obj_moniker.h"
-
-/* the following depend on obj_moniker */
-#include "wine/obj_dataobject.h"
-
-/* the following depend on obj_dataobject.h */
-#include "wine/obj_dragdrop.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
 
 #include "wine/obj_inplace.h"
 #include "wine/obj_cache.h"
 #include "wine/obj_oleobj.h"
 #include "wine/obj_oleview.h"
 #include "wine/obj_errorinfo.h"
+#include "wine/obj_dragdrop.h"
 
 #endif /* __WINE_OLEIDL_H */
 
Index: include/unknwn.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/unknwn.h,v
retrieving revision 1.4
diff -u -r1.4 unknwn.h
--- include/unknwn.h	18 Jul 2001 20:04:08 -0000	1.4
+++ include/unknwn.h	19 Nov 2002 23:37:18 -0000
@@ -10,6 +10,8 @@
 #ifndef __WINE_UNKNWN_H
 #define __WINE_UNKNWN_H
 
+#define __WINE_INCLUDE_UNKNWN
 #include "wine/obj_base.h"
+#undef __WINE_INCLUDE_UNKNWN
 
 #endif /* __WINE_UNKNWN_H */
Index: include/wine/obj_base.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wine/obj_base.h,v
retrieving revision 1.48
diff -u -r1.48 obj_base.h
--- include/wine/obj_base.h	18 Nov 2002 17:53:44 -0000	1.48
+++ include/wine/obj_base.h	19 Nov 2002 23:37:18 -0000
@@ -6,6 +6,10 @@
 #ifndef __WINE_WINE_OBJ_BASE_H
 #define __WINE_WINE_OBJ_BASE_H
 
+#ifndef __WINE_INCLUDE_UNKNWN
+#error DO NOT INCLUDE DIRECTLY
+#endif
+
 /*****************************************************************************
  * define ICOM_MSVTABLE_COMPAT
  * to implement the microsoft com vtable compatibility workaround for g++.