diff --git a/debugger/dbgmain.c b/debugger/dbgmain.c index 114b4a1bd7e..084ad92e02c 100644 --- a/debugger/dbgmain.c +++ b/debugger/dbgmain.c @@ -12,8 +12,6 @@ #include "module.h" #include "debugger.h" #include "win.h" - -#include "debugger.h" #include "peexe.h" #include "pe_image.h" diff --git a/debugger/editline.c b/debugger/editline.c index 3063357d69a..fa690d71ba9 100644 --- a/debugger/editline.c +++ b/debugger/editline.c @@ -33,7 +33,6 @@ #include #include #include -#include #include "windef.h" #include "debugger.h" diff --git a/debugger/source.c b/debugger/source.c index 05e8c708fb0..b372d705eee 100644 --- a/debugger/source.c +++ b/debugger/source.c @@ -26,7 +26,6 @@ #include "pe_image.h" #include "peexe.h" #include "debugger.h" -#include "peexe.h" #include "task.h" struct searchlist diff --git a/debugger/stabs.c b/debugger/stabs.c index b318a0d2606..cb5f7f0bb9d 100644 --- a/debugger/stabs.c +++ b/debugger/stabs.c @@ -37,9 +37,6 @@ #ifdef HAVE_LINK_H # include #endif -#ifdef HAVE_SYS_MMAN_H -# include -#endif #elif defined(__EMX__) #ifdef HAVE_A_OUT_H # include diff --git a/debugger/types.c b/debugger/types.c index 04bef27e635..1719586e617 100644 --- a/debugger/types.c +++ b/debugger/types.c @@ -22,7 +22,6 @@ #include "pe_image.h" #include "peexe.h" #include "debugger.h" -#include "peexe.h" #define NR_TYPE_HASH 521 diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c index 2de08c6b847..9a2721d6c07 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/icmp/icmp_main.c @@ -59,7 +59,6 @@ #define LITTLE_ENDIAN 1234 #endif #ifndef BYTE_ORDER -#include "config.h" #ifdef WORDS_BIGENDIAN #define BYTE_ORDER BIG_ENDIAN #else diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 513e72c5225..251db264425 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -18,7 +18,6 @@ #include "winnls.h" #include "debugstr.h" #include "debugtools.h" -#include "winuser.h" #include "winerror.h" #include "stackframe.h" diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ce3f5e4f30c..e11bdc35765 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -116,7 +116,6 @@ typedef struct trapframe SIGCONTEXT; #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -#include typedef struct sigcontext SIGCONTEXT; #define HANDLER_DEF(name) void name( int __signal, int code, SIGCONTEXT *__context ) @@ -126,7 +125,6 @@ typedef struct sigcontext SIGCONTEXT; #if defined(__svr4__) || defined(_SCO_DS) || defined(__sun) -#include #ifdef _SCO_DS #include #endif diff --git a/dlls/wing/wing_main.c b/dlls/wing/wing_main.c index 5d5084366be..595f09c5aa6 100644 --- a/dlls/wing/wing_main.c +++ b/dlls/wing/wing_main.c @@ -17,7 +17,6 @@ #include "monitor.h" #include "palette.h" #include "windef.h" -#include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(wing) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index a0e8e09d975..f7f9c791e25 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -18,7 +18,6 @@ #include "digitalv.h" #include "options.h" #include "wine/winbase16.h" -#include "winuser.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(mci) diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 56a8a65034d..5b40e35ff5e 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -15,6 +15,7 @@ */ #include "config.h" +#include "winerror.h" #ifndef X_DISPLAY_MISSING @@ -51,7 +52,6 @@ #include #include -#include "winerror.h" #include "gdi.h" #include "heap.h" #include "dc.h" @@ -5251,7 +5251,6 @@ DWORD WINAPI DDRAW_DllCanUnloadNow(void) #else /* !defined(X_DISPLAY_MISSING) */ #include "windef.h" -#include "winerror.h" #include "wtypes.h" #define DD_OK 0 diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c index 70c715caf1c..3f43619bdfd 100644 --- a/graphics/x11drv/graphics.c +++ b/graphics/x11drv/graphics.c @@ -33,7 +33,6 @@ #include "gdi.h" #include "dc.h" #include "monitor.h" -#include "bitmap.h" #include "callback.h" #include "metafile.h" #include "palette.h" diff --git a/loader/loadorder.c b/loader/loadorder.c index 101a8b228c3..ea47c59b6c8 100644 --- a/loader/loadorder.c +++ b/loader/loadorder.c @@ -13,7 +13,6 @@ #include "options.h" #include "loadorder.h" #include "heap.h" -#include "options.h" #include "module.h" #include "elfdll.h" #include "debugtools.h" diff --git a/loader/main.c b/loader/main.c index 7bf2f2938a0..7e801b5e5a1 100644 --- a/loader/main.c +++ b/loader/main.c @@ -49,7 +49,6 @@ #include "win16drv.h" #include "callback.h" #include "server.h" -#include "cursoricon.h" #include "loadorder.h" DEFAULT_DEBUG_CHANNEL(server) diff --git a/loader/ne/convert.c b/loader/ne/convert.c index 590e77a9567..00cbb222783 100644 --- a/loader/ne/convert.c +++ b/loader/ne/convert.c @@ -8,7 +8,6 @@ #include "wine/winuser16.h" #include "module.h" #include "debugtools.h" -#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(resource) diff --git a/loader/ne/module.c b/loader/ne/module.c index a948e978d30..cf979145b6e 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -23,15 +23,12 @@ #include "task.h" #include "global.h" #include "process.h" -#include "toolhelp.h" #include "snoop.h" #include "builtin16.h" #include "stackframe.h" #include "debugtools.h" -#include "file.h" #include "loadorder.h" #include "elfdll.h" -#include "toolhelp.h" DEFAULT_DEBUG_CHANNEL(module) diff --git a/loader/task.c b/loader/task.c index 07a6d87c402..ca93800ef36 100644 --- a/loader/task.c +++ b/loader/task.c @@ -31,7 +31,6 @@ #include "toolhelp.h" #include "winnt.h" #include "winsock.h" -#include "thread.h" #include "syslevel.h" #include "debugtools.h" #include "dosexe.h" diff --git a/misc/cpu.c b/misc/cpu.c index dec6e2dc7f0..f8fd090acbd 100644 --- a/misc/cpu.c +++ b/misc/cpu.c @@ -14,7 +14,6 @@ #include "global.h" #include "winnt.h" #include "winerror.h" -#include "winreg.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(reg) diff --git a/msdos/ioports.c b/msdos/ioports.c index 931970ecabb..29e2329c550 100644 --- a/msdos/ioports.c +++ b/msdos/ioports.c @@ -22,7 +22,6 @@ #include "options.h" #include "miscemu.h" #include "debugtools.h" -#include "miscemu.h" DEFAULT_DEBUG_CHANNEL(int) diff --git a/ole/guid.c b/ole/guid.c index e59a51291c3..e8da44818b8 100644 --- a/ole/guid.c +++ b/ole/guid.c @@ -14,7 +14,6 @@ #include "olectl.h" #include "oleidl.h" #include "oaidl.h" -#include "olectl.h" #include "ocidl.h" #include "objbase.h" #include "servprov.h" @@ -25,9 +24,7 @@ #include "dplay.h" #include "dplobby.h" #include "vfw.h" -#include "shlguid.h" #include "shlobj.h" -#include "docobj.h" /* and now for the one assumed GUID... */ DEFINE_GUID(GUID_NULL, 0,0,0,0,0,0,0,0,0,0,0); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 26e14f5d067..388ba6c9344 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -10,8 +10,6 @@ #ifdef LCC #include "lcc.h" -#else -#include "shell.h" #endif #include "main.h" @@ -19,10 +17,13 @@ #include "dialog.h" #include "language.h" +#if !defined(LCC) || defined(WINELIB) +#include "shell.h" +#endif + #ifdef WINELIB #include "options.h" #include "resource.h" -#include "shell.h" void LIBWINE_Register_Da(); void LIBWINE_Register_De(); void LIBWINE_Register_En(); diff --git a/scheduler/critsection.c b/scheduler/critsection.c index 71af68ab99b..1f46cdbdc42 100644 --- a/scheduler/critsection.c +++ b/scheduler/critsection.c @@ -8,7 +8,6 @@ #include #include #include -#include "debugtools.h" #include "winerror.h" #include "winbase.h" #include "heap.h" diff --git a/scheduler/process.c b/scheduler/process.c index 5bf16c8766f..7804fae671f 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -21,7 +21,6 @@ #include "thread.h" #include "winerror.h" #include "pe_image.h" -#include "task.h" #include "server.h" #include "options.h" #include "callback.h" diff --git a/server/socket.c b/server/socket.c index c540aac042c..57411105a47 100644 --- a/server/socket.c +++ b/server/socket.c @@ -21,7 +21,6 @@ #include #include -#include "config.h" #include "object.h" #include "request.h" diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index a6c1ce27f42..2b1f2ddf1c6 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -12,7 +12,6 @@ #include #include #include -#include #include "wrc.h" #include "newstruc.h" diff --git a/win32/console.c b/win32/console.c index bf04381a146..0284cc8f877 100644 --- a/win32/console.c +++ b/win32/console.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #ifdef HAVE_SYS_ERRNO_H diff --git a/win32/kernel32.c b/win32/kernel32.c index bad97f31df8..7e303165f09 100644 --- a/win32/kernel32.c +++ b/win32/kernel32.c @@ -19,9 +19,7 @@ #include "neexe.h" #include "process.h" #include "stackframe.h" -#include "heap.h" #include "selectors.h" -#include "task.h" #include "file.h" #include "debugtools.h" #include "flatthunk.h" diff --git a/windows/x11drv/main.c b/windows/x11drv/main.c index f1b8749304d..63450a3c03c 100644 --- a/windows/x11drv/main.c +++ b/windows/x11drv/main.c @@ -34,7 +34,6 @@ #include "x11drv.h" #include "xmalloc.h" #include "version.h" -#include "win.h" /**********************************************************************/