Index: /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk	(revision 43272)
+++ /trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk	(revision 43273)
@@ -71,5 +71,4 @@
 	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
 	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-	$(VBOX_PATH_X11_ROOT)/1.3/xorg \
 	$(VBOX_MESA_INCS) \
 	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
Index: /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	(revision 43272)
+++ /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	(revision 43273)
@@ -30,5 +30,18 @@
 #include <elf.h>
 #include <unistd.h>
-#include "xf86.h"
+/** X server message type definitions. */
+typedef enum {
+    X_PROBED,			/* Value was probed */
+    X_CONFIG,			/* Value was given in the config file */
+    X_DEFAULT,			/* Value is a default */
+    X_CMDLINE,			/* Value was given on the command line */
+    X_NOTICE,			/* Notice */
+    X_ERROR,			/* Error message */
+    X_WARNING,			/* Warning message */
+    X_INFO,			/* Informational message */
+    X_NONE,			/* No prefix */
+    X_NOT_IMPLEMENTED,		/* Not implemented */
+    X_UNKNOWN = -1		/* unknown -- this must always be last */
+} MessageType;
 
 #define VBOX_NO_MESA_PATCH_REPORTS