diff --git a/device-cheetah.mk b/device-cheetah.mk
index 9d0522d..3ef96fa 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -270,11 +270,11 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-include vendor/goodix/udfps/configuration/udfps_common.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-include vendor/goodix/udfps/configuration/udfps_shipping.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
 else
-include vendor/goodix/udfps/configuration/udfps_factory.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
 endif
 
 PRODUCT_PACKAGES += \
diff --git a/device-panther.mk b/device-panther.mk
index 4866234..13f8e30 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -251,11 +251,11 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-include vendor/goodix/udfps/configuration/udfps_common.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-include vendor/goodix/udfps/configuration/udfps_shipping.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
 else
-include vendor/goodix/udfps/configuration/udfps_factory.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
 endif
 
 # Display
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 83997f6..983d166 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -145,11 +145,11 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g6_trusty
-include vendor/goodix/udfps/configuration/udfps_common.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-include vendor/goodix/udfps/configuration/udfps_shipping.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
 else
-include vendor/goodix/udfps/configuration/udfps_factory.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
 endif
 
 # WiFi Overlay