From 3efacb0acfcb54c2ed485d8a687fd7d3b2011530 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Tue, 7 Jan 2003 23:09:22 +0000
Subject: [PATCH] Remove extra #include directives from winspool.h.

---
 dlls/wineps/builtin.c  |  6 +++++-
 dlls/wineps/download.c |  6 +++++-
 dlls/wineps/font.c     |  4 ++++
 dlls/wineps/type1.c    |  6 +++++-
 dlls/wineps/type42.c   |  6 +++++-
 dlls/winspool/info.c   |  3 ++-
 dlls/winspool/wspool.c |  2 ++
 include/winspool.h     | 11 -----------
 8 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/dlls/wineps/builtin.c b/dlls/wineps/builtin.c
index 938e69ee16f..02baa66c472 100644
--- a/dlls/wineps/builtin.c
+++ b/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);
 
diff --git a/dlls/wineps/download.c b/dlls/wineps/download.c
index 9c012603a5a..749387d9db5 100644
--- a/dlls/wineps/download.c
+++ b/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);
 
diff --git a/dlls/wineps/font.c b/dlls/wineps/font.c
index 4974622c2e1..d99b6f0f9fb 100644
--- a/dlls/wineps/font.c
+++ b/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"
diff --git a/dlls/wineps/type1.c b/dlls/wineps/type1.c
index 8347ec7717d..e55eaa3911b 100644
--- a/dlls/wineps/type1.c
+++ b/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"
 
diff --git a/dlls/wineps/type42.c b/dlls/wineps/type42.c
index b187cced700..f195a17b37e 100644
--- a/dlls/wineps/type42.c
+++ b/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"
 
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 3918a9bd928..7ebeaa440ef 100644
--- a/dlls/winspool/info.c
+++ b/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"
diff --git a/dlls/winspool/wspool.c b/dlls/winspool/wspool.c
index f5e4a8d2c52..d49cdb64c6c 100644
--- a/dlls/winspool/wspool.c
+++ b/dlls/winspool/wspool.c
@@ -21,6 +21,8 @@
 
 
 #include "config.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "winspool.h"
 #include "wine/debug.h"
 
diff --git a/include/winspool.h b/include/winspool.h
index 00954df7229..ce5851ad4e0 100644
--- a/include/winspool.h
+++ b/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 */
-
-
-
-
-
-
-