Index: /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 22869)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 22870)
@@ -128,8 +128,5 @@
 	$(VBOX_PATH_X11_XORG_7_0) \
 	$(VBOX_PATH_X11_XORG_7_0)/X11 \
-	$(VBOX_PATH_X11_XORG_7_0)/xorg \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.3 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-1.0.5 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.3
+	$(VBOX_PATH_X11_XORG_7_0)/xorg
 vboxvideo_drv_70_SOURCES  = \
 	vboxvideo_70.c \
@@ -155,8 +152,5 @@
 	$(VBOX_PATH_X11_XORG_7_1) \
 	$(VBOX_PATH_X11_XORG_7_1)/X11 \
-	$(VBOX_PATH_X11_XORG_7_1)/xorg \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.7 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.0.1 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.3
+	$(VBOX_PATH_X11_XORG_7_1)/xorg
 vboxvideo_drv_71_SOURCES  = \
 	vboxvideo_70.c \
@@ -183,7 +177,7 @@
 	$(VBOX_PATH_X11_XORG_1_3)/X11 \
 	$(VBOX_PATH_X11_XORG_1_3)/xorg \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.8 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.3.0 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.3
+	$(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
+	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
+	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
 vboxvideo_drv_13_SOURCES = \
 	vboxvideo_13.c \
@@ -213,7 +207,7 @@
 	$(VBOX_PATH_X11_XORG_1_4)/X11 \
 	$(VBOX_PATH_X11_XORG_1_4)/xorg \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.8 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.3.0 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4
+	$(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
+	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
+	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
 vboxvideo_drv_14_SOURCES  = \
 	vboxvideo_13.c \
@@ -240,7 +234,7 @@
 	$(VBOX_PATH_X11_XORG_1_5) \
 	$(VBOX_PATH_X11_XORG_1_5)/X11 \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.9 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.3.1 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 \
+	$(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
+	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
+	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
 vboxvideo_drv_15_SOURCES  = \
@@ -268,7 +262,7 @@
 	$(VBOX_PATH_X11_XORG_1_6) \
 	$(VBOX_PATH_X11_XORG_1_6)/X11 \
-	$(VBOX_PATH_X11_ROOT)/glproto-1.4.9 \
-	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.5 \
-	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 \
+	$(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
+	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
+	$(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -301,5 +295,4 @@
 	$(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
 	$(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-	$(VBOX_PATH_X11_ROOT)/Mesa-7.5/include \
 	$(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
 	$(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \