From 294c8af60ba112cc6c523824ab5b666ccc5df979 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 20 Jan 2004 22:48:57 +0000
Subject: [PATCH] Removed some unnecessary inclusions of gdi.h.

---
 dlls/opengl32/wgl.c       | 3 ++-
 dlls/opengl32/wgl.h       | 2 +-
 dlls/ttydrv/bitmap.c      | 1 -
 dlls/ttydrv/graphics.c    | 1 -
 dlls/ttydrv/objects.c     | 1 -
 dlls/ttydrv/user.c        | 1 -
 dlls/ttydrv/wnd.c         | 2 +-
 dlls/wineps/download.c    | 1 -
 dlls/wineps/pen.c         | 6 +++++-
 dlls/x11drv/clipboard.c   | 1 +
 dlls/x11drv/clipping.c    | 1 -
 dlls/x11drv/init.c        | 1 +
 dlls/x11drv/opengl.c      | 2 +-
 dlls/x11drv/winpos.c      | 1 +
 dlls/x11drv/wintab.c      | 1 +
 dlls/x11drv/x11drv.h      | 3 +--
 dlls/x11drv/x11drv_main.c | 1 -
 dlls/x11drv/x11font.h     | 2 +-
 dlls/x11drv/xvidmode.c    | 1 +
 19 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 989f4bbd5b1..e87f5ebe60e 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 0d2781b70a2..b7e43e1aa22 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 89366297897..9969a2ca203 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 9167079883a..b827cad6c74 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 c9ebb296bb4..00a06685597 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 fad2331509f..736a8dd1e5b 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 1dc03b38492..0b6a9f14d9d 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 2c66e82f6b7..4cea3d798cb 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 59318a703a0..d122e043238 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 55dbb5c17cc..9a143895525 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 ee22255a712..5f1515c8bb3 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 11e93d0eab2..f2c8e4c4938 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 95bd76fc167..53345a2877b 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 3370167025b..b6b58862970 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 71fe01fab14..4d540b55769 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 55e98d3226d..03aee8b7885 100644
--- a/dlls/x11drv/x11drv.h
+++ b/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 */
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 9bff9eca9c8..8f6928f62b8 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 e9a99f845eb..647071a624e 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 6d72e264a4b..25c8aee7897 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>
 
-- 
GitLab