Moved undocshell.h to dlls/shell32. Removed shell16.h.
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 08ce420..7379ae1 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -2,7 +2,7 @@
#include <string.h>
#include "debugtools.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlguid.h"
#include "pidl.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 91d0099..3ceb929 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -10,7 +10,7 @@
#include "debugtools.h"
#include "pidl.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c
index b81b3b5..cf6ebb6 100644
--- a/dlls/shell32/clipboard.c
+++ b/dlls/shell32/clipboard.c
@@ -25,7 +25,7 @@
#include "pidl.h"
#include "shlwapi.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shell32_main.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index ec7c29a..cf18242 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -11,7 +11,7 @@
#include "winerror.h"
#include "shell32_main.h"
#include "debugtools.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/obj_dataobject.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 7b1ea61..1baf6d6 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -9,7 +9,7 @@
#include "shellapi.h"
#include "shlobj.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 7edab9c..4a16d89 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -8,7 +8,7 @@
#include <string.h>
#include "debugtools.h"
#include "winreg.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlwapi.h"
#include "winerror.h"
#include "wine/obj_base.h"
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 1ad6f82..94280fd 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -11,7 +11,7 @@
#include "windef.h"
#include "wine/obj_base.h"
#include "wine/obj_extracticon.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlguid.h"
#include "debugtools.h"
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 192958e..96f87eb 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -18,7 +18,7 @@
#include "shlguid.h"
#include "pidl.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlwapi.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 806395c..5df26c1 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -16,7 +16,7 @@
#include "shlguid.h"
#include "winerror.h"
#include "winnls.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shell32_main.h"
#include "shellapi.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 2066907..de32b1f 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -19,7 +19,6 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/shell16.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index dd6e84a..ecb4c55 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -20,8 +20,7 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/shell16.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/winuser16.h"
#include "authors.h"
#include "heap.h"
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index e34dda1..10991c3 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -66,7 +66,8 @@
BOOL HCR_GetClassName (REFIID riid, LPSTR szDest, DWORD len);
BOOL HCR_GetFolderAttributes (REFIID riid, LPDWORD szDest);
-DWORD WINAPI ParseFieldA(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
+BOOL WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
+DWORD WINAPI ParseFieldA(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
/****************************************************************************
* Class constructors
@@ -171,6 +172,7 @@
HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR);
HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD);
BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16);
+BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
inline static BOOL SHELL_OsIsUnicode(void)
{
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 9c7a096..ba0c96b 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -21,7 +21,7 @@
#include "winreg.h"
#include "shlobj.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "bitmaps/wine.xpm"
#include "heap.h"
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 132ce38..70f10c2 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -17,7 +17,7 @@
#include "winreg.h"
#include "winerror.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/unicode.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index a14e46d..1f116d9 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -17,7 +17,7 @@
#include "shlguid.h"
#include "shlobj.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 7ab5f1d..8d4006b 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -13,7 +13,7 @@
#include "shlobj.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/unicode.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 2252cfc..832473b 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -13,7 +13,7 @@
#include "winreg.h"
#include "winnls.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/winbase16.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index eb8edba..d51c350 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -11,7 +11,7 @@
#include "shlwapi.h"
#include "shellapi.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/unicode.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index e02f5b4..0453cd9 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -9,7 +9,7 @@
#include "shlobj.h"
#include "shresdef.h"
#include "shell32_main.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlwapi.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 7f08e5c..af01e50 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -23,7 +23,7 @@
#include "wine/obj_base.h"
#include "wine/obj_dragdrop.h"
#include "wine/obj_shellfolder.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shell32_main.h"
#include "shresdef.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 6c229d5..d73a78f 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -7,7 +7,7 @@
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
#include "wine/obj_shellfolder.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shlwapi.h"
#include "heap.h"
#include "debugtools.h"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 3d3828b..d6945c2 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -31,7 +31,7 @@
#include "servprov.h"
#include "shlguid.h"
#include "shlobj.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shresdef.h"
#include "debugtools.h"
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index dde9079..1cecb20 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -20,7 +20,7 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "wine/winuser16.h"
#include "debugtools.h"
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index de20c86..aaf03ec 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -16,7 +16,7 @@
#include "shell32_main.h"
#include "shellfolder.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index 6a3a0db..5a89774 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -14,7 +14,7 @@
#include "wine/obj_contextmenu.h"
#include "wine/obj_shellbrowser.h"
#include "wine/obj_shellextinit.h"
-#include "wine/undocshell.h"
+#include "undocshell.h"
#include "shell32_main.h"
#include "shellfolder.h"
diff --git a/include/wine/undocshell.h b/dlls/shell32/undocshell.h
similarity index 100%
rename from include/wine/undocshell.h
rename to dlls/shell32/undocshell.h
diff --git a/include/wine/shell16.h b/include/wine/shell16.h
deleted file mode 100644
index 340612c..0000000
--- a/include/wine/shell16.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __WINE_WINE_SHELL16_H
-#define __WINE_WINE_SHELL16_H
-
-#include "wine/windef16.h"
-
-BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
-BOOL WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
-
-
-#endif /* __WINE_WINE_SHELL16_H */
