diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 67346d4de5d6..e74e463f121c 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -36,16 +36,11 @@
 #include <sys/systm.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
@@ -54,17 +49,13 @@
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_zone.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 
-#include <sys/ioccom.h>
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_ncp.h>
-#include <netncp/ncp_rq.h>
 
 #include <nwfs/nwfs.h>
 #include <nwfs/nwfs_node.h>
diff --git a/sys/fs/nwfs/nwfs_ioctl.c b/sys/fs/nwfs/nwfs_ioctl.c
index 6b4b510bc79c..1892cef8d872 100644
--- a/sys/fs/nwfs/nwfs_ioctl.c
+++ b/sys/fs/nwfs/nwfs_ioctl.c
@@ -33,16 +33,10 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/dirent.h>
-#include <sys/signalvar.h>
 #include <sys/ioccom.h>
 
 #include <netncp/ncp.h>
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index 55e19b7c6fd3..bd4ca7a416c1 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -37,7 +37,6 @@
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
@@ -46,9 +45,6 @@
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vnode_pager.h>
-#include <vm/vm_zone.h>
 #include <sys/queue.h>
 
 #include <netncp/ncp.h>
diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c
index d57d67537ada..9ba8b312b1bc 100644
--- a/sys/fs/nwfs/nwfs_subr.c
+++ b/sys/fs/nwfs/nwfs_subr.c
@@ -34,17 +34,14 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <machine/clock.h>
 #include <sys/time.h>
-#include <sys/namei.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_ncp.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_user.h>
 #include <netncp/ncp_rq.h>
 #include <netncp/nwerror.h>
 
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index 53ecf984e4e5..2f03564d8abd 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -50,10 +49,8 @@
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
-#include <netncp/ncp_sock.h>
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_ncp.h>
-#include <netncp/ncp_rq.h>
 #include <netncp/ncp_nls.h>
 
 #include <nwfs/nwfs.h>
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index ab9f22017c18..61163b0352a8 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -34,24 +34,17 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/dirent.h>
-#include <sys/signalvar.h>
-#include <sys/ioccom.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
-#include <vm/vnode_pager.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 84b1603c520b..835176e63e98 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -35,7 +35,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
@@ -43,7 +42,6 @@
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_user.h>
 #include <netncp/ncp_conn.h>
 
 SLIST_HEAD(ncp_handle_head,ncp_handle);
diff --git a/sys/netncp/ncp_crypt.c b/sys/netncp/ncp_crypt.c
index 9ee06652b5fd..8ffb62b68747 100644
--- a/sys/netncp/ncp_crypt.c
+++ b/sys/netncp/ncp_crypt.c
@@ -2,12 +2,8 @@
  * $FreeBSD$
  */
 #include <sys/param.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/poll.h>
 #include <netncp/ncp.h>
 #include <netncp/ncp_subr.h>
 
diff --git a/sys/netncp/ncp_login.c b/sys/netncp/ncp_login.c
index bac5ac517649..7c3c1f273491 100644
--- a/sys/netncp/ncp_login.c
+++ b/sys/netncp/ncp_login.c
@@ -36,14 +36,10 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/poll.h>
-#include <sys/mbuf.h>
 #include <sys/socket.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
-#include <netncp/ncp_sock.h>
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_ncp.h>
 #include <netncp/ncp_rq.h>
diff --git a/sys/netncp/ncp_mod.c b/sys/netncp/ncp_mod.c
index 59325ba6f906..aabfc0f25fa0 100644
--- a/sys/netncp/ncp_mod.c
+++ b/sys/netncp/ncp_mod.c
@@ -34,11 +34,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/exec.h>
 #include <sys/sysent.h>
-#include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
@@ -46,7 +43,6 @@
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
-#include <netncp/ncp_sock.h>
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_ncp.h>
 #include <netncp/ncp_user.h>
diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c
index 943c0caa996f..499eb1cab5aa 100644
--- a/sys/netncp/ncp_ncp.c
+++ b/sys/netncp/ncp_ncp.c
@@ -38,13 +38,10 @@
 
 #include <sys/param.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/poll.h>
 #include <sys/signalvar.h>
-#include <sys/socketvar.h>
 #include <sys/mbuf.h>
 
 #ifdef IPX
diff --git a/sys/netncp/ncp_nls.c b/sys/netncp/ncp_nls.c
index 560603025b18..be24e977c1f9 100644
--- a/sys/netncp/ncp_nls.c
+++ b/sys/netncp/ncp_nls.c
@@ -35,15 +35,8 @@
  */
 #include <sys/param.h>
 #include <sys/errno.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/time.h>
-#include <sys/lock.h>
 
 #include <netncp/ncp.h>
-#include <netncp/ncp_subr.h>
 #include <netncp/ncp_nls.h>
 
 /*
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index bd3c4f092f81..238f0ae33b2e 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -50,9 +50,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/kernel.h>
-#include <sys/poll.h>
 #include <sys/uio.h>
-#include <sys/file.h>
 #include <sys/syslog.h>
 #include <sys/mbuf.h>
 #include <net/route.h>
@@ -66,7 +64,6 @@
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_sock.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_ncp.h>
 #include <netncp/ncp_rq.h>
 
 #ifdef IPX
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index b26d6389c3da..a14e3f07edaf 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -47,7 +47,6 @@
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_rq.h>
 #include <netncp/ncp_ncp.h>
-#include <netncp/ncp_user.h>
 #include <netncp/nwerror.h>
 
 int ncp_debuglevel = 0;
diff --git a/sys/nwfs/nwfs_io.c b/sys/nwfs/nwfs_io.c
index 67346d4de5d6..e74e463f121c 100644
--- a/sys/nwfs/nwfs_io.c
+++ b/sys/nwfs/nwfs_io.c
@@ -36,16 +36,11 @@
 #include <sys/systm.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
@@ -54,17 +49,13 @@
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_zone.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 
-#include <sys/ioccom.h>
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_ncp.h>
-#include <netncp/ncp_rq.h>
 
 #include <nwfs/nwfs.h>
 #include <nwfs/nwfs_node.h>
diff --git a/sys/nwfs/nwfs_ioctl.c b/sys/nwfs/nwfs_ioctl.c
index 6b4b510bc79c..1892cef8d872 100644
--- a/sys/nwfs/nwfs_ioctl.c
+++ b/sys/nwfs/nwfs_ioctl.c
@@ -33,16 +33,10 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/dirent.h>
-#include <sys/signalvar.h>
 #include <sys/ioccom.h>
 
 #include <netncp/ncp.h>
diff --git a/sys/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c
index 55e19b7c6fd3..bd4ca7a416c1 100644
--- a/sys/nwfs/nwfs_node.c
+++ b/sys/nwfs/nwfs_node.c
@@ -37,7 +37,6 @@
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
@@ -46,9 +45,6 @@
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vnode_pager.h>
-#include <vm/vm_zone.h>
 #include <sys/queue.h>
 
 #include <netncp/ncp.h>
diff --git a/sys/nwfs/nwfs_subr.c b/sys/nwfs/nwfs_subr.c
index d57d67537ada..9ba8b312b1bc 100644
--- a/sys/nwfs/nwfs_subr.c
+++ b/sys/nwfs/nwfs_subr.c
@@ -34,17 +34,14 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <machine/clock.h>
 #include <sys/time.h>
-#include <sys/namei.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_ncp.h>
 #include <netncp/ncp_subr.h>
-#include <netncp/ncp_user.h>
 #include <netncp/ncp_rq.h>
 #include <netncp/nwerror.h>
 
diff --git a/sys/nwfs/nwfs_vfsops.c b/sys/nwfs/nwfs_vfsops.c
index 53ecf984e4e5..2f03564d8abd 100644
--- a/sys/nwfs/nwfs_vfsops.c
+++ b/sys/nwfs/nwfs_vfsops.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
@@ -50,10 +49,8 @@
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>
-#include <netncp/ncp_sock.h>
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_ncp.h>
-#include <netncp/ncp_rq.h>
 #include <netncp/ncp_nls.h>
 
 #include <nwfs/nwfs.h>
diff --git a/sys/nwfs/nwfs_vnops.c b/sys/nwfs/nwfs_vnops.c
index ab9f22017c18..61163b0352a8 100644
--- a/sys/nwfs/nwfs_vnops.c
+++ b/sys/nwfs/nwfs_vnops.c
@@ -34,24 +34,17 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/dirent.h>
-#include <sys/signalvar.h>
-#include <sys/ioccom.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
-#include <vm/vnode_pager.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>