Remove extra #include directives from winspool.h.

dlls/wineps/builtin.c

@@ -20,11 +20,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
+
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
 #include "winspool.h"
+
 #include "gdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"
-#include "winerror.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 

dlls/wineps/download.c

@@ -21,11 +21,15 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
+
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
 #include "winspool.h"
+
 #include "gdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"
-#include "winerror.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 

dlls/wineps/font.c

@@ -20,7 +20,11 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
+
+#include "winbase.h"
+#include "wingdi.h"
 #include "winspool.h"
+
 #include "gdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"

dlls/wineps/type1.c

@@ -21,10 +21,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
 #include "winspool.h"
+
 #include "psdrv.h"
 #include "wine/debug.h"
-#include "winerror.h"
 #include "config.h"
 #include "wine/port.h"
 

dlls/wineps/type42.c

@@ -21,10 +21,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
 #include "winspool.h"
+
 #include "psdrv.h"
 #include "wine/debug.h"
-#include "winerror.h"
 #include "config.h"
 #include "wine/port.h"
 

dlls/winspool/info.c

@@ -40,10 +40,11 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "wine/library.h"
-#include "winspool.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "winreg.h"
+#include "wingdi.h"
+#include "winspool.h"
 #include "winternl.h"
 #include "wine/windef16.h"
 #include "wine/unicode.h"

dlls/winspool/wspool.c

@@ -21,6 +21,8 @@
 
 
 #include "config.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "winspool.h"
 #include "wine/debug.h"
 

include/winspool.h

@@ -22,10 +22,6 @@
 #ifndef __WINE_WINSPOOL_H
 #define __WINE_WINSPOOL_H
 
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1135,10 +1131,3 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
 #endif
 
 #endif  /* __WINE_WINSPOOL_H */
-
-
-
-
-
-
-