Optimized away more includes, readded some #includes for necessary

dlls/shell32/contmenu.c

@@ -9,7 +9,7 @@
 #include "debug.h"
 
 #include "pidl.h"
-#include "objbase.h"
+#include "wine/obj_base.h"
 #include "if_macros.h"
 #include "shlguid.h"
 #include "shell32_main.h"

dlls/shell32/enumidlist.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "debug.h"
-#include "objbase.h"
+#include "wine/obj_base.h"
 #include "winerror.h"
 
 #include "pidl.h"

dlls/shell32/folders.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "debug.h"
-#include "objbase.h"
+#include "wine/obj_base.h"
 #include "winerror.h"
 #include "pidl.h"
 #include "shell32_main.h"

dlls/shell32/shelllink.c

@@ -9,7 +9,6 @@
 #include "debug.h"
 #include "winerror.h"
 
-#include "objbase.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 

dlls/shell32/shellole.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include "winreg.h"
 #include "winerror.h"
-#include "objbase.h"
+#include "wine/obj_base.h"
 #include "winversion.h"
 
 #include "shlguid.h"

dlls/shell32/shlview.c

@@ -17,7 +17,7 @@
 #include "shlguid.h"
 #include "shlobj.h"
 #include "servprov.h"
-#include "objbase.h"
+#include "wine/obj_base.h"
 #include "if_macros.h"
 #include "shell32_main.h"
 #include "shresdef.h"

graphics/d3ddevices.c

@@ -12,7 +12,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/d3dexecutebuffer.c

@@ -12,7 +12,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/d3dlight.c

@@ -12,7 +12,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/d3dmaterial.c

@@ -11,7 +11,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/d3dtexture.c

@@ -12,7 +12,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/d3dviewport.c

@@ -11,7 +11,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
-#include "objbase.h"
 
 #include "d3d_private.h"
 

graphics/ddraw.c

@@ -50,7 +50,6 @@
 #include "winerror.h"
 #include "gdi.h"
 #include "heap.h"
-#include "ldt.h"
 #include "dc.h"
 #include "win.h"
 #include "miscemu.h"
@@ -60,7 +59,6 @@
 #include "spy.h"
 #include "message.h"
 #include "options.h"
-#include "objbase.h"
 #include "monitor.h"
 
 /* This for all the enumeration and creation of D3D-related objects */

loader/main.c

@@ -14,7 +14,6 @@
 #include "bitmap.h"
 #include "comm.h"
 #include "neexe.h"
-#include "win.h"
 #include "main.h"
 #include "menu.h"
 #include "message.h"

memory/atom.c

@@ -17,6 +17,8 @@
 #include <ctype.h>
 
 #include "winuser.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "instance.h"
 #include "ldt.h"
 #include "stackframe.h"

misc/lstr.c

@@ -26,6 +26,7 @@
 #include "winnls.h"
 #include "wine/winbase16.h"
 #include "winuser.h"
+#include "wine/winuser16.h"
 #include "task.h"
 #include "heap.h"
 #include "ldt.h"

msdos/dosconf.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "windows.h"
+#include "winbase.h"
 #include "msdos.h"
 #include "debug.h"
 #include "options.h"

msdos/dosmem.c

@@ -8,8 +8,8 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include "windows.h"
 #include "winbase.h"
+#include "wine/winbase16.h"
 #include "global.h"
 #include "ldt.h"
 #include "miscemu.h"

msdos/dpmi.c

@@ -6,23 +6,19 @@
 
 #include <unistd.h>
 #include <string.h>
-#include "windows.h"
-#include "heap.h"
-#include "global.h"
+#include "wintypes.h"
+#include "wine/winbase16.h"
 #include "ldt.h"
+#include "global.h"
 #include "module.h"
 #include "miscemu.h"
-#include "drive.h"
 #include "msdos.h"
 #include "task.h"
-#include "dosexe.h"
 #include "toolhelp.h"
-#include "debug.h"
 #include "selectors.h"
-#include "thread.h"
 #include "process.h"
-#include "stackframe.h"
 #include "callback.h"
+#include "debug.h"
 
 #define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive())
 

msdos/int16.c

@@ -7,14 +7,10 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "debug.h"
-
-#include "ldt.h"
-#include "drive.h"
-#include "msdos.h"
-#include "miscemu.h"
 #include "module.h"
 #include "console.h"
+#include "wincon.h"
+#include "debug.h"
 
 /**********************************************************************
  *	    INT_Int16Handler

msdos/int21.c

@@ -16,7 +16,10 @@
 #include <unistd.h>
 #include <utime.h>
 #include <ctype.h>
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h" /* SW_NORMAL */
+#include "wine/winbase16.h"
 #include "winerror.h"
 #include "drive.h"
 #include "file.h"

msdos/int2a.c

@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include "msdos.h"
 #include "miscemu.h"
-/* #define DEBUG_INT */
 #include "debug.h"
 
 /**********************************************************************

msdos/interrupts.c

@@ -5,13 +5,9 @@
  */
 
 #include <sys/types.h>
-
-#include "windows.h"
-#include "drive.h"
+#include "wintypes.h"
 #include "miscemu.h"
 #include "msdos.h"
-#include "module.h"
-#include "stackframe.h"
 #include "debug.h"
 
 static FARPROC16 INT_Vectors[256];

msdos/ioports.c

@@ -16,7 +16,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "vga.h"
 #include "dosexe.h"
 #include "options.h"

msdos/vxd.c

@@ -6,12 +6,13 @@
 
 #include <fcntl.h>
 #include <memory.h>
-#include "windows.h"
 #include "winbase.h"
+#include "winuser.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "msdos.h"
 #include "miscemu.h"
 #include "selectors.h"
-#include "module.h"
 #include "neexe.h"
 #include "task.h"
 #include "process.h"

msdos/xms.c

@@ -8,7 +8,7 @@
 
 #include <unistd.h>
 #include <string.h>
-#include "windows.h"
+#include "winbase.h"
 #include "global.h"
 #include "module.h"
 #include "miscemu.h"

ole/storage.c

@@ -10,8 +10,10 @@
 #include <assert.h>
 #include <time.h>
 #include <string.h>
-#include "windows.h"
+#include "windef.h"
 #include "winerror.h"
+#include "wine/winestring.h"
+#include "wine/winbase16.h"
 #include "file.h"
 #include "ole.h"
 #include "wine/obj_base.h"

ole/typelib.c

@@ -8,8 +8,8 @@
 #include <string.h>
 #include <assert.h>
 #include "wintypes.h"
+#include "wine/winbase16.h"
 #include "heap.h"
-#include "windows.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "oleauto.h"

programs/avitools/icinfo.c

@@ -2,6 +2,7 @@
 #include <strings.h>
 #include "wintypes.h"
 #include "windows.h"
+#include "driver.h"
 #include "mmsystem.h"
 #include "vfw.h"
 

relay32/relay386.c

@@ -8,7 +8,6 @@
 #include <assert.h>
 #include <string.h>
 #include "winnt.h"
-#include "windows.h"
 #include "builtin32.h"
 #include "selectors.h"
 #include "debugstr.h"
@@ -136,6 +135,9 @@ int RELAY_CallFrom32( int ret_addr, ... )
         case 15: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
                              args[6],args[7],args[8],args[9],args[10],args[11],
                              args[12],args[13],args[14]); break;
+        case 16: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5],
+                             args[6],args[7],args[8],args[9],args[10],args[11],
+                             args[12],args[13],args[14],args[15]); break;
         default:
             ERR(relay, "Unsupported nb args %d\n",
                      nb_args );
@@ -176,6 +178,9 @@ int RELAY_CallFrom32( int ret_addr, ... )
         case 15: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
                             args[6],args[7],args[8],args[9],args[10],args[11],
                             args[12],args[13],args[14]); break;
+        case 16: ret = func(args[0],args[1],args[2],args[3],args[4],args[5],
+                            args[6],args[7],args[8],args[9],args[10],args[11],
+                            args[12],args[13],args[14],args[15]); break;
         default:
             ERR(relay, "Unsupported nb args %d\n",nb_args );
             assert(FALSE);

tools/build.c

@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include "windows.h"
+#include "winbase.h"
 #include "winnt.h"
 #include "module.h"
 #include "neexe.h"

windows/clipboard.c

@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "winuser.h"
+#include "wine/winuser16.h"
 #include "heap.h"
 #include "task.h"
 #include "message.h"

windows/input.c

@@ -17,6 +17,7 @@
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
+#include "wine/keyboard16.h"
 #include "win.h"
 #include "gdi.h"
 #include "heap.h"