diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2bd4dd9e..3843da5d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -40,8 +40,10 @@ endif
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
-# Broken Headers
+# Broken Files/Headers
 BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES := true
+BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
+
 
 # Architecture
 TARGET_ARCH := arm64