Don't include winbase.h or winerror.h when not necessary.

dlls/ntdll/atom.c

@@ -29,7 +29,6 @@
 #include <ctype.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "ntstatus.h"
 
 #include "wine/server.h"

dlls/ntdll/cdrom.c

@@ -79,7 +79,6 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "ntddstor.h"

dlls/ntdll/critsection.c

@@ -25,9 +25,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "winerror.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"

dlls/ntdll/debugbuffer.c

@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 #include "ntdll_misc.h"

dlls/ntdll/debugtools.c

@@ -35,7 +35,6 @@
 #include "wine/library.h"
 #include "wine/unicode.h"
 #include "ntstatus.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 #include "excpt.h"

dlls/ntdll/directory.c

@@ -57,7 +57,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "ntstatus.h"
 #include "winternl.h"

dlls/ntdll/env.c

@@ -24,7 +24,6 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/ntdll/error.c

@@ -25,7 +25,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/debug.h"

dlls/ntdll/exception.c

@@ -28,7 +28,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/exception.h"
 #include "wine/server.h"

dlls/ntdll/handletable.c

@@ -21,7 +21,6 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"

dlls/ntdll/heap.c

@@ -34,9 +34,7 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
-#include "winerror.h"
 #include "winnt.h"
 #include "wine/debug.h"
 #include "winternl.h"

dlls/ntdll/large_int.c

@@ -23,7 +23,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 
 /*

dlls/ntdll/loader.c

@@ -29,7 +29,6 @@
 #define NONAMELESSSTRUCT
 
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 

dlls/ntdll/loadorder.c

@@ -28,8 +28,6 @@
 #include <assert.h>
 
 #include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "module.h"

dlls/ntdll/nt.c

@@ -30,7 +30,6 @@
 #include "wine/unicode.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"

dlls/ntdll/om.c

@@ -32,7 +32,6 @@
 #include "wine/debug.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"

dlls/ntdll/path.c

@@ -28,7 +28,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "winioctl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/ntdll/process.c

@@ -29,7 +29,6 @@
 #include "wine/debug.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"

dlls/ntdll/reg.c

@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "winerror.h"
 #include "wine/library.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"

dlls/ntdll/relay.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "wine/exception.h"

dlls/ntdll/resource.c

@@ -40,7 +40,6 @@
 #include "winnls.h"
 #include "winnt.h"
 #include "winternl.h"
-#include "winerror.h"
 #include "excpt.h"
 #include "wine/exception.h"
 #include "wine/unicode.h"

dlls/ntdll/rtl.c

@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"

dlls/ntdll/rtlbitmap.c

@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 

dlls/ntdll/rtlstr.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

dlls/ntdll/sec.c

@@ -33,7 +33,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "wine/exception.h"
 #include "ntdll_misc.h"
 #include "excpt.h"

dlls/ntdll/server.c

@@ -58,7 +58,6 @@
 #include "wine/pthread.h"
 #include "wine/server.h"
 #include "wine/debug.h"
-#include "winerror.h"
 #include "ntdll_misc.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(server);

dlls/ntdll/signal_i386.c

@@ -52,7 +52,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "thread.h"
 #include "wine/library.h"
 #include "ntdll_misc.h"

dlls/ntdll/signal_powerpc.c

@@ -51,7 +51,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "wine/exception.h"

dlls/ntdll/signal_sparc.c

@@ -32,7 +32,6 @@
 #include <sys/ucontext.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winnt.h"
 

dlls/ntdll/string.c

@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 
 

dlls/ntdll/sync.c

@@ -51,7 +51,6 @@
 #define NONAMELESSSTRUCT
 
 #include "windef.h"
-#include "winbase.h"
 #include "thread.h"
 #include "wine/server.h"
 #include "wine/debug.h"

dlls/ntdll/version.c

@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"

dlls/ntdll/virtual.c

@@ -43,7 +43,6 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wine/library.h"

dlls/ntdll/wcstring.c

@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"