diff --git a/drivers/staging/android/uapi/Kbuild b/drivers/staging/android/uapi/Kbuild
deleted file mode 100644
index 67358c786f4f..000000000000
--- a/drivers/staging/android/uapi/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-header-y += ion.h
-header-y += msm_ion.h
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index aa78179c0d20..a4859e2c673e 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -22,7 +22,6 @@ header-y += netfilter_ipv4/
 header-y += netfilter_ipv6/
 header-y += usb/
 header-y += wimax/
-header-y += ../../../drivers/staging/android/uapi/
 
 genhdr-y += version.h
 
diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
deleted file mode 100644
index fd011a90ffed..000000000000
--- a/include/uapi/linux/ion.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UAPI_LINUX_ION_H__
-#define __UAPI_LINUX_ION_H__
-
-#include <linux/staging/android/uapi/ion.h>
-
-#endif /* __UAPI_LINUX_ION_H__ */
diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
new file mode 120000
index 000000000000..17e8dbb24265
--- /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/msm_ion.h b/include/uapi/linux/msm_ion.h
deleted file mode 100644
index 05900fefd792..000000000000
--- a/include/uapi/linux/msm_ion.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UAPI_LINUX_MSM_ION_H__
-#define __UAPI_LINUX_MSM_ION_H__
-
-#include <linux/staging/android/uapi/msm_ion.h>
-
-#endif /* __UAPI_LINUX_MSM_ION_H__ */
diff --git a/include/uapi/linux/msm_ion.h b/include/uapi/linux/msm_ion.h
new file mode 120000
index 000000000000..94349d27efa6
--- /dev/null
+++ b/include/uapi/linux/msm_ion.h
@@ -0,0 +1 @@
+../../../drivers/staging/android/uapi/msm_ion.h
\ No newline at end of file