Index: /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 43270)
@@ -23,4 +23,13 @@
 #
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+
+vboxvideo_70_DEFS := \
+	IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC
+ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
+ vboxvideo_70_DEFS += __EXTENSIONS__  ## @todo Why this?
+endif
+vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
+vboxvideo_15_DEFS := \
+	$(vboxvideo_13_DEFS) VBOX_DRI NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
 
 #
@@ -109,8 +118,6 @@
 	-Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
 endif
-vboxvideo_drv_70_DEFS := \
-	XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 IN_XF86_MODULE IN_RT_STATIC
+vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700000000
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxvideo_drv_70_DEFS += __EXTENSIONS__
  vboxvideo_drv_70_CFLAGS += -D_XPG6 # Until we have moved the C++ bits into a library
 endif
@@ -129,5 +136,5 @@
 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
+vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
 vboxvideo_drv_71_INCS = \
 	$(VBOX_PATH_X11_XORG_7_1) \
@@ -144,5 +151,5 @@
 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
+vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
 vboxvideo_drv_13_INCS = \
 	$(VBOX_PATH_X11_XORG_1_3) \
@@ -163,5 +170,5 @@
 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
+vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
 vboxvideo_drv_14_INCS = \
 	$(VBOX_PATH_X11_XORG_1_4) \
@@ -182,6 +189,5 @@
 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
-                         VBOX_NO_LOW_COLOUR
+vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
 if1of ($(KBUILD_TARGET), linux solaris)
  vboxvideo_drv_15_DEFS += VBOX_DRI
@@ -209,5 +215,5 @@
 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
 vboxvideo_drv_16_INCS = \
 	$(VBOX_PATH_X11_XORG_1_6) \
@@ -229,5 +235,5 @@
 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_17_INCS = \
@@ -256,5 +262,5 @@
 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_18_INCS = \
@@ -283,5 +289,5 @@
 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_19_INCS = \
@@ -310,5 +316,5 @@
 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_110_INCS = \
@@ -337,5 +343,5 @@
 vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_111_INCS = \
@@ -364,5 +370,5 @@
 vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_112_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_112_INCS = \
@@ -391,5 +397,5 @@
 vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_113_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxvideo_drv_113_INCS = \
Index: /trunk/src/VBox/Additions/x11/vboxvideo/edid.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/edid.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/edid.c	(revision 43270)
@@ -45,5 +45,4 @@
  */
 
-#include <xorg-server.h>
 #include <misc.h>
 #include <xf86DDC.h>
Index: /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c	(revision 43270)
@@ -31,4 +31,8 @@
 
 #include "vboxvideo.h"
+
+#ifdef XORG_7X
+# include <stdlib.h>
+#endif
 
 #define VBOX_MAX_CURSOR_WIDTH 64
Index: /trunk/src/VBox/Additions/x11/vboxvideo/setmode.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/setmode.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/setmode.c	(revision 43270)
@@ -54,5 +54,4 @@
 # define _XF86_ANSIC_H
 # define XF86_LIBC_H
-# include "xorg-server.h"
 # include <string.h>
 #endif
Index: /trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c	(revision 43270)
@@ -29,4 +29,9 @@
 
 #include "vboxvideo.h"
+
+#ifdef XORG_7X
+# include <stdio.h>
+# include <stdlib.h>
+#endif
 
 /**************************************************************************
Index: /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c	(revision 43270)
@@ -56,5 +56,5 @@
 
 #ifdef XORG_7X
-# include "xorg-server.h"
+# include <stdlib.h>
 # include <string.h>
 #endif
@@ -560,5 +560,4 @@
 #endif /* VBOXVIDEO_13 */
 
-#ifdef XFree86LOADER
 /* Module loader interface */
 static MODULESETUPPROTO(vboxSetup);
@@ -623,5 +622,4 @@
 }
 
-#endif  /* XFree86Loader defined */
 
 static const OptionInfoRec *
Index: /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	(revision 43270)
@@ -118,5 +118,4 @@
 #include "sarea.h"
 #include "GL/glxint.h"
-#include "GL/glxtokens.h"
 
 /* For some reason this is not in the header files. */
Index: /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c	(revision 43269)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c	(revision 43270)
@@ -52,4 +52,8 @@
 # include "xf86Pci.h"
 #endif
+#include <dri.h>
+#include <GL/glx.h>
+#include <GL/glxint.h>
+#include <drm.h>
 
 static Bool