diff --git a/include/uapi/linux/ashmem.h b/include/uapi/linux/ashmem.h
new file mode 120000
index 0000000..c79275b
--- /dev/null
+++ b/include/uapi/linux/ashmem.h
@@ -0,0 +1 @@
+../../../drivers/staging/android/uapi/ashmem.h
\ No newline at end of file
diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
new file mode 120000
index 0000000..17e8dbb
--- /dev/null
+++ b/include/uapi/linux/ion.h
@@ -0,0 +1 @@
+../../../drivers/staging/android/uapi/ion.h
\ No newline at end of file
diff --git a/include/uapi/linux/ion_test.h b/include/uapi/linux/ion_test.h
new file mode 120000
index 0000000..eb7043d
--- /dev/null
+++ b/include/uapi/linux/ion_test.h
@@ -0,0 +1 @@
+../../../drivers/staging/android/uapi/ion_test.h
\ No newline at end of file
diff --git a/include/uapi/linux/secure_ion.h b/include/uapi/linux/secure_ion.h
new file mode 120000
index 0000000..c0f38e3
--- /dev/null
+++ b/include/uapi/linux/secure_ion.h
@@ -0,0 +1 @@
+../../../drivers/staging/android/uapi/secure_ion.h
\ No newline at end of file
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index e15159d..e035172 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -314,6 +314,9 @@
 # Build kernel header package
 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
+# Include symlinks and Android staging
+(cd $srctree; find arch/*/include include scripts -type l) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find drivers/staging/android/uapi -type f) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
 if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then