I know, it would be nice to have an intelligent utility to
cleanup the headers, but by the looks of it, it has to be
rather smart. This is probably one of the more difficult
cleanups, and I did it all by hand, which gave me a chance
to cleanup/reorganize the includes a bit. All other (except
for winbase.h) are *a lot* simpler. People can do them by
hand quite easily.
ChangeLog
Remove non-standard header includes from commctrl.h
Index: include/commctrl.h
===================================================================
RCS file: /var/cvs/wine/include/commctrl.h,v
retrieving revision 1.114
diff -u -r1.114 commctrl.h
--- include/commctrl.h 2 Sep 2003 18:16:22 -0000 1.114
+++ include/commctrl.h 3 Sep 2003 19:28:38 -0000
@@ -21,11 +21,6 @@
#ifndef __WINE_COMMCTRL_H
#define __WINE_COMMCTRL_H
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
#include <prsht.h>
#ifdef __cplusplus
Index: programs/wineconsole/dialog.c
===================================================================
RCS file: /var/cvs/wine/programs/wineconsole/dialog.c,v
retrieving revision 1.15
diff -u -r1.15 dialog.c
--- programs/wineconsole/dialog.c 24 Feb 2003 20:41:08 -0000 1.15
+++ programs/wineconsole/dialog.c 4 Sep 2003 02:21:04 -0000
@@ -22,8 +22,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
#include "commctrl.h"
-#include "prsht.h"
#include "winecon_user.h"
#include "wine/debug.h"
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.81
diff -u -r1.81 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c 22 Aug 2003 23:51:15 -0000 1.81
+++ dlls/comctl32/comctl32undoc.c 4 Sep 2003 02:25:51 -0000
@@ -29,9 +29,6 @@
* - Add more functions.
* - Write some documentation.
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <string.h>
#include <stdlib.h> /* atoi */
#include <ctype.h>
@@ -39,16 +36,20 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "commctrl.h"
-#include "objbase.h"
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "winerror.h"
#include "winreg.h"
+#include "commctrl.h"
+#include "objbase.h"
+#include "config.h"
+#include "wine/port.h"
#include "wine/unicode.h"
-#include "comctl32.h"
-
#include "wine/debug.h"
+
+#include "comctl32.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.68
diff -u -r1.68 commctrl.c
--- dlls/comctl32/commctrl.c 22 Aug 2003 23:51:15 -0000 1.68
+++ dlls/comctl32/commctrl.c 4 Sep 2003 02:27:15 -0000
@@ -57,13 +57,17 @@
#include <string.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
-#include "commctrl.h"
+#include "winuser.h"
#include "winerror.h"
#include "winreg.h"
+#include "winnls.h"
+#include "commctrl.h"
#define NO_SHLWAPI_STREAM
#include "shlwapi.h"
#include "comctl32.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Index: dlls/comctl32/datetime.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/datetime.c,v
retrieving revision 1.37
diff -u -r1.37 datetime.c
--- dlls/comctl32/datetime.c 13 May 2003 22:04:40 -0000 1.37
+++ dlls/comctl32/datetime.c 4 Sep 2003 02:28:02 -0000
@@ -29,9 +29,13 @@
#include <string.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
#include "wingdi.h"
#include "commctrl.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(datetime);
Index: dlls/comctl32/draglist.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/draglist.c,v
retrieving revision 1.15
diff -u -r1.15 draglist.c
--- dlls/comctl32/draglist.c 23 Oct 2002 22:19:11 -0000 1.15
+++ dlls/comctl32/draglist.c 4 Sep 2003 02:29:13 -0000
@@ -26,7 +26,11 @@
* - Everything.
*/
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
#include "commctrl.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
Index: dlls/comctl32/treeview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/treeview.c,v
retrieving revision 1.124
diff -u -r1.124 treeview.c
--- dlls/comctl32/treeview.c 23 Aug 2003 23:18:48 -0000 1.124
+++ dlls/comctl32/treeview.c 4 Sep 2003 02:32:26 -0000
@@ -38,9 +38,6 @@
* Scroll (instead of repaint) as much as possible.
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <assert.h>
#include <ctype.h>
#include <string.h>
@@ -49,10 +46,16 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
#include "wingdi.h"
#include "commctrl.h"
#include "comctl32.h"
+
+#include "config.h"
+#include "wine/port.h"
#include "wine/debug.h"
/* internal structures */
Index: dlls/ole32/ole2.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2.c,v
retrieving revision 1.45
diff -u -r1.45 ole2.c
--- dlls/ole32/ole2.c 9 Jul 2003 19:49:12 -0000 1.45
+++ dlls/ole32/ole2.c 3 Sep 2003 19:53:26 -0000
@@ -30,15 +30,15 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "commctrl.h"
-#include "ole2.h"
-#include "ole2ver.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winuser.h"
#include "winreg.h"
#include "wownt32.h"
+#include "commctrl.h"
+#include "ole2.h"
+#include "ole2ver.h"
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
Index: dlls/ole32/ole2_16.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2_16.c,v
retrieving revision 1.1
diff -u -r1.1 ole2_16.c
--- dlls/ole32/ole2_16.c 9 Jul 2003 19:49:12 -0000 1.1
+++ dlls/ole32/ole2_16.c 3 Sep 2003 19:52:23 -0000
@@ -30,15 +30,15 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "commctrl.h"
-#include "ole2.h"
-#include "ole2ver.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winuser.h"
#include "winreg.h"
#include "wownt32.h"
+#include "commctrl.h"
+#include "ole2.h"
+#include "ole2ver.h"
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
Index: dlls/oleaut32/variant.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/variant.c,v
retrieving revision 1.68
diff -u -r1.68 variant.c
--- dlls/oleaut32/variant.c 18 Jul 2003 22:52:58 -0000 1.68
+++ dlls/oleaut32/variant.c 4 Sep 2003 02:08:17 -0000
@@ -41,7 +41,6 @@
#include <stdio.h>
#include <math.h>
#include <time.h>
-
#ifdef HAVE_FLOAT_H
# include <float.h>
#endif
@@ -49,13 +48,15 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
#include "oleauto.h"
#include "heap.h"
-#include "wine/debug.h"
-#include "winerror.h"
#include "parsedt.h"
#include "typelib.h"
#include "winternl.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/setupapi/setupcab.c
===================================================================
RCS file: /var/cvs/wine/dlls/setupapi/setupcab.c,v
retrieving revision 1.1
diff -u -r1.1 setupcab.c
--- dlls/setupapi/setupcab.c 27 Aug 2003 23:12:36 -0000 1.1
+++ dlls/setupapi/setupcab.c 4 Sep 2003 02:47:52 -0000
@@ -23,17 +23,22 @@
*
*/
-#include "string.h"
-#include "stdlib.h"
+#include <string.h>
+#include <stdlib.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
#include "setupapi.h"
-#include "setupapi_private.h"
#include "fdi.h"
-#include "wine/unicode.h"
#include "msvcrt/fcntl.h"
#include "msvcrt/share.h"
+#include "wine/unicode.h"
#include "wine/debug.h"
+
+#include "setupapi_private.h"
static HINSTANCE CABINET_hInstance = 0;
Index: dlls/setupapi/stubs.c
===================================================================
RCS file: /var/cvs/wine/dlls/setupapi/stubs.c,v
retrieving revision 1.12
diff -u -r1.12 stubs.c
--- dlls/setupapi/stubs.c 27 Aug 2003 23:12:36 -0000 1.12
+++ dlls/setupapi/stubs.c 4 Sep 2003 02:48:32 -0000
@@ -18,9 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "wine/debug.h"
#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
#include "setupapi.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
Index: dlls/shell32/brsfolder.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/brsfolder.c,v
retrieving revision 1.47
diff -u -r1.47 brsfolder.c
--- dlls/shell32/brsfolder.c 2 Sep 2003 01:01:06 -0000 1.47
+++ dlls/shell32/brsfolder.c 3 Sep 2003 19:56:56 -0000
@@ -25,13 +25,18 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
#include "undocshell.h"
#include "shlguid.h"
#include "pidl.h"
#include "shell32_main.h"
#include "shellapi.h"
#include "shresdef.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/changenotify.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/changenotify.c,v
retrieving revision 1.25
diff -u -r1.25 changenotify.c
--- dlls/shell32/changenotify.c 2 Sep 2003 01:01:06 -0000 1.25
+++ dlls/shell32/changenotify.c 3 Sep 2003 19:57:58 -0000
@@ -20,10 +20,14 @@
#include <string.h>
-#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "pidl.h"
#include "shell32_main.h"
#include "undocshell.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/classes.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/classes.c,v
retrieving revision 1.30
diff -u -r1.30 classes.c
--- dlls/shell32/classes.c 19 Jul 2003 03:07:41 -0000 1.30
+++ dlls/shell32/classes.c 3 Sep 2003 19:59:27 -0000
@@ -19,21 +19,24 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "wine/debug.h"
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
#include "winreg.h"
-
#include "shlobj.h"
#include "shell32_main.h"
#include "shlguid.h"
#include "shresdef.h"
#include "shlwapi.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/clipboard.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/clipboard.c,v
retrieving revision 1.15
diff -u -r1.15 clipboard.c
--- dlls/shell32/clipboard.c 26 Jul 2003 20:32:43 -0000 1.15
+++ dlls/shell32/clipboard.c 3 Sep 2003 19:59:55 -0000
@@ -37,6 +37,9 @@
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winreg.h"
#include "pidl.h"
#include "undocshell.h"
Index: dlls/shell32/dataobject.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/dataobject.c,v
retrieving revision 1.39
diff -u -r1.39 dataobject.c
--- dlls/shell32/dataobject.c 2 Sep 2003 01:01:06 -0000 1.39
+++ dlls/shell32/dataobject.c 3 Sep 2003 20:00:25 -0000
@@ -23,11 +23,15 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "pidl.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
+#include "pidl.h"
#include "shell32_main.h"
-#include "wine/debug.h"
#include "undocshell.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/debughlp.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/debughlp.c,v
retrieving revision 1.8
diff -u -r1.8 debughlp.c
--- dlls/shell32/debughlp.c 2 Sep 2003 01:01:06 -0000 1.8
+++ dlls/shell32/debughlp.c 3 Sep 2003 20:01:07 -0000
@@ -22,13 +22,17 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "pidl.h"
#include "shlguid.h"
-#include "wine/debug.h"
#include "debughlp.h"
#include "docobj.h"
#include "shell32_main.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(pidl);
Index: dlls/shell32/dialogs.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/dialogs.c,v
retrieving revision 1.15
diff -u -r1.15 dialogs.c
--- dlls/shell32/dialogs.c 14 Jan 2003 23:43:42 -0000 1.15
+++ dlls/shell32/dialogs.c 3 Sep 2003 20:03:16 -0000
@@ -18,20 +18,23 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <string.h>
#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
#include "winreg.h"
#include "commdlg.h"
-#include "wine/debug.h"
-
#include "shellapi.h"
#include "shlobj.h"
#include "shell32_main.h"
#include "undocshell.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
typedef struct
{
Index: dlls/shell32/enumidlist.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/enumidlist.c,v
retrieving revision 1.30
diff -u -r1.30 enumidlist.c
--- dlls/shell32/enumidlist.c 22 Jul 2003 03:16:00 -0000 1.30
+++ dlls/shell32/enumidlist.c 3 Sep 2003 20:03:55 -0000
@@ -20,16 +20,20 @@
#include <stdlib.h>
#include <string.h>
-#include "wine/debug.h"
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winreg.h"
#include "undocshell.h"
#include "shlwapi.h"
#include "winerror.h"
#include "objbase.h"
-
#include "pidl.h"
#include "shlguid.h"
#include "shell32_main.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/folders.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/folders.c,v
retrieving revision 1.38
diff -u -r1.38 folders.c
--- dlls/shell32/folders.c 10 Apr 2003 18:17:34 -0000 1.38
+++ dlls/shell32/folders.c 3 Sep 2003 20:04:48 -0000
@@ -22,12 +22,14 @@
#include <string.h>
#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
#include "objbase.h"
#include "undocshell.h"
#include "shlguid.h"
#include "wine/debug.h"
-#include "winerror.h"
#include "pidl.h"
#include "shell32_main.h"
Index: dlls/shell32/memorystream.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/memorystream.c,v
retrieving revision 1.10
diff -u -r1.10 memorystream.c
--- dlls/shell32/memorystream.c 21 May 2003 18:50:53 -0000 1.10
+++ dlls/shell32/memorystream.c 3 Sep 2003 20:05:27 -0000
@@ -28,11 +28,14 @@
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
#include "shlobj.h"
-#include "wine/debug.h"
#include "shell32_main.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.119
diff -u -r1.119 shell32_main.c
--- dlls/shell32/shell32_main.c 2 Sep 2003 01:01:06 -0000 1.119
+++ dlls/shell32/shell32_main.c 3 Sep 2003 20:02:19 -0000
@@ -19,13 +19,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
#include "winreg.h"
#include "dlgs.h"
@@ -34,6 +34,7 @@
#include "shlguid.h"
#include "shlwapi.h"
+#include "config.h"
#include "undocshell.h"
#include "wine/winuser16.h"
#include "authors.h"
Index: dlls/shell32/shfldr_desktop.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_desktop.c,v
retrieving revision 1.9
diff -u -r1.9 shfldr_desktop.c
--- dlls/shell32/shfldr_desktop.c 10 Apr 2003 18:17:34 -0000 1.9
+++ dlls/shell32/shfldr_desktop.c 3 Sep 2003 20:06:47 -0000
@@ -20,17 +20,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
#include "winreg.h"
#include "ole2.h"
@@ -42,9 +41,12 @@
#include "shresdef.h"
#include "shlwapi.h"
#include "shellfolder.h"
-#include "wine/debug.h"
#include "debughlp.h"
#include "shfldr.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL (shell);
Index: dlls/shell32/shfldr_fs.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_fs.c,v
retrieving revision 1.11
diff -u -r1.11 shfldr_fs.c
--- dlls/shell32/shfldr_fs.c 10 Apr 2003 18:17:34 -0000 1.11
+++ dlls/shell32/shfldr_fs.c 3 Sep 2003 20:07:45 -0000
@@ -20,17 +20,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
#include "winreg.h"
#include "ole2.h"
@@ -42,9 +41,12 @@
#include "shresdef.h"
#include "shlwapi.h"
#include "shellfolder.h"
-#include "wine/debug.h"
#include "debughlp.h"
#include "shfldr.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL (shell);
Index: dlls/shell32/shfldr_mycomp.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_mycomp.c,v
retrieving revision 1.7
diff -u -r1.7 shfldr_mycomp.c
--- dlls/shell32/shfldr_mycomp.c 10 Apr 2003 18:17:34 -0000 1.7
+++ dlls/shell32/shfldr_mycomp.c 3 Sep 2003 20:08:36 -0000
@@ -20,17 +20,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
#include "winreg.h"
#include "pidl.h"
@@ -41,9 +40,12 @@
#include "shresdef.h"
#include "shlwapi.h"
#include "shellfolder.h"
-#include "wine/debug.h"
#include "debughlp.h"
#include "shfldr.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL (shell);
Index: dlls/shell32/shlfileop.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.32
diff -u -r1.32 shlfileop.c
--- dlls/shell32/shlfileop.c 2 Sep 2003 18:12:44 -0000 1.32
+++ dlls/shell32/shlfileop.c 3 Sep 2003 20:09:44 -0000
@@ -21,12 +21,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <string.h>
#include <ctype.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winreg.h"
#include "shellapi.h"
#include "shlobj.h"
@@ -35,6 +35,9 @@
#include "shlwapi.h"
#include "shell32_main.h"
#include "undocshell.h"
+
+#include "config.h"
+#include "wine/port.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Index: dlls/shell32/shlfolder.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shlfolder.c,v
retrieving revision 1.81
diff -u -r1.81 shlfolder.c
--- dlls/shell32/shlfolder.c 2 Sep 2003 01:01:06 -0000 1.81
+++ dlls/shell32/shlfolder.c 3 Sep 2003 20:10:18 -0000
@@ -22,15 +22,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
#include "winreg.h"
#include "ole2.h"
@@ -42,9 +41,12 @@
#include "shresdef.h"
#include "shlwapi.h"
#include "shellfolder.h"
-#include "wine/debug.h"
#include "debughlp.h"
#include "shfldr.h"
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL (shell);
Index: dlls/shell32/shpolicy.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shpolicy.c,v
retrieving revision 1.15
diff -u -r1.15 shpolicy.c
--- dlls/shell32/shpolicy.c 27 Mar 2003 00:00:15 -0000 1.15
+++ dlls/shell32/shpolicy.c 3 Sep 2003 20:10:52 -0000
@@ -33,6 +33,8 @@
#include <string.h>
#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
#include "winreg.h"
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.26
diff -u -r1.26 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c 2 Sep 2003 01:01:06 -0000 1.26
+++ dlls/shell32/shv_bg_cmenu.c 3 Sep 2003 20:11:23 -0000
@@ -22,8 +22,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "wine/debug.h"
-
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "pidl.h"
#include "shlguid.h"
#include "shlobj.h"
@@ -31,6 +32,8 @@
#include "shell32_main.h"
#include "shellfolder.h"
#include "undocshell.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.18
diff -u -r1.18 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c 2 Sep 2003 01:01:06 -0000 1.18
+++ dlls/shell32/shv_item_cmenu.c 3 Sep 2003 20:12:00 -0000
@@ -22,8 +22,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
#include "winerror.h"
-#include "wine/debug.h"
#include "pidl.h"
#include "shlguid.h"
@@ -32,6 +34,8 @@
#include "shell32_main.h"
#include "shellfolder.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
--
Dimi.
