diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h
index 9110b66c7ef18b05070cd376163df856bdb8f971..9400a9f6318a0fab9ac95aeb12e84776a4ae4006 100644
--- a/fs/autofs/autofs_i.h
+++ b/fs/autofs/autofs_i.h
@@ -25,7 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/completion.h>
-#include <asm/current.h>
+#include <linux/file.h>
 
 /* This is the range of ioctl() numbers we claim as ours */
 #define AUTOFS_IOC_FIRST     AUTOFS_IOC_READY
diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c
index a2281ab2b957421d48d369411da0c488d893982b..ea4ca1445ab78808644408de99430d8bbd6e1fd9 100644
--- a/fs/autofs/dev-ioctl.c
+++ b/fs/autofs/dev-ioctl.c
@@ -7,23 +7,10 @@
  * option, any later version, incorporated herein by reference.
  */
 
-#include <linux/module.h>
-#include <linux/vmalloc.h>
 #include <linux/miscdevice.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/namei.h>
-#include <linux/fcntl.h>
-#include <linux/file.h>
-#include <linux/fdtable.h>
-#include <linux/sched.h>
-#include <linux/cred.h>
 #include <linux/compat.h>
 #include <linux/syscalls.h>
 #include <linux/magic.h>
-#include <linux/dcache.h>
-#include <linux/uaccess.h>
-#include <linux/slab.h>
 
 #include "autofs_i.h"
 
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 6262819ede454c8dce11d5237a38037bd4654dbf..b51980fc274e6c6b26fef944974a076523ae33a3 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -7,16 +7,12 @@
  * option, any later version, incorporated herein by reference.
  */
 
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/file.h>
 #include <linux/seq_file.h>
 #include <linux/pagemap.h>
 #include <linux/parser.h>
-#include <linux/bitops.h>
 #include <linux/magic.h>
+
 #include "autofs_i.h"
-#include <linux/module.h>
 
 struct autofs_info *autofs_new_ino(struct autofs_sb_info *sbi)
 {
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index a4b36e44f73cf81482fc6050f82740bceae4490b..a3d4141505784cb759883a8015ab1fbdb5a5aaae 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -9,13 +9,7 @@
  */
 
 #include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/stat.h>
-#include <linux/slab.h>
-#include <linux/param.h>
-#include <linux/time.h>
 #include <linux/compat.h>
-#include <linux/mutex.h>
 
 #include "autofs_i.h"
 
diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c
index 8a566fa66afe570d0e0c80798eaf09146ba3b3a8..8c858126c751d696c73a5424bfabe8b63d47b595 100644
--- a/fs/autofs/waitq.c
+++ b/fs/autofs/waitq.c
@@ -7,11 +7,7 @@
  * option, any later version, incorporated herein by reference.
  */
 
-#include <linux/slab.h>
-#include <linux/time.h>
-#include <linux/signal.h>
 #include <linux/sched/signal.h>
-#include <linux/file.h>
 #include "autofs_i.h"
 
 /* We make this a static variable rather than a part of the superblock; it
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index b3e1768b636eb1f857d440595813f9339bf5fa68..9907475b422624cc10b262e84d57aee3150f00db 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -38,7 +38,6 @@
 #include <linux/ppp-ioctl.h>
 #include <linux/if_pppox.h>
 #include <linux/mtio.h>
-#include <linux/auto_fs.h>
 #include <linux/tty.h>
 #include <linux/vt_kern.h>
 #include <linux/fb.h>