diff --git a/Android.bp b/Android.bp
index 4d1bebe..46c80a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,6 +4,16 @@
 
 soong_namespace {
 	imports: [
+                "vendor/xiaomi/alioth",
+		"vendor/xiaomi/sm8250-common",
+        "hardware/qcom-caf/common/libqti-perfd-client",
+		"hardware/qcom-caf/sm8250",
+		"hardware/qcom-caf/wlan",
+        "hardware/xiaomi",
+		"vendor/qcom/opensource/commonsys/display",
+		"vendor/qcom/opensource/commonsys-intf/display",
+		"vendor/qcom/opensource/dataservices",
+		"vendor/qcom/opensource/display",
 	],
 }
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 292a719..b10f168 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -27,6 +27,21 @@ if [ ! -f "${HELPER}" ]; then
 fi
 source "${HELPER}"
 
+function vendor_imports() {
+    cat <<EOF >>"$1"
+                "device/xiaomi/alioth",
+		"device/xiaomi/sm8250-common",
+        "hardware/qcom-caf/common/libqti-perfd-client",
+		"hardware/qcom-caf/sm8250",
+		"hardware/qcom-caf/wlan",
+        "hardware/xiaomi",
+		"vendor/qcom/opensource/commonsys/display",
+		"vendor/qcom/opensource/commonsys-intf/display",
+		"vendor/qcom/opensource/dataservices",
+		"vendor/qcom/opensource/display",
+EOF
+}
+
 # Initialize the helper
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true