diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9515b25
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,2 @@
+soong_namespace {
+}
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d8407c3..70f8a8e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -54,6 +54,10 @@ TARGET_EXFAT_DRIVER := sdfat
 # HIDL
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
 
+# Init
+TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_matisse
+TARGET_RECOVERY_DEVICE_MODULES := libinit_matisse
+
 # Kernel
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x37 zcache.enabled=1 zcache.compressor=lz4
@@ -81,10 +85,6 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2362232012
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 12884901888
 TARGET_USES_MKE2FS := true
 
-# Init
-TARGET_INIT_VENDOR_LIB := libinit_matisse
-TARGET_RECOVERY_DEVICE_MODULES := libinit_matisse
-
 # Power HAL
 TARGET_POWERHAL_SET_INTERACTIVE_EXT := $(COMMON_PATH)/power/power_ext.c
 
diff --git a/matisse.mk b/matisse.mk
index 4a42634..03847a8 100644
--- a/matisse.mk
+++ b/matisse.mk
@@ -88,6 +88,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/_hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/_hals.conf
 
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+    $(LOCAL_PATH)
+
 # Thermal
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8226.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8226.conf