--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig	2020-07-10 02:56:54.000000000 +1000
+++ src/VBox/GuestHost/OpenGL/Makefile.kmk	2020-08-22 00:18:41.127926000 +1000
@@ -48,7 +48,7 @@
 VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
 VBoxOGLcrutil_INCS += \
 	$(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
+if1of ($(KBUILD_TARGET), linux solaris bsdsunix freebsd)
  VBoxOGLcrutil_INCS += \
 	$(VBOX_GL_INCS)
 endif
@@ -94,7 +94,7 @@
 VBoxOGLcrutil_INCS.win    += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
 VBoxOGLcrutil_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux bsdsunix freebsd)
 VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
 endif
 
@@ -140,7 +140,7 @@
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
  VBoxOGLhostcrutil_INSTTYPE.win = both
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux bsdsunix freebsd)
 VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
 endif
 VBoxOGLhostcrutil_LIBS.win =  \
@@ -171,7 +171,7 @@
 VBoxOGLcrpacker_INCS = \
 	packer \
 	$(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
+if1of ($(KBUILD_TARGET), linux solaris bsdsunix freebsd)
  VBoxOGLcrpacker_INCS += \
 	$(VBOX_GL_INCS)
 endif
@@ -285,7 +285,7 @@
 	$(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
 VBoxOGLspuload_INCS += \
 	$(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
+if1of ($(KBUILD_TARGET), linux solaris bsdsunix freebsd)
  VBoxOGLspuload_INCS += \
 	$(VBOX_GL_INCS)
 endif
@@ -359,7 +359,7 @@
 VBoxOGLcrstate_INCS = \
 	state_tracker \
 	$(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
+if1of ($(KBUILD_TARGET), linux solaris bsdsunix freebsd)
  VBoxOGLcrstate_INCS += \
 	$(VBOX_GL_INCS)
 endif
@@ -553,7 +553,7 @@
 	$(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
 VBoxOGLerrorspu_INCS += \
 	$(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
+if1of ($(KBUILD_TARGET), linux solaris bsdsunix freebsd)
  VBoxOGLerrorspu_INCS += \
 	$(VBOX_GL_INCS)
 endif