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.

console/interface.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "windows.h"
+#include "windef.h"
 #include "console.h"
 #include "config.h"
 

console/ncurses.c

@@ -1,6 +1,7 @@
 /* ncurses.c */
 /* Copyright 1999 - Joseph Pranevich */
 
+#include <stdio.h>
 #include "config.h"
 #include "console.h"
 

console/tty.c

@@ -14,7 +14,6 @@
 #include "console.h"
 #include "config.h"
 #include "wintypes.h" /* FALSE */
-#include "windows.h" /* _lread16() */
 void TTY_Start()
 {
    /* This should be the root driver so we can ignore anything

console/xterm.c

@@ -8,6 +8,7 @@
    It does not currently support changing the title bar.
 */
 
+#include <stdio.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -15,7 +16,6 @@
 #include <termios.h>
 #include <errno.h>
 
-#include "windows.h"
 #include "console.h"
 #include "options.h"
 #include "debug.h"

controls/desktop.c

@@ -11,6 +11,7 @@
 #include <unistd.h>
 
 #include "desktop.h"
+#include "windef.h"
 #include "heap.h"
 #include "monitor.h"
 #include "win.h"

controls/edit.c

@@ -11,9 +11,9 @@
  *	please read EDIT.TODO (and update it when you change things)
  */
 
-#include "windows.h"
 #include "winnt.h"
 #include "win.h"
+#include "wine/winbase16.h"
 #include "combo.h"
 #include "local.h"
 #include "resource.h"

controls/scroll.c

@@ -5,7 +5,6 @@
  * Copyright 1994, 1996 Alexandre Julliard
  */
 
-#include "windows.h"
 #include "wine/winuser16.h"
 #include "sysmetrics.h"
 #include "scroll.h"

controls/uitools.c

@@ -5,7 +5,6 @@
  * Copyright 1997 Bertho A. Stultiens
  */
 
-#include "windows.h"
 #include "wine/winuser16.h"
 #include "debug.h"
 

debugger/break.c

@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include "module.h"
+#include "neexe.h"
 #include "process.h"
 #include "task.h"
 #include "miscemu.h"

debugger/dbg.y

@@ -20,6 +20,7 @@
 #include "options.h"
 #include "queue.h"
 #include "win.h"
+#include "wine/winbase16.h"
 #include "winnt.h"
 #include "debugger.h"
 #include "neexe.h"

debugger/expr.c

@@ -11,6 +11,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <neexe.h>
+#include "wine/winbase16.h"
 #include "module.h"
 #include "task.h"
 #include "selectors.h"

debugger/memory.c

@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include "windows.h"
 #include "debugger.h"
+#include "miscemu.h"
 
 
 /************************************************************

debugger/msc.c

@@ -27,10 +27,10 @@
 #ifndef PATH_MAX
 #define PATH_MAX _MAX_PATH
 #endif
+#include "debugger.h"
 #include "win.h"
 #include "pe_image.h"
-#include "peexe.h"
-#include "debugger.h"
+#include "neexe.h"
 #include "peexe.h"
 #include "xmalloc.h"
 #include "file.h"

debugger/registers.c

@@ -5,6 +5,7 @@
  */
 
 #include <stdio.h>
+#include "selectors.h"
 #include "debugger.h"
 
 CONTEXT DEBUG_context;

debugger/source.c

@@ -20,6 +20,7 @@
 #endif
 
 #include "win.h"
+#include "wine/winbase16.h"
 #include "pe_image.h"
 #include "peexe.h"
 #include "debugger.h"

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]

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

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]
  */

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);

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;

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])
 
 

dlls/comctl32/comboex.c

@@ -16,7 +16,6 @@
  *   - should include "combo.h" 
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "comboex.h"
 #include "win.h"

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"

dlls/comctl32/datetime.c

@@ -14,7 +14,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "datetime.h"
 #include "win.h"

dlls/comctl32/draglist.c

@@ -12,7 +12,6 @@
  *   - Everything.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 
 #include "debug.h"

dlls/comctl32/flatsb.c

@@ -15,7 +15,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "flatsb.h" 
 #include "win.h"

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"
 
 

dlls/comctl32/hotkey.c

@@ -13,7 +13,6 @@
  *   - Display code.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "hotkey.h"
 #include "win.h"

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"

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"

dlls/comctl32/monthcal.c

@@ -14,7 +14,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "monthcal.h"
 #include "win.h"

dlls/comctl32/nativefont.c

@@ -13,7 +13,6 @@
  *   - All notifications.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "nativefont.h"
 #include "win.h"

dlls/comctl32/pager.c

@@ -13,7 +13,6 @@
  *   - All notifications.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "pager.h"
 #include "win.h"

dlls/comctl32/progress.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "progress.h"
 #include "win.h"

dlls/comctl32/propsheet.c

@@ -8,7 +8,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "prsht.h"
 #include "propsheet.h"

dlls/comctl32/rebar.c

@@ -18,7 +18,6 @@
  *   - All notifications.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "rebar.h"
 #include "win.h"

dlls/comctl32/status.c

@@ -5,7 +5,6 @@
  * Copyright 1998 Eric Kohl
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "status.h"
 #include "win.h"

dlls/comctl32/tab.c

@@ -13,7 +13,6 @@
  *
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "tab.h"
 #include "win.h"

dlls/comctl32/toolbar.c

@@ -25,7 +25,6 @@
  *   - Microsofts controlspy examples.
  */
 
-#include "windows.h"
 #include "commctrl.h"
 #include "sysmetrics.h"
 #include "cache.h"

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"

dlls/comctl32/trackbar.c

@@ -24,7 +24,6 @@
 
 
 
-#include "windows.h"
 #include "commctrl.h"
 #include "trackbar.h"
 #include "win.h"

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"

dlls/comctl32/updown.c

@@ -30,7 +30,6 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
 #include "commctrl.h"
 #include "winnls.h"
 #include "sysmetrics.h"

dlls/imagehlp/access.c

@@ -4,7 +4,6 @@
  *	Copyright 1998	Patrik Stridvall
  */
 
-#include "windows.h"
 #include "winbase.h"
 #include "winnt.h"
 #include "winerror.h"

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"

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"
 
 /**********************************************************************/
 

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)

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"

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"

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"

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)

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"

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"

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"

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"

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"

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"

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"

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);   

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

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;   
 /**************************************************************************

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"

dlls/rasapi32/rasapi.c

@@ -4,7 +4,7 @@
  * Copyright 1998 Marcus Meissner
  */
 
-#include "windows.h"
+#include "wintypes.h"
 #include "ras.h"
 #include "debug.h"
 

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"

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"

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"
 

dlls/shell32/enumidlist.c

@@ -12,7 +12,6 @@
 
 #include "pidl.h"
 #include "shlguid.h"
-#include "shlobj.h"
 #include "shell32_main.h"
 
 /* IEnumIDList Implementation */

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"
 
 
 /******************************************************************************

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"

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"

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"
+
 /*************************************************************************
  *
  */

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"

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"

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
 */

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"
 
 
 /*************************************************************************

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"
 
 

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"

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"
 
 

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"
 
 

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!

files/change.c

@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
-#include "windows.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "process.h"

files/dos_fs.c

@@ -19,7 +19,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "windows.h"
+#include "windef.h"
+#include "winuser.h"
+#include "wine/winbase16.h"
 #include "winerror.h"
 #include "drive.h"
 #include "file.h"

files/file.c

@@ -24,8 +24,11 @@
 #include <unistd.h>
 #include <utime.h>
 
-#include "windows.h"
 #include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "drive.h"
 #include "device.h"
 #include "file.h"

files/profile.c

@@ -11,7 +11,9 @@
 
 #include <sys/stat.h>
 
-#include "windows.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "winuser.h"
 #include "file.h"
 #include "heap.h"
 #include "debug.h"

graphics/metafiledrv/init.c

@@ -4,11 +4,13 @@
  * Copyright 1996 Alexandre Julliard
  */
 
-#include "metafiledrv.h"
+#include "windef.h"
+#include "wine/winbase16.h"
 #include "dc.h"
 #include "heap.h"
 #include "global.h"
 #include "metafile.h"
+#include "metafiledrv.h"
 #include "debug.h"
 
 #include <string.h>

if1632/snoop.c

@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 #include "windows.h"
 #include "winbase.h"
 #include "winnt.h"

if1632/thunk.c

@@ -5,14 +5,14 @@
  * Copyright 1998       Ulrich Weigand
  */
 
-#include "windows.h"
+#include <string.h>
+#include "wine/winbase16.h"
 #include "wine/winuser16.h"
+#include "hook.h"
 #include "callback.h"
-#include "resource.h"
 #include "task.h"
 #include "user.h"
 #include "heap.h"
-#include "hook.h"
 #include "module.h"
 #include "process.h"
 #include "stackframe.h"

include/button.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_BUTTON_H
 #define __WINE_BUTTON_H
 
-#include "windows.h"
+#include "wingdi.h"
 
   /* Extra info for BUTTON windows */
   /* Note: under MS-Windows, state is a BYTE and this structure is */

include/cdrom.h

@@ -6,13 +6,13 @@
  * Copyright 1999 Eric Pouech
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include "winbase.h"
-
 #ifndef __WINE_CDROM_H__
 #define __WINE_CDROM_H__
 
+#include <stdlib.h>
+#include <unistd.h>
+#include "wintypes.h"
+
 #ifdef HAVE_LINUX_CDROM_H
 # include <linux/cdrom.h>
 #endif

include/class.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CLASS_H
 #define __WINE_CLASS_H
 
-#include "windows.h"
+#include "wintypes.h"
 #include "winproc.h"
 
 #define CLASS_MAGIC   ('C' | ('L' << 8) | ('A' << 16) | ('S' << 24))

include/console.h

@@ -9,7 +9,6 @@
 #define CONSOLE_H
 
 #include <stdio.h>
-
 #include "config.h"
 
 /* Can we compile with curses/ncurses? */

include/cursoricon.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CURSORICON_H
 #define __WINE_CURSORICON_H
 
-#include "windows.h"
+#include "wingdi.h"
 
 #pragma pack(1)
 

include/dce.h

@@ -7,7 +7,6 @@
 #ifndef __WINE_DCE_H
 #define __WINE_DCE_H
 
-#include "windows.h"
 #include "win.h"
 
 /* additional DCX flags 

include/ddraw.h

@@ -6,6 +6,8 @@
 #include <X11/extensions/XShm.h>
 #endif /* defined(HAVE_LIBXXSHM) */
 
+#include "winbase.h" /* LARGE_INTEGER ... */
+#include "wingdi.h" /* PALETTE stuff ... */
 #include "wine/obj_base.h"
 
 #ifndef	DIRECTDRAW_VERSION

include/debugger.h

@@ -7,10 +7,9 @@
 #ifndef __WINE_DEBUGGER_H
 #define __WINE_DEBUGGER_H
 
-#include "winnt.h"
-#include "selectors.h"
+#include <sys/types.h> /* u_long ... */
+#include "wintypes.h"
 #include "sig_context.h"
-#include "pe_image.h"
 #include "miscemu.h"
 
 #define STEP_FLAG 0x100 /* single step flag */

include/desktop.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_DESKTOP_H
 #define __WINE_DESKTOP_H
 
-#include "windows.h"
+#include "wintypes.h"
 
 struct tagMONITOR;
 

include/dialog.h

@@ -7,7 +7,6 @@
 #ifndef __WINE_DIALOG_H
 #define __WINE_DIALOG_H
 
-#include "windows.h"
 #include "winproc.h"
 
   /* Dialog info structure.

include/dinput.h

@@ -1,9 +1,10 @@
 #ifndef _WINE_DINPUT_H
 #define _WINE_DINPUT_H
 
+#include "windef.h" /* for MAX_PATH */
+#include "wintypes.h"
 #include "unknwn.h"
 #include "mouse.h"
-#include "windef.h" /* for MAX_PATH */
 
 #define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn)
 #define STDMETHOD_(ret,xfn) ret (CALLBACK *fn##xfn)

include/dosexe.h

@@ -7,11 +7,9 @@
 #ifndef __WINE_DOSEXE_H
 #define __WINE_DOSEXE_H
 
-#include <sys/types.h>
-#include "windows.h"
-#include "winnt.h"
-#include "sig_context.h"
+#include <sys/types.h> /* pid_t */
 #include "wintypes.h"
+#include "sig_context.h"
 
 typedef struct _DOSTASK {
  LPVOID img;

include/dsound.h

@@ -1,8 +1,7 @@
 #ifndef __WINE_DSOUND_H
 #define __WINE_DSOUND_H
 
-#include "windows.h"
-#include "winbase.h"
+#include "wintypes.h"
 #include "mmsystem.h"
 #include "d3d.h"			/*FIXME: Need to break out d3dtypes.h */