diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 404988087d8..947686889ab 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
@@ -26,13 +28,19 @@
 #include "wingdi.h"
 #include "wine/debug.h"
 
-#include "config.h"
-#include "x11drv.h"
-
 #include "d3d8_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 
+/* x11drv GDI escapes */
+#define X11DRV_ESCAPE 6789
+enum x11drv_escape_codes
+{
+    X11DRV_GET_DISPLAY,   /* get X11 display for a DC */
+    X11DRV_GET_DRAWABLE,  /* get current drawable for a DC */
+    X11DRV_GET_FONT,      /* get current X font for a DC */
+};
+
 #define NUM_MODES 10
 static const int modes[NUM_MODES][3] = {
     {640, 480, 85},
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 7e19bc299f0..59d823ffd00 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <math.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
@@ -35,10 +36,17 @@
 #include "mesa_private.h"
 #include "main.h"
 
-#include "x11drv.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
+/* x11drv GDI escapes */
+#define X11DRV_ESCAPE 6789
+enum x11drv_escape_codes
+{
+    X11DRV_GET_DISPLAY,   /* get X11 display for a DC */
+    X11DRV_GET_DRAWABLE,  /* get current drawable for a DC */
+    X11DRV_GET_FONT,      /* get current X font for a DC */
+};
+
 /* They are non-static as they are used by Direct3D in the creation function */
 const GUID IID_D3DDEVICE_OpenGL = {
   0x31416d44,
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 8aab2aaa45a..9124565f189 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -26,7 +26,6 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "winerror.h"
-#include "x11drv.h"
 
 #include "wgl.h"
 #include "opengl_ext.h"
@@ -34,6 +33,15 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
+/* x11drv GDI escapes */
+#define X11DRV_ESCAPE 6789
+enum x11drv_escape_codes
+{
+    X11DRV_GET_DISPLAY,   /* get X11 display for a DC */
+    X11DRV_GET_DRAWABLE,  /* get current drawable for a DC */
+    X11DRV_GET_FONT,      /* get current X font for a DC */
+};
+
 void (*wine_tsx11_lock_ptr)(void) = NULL;
 void (*wine_tsx11_unlock_ptr)(void) = NULL;
 
diff --git a/include/x11drv.h b/dlls/x11drv/x11drv.h
similarity index 100%
rename from include/x11drv.h
rename to dlls/x11drv/x11drv.h