From d98dc34f523c46cf3aa2c86a70166af88a26b2cb Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Mon, 23 Apr 2001 09:05:15 +0000
Subject: [PATCH] Correct #includes to work with fixed sys/mount.h.

---
 sys/amd64/amd64/autoconf.c        | 2 ++
 sys/amd64/amd64/genassym.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_subr.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/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_export.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_subr.c               | 2 ++
 sys/kern/vfs_syscalls.c           | 2 ++
 sys/kern/vfs_vnops.c              | 2 ++
 sys/miscfs/procfs/procfs_subr.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 ++
 85 files changed, 169 insertions(+)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index b6700be6466..74917561330 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -61,6 +61,8 @@
 #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 c6f0970d63f..433702c42df 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -44,6 +44,8 @@
 #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/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index dbdf5549631..d73a47cd38b 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -51,6 +51,8 @@
 #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 38abc16c465..f9d145ff87a 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -55,6 +55,8 @@
 #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 776559d8b05..70d366ebf1b 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -54,6 +54,8 @@
 #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 672ea5df2e2..6cda3bd1287 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -55,6 +55,8 @@
 #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 8ed27a07380..87e77aad1b8 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -57,6 +57,8 @@
 #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_subr.c b/sys/fs/procfs/procfs_subr.c
index f2e0d9f300a..035eb7568c1 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -43,6 +43,8 @@
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
+#include <net/radix.h>
+#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 91daf9d4f61..5544b420b0e 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -47,6 +47,8 @@
 #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 01e73ac96c6..5dbd01e8946 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -54,6 +54,8 @@
 #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 2940f404b77..bdfe71483d3 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -41,6 +41,8 @@
 #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 40fdd65be29..6be13aa93e3 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -45,6 +45,8 @@
 #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 40fdd65be29..6be13aa93e3 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -45,6 +45,8 @@
 #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 b6700be6466..74917561330 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -61,6 +61,8 @@
 #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 c6f0970d63f..433702c42df 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -44,6 +44,8 @@
 #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/kern/init_main.c b/sys/kern/init_main.c
index a27b3e3ae84..0266d76f0eb 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -50,6 +50,8 @@
 #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 cfa8cbe7109..f149563507c 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -44,6 +44,8 @@
 #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 cbd91ddaa3c..fe711cdda5b 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -31,6 +31,8 @@
 #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 55c4ba47d97..8463991520a 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -54,6 +54,8 @@
 #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 2526c6b94d8..33f7902916b 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -58,6 +58,7 @@
 #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 c1b53d8c76e..92c7d50bda9 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -34,6 +34,8 @@
 #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 2299e703448..ebb221ea0e1 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -41,6 +41,8 @@
 #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 8a6e0452813..f4a19ba0991 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -46,6 +46,8 @@
 #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 34fba7846a1..32d7575ba3a 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -48,6 +48,8 @@
 #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 cdbf668c69d..13411298d80 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -47,6 +47,8 @@
 #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_export.c b/sys/kern/vfs_export.c
index 853bf765624..352b83e56ae 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -59,6 +59,8 @@
 #include <sys/kthread.h>
 #include <sys/ktr.h>
 #include <sys/malloc.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/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 6b73258f068..03d56f3b92f 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -49,6 +49,8 @@
 #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 76d115551e2..3461b76929b 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -43,6 +43,8 @@
 #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 c95e020d588..def53d20798 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -46,6 +46,8 @@
 #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 34fba7846a1..32d7575ba3a 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -48,6 +48,8 @@
 #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_subr.c b/sys/kern/vfs_subr.c
index 853bf765624..352b83e56ae 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -59,6 +59,8 @@
 #include <sys/kthread.h>
 #include <sys/ktr.h>
 #include <sys/malloc.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/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 6b73258f068..03d56f3b92f 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -49,6 +49,8 @@
 #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 4cb77c13ac9..98da01a373f 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -45,6 +45,8 @@
 #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_subr.c b/sys/miscfs/procfs/procfs_subr.c
index f2e0d9f300a..035eb7568c1 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -43,6 +43,8 @@
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
+#include <net/radix.h>
+#include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 91daf9d4f61..5544b420b0e 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -47,6 +47,8 @@
 #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 01e73ac96c6..5dbd01e8946 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -54,6 +54,8 @@
 #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 2940f404b77..bdfe71483d3 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -41,6 +41,8 @@
 #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 dbdf5549631..d73a47cd38b 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -51,6 +51,8 @@
 #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 38abc16c465..f9d145ff87a 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -55,6 +55,8 @@
 #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 776559d8b05..70d366ebf1b 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -54,6 +54,8 @@
 #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 672ea5df2e2..6cda3bd1287 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -55,6 +55,8 @@
 #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 8ed27a07380..87e77aad1b8 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -57,6 +57,8 @@
 #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 cb7297f46bf..2154d1b8219 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -46,6 +46,8 @@
 #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 c7e6917e87d..ac9c217a70d 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -48,6 +48,8 @@
 #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 aaac36161d3..bc375d006fa 100644
--- a/sys/nfs/nfs_lock.c
+++ b/sys/nfs/nfs_lock.c
@@ -34,6 +34,8 @@
 #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 0191b664a81..6531fd0c59c 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -40,6 +40,8 @@
 
 #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 3878a77ff20..99d03dd4e3d 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -54,6 +54,8 @@
 #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 e015d1795fc..bd54a3b7eb7 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -76,6 +76,8 @@
 #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 fefeea8ac8e..de6a592c158 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -45,6 +45,8 @@
 #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 e7b10dd6b6d..f2e9182dbcc 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -44,6 +44,8 @@
  */
 #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 c7e6917e87d..ac9c217a70d 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -48,6 +48,8 @@
 #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 a47d5a8e332..e461d0d76b4 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -46,6 +46,8 @@
 #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 7f8be03082e..d454075773e 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -46,6 +46,8 @@
 #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 b37f6da6606..c6088e4ad9d 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -49,6 +49,8 @@
 #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 cb7297f46bf..2154d1b8219 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -46,6 +46,8 @@
 #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 aaac36161d3..bc375d006fa 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -34,6 +34,8 @@
 #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 a47d5a8e332..e461d0d76b4 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -46,6 +46,8 @@
 #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 0191b664a81..6531fd0c59c 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -40,6 +40,8 @@
 
 #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 fefeea8ac8e..de6a592c158 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -45,6 +45,8 @@
 #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 c7e6917e87d..ac9c217a70d 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -48,6 +48,8 @@
 #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 7f8be03082e..d454075773e 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -46,6 +46,8 @@
 #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 b37f6da6606..c6088e4ad9d 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -49,6 +49,8 @@
 #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 e015d1795fc..bd54a3b7eb7 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -76,6 +76,8 @@
 #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 e7b10dd6b6d..f2e9182dbcc 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -44,6 +44,8 @@
  */
 #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 fefeea8ac8e..de6a592c158 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -45,6 +45,8 @@
 #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 c7e6917e87d..ac9c217a70d 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -48,6 +48,8 @@
 #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 a47d5a8e332..e461d0d76b4 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -46,6 +46,8 @@
 #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 f569dc1a205..f09007f8bfb 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -44,6 +44,8 @@
 #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 92fe3794a75..b6bdb4988b5 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -39,6 +39,8 @@
 #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 2395ec402d1..1a48b707312 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -38,6 +38,8 @@
 
 #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 35e0d1b2662..2b091621311 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -43,6 +43,8 @@
 #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 e8399a61fc4..d42aa5fbae8 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -55,6 +55,8 @@
 #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 aa2960dd02f..2f23717a2bd 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -43,6 +43,8 @@
 #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 8fefb0ebda1..326b53d6707 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -45,6 +45,8 @@
 #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 ae246d39fe5..2f56b1a366a 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -45,6 +45,8 @@
 #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 c78b0a473ee..3f2fdcfaa69 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -36,6 +36,8 @@
 #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 40fdd65be29..6be13aa93e3 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -45,6 +45,8 @@
 #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 e77e9fb0885..853eb4db9e3 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -37,6 +37,8 @@
 #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 d4ed8b3efaa..56c4bc24206 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -44,6 +44,8 @@
 
 #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 1b6f8053857..a85fea20981 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -47,6 +47,8 @@
 #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 f419f01340c..dc1c5e69b72 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -45,6 +45,8 @@
 #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 ded05c1bb81..33346cf66a2 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -45,6 +45,8 @@
 #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 0b65496d88a..7c362630d89 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -51,6 +51,8 @@
 #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 cc205a8b840..d1273182a03 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -74,6 +74,8 @@
 #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 e9400b80cc2..ea183f0cc86 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -55,6 +55,8 @@
 #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>