Removed some unnecessary inclusions of gdi.h.

dlls/opengl32/wgl.c

@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -30,8 +31,8 @@
 
 #include "wgl.h"
 #include "opengl_ext.h"
+#include "wine/library.h"
 #include "wine/debug.h"
-#include "wine/port.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 

dlls/opengl32/wgl.h

@@ -20,7 +20,7 @@
 #ifndef __DLLS_OPENGL32_WGL_H
 #define __DLLS_OPENGL32_WGL_H
 
-#include "gdi.h"
+#include "wingdi.h"
 
 typedef void *HGLRC;
 

dlls/ttydrv/bitmap.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include "gdi.h"
 #include "ttydrv.h"
 #include "winbase.h"
 #include "wine/debug.h"

dlls/ttydrv/graphics.c

@@ -25,7 +25,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
-#include "gdi.h"
 #include "wine/debug.h"
 #include "ttydrv.h"
 

dlls/ttydrv/objects.c

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include "gdi.h"
 #include "ttydrv.h"
 #include "wine/debug.h"
 

dlls/ttydrv/user.c

@@ -25,7 +25,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "dinput.h"
-#include "gdi.h"
 #include "ttydrv.h"
 #include "wine/debug.h"
 

dlls/ttydrv/wnd.c

@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include "gdi.h"
 #include "ttydrv.h"
 #include "win.h"
 #include "winpos.h"
 #include "wownt32.h"
+#include "wine/wingdi16.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);

dlls/wineps/download.c

@@ -29,7 +29,6 @@
 #include "wingdi.h"
 #include "winspool.h"
 
-#include "gdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"
 

dlls/wineps/pen.c

@@ -18,7 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gdi.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "psdrv.h"
 #include "wine/debug.h"
 

dlls/x11drv/clipboard.c

@@ -77,6 +77,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
+#include "wine/wingdi16.h"
 #include "win.h"
 #include "x11drv.h"
 #include "wine/debug.h"

dlls/x11drv/clipping.c

@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "gdi.h"
 #include "x11drv.h"
 #include "wine/debug.h"
 

dlls/x11drv/init.c

@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "x11drv.h"
 #include "x11font.h"
+#include "gdi.h"
 #include "ddrawi.h"
 #include "wine/debug.h"
 

dlls/x11drv/opengl.c

@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gdi.h"
 #include "x11drv.h"
+#include "wine/library.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);

dlls/x11drv/winpos.c

@@ -34,6 +34,7 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "wownt32.h"
+#include "wine/wingdi16.h"
 
 #include "x11drv.h"
 #include "win.h"

dlls/x11drv/wintab.c

@@ -25,6 +25,7 @@
 
 #include "windef.h"
 #include "x11drv.h"
+#include "wine/library.h"
 #include "wine/debug.h"
 #include "wintab.h"
 

dlls/x11drv/x11drv.h

@@ -40,7 +40,6 @@ typedef int Status;
 
 #include "windef.h"
 #include "winbase.h"
-#include "gdi.h"
 #include "user.h"
 #include "win.h"
 #include "ddrawi.h"
@@ -87,7 +86,7 @@ typedef struct tagXRENDERINFO *XRENDERINFO;
 typedef struct
 {
     HDC           hdc;
-    DC           *dc;          /* direct pointer to DC, should go away */
+    struct tagDC *dc;          /* direct pointer to DC, should go away */
     GC            gc;          /* X Window GC */
     Drawable      drawable;
     POINT         org;          /* DC origin relative to drawable */

dlls/x11drv/x11drv_main.c

@@ -55,7 +55,6 @@
 #include "wine/winbase16.h"
 #include "winreg.h"
 
-#include "gdi.h"
 #include "user.h"
 #include "win.h"
 #include "x11drv.h"

dlls/x11drv/x11font.h

@@ -21,7 +21,7 @@
 #ifndef __WINE_X11FONT_H
 #define __WINE_X11FONT_H
 
-#include "gdi.h"
+#include "wine/wingdi16.h"
 #include "x11drv.h"
 #include "pshpack1.h"
 

dlls/x11drv/xvidmode.c

@@ -21,6 +21,7 @@
 #include "config.h"
 #include <string.h>
 #include <stdio.h>
+#include <math.h>
 
 #include <X11/Xlib.h>