diff --git a/vboxdrv/Makefile b/vboxdrv/Makefile
index e262c61..4af8dac 100644
--- a/vboxdrv/Makefile
+++ b/vboxdrv/Makefile
@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
  MOD_OBJS += SUPDrvDTrace.o
 endif

-MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL  = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux)
 ifdef VBOX_WITH_NATIVE_DTRACE
  MOD_INCL += -I/usr/include/linux -I/usr/include
 endif
@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
 endif

 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h \
	-fno-omit-frame-pointer -fno-pie

 include $(obj)/Makefile.include.footer
diff --git a/vboxnetadp/Makefile b/vboxnetadp/Makefile
index e262c61..4af8dac 100644
--- a/vboxnetadp/Makefile
+++ b/vboxnetadp/Makefile
@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
	math/gcc/umoddi3.o
 endif

-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
	    -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
	    -Wno-declaration-after-statement
@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
 endif

 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie

 include $(obj)/Makefile.include.footer
diff --git a/vboxnetflt/Makefile b/vboxnetflt/Makefile
index e262c61..4af8dac 100644
--- a/vboxnetflt/Makefile
+++ b/vboxnetflt/Makefile
@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
	math/gcc/umoddi3.o
 endif

-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
	-DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
	-Wno-declaration-after-statement
@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE
 endif

 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie

 include $(obj)/Makefile.include.footer
diff --git a/vboxpci/Makefile b/vboxpci/Makefile
index e262c61..4af8dac 100644
--- a/vboxpci/Makefile
+++ b/vboxpci/Makefile
@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o       \
	math/gcc/umoddi3.o
 endif

-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux)
 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
	-DRT_WITH_VBOX -DVBOX_WITH_HARDENING
 ifeq ($(BUILD_TARGET_ARCH),amd64)
@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE
 endif

 # build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie

 include $(obj)/Makefile.include.footer