diff --git a/[refs] b/[refs]
index 1033adbf3ff7..8599b3a6259f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b060420a596095869a6d7849caa798d23839cd1
+refs/heads/master: 1dbe39424a43e56a6c9aed12661192af51dcdb9f
diff --git a/trunk/include/linux/xattr.h b/trunk/include/linux/xattr.h
index 6050783005bd..aed54c50aa66 100644
--- a/trunk/include/linux/xattr.h
+++ b/trunk/include/linux/xattr.h
@@ -13,10 +13,6 @@
 #define XATTR_CREATE	0x1	/* set value, fail if attr already exists */
 #define XATTR_REPLACE	0x2	/* set value, fail if attr does not exist */
 
-#ifdef  __KERNEL__
-
-#include <linux/types.h>
-
 /* Namespaces */
 #define XATTR_OS2_PREFIX "os2."
 #define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
@@ -53,6 +49,10 @@
 #define XATTR_CAPS_SUFFIX "capability"
 #define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
 
+#ifdef  __KERNEL__
+
+#include <linux/types.h>
+
 struct inode;
 struct dentry;