diff --git a/bt/qti-bt.mk b/bt/qti-bt.mk
index ac9b8ff6..d0e29b3c 100644
--- a/bt/qti-bt.mk
+++ b/bt/qti-bt.mk
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 # Include QTI Bluetooth makefiles.
+ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
 include vendor/qcom/opensource/commonsys-intf/bluetooth/bt-commonsys-intf-board.mk
 $(call inherit-product, vendor/qcom/opensource/commonsys-intf/bluetooth/bt-system-opensource-product.mk)
+endif
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/display/qti-display.mk b/display/qti-display.mk
index 866c84f8..ba6db52e 100644
--- a/display/qti-display.mk
+++ b/display/qti-display.mk
@@ -20,8 +20,10 @@ endif
 # 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
+endif
 
 # Get non-open-source specific aspects
 $(call inherit-product-if-exists, vendor/qcom/common/display/display-vendor.mk)