diff --git a/debugger/break.c b/debugger/break.c
index 4216158..b0252de 100644
--- a/debugger/break.c
+++ b/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"
 
diff --git a/debugger/db_disasm.c b/debugger/db_disasm.c
index 2ae25ca..0345b03 100644
--- a/debugger/db_disasm.c
+++ b/debugger/db_disasm.c
@@ -63,7 +63,6 @@
  */
 
 #include <stdio.h>
-#include "windows.h"
 #include "debugger.h"
 
 /*
diff --git a/debugger/dbg.y b/debugger/dbg.y
index 5ec81ac..8f74fad 100644
--- a/debugger/dbg.y
+++ b/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"
diff --git a/debugger/memory.c b/debugger/memory.c
index 7658a37..e36e76f 100644
--- a/debugger/memory.c
+++ b/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"
 
diff --git a/debugger/msc.c b/debugger/msc.c
index efdd16f..b5fa606 100644
--- a/debugger/msc.c
+++ b/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"
diff --git a/debugger/source.c b/debugger/source.c
index 04627ed..95ce030 100644
--- a/debugger/source.c
+++ b/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"
diff --git a/debugger/stabs.c b/debugger/stabs.c
index b26be21..966f8f0 100644
--- a/debugger/stabs.c
+++ b/debugger/stabs.c
@@ -19,7 +19,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 
-#include "win.h"
 #include "debugger.h"
 #include "xmalloc.h"
 
diff --git a/debugger/stack.c b/debugger/stack.c
index 2fe17c0..574d734 100644
--- a/debugger/stack.c
+++ b/debugger/stack.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "xmalloc.h"
-#include "windows.h"
 #include "debugger.h"
 
 
diff --git a/debugger/types.c b/debugger/types.c
index 6c94c4d..df1738d 100644
--- a/debugger/types.c
+++ b/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"
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index a77f679..9f16aac 100644
--- a/dlls/comctl32/comboex.c
+++ b/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
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 6bec902..9e702b5 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -14,9 +14,9 @@
  *
  */
 
+#include "win.h"
 #include "commctrl.h"
 #include "datetime.h"
-#include "win.h"
 #include "debug.h"
 
 
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index 560fa80..8b09912 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -13,7 +13,6 @@
  */
 
 #include "commctrl.h"
-
 #include "debug.h"
 
 
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 8d1ed32..25a9ac8 100644
--- a/dlls/comctl32/updown.c
+++ b/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"
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index ea65a5b..837418a 100644
--- a/dlls/msacm/msacm_main.c
+++ b/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"
 
diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
index b0fddca..0c4f267 100644
--- a/dlls/msacm32/filter.c
+++ b/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)
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index f382a0a..e06d9e1 100644
--- a/dlls/msacm32/internal.c
+++ b/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"
 
 /**********************************************************************/
 
diff --git a/files/directory.c b/files/directory.c
index 9ef6efe..62e91e6 100644
--- a/files/directory.c
+++ b/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"
diff --git a/graphics/cache.c b/graphics/cache.c
index 5d0f184..7cf4c92 100644
--- a/graphics/cache.c
+++ b/graphics/cache.c
@@ -6,7 +6,7 @@
  *
  */
 
-#include "windows.h"
+#include "wingdi.h"
 #include "cache.h"
 
 static const WORD wPattern55AA[] =
diff --git a/graphics/d3dcommon.c b/graphics/d3dcommon.c
index 4a46eb3..47cbb1c 100644
--- a/graphics/d3dcommon.c
+++ b/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"
diff --git a/graphics/d3ddevices.c b/graphics/d3ddevices.c
index b74ffef..c73700e 100644
--- a/graphics/d3ddevices.c
+++ b/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"
diff --git a/graphics/d3dexecutebuffer.c b/graphics/d3dexecutebuffer.c
index 87ebbb6..9a02ed9 100644
--- a/graphics/d3dexecutebuffer.c
+++ b/graphics/d3dexecutebuffer.c
@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/graphics/d3dlight.c b/graphics/d3dlight.c
index 94a6378..ddf64ae 100644
--- a/graphics/d3dlight.c
+++ b/graphics/d3dlight.c
@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/graphics/d3dmaterial.c b/graphics/d3dmaterial.c
index 1772715..0bb4f6e 100644
--- a/graphics/d3dmaterial.c
+++ b/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"
diff --git a/graphics/d3dtexture.c b/graphics/d3dtexture.c
index 46d7d37..6a41917 100644
--- a/graphics/d3dtexture.c
+++ b/graphics/d3dtexture.c
@@ -5,7 +5,6 @@
 
 
 #include "config.h"
-#include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
diff --git a/graphics/d3dviewport.c b/graphics/d3dviewport.c
index da90c8e..07a8c56 100644
--- a/graphics/d3dviewport.c
+++ b/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"
diff --git a/graphics/ddraw.c b/graphics/ddraw.c
index fdf2f96..3f21ef4 100644
--- a/graphics/ddraw.c
+++ b/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"
diff --git a/graphics/dispdib.c b/graphics/dispdib.c
index eab4077..f1ed629 100644
--- a/graphics/dispdib.c
+++ b/graphics/dispdib.c
@@ -6,7 +6,6 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "miscemu.h"
 #include "dispdib.h"
 #include "vga.h"
diff --git a/graphics/env.c b/graphics/env.c
index 8220a21..8f1e4b9 100644
--- a/graphics/env.c
+++ b/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"
diff --git a/graphics/escape.c b/graphics/escape.c
index 8b4a9c4..d6986a8 100644
--- a/graphics/escape.c
+++ b/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"
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index 1ea67c7..f9016de 100644
--- a/graphics/fontengine.c
+++ b/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"
 
 
diff --git a/graphics/mapping.c b/graphics/mapping.c
index 52eb7a3..f9a1f83 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -4,7 +4,6 @@
  * Copyright 1993 Alexandre Julliard
  */
 
-#include <math.h>
 #include "dc.h"
 #include "debug.h"
 
diff --git a/graphics/painting.c b/graphics/painting.c
index 0a5100d..bc7e605 100644
--- a/graphics/painting.c
+++ b/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"
diff --git a/graphics/path.c b/graphics/path.c
index 8e588a6..bf6e8df 100644
--- a/graphics/path.c
+++ b/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"
diff --git a/graphics/psdrv/afm.c b/graphics/psdrv/afm.c
index 8345345..a11cd10 100644
--- a/graphics/psdrv/afm.c
+++ b/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"
diff --git a/graphics/psdrv/bitmap.c b/graphics/psdrv/bitmap.c
index 1a0698b..2b8f340 100644
--- a/graphics/psdrv/bitmap.c
+++ b/graphics/psdrv/bitmap.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "gdi.h"
 #include "psdrv.h"
 #include "debug.h"
diff --git a/graphics/psdrv/brush.c b/graphics/psdrv/brush.c
index 2579e4c..1b3cd85 100644
--- a/graphics/psdrv/brush.c
+++ b/graphics/psdrv/brush.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "brush.h"
 #include "debug.h"
diff --git a/graphics/psdrv/color.c b/graphics/psdrv/color.c
index f53e037..7ceaa99 100644
--- a/graphics/psdrv/color.c
+++ b/graphics/psdrv/color.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 
diff --git a/graphics/psdrv/driver.c b/graphics/psdrv/driver.c
index 261c11a..2b3b703 100644
--- a/graphics/psdrv/driver.c
+++ b/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} };
diff --git a/graphics/psdrv/font.c b/graphics/psdrv/font.c
index 3085bb9..dc471c0 100644
--- a/graphics/psdrv/font.c
+++ b/graphics/psdrv/font.c
@@ -5,7 +5,6 @@
  *
  */
 #include <string.h>
-#include "windows.h"
 #include "winspool.h"
 #include "psdrv.h"
 #include "debug.h"
diff --git a/graphics/psdrv/graphics.c b/graphics/psdrv/graphics.c
index a535c75..8363629 100644
--- a/graphics/psdrv/graphics.c
+++ b/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"
diff --git a/graphics/psdrv/init.c b/graphics/psdrv/init.c
index e86b83f..2348146 100644
--- a/graphics/psdrv/init.c
+++ b/graphics/psdrv/init.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "gdi.h"
 #include "psdrv.h"
 #include "debug.h"
diff --git a/graphics/psdrv/objects.c b/graphics/psdrv/objects.c
index 187161e..1c85773 100644
--- a/graphics/psdrv/objects.c
+++ b/graphics/psdrv/objects.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "psdrv.h"
 #include "font.h"
 #include "pen.h"
diff --git a/graphics/psdrv/pen.c b/graphics/psdrv/pen.c
index 958ffda..e018645 100644
--- a/graphics/psdrv/pen.c
+++ b/graphics/psdrv/pen.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "windows.h"
 #include "pen.h"
 #include "psdrv.h"
 #include "debug.h"
diff --git a/graphics/psdrv/ppd.c b/graphics/psdrv/ppd.c
index e5d1ab7..fbc32d2 100644
--- a/graphics/psdrv/ppd.c
+++ b/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"
diff --git a/graphics/psdrv/ps.c b/graphics/psdrv/ps.c
index 6a47c67..3b73498 100644
--- a/graphics/psdrv/ps.c
+++ b/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"
diff --git a/graphics/psdrv/text.c b/graphics/psdrv/text.c
index ee2a02b..bffe956 100644
--- a/graphics/psdrv/text.c
+++ b/graphics/psdrv/text.c
@@ -5,7 +5,6 @@
  *
  */
 #include <string.h>
-#include "windows.h"
 #include "psdrv.h"
 #include "debug.h"
 #include "winspool.h"
diff --git a/graphics/vga.c b/graphics/vga.c
index 742c526..d006e0d 100644
--- a/graphics/vga.c
+++ b/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"
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index fb9d1e5..22ad850 100644
--- a/graphics/win16drv/font.c
+++ b/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"
diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c
index 5038949..e2f04e3 100644
--- a/graphics/win16drv/init.c
+++ b/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"
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index bfff6a0..20eb749 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/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"
diff --git a/graphics/win16drv/text.c b/graphics/win16drv/text.c
index 609ecaf..815b195 100644
--- a/graphics/win16drv/text.c
+++ b/graphics/win16drv/text.c
@@ -6,7 +6,6 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
 #include "win16drv.h"
 #include "dc.h"
 #include "gdi.h"
diff --git a/if1632/builtin.c b/if1632/builtin.c
index df96d3a..a514170 100644
--- a/if1632/builtin.c
+++ b/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"
diff --git a/if1632/relay.c b/if1632/relay.c
index e5ad14a..b072f9d 100644
--- a/if1632/relay.c
+++ b/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"
diff --git a/if1632/snoop.c b/if1632/snoop.c
index d560e3c..69915aa 100644
--- a/if1632/snoop.c
+++ b/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"
diff --git a/include/dispdib.h b/include/dispdib.h
index 72e5d87..87cffd8 100644
--- a/include/dispdib.h
+++ b/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
diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c
index 59094bf..ce93852 100644
--- a/loader/dos/dosvm.c
+++ b/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"
diff --git a/loader/elf.c b/loader/elf.c
index 9214beb..203b995 100644
--- a/loader/elf.c
+++ b/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"
diff --git a/loader/libres.c b/loader/libres.c
index 081d095..c1485db 100644
--- a/loader/libres.c
+++ b/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
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 1a4b99c..7199377 100644
--- a/loader/pe_image.c
+++ b/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"
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index 9839b69..0e2ab76 100644
--- a/loader/pe_resource.c
+++ b/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"
diff --git a/loader/resource.c b/loader/resource.c
index 082bbff..d14f0c1 100644
--- a/loader/resource.c
+++ b/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"
diff --git a/memory/environ.c b/memory/environ.c
index ab77b12..ad9db92 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -4,7 +4,6 @@
  * Copyright 1996, 1998 Alexandre Julliard
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include "winuser.h"
diff --git a/memory/global.c b/memory/global.c
index c6a9f6a..cd470c0 100644
--- a/memory/global.c
+++ b/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"
diff --git a/memory/heap.c b/memory/heap.c
index 2264fef..e9f5c74 100644
--- a/memory/heap.c
+++ b/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"
diff --git a/memory/local.c b/memory/local.c
index abdb618..d0f15d9 100644
--- a/memory/local.c
+++ b/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"
diff --git a/memory/selector.c b/memory/selector.c
index 6480aec..d3bbdbb 100644
--- a/memory/selector.c
+++ b/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"
diff --git a/memory/string.c b/memory/string.c
index 567d3b4..7336494 100644
--- a/memory/string.c
+++ b/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"
diff --git a/misc/callback.c b/misc/callback.c
index fe489ac..83d77e7 100644
--- a/misc/callback.c
+++ b/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"
 
 
 /**********************************************************************
diff --git a/misc/cpu.c b/misc/cpu.c
index 37c9f1b..dc40c82 100644
--- a/misc/cpu.c
+++ b/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"
diff --git a/misc/crtdll.c b/misc/crtdll.c
index e352397..7c1a594 100644
--- a/misc/crtdll.c
+++ b/misc/crtdll.c
@@ -38,8 +38,8 @@
 #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"
diff --git a/misc/ddeml.c b/misc/ddeml.c
index ebc7bda..8efab81 100644
--- a/misc/ddeml.c
+++ b/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.
  */
diff --git a/misc/error.c b/misc/error.c
index dace017..d8ef9a6 100644
--- a/misc/error.c
+++ b/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"
 
diff --git a/misc/imm.c b/misc/imm.c
index d0d43be..d2d3d2d 100644
--- a/misc/imm.c
+++ b/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"
diff --git a/misc/lstr.c b/misc/lstr.c
index 4820205..69e4036 100644
--- a/misc/lstr.c
+++ b/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"
diff --git a/misc/lzexpand.c b/misc/lzexpand.c
index 8e5f8f5..dfa3b0e 100644
--- a/misc/lzexpand.c
+++ b/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"
diff --git a/misc/main.c b/misc/main.c
index 6ba14eb..f7a36a9 100644
--- a/misc/main.c
+++ b/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"
diff --git a/misc/network.c b/misc/network.c
index de63eaf..af8a1a6 100644
--- a/misc/network.c
+++ b/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"
 
 /********************************************************************
diff --git a/misc/registry.c b/misc/registry.c
index b738b71..47336ce 100644
--- a/misc/registry.c
+++ b/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"
diff --git a/misc/shell.c b/misc/shell.c
index 0ae8fc16..3134efe 100644
--- a/misc/shell.c
+++ b/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 */
 
diff --git a/misc/sound.c b/misc/sound.c
index 337bc48..be5ed72 100644
--- a/misc/sound.c
+++ b/misc/sound.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "debug.h"
 
 INT16 WINAPI OpenSound16(void)
diff --git a/misc/system.c b/misc/system.c
index b29a62d..227a0f4 100644
--- a/misc/system.c
+++ b/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"
diff --git a/misc/tapi32.c b/misc/tapi32.c
index e5e223c..8d40e3c 100644
--- a/misc/tapi32.c
+++ b/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(
diff --git a/misc/toolhelp.c b/misc/toolhelp.c
index d09f2a9..93178be 100644
--- a/misc/toolhelp.c
+++ b/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"
diff --git a/misc/tweak.c b/misc/tweak.c
index 9ce44e0..69a63d6 100644
--- a/misc/tweak.c
+++ b/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"
diff --git a/misc/version.c b/misc/version.c
index 0c8b2f0..1d23ba9 100644
--- a/misc/version.c
+++ b/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"
 
diff --git a/misc/w32scomb.c b/misc/w32scomb.c
index 4d77ce8..0bd2910 100644
--- a/misc/w32scomb.c
+++ b/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"
 
 /***********************************************************************
diff --git a/misc/w32skrnl.c b/misc/w32skrnl.c
index 6f3030f..2ef3b2b 100644
--- a/misc/w32skrnl.c
+++ b/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)
 {
diff --git a/misc/w32sys.c b/misc/w32sys.c
index fbf3940..74280f9 100644
--- a/misc/w32sys.c
+++ b/misc/w32sys.c
@@ -5,7 +5,7 @@
  * Copyright (c) 1996 Anand Kumria
  */
 
-#include "windows.h"
+#include "wintypes.h"
 #include "w32sys.h"
 
 /***********************************************************************
diff --git a/misc/win32s16.c b/misc/win32s16.c
index 42913d1..9bc895a 100644
--- a/misc/win32s16.c
+++ b/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()
diff --git a/misc/windebug.c b/misc/windebug.c
index 53b4e25..bf5f2f9 100644
--- a/misc/windebug.c
+++ b/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"
 
diff --git a/misc/winsock.c b/misc/winsock.c
index 10881fd..c12dcc7 100644
--- a/misc/winsock.c
+++ b/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"
diff --git a/misc/winsock_dns.c b/misc/winsock_dns.c
index 801e77c..6ab8345 100644
--- a/misc/winsock_dns.c
+++ b/misc/winsock_dns.c
@@ -35,7 +35,6 @@
 #endif
 
 #include "winsock.h"
-#include "windows.h"
 #include "heap.h"
 #include "ldt.h"
 #include "message.h"
diff --git a/misc/wsprintf.c b/misc/wsprintf.c
index ef811e3..6777901 100644
--- a/misc/wsprintf.c
+++ b/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"
diff --git a/miscemu/instr.c b/miscemu/instr.c
index 577644c..e2090d8 100644
--- a/miscemu/instr.c
+++ b/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"
diff --git a/msdos/xms.c b/msdos/xms.c
index 07d1037..c5d462f 100644
--- a/msdos/xms.c
+++ b/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"
diff --git a/relay32/snoop.c b/relay32/snoop.c
index b09dea3..e83e828 100644
--- a/relay32/snoop.c
+++ b/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"
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 900ebfc..dd8bc1e 100644
--- a/scheduler/critsection.c
+++ b/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"
diff --git a/scheduler/event.c b/scheduler/event.c
index fbf2991..597689d 100644
--- a/scheduler/event.c
+++ b/scheduler/event.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/mutex.c b/scheduler/mutex.c
index 83f1917..895216e 100644
--- a/scheduler/mutex.c
+++ b/scheduler/mutex.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/pipe.c b/scheduler/pipe.c
index 0847ec5..cc27c6a 100644
--- a/scheduler/pipe.c
+++ b/scheduler/pipe.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c
index 24a70db..7a0ce62 100644
--- a/scheduler/semaphore.c
+++ b/scheduler/semaphore.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include "windows.h"
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 4b4d1ea..ec65a9c 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-#include <signal.h>
 #include <unistd.h>
 #include "wine/winbase16.h"
 #include "thread.h"
@@ -16,7 +15,6 @@
 #include "winerror.h"
 #include "heap.h"
 #include "selectors.h"
-#include "miscemu.h"
 #include "winnt.h"
 #include "server.h"
 #include "stackframe.h"
diff --git a/win32/code_page.c b/win32/code_page.c
index 2c395c2..89a2b15 100644
--- a/win32/code_page.c
+++ b/win32/code_page.c
@@ -5,7 +5,6 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
 #include "winerror.h"
 #include "winnls.h"
 #include "heap.h"
diff --git a/win32/console.c b/win32/console.c
index 3453952..98ebbec 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -33,7 +33,9 @@
 #include <signal.h>
 #include <assert.h>
 
-#include "windows.h"
+#include "winbase.h"
+#include "wine/winuser16.h"
+#include "wine/keyboard16.h"
 #include "k32obj.h"
 #include "thread.h"
 #include "async.h"
diff --git a/win32/device.c b/win32/device.c
index 36b8b5a..934a5be 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -17,8 +17,8 @@
 #include <fcntl.h>
 #include <string.h>
 #include <time.h>
-#include "windows.h"
 #include "winbase.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "file.h"
 #include "process.h"
diff --git a/win32/error.c b/win32/error.c
index 3c2ee11..0e95514 100644
--- a/win32/error.c
+++ b/win32/error.c
@@ -5,7 +5,6 @@
  */
 
 #include <errno.h>
-#include "windows.h"
 #include "winerror.h"
 #include "debug.h"
 
diff --git a/win32/except.c b/win32/except.c
index 014cb7f..110b762 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -32,7 +32,7 @@
  */
 
 #include <assert.h>
-#include "windows.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "ldt.h"
 #include "process.h"
diff --git a/win32/file.c b/win32/file.c
index 4e4c142..7c48436 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <time.h>
-#include "windows.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "file.h"
diff --git a/win32/init.c b/win32/init.c
index c2c9b5e..6856117 100644
--- a/win32/init.c
+++ b/win32/init.c
@@ -7,9 +7,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include "except.h"
-#include "windows.h"
 #include "winerror.h"
+#include "wine/winestring.h"
+#include "except.h"
 #include "heap.h"
 #include "task.h"
 #include "debug.h"
diff --git a/win32/kernel32.c b/win32/kernel32.c
index 0b64609..3335dce 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -8,7 +8,9 @@
  *      the function documentation for more details.
  */
 
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
 #include "callback.h"
 #include "task.h"
 #include "user.h"
diff --git a/win32/newfns.c b/win32/newfns.c
index c0a04da..b65c9e3 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -10,8 +10,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include "windows.h"
-#include "winnt.h"
+#include "wintypes.h"
 #include "winerror.h"
 #include "heap.h"
 #include "debug.h"
diff --git a/win32/process.c b/win32/process.c
index 3744390..3e466c3 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/times.h>
-#include "windows.h"
+#include "winbase.h"
 #include "winerror.h"
 #include "heap.h"
 #include "thread.h"
diff --git a/win32/thread.c b/win32/thread.c
index a235a5f..87855c8 100644
--- a/win32/thread.c
+++ b/win32/thread.c
@@ -7,8 +7,7 @@
 
 #include <unistd.h>
 #include <string.h>
-#include "winnt.h"
-#include "winbase.h"
+#include "wintypes.h"
 #include "winerror.h"
 #include "debug.h"
 
diff --git a/win32/time.c b/win32/time.c
index b6bdf77..f9c7dbe 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -9,7 +9,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include "file.h"
-#include "windows.h"
 #include "winerror.h"
 #include "debug.h"