Extra #include removal in winspool.h

[Francois Gouget]

Changelog:

 * include/winspool.h,
   dlls/wineps/builtin.c,
   dlls/wineps/download.c,
   dlls/wineps/font.c,
   dlls/wineps/type1.c,
   dlls/wineps/type42.c,
   dlls/winspool/info.c,
   dlls/winspool/wspool.c

   Remove extra #include directives from winspool.h


Index: include/winspool.h
===================================================================
RCS file: /home/wine/wine/include/winspool.h,v
retrieving revision 1.22
diff -u -r1.22 winspool.h
--- include/winspool.h	31 May 2002 23:06:49 -0000	1.22
+++ include/winspool.h	6 Jan 2003 01:54:16 -0000
@@ -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
Index: dlls/wineps/builtin.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/builtin.c,v
retrieving revision 1.2
diff -u -r1.2 builtin.c
--- dlls/wineps/builtin.c	31 Jul 2002 20:04:20 -0000	1.2
+++ dlls/wineps/builtin.c	6 Jan 2003 01:54:11 -0000
@@ -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);

Index: dlls/wineps/download.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/download.c,v
retrieving revision 1.3
diff -u -r1.3 download.c
--- dlls/wineps/download.c	13 Nov 2002 23:51:44 -0000	1.3
+++ dlls/wineps/download.c	6 Jan 2003 01:54:11 -0000
@@ -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);

Index: dlls/wineps/font.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/font.c,v
retrieving revision 1.29
diff -u -r1.29 font.c
--- dlls/wineps/font.c	18 Oct 2002 23:48:57 -0000	1.29
+++ dlls/wineps/font.c	6 Jan 2003 01:54:11 -0000
@@ -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"
Index: dlls/wineps/type1.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/type1.c,v
retrieving revision 1.3
diff -u -r1.3 type1.c
--- dlls/wineps/type1.c	13 Nov 2002 23:50:44 -0000	1.3
+++ dlls/wineps/type1.c	6 Jan 2003 01:54:12 -0000
@@ -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"

Index: dlls/wineps/type42.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/type42.c,v
retrieving revision 1.2
diff -u -r1.2 type42.c
--- dlls/wineps/type42.c	13 Nov 2002 23:51:44 -0000	1.2
+++ dlls/wineps/type42.c	6 Jan 2003 01:54:12 -0000
@@ -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"

Index: dlls/winspool/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.64
diff -u -r1.64 info.c
--- dlls/winspool/info.c	3 Jan 2003 03:04:46 -0000	1.64
+++ dlls/winspool/info.c	6 Jan 2003 01:54:15 -0000
@@ -37,10 +37,11 @@
 #  define CUPS_SONAME "libcups.so"
 # endif
 #endif
-#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"
Index: dlls/winspool/wspool.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/wspool.c,v
retrieving revision 1.8
diff -u -r1.8 wspool.c
--- dlls/winspool/wspool.c	4 Nov 2002 23:53:42 -0000	1.8
+++ dlls/winspool/wspool.c	6 Jan 2003 01:54:15 -0000
@@ -21,6 +21,8 @@


 #include "config.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "winspool.h"
 #include "wine/debug.h"




-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
              Linux: Because rebooting is for adding new hardware