From 1f5315c80faa9e87e22e5e4245503f848caf1401 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@transgaming.com>
Date: Thu, 5 Dec 2002 20:33:07 +0000
Subject: [PATCH] Make sure that no files except unknwn.h include
 wine/obj_base.h directly.

---
 dlls/comctl32/imagelist.c          |  3 +--
 dlls/ddraw/d3dcommon.c             |  2 +-
 dlls/ddraw/d3ddevice/main.c        |  2 +-
 dlls/ddraw/d3ddevice/mesa.c        |  2 +-
 dlls/ddraw/d3dexecutebuffer.c      |  2 +-
 dlls/ddraw/d3dlight.c              |  2 +-
 dlls/ddraw/d3dmaterial.c           |  2 +-
 dlls/ddraw/d3dtexture.c            |  2 +-
 dlls/ddraw/d3dvertexbuffer.c       |  2 +-
 dlls/ddraw/d3dviewport.c           |  2 +-
 dlls/ddraw/mesa.c                  |  2 +-
 dlls/dplayx/dpclassfactory.c       |  2 +-
 dlls/ole32/antimoniker.c           |  5 +----
 dlls/ole32/bindctx.c               |  5 +----
 dlls/ole32/compobj.c               |  8 +-------
 dlls/ole32/compositemoniker.c      |  5 -----
 dlls/ole32/datacache.c             |  7 -------
 dlls/ole32/errorinfo.c             |  4 +---
 dlls/ole32/filemoniker.c           |  3 ---
 dlls/ole32/ftmarshal.c             |  2 +-
 dlls/ole32/ifs.c                   |  2 --
 dlls/ole32/itemmoniker.c           |  6 +-----
 dlls/ole32/moniker.c               |  4 ----
 dlls/ole32/ole32_main.c            |  1 -
 dlls/ole32/ole32_main.h            |  6 ++++++
 dlls/ole32/oleobj.c                |  2 +-
 dlls/ole32/stg_bigblockfile.c      |  3 +--
 dlls/ole32/storage.c               |  4 +---
 dlls/ole32/storage32.h             |  4 +---
 dlls/oleaut32/connpt.c             |  2 --
 dlls/oleaut32/dispatch.c           |  2 --
 dlls/oleaut32/olefont.c            |  4 +---
 dlls/oleaut32/safearray.c          |  1 -
 dlls/oleaut32/tmarshal.c           |  3 ---
 dlls/oleaut32/typelib.c            |  2 +-
 dlls/rpcrt4/cproxy.c               |  4 +---
 dlls/rpcrt4/cpsf.c                 |  3 +--
 dlls/rpcrt4/cstub.c                |  3 +--
 dlls/rpcrt4/ndr_marshall.c         |  2 +-
 dlls/rpcrt4/ndr_midl.c             |  3 +--
 dlls/rpcrt4/ndr_ole.c              |  5 +----
 dlls/shdocvw/classinfo.c           |  4 +++-
 dlls/shdocvw/shdocvw.h             | 18 +++---------------
 dlls/shell32/dragdrophelper.c      |  6 ++----
 dlls/shell32/folders.c             |  3 +--
 dlls/shell32/shellfolder.h         |  4 +---
 dlls/shell32/shellord.c            |  1 -
 dlls/shell32/shfldr_desktop.c      |  5 +----
 dlls/shell32/shfldr_fs.c           |  5 +----
 dlls/shell32/shfldr_mycomp.c       |  6 +-----
 dlls/shell32/shlfolder.c           |  5 +----
 dlls/shell32/shlmenu.c             |  3 ---
 dlls/shell32/shv_bg_cmenu.c        |  4 +---
 dlls/shell32/shv_item_cmenu.c      |  5 +----
 dlls/shlwapi/clist.c               |  3 +--
 dlls/shlwapi/istream.c             |  2 --
 dlls/shlwapi/ordinal.c             |  2 --
 dlls/shlwapi/regstream.c           |  3 +--
 dlls/shlwapi/thread.c              |  1 -
 include/dplay.h                    |  1 -
 include/oaidl.h                    | 11 +++++++----
 include/objbase.h                  | 21 +++------------------
 include/objidl.h                   |  5 ++++-
 include/ocidl.h                    | 10 +++++++---
 include/ole.h                      |  7 +------
 include/ole2.h                     | 13 +++----------
 include/oleauto.h                  |  9 ++-------
 include/olectl.h                   |  2 ++
 include/oledlg.h                   |  2 +-
 include/oleidl.h                   | 19 ++++---------------
 include/servprov.h                 |  2 +-
 include/shlguid.h                  |  2 +-
 include/shlobj.h                   |  4 +---
 include/unknwn.h                   |  2 ++
 include/urlmon.h                   |  2 +-
 include/wine/obj_base.h            |  4 ++++
 include/wine/obj_misc.h            |  8 --------
 include/wine/obj_serviceprovider.h |  2 +-
 78 files changed, 99 insertions(+), 237 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 662e9f479eb..28370e51458 100644
--- a/dlls/comctl32/imagelist.c
+++ b/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"
diff --git a/dlls/ddraw/d3dcommon.c b/dlls/ddraw/d3dcommon.c
index b99fb8592dc..d02af9b5ebb 100644
--- a/dlls/ddraw/d3dcommon.c
+++ b/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"
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index 15d672f8cf3..5af8ea17624 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/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"
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 9621315d432..967c88f6366 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/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"
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index 70ab5f05372..67415949929 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/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"
diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/d3dlight.c
index 94d77ceb665..5237322c096 100644
--- a/dlls/ddraw/d3dlight.c
+++ b/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"
diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
index b06aee1ef26..ed1acf0cc96 100644
--- a/dlls/ddraw/d3dmaterial.c
+++ b/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"
diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index 9bd8ec0a354..8a47ff75789 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/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"
diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c
index c64b0d97aab..65e0d27dc9a 100644
--- a/dlls/ddraw/d3dvertexbuffer.c
+++ b/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"
diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/d3dviewport.c
index 2a036174593..a1c31e7d5a9 100644
--- a/dlls/ddraw/d3dviewport.c
+++ b/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"
diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c
index e07b407d3c6..3b58691f166 100644
--- a/dlls/ddraw/mesa.c
+++ b/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"
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index 5fa2a962723..0eb76682f79 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/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"
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 9664eb4bad0..41e468ac013 100644
--- a/dlls/ole32/antimoniker.c
+++ b/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);
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index e66cc325c88..6eeee55db3b 100644
--- a/dlls/ole32/bindctx.c
+++ b/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);
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 2ff77164595..8ded0bc2d56 100644
--- a/dlls/ole32/compobj.c
+++ b/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"
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index a2878c8b8a7..7fa69ed557b 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/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"
 
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index dfbad7123db..491c5314466 100644
--- a/dlls/ole32/datacache.c
+++ b/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"
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 2e4598bf875..ef45e96008c 100644
--- a/dlls/ole32/errorinfo.c
+++ b/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"
 
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index bf70e784b68..4f18c97f4de 100644
--- a/dlls/ole32/filemoniker.c
+++ b/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"
 
diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 0d749acf504..9c9b5bf78ec 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/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"
 
diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index a71f69d51b3..22aa8763d0c 100644
--- a/dlls/ole32/ifs.c
+++ b/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);
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 86c36db40a1..7c4fca41d71 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/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);
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 103d450896b..4eaebcc7298 100644
--- a/dlls/ole32/moniker.c
+++ b/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"
 
diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c
index a710b0e6bcf..c477f2c9c44 100644
--- a/dlls/ole32/ole32_main.c
+++ b/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);
 
diff --git a/dlls/ole32/ole32_main.h b/dlls/ole32/ole32_main.h
index bb1fef222cb..65d5352c1e8 100644
--- a/dlls/ole32/ole32_main.h
+++ b/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 */
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 67b867f3314..c1d5294f189 100644
--- a/dlls/ole32/oleobj.c
+++ b/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);
 
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index c425ecf7b14..7990491d0e7 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/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"
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index c0f784e8a14..8cb62d353d4 100644
--- a/dlls/ole32/storage.c
+++ b/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);
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index d5ed920d4e4..5c26d293d7f 100644
--- a/dlls/ole32/storage32.h
+++ b/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.
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index fe99c985954..e9415a72b20 100644
--- a/dlls/oleaut32/connpt.c
+++ b/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"
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index fedcef8f193..7cc7b2da054 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/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);
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index cb9180ba110..e04362d7f51 100644
--- a/dlls/oleaut32/olefont.c
+++ b/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"
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index dd416de69c1..8da2d763886 100644
--- a/dlls/oleaut32/safearray.c
+++ b/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);
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 0f863216bea..15c3149e6cb 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/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"
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 9e52fef6de8..04c0e747d42 100644
--- a/dlls/oleaut32/typelib.c
+++ b/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"
diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index 433d5ab6905..78854845575 100644
--- a/dlls/rpcrt4/cproxy.c
+++ b/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"
diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c
index b9e71624718..49930d913fe 100644
--- a/dlls/rpcrt4/cpsf.c
+++ b/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"
 
diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
index c37d1f28e32..d9f2c98fa88 100644
--- a/dlls/rpcrt4/cstub.c
+++ b/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"
 
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index ceea5f2f66f..c242c9fe47a 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/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"
 
diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c
index fec5cc2716f..33d0e2c987d 100644
--- a/dlls/rpcrt4/ndr_midl.c
+++ b/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"
 
diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c
index 80a03aa0452..0bd1725aa98 100644
--- a/dlls/rpcrt4/ndr_ole.c
+++ b/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"
 
diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c
index 6aa2a7a3619..6070b7482c6 100644
--- a/dlls/shdocvw/classinfo.c
+++ b/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);
 
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index c561dd719d8..c5c2bf541d6 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/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"
 
 /**********************************************************************
diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c
index d535eddca48..5e264d513cd 100644
--- a/dlls/shell32/dragdrophelper.c
+++ b/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"
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 43c87731fe4..49ab0f9d2f7 100644
--- a/dlls/shell32/folders.c
+++ b/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"
 
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index af8817b0cad..0457825ea4a 100644
--- a/dlls/shell32/shellfolder.h
+++ b/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
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index f87ac563d58..78daae8f7a1 100644
--- a/dlls/shell32/shellord.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index fb4788281b6..bc03b489eec 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index a1f224744ba..23bef6c1e0d 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/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"
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index 34a2e15d87d..e90a9da88d1 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/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"
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 27b9401986e..e8cde9a90b0 100644
--- a/dlls/shell32/shlfolder.c
+++ b/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"
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 5e92e95d280..6ddd6e73888 100644
--- a/dlls/shell32/shlmenu.c
+++ b/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"
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index fa1f19bd149..6f847f15239 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/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"
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index f009c23e309..3e5db327f17 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/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"
diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c
index 27084719f22..2a7a6e9b9f7 100644
--- a/dlls/shlwapi/clist.c
+++ b/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);
diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c
index 3d979c42b50..3729212cdb9 100644
--- a/dlls/shlwapi/istream.c
+++ b/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"
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index e2217cdbf97..d61915ede8e 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/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"
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 95113fb7184..4c36bb75b49 100644
--- a/dlls/shlwapi/regstream.c
+++ b/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"
 
diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c
index 466e3c5b51e..f1fcd9ae94f 100644
--- a/dlls/shlwapi/thread.c
+++ b/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
diff --git a/include/dplay.h b/include/dplay.h
index 882aefcde1e..9f7ad0c9644 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -20,7 +20,6 @@
 #define __WINE_DPLAY_H
 
 #include "ole2.h"
-#include "wine/obj_base.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/oaidl.h b/include/oaidl.h
index 363f356f1ed..b493b586c2b 100644
--- a/include/oaidl.h
+++ b/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 */
diff --git a/include/objbase.h b/include/objbase.h
index 4aa2c455c33..26435ce1c7f 100644
--- a/include/objbase.h
+++ b/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 */
diff --git a/include/objidl.h b/include/objidl.h
index 0ff74b68315..062bea0dbc6 100644
--- a/include/objidl.h
+++ b/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"
diff --git a/include/ocidl.h b/include/ocidl.h
index e6bb7e0271b..0c4b4a927b7 100644
--- a/include/ocidl.h
+++ b/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"
diff --git a/include/ole.h b/include/ole.h
index d9ef4cbb5f5..1277a9151cd 100644
--- a/include/ole.h
+++ b/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;
 
diff --git a/include/ole2.h b/include/ole2.h
index 6bed8ee17c2..4bde59d91dc 100644
--- a/include/ole2.h
+++ b/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;
diff --git a/include/oleauto.h b/include/oleauto.h
index 6b38fea09b3..2b131abd022 100644
--- a/include/oleauto.h
+++ b/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" {
diff --git a/include/olectl.h b/include/olectl.h
index 5cb11842b4b..6e03f7187ad 100644
--- a/include/olectl.h
+++ b/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" {
diff --git a/include/oledlg.h b/include/oledlg.h
index 97a089cb86f..0feb8e912a9 100644
--- a/include/oledlg.h
+++ b/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" {
diff --git a/include/oleidl.h b/include/oleidl.h
index 84684c2b669..d5e0e56c438 100644
--- a/include/oleidl.h
+++ b/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 */
 
diff --git a/include/servprov.h b/include/servprov.h
index 222f29d713c..a149ace258d 100644
--- a/include/servprov.h
+++ b/include/servprov.h
@@ -29,7 +29,7 @@
 #define __WINE_SERVPROV_H
 
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 
 /*****************************************************************************
diff --git a/include/shlguid.h b/include/shlguid.h
index f8e66770bee..005aa819d04 100644
--- a/include/shlguid.h
+++ b/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)
 
diff --git a/include/shlobj.h b/include/shlobj.h
index b63241af4b5..0107df52acb 100644
--- a/include/shlobj.h
+++ b/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"
diff --git a/include/unknwn.h b/include/unknwn.h
index de16a1ce3b7..684d80ff083 100644
--- a/include/unknwn.h
+++ b/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 */
diff --git a/include/urlmon.h b/include/urlmon.h
index 37274c07ca9..c19548f9321 100644
--- a/include/urlmon.h
+++ b/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" {
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index aeda0958961..94c818bb466 100644
--- a/include/wine/obj_base.h
+++ b/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++.
diff --git a/include/wine/obj_misc.h b/include/wine/obj_misc.h
index baea60efac1..ce6fbf24437 100644
--- a/include/wine/obj_misc.h
+++ b/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);
 
 
diff --git a/include/wine/obj_serviceprovider.h b/include/wine/obj_serviceprovider.h
index bd11c0df10d..b3556056885 100644
--- a/include/wine/obj_serviceprovider.h
+++ b/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