diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
index 2b81323..746c8b8 100644
--- a/vmblock-only/Makefile
+++ b/vmblock-only/Makefile
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
 ifdef LINUXINCLUDE
 HEADER_DIR = $(LINUXINCLUDE)
 else
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 endif
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmblock
 PRODUCT := ws
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
index 8e9c5be..6ec828b 100644
--- a/vmci-only/Makefile
+++ b/vmci-only/Makefile
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
 ifdef LINUXINCLUDE
 HEADER_DIR = $(LINUXINCLUDE)
 else
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 endif
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmci
 PRODUCT := ws
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
index 5bd867b..91a83d4 100644
--- a/vmmon-only/Makefile
+++ b/vmmon-only/Makefile
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
 ifdef LINUXINCLUDE
 HEADER_DIR = $(LINUXINCLUDE)
 else
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 endif
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmmon
 PRODUCT := @@PRODUCT@@
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
index d4eb73c..c7c6d38 100644
--- a/vmnet-only/Makefile
+++ b/vmnet-only/Makefile
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
 ifdef LINUXINCLUDE
 HEADER_DIR = $(LINUXINCLUDE)
 else
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 endif
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmnet
 PRODUCT := @@PRODUCT@@
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
index 93dd61d..9765696 100644
--- a/vsock-only/Makefile
+++ b/vsock-only/Makefile
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
 ifdef LINUXINCLUDE
 HEADER_DIR = $(LINUXINCLUDE)
 else
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 endif
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vsock
 PRODUCT := ws