diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 989f4bbd5b..e87f5ebe60 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include @@ -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 0d2781b70a..b7e43e1aa2 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 8936629789..9969a2ca20 100644 --- a/dlls/ttydrv/bitmap.c +++ b/dlls/ttydrv/bitmap.c @@ -22,7 +22,6 @@ #include -#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 9167079883..b827cad6c7 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 c9ebb296bb..00a0668559 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 fad2331509..736a8dd1e5 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 1dc03b3849..0b6a9f14d9 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 2c66e82f6b..4cea3d798c 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 59318a703a..d122e04323 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 + +#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 55dbb5c17c..9a14389552 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 ee22255a71..5f1515c8bb 100644 --- a/dlls/x11drv/clipping.c +++ b/dlls/x11drv/clipping.c @@ -22,7 +22,6 @@ #include -#include "gdi.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 11e93d0eab..f2c8e4c493 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 95bd76fc16..53345a2877 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -24,8 +24,8 @@ #include #include -#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 3370167025..b6b5886297 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 71fe01fab1..4d540b5576 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 55e98d3226..03aee8b788 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 9bff9eca9c..8f6928f62b 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 e9a99f845e..647071a624 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 6d72e264a4..25c8aee789 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -21,6 +21,7 @@ #include "config.h" #include #include +#include #include