diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index bbb62ff84601b85c0e3d9ce30d86fcc7f2115914..8418154215df5c26351e0f6561a97780b44ba998 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -6,7 +6,6 @@
 #ifndef __LINUX_BLK_TYPES_H
 #define __LINUX_BLK_TYPES_H
 
-#include <linux/kabi.h>
 #include <linux/types.h>
 #include <linux/bvec.h>
 #include <linux/ktime.h>
diff --git a/include/linux/cred.h b/include/linux/cred.h
index cd1b5fc47d52c9983f0724d6940e52f76682e2d5..7385295198ca259cdb296e12d3bc59beb93b220c 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -8,7 +8,6 @@
 #ifndef _LINUX_CRED_H
 #define _LINUX_CRED_H
 
-#include <linux/kabi.h>
 #include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/key.h>
diff --git a/include/linux/device.h b/include/linux/device.h
index 929b66dc5ea9ecaf646350dfb63227a54d1e32c9..d9291e2a624ad6794209dd125e44d8667095ca8c 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -12,7 +12,6 @@
 #ifndef _DEVICE_H_
 #define _DEVICE_H_
 
-#include <linux/kabi.h>
 #include <linux/dev_printk.h>
 #include <linux/energy_model.h>
 #include <linux/ioport.h>
diff --git a/include/linux/device/class.h b/include/linux/device/class.h
index f2071ee10d61a685cc3666b3c4a512a10969ca24..34f2593267311e098eddeaef89cd68cf13cb76e4 100644
--- a/include/linux/device/class.h
+++ b/include/linux/device/class.h
@@ -14,7 +14,6 @@
 #ifndef _DEVICE_CLASS_H_
 #define _DEVICE_CLASS_H_
 
-#include <linux/kabi.h>
 #include <linux/kobject.h>
 #include <linux/klist.h>
 #include <linux/pm.h>
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index fc7e99ba642046156d722734938c2bad6a1187c2..3930f564f20791830b1ad1069aef3e7adcb475d0 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -10,7 +10,6 @@
 #define _LINUX_IOPORT_H
 
 #ifndef __ASSEMBLY__
-#include <linux/kabi.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/bits.h>
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1ae73cc4b80605bd1055dd7cf1f42fa436c728ff..4958e96f508d14553bfd16613de1d942f59a885a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -6,7 +6,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/kabi.h>
 #include <linux/mmdebug.h>
 #include <linux/gfp.h>
 #include <linux/bug.h>
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 2b68047db2d9b1f1b2bb0aa4f23890571480f60d..f2aa72ec0e577b711a56d906c959a812ee8bf08b 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -2,7 +2,6 @@
 #ifndef _LINUX_SWAP_H
 #define _LINUX_SWAP_H
 
-#include <linux/kabi.h>
 #include <linux/spinlock.h>
 #include <linux/linkage.h>
 #include <linux/mmzone.h>