Index: VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
===================================================================
--- VirtualBox-5.2.0.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -69,18 +69,13 @@ VBoxOGL_INCS           = . $(VBOX_GRAPHI
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  ifndef VBOX_USE_SYSTEM_GL_HEADERS
   VBoxOGL_INCS     += \
-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-	$(VBOX_GL_INCS)
- endif
+	/usr/include/x11 \
+	/usr/include/xorg \
+	/usr/include/pixman-1 \
+	$(VBOX_MESA_INCS) \
+	/usr/include/drm \
+	/usr/include/libdrm
+  endif
  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
 endif
 
@@ -219,10 +214,10 @@ if1of ($(KBUILD_TARGET), linux solaris f
   VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
  else
   VBoxOGL_LIBS += \
- 	$(PATH_STAGE_LIB)/libXcomposite.so \
- 	$(PATH_STAGE_LIB)/libXdamage.so \
- 	$(PATH_STAGE_LIB)/libXfixes.so \
- 	$(PATH_STAGE_LIB)/libXext.so
+ 	Xcomposite \
+ 	Xdamage \
+ 	Xfixes \
+ 	Xext
  endif
  ifdef VBoxOGL_FAKEDRI
   ifeq ($(KBUILD_TARGET), freebsd)
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c
===================================================================
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/getmode.c
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c
@@ -26,6 +26,7 @@
  */
 
 #include "vboxvideo.h"
+#include "VBoxVideoGuest.h"
 
 #define NEED_XF86_TYPES
 #include "xf86.h"