--- VirtualBox/src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2017-09-14 23:57:58.834458822 +0000
+++ VirtualBox/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2017-09-14 23:59:49.918241816 +0000
@@ -69,16 +69,9 @@ 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 \
+  	/usr/include/x11 \
+  	/usr/include/xorg \
+  	/usr/include/pixman-1 \
 	$(VBOX_GL_INCS)
  endif
  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
@@ -218,11 +211,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
  ifdef VBOX_USE_SYSTEM_GL_HEADERS
   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
+  VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
  endif
  ifdef VBoxOGL_FAKEDRI
   ifeq ($(KBUILD_TARGET), freebsd)