Make sure that no files except unknwn.h include wine/obj_base.h

directly.

dlls/comctl32/imagelist.c

@@ -45,8 +45,7 @@
 #include <string.h>
 #include "winerror.h"
 #include "winbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "commctrl.h"
 #include "imagelist.h"
 #include "wine/debug.h"

dlls/ddraw/d3dcommon.c

@@ -20,7 +20,7 @@
  */
 
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3ddevice/main.c

@@ -24,7 +24,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3ddevice/mesa.c

@@ -25,7 +25,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dexecutebuffer.c

@@ -24,7 +24,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dlight.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dmaterial.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dtexture.c

@@ -24,7 +24,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dvertexbuffer.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/d3dviewport.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/ddraw/mesa.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "wine/debug.h"

dlls/dplayx/dpclassfactory.c

@@ -18,7 +18,7 @@
 
 #include <string.h>
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "winerror.h"
 #include "wine/debug.h"
 #include "dpinit.h"

dlls/ole32/antimoniker.c

@@ -23,10 +23,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
+#include "objbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/ole32/bindctx.c

@@ -23,10 +23,7 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
+#include "objbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/ole32/compobj.c

@@ -37,14 +37,8 @@
 #include "winerror.h"
 #include "winreg.h"
 #include "wownt32.h"
-#include "wtypes.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 #include "compobj_private.h"
 
 #include "wine/debug.h"

dlls/ole32/compositemoniker.c

@@ -22,11 +22,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/debug.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
 #include "wine/unicode.h"
 #include "ole2.h"
 

dlls/ole32/datacache.c

@@ -50,13 +50,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.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_oleview.h"
-#include "wine/obj_cache.h"
 #include "wine/unicode.h"
 #include "ole2.h"
 #include "wine/debug.h"

dlls/ole32/errorinfo.c

@@ -30,9 +30,7 @@
 #include "oleauto.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_errorinfo.h"
+#include "objbase.h"
 #include "wine/unicode.h"
 #include "thread.h"
 

dlls/ole32/filemoniker.c

@@ -26,9 +26,6 @@
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "objbase.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_base.h"
 
 #include "compobj_private.h"
 

dlls/ole32/ftmarshal.c

@@ -27,7 +27,7 @@
 
 #include "winbase.h"
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_marshal.h"
 

dlls/ole32/ifs.c

@@ -30,8 +30,6 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/ole32/itemmoniker.c

@@ -24,11 +24,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "wine/debug.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
+#include "ole2.h"
 #include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/ole32/moniker.c

@@ -25,10 +25,6 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_moniker.h"
 #include "wine/debug.h"
 #include "ole2.h"
 

dlls/ole32/ole32_main.c

@@ -22,7 +22,6 @@
 #include "winerror.h"
 #include "ole32_main.h"
 #include "wine/debug.h"
-#include "wine/obj_misc.h" /* FIXME: CoRegisterMallocSpy */
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

dlls/ole32/ole32_main.h

@@ -20,10 +20,16 @@
 #define __WINE_OLE32_MAIN_H
 
 #include "windef.h"
+#include "objbase.h"
 
 extern HINSTANCE OLE32_hInstance;
 
 void COMPOBJ_InitProcess( void );
 void COMPOBJ_UninitProcess( void );
+/* FIXME: not implemented */
+HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
+/* FIXME: not implemented */
+HRESULT WINAPI CoRevokeMallocSpy(void);
+
 
 #endif /* __WINE_OLE32_MAIN_H */

dlls/ole32/oleobj.c

@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/debug.h"
-#include "oleidl.h"
+#include "ole2.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

dlls/ole32/stg_bigblockfile.c

@@ -39,8 +39,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "ole2.h"
 
 #include "storage32.h"

dlls/ole32/storage.c

@@ -35,9 +35,7 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
-#include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/ole32/storage32.h

@@ -29,10 +29,8 @@
 #ifndef __STORAGE32_H__
 #define __STORAGE32_H__
 
-#include "wtypes.h"
 #include "winnt.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 
 /*
  * Definitions for the file format offsets.

dlls/oleaut32/connpt.c

@@ -30,8 +30,6 @@
 #include "winuser.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_connection.h"
 #include "connpt.h"
 
 #include "wine/debug.h"

dlls/oleaut32/dispatch.c

@@ -34,8 +34,6 @@
 #include "winreg.h"         /* for HKEY_LOCAL_MACHINE */
 #include "winnls.h"         /* for PRIMARYLANGID */
 
-#include "wine/obj_oleaut.h"
-
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/oleaut32/olefont.c

@@ -28,9 +28,7 @@
 #include "winuser.h"
 #include "wine/unicode.h"
 #include "oleauto.h"    /* for SysAllocString(....) */
-#include "wine/obj_base.h"
-#include "wine/obj_olefont.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "ole2.h"
 #include "olectl.h"
 #include "wine/debug.h"

dlls/oleaut32/safearray.c

@@ -27,7 +27,6 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "oleauto.h"
-#include "wine/obj_base.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/oleaut32/tmarshal.c

@@ -33,9 +33,6 @@
 
 #include "ole2.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
-#include "wine/obj_storage.h"
 #include "heap.h"
 #include "ole2disp.h"
 #include "typelib.h"

dlls/oleaut32/typelib.c

@@ -66,7 +66,7 @@
 #include "winuser.h"
 
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "heap.h"
 #include "ole2disp.h"
 #include "typelib.h"

dlls/rpcrt4/cproxy.c

@@ -25,9 +25,7 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
-
+#include "objbase.h"
 #include "rpcproxy.h"
 
 #include "cpsf.h"

dlls/rpcrt4/cpsf.c

@@ -26,8 +26,7 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 

dlls/rpcrt4/cstub.c

@@ -22,8 +22,7 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 

dlls/rpcrt4/ndr_marshall.c

@@ -35,7 +35,7 @@
 #include "rpcndr.h"
 
 #include "wine/rpcfc.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 #include "wine/debug.h"
 

dlls/rpcrt4/ndr_midl.c

@@ -31,8 +31,7 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 

dlls/rpcrt4/ndr_ole.c

@@ -32,10 +32,7 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcndr.h"
 

dlls/shdocvw/classinfo.c

@@ -19,8 +19,10 @@
  */
 
 #include <string.h>
-#include "wine/debug.h"
+
+#include "winbase.h"
 #include "shdocvw.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 

dlls/shdocvw/shdocvw.h

@@ -26,21 +26,9 @@
 #include "winbase.h"
 #include "winuser.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_oleobj.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_olefont.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_oleview.h"
-#include "wine/obj_control.h"
-#include "wine/obj_connection.h"
-#include "wine/obj_property.h"
-#include "wine/obj_oleundo.h"
+#include "ole2.h"
+#include "olectl.h"
+#include "shlobj.h"
 #include "wine/obj_webbrowser.h"
 
 /**********************************************************************

dlls/shell32/dragdrophelper.c

@@ -22,15 +22,13 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
-#include "winerror.h"
 #include "winbase.h"
 #include "winreg.h"
 
-#include "oleidl.h"
+#include "objbase.h"
+#include "ole2.h"
 #include "shlguid.h"
 
 #include "wine/obj_dragdrophelper.h"

dlls/shell32/folders.c

@@ -22,8 +22,7 @@
 #include <string.h>
 
 #include "windef.h"
-#include "wine/obj_base.h"
-#include "wine/obj_extracticon.h"
+#include "objbase.h"
 #include "undocshell.h"
 #include "shlguid.h"
 

dlls/shell32/shellfolder.h

@@ -23,9 +23,7 @@
 
 #include "winbase.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_shellfolder.h"
-
+#include "shlobj.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

dlls/shell32/shellord.c

@@ -29,7 +29,6 @@
 #include "winnls.h"
 #include "heap.h"
 
-#include "wine/obj_base.h"
 #include "shellapi.h"
 #include "shlguid.h"
 #include "shlobj.h"

dlls/shell32/shfldr_desktop.c

@@ -31,13 +31,10 @@
 #include "winbase.h"
 #include "winreg.h"
 
-#include "oleidl.h"
+#include "ole2.h"
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"

dlls/shell32/shfldr_fs.c

@@ -31,13 +31,10 @@
 #include "winbase.h"
 #include "winreg.h"
 
-#include "oleidl.h"
+#include "ole2.h"
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"

dlls/shell32/shfldr_mycomp.c

@@ -31,13 +31,9 @@
 #include "winbase.h"
 #include "winreg.h"
 
-#include "oleidl.h"
+#include "pidl.h"
 #include "shlguid.h"
 
-#include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"

dlls/shell32/shlfolder.c

@@ -33,13 +33,10 @@
 #include "winbase.h"
 #include "winreg.h"
 
-#include "oleidl.h"
+#include "ole2.h"
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shresdef.h"

dlls/shell32/shlmenu.c

@@ -22,9 +22,6 @@
 
 #include "winreg.h"
 #include "shlobj.h"
-#include "wine/obj_base.h"
-#include "wine/obj_enumidlist.h"
-#include "wine/obj_shellfolder.h"
 #include "undocshell.h"
 #include "shlwapi.h"
 #include "heap.h"

dlls/shell32/shv_bg_cmenu.c

@@ -24,9 +24,7 @@
 
 #include "pidl.h"
 #include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellbrowser.h"
+#include "shlobj.h"
 
 #include "shell32_main.h"
 #include "shellfolder.h"

dlls/shell32/shv_item_cmenu.c

@@ -25,11 +25,8 @@
 
 #include "pidl.h"
 #include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_shellextinit.h"
 #include "undocshell.h"
+#include "shlobj.h"
 
 #include "shell32_main.h"
 #include "shellfolder.h"

dlls/shlwapi/clist.c

@@ -22,8 +22,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);

dlls/shlwapi/istream.c

@@ -22,8 +22,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #define NO_SHLWAPI_REG
 #define NO_SHLWAPI_PATH
 #include "shlwapi.h"

dlls/shlwapi/ordinal.c

@@ -36,8 +36,6 @@
 #include "shellapi.h"
 #include "commdlg.h"
 #include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_inplace.h"
 #include "wine/obj_serviceprovider.h"
 #include "wine/obj_control.h"
 #include "wine/obj_connection.h"

dlls/shlwapi/regstream.c

@@ -23,9 +23,8 @@
 
 #include "winerror.h"
 #include "winbase.h"
+#include "objbase.h"
 #include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 
 #include "wine/debug.h"
 

dlls/shlwapi/thread.c

@@ -22,7 +22,6 @@
 
 #include "windef.h"
 #include "winnls.h"
-#include "wine/obj_base.h"
 #include "wine/debug.h"
 #define NO_SHLWAPI_REG
 #define NO_SHLWAPI_PATH

include/dplay.h

@@ -20,7 +20,6 @@
 #define __WINE_DPLAY_H
 
 #include "ole2.h"
-#include "wine/obj_base.h"
 
 #ifdef __cplusplus
 extern "C" {

include/oaidl.h

@@ -28,12 +28,15 @@
 #ifndef __WINE_OAIDL_H
 #define __WINE_OAIDL_H
 
-#include "ole2.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
+
+#define __WINE_INCLUDE_OBJIDL
 #include "objidl.h"
-
-#include "wine/obj_base.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 */

include/objbase.h

@@ -21,24 +21,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 */

include/objidl.h

@@ -28,8 +28,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"

include/ocidl.h

@@ -28,10 +28,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"

include/ole.h

@@ -27,12 +27,7 @@ extern "C" {
 
 #include "windef.h"
 #include "wine/windef16.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 "objbase.h"
 
 struct tagLOGPALETTE;
 

include/ole2.h

@@ -24,17 +24,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;

include/oleauto.h

@@ -20,14 +20,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" {

include/olectl.h

@@ -20,7 +20,9 @@
 #define __WINE_OLECTL_H
 
 #include "windef.h"
+#define __WINE_INCLUDE_OCIDL
 #include "ocidl.h"
+#undef __WINE_INCLUDE_OCIDL
 
 #ifdef __cplusplus
 extern "C" {

include/oledlg.h

@@ -24,7 +24,7 @@
 #include "commdlg.h"
 #include "prsht.h"
 #include "windef.h"
-#include "oleidl.h"
+#include "ole2.h"
 
 #ifdef __cplusplus
 extern "C" {

include/oleidl.h

@@ -28,27 +28,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 */
 

include/servprov.h

@@ -29,7 +29,7 @@
 #define __WINE_SERVPROV_H
 
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 
 /*****************************************************************************

include/shlguid.h

@@ -19,7 +19,7 @@
 #ifndef __WINE_SHLGUID_H
 #define __WINE_SHLGUID_H
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 #define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
 

include/shlobj.h

@@ -22,6 +22,7 @@
 #include "windef.h"
 #include "winbase.h"	/* WIN32_FIND_* */
 #include "ole2.h"
+#include "oleauto.h"
 #include "commctrl.h"
 #include "prsht.h"
 
@@ -53,10 +54,7 @@ BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
 #define     SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
 
 
-#include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_oleaut.h"
 #include "wine/obj_shellfolder.h"
 #include "wine/obj_shellview.h"
 #include "wine/obj_shelllink.h"

include/unknwn.h

@@ -28,6 +28,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 */

include/urlmon.h

@@ -29,7 +29,7 @@
 #define __WINE_URLMON_H
 
 #include "winbase.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 #ifdef __cplusplus
 extern "C" {

include/wine/obj_base.h

@@ -22,6 +22,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++.

include/wine/obj_misc.h

@@ -24,8 +24,6 @@
 #ifndef __WINE_WINE_OBJ_MISC_H
 #define __WINE_WINE_OBJ_MISC_H
 
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
@@ -193,12 +191,6 @@ ICOM_DEFINE(IMallocSpy,IUnknown)
 #define IMallocSpy_PreHeapMinimize(p)    ICOM_CALL (PreHeapMinimize,p)
 #define IMallocSpy_PostHeapMinimize(p)   ICOM_CALL (PostHeapMinimize,p)
 
-/* FIXME: not implemented */
-HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoRevokeMallocSpy(void);
-
 HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime);
 
 

include/wine/obj_serviceprovider.h

@@ -23,7 +23,7 @@
 #ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H
 #define __WINE_WINE_OBJ_SERVICEPROVIDER_H
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "winbase.h"
 
 #ifdef __cplusplus