Removed extra #include statements.

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"
 

debugger/editline.c

@@ -33,7 +33,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "windef.h"
 #include "debugger.h"

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

debugger/stabs.c

@@ -37,9 +37,6 @@
 #ifdef HAVE_LINK_H
 # include <link.h>
 #endif
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
 #elif defined(__EMX__)
 #ifdef HAVE_A_OUT_H
 # include <a_out.h>

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
 

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

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"
 

dlls/ntdll/signal_i386.c

@@ -116,7 +116,6 @@ typedef struct trapframe SIGCONTEXT;
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 
-#include <signal.h>
 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 <signal.h>
 #ifdef _SCO_DS
 #include <sys/regset.h>
 #endif

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)
 

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)

graphics/ddraw.c

@@ -15,6 +15,7 @@
  */
 
 #include "config.h"
+#include "winerror.h"
 
 #ifndef X_DISPLAY_MISSING 
 
@@ -51,7 +52,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#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

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"

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"

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)

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)
 

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)
 

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"

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)

msdos/ioports.c

@@ -22,7 +22,6 @@
 #include "options.h"
 #include "miscemu.h"
 #include "debugtools.h"
-#include "miscemu.h"
 
 DEFAULT_DEBUG_CHANNEL(int)
 

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);

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();

scheduler/critsection.c

@@ -8,7 +8,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "debugtools.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "heap.h"

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"

server/socket.c

@@ -21,7 +21,6 @@
 #include <sys/uio.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "object.h"
 #include "request.h"
 

tools/wrc/newstruc.c

@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <string.h>
 
 #include "wrc.h"
 #include "newstruc.h"

win32/console.c

@@ -28,7 +28,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #ifdef HAVE_SYS_ERRNO_H

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"

windows/x11drv/main.c

@@ -34,7 +34,6 @@
 #include "x11drv.h"
 #include "xmalloc.h"
 #include "version.h"
-#include "win.h"
 
 /**********************************************************************/