--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig	2020-07-10 02:57:05.000000000 +1000
+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk	2020-08-23 02:48:36.915273000 +1000
@@ -86,7 +86,7 @@
  VBoxSharedCrOpenGL_LIBS += \
 	$(LIB_XPCOM)
 endif
-if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
+if1of ($(KBUILD_TARGET), bsdsunix freebsd linux netbsd openbsd solaris) # the X11 gang
  VBoxSharedCrOpenGL_LIBS += \
 	Xmu \
 	X11 \
@@ -278,6 +278,7 @@
 	render/renderspu_wgl.c
 VBoxOGLrenderspu_SOURCES.linux   = render/renderspu_glx.c
 VBoxOGLrenderspu_SOURCES.solaris = render/renderspu_glx.c
+VBoxOGLrenderspu_SOURCES.bsdsunix = render/renderspu_glx.c
 VBoxOGLrenderspu_SOURCES.freebsd = render/renderspu_glx.c
 VBoxOGLrenderspu_OBJCFLAGS.darwin = -Wno-shadow
 VBoxOGLrenderspu_SOURCES.darwin  = \
@@ -316,6 +317,7 @@
   VBoxTestOGL_DEFS.linux       = Linux=1 _GNU_SOURCE
   VBoxTestOGL_DEFS.solaris     = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
   VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
+  VBoxTestOGL_DEFS.bsdsunix    = BSDSUniX=1 _GNU_SOURCE
   VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
   if $(VBOX_GCC_VERSION_CXX) >= 90000
    VBoxTestOGL_CXXFLAGS       += -Wno-deprecated-copy
@@ -335,18 +337,21 @@
     $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
     $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
   ifdef VBOX_WITH_VIDEOHWACCEL
+   VBoxTestOGL_CXXFLAGS.bsdsunix += -std=c++11
+   VBoxTestOGL_CXXFLAGS.freebsd += -std=c++11
    VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets
    VBoxTestOGL_LIBS.linux   += xcb
    VBoxTestOGL_LIBS.solaris += xcb
+   VBoxTestOGL_LIBS.bsdsunix += xcb
    VBoxTestOGL_LIBS.freebsd += xcb
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL -framework IOKit
    VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
-   if1of ($(KBUILD_TARGET), solaris linux freebsd)
+   if1of ($(KBUILD_TARGET), bsdsunix solaris linux freebsd)
     # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!
     VBoxTestOGL_LIBS += GL pthread dl
    endif
   endif
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
+  if1of ($(KBUILD_TARGET), bsdsunix freebsd linux netbsd openbsd solaris) # the X11 gang
    VBoxTestOGL_LIBS += \
   	Xmu \
   	X11 \