From 04c3e1d456738a1854f295ff6f9521d8c2426817 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 19 Feb 1999 10:37:02 +0000 Subject: [PATCH] Removed a lot of occurences of windows.h (and added necessary other includes). --- debugger/break.c | 2 +- debugger/db_disasm.c | 1 - debugger/dbg.y | 2 +- debugger/memory.c | 2 +- debugger/msc.c | 2 -- debugger/source.c | 1 - debugger/stabs.c | 1 - debugger/stack.c | 1 - debugger/types.c | 1 - dlls/comctl32/comboex.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/draglist.c | 1 - dlls/comctl32/updown.c | 1 - dlls/msacm/msacm_main.c | 3 +-- dlls/msacm32/filter.c | 3 +-- dlls/msacm32/internal.c | 3 +-- files/directory.c | 4 +++- graphics/cache.c | 2 +- graphics/d3dcommon.c | 2 -- graphics/d3ddevices.c | 1 - graphics/d3dexecutebuffer.c | 1 - graphics/d3dlight.c | 1 - graphics/d3dmaterial.c | 1 - graphics/d3dtexture.c | 1 - graphics/d3dviewport.c | 1 - graphics/ddraw.c | 1 - graphics/dispdib.c | 1 - graphics/env.c | 1 - graphics/escape.c | 2 +- graphics/fontengine.c | 2 +- graphics/mapping.c | 1 - graphics/painting.c | 8 -------- graphics/path.c | 3 ++- graphics/psdrv/afm.c | 1 - graphics/psdrv/bitmap.c | 1 - graphics/psdrv/brush.c | 1 - graphics/psdrv/color.c | 1 - graphics/psdrv/driver.c | 3 +-- graphics/psdrv/font.c | 1 - graphics/psdrv/graphics.c | 1 - graphics/psdrv/init.c | 1 - graphics/psdrv/objects.c | 1 - graphics/psdrv/pen.c | 1 - graphics/psdrv/ppd.c | 1 - graphics/psdrv/ps.c | 1 - graphics/psdrv/text.c | 1 - graphics/vga.c | 3 ++- graphics/win16drv/font.c | 3 +-- graphics/win16drv/init.c | 1 - graphics/win16drv/prtdrv.c | 2 +- graphics/win16drv/text.c | 1 - if1632/builtin.c | 4 ++-- if1632/relay.c | 3 ++- if1632/snoop.c | 1 - include/dispdib.h | 2 +- loader/dos/dosvm.c | 1 + loader/elf.c | 1 - loader/libres.c | 2 +- loader/pe_image.c | 2 +- loader/pe_resource.c | 2 +- loader/resource.c | 5 ++++- memory/environ.c | 1 - memory/global.c | 2 +- memory/heap.c | 3 ++- memory/local.c | 2 +- memory/selector.c | 2 +- memory/string.c | 3 ++- misc/callback.c | 4 ++-- misc/cpu.c | 4 +++- misc/crtdll.c | 4 ++-- misc/ddeml.c | 6 +++--- misc/error.c | 2 +- misc/imm.c | 3 ++- misc/lstr.c | 6 ++++-- misc/lzexpand.c | 5 ++++- misc/main.c | 4 +--- misc/network.c | 5 +++-- misc/registry.c | 6 ++++-- misc/shell.c | 2 -- misc/sound.c | 2 +- misc/system.c | 3 ++- misc/tapi32.c | 2 +- misc/toolhelp.c | 4 ++-- misc/tweak.c | 2 +- misc/version.c | 4 ++-- misc/w32scomb.c | 4 ++-- misc/w32skrnl.c | 4 +--- misc/w32sys.c | 2 +- misc/win32s16.c | 2 +- misc/windebug.c | 2 +- misc/winsock.c | 3 +-- misc/winsock_dns.c | 1 - misc/wsprintf.c | 3 ++- miscemu/instr.c | 2 +- msdos/xms.c | 1 + relay32/snoop.c | 1 - scheduler/critsection.c | 1 - scheduler/event.c | 1 - scheduler/mutex.c | 1 - scheduler/pipe.c | 1 - scheduler/semaphore.c | 1 - scheduler/thread.c | 2 -- win32/code_page.c | 1 - win32/console.c | 4 +++- win32/device.c | 2 +- win32/error.c | 1 - win32/except.c | 2 +- win32/file.c | 1 - win32/init.c | 4 ++-- win32/kernel32.c | 4 +++- win32/newfns.c | 3 +-- win32/process.c | 2 +- win32/thread.c | 3 +-- win32/time.c | 1 - 114 files changed, 103 insertions(+), 147 deletions(-) diff --git a/debugger/break.c b/debugger/break.c index 4216158a7ae..b0252deb7f0 100644 --- a/debugger/break.c +++ b/debugger/break.c @@ -9,13 +9,13 @@ #include #include #include +#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 2ae25ca2546..0345b039d8c 100644 --- a/debugger/db_disasm.c +++ b/debugger/db_disasm.c @@ -63,7 +63,6 @@ */ #include -#include "windows.h" #include "debugger.h" /* diff --git a/debugger/dbg.y b/debugger/dbg.y index 5ec81acff1b..8f74fad4f59 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 7658a372af4..e36e76ff5b1 100644 --- a/debugger/memory.c +++ b/debugger/memory.c @@ -7,7 +7,7 @@ #include #include -#include "windows.h" +#include "wine/winbase16.h" #include "debugger.h" #include "miscemu.h" diff --git a/debugger/msc.c b/debugger/msc.c index efdd16fa6e9..b5fa606ed3c 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 04627ed1ef5..95ce030225b 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 b26be2141d8..966f8f0bd38 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 2fe17c0328f..574d7349b75 100644 --- a/debugger/stack.c +++ b/debugger/stack.c @@ -8,7 +8,6 @@ #include #include #include "xmalloc.h" -#include "windows.h" #include "debugger.h" diff --git a/debugger/types.c b/debugger/types.c index 6c94c4d50ef..df1738d6888 100644 --- a/debugger/types.c +++ b/debugger/types.c @@ -18,7 +18,6 @@ #include #include -#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 a77f67914c9..9f16aacc4b9 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 6bec9026ff0..9e702b528cd 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 560fa801516..8b099121b3f 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 8d1ed3222d8..25a9ac86168 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -32,7 +32,6 @@ #include #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 ea65a5bcb96..837418afaa3 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 b0fddca24b5..0c4f26763d0 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 f382a0a7a64..e06d9e1d088 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 9ef6efebe19..62e91e6c4d8 100644 --- a/files/directory.c +++ b/files/directory.c @@ -13,7 +13,9 @@ #include #include -#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 5d0f1843874..7cf4c929ab2 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 4a46eb315db..47cbb1c05fa 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 b74ffef363c..c73700ee583 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 87ebbb61116..9a02ed9759e 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 94a6378b7e3..ddf64aed813 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 17727159b39..0bb4f6e2029 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 46d7d377b58..6a41917bd4d 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 da90c8ecc5c..07a8c5686e4 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 fdf2f968002..3f21ef48888 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -46,7 +46,6 @@ #include #include #include -#include "windows.h" #include "winerror.h" #include "gdi.h" diff --git a/graphics/dispdib.c b/graphics/dispdib.c index eab4077bd67..f1ed6296464 100644 --- a/graphics/dispdib.c +++ b/graphics/dispdib.c @@ -6,7 +6,6 @@ */ #include -#include "windows.h" #include "miscemu.h" #include "dispdib.h" #include "vga.h" diff --git a/graphics/env.c b/graphics/env.c index 8220a216a90..8f1e4b93406 100644 --- a/graphics/env.c +++ b/graphics/env.c @@ -8,7 +8,6 @@ */ #include #include -#include "windows.h" #include "config.h" #include "gdi.h" #include "debug.h" diff --git a/graphics/escape.c b/graphics/escape.c index 8b4a9c40e42..d6986a83549 100644 --- a/graphics/escape.c +++ b/graphics/escape.c @@ -5,7 +5,7 @@ */ #include -#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 1ea67c72c51..f9016de925b 100644 --- a/graphics/fontengine.c +++ b/graphics/fontengine.c @@ -8,7 +8,7 @@ #include #include #include -#include "windows.h" +#include "winbase.h" #include "font.h" diff --git a/graphics/mapping.c b/graphics/mapping.c index 52eb7a3d651..f9a1f834323 100644 --- a/graphics/mapping.c +++ b/graphics/mapping.c @@ -4,7 +4,6 @@ * Copyright 1993 Alexandre Julliard */ -#include #include "dc.h" #include "debug.h" diff --git a/graphics/painting.c b/graphics/painting.c index 0a5100d5645..bc7e60576d9 100644 --- a/graphics/painting.c +++ b/graphics/painting.c @@ -10,19 +10,11 @@ #include "ts_xutil.h" #include "x11drv.h" -#include #include -#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 8e588a6f5ca..bf6e8df888d 100644 --- a/graphics/path.c +++ b/graphics/path.c @@ -8,7 +8,8 @@ #include #include -#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 8345345f9da..a11cd100b09 100644 --- a/graphics/psdrv/afm.c +++ b/graphics/psdrv/afm.c @@ -7,7 +7,6 @@ */ #include -#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 1a0698b8051..2b8f340f3bc 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 2579e4c9e49..1b3cd85a963 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 f53e037aac4..7ceaa99f343 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 261c11ad186..2b3b70357b8 100644 --- a/graphics/psdrv/driver.c +++ b/graphics/psdrv/driver.c @@ -10,11 +10,10 @@ */ #include -#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 3085bb9b722..dc471c0643b 100644 --- a/graphics/psdrv/font.c +++ b/graphics/psdrv/font.c @@ -5,7 +5,6 @@ * */ #include -#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 a535c75dc8f..836362934d9 100644 --- a/graphics/psdrv/graphics.c +++ b/graphics/psdrv/graphics.c @@ -6,7 +6,6 @@ */ #include #include -#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 e86b83fb49a..23481468362 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 187161e38c9..1c85773ac76 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 958ffdaff6f..e0186459297 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 e5d1ab76c47..fbc32d27df1 100644 --- a/graphics/psdrv/ppd.c +++ b/graphics/psdrv/ppd.c @@ -7,7 +7,6 @@ #include #include -#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 6a47c67871c..3b73498d6f4 100644 --- a/graphics/psdrv/ps.c +++ b/graphics/psdrv/ps.c @@ -7,7 +7,6 @@ #include #include -#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 ee2a02bc681..bffe95633de 100644 --- a/graphics/psdrv/text.c +++ b/graphics/psdrv/text.c @@ -5,7 +5,6 @@ * */ #include -#include "windows.h" #include "psdrv.h" #include "debug.h" #include "winspool.h" diff --git a/graphics/vga.c b/graphics/vga.c index 742c526926b..d006e0d7b3e 100644 --- a/graphics/vga.c +++ b/graphics/vga.c @@ -6,8 +6,9 @@ */ #include -#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 fb9d1e5a532..22ad850f1d1 100644 --- a/graphics/win16drv/font.c +++ b/graphics/win16drv/font.c @@ -6,9 +6,8 @@ */ #include -#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 50389497671..e2f04e3f884 100644 --- a/graphics/win16drv/init.c +++ b/graphics/win16drv/init.c @@ -7,7 +7,6 @@ #include #include -#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 bfff6a030f1..20eb7495d36 100644 --- a/graphics/win16drv/prtdrv.c +++ b/graphics/win16drv/prtdrv.c @@ -10,7 +10,7 @@ #include #include #include -#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 609ecaf0a28..815b1957b3a 100644 --- a/graphics/win16drv/text.c +++ b/graphics/win16drv/text.c @@ -6,7 +6,6 @@ */ #include -#include "windows.h" #include "win16drv.h" #include "dc.h" #include "gdi.h" diff --git a/if1632/builtin.c b/if1632/builtin.c index df96d3ac667..a5141704308 100644 --- a/if1632/builtin.c +++ b/if1632/builtin.c @@ -7,9 +7,9 @@ #include #include #include -#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 e5ad14a78c0..b072f9d4882 100644 --- a/if1632/relay.c +++ b/if1632/relay.c @@ -5,7 +5,8 @@ #include #include -#include "windows.h" +#include +#include "wine/winbase16.h" #include "winnt.h" #include "global.h" #include "heap.h" diff --git a/if1632/snoop.c b/if1632/snoop.c index d560e3c3a69..69915aab744 100644 --- a/if1632/snoop.c +++ b/if1632/snoop.c @@ -6,7 +6,6 @@ #include #include -#include "windows.h" #include "winbase.h" #include "winnt.h" #include "heap.h" diff --git a/include/dispdib.h b/include/dispdib.h index 72e5d87aaae..87cffd891cb 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 59094bf0771..ce93852dfb9 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 9214bebf75c..203b995c7ac 100644 --- a/loader/elf.c +++ b/loader/elf.c @@ -16,7 +16,6 @@ #include #include -#include "windows.h" #include "snoop.h" #include "process.h" #include "neexe.h" diff --git a/loader/libres.c b/loader/libres.c index 081d0957335..c1485dbfb56 100644 --- a/loader/libres.c +++ b/loader/libres.c @@ -5,11 +5,11 @@ */ #include +#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 1a4b99ca37f..719937704cd 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -44,7 +44,7 @@ #include #include #include -#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 9839b696679..0e2ab767c12 100644 --- a/loader/pe_resource.c +++ b/loader/pe_resource.c @@ -12,8 +12,8 @@ #include #include +#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 082bbff61ab..d14f0c16098 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -12,7 +12,10 @@ #include #include #include -#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 ab77b121367..ad9db92d46e 100644 --- a/memory/environ.c +++ b/memory/environ.c @@ -4,7 +4,6 @@ * Copyright 1996, 1998 Alexandre Julliard */ -#include #include #include #include "winuser.h" diff --git a/memory/global.c b/memory/global.c index c6a9f6aae71..cd470c0763d 100644 --- a/memory/global.c +++ b/memory/global.c @@ -10,7 +10,7 @@ #include #include -#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 2264fefb1bc..e9f5c7490a1 100644 --- a/memory/heap.c +++ b/memory/heap.c @@ -8,7 +8,8 @@ #include #include #include -#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 abdb618ae24..d0f15d9c797 100644 --- a/memory/local.c +++ b/memory/local.c @@ -14,7 +14,7 @@ #include #include -#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 6480aec3cbf..d3bbdbb2ff2 100644 --- a/memory/selector.c +++ b/memory/selector.c @@ -5,7 +5,7 @@ */ #include -#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 567d3b467d1..7336494e0b0 100644 --- a/memory/string.c +++ b/memory/string.c @@ -7,7 +7,8 @@ #include #include -#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 fe489ac7426..83d77e7c954 100644 --- a/misc/callback.c +++ b/misc/callback.c @@ -5,12 +5,12 @@ */ #include -#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 37c9f1b4588..dc40c825f6b 100644 --- a/misc/cpu.c +++ b/misc/cpu.c @@ -7,8 +7,10 @@ #include #include +#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 e3523978f6d..7c1a5948080 100644 --- a/misc/crtdll.c +++ b/misc/crtdll.c @@ -38,8 +38,8 @@ AJ 990101: #include #include #include -#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 ebc7bda323c..8efab81437a 100644 --- a/misc/ddeml.c +++ b/misc/ddeml.c @@ -10,13 +10,13 @@ #include #include +#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 dace017565c..d8ef9a6e3f3 100644 --- a/misc/error.c +++ b/misc/error.c @@ -7,7 +7,7 @@ #include #include -#include "windows.h" +#include "wintypes.h" #include "stackframe.h" #include "debug.h" diff --git a/misc/imm.c b/misc/imm.c index d0d43be8ca1..d2d3d2d923d 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 482020506f0..69e403683d0 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 8e5f8f5c4d2..dfa3b0e6c5c 100644 --- a/misc/lzexpand.c +++ b/misc/lzexpand.c @@ -9,7 +9,10 @@ #include #include -#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 6ba14ebb1a6..f7a36a9642b 100644 --- a/misc/main.c +++ b/misc/main.c @@ -21,16 +21,14 @@ #ifdef MALLOC_DEBUGGING # include #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 de63eaf4899..af8a1a648d2 100644 --- a/misc/network.c +++ b/misc/network.c @@ -11,12 +11,13 @@ #include #include -#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 b738b716d5c..47336cea9c2 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -30,8 +30,10 @@ #include #include #include -#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 0ae8fc1631d..3134efe0f06 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 337bc488fcb..be5ed72d586 100644 --- a/misc/sound.c +++ b/misc/sound.c @@ -3,7 +3,7 @@ */ #include -#include "windows.h" +#include "wintypes.h" #include "debug.h" INT16 WINAPI OpenSound16(void) diff --git a/misc/system.c b/misc/system.c index b29a62dca56..227a0f4da6c 100644 --- a/misc/system.c +++ b/misc/system.c @@ -12,7 +12,8 @@ #include #include -#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 e5e223cbd80..8d40e3caff7 100644 --- a/misc/tapi32.c +++ b/misc/tapi32.c @@ -7,7 +7,7 @@ #include #include #include -#include "windows.h" +#include "wintypes.h" #include "debug.h" UINT32 WINAPI lineInitialize( diff --git a/misc/toolhelp.c b/misc/toolhelp.c index d09f2a98b75..93178be6cf6 100644 --- a/misc/toolhelp.c +++ b/misc/toolhelp.c @@ -9,8 +9,8 @@ #include #include #include -#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 9ce44e046d3..69a63d6f9c0 100644 --- a/misc/tweak.c +++ b/misc/tweak.c @@ -29,7 +29,7 @@ *****************************************************************************/ #include -#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 0c8b2f08f33..1d23ba9b63b 100644 --- a/misc/version.c +++ b/misc/version.c @@ -9,12 +9,12 @@ #include #include -#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 4d77ce86823..0bd2910bc01 100644 --- a/misc/w32scomb.c +++ b/misc/w32scomb.c @@ -8,11 +8,11 @@ #include #include #include -#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 6f3030f8981..2ef3b2b4744 100644 --- a/misc/w32skrnl.c +++ b/misc/w32skrnl.c @@ -6,9 +6,7 @@ */ #include -#include -#include -#include "windows.h" +#include "winbase.h" LPSTR WINAPI GetWin32sDirectory(void) { diff --git a/misc/w32sys.c b/misc/w32sys.c index fbf394009d1..74280f9ddf2 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 42913d11019..9bc895ae668 100644 --- a/misc/win32s16.c +++ b/misc/win32s16.c @@ -7,7 +7,7 @@ #include #include -#include "windows.h" +#include "wintypes.h" #include "debug.h" void WINAPI BootTask() diff --git a/misc/windebug.c b/misc/windebug.c index 53b4e257fb8..bf5f2f94700 100644 --- a/misc/windebug.c +++ b/misc/windebug.c @@ -6,7 +6,7 @@ #include #include -#include "windows.h" +#include "wintypes.h" #include "module.h" #include "debug.h" diff --git a/misc/winsock.c b/misc/winsock.c index 10881fd5f75..c12dcc72be8 100644 --- a/misc/winsock.c +++ b/misc/winsock.c @@ -13,7 +13,6 @@ #include "config.h" #include -#include #include #include #include @@ -46,8 +45,8 @@ #include #include +#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 801e77c468e..6ab8345ff8f 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 ef811e3d39e..67779015b9b 100644 --- a/misc/wsprintf.c +++ b/misc/wsprintf.c @@ -6,7 +6,8 @@ #include #include -#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 577644c5334..e2090d8c0f7 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 07d10378d79..c5d462fdb06 100644 --- a/msdos/xms.c +++ b/msdos/xms.c @@ -9,6 +9,7 @@ #include #include #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 b09dea3517e..e83e828719a 100644 --- a/relay32/snoop.c +++ b/relay32/snoop.c @@ -7,7 +7,6 @@ #include #include -#include "windows.h" #include "winbase.h" #include "winnt.h" #include "heap.h" diff --git a/scheduler/critsection.c b/scheduler/critsection.c index 900ebfc7447..dd8bc1ebdfc 100644 --- a/scheduler/critsection.c +++ b/scheduler/critsection.c @@ -10,7 +10,6 @@ #include #include #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 fbf2991927a..597689d04f8 100644 --- a/scheduler/event.c +++ b/scheduler/event.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "k32obj.h" #include "process.h" diff --git a/scheduler/mutex.c b/scheduler/mutex.c index 83f1917440e..895216ec267 100644 --- a/scheduler/mutex.c +++ b/scheduler/mutex.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "k32obj.h" #include "process.h" diff --git a/scheduler/pipe.c b/scheduler/pipe.c index 0847ec5794f..cc27c6a73cd 100644 --- a/scheduler/pipe.c +++ b/scheduler/pipe.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "k32obj.h" #include "process.h" diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c index 24a70db64cb..7a0ce620bcc 100644 --- a/scheduler/semaphore.c +++ b/scheduler/semaphore.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "k32obj.h" #include "process.h" diff --git a/scheduler/thread.c b/scheduler/thread.c index 4b4d1eae13f..ec65a9c238b 100644 --- a/scheduler/thread.c +++ b/scheduler/thread.c @@ -5,7 +5,6 @@ */ #include -#include #include #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 2c395c220b3..89a2b15c41b 100644 --- a/win32/code_page.c +++ b/win32/code_page.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "winnls.h" #include "heap.h" diff --git a/win32/console.c b/win32/console.c index 3453952b54c..98ebbec6d2b 100644 --- a/win32/console.c +++ b/win32/console.c @@ -33,7 +33,9 @@ #include #include -#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 36b8b5a0631..934a5be26ae 100644 --- a/win32/device.c +++ b/win32/device.c @@ -17,8 +17,8 @@ #include #include #include -#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 3c2ee11a62d..0e95514c03d 100644 --- a/win32/error.c +++ b/win32/error.c @@ -5,7 +5,6 @@ */ #include -#include "windows.h" #include "winerror.h" #include "debug.h" diff --git a/win32/except.c b/win32/except.c index 014cb7f1475..110b7627673 100644 --- a/win32/except.c +++ b/win32/except.c @@ -32,7 +32,7 @@ */ #include -#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 4e4c142efda..7c484365b29 100644 --- a/win32/file.c +++ b/win32/file.c @@ -14,7 +14,6 @@ #include #include #include -#include "windows.h" #include "winbase.h" #include "winerror.h" #include "file.h" diff --git a/win32/init.c b/win32/init.c index c2c9b5ef8c2..6856117f7cf 100644 --- a/win32/init.c +++ b/win32/init.c @@ -7,9 +7,9 @@ #include #include #include -#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 0b64609df0a..3335dce978d 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 c0a04da6a3b..b65c9e382e2 100644 --- a/win32/newfns.c +++ b/win32/newfns.c @@ -10,8 +10,7 @@ at a later date. */ #include #include #include -#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 37443906230..3e466c3273a 100644 --- a/win32/process.c +++ b/win32/process.c @@ -7,7 +7,7 @@ #include #include #include -#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 a235a5f2f6f..87855c89fda 100644 --- a/win32/thread.c +++ b/win32/thread.c @@ -7,8 +7,7 @@ #include #include -#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 b6bdf775878..f9c7dbeb7b5 100644 --- a/win32/time.c +++ b/win32/time.c @@ -9,7 +9,6 @@ #include #include #include "file.h" -#include "windows.h" #include "winerror.h" #include "debug.h"