From 4b9d9cbaac4fca2bd620bd18a83cd2f91879bdeb Mon Sep 17 00:00:00 2001
From: grog <grog@FreeBSD.org>
Date: Sun, 29 Apr 2001 02:45:39 +0000
Subject: Revert consequences of changes to mount.h, part 2.

Requested by:	bde
---
 sys/amd64/amd64/autoconf.c        | 2 --
 sys/amd64/amd64/genassym.c        | 2 --
 sys/fs/cd9660/cd9660_bmap.c       | 2 --
 sys/fs/cd9660/cd9660_lookup.c     | 2 --
 sys/fs/cd9660/cd9660_node.c       | 2 --
 sys/fs/cd9660/cd9660_rrip.c       | 2 --
 sys/fs/cd9660/cd9660_util.c       | 2 --
 sys/fs/cd9660/cd9660_vfsops.c     | 2 --
 sys/fs/cd9660/cd9660_vnops.c      | 2 --
 sys/fs/msdosfs/msdosfs_denode.c   | 2 --
 sys/fs/msdosfs/msdosfs_fat.c      | 2 --
 sys/fs/msdosfs/msdosfs_lookup.c   | 2 --
 sys/fs/msdosfs/msdosfs_vfsops.c   | 2 --
 sys/fs/msdosfs/msdosfs_vnops.c    | 2 --
 sys/fs/procfs/procfs_vfsops.c     | 2 --
 sys/fs/procfs/procfs_vnops.c      | 2 --
 sys/fs/specfs/spec_vnops.c        | 2 --
 sys/gnu/ext2fs/ext2_bmap.c        | 2 --
 sys/gnu/fs/ext2fs/ext2_bmap.c     | 2 --
 sys/i386/i386/autoconf.c          | 2 --
 sys/i386/i386/genassym.c          | 2 --
 sys/isofs/cd9660/cd9660_bmap.c    | 2 --
 sys/isofs/cd9660/cd9660_lookup.c  | 2 --
 sys/isofs/cd9660/cd9660_node.c    | 2 --
 sys/isofs/cd9660/cd9660_rrip.c    | 2 --
 sys/isofs/cd9660/cd9660_util.c    | 2 --
 sys/isofs/cd9660/cd9660_vfsops.c  | 2 --
 sys/isofs/cd9660/cd9660_vnops.c   | 2 --
 sys/kern/init_main.c              | 2 --
 sys/kern/kern_acct.c              | 2 --
 sys/kern/kern_exec.c              | 2 --
 sys/kern/kern_shutdown.c          | 2 --
 sys/kern/uipc_syscalls.c          | 1 -
 sys/kern/vfs_bio.c                | 2 --
 sys/kern/vfs_cache.c              | 2 --
 sys/kern/vfs_cluster.c            | 2 --
 sys/kern/vfs_conf.c               | 2 --
 sys/kern/vfs_default.c            | 2 --
 sys/kern/vfs_extattr.c            | 2 --
 sys/kern/vfs_init.c               | 2 --
 sys/kern/vfs_lookup.c             | 2 --
 sys/kern/vfs_mount.c              | 2 --
 sys/kern/vfs_syscalls.c           | 2 --
 sys/kern/vfs_vnops.c              | 2 --
 sys/miscfs/procfs/procfs_vfsops.c | 2 --
 sys/miscfs/procfs/procfs_vnops.c  | 2 --
 sys/miscfs/specfs/spec_vnops.c    | 2 --
 sys/msdosfs/msdosfs_denode.c      | 2 --
 sys/msdosfs/msdosfs_fat.c         | 2 --
 sys/msdosfs/msdosfs_lookup.c      | 2 --
 sys/msdosfs/msdosfs_vfsops.c      | 2 --
 sys/msdosfs/msdosfs_vnops.c       | 2 --
 sys/nfs/nfs_bio.c                 | 2 --
 sys/nfs/nfs_common.c              | 2 --
 sys/nfs/nfs_lock.c                | 2 --
 sys/nfs/nfs_node.c                | 2 --
 sys/nfs/nfs_nqlease.c             | 2 --
 sys/nfs/nfs_serv.c                | 2 --
 sys/nfs/nfs_socket.c              | 2 --
 sys/nfs/nfs_srvcache.c            | 2 --
 sys/nfs/nfs_subs.c                | 2 --
 sys/nfs/nfs_syscalls.c            | 2 --
 sys/nfs/nfs_vfsops.c              | 2 --
 sys/nfs/nfs_vnops.c               | 2 --
 sys/nfsclient/nfs_bio.c           | 2 --
 sys/nfsclient/nfs_lock.c          | 2 --
 sys/nfsclient/nfs_nfsiod.c        | 2 --
 sys/nfsclient/nfs_node.c          | 2 --
 sys/nfsclient/nfs_socket.c        | 2 --
 sys/nfsclient/nfs_subs.c          | 2 --
 sys/nfsclient/nfs_vfsops.c        | 2 --
 sys/nfsclient/nfs_vnops.c         | 2 --
 sys/nfsserver/nfs_serv.c          | 2 --
 sys/nfsserver/nfs_srvcache.c      | 2 --
 sys/nfsserver/nfs_srvsock.c       | 2 --
 sys/nfsserver/nfs_srvsubs.c       | 2 --
 sys/nfsserver/nfs_syscalls.c      | 2 --
 sys/ufs/ffs/ffs_alloc.c           | 2 --
 sys/ufs/ffs/ffs_balloc.c          | 2 --
 sys/ufs/ffs/ffs_inode.c           | 2 --
 sys/ufs/ffs/ffs_snapshot.c        | 2 --
 sys/ufs/ffs/ffs_softdep.c         | 2 --
 sys/ufs/ffs/ffs_vfsops.c          | 2 --
 sys/ufs/ffs/ffs_vnops.c           | 2 --
 sys/ufs/mfs/mfs_vfsops.c          | 2 --
 sys/ufs/ufs/ufs_acl.c             | 2 --
 sys/ufs/ufs/ufs_bmap.c            | 2 --
 sys/ufs/ufs/ufs_extattr.c         | 2 --
 sys/ufs/ufs/ufs_inode.c           | 2 --
 sys/ufs/ufs/ufs_lookup.c          | 2 --
 sys/ufs/ufs/ufs_quota.c           | 2 --
 sys/ufs/ufs/ufs_vfsops.c          | 2 --
 sys/ufs/ufs/ufs_vnops.c           | 2 --
 sys/vm/vm_object.c                | 2 --
 sys/vm/vnode_pager.c              | 2 --
 usr.bin/fstat/fstat.c             | 1 -
 usr.bin/fstat/msdosfs.c           | 2 --
 usr.sbin/pstat/pstat.c            | 2 --
 98 files changed, 194 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 7491756..b6700be 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 433702c..c6f0970 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 d6796c9..e5fcd9a 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 27e1824..b2d5057 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 53c4dae..00f79e8 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 9616f35..5f0a262 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 f3e693e..56279db 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 276718f..a569c53 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 270da20..f34ebd4 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 d73a47c..dbdf554 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 f9d145f..38abc16 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 70d366e..776559d 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 2f04def..1d9b131 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 87e77aa..8ed27a0 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 5544b42..91daf9d 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 c253295..dc53c76 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 bdfe714..2940f40 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 6be13aa..40fdd65 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 6be13aa..40fdd65 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 7491756..b6700be 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 433702c..c6f0970 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 d6796c9..e5fcd9a 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 27e1824..b2d5057 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 53c4dae..00f79e8 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 9616f35..5f0a262 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 f3e693e..56279db 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 276718f..a569c53 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 270da20..f34ebd4 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 0266d76..a27b3e3 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 f149563..cfa8cbe 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 fe711cd..cbd91dd 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 ffe40c4..52ded64 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 74e1dc6..a8172a3 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 92c7d50..c1b53d8 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 ebb221e..2299e70 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 f4a19ba..8a6e045 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 32d7575..34fba78 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 f1dd5e9..e06dfa4 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 03d56f3..6b73258 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 3461b76..76d1155 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 def53d2..c95e020 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 32d7575..34fba78 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 03d56f3..6b73258 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 62407fe..fd13579 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 5544b42..91daf9d 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 c253295..dc53c76 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 bdfe714..2940f40 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 d73a47c..dbdf554 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 f9d145f..38abc16 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 70d366e..776559d 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 2f04def..1d9b131 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 87e77aa..8ed27a0 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 2154d1b..cb7297f 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 ac9c217..c7e6917 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 bc375d00..aaac361 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 6531fd0..0191b66 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 99d03dd4e..3878a77 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 bd54a3b..e015d17 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 de6a592..fefeea8 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 f2e9182..e7b10dd 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 ac9c217..c7e6917 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 e461d0d..a47d5a8 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 d454075..7f8be03 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 c6088e4..b37f6da 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 2154d1b..cb7297f 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 bc375d00..aaac361 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 e461d0d..a47d5a8 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 6531fd0..0191b66 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 de6a592..fefeea8 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 ac9c217..c7e6917 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 d454075..7f8be03 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 c6088e4..b37f6da 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 bd54a3b..e015d17 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 f2e9182..e7b10dd 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 de6a592..fefeea8 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 ac9c217..c7e6917 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 e461d0d..a47d5a8 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 f09007f..f569dc1 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 b6bdb49..92fe379 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 1a48b70..2395ec4 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 b92d179..28086cc 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 d42aa5f..e8399a6 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 02c3eaf..ccfdf18 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 326b53d..8fefb0e 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 4ac0002..7891cc5 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 3f2fdcf..c78b0a4 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 6be13aa..40fdd65 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 853eb4d..e77e9fb 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 56c4bc2..d4ed8b3 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 a85fea2..1b6f805 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 dc1c5e6..f419f01 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 73f8237..033f9dd 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 ad4e019..4510375 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 d127318..cc205a8 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 ea183f0..e9400b8 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 45ef13e..49bc0801 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 bf29df5..809477d 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 03945a7..c00fc89 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>
-- 
cgit v1.1