Optimized include/*.h: (recursively) include all headers needed by
this .h file, but only those. Necessary fixes to a lot of .c files,
started optimizing "windows.h" away from some of them. Moved
GetCurrentTask prototype to wine/winbase16.h.
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 36035f9..f73c848 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -4,12 +4,15 @@
* Copyright 1995 Sven Verdoolaege
*/
-#include "windows.h"
+#include <unistd.h>
+
+#include "wintypes.h"
#include "winerror.h"
-#include "debug.h"
+#include "wine/winestring.h"
#include "heap.h"
-#include <unistd.h>
+#include "debug.h"
+
/******************************************************************************
* GetUserName32A [ADVAPI32.67]
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 97f3b13..0112ed4 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -1,10 +1,10 @@
/*
* dlls/advapi32/crypt.c
*/
-#include "windows.h"
+#include "wintypes.h"
#include "winerror.h"
-#include "debug.h"
#include "wincrypt.h"
+#include "debug.h"
/******************************************************************************
* CryptAcquireContextA
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 1610178..37cb8d4 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -4,11 +4,13 @@
* Copyright 1995 Sven Verdoolaege, 1998 Juergen Schmied
*/
-#include "windows.h"
+#include "wintypes.h"
+#include "winreg.h"
#include "winerror.h"
-#include "debug.h"
#include "heap.h"
+#include "debug.h"
+
/******************************************************************************
* BackupEventLog32A [ADVAPI32.15]
*/
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 3983aba..6d46d39 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -1,11 +1,12 @@
/*
* dlls/advapi32/security.c
*/
-#include "windows.h"
+#include "wintypes.h"
+#include "winreg.h"
#include "winerror.h"
-#include "debug.h"
#include "heap.h"
#include "ntdll.h"
+#include "debug.h"
/* FIXME: move it to a header */
BOOL32 WINAPI IsValidSid (PSID pSid);
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 11b76e4..c8ce36f 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -4,11 +4,12 @@
* Copyright 1995 Sven Verdoolaege
*/
-#include "windows.h"
-#include "winerror.h"
-#include "debug.h"
-#include "heap.h"
#include <time.h>
+#include "wintypes.h"
+#include "winreg.h"
+#include "winerror.h"
+#include "heap.h"
+#include "debug.h"
/* FIXME: Where do these belong? */
typedef DWORD SERVICE_STATUS_HANDLE;
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index fc50159..bf44427 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -13,15 +13,12 @@
* - All notifications.
*/
-#include "windows.h"
-#include "winnt.h"
-#include "winbase.h"
+
+#include "win.h"
#include "commctrl.h"
#include "animate.h"
-#include "win.h"
#include "debug.h"
-
#define ANIMATE_GetInfoPtr(wndPtr) ((ANIMATE_INFO *)wndPtr->wExtra[0])
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index b04951a..a77f679 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -16,7 +16,6 @@
* - should include "combo.h"
*/
-#include "windows.h"
#include "commctrl.h"
#include "comboex.h"
#include "win.h"
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 41cb935..c83956d 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -15,9 +15,9 @@
*/
#include <string.h>
-#include <stdlib.h>
+#include <stdlib.h> /* atoi */
#include <ctype.h>
-#include "windows.h"
+
#include "commctrl.h"
#include "heap.h"
#include "debug.h"
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 79963a8..6bec902 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -14,7 +14,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "datetime.h"
#include "win.h"
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index e70282f..560fa80 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -12,7 +12,6 @@
* - Everything.
*/
-#include "windows.h"
#include "commctrl.h"
#include "debug.h"
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index 1813ff0..982a1c4 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -15,7 +15,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "flatsb.h"
#include "win.h"
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index b0520e5..253cc41 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -19,10 +19,9 @@
* - Little flaw when drawing a bitmap on the right side of the text.
*/
-#include "windows.h"
#include "commctrl.h"
-#include "header.h"
#include "win.h"
+#include "header.h"
#include "debug.h"
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index be2c329..e9a3438 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -13,7 +13,6 @@
* - Display code.
*/
-#include "windows.h"
#include "commctrl.h"
#include "hotkey.h"
#include "win.h"
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 0650a65..540ae42 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -30,7 +30,6 @@
#define __WINE_IMAGELIST_C
-#include "windows.h"
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
#include "imagelist.h"
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 0e83d02..59bf86a 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -22,7 +22,6 @@
#include <ctype.h>
#include <stdlib.h>
-#include "windows.h"
#include "win.h"
#include "commctrl.h"
#include "ipaddress.h"
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index eb29519..3ccc946 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -14,7 +14,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "monthcal.h"
#include "win.h"
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index c4ae462..3877b44 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -13,7 +13,6 @@
* - All notifications.
*/
-#include "windows.h"
#include "commctrl.h"
#include "nativefont.h"
#include "win.h"
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index 979eca1..cae056c 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -13,7 +13,6 @@
* - All notifications.
*/
-#include "windows.h"
#include "commctrl.h"
#include "pager.h"
#include "win.h"
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index 3a99d3f..7b17a70 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -5,7 +5,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "progress.h"
#include "win.h"
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 548f162..ffe30f4 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -8,7 +8,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "prsht.h"
#include "propsheet.h"
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 006f92c..32b3c1b 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -18,7 +18,6 @@
* - All notifications.
*/
-#include "windows.h"
#include "commctrl.h"
#include "rebar.h"
#include "win.h"
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index e32c30a..30acd1c 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -5,7 +5,6 @@
* Copyright 1998 Eric Kohl
*/
-#include "windows.h"
#include "commctrl.h"
#include "status.h"
#include "win.h"
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 18f2a60..06ad368 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -13,7 +13,6 @@
*
*/
-#include "windows.h"
#include "commctrl.h"
#include "tab.h"
#include "win.h"
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 816e3b0..37f0d64 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -25,7 +25,6 @@
* - Microsofts controlspy examples.
*/
-#include "windows.h"
#include "commctrl.h"
#include "sysmetrics.h"
#include "cache.h"
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index f04d1c7..d5b756d 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -14,7 +14,6 @@
* hittest.exe, needtext.exe, newrect.exe, updtext.exe and winfrpt.exe.
*/
-#include "windows.h"
#include "commctrl.h"
#include "tooltips.h"
#include "win.h"
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 65863b4..575ba04 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -24,7 +24,6 @@
-#include "windows.h"
#include "commctrl.h"
#include "trackbar.h"
#include "win.h"
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 08b48fb..63d2833 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -38,7 +38,7 @@
#include <string.h>
-#include "windows.h"
+#include "winbase.h"
#include "commctrl.h"
#include "treeview.h"
#include "win.h"
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 1f39352..8d1ed32 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -30,7 +30,6 @@
*/
#include <stdlib.h>
-#include "windows.h"
#include "commctrl.h"
#include "winnls.h"
#include "sysmetrics.h"
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index d9c4064..1d63747 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -4,7 +4,6 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
#include "winbase.h"
#include "winnt.h"
#include "winerror.h"
diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c
index becf247..c92b1bb 100644
--- a/dlls/imagehlp/debug.c
+++ b/dlls/imagehlp/debug.c
@@ -4,8 +4,8 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
#include "winerror.h"
+#include "winbase.h"
#include "wintypes.h"
#include "debug.h"
#include "imagehlp.h"
diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c
index 9e728ad..cc76945 100644
--- a/dlls/imagehlp/imagehlp_main.c
+++ b/dlls/imagehlp/imagehlp_main.c
@@ -4,11 +4,11 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "imagehlp.h"
#include "winerror.h"
+#include "winbase.h"
#include "wintypes.h"
#include "debug.h"
-#include "imagehlp.h"
/**********************************************************************/
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index 9614da5..c15308d 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -4,11 +4,11 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
-#include "winerror.h"
#include "wintypes.h"
-#include "debug.h"
+#include "winbase.h"
+#include "winerror.h"
#include "imagehlp.h"
+#include "debug.h"
/***********************************************************************
* ImageAddCertificate32 (IMAGEHLP.10)
diff --git a/dlls/imagehlp/internal.c b/dlls/imagehlp/internal.c
index 3d780b2..42a8495 100644
--- a/dlls/imagehlp/internal.c
+++ b/dlls/imagehlp/internal.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index de67bab..ad8bbcf 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c
index 4ff3512..b319145 100644
--- a/dlls/imagehlp/symbol.c
+++ b/dlls/imagehlp/symbol.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index e234d43..ea65a5b 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -4,12 +4,11 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
#include "winerror.h"
+#include "winbase.h"
#include "wintypes.h"
-#include "debug.h"
-#include "mmsystem.h"
#include "msacm.h"
+#include "debug.h"
/***********************************************************************
* ACMGETVERSION (MSACM.7)
diff --git a/dlls/msacm32/builtin.c b/dlls/msacm32/builtin.c
index 985c76f..3ba3339 100644
--- a/dlls/msacm32/builtin.c
+++ b/dlls/msacm32/builtin.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index bee3d11..2d7411a 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -4,9 +4,10 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
+#include "winuser.h"
#include "debug.h"
#include "driver.h"
#include "heap.h"
diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
index 45dc02c..b0fddca 100644
--- a/dlls/msacm32/filter.c
+++ b/dlls/msacm32/filter.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index 0cd2fc1..e780bd1 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index 62c60ae..f382a0a 100644
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -4,7 +4,8 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
+#include "winuser.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c
index f1dc476..655c226 100644
--- a/dlls/msacm32/msacm32_main.c
+++ b/dlls/msacm32/msacm32_main.c
@@ -4,11 +4,10 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
-#include "mmsystem.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "winversion.h"
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
index d159478..21ca98b 100644
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index e404ad8..af15030 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -10,19 +10,13 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "win.h"
-#include "file.h"
-#include "windows.h"
-#include "winnls.h"
-#include "heap.h"
-#include "debug.h"
-#include "module.h"
-#include "debugstr.h"
-
-#include "winnt.h"
+#include "wintypes.h"
#include "windef.h"
+#include "ntdll.h"
#include "ntdef.h"
#include "ntddk.h"
+#include "debugstr.h"
+#include "debug.h"
/* move to winbase.h */
typedef VOID (CALLBACK *PTIMERAPCROUTINE)(LPVOID lpArgToCompletionRoutine,DWORD dwTimerLowValue,DWORD dwTimerHighValue);
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index c644f99..7e60511 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -1,10 +1,11 @@
-#include "win.h"
-#include "debug.h"
-#include "windows.h"
+#include "windef.h"
+#include "wintypes.h"
#include "winreg.h"
#include "ntdll.h"
#include "ntddk.h"
+#include "debug.h"
+
/******************************************************************************
* NtCreateKey [NTDLL]
* ZwCreateKey
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 2fedbc7..104e0e6 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -12,21 +12,20 @@
#include <time.h>
#include <ctype.h>
#include <math.h>
-#include "win.h"
-#include "stackframe.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/winestring.h"
#include "file.h"
-#include "windows.h"
+#include "stackframe.h"
#include "winnls.h"
#include "ntdll.h"
-#include "heap.h"
-#include "debug.h"
-#include "module.h"
-#include "heap.h"
#include "debugstr.h"
-
+#include "heap.h"
#include "ntdef.h"
#include "winreg.h"
+#include "debug.h"
+
/* fixme: move to windef.h*/
typedef BOOL32 *LPBOOL;
/**************************************************************************
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 94bc7f6..07c2b3b 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -4,7 +4,6 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
#include "winbase.h"
#include "wintypes.h"
#include "winerror.h"
diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index 98c8250..a798f2b 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -4,7 +4,7 @@
* Copyright 1998 Marcus Meissner
*/
-#include "windows.h"
+#include "wintypes.h"
#include "ras.h"
#include "debug.h"
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 63ad76f..69e6163 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -1,7 +1,6 @@
#include <stdlib.h>
#include <string.h>
-#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "heap.h"
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index b65090e..b980b23 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -8,6 +8,7 @@
#include <string.h>
#include "debug.h"
#include "winerror.h"
+#include "winreg.h"
#include "shlobj.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/contmenu.c b/dlls/shell32/contmenu.c
index 9189807..14f7912 100644
--- a/dlls/shell32/contmenu.c
+++ b/dlls/shell32/contmenu.c
@@ -3,7 +3,6 @@
*
* Copyright 1998 Juergen Schmied <juergen.schmied@metronet.de>
*/
-#include "windows.h"
#include "winerror.h"
#include "debug.h"
@@ -11,7 +10,6 @@
#include "objbase.h"
#include "if_macros.h"
#include "shlguid.h"
-#include "shlobj.h"
#include "shell32_main.h"
#include "shresdef.h"
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 0707dd1..baa3a74 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -12,7 +12,6 @@
#include "pidl.h"
#include "shlguid.h"
-#include "shlobj.h"
#include "shell32_main.h"
/* IEnumIDList Implementation */
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 4140c99..f556c96 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -9,11 +9,9 @@
#include "debug.h"
#include "objbase.h"
#include "winerror.h"
-
#include "pidl.h"
#include "shell32_main.h"
#include "shlguid.h"
-#include "shlobj.h"
/******************************************************************************
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 64ae065..a678631 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -5,8 +5,8 @@
* since dll geting never unloaded the iconcache will never be freed
*/
#include <string.h>
-#include "windows.h"
#include "wine/winuser16.h"
+#include "wine/winbase16.h"
#include "neexe.h"
#include "cursoricon.h"
#include "module.h"
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 8d6a992..05238d4 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <string.h>
-#include "windows.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "heap.h"
@@ -20,6 +19,7 @@
#include "authors.h"
#include "shell.h"
+#include "shellapi.h"
#include "pidl.h"
#include "shlobj.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 3887a44..3ec96a0 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -8,15 +8,17 @@
#include <stdlib.h>
#include <string.h>
-#include "debug.h"
-#include "objbase.h"
+#include "winreg.h"
#include "winerror.h"
+#include "objbase.h"
#include "winversion.h"
#include "shlguid.h"
#include "shlobj.h"
#include "shell32_main.h"
+#include "debug.h"
+
/*************************************************************************
*
*/
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 04cce48..5bff512 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -6,8 +6,8 @@
* 1998 Jürgen Schmied
*/
#include <string.h>
-#include "windows.h"
#include "winerror.h"
+#include "winreg.h"
#include "debug.h"
#include "winnls.h"
#include "winversion.h"
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 3efa3ed..8503657 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -6,7 +6,6 @@
*/
#include <string.h>
#include <ctype.h>
-#include "windows.h"
#include "debug.h"
#include "winnls.h"
#include "winversion.h"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index a02ef3f..cc98822 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <string.h>
-#include "debug.h"
+
#include "winerror.h"
#include "pidl.h"
@@ -22,6 +22,8 @@
#include "shell32_main.h"
#include "shresdef.h"
+#include "debug.h"
+
/***********************************************************************
* IShellView implementation
*/
diff --git a/dlls/ver/ver16.c b/dlls/ver/ver16.c
index aa19df0..f2a05d4 100644
--- a/dlls/ver/ver16.c
+++ b/dlls/ver/ver16.c
@@ -4,10 +4,11 @@
* Copyright 1999 Ulrich Weigand
*/
-#include "windows.h"
-#include "debug.h"
-#include "ver.h"
+#include "winbase.h"
+#include "winver.h"
#include "ldt.h"
+#include "ver.h"
+#include "debug.h"
/*************************************************************************
diff --git a/dlls/version/info.c b/dlls/version/info.c
index 3835eae..185f2f1 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -9,11 +9,12 @@
#include <stdlib.h>
#include <string.h>
-#include "windows.h"
+#include "winreg.h"
+#include "winver.h"
+#include "wine/winuser16.h"
#include "winerror.h"
#include "heap.h"
#include "ver.h"
-#include "winreg.h"
#include "debug.h"
diff --git a/dlls/version/install.c b/dlls/version/install.c
index e921ecf..40c8d5f 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -8,7 +8,9 @@
#include <stdlib.h>
#include <string.h>
-#include "windows.h"
+#include "windef.h"
+#include "winver.h"
+#include "wine/winestring.h"
#include "winerror.h"
#include "heap.h"
#include "ver.h"
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 580d329..2a48b97 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -9,12 +9,14 @@
#include <stdlib.h>
#include <string.h>
-#include "windows.h"
-#include "heap.h"
-#include "ver.h"
-#include "lzexpand.h"
-#include "module.h"
+#include "peexe.h"
#include "neexe.h"
+#include "module.h"
+#include "winver.h"
+#include "ver.h"
+#include "heap.h"
+#include "lzexpand.h"
+#include "peexe.h"
#include "debug.h"
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 0dc0cbc..bbdbc00 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -8,14 +8,13 @@
#include <unistd.h>
#include <callback.h>
#include <string.h>
-#include "windows.h"
+#include "winbase.h"
#include "aspi.h"
#include "winaspi.h"
#include "options.h"
#include "heap.h"
#include "debug.h"
#include "selectors.h"
-#include "module.h"
#include "miscemu.h"
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index 8eec3c5..e57272e 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -7,15 +7,13 @@
#include <memory.h>
#include <unistd.h>
#include <callback.h>
-#include "windows.h"
+
+#include "winbase.h"
#include "aspi.h"
#include "wnaspi32.h"
#include "options.h"
#include "heap.h"
#include "debug.h"
-#include "selectors.h"
-#include "module.h"
-#include "miscemu.h"
/* FIXME!
