diff --git a/device-oriole.mk b/device-oriole.mk
index e58ce7e..6508181 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-raven.mk b/device-raven.mk
index c0190a0..dd8478b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-slider.mk b/device-slider.mk
index f4e6b57..8acb9ff 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 17e4d45..a61250b 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
 
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)