Removed a lot of occurences of windows.h (and added necessary other

includes).

debugger/break.c

@@ -9,13 +9,13 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/mman.h>
+#include "wine/winbase16.h"
 #include "module.h"
 #include "neexe.h"
 #include "process.h"
 #include "task.h"
 #include "miscemu.h"
 #include "toolhelp.h"
-#include "windows.h"
 #include "debugger.h"
 #include "dosexe.h"
 

debugger/db_disasm.c

@@ -63,7 +63,6 @@
  */
 
 #include <stdio.h>
-#include "windows.h"
 #include "debugger.h"
 
 /*

debugger/dbg.y

@@ -19,9 +19,9 @@
 #include "task.h"
 #include "options.h"
 #include "queue.h"
-#include "win.h"
 #include "wine/winbase16.h"
 #include "winnt.h"
+#include "win.h"
 #include "debugger.h"
 #include "neexe.h"
 #include "process.h"

debugger/memory.c

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "debugger.h"
 #include "miscemu.h"
 

debugger/msc.c

@@ -28,8 +28,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 #include "debugger.h"
-#include "win.h"
-#include "pe_image.h"
 #include "neexe.h"
 #include "peexe.h"
 #include "xmalloc.h"

debugger/source.c

@@ -19,7 +19,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 
-#include "win.h"
 #include "wine/winbase16.h"
 #include "pe_image.h"
 #include "peexe.h"

debugger/stabs.c

@@ -19,7 +19,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 
-#include "win.h"
 #include "debugger.h"
 #include "xmalloc.h"
 

debugger/stack.c

@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "xmalloc.h"
-#include "windows.h"
 #include "debugger.h"
 
 

debugger/types.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "win.h"
 #include "pe_image.h"
 #include "peexe.h"
 #include "debugger.h"

dlls/comctl32/comboex.c

@@ -16,9 +16,9 @@
  *   - should include "combo.h" 
  */
 
+#include "win.h"
 #include "commctrl.h"
 #include "comboex.h"
-#include "win.h"
 #include "debug.h"
 
 #define ID_CB_EDIT    1001

dlls/comctl32/datetime.c

@@ -14,9 +14,9 @@
  *
  */
 
+#include "win.h"
 #include "commctrl.h"
 #include "datetime.h"
-#include "win.h"
 #include "debug.h"
 
 

dlls/comctl32/draglist.c

@@ -13,7 +13,6 @@
  */
 
 #include "commctrl.h"
-
 #include "debug.h"
 
 

dlls/comctl32/updown.c

@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include "commctrl.h"
 #include "winnls.h"
-#include "sysmetrics.h"
 #include "updown.h"
 #include "win.h"
 #include "debug.h"

dlls/msacm/msacm_main.c

@@ -4,9 +4,8 @@
  *      Copyright 1998  Patrik Stridvall
  */
 
-#include "winerror.h"
 #include "winbase.h"
-#include "wintypes.h"
+#include "winerror.h"
 #include "msacm.h"
 #include "debug.h"
 

dlls/msacm32/filter.c

@@ -6,11 +6,10 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
-#include "debug.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
+#include "debug.h"
 
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.13)

dlls/msacm32/internal.c

@@ -7,13 +7,12 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "winerror.h"
-#include "wintypes.h"
-#include "debug.h"
 #include "driver.h"
 #include "heap.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
+#include "debug.h"
 
 /**********************************************************************/
 

files/directory.c

@@ -13,7 +13,9 @@
 #include <errno.h>
 #include <sys/errno.h>
 
-#include "windows.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "winerror.h"
 #include "process.h"
 #include "drive.h"

graphics/cache.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "windows.h"
+#include "wingdi.h"
 #include "cache.h"
 
 static const WORD wPattern55AA[] =

graphics/d3dcommon.c

@@ -4,8 +4,6 @@
    This file contains all common miscellaneous code that spans
    different 'objects' */
 
-#include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "wine/obj_base.h"
 #include "ddraw.h"

graphics/d3ddevices.c

@@ -5,7 +5,6 @@
    only the 'OpenGL' target is supported. */
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/d3dexecutebuffer.c

@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/d3dlight.c

@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/d3dmaterial.c

@@ -4,7 +4,6 @@
    This files contains the implementation of Direct3DMaterial2. */
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/d3dtexture.c

@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/d3dviewport.c

@@ -4,7 +4,6 @@
    This files contains the implementation of Direct3DViewport2. */
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"

graphics/ddraw.c

@@ -46,7 +46,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
-#include "windows.h"
 
 #include "winerror.h"
 #include "gdi.h"

graphics/dispdib.c

@@ -6,7 +6,6 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "miscemu.h"
 #include "dispdib.h"
 #include "vga.h"

graphics/env.c

@@ -8,7 +8,6 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include "windows.h"
 #include "config.h"
 #include "gdi.h"
 #include "debug.h"

graphics/escape.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "windows.h"
+#include "wingdi.h"
 #include "gdi.h"
 #include "heap.h"
 #include "ldt.h"

graphics/fontengine.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <debug.h>     
-#include "windows.h"
+#include "winbase.h"
 #include "font.h"
 
 

graphics/mapping.c

@@ -4,7 +4,6 @@
  * Copyright 1993 Alexandre Julliard
  */
 
-#include <math.h>
 #include "dc.h"
 #include "debug.h"
 

graphics/painting.c

@@ -10,19 +10,11 @@
 #include "ts_xutil.h"
 #include "x11drv.h"
 
-#include <math.h>
 #include <stdlib.h>
-#ifndef PI
-#define PI M_PI
-#endif
-#include "gdi.h"
 #include "dc.h"
 #include "bitmap.h"
-#include "callback.h"
 #include "heap.h"
-#include "metafile.h"
 #include "monitor.h"
-#include "palette.h"
 #include "cache.h"
 #include "region.h"
 #include "path.h"

graphics/path.c

@@ -8,7 +8,8 @@
 #include <malloc.h>
 #include <math.h>
 
-#include "windows.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "winerror.h"
 
 #include "dc.h"

graphics/psdrv/afm.c

@@ -7,7 +7,6 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "winnt.h" /* HEAP_ZERO_MEMORY */
 #include "psdrv.h"
 #include "options.h"

graphics/psdrv/bitmap.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "gdi.h"
 #include "psdrv.h"
 #include "debug.h"

graphics/psdrv/brush.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "brush.h"
 #include "debug.h"

graphics/psdrv/color.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 

graphics/psdrv/driver.c

@@ -10,11 +10,10 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 #include "resource.h"
-#include "win.h"
+#include "winuser.h"
 #include "winspool.h"
 
 static LONG Resolutions[][2] = { {600,600} };

graphics/psdrv/font.c

@@ -5,7 +5,6 @@
  *
  */
 #include <string.h>
-#include "windows.h"
 #include "winspool.h"
 #include "psdrv.h"
 #include "debug.h"

graphics/psdrv/graphics.c

@@ -6,7 +6,6 @@
  */
 #include <string.h>
 #include <math.h>
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 #include "winspool.h"

graphics/psdrv/init.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "gdi.h"
 #include "psdrv.h"
 #include "debug.h"

graphics/psdrv/objects.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "font.h"
 #include "pen.h"

graphics/psdrv/pen.c

@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "pen.h"
 #include "psdrv.h"
 #include "debug.h"

graphics/psdrv/ppd.c

@@ -7,7 +7,6 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "windows.h"
 #include "winnt.h" /* HEAP_ZERO_MEMORY */
 #include "heap.h"
 #include "debug.h"

graphics/psdrv/ps.c

@@ -7,7 +7,6 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "windows.h"
 #include "psdrv.h"
 #include "winspool.h"
 #include "debug.h"

graphics/psdrv/text.c

@@ -5,7 +5,6 @@
  *
  */
 #include <string.h>
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 #include "winspool.h"

graphics/vga.c

@@ -6,8 +6,9 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "winbase.h"
+#include "winuser.h"
+#include "wine/winuser16.h"
 #include "miscemu.h"
 #include "vga.h"
 #include "ddraw.h"

graphics/win16drv/font.c

@@ -6,9 +6,8 @@
  */
 
 #include <stdio.h>
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "win16drv.h"
-#include "gdi.h"
 #include "module.h"
 #include "font.h"
 #include "heap.h"

graphics/win16drv/init.c

@@ -7,7 +7,6 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "windows.h"
 #include "win16drv.h"
 #include "gdi.h"
 #include "bitmap.h"

graphics/win16drv/prtdrv.c

@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "win16drv.h"
 #include "heap.h"
 #include "brush.h"

graphics/win16drv/text.c

@@ -6,7 +6,6 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
 #include "win16drv.h"
 #include "dc.h"
 #include "gdi.h"

if1632/builtin.c

@@ -7,9 +7,9 @@
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
-#include "windows.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
 #include "builtin32.h"
-#include "gdi.h"
 #include "global.h"
 #include "heap.h"
 #include "module.h"

if1632/relay.c

@@ -5,7 +5,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "windows.h"
+#include <string.h>
+#include "wine/winbase16.h"
 #include "winnt.h"
 #include "global.h"
 #include "heap.h"

if1632/snoop.c

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

include/dispdib.h

@@ -8,7 +8,7 @@
 #ifndef __WINE_DISPDIB_H
 #define __WINE_DISPDIB_H
 
-#include "wintypes.h"
+#include "wingdi.h"
 
 /* error codes */
 #define DISPLAYDIB_NOERROR        0x0000

loader/dos/dosvm.c

@@ -21,6 +21,7 @@
 #include "winnt.h"
 #include "sig_context.h"
 #include "msdos.h"
+#include "file.h"
 #include "miscemu.h"
 #include "debugger.h"
 #include "module.h"

loader/elf.c

@@ -16,7 +16,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "windows.h"
 #include "snoop.h"
 #include "process.h"
 #include "neexe.h"

loader/libres.c

@@ -5,11 +5,11 @@
  */
 
 #include <stdlib.h>
+#include "wine/winestring.h"
 #include "libres.h"
 #include "resource.h"
 #include "debug.h"
 #include "heap.h"
-#include "windows.h"
 #include "xmalloc.h"
 
 typedef struct RLE

loader/pe_image.c

@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include "windows.h"
+#include "windef.h"
 #include "winbase.h"
 #include "callback.h"
 #include "file.h"

loader/pe_resource.c

@@ -12,8 +12,8 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#include "wine/winestring.h"
 #include "wintypes.h"
-#include "windows.h"
 #include "pe_image.h"
 #include "module.h"
 #include "heap.h"

loader/resource.c

@@ -12,7 +12,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "windows.h"
+#include "ntdll.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "gdi.h"
 #include "global.h"

memory/environ.c

@@ -4,7 +4,6 @@
  * Copyright 1996, 1998 Alexandre Julliard
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include "winuser.h"

memory/global.c

@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "global.h"
 #include "heap.h"
 #include "toolhelp.h"

memory/heap.c

@@ -8,7 +8,8 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "windows.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "selectors.h"
 #include "global.h"
 #include "winbase.h"

memory/local.c

@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "ldt.h"
 #include "task.h"
 #include "global.h"

memory/selector.c

@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include "windows.h"
+#include "wine/winbase16.h"
 #include "ldt.h"
 #include "miscemu.h"
 #include "selectors.h"

memory/string.c

@@ -7,7 +7,8 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "windows.h"
+#include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "ldt.h"
 #include "debug.h"

misc/callback.c

@@ -5,12 +5,12 @@
  */
 
 #include <assert.h>
-#include "debug.h"
-#include "windows.h"
+#include "winuser.h"
 #include "callback.h"
 #include "task.h"
 #include "syslevel.h"
 #include "queue.h"
+#include "debug.h"
 
 
 /**********************************************************************

misc/cpu.c

@@ -7,8 +7,10 @@
 
 #include <ctype.h>
 #include <string.h>
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "winreg.h"
 #include "global.h"
-#include "windows.h"
 #include "winnt.h"
 #include "winerror.h"
 #include "winreg.h"

misc/crtdll.c

@@ -38,8 +38,8 @@ AJ 990101:
 #include <math.h>
 #include <fcntl.h>
 #include <setjmp.h>
-#include "win.h"
-#include "windows.h"
+#include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "debug.h"
 #include "module.h"

misc/ddeml.c

@@ -10,13 +10,13 @@
 
 #include <stdlib.h>
 #include <strings.h>
+#include "winbase.h"
+#include "winuser.h"
 #include "ddeml.h"
-#include "debug.h"
-#include "windows.h"
-#include "wintypes.h"
 #include "winerror.h"
 #include "heap.h"
 #include "shm_semaph.h"
+#include "debug.h"
 
 /* Has defined in atom.c file.
  */

misc/error.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "windows.h"
+#include "wintypes.h"
 #include "stackframe.h"
 #include "debug.h"
 

misc/imm.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"

misc/lstr.c

@@ -22,8 +22,10 @@
 #endif  /* HAVE_WCTYPE_H */
 
 
-#include "windows.h"
-#include "winnt.h"	/* HEAP_ macros */
+#include "winbase.h"
+#include "winnls.h"
+#include "wine/winbase16.h"
+#include "winuser.h"
 #include "task.h"
 #include "heap.h"
 #include "ldt.h"

misc/lzexpand.c

@@ -9,7 +9,10 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "file.h"
 #include "heap.h"
 #include "lzexpand.h"

misc/main.c

@@ -21,16 +21,14 @@
 #ifdef MALLOC_DEBUGGING
 # include <malloc.h>
 #endif
+#include "winbase.h"
 #include "winsock.h"
 #include "heap.h"
 #include "message.h"
 #include "msdos.h"
-#include "windows.h"
 #include "color.h"
 #include "options.h"
 #include "desktop.h"
-#include "shell.h"
-#include "winbase.h"
 #include "builtin32.h"
 #include "debug.h"
 #include "debugdefs.h"

misc/network.c

@@ -11,12 +11,13 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include "windows.h"
+#include "wintypes.h"
+#include "winnetwk.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "drive.h"
 #include "wnet.h"
 #include "debug.h"
-#include "win.h"
 #include "heap.h"
 
 /********************************************************************

misc/registry.c

@@ -30,8 +30,10 @@
 #include <pwd.h>
 #include <assert.h>
 #include <time.h>
-#include "windows.h"
-#include "win.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "winerror.h"
 #include "file.h"
 #include "heap.h"

misc/shell.c

@@ -13,7 +13,6 @@
 #include "wine/shell16.h"
 #include "winerror.h"
 #include "file.h"
-#include "shell.h"
 #include "heap.h"
 #include "module.h"
 #include "neexe.h"
@@ -26,7 +25,6 @@
 #include "debug.h"
 #include "winreg.h"
 #include "imagelist.h"
-#include "commctrl.h"
 
 /* .ICO file ICONDIR definitions */
 

misc/sound.c

@@ -3,7 +3,7 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "debug.h"
 
 INT16 WINAPI OpenSound16(void)

misc/system.c

@@ -12,7 +12,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "windows.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "selectors.h"
 #include "sig_context.h"
 #include "miscemu.h"

misc/tapi32.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "debug.h"
 
 UINT32 WINAPI lineInitialize(

misc/toolhelp.c

@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <assert.h>
-#include "windows.h"
-#include "win.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
 #include "winerror.h"
 #include "process.h"
 #include "tlhelp32.h"

misc/tweak.c

@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #include <string.h>
-#include "windows.h"
+#include "winuser.h"
 #include "tweak.h"
 #include "options.h"
 #include "debug.h"

misc/version.c

@@ -9,12 +9,12 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "windows.h"
 #include "winbase.h"
+#include "winuser.h"
+#include "wine/winbase16.h"
 #include "process.h"
 #include "options.h"
 #include "debug.h"
-#include "ole.h"
 #include "neexe.h"
 #include "winversion.h"
 

misc/w32scomb.c

@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "windows.h"
+#include "wintypes.h"
+#include "wine/winbase16.h"
 #include "module.h"
 #include "ldt.h"
 #include "selectors.h"
-#include "winbase.h"
 #include "heap.h"
 
 /***********************************************************************

misc/w32skrnl.c

@@ -6,9 +6,7 @@
  */
 
 #include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "windows.h"
+#include "winbase.h"
 
 LPSTR WINAPI GetWin32sDirectory(void)
 {

misc/w32sys.c

@@ -5,7 +5,7 @@
  * Copyright (c) 1996 Anand Kumria
  */
 
-#include "windows.h"
+#include "wintypes.h"
 #include "w32sys.h"
 
 /***********************************************************************

misc/win32s16.c

@@ -7,7 +7,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "debug.h"
 
 void WINAPI BootTask()

misc/windebug.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "module.h"
 #include "debug.h"
 

misc/winsock.c

@@ -13,7 +13,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <signal.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/ioctl.h>
@@ -46,8 +45,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "wine/winbase16.h"
 #include "winsock.h"
-#include "windows.h"
 #include "winnt.h"
 #include "heap.h"
 #include "ldt.h"

misc/winsock_dns.c

@@ -35,7 +35,6 @@
 #endif
 
 #include "winsock.h"
-#include "windows.h"
 #include "heap.h"
 #include "ldt.h"
 #include "message.h"

misc/wsprintf.c

@@ -6,7 +6,8 @@
 
 #include <stdarg.h>
 #include <string.h>
-#include "windows.h"
+#include "wine/winbase16.h"
+#include "winuser.h"
 #include "ldt.h"
 #include "stackframe.h"
 #include "debug.h"

miscemu/instr.c

@@ -4,7 +4,7 @@
  * Copyright 1995 Alexandre Julliard
  */
 
-#include "windows.h"
+#include "wine/winuser16.h"
 #include "ldt.h"
 #include "global.h"
 #include "module.h"

msdos/xms.c

@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "windows.h"
+#include "global.h"
 #include "module.h"
 #include "miscemu.h"
 #include "toolhelp.h"

relay32/snoop.c

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

scheduler/critsection.c

@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <sys/sem.h>
 #include "debug.h"
-#include "windows.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "heap.h"

scheduler/event.c

@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"

scheduler/mutex.c

@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"

scheduler/pipe.c

@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"