diff --git a/components.mk b/components.mk
index 01d7fc48..3735b5d8 100644
--- a/components.mk
+++ b/components.mk
@@ -113,6 +113,7 @@ endif
 
 ifneq (,$(filter display, $(TARGET_COMMON_QTI_COMPONENTS)))
 include $(QCOM_COMMON_PATH)/system/display/qti-display.mk
+include $(QCOM_COMMON_PATH)/vendor/display/qti-display.mk
 endif
 
 ifneq (,$(filter nq-nfc, $(TARGET_COMMON_QTI_COMPONENTS)))
diff --git a/system/display/qti-display.mk b/system/display/qti-display.mk
index 788149c8..25f44d76 100644
--- a/system/display/qti-display.mk
+++ b/system/display/qti-display.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Paranoid Android
+# Copyright (C) 2022 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,31 +13,15 @@
 # limitations under the License.
 
 # Include display HAL makefiles.
--include hardware/qcom/display/config/display-board.mk
--include hardware/qcom/display/config/display-product.mk
 ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
 include vendor/qcom/opensource/commonsys-intf/display/config/display-interfaces-product.mk
 include vendor/qcom/opensource/commonsys-intf/display/config/display-product-system.mk
 include vendor/qcom/opensource/commonsys/display/config/display-product-commonsys.mk
 endif
 
-# Lights AIDL Soong Configs
-SOONG_CONFIG_NAMESPACES += lights
-SOONG_CONFIG_lights += lighttargets
-SOONG_CONFIG_lights_lighttargets := lightaidlV1target
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
-
 # Packages
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.common-V1-ndk_platform \
-    android.hardware.graphics.common-V1-ndk_platform.vendor \
-    android.hardware.lights-service.qti \
-    libqdutils \
-    libqservice \
-    lights.qcom
+    android.hardware.graphics.common-V1-ndk_platform
 
 # Get non-open-source specific aspects.
 $(call inherit-product-if-exists, vendor/qcom/common/system/display/display-vendor.mk)
diff --git a/vendor/display/qti-display.mk b/vendor/display/qti-display.mk
new file mode 100644
index 00000000..19755335
--- /dev/null
+++ b/vendor/display/qti-display.mk
@@ -0,0 +1,37 @@
+# Copyright (C) 2022 Paranoid Android
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Include display HAL makefiles.
+-include hardware/qcom/display/config/display-board.mk
+-include hardware/qcom/display/config/display-product.mk
+
+# Lights AIDL Soong Configs
+SOONG_CONFIG_NAMESPACES += lights
+SOONG_CONFIG_lights += lighttargets
+SOONG_CONFIG_lights_lighttargets := lightaidlV1target
+
+# Permissions
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
+
+# Packages
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.common-V1-ndk_platform.vendor \
+    android.hardware.lights-service.qti \
+    libqdutils \
+    libqservice \
+    lights.qcom
+
+# Get non-open-source specific aspects.
+$(call inherit-product-if-exists, vendor/qcom/common/vendor/display/display-vendor.mk)