diff --git a/device-husky.mk b/device-husky.mk
index 69c7d75..f0713e1 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -254,11 +254,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 $(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app)
-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_VENDOR_PROPERTIES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 7eba21f..45fc0c7 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -243,11 +243,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 $(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app)
-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
 
 # Fingerprint exposure compensation