diff --git a/Android.mk b/Android.mk
index b6c4abf..fad6541 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter borneo capri caprip devon hawao rhode, $(TARGET_DEVICE)),)
+ifneq ($(filter borneo capri caprip cebu guam guamna guamp devon hawao rhode, $(TARGET_DEVICE)),)
 include $(call all-makefiles-under, $(LOCAL_PATH))
 
 include $(CLEAR_VARS)
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 1716e02..f740fdc 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 "borneo capri caprip devon hawao rhode"
+write_headers "borneo capri caprip cebu guam guamna guamp devon hawao rhode"
 
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true