diff --git a/[refs] b/[refs]
index 2e89a74784d5..b37bbfce87a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f63aaa8b9239475fc580d4450f1141496655305
+refs/heads/master: 79955898f961a870cbcc58f6ae13f3741a909da5
diff --git a/trunk/include/linux/auto_dev-ioctl.h b/trunk/include/linux/auto_dev-ioctl.h
index 91a773993a5c..850f39b33e74 100644
--- a/trunk/include/linux/auto_dev-ioctl.h
+++ b/trunk/include/linux/auto_dev-ioctl.h
@@ -10,8 +10,13 @@
 #ifndef _LINUX_AUTO_DEV_IOCTL_H
 #define _LINUX_AUTO_DEV_IOCTL_H
 
+#include <linux/auto_fs.h>
+
+#ifdef __KERNEL__
 #include <linux/string.h>
-#include <linux/types.h>
+#else
+#include <string.h>
+#endif /* __KERNEL__ */
 
 #define AUTOFS_DEVICE_NAME		"autofs"
 
diff --git a/trunk/include/linux/auto_fs.h b/trunk/include/linux/auto_fs.h
index c21e5972a3e8..63265852b7d1 100644
--- a/trunk/include/linux/auto_fs.h
+++ b/trunk/include/linux/auto_fs.h
@@ -17,11 +17,13 @@
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/limits.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#else
 #include <asm/types.h>
+#include <sys/ioctl.h>
 #endif /* __KERNEL__ */
 
-#include <linux/ioctl.h>
-
 /* This file describes autofs v3 */
 #define AUTOFS_PROTO_VERSION	3