diff --git a/Android.mk b/Android.mk
index 12dc538..3f8c08d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter sapphire topaz,$(TARGET_DEVICE)),)
+ifneq ($(filter sapphire topaz xun,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 # A/B builds require us to create the mount points at compile time.
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index b25c310..3827089 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -25,7 +25,7 @@ source "${HELPER}"
 setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
 
 # Warning headers and guards
-write_headers "sapphire topaz"
+write_headers "sapphire topaz xun"
 
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true