Include Xmd.h in x11drv.h with the proper defines to make it work, and

remove related hacks in various C files.

dlls/x11drv/opengl.c

@@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 #undef CALLBACK
 #undef WINAPI
 
-#define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */
 #ifdef HAVE_GL_GL_H
 # include <GL/gl.h>
 #endif
@@ -46,7 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 #ifdef HAVE_GL_GLEXT_H
 # include <GL/glext.h>
 #endif
-#undef  XMD_H
 
 #undef APIENTRY
 #undef CALLBACK

dlls/x11drv/x11drv.h

@@ -38,6 +38,23 @@
 #include <X11/extensions/xf86dga.h>
 #endif
 
+#define BOOL X_BOOL
+#define BYTE X_BYTE
+#define INT8 X_INT8
+#define INT16 X_INT16
+#define INT32 X_INT32
+#define INT64 X_INT64
+#define LONG64 X_LONG64
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#undef BOOL
+#undef BYTE
+#undef INT8
+#undef INT16
+#undef INT32
+#undef INT64
+#undef LONG64
+
 #undef Status  /* avoid conflict with wintrnl.h */
 typedef int Status;
 

dlls/x11drv/x11drv_main.c

@@ -38,22 +38,6 @@
 #include <X11/XKBlib.h>
 #endif
 
-#define BOOL X_BOOL
-#define BYTE X_BYTE
-#define INT8 X_INT8
-#define INT16 X_INT16
-#define INT32 X_INT32
-#define INT64 X_INT64
-#define LONG64 X_LONG64
-#include <X11/Xproto.h>
-#undef BOOL
-#undef BYTE
-#undef INT8
-#undef INT16
-#undef INT32
-#undef INT64
-#undef LONG64
-
 #include "windef.h"
 #include "winbase.h"
 #include "wine/winbase16.h"

dlls/x11drv/xvidmode.c

@@ -23,15 +23,12 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <X11/Xlib.h>
+#include "x11drv.h"
 
 #ifdef HAVE_LIBXXF86VM
-#define XMD_H
-#include "basetsd.h"
 #include <X11/extensions/xf86vmode.h>
 #endif /* HAVE_LIBXXF86VM */
 
-#include "x11drv.h"
 #include "x11ddraw.h"
 #include "xvidmode.h"