From 74af67ef42d3092f3398ed090d2b27dee2208563 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 26 Sep 2000 00:00:55 +0000
Subject: [PATCH] Removed shell.h. Cleaned up the nested includes mess in
 wine/obj_*.h.

---
 dlls/comctl32/imagelist.c             |  3 +-
 dlls/commdlg/cdlg.h                   |  2 +-
 dlls/ole32/antimoniker.c              |  3 +
 dlls/ole32/bindctx.c                  |  4 ++
 dlls/ole32/compositemoniker.c         |  4 ++
 dlls/ole32/datacache.c                |  5 ++
 dlls/ole32/errorinfo.c                |  2 +
 dlls/ole32/itemmoniker.c              | 10 +--
 dlls/ole32/moniker.c                  |  5 ++
 dlls/ole32/ole2impl.c                 |  3 +-
 dlls/ole32/ole2stubs.c                |  5 +-
 dlls/ole32/stg_bigblockfile.c         |  1 +
 dlls/ole32/stg_stream.c               |  3 +-
 dlls/ole32/storage32.h                |  1 +
 dlls/oleaut32/connpt.c                |  2 +
 dlls/oleaut32/olefont.c               |  2 +
 dlls/olepro32/olepro32stubs.c         |  1 +
 dlls/shell32/classes.c                |  2 +-
 dlls/shell32/enumidlist.c             |  4 +-
 dlls/shell32/memorystream.c           |  7 +-
 dlls/shell32/pidl.c                   |  4 +-
 dlls/shell32/shell32_main.h           |  9 ++-
 dlls/shell32/shellfolder.h            |  1 -
 dlls/shell32/shellguid.c              |  2 +
 dlls/shell32/shelllink.c              |  8 +--
 dlls/shell32/shellstring.c            |  7 +-
 dlls/shell32/shlfileop.c              |  2 +-
 dlls/shell32/shlfolder.c              |  4 +-
 dlls/shell32/shlmenu.c                |  1 +
 dlls/shell32/shlview.c                | 10 +--
 dlls/shell32/shv_bg_cmenu.c           |  3 +-
 dlls/shell32/systray.c                |  5 +-
 dlls/shlwapi/regstream.c              |  3 +-
 dlls/shlwapi/shlwapi_main.c           |  1 +
 dlls/shlwapi/string.c                 |  7 +-
 include/dlgs.h                        |  2 -
 include/main.h                        |  2 +
 include/ocidl.h                       |  4 ++
 include/ole2.h                        |  4 +-
 include/oleauto.h                     |  1 +
 include/oleidl.h                      |  1 +
 include/shell.h                       | 95 ---------------------------
 include/shlobj.h                      | 57 ++++++++++++----
 include/shlwapi.h                     | 12 ++--
 include/windows.h                     |  1 -
 include/wine/obj_cache.h              |  5 --
 include/wine/obj_channel.h            |  2 -
 include/wine/obj_clientserver.h       |  2 -
 include/wine/obj_commdlgbrowser.h     |  6 --
 include/wine/obj_connection.h         |  3 -
 include/wine/obj_contextmenu.h        |  5 --
 include/wine/obj_control.h            |  7 --
 include/wine/obj_dataobject.h         |  4 --
 include/wine/obj_dockingwindowframe.h |  6 --
 include/wine/obj_dragdrop.h           |  5 --
 include/wine/obj_enumidlist.h         |  4 --
 include/wine/obj_errorinfo.h          |  3 -
 include/wine/obj_extracticon.h        |  6 --
 include/wine/obj_inplace.h            |  2 -
 include/wine/obj_marshal.h            |  3 -
 include/wine/obj_misc.h               |  2 -
 include/wine/obj_moniker.h            |  4 --
 include/wine/obj_oleaut.h             |  2 -
 include/wine/obj_olefont.h            |  4 --
 include/wine/obj_oleobj.h             |  5 --
 include/wine/obj_oleundo.h            |  7 --
 include/wine/obj_oleview.h            |  4 --
 include/wine/obj_picture.h            |  5 --
 include/wine/obj_property.h           |  6 --
 include/wine/obj_propertystorage.h    |  3 -
 include/wine/obj_queryassociations.h  |  3 -
 include/wine/obj_shellbrowser.h       |  9 ---
 include/wine/obj_shellextinit.h       |  7 --
 include/wine/obj_shellfolder.h        |  7 --
 include/wine/obj_shelllink.h          |  4 --
 include/wine/obj_shellview.h          |  9 ---
 include/wine/obj_storage.h            |  4 --
 include/wine/undocshell.h             | 10 ++-
 loader/main.c                         |  1 -
 programs/notepad/dialog.c             |  1 -
 programs/regapi/regapi.c              |  1 -
 programs/winhelp/macro.c              |  3 -
 82 files changed, 152 insertions(+), 327 deletions(-)
 delete mode 100644 include/shell.h

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index d5c0d196f0e..58bd77471ac 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -22,12 +22,13 @@
  *      limited in functionality too.
  */
 
+#include "winerror.h"
+#include "winbase.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "commctrl.h"
 #include "imagelist.h"
 #include "debugtools.h"
-#include "winerror.h"
 
 DEFAULT_DEBUG_CHANNEL(imagelist);
 
diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h
index 79121f68e62..0fd5b393c3f 100644
--- a/dlls/commdlg/cdlg.h
+++ b/dlls/commdlg/cdlg.h
@@ -88,7 +88,7 @@ typedef struct {
 #define PD32_MILIMETERS                       1587
 
 #include "commctrl.h"
-#include "wine/undocshell.h"
+#include "shlobj.h"
 #include "shellapi.h"
 
 /* IMAGELIST */
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 4aa4e302203..0c8da5c9ab4 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -8,6 +8,9 @@
 #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 "debugtools.h"
 
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index 39a1e618ddd..11034c70ef7 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -7,7 +7,11 @@
 #include <string.h>
 #include <assert.h>
 #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 "debugtools.h"
 #include "heap.h"
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index a53c627dbce..60ab1c8cc82 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -7,6 +7,10 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debugtools.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 d2213b96315..3126edbf24a 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -35,6 +35,11 @@
 #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"
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index d336efe4b1e..92e96e1bf5d 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -14,6 +14,8 @@
 #include "winerror.h"
 #include "thread.h"
 #include "debugtools.h"
+#include "wine/obj_base.h"
+#include "wine/obj_oleaut.h"
 #include "wine/obj_errorinfo.h"
 #include "wine/unicode.h"
 
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index efa31e2443d..a2c9171294b 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -4,13 +4,15 @@
  *           Copyright 1999  Noomen Hamza
  ***************************************************************************************/
 
-#include "wine/obj_base.h"
-#include "wine/obj_moniker.h"
-#include "winbase.h"
-
 #include <assert.h>
 #include "winerror.h"
+#include "winbase.h"
 #include "debugtools.h"
+#include "wine/winestring.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"
 
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 2666eb635f9..f75373d17e9 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -7,6 +7,11 @@
 
 #include <assert.h>
 #include "winerror.h"
+#include "wtypes.h"
+#include "winbase.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
+#include "wine/obj_misc.h"
 #include "wine/obj_moniker.h"
 #include "debugtools.h"
 #include "heap.h"
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c
index 9e165ba27fb..0c7c324d466 100644
--- a/dlls/ole32/ole2impl.c
+++ b/dlls/ole32/ole2impl.c
@@ -4,10 +4,11 @@
  * Copyright (C) 1999-2000 Abey George
  */
 
-#include "ole2.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "debugtools.h"
+#include "ole2.h"
 #include "olestd.h"
 #include "winreg.h"
 
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index f04c76002a7..695a6fc18ad 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -5,13 +5,14 @@
  * Move these functions to dlls/ole32/ole2impl.c when you implement them.
  */
 
-#include "ole2.h"
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "ole2.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(ole);
 
 /******************************************************************************
  *               OleCreateLinkToFile        [OLE32.96]
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index e02b076e8e3..d67a3cf6266 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -26,6 +26,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
+#include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "ole2.h"
 
diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 5331e28ce31..f5b0d9aa4cd 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -16,11 +16,10 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debugtools.h"
-#include "wine/obj_storage.h"
 
 #include "storage32.h"
 
-DEFAULT_DEBUG_CHANNEL(storage)
+DEFAULT_DEBUG_CHANNEL(storage);
 
 
 /*
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 6fd1eb72561..b1dddad0eff 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -17,6 +17,7 @@
 
 #include "wtypes.h"
 #include "winnt.h"
+#include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 
 /*
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index dcbaa8adc0f..05b56f351f1 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -9,6 +9,8 @@
 
 #include <assert.h>
 #include "winerror.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "olectl.h"
 #include "wine/obj_base.h"
 #include "wine/obj_connection.h"
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index e5b8a6c9286..28e3ff4c172 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -9,6 +9,8 @@
 #include <assert.h>
 #include <string.h>
 #include "winerror.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "wine/unicode.h"
 #include "oleauto.h"    /* for SysAllocString(....) */
 #include "wine/obj_olefont.h"
diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c
index 7c2c3b3f8e6..532589cc415 100644
--- a/dlls/olepro32/olepro32stubs.c
+++ b/dlls/olepro32/olepro32stubs.c
@@ -7,6 +7,7 @@
  */
 
 #include "debugtools.h"
+#include "winbase.h"
 #include "ole2.h"
 #include "windef.h"
 
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 5fb04c821f2..85cfd591a4e 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -11,11 +11,11 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_queryassociations.h"
 #include "shlobj.h"
 #include "shell32_main.h"
 #include "shlguid.h"
 #include "shresdef.h"
+#include "wine/obj_queryassociations.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index a75d15be522..75789343266 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -8,10 +8,10 @@
 #include <string.h>
 #include "debugtools.h"
 #include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_enumidlist.h"
 #include "wine/undocshell.h"
 #include "winerror.h"
+#include "wine/obj_base.h"
+#include "wine/obj_enumidlist.h"
 
 #include "pidl.h"
 #include "shlguid.h"
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index ad210022cc9..7e85ccdedc2 100644
--- a/dlls/shell32/memorystream.c
+++ b/dlls/shell32/memorystream.c
@@ -11,13 +11,14 @@
 
 #include <string.h>
 
-#include "wine/obj_storage.h"
-#include "heap.h"
+#include "winbase.h"
 #include "winerror.h"
+#include "shlobj.h"
 #include "debugtools.h"
+#include "heap.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj);
 static ULONG WINAPI IStream_fnAddRef(IStream *iface);
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 9a201a10c65..4efba8c4d34 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -13,15 +13,15 @@
 #include <string.h>
 #include "winbase.h"
 #include "debugtools.h"
-#include "shell.h"
 #include "shlguid.h"
 #include "winerror.h"
 #include "winnls.h"
+#include "wine/winestring.h"
+#include "wine/undocshell.h"
 #include "shell32_main.h"
 #include "shellapi.h"
 
 #include "pidl.h"
-#include "wine/undocshell.h"
 
 DEFAULT_DEBUG_CHANNEL(pidl);
 DECLARE_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 1e6f779ed3c..4208e2d0ef6 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -6,7 +6,6 @@
 #define __WINE_SHELL_MAIN_H
 
 #include "commctrl.h"
-#include "shell.h"
 #include "docobj.h"
 
 #include "wine/obj_shellfolder.h"
@@ -63,10 +62,6 @@ extern HRESULT (WINAPI* pRevokeDragDrop)(HWND hwnd);
 */
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
 
-HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
-HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
-HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
-
 /* Iconcache */
 #define INVALID_INDEX -1
 BOOL SIC_Initialize(void);
@@ -165,6 +160,10 @@ void FreeChangeNotifications(void);
 /* file operation */
 BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI);
 
+HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
+
+extern HINSTANCE SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
+
 inline static BOOL SHELL_OsIsUnicode(void)
 {
     /* if high-bit of version is 0, we are emulating NT */
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index c2db02cfc0c..54f39931931 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -7,7 +7,6 @@
 #define __WINE_SHELLFOLDER_HELP_H
 
 #include "winbase.h"
-#include "shell.h"
 
 #include "wine/obj_base.h"
 #include "wine/obj_shellfolder.h"
diff --git a/dlls/shell32/shellguid.c b/dlls/shell32/shellguid.c
index 98212040e28..bad0aa02866 100644
--- a/dlls/shell32/shellguid.c
+++ b/dlls/shell32/shellguid.c
@@ -6,6 +6,8 @@
  *  this in in a single file due to interfering definitions
  *
  */
+#include "winbase.h"
+
 #include "initguid.h"
 
 #include "shlwapi.h"
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 895d4937892..25cef1c8469 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -8,14 +8,14 @@
 #include <string.h>
 #include "debugtools.h"
 #include "winerror.h"
+#include "winbase.h"
+#include "winnls.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_shelllink.h"
+#include "shlobj.h"
+#include "wine/winestring.h"
 #include "wine/undocshell.h"
 
 #include "heap.h"
-#include "winnls.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shlguid.h"
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index fac7cbea132..0fc4762a34d 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -8,6 +8,7 @@
 #include "debugtools.h"
 #include "heap.h"
 
+#include "shlobj.h"
 #include "shlwapi.h"
 #include "shellapi.h"
 #include "shell32_main.h"
@@ -26,17 +27,17 @@ DEFAULT_DEBUG_CHANNEL(shell);
  * NOTES
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
         return StrRetToBufA( src, pidl, dest, len );
 }
 
-HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
         return StrRetToBufW( src, pidl, dest, len );
 }
 
-HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
 	if(SHELL_OsIsUnicode())
 	  return StrRetToStrNW (dest, len, src, pidl);
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 14c2b3c27f1..c19b3ad4392 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -4,10 +4,10 @@
 #include <string.h>
 #include "debugtools.h"
 #include "shellapi.h"
-#include "shell32_main.h"
 
 #include "shlobj.h"
 #include "shresdef.h"
+#include "shell32_main.h"
 #include "wine/undocshell.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 6ff64d7f900..dad9895ffba 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -14,11 +14,13 @@
 
 #include "debugtools.h"
 #include "winerror.h"
+#include "winbase.h"
 
 #include "oleidl.h"
 #include "shlguid.h"
 
 #include "pidl.h"
+#include "wine/winestring.h"
 #include "wine/obj_base.h"
 #include "wine/obj_dragdrop.h"
 #include "wine/obj_shellfolder.h"
@@ -30,7 +32,7 @@
 #define INITGUID
 #include "initguid.h"
 #include "shellfolder.h"
-
+#include "wine/obj_queryassociations.h"
 
 DEFAULT_DEBUG_CHANNEL(shell)
 
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index fc191ff5471..09840a663ce 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -3,6 +3,7 @@
  */
 #include <string.h>
 
+#include "shlobj.h"
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"
 #include "wine/obj_shellfolder.h"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 318aa6ec9cd..d885f1b9d28 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -27,15 +27,7 @@
 
 #include "servprov.h"
 #include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_shellview.h"
-#include "wine/obj_oleview.h"
-#include "wine/obj_commdlgbrowser.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_dockingwindowframe.h"
-#include "wine/obj_extracticon.h"
-#include "wine/obj_dragdrop.h"
+#include "shlobj.h"
 #include "wine/undocshell.h"
 #include "shresdef.h"
 #include "debugtools.h"
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index 43e12ce93e9..e058a0434e8 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -16,10 +16,9 @@
 
 #include "shell32_main.h"
 #include "shellfolder.h"
-#include "shell.h" /* DROPFILESTRUCT */
 #include "wine/undocshell.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
 *  IContextMenu Implementation
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 1279a33ceea..e766b41da06 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -13,12 +13,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "heap.h"
+#include "wine/winestring.h"
+#include "shlobj.h"
 #include "shellapi.h"
 #include "shell32_main.h"
-#include "windows.h"
 #include "commctrl.h"
 #include "debugtools.h"
+#include "heap.h"
 #include "config.h"
 
 DEFAULT_DEBUG_CHANNEL(shell)
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 20a683d20df..2952ca688de 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -4,8 +4,9 @@
 #include <string.h>
 
 #include "winerror.h"
+#include "winbase.h"
 #include "winreg.h"
-#include "wine/obj_storage.h"
+#include "shlobj.h"
 
 #include "heap.h"
 #include "debugtools.h"
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index ea38f350be0..b94b9750551 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -10,6 +10,7 @@
 #include "debugtools.h"
 
 #include "initguid.h"
+#include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 1932617c82b..c9bd12a0a72 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -5,10 +5,13 @@
 
 #include "winerror.h"
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "shlwapi.h"
+#include "shlobj.h"
 #include "wine/unicode.h"
+#include "wine/winestring.h"
 #include "heap.h"
 #include "debugtools.h"
 
@@ -332,7 +335,7 @@ LPWSTR WINAPI StrCatBuffW(LPWSTR front, LPCWSTR back, INT size)
  * NOTES
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToBufA (LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len)
 {
 	TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
 
@@ -370,7 +373,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest, DWORD
  * NOTES
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToBufW (LPSTRRET src, LPITEMIDLIST pidl, LPWSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len)
 {
 	TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
 
diff --git a/include/dlgs.h b/include/dlgs.h
index 5e16c81b331..8296eb0b999 100644
--- a/include/dlgs.h
+++ b/include/dlgs.h
@@ -5,8 +5,6 @@
 #ifndef __WINE_DLGS_H
 #define __WINE_DLGS_H
 
-#include "wine/obj_shellview.h"
-
 #define ctlFirst    0x0400
 #define ctlLast     0x04ff
     /* Push buttons */
diff --git a/include/main.h b/include/main.h
index 99579278307..447207203aa 100644
--- a/include/main.h
+++ b/include/main.h
@@ -14,4 +14,6 @@ extern void MAIN_ParseDebugOptions(const char *options);
 extern BOOL RELAY_Init(void);
 extern int RELAY_ShowDebugmsgRelay(const char *func);
 
+extern void SHELL_LoadRegistry(void);
+
 #endif  /* __WINE_MAIN_H */
diff --git a/include/ocidl.h b/include/ocidl.h
index bce3185b068..a96328c2270 100644
--- a/include/ocidl.h
+++ b/include/ocidl.h
@@ -1,10 +1,14 @@
 #ifndef __WINE_OCIDL_H
 #define __WINE_OCIDL_H
 
+#include "windows.h"
+#include "ole2.h"
 
 #include "wine/obj_base.h"
 
 /* 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/ole2.h b/include/ole2.h
index 49a8a31f5ef..607f0255505 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -7,9 +7,11 @@
 
 #include "windef.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_base.h"
+#include "wine/obj_dataobject.h"
 #include "wine/obj_dragdrop.h"
 #include "wine/obj_inplace.h"
 #include "wine/obj_oleobj.h"
diff --git a/include/oleauto.h b/include/oleauto.h
index 44529e7ed95..8b8a4b9be9a 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -2,6 +2,7 @@
 #define __WINE_OLEAUTO_H
 
 #include "wtypes.h"
+#include "wine/obj_base.h"
 #include "wine/obj_oleaut.h"
 #include "wine/obj_errorinfo.h"
 
diff --git a/include/oleidl.h b/include/oleidl.h
index 6abc662558c..9be7af4a385 100644
--- a/include/oleidl.h
+++ b/include/oleidl.h
@@ -3,6 +3,7 @@
 
 
 #include "wine/obj_base.h"
+#include "wine/obj_misc.h"
 
 /* the following depend only on obj_base.h */
 #include "wine/obj_storage.h"
diff --git a/include/shell.h b/include/shell.h
deleted file mode 100644
index df5f509230c..00000000000
--- a/include/shell.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 				Shell Library definitions
- */
-#ifndef __WINE_SHELL_H
-#define __WINE_SHELL_H
-
-#include "windef.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-/****************************************************************************
-* shell 16
-*/
-extern void SHELL_LoadRegistry(void);
-
-/* global functions used from shell32 */
-extern HINSTANCE SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
-extern HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
-
-/****************************************************************************
-* shell 32
-*/
-/****************************************************************************
-* common return codes 
-*/
-#define SHELL_ERROR_SUCCESS           0L
-#define SHELL_ERROR_BADDB             1L
-#define SHELL_ERROR_BADKEY            2L
-#define SHELL_ERROR_CANTOPEN          3L
-#define SHELL_ERROR_CANTREAD          4L
-#define SHELL_ERROR_CANTWRITE         5L
-#define SHELL_ERROR_OUTOFMEMORY       6L
-#define SHELL_ERROR_INVALID_PARAMETER 7L
-#define SHELL_ERROR_ACCESS_DENIED     8L
-
-/****************************************************************************
-* common shell file structures 
-*/
-/******************************
-* DRAG&DROP API
-*/
-typedef struct { 	   /* structure for dropped files */ 
-	WORD		wSize;
-	POINT16		ptMousePos;   
-	BOOL16		fInNonClientArea;
-	/* memory block with filenames follows */     
-} DROPFILESTRUCT16, *LPDROPFILESTRUCT16; 
-
-typedef struct { 	   /* structure for dropped files */ 
-	DWORD		lSize;
-	POINT		ptMousePos;   
-	BOOL		fInNonClientArea;
-        BOOL          fWideChar;
-	/* memory block with filenames follows */     
-} DROPFILESTRUCT, *LPDROPFILESTRUCT; 
-
-
-/****************************************************************************
-* SHITEMID, ITEMIDLIST, PIDL API 
-*/
-#include "pshpack1.h"
-typedef struct 
-{ WORD	cb;	/* nr of bytes in this item */
-  BYTE	abID[1];/* first byte in this item */
-} SHITEMID,*LPSHITEMID;
-typedef LPSHITEMID const LPCSHITEMID;
-
-typedef struct 
-{ SHITEMID mkid; /* first itemid in list */
-} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
-#include "poppack.h"
-
-BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
-BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
-#define  SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
-
-/****************************************************************************
-* SHAddToRecentDocs API
-*/
-#define SHARD_PIDL      0x00000001L
-#define SHARD_PATH      0x00000002L
-
-DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
-
-/****************************************************************************
-*  other functions
-*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif  /* __WINE_SHELL_H */
diff --git a/include/shlobj.h b/include/shlobj.h
index bd0347a5699..6a93b935d2c 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1,20 +1,9 @@
 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_shelllink.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellextinit.h"
-#include "wine/obj_extracticon.h"
-#include "wine/obj_commdlgbrowser.h"
-#include "wine/obj_dockingwindowframe.h"
-
 #include "windef.h"
 #include "winbase.h"	/* WIN32_FIND_* */
 #include "ole2.h"
-#include "shell.h"
 #include "commctrl.h"
 #include "prsht.h"
 
@@ -22,6 +11,42 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+/****************************************************************************
+* SHITEMID, ITEMIDLIST, PIDL API 
+*/
+#include "pshpack1.h"
+typedef struct
+{
+    WORD cb;      /* nr of bytes in this item */
+    BYTE abID[1]; /* first byte in this item */
+} SHITEMID, *LPSHITEMID;
+typedef LPSHITEMID const LPCSHITEMID;
+
+typedef struct _ITEMIDLIST
+{
+    SHITEMID mkid; /* first itemid in list */
+} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
+#include "poppack.h"
+
+BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
+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 "wine/obj_shellbrowser.h"
+#include "wine/obj_contextmenu.h"
+#include "wine/obj_shellextinit.h"
+#include "wine/obj_extracticon.h"
+#include "wine/obj_commdlgbrowser.h"
+#include "wine/obj_dockingwindowframe.h"
+
 /*****************************************************************************
  * Predeclare interfaces
  */
@@ -95,6 +120,16 @@ ICOM_DEFINE(IShellIcon, IUnknown)
 /*** IShellIcon methods ***/
 #define IShellIcon_GetIconOf(p,a,b,c)         ICOM_CALL3(GetIconOf,p,a,b,c)
 
+/****************************************************************************
+* SHAddToRecentDocs API
+*/
+#define SHARD_PIDL      0x00000001L
+#define SHARD_PATHA     0x00000002L
+#define SHARD_PATHW     0x00000003L
+#define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH)
+
+DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
+
 /****************************************************************************
  * Shell Execute API
  */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 1f4f5df8cf2..6d41ebb8e0f 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1,9 +1,7 @@
 #ifndef __WINE_SHLWAPI_H
 #define __WINE_SHLWAPI_H
 
-#include "windef.h"
-#include "wine/obj_queryassociations.h"
-#include "wine/obj_shellfolder.h"
+#include "objbase.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -113,10 +111,10 @@ LPSTR WINAPI StrDupA(LPCSTR lpSrc);
 LPWSTR WINAPI StrDupW(LPCWSTR lpSrc);
 #define StrDup WINELIB_NAME_AW(StrDup)
 
-HRESULT WINAPI StrRetToBufA(LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest,
-			    DWORD len);
-HRESULT WINAPI StrRetToBufW(LPSTRRET src, LPITEMIDLIST pidl, LPWSTR dest,
-			    DWORD len);
+struct _STRRET;
+struct _ITEMIDLIST;
+HRESULT WINAPI StrRetToBufA(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPSTR dest, DWORD len);
+HRESULT WINAPI StrRetToBufW(struct _STRRET *src, const struct _ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
 #define StrRetToBuf WINELIB_NAME_AW(StrRetToBuf)
 
 void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
diff --git a/include/windows.h b/include/windows.h
index 5196ef26efe..d623ed10a22 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -9,7 +9,6 @@ extern "C" {
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "shell.h"
 #include "winreg.h"
 #include "winnetwk.h"
 #include "winver.h"
diff --git a/include/wine/obj_cache.h b/include/wine/obj_cache.h
index d47f8458e7f..8c5f6644952 100644
--- a/include/wine/obj_cache.h
+++ b/include/wine/obj_cache.h
@@ -7,11 +7,6 @@
 #ifndef __WINE_WINE_OBJ_CACHE_H
 #define __WINE_WINE_OBJ_CACHE_H
 
-
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_dataobject.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_channel.h b/include/wine/obj_channel.h
index 20d6a91d98f..843f53eeec5 100644
--- a/include/wine/obj_channel.h
+++ b/include/wine/obj_channel.h
@@ -5,8 +5,6 @@
 #ifndef __WINE_WINE_OBJ_CHANNEL_H
 #define __WINE_WINE_OBJ_CHANNEL_H
 
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_clientserver.h b/include/wine/obj_clientserver.h
index 5add3978f25..76c69585139 100644
--- a/include/wine/obj_clientserver.h
+++ b/include/wine/obj_clientserver.h
@@ -5,8 +5,6 @@
 #ifndef __WINE_WINE_OBJ_CLIENTSERVER_H
 #define __WINE_WINE_OBJ_CLIENTSERVER_H
 
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_commdlgbrowser.h b/include/wine/obj_commdlgbrowser.h
index e585de19645..ac3cec110b8 100644
--- a/include/wine/obj_commdlgbrowser.h
+++ b/include/wine/obj_commdlgbrowser.h
@@ -5,12 +5,6 @@
 #ifndef __WINE_WINE_OBJ_COMMDLGBROWSER_H
 #define __WINE_WINE_OBJ_COMMDLGBROWSER_H
 
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_shellview.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_connection.h b/include/wine/obj_connection.h
index 0f8efccae06..910aae6d967 100644
--- a/include/wine/obj_connection.h
+++ b/include/wine/obj_connection.h
@@ -7,9 +7,6 @@
 #ifndef __WINE_WINE_OBJ_CONNECTION_H
 #define __WINE_WINE_OBJ_CONNECTION_H
 
-#include "wine/obj_base.h"
-#include "winbase.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_contextmenu.h b/include/wine/obj_contextmenu.h
index 322067e3fd0..542ebb73203 100644
--- a/include/wine/obj_contextmenu.h
+++ b/include/wine/obj_contextmenu.h
@@ -9,11 +9,6 @@
 #ifndef __WINE_WINE_OBJ_CONTEXTMENU_H
 #define __WINE_WINE_OBJ_CONTEXTMENU_H
 
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_control.h b/include/wine/obj_control.h
index 62e0540fecf..d3c38cf5384 100644
--- a/include/wine/obj_control.h
+++ b/include/wine/obj_control.h
@@ -7,13 +7,6 @@
 #ifndef __WINE_WINE_OBJ_CONTROL_H
 #define __WINE_WINE_OBJ_CONTROL_H
 
-
-#include "winbase.h"
-#include "wine/obj_oleaut.h" /* for DISPID */
-#include "wine/obj_oleview.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_dragdrop.h"
-
 struct tagMSG;
 
 #ifdef __cplusplus
diff --git a/include/wine/obj_dataobject.h b/include/wine/obj_dataobject.h
index 67fc0b67453..bfddfbdd7e6 100644
--- a/include/wine/obj_dataobject.h
+++ b/include/wine/obj_dataobject.h
@@ -6,10 +6,6 @@
 #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
 #define __WINE_WINE_OBJ_DATAOBJECT_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_storage.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_dockingwindowframe.h b/include/wine/obj_dockingwindowframe.h
index c1576be59c5..da94b8d4057 100644
--- a/include/wine/obj_dockingwindowframe.h
+++ b/include/wine/obj_dockingwindowframe.h
@@ -5,12 +5,6 @@
 #ifndef __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
 #define __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
 
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_inplace.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_dragdrop.h b/include/wine/obj_dragdrop.h
index b92915e5799..3410be51239 100644
--- a/include/wine/obj_dragdrop.h
+++ b/include/wine/obj_dragdrop.h
@@ -5,11 +5,6 @@
 #ifndef __WINE_WINE_OBJ_DRAGDROP_H
 #define __WINE_WINE_OBJ_DRAGDROP_H
 
-#include "winnt.h"
-#include "windef.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dataobject.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_enumidlist.h b/include/wine/obj_enumidlist.h
index ac96bdb7f90..d27da2c3859 100644
--- a/include/wine/obj_enumidlist.h
+++ b/include/wine/obj_enumidlist.h
@@ -7,10 +7,6 @@
 #ifndef __WINE_WINE_OBJ_ENUMIDLIST_H
 #define __WINE_WINE_OBJ_ENUMIDLIST_H
 
-#include "wine/obj_base.h"
-#include "shell.h"
-#include "winbase.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_errorinfo.h b/include/wine/obj_errorinfo.h
index b615281df78..2e3e816cd7f 100644
--- a/include/wine/obj_errorinfo.h
+++ b/include/wine/obj_errorinfo.h
@@ -5,9 +5,6 @@
 #ifndef __WINE_WINE_OBJ_ERRORINFO_H
 #define __WINE_WINE_OBJ_ERRORINFO_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-
 DEFINE_GUID(IID_IErrorInfo,0x1CF2B120,0x547D,0x101B,0x8E,0x65,0x08,0x00,0x2B,0x2B,0xD1,0x19);
 typedef struct IErrorInfo IErrorInfo,*LPERRORINFO;
 
diff --git a/include/wine/obj_extracticon.h b/include/wine/obj_extracticon.h
index 0a2145fc1d7..f8e96a95f1b 100644
--- a/include/wine/obj_extracticon.h
+++ b/include/wine/obj_extracticon.h
@@ -5,12 +5,6 @@
 #ifndef __WINE_WINE_OBJ_EXTRACTICON_H
 #define __WINE_WINE_OBJ_EXTRACTICON_H
 
-#include "winbase.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_inplace.h b/include/wine/obj_inplace.h
index f6670264aa7..146e24df23b 100644
--- a/include/wine/obj_inplace.h
+++ b/include/wine/obj_inplace.h
@@ -7,9 +7,7 @@
 #ifndef __WINE_WINE_OBJ_INPLACE_H
 #define __WINE_WINE_OBJ_INPLACE_H
 
-
 struct tagMSG;
-#include "wine/obj_moniker.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/wine/obj_marshal.h b/include/wine/obj_marshal.h
index e77ce38dc17..e3656180d89 100644
--- a/include/wine/obj_marshal.h
+++ b/include/wine/obj_marshal.h
@@ -6,9 +6,6 @@
 #ifndef __WINE_WINE_OBJ_MARSHAL_H
 #define __WINE_WINE_OBJ_MARSHAL_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_misc.h b/include/wine/obj_misc.h
index 9dae7ba1a09..8e04e0ad943 100644
--- a/include/wine/obj_misc.h
+++ b/include/wine/obj_misc.h
@@ -8,8 +8,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) */
diff --git a/include/wine/obj_moniker.h b/include/wine/obj_moniker.h
index 114217e4951..83d5b1b3393 100644
--- a/include/wine/obj_moniker.h
+++ b/include/wine/obj_moniker.h
@@ -4,10 +4,6 @@
 #ifndef __WINE_WINE_OBJ_MONIKER_H
 #define __WINE_WINE_OBJ_MONIKER_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_misc.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index e38c67726bd..0d33dc88920 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -5,8 +5,6 @@
 #ifndef __WINE_WINE_OBJ_OLEAUT_H
 #define __WINE_WINE_OBJ_OLEAUT_H
 
-#include "wine/obj_base.h"
-
 /*****************************************************************************
  * Predeclare the interfaces
  */
diff --git a/include/wine/obj_olefont.h b/include/wine/obj_olefont.h
index e39759c747d..c0edcf448a9 100644
--- a/include/wine/obj_olefont.h
+++ b/include/wine/obj_olefont.h
@@ -7,10 +7,6 @@
 #ifndef __WINE_WINE_OBJ_OLEFONT_H
 #define __WINE_WINE_OBJ_OLEFONT_H
 
-#include "wine/obj_oleaut.h"
-#include "wine/obj_base.h"
-#include "wingdi.h"	/* TEXTMETRIC*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_oleobj.h b/include/wine/obj_oleobj.h
index dcda1ba0c00..6fb6a2fa4a8 100644
--- a/include/wine/obj_oleobj.h
+++ b/include/wine/obj_oleobj.h
@@ -7,11 +7,6 @@
 #ifndef __WINE_WINE_OBJ_OLEOBJ_H
 #define __WINE_WINE_OBJ_OLEOBJ_H
 
-
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_dataobject.h"
-
 struct tagMSG;
 struct tagLOGPALETTE;
 
diff --git a/include/wine/obj_oleundo.h b/include/wine/obj_oleundo.h
index 5f676c6180d..b52fbe2ef60 100644
--- a/include/wine/obj_oleundo.h
+++ b/include/wine/obj_oleundo.h
@@ -7,13 +7,6 @@
 #ifndef __WINE_WINE_OBJ_OLEUNDO_H
 #define __WINE_WINE_OBJ_OLEUNDO_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_olefont.h"
-#include "wine/obj_property.h"
-#include "winbase.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_oleview.h b/include/wine/obj_oleview.h
index d3a24fd137f..b7ff2fe2a06 100644
--- a/include/wine/obj_oleview.h
+++ b/include/wine/obj_oleview.h
@@ -6,10 +6,6 @@
 #ifndef __WINE_WINE_OBJ_OLEVIEW_H
 #define __WINE_WINE_OBJ_OLEVIEW_H
 
-
-#include "wine/obj_base.h"
-#include "wine/obj_dataobject.h"
-
 struct tagLOGPALETTE;
 
 #ifdef __cplusplus
diff --git a/include/wine/obj_picture.h b/include/wine/obj_picture.h
index c39d9496b31..2e2d55c4a3e 100644
--- a/include/wine/obj_picture.h
+++ b/include/wine/obj_picture.h
@@ -7,11 +7,6 @@
 #ifndef __WINE_WINE_OBJ_PICTURE_H
 #define __WINE_WINE_OBJ_PICTURE_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-#include "windows.h"
-#include "windef.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_property.h b/include/wine/obj_property.h
index 2aed4009ad4..8ab92ab98d2 100644
--- a/include/wine/obj_property.h
+++ b/include/wine/obj_property.h
@@ -7,12 +7,6 @@
 #ifndef __WINE_WINE_OBJ_PROPERTY_H
 #define __WINE_WINE_OBJ_PROPERTY_H
 
-#include "wine/obj_oleaut.h" /* for DISPID */
-#include "wine/obj_storage.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_propertystorage.h b/include/wine/obj_propertystorage.h
index 9b4c3fee01a..5236ff9ae3c 100644
--- a/include/wine/obj_propertystorage.h
+++ b/include/wine/obj_propertystorage.h
@@ -5,9 +5,6 @@
 #ifndef __WINE_WINE_OBJ_PROPERTYSTORAGE_H
 #define __WINE_WINE_OBJ_PROPERTYSTORAGE_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_queryassociations.h b/include/wine/obj_queryassociations.h
index 72302cf92c0..257d9f231e5 100644
--- a/include/wine/obj_queryassociations.h
+++ b/include/wine/obj_queryassociations.h
@@ -5,9 +5,6 @@
 #ifndef __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
 #define __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
 
-#include "winbase.h"
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_shellbrowser.h b/include/wine/obj_shellbrowser.h
index cf85b91c517..3387e1bcb66 100644
--- a/include/wine/obj_shellbrowser.h
+++ b/include/wine/obj_shellbrowser.h
@@ -5,15 +5,6 @@
 #ifndef __WINE_WINE_OBJ_SHELLBROWSER_H
 #define __WINE_WINE_OBJ_SHELLBROWSER_H
 
-#include "winbase.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_inplace.h"	/* IOleWindow */
-#include "wine/obj_shellview.h"	/* IShellView */
-#include "commctrl.h" 		/* TBBUTTON */
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_shellextinit.h b/include/wine/obj_shellextinit.h
index 3febd8361c4..3bac3a1cd3d 100644
--- a/include/wine/obj_shellextinit.h
+++ b/include/wine/obj_shellextinit.h
@@ -5,13 +5,6 @@
 #ifndef __WINE_WINE_OBJ_SHELLEXTINIT_H
 #define __WINE_WINE_OBJ_SHELLEXTINIT_H
 
-#include "shell.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dataobject.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_shellfolder.h b/include/wine/obj_shellfolder.h
index 325434c8c56..0a2540321ac 100644
--- a/include/wine/obj_shellfolder.h
+++ b/include/wine/obj_shellfolder.h
@@ -7,13 +7,6 @@
 #ifndef __WINE_WINE_OBJ_SHELLFOLDER_H
 #define __WINE_WINE_OBJ_SHELLFOLDER_H
 
-#include "wine/obj_base.h"
-#include "wine/obj_moniker.h"		/* for LPBC */
-#include "wine/obj_enumidlist.h"
-#include "wine/obj_oleaut.h"
-#include "winbase.h"
-#include "shell.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_shelllink.h b/include/wine/obj_shelllink.h
index 00c97162ac4..79bf29f3344 100644
--- a/include/wine/obj_shelllink.h
+++ b/include/wine/obj_shelllink.h
@@ -7,10 +7,6 @@
 #ifndef __WINE_WINE_OBJ_SHELLLINK_H
 #define __WINE_WINE_OBJ_SHELLLINK_H
 
-#include "wine/obj_base.h"
-#include "winbase.h"
-#include "shell.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_shellview.h b/include/wine/obj_shellview.h
index de90ba351f9..5786bcc7882 100644
--- a/include/wine/obj_shellview.h
+++ b/include/wine/obj_shellview.h
@@ -5,15 +5,6 @@
 #ifndef __WINE_WINE_OBJ_SHELLVIEW_H
 #define __WINE_WINE_OBJ_SHELLVIEW_H
 
-#include "winbase.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_shellfolder.h"
-#include "prsht.h"	/* LPFNADDPROPSHEETPAGE */
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/obj_storage.h b/include/wine/obj_storage.h
index 0ea49d9dde5..96b7e18e251 100644
--- a/include/wine/obj_storage.h
+++ b/include/wine/obj_storage.h
@@ -5,10 +5,6 @@
 #ifndef __WINE_WINE_OBJ_STORAGE_H
 #define __WINE_WINE_OBJ_STORAGE_H
 
-
-#include "winnt.h"
-#include "wine/obj_base.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/wine/undocshell.h b/include/wine/undocshell.h
index 5c07b4d9675..ca9a8f2fe56 100644
--- a/include/wine/undocshell.h
+++ b/include/wine/undocshell.h
@@ -3,9 +3,7 @@
 
 #include "windef.h"
 #include "commctrl.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_shellview.h"
-#include "wine/obj_dragdrop.h"
+#include "shlobj.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -98,19 +96,19 @@ HRESULT WINAPI StrRetToStrNA (
 	LPVOID dest,
 	DWORD len,
 	LPSTRRET src,
-	LPITEMIDLIST pidl);
+	const ITEMIDLIST *pidl);
 
 HRESULT WINAPI StrRetToStrNW (
 	LPVOID dest,
 	DWORD len,
 	LPSTRRET src,
-	LPITEMIDLIST pidl);
+	const ITEMIDLIST *pidl);
 
 HRESULT WINAPI StrRetToStrNAW (
 	LPVOID dest,
 	DWORD len,
 	LPSTRRET src,
-	LPITEMIDLIST pidl);
+	const ITEMIDLIST *pidl);
 
 
 /****************************************************************************
diff --git a/loader/main.c b/loader/main.c
index 4e60ebbcc00..ea396b986c3 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -14,7 +14,6 @@
 #include "drive.h"
 #include "file.h"
 #include "options.h"
-#include "shell.h"
 #include "debugtools.h"
 #include "server.h"
 #include "loadorder.h"
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index a7827b45a3d..9dd5a028005 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -12,7 +12,6 @@
 #include <winerror.h>
 
 #ifdef WINELIB
-#include "shell.h"
 #include "options.h"
 #endif
 
diff --git a/programs/regapi/regapi.c b/programs/regapi/regapi.c
index 237c5324801..9c8e91023b5 100644
--- a/programs/regapi/regapi.c
+++ b/programs/regapi/regapi.c
@@ -14,7 +14,6 @@
 #include <winerror.h>
 #include <winnt.h>
 #include <string.h>
-#include <shell.h>
 
 /******************************************************************************
  * Defines and consts
diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c
index 2f2d11df041..e3c293a64d8 100644
--- a/programs/winhelp/macro.c
+++ b/programs/winhelp/macro.c
@@ -7,9 +7,6 @@
 #include <stdio.h>
 #include "windows.h"
 #include "commdlg.h"
-#ifdef WINELIB
-#include "shell.h"
-#endif
 #include "winhelp.h"
 #include "macro.h"