diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 74917561330..b6700be6466 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -61,8 +61,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/cons.h>
 
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 433702c42df..c6f0970d63f 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -44,8 +44,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index d6796c9f2e1..e5fcd9ab32b 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -41,8 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 27e182463ac..b2d5057f631 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -47,8 +47,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 53c4dae7d45..00f79e80c1d 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -41,8 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 9616f350650..5f0a262bd90 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -44,8 +44,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index f3e693e754a..56279db0366 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -41,8 +41,6 @@
  */
 
 #include <sys/param.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 276718f2169..a569c53a5c8 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -45,8 +45,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 270da205a0d..f34ebd44634 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -46,8 +46,6 @@
 #include <sys/stat.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/fifofs/fifo.h>
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index d73a47cd38b..dbdf5549631 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -51,8 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/bio.h>
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index f9d145ff87a..38abc16c465 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -55,8 +55,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>		/* to define statfs structure */
 #include <sys/vnode.h>		/* to define vattr structure */
 
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 70d366ebf1b..776559d8b05 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -54,8 +54,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <msdosfs/bpb.h>
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 2f04def7495..1d9b13137ff 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -55,8 +55,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 87e77aad1b8..8ed27a07380 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -57,8 +57,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 5544b420b0e..91daf9d4f61 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -47,8 +47,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/procfs/procfs.h>
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index c253295c323..dc53c764da0 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -54,8 +54,6 @@
 #include <sys/sx.h>
 #include <sys/vnode.h>
 #include <sys/uio.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index bdfe71483d3..2940f404b77 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -41,8 +41,6 @@
 #include <sys/conf.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 6be13aa93e3..40fdd65be29 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -45,8 +45,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 6be13aa93e3..40fdd65be29 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -45,8 +45,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 74917561330..b6700be6466 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -61,8 +61,6 @@
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/cons.h>
 
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 433702c42df..c6f0970d63f 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -44,8 +44,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index d6796c9f2e1..e5fcd9ab32b 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -41,8 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 27e182463ac..b2d5057f631 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -47,8 +47,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 53c4dae7d45..00f79e80c1d 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -41,8 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 9616f350650..5f0a262bd90 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -44,8 +44,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index f3e693e754a..56279db0366 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -41,8 +41,6 @@
  */
 
 #include <sys/param.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 276718f2169..a569c53a5c8 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -45,8 +45,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 270da205a0d..f34ebd44634 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -46,8 +46,6 @@
 #include <sys/stat.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/fifofs/fifo.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 0266d76f0eb..a27b3e3ae84 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -50,8 +50,6 @@
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index f149563507c..cfa8cbe7109 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -44,8 +44,6 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index fe711cdda5b..cbd91ddaa3c 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -31,8 +31,6 @@
 #include <sys/sysproto.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/filedesc.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index ffe40c42578..52ded6468c0 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -54,8 +54,6 @@
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 74e1dc6bf1b..a8172a30e1b 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -58,7 +58,6 @@
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <net/radix.h>
 #include <sys/mount.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 92c7d50bda9..c1b53d8c76e 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -34,8 +34,6 @@
 #include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ebb221ea0e1..2299e703448 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -41,8 +41,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index f4a19ba0991..8a6e0452813 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -46,8 +46,6 @@
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
 #include <sys/vmmeter.h>
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 32d7575ba3a..34fba7846a1 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -48,8 +48,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index f1dd5e9e48d..e06dfa4a5c9 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -47,8 +47,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/unistd.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 03d56f3b92f..6b73258f068 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -49,8 +49,6 @@
 #include <sys/buf.h>
 #include <sys/sysent.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 3461b76929b..76d115551e2 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -43,8 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index def53d20798..c95e020d588 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -46,8 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 32d7575ba3a..34fba7846a1 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -48,8 +48,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 03d56f3b92f..6b73258f068 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -49,8 +49,6 @@
 #include <sys/buf.h>
 #include <sys/sysent.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 62407fee071..fd1357912c7 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -45,8 +45,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 5544b420b0e..91daf9d4f61 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -47,8 +47,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/procfs/procfs.h>
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index c253295c323..dc53c764da0 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -54,8 +54,6 @@
 #include <sys/sx.h>
 #include <sys/vnode.h>
 #include <sys/uio.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index bdfe71483d3..2940f404b77 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -41,8 +41,6 @@
 #include <sys/conf.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index d73a47cd38b..dbdf5549631 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -51,8 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/bio.h>
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index f9d145ff87a..38abc16c465 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -55,8 +55,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>		/* to define statfs structure */
 #include <sys/vnode.h>		/* to define vattr structure */
 
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 70d366ebf1b..776559d8b05 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -54,8 +54,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <msdosfs/bpb.h>
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 2f04def7495..1d9b13137ff 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -55,8 +55,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 87e77aad1b8..8ed27a07380 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -57,8 +57,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 2154d1b8219..cb7297f46bf 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -46,8 +46,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index ac9c217a70d..c7e6917e87d 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -48,8 +48,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c
index bc375d006fa..aaac36161d3 100644
--- a/sys/nfs/nfs_lock.c
+++ b/sys/nfs/nfs_lock.c
@@ -34,8 +34,6 @@
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 6531fd0c59c..0191b664a81 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -40,8 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 99d03dd4e3d..3878a77ff20 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -54,8 +54,6 @@
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index bd54a3b7eb7..e015d1795fc 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -76,8 +76,6 @@
 #include <sys/namei.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index de6a592c158..fefeea8ac8e 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -45,8 +45,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index f2e9182dbcc..e7b10dd6b6d 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -44,8 +44,6 @@
  */
 #include <sys/param.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index ac9c217a70d..c7e6917e87d 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -48,8 +48,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index e461d0d76b4..a47d5a8e332 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -46,8 +46,6 @@
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/bio.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index d454075773e..7f8be03082e 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -46,8 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index c6088e4ad9d..b37f6da6606 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -49,8 +49,6 @@
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 2154d1b8219..cb7297f46bf 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -46,8 +46,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index bc375d006fa..aaac36161d3 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -34,8 +34,6 @@
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index e461d0d76b4..a47d5a8e332 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -46,8 +46,6 @@
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/bio.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 6531fd0c59c..0191b664a81 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -40,8 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index de6a592c158..fefeea8ac8e 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -45,8 +45,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index ac9c217a70d..c7e6917e87d 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -48,8 +48,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index d454075773e..7f8be03082e 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -46,8 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index c6088e4ad9d..b37f6da6606 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -49,8 +49,6 @@
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index bd54a3b7eb7..e015d1795fc 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -76,8 +76,6 @@
 #include <sys/namei.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index f2e9182dbcc..e7b10dd6b6d 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -44,8 +44,6 @@
  */
 #include <sys/param.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index de6a592c158..fefeea8ac8e 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -45,8 +45,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index ac9c217a70d..c7e6917e87d 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -48,8 +48,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index e461d0d76b4..a47d5a8e332 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -46,8 +46,6 @@
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/bio.h>
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index f09007f8bfb..f569dc1a205 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -44,8 +44,6 @@
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index b6bdb4988b5..92fe3794a75 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -39,8 +39,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/lock.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 1a48b707312..2395ec402d1 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -38,8 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/bio.h>
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index b92d179f708..28086cc8165 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -43,8 +43,6 @@
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index d42aa5fbae8..e8399a61fc4 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -55,8 +55,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 02c3eafaedb..ccfdf18867d 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -43,8 +43,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 326b53d6707..8fefb0ebda1 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -45,8 +45,6 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 4ac0002a93a..7891cc53217 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -45,8 +45,6 @@
 #include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index 3f2fdcfaa69..c78b0a473ee 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -36,8 +36,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/stat.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/types.h>
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 6be13aa93e3..40fdd65be29 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -45,8 +45,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 853eb4db9e3..e77e9fb0885 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -37,8 +37,6 @@
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/lock.h>
 #include <sys/dirent.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 56c4bc24206..d4ed8b3efaa 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -44,8 +44,6 @@
 
 #include <sys/param.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index a85fea20981..1b6f8053857 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -47,8 +47,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index dc1c5e69b72..f419f01340c 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -45,8 +45,6 @@
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 
 #include <ufs/ufs/extattr.h>
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 73f8237af8d..033f9dd8719 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -45,8 +45,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index ad4e0199b8d..451037572f1 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -51,8 +51,6 @@
 #include <sys/stat.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index d1273182a03..cc205a8b840 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -74,8 +74,6 @@
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
 #include <sys/mman.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index ea183f0cc86..e9400b80cc2 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -55,8 +55,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 45ef13eb63e..49bc0801f02 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -51,7 +51,6 @@ static const char rcsid[] =
 #include <sys/user.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
-#include <net/radix.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
diff --git a/usr.bin/fstat/msdosfs.c b/usr.bin/fstat/msdosfs.c
index bf29df5b265..809477d476b 100644
--- a/usr.bin/fstat/msdosfs.c
+++ b/usr.bin/fstat/msdosfs.c
@@ -42,8 +42,6 @@
 #include <sys/vnode.h>
 
 #define	_KERNEL
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <msdosfs/bpb.h>
 #include <msdosfs/msdosfsmount.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 03945a78985..c00fc89539d 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -53,8 +53,6 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
 #include <sys/namei.h>