71 files changed, 0 insertions, 72 deletions

diff --git a/sys/cam/cam_extend.c b/sys/cam/cam_extend.c
index 0802febac4439..b6d41331ccbbc 100644
--- a/sys/cam/cam_extend.c
+++ b/sys/cam/cam_extend.c
@@ -25,7 +25,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <cam/cam_extend.h>
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 51b3f6a7792c0..4040030f09bc8 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 /*#include <sys/ioctl.h>*/
-#include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/unistd.h>
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 6d250fdee4718..b37e213f92799 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -79,7 +79,6 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index e51f155b592fe..aa9c97f5a538a 100644
--- a/sys/dev/awi/am79c930.c
+++ b/sys/dev/awi/am79c930.c
@@ -63,7 +63,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #ifndef __FreeBSD__
 #include <sys/device.h>
 #endif
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 6a385537e49c8..e8db0eed8d82c 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 7b4479be174d2..e4b4001a3bc32 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -62,7 +62,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index bbf361a490f88..57881569274a4 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/linker.h>
 #include <sys/fbio.h>
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 4b2d6f244f2e8..e76c56a63c52e 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -43,7 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 
 #include <sys/buf.h>
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index f8ef5e1794e7b..c3156d2fe20e7 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -28,7 +28,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 79ac2e5859548..ab5bc150c7e16 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -43,7 +43,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 7e473a3a71fff..7a9b503db6016 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -45,7 +45,6 @@
 #endif	/* _KERNEL */
 
 #ifdef	_KERNEL
-#include <sys/kernel.h>
 #endif /* _KERNEL */
 
 #include "opt_vpo.h"
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index af21ac2efff3f..61c325c63605b 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/bus.h>
 
 #include <dev/ppbus/ppbconf.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 2da4d2a458711..0feb9bb4ac47c 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -39,7 +39,6 @@
 #endif
 
 #ifdef	_KERNEL
-#include <sys/kernel.h>
 #endif
 
 #include "opt_vpo.h"
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 5e242aa7e912f..b91f3d37d79c7 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -28,7 +28,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 15e00b90c0fe3..9e65f3b3ebea5 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -83,7 +83,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 21e121a3c7a79..d609d00046716 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 
 #include <dev/sound/pcm/sound.h>
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index e7587184734b1..18272b39ab163 100644
--- a/sys/dev/syscons/scterm-dumb.c
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/consio.h>
 
 #include <machine/pc/display.h>
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 35a7db64a1fa4..c712bd6f0edcb 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -54,7 +54,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 94fbcf7723911..e406409a01476 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/kernel.h>
 #include <sys/device.h>
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 5a8e9f44beb90..1538f90f05c4a 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/file.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index c86c6c85575d8..f2e0d9f300a06 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 2aaa5aa6a2e50..898b298b782ab 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -114,7 +114,6 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ctxreg.h>
diff --git a/sys/i4b/layer1/i4b_avm_a1.c b/sys/i4b/layer1/i4b_avm_a1.c
index af6b74fc2b568..b44ff0fedc553 100644
--- a/sys/i4b/layer1/i4b_avm_a1.c
+++ b/sys/i4b/layer1/i4b_avm_a1.c
@@ -50,7 +50,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_bchan.c b/sys/i4b/layer1/i4b_bchan.c
index 8dd6252501e3f..dad624710c964 100644
--- a/sys/i4b/layer1/i4b_bchan.c
+++ b/sys/i4b/layer1/i4b_bchan.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <machine/stdarg.h>
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index d3fefae25f8db..abddb459dec65 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -49,7 +49,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_drn_ngo.c b/sys/i4b/layer1/i4b_drn_ngo.c
index 945706910f075..a7b1d9282df02 100644
--- a/sys/i4b/layer1/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/i4b_drn_ngo.c
@@ -42,7 +42,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_elsa_pcc16.c b/sys/i4b/layer1/i4b_elsa_pcc16.c
index 84910e8cde4ef..24f05b65fd1f6 100644
--- a/sys/i4b/layer1/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/i4b_elsa_pcc16.c
@@ -41,7 +41,6 @@
 #if (NISIC > 0) && defined(ELSA_PCC16)
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index 5746c1f34c3ff..63fed1e7b2553 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -41,7 +41,6 @@
 #if (NISIC > 0) && defined(ELSA_QS1ISA)
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_hscx.c b/sys/i4b/layer1/i4b_hscx.c
index 36aef240606c1..7b71d0c5b762d 100644
--- a/sys/i4b/layer1/i4b_hscx.c
+++ b/sys/i4b/layer1/i4b_hscx.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_isac.c b/sys/i4b/layer1/i4b_isac.c
index 1171463dd3b35..ef56df17d0524 100644
--- a/sys/i4b/layer1/i4b_isac.c
+++ b/sys/i4b/layer1/i4b_isac.c
@@ -43,7 +43,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_isic.c b/sys/i4b/layer1/i4b_isic.c
index b6db86a2fb0c0..59d3c22080ad8 100644
--- a/sys/i4b/layer1/i4b_isic.c
+++ b/sys/i4b/layer1/i4b_isic.c
@@ -42,7 +42,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_l1.c b/sys/i4b/layer1/i4b_l1.c
index cdb2b0163ee2f..dc256cf54b4fd 100644
--- a/sys/i4b/layer1/i4b_l1.c
+++ b/sys/i4b/layer1/i4b_l1.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_siemens_isurf.c b/sys/i4b/layer1/i4b_siemens_isurf.c
index 29730aa7e63b5..956bc17baaa8c 100644
--- a/sys/i4b/layer1/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/i4b_siemens_isurf.c
@@ -52,7 +52,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_sws.c b/sys/i4b/layer1/i4b_sws.c
index d6dd4db7bc913..13834457b7681 100644
--- a/sys/i4b/layer1/i4b_sws.c
+++ b/sys/i4b/layer1/i4b_sws.c
@@ -69,7 +69,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_tel_s016.c b/sys/i4b/layer1/i4b_tel_s016.c
index d3879b1ad77c0..e63e42596bcef 100644
--- a/sys/i4b/layer1/i4b_tel_s016.c
+++ b/sys/i4b/layer1/i4b_tel_s016.c
@@ -52,7 +52,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_tel_s0163.c b/sys/i4b/layer1/i4b_tel_s0163.c
index a446a44b4ac01..fd6e6b3eac8f1 100644
--- a/sys/i4b/layer1/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/i4b_tel_s0163.c
@@ -52,7 +52,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer1/i4b_tel_s08.c b/sys/i4b/layer1/i4b_tel_s08.c
index a7c835de48558..c7131d661dea3 100644
--- a/sys/i4b/layer1/i4b_tel_s08.c
+++ b/sys/i4b/layer1/i4b_tel_s08.c
@@ -52,7 +52,6 @@
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index 3bd986333fb3e..af3e22ea6d746 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 333650c1043f0..f2e432c88c113 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index a3690b9cce6d4..6d2dd16d5428d 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 4fb0fb604530b..ede15ba513932 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -48,7 +48,6 @@
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index f0c6702c6b201..bc70555c010d7 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index 98f9b00a9a4da..91c24e9010675 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -51,7 +51,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/mbuf.h>
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index 7de4965e8c2a2..14d1731d57068 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 4356a8c70e403..271fbfbda062e 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index dfebbca5d07dd..8fa404c8288d5 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index 92de1ad528276..0ace47a7ef150 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index da11b63e115eb..fae4c1c686f68 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index e2fa689d0605a..144bc859b55e0 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -51,7 +51,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index 1162144eee761..0f2d1a01d60a2 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -50,7 +50,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index cde245141eec3..2e1433feb2c35 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -48,7 +48,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index 1f61fd7c243a3..5ed1e82f1c47f 100644
--- a/sys/isa/pnpparse.c
+++ b/sys/isa/pnpparse.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c
index cce81c3bff6e5..0c1fb72dd3a54 100644
--- a/sys/kern/ksched.c
+++ b/sys/kern/ksched.c
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/resource.h>
 #include <machine/cpu.h>	/* For need_resched */
 #include <machine/ipl.h>	/* For need_resched */
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index c86c6c85575d8..f2e0d9f300a06 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index d6a0fd5d81db4..bbd10d83f9d27 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -44,7 +44,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h> 
@@ -78,7 +77,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <sys/kernel.h>
 #include <net/iso88025.h>
 
 void
diff --git a/sys/net/net_osdep.c b/sys/net/net_osdep.c
index 81dd3a8e525c5..03e40f3ad2dd5 100644
--- a/sys/net/net_osdep.c
+++ b/sys/net/net_osdep.c
@@ -31,7 +31,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index 7a5416a0559e7..8ef0f390d2401 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -46,7 +46,6 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index 8f42814e3a5e6..e8aa77e4e6613 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index 3c3602c4c8261..c33dfe867346b 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -47,7 +47,6 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index fa61b54890ecc..b79a0ad0ab5c9 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -37,7 +37,6 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index dc559e125661f..98b973d936e45 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -40,7 +40,6 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index 2ff12adb53c3c..ef550697cbb67 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 4509b9a330256..fbe0d253ef0a9 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -46,7 +46,6 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index d1e138b73bd5c..249d38ca54d71 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -39,7 +39,6 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index da92879f5bed6..2501a2d6bcc36 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -36,7 +36,6 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index 5a8e9f44beb90..1538f90f05c4a 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/file.h>
diff --git a/sys/pc98/pc98/isa_compat.c b/sys/pc98/pc98/isa_compat.c
index 20af88d19404f..9949dbbbf5ce8 100644
--- a/sys/pc98/pc98/isa_compat.c
+++ b/sys/pc98/pc98/isa_compat.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
diff --git a/sys/posix4/ksched.c b/sys/posix4/ksched.c
index cce81c3bff6e5..0c1fb72dd3a54 100644
--- a/sys/posix4/ksched.c
+++ b/sys/posix4/ksched.c
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/resource.h>
 #include <machine/cpu.h>	/* For need_resched */
 #include <machine/ipl.h>	/* For need_resched */
diff --git a/sys/svr4/svr4_fcntl.c b/sys/svr4/svr4_fcntl.c
index 51b3f6a7792c0..4040030f09bc8 100644
--- a/sys/svr4/svr4_fcntl.c
+++ b/sys/svr4/svr4_fcntl.c
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 /*#include <sys/ioctl.h>*/
-#include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/unistd.h>
diff --git a/sys/svr4/svr4_ipc.c b/sys/svr4/svr4_ipc.c
index 6d250fdee4718..b37e213f92799 100644
--- a/sys/svr4/svr4_ipc.c
+++ b/sys/svr4/svr4_ipc.c
@@ -79,7 +79,6 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 78b8f7e7e0b0d..38aa03b77d095 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -42,7 +42,6 @@
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>