Removed some unnecessary inclusions of gdi.h.
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 989f4bb..e87f5eb 100644
--- a/dlls/opengl32/wgl.c
+++ b/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);
diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h
index 0d2781b..b7e43e1 100644
--- a/dlls/opengl32/wgl.h
+++ b/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;
diff --git a/dlls/ttydrv/bitmap.c b/dlls/ttydrv/bitmap.c
index 8936629..9969a2c 100644
--- a/dlls/ttydrv/bitmap.c
+++ b/dlls/ttydrv/bitmap.c
@@ -22,7 +22,6 @@
#include <string.h>
-#include "gdi.h"
#include "ttydrv.h"
#include "winbase.h"
#include "wine/debug.h"
diff --git a/dlls/ttydrv/graphics.c b/dlls/ttydrv/graphics.c
index 9167079..b827cad 100644
--- a/dlls/ttydrv/graphics.c
+++ b/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"
diff --git a/dlls/ttydrv/objects.c b/dlls/ttydrv/objects.c
index c9ebb29..00a0668 100644
--- a/dlls/ttydrv/objects.c
+++ b/dlls/ttydrv/objects.c
@@ -20,7 +20,6 @@
#include "config.h"
-#include "gdi.h"
#include "ttydrv.h"
#include "wine/debug.h"
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index fad2331..736a8dd 100644
--- a/dlls/ttydrv/user.c
+++ b/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"
diff --git a/dlls/ttydrv/wnd.c b/dlls/ttydrv/wnd.c
index 1dc03b3..0b6a9f1 100644
--- a/dlls/ttydrv/wnd.c
+++ b/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);
diff --git a/dlls/wineps/download.c b/dlls/wineps/download.c
index 2c66e82..4cea3d7 100644
--- a/dlls/wineps/download.c
+++ b/dlls/wineps/download.c
@@ -29,7 +29,6 @@
#include "wingdi.h"
#include "winspool.h"
-#include "gdi.h"
#include "psdrv.h"
#include "wine/debug.h"
diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c
index 59318a7..d122e04 100644
--- a/dlls/wineps/pen.c
+++ b/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"
diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c
index 55dbb5c..9a14389 100644
--- a/dlls/x11drv/clipboard.c
+++ b/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"
diff --git a/dlls/x11drv/clipping.c b/dlls/x11drv/clipping.c
index ee22255..5f1515c 100644
--- a/dlls/x11drv/clipping.c
+++ b/dlls/x11drv/clipping.c
@@ -22,7 +22,6 @@
#include <stdio.h>
-#include "gdi.h"
#include "x11drv.h"
#include "wine/debug.h"
diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c
index 11e93d0..f2c8e4c 100644
--- a/dlls/x11drv/init.c
+++ b/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"
diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c
index 95bd76f..53345a2 100644
--- a/dlls/x11drv/opengl.c
+++ b/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);
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index 3370167..b6b5886 100644
--- a/dlls/x11drv/winpos.c
+++ b/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"
diff --git a/dlls/x11drv/wintab.c b/dlls/x11drv/wintab.c
index 71fe01f..4d540b5 100644
--- a/dlls/x11drv/wintab.c
+++ b/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"
diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h
index 55e98d3..03aee8b 100644
--- a/dlls/x11drv/x11drv.h
+++ b/dlls/x11drv/x11drv.h
@@ -40,7 +40,6 @@
#include "windef.h"
#include "winbase.h"
-#include "gdi.h"
#include "user.h"
#include "win.h"
#include "ddrawi.h"
@@ -87,7 +86,7 @@
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 */
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 9bff9ec..8f6928f 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/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"
diff --git a/dlls/x11drv/x11font.h b/dlls/x11drv/x11font.h
index e9a99f8..647071a 100644
--- a/dlls/x11drv/x11font.h
+++ b/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"
diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c
index 6d72e26..25c8aee 100644
--- a/dlls/x11drv/xvidmode.c
+++ b/dlls/x11drv/xvidmode.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <string.h>
#include <stdio.h>
+#include <math.h>
#include <X11/Xlib.h>
