Removed shell.h. Cleaned up the nested includes mess in wine/obj_*.h.
diff --git a/include/wine/undocshell.h b/include/wine/undocshell.h
index 5c07b4d..ca9a8f2 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 @@
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);
/****************************************************************************