Move suser() and suser_xxx() prototypes and a related #define from

<sys/proc.h> to <sys/systm.h>.

Correctly document the #includes needed in the manpage.

Add one now needed #include of <sys/systm.h>.
Remove the consequent 48 unused #includes of <sys/proc.h>.

63 files changed, 16 insertions, 66 deletions

diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9
index ec63456..0677073 100644
--- a/share/man/man9/suser.9
+++ b/share/man/man9/suser.9
@@ -42,8 +42,7 @@
 .Nd check if process has superuser privelige
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
-.Fd #include <sys/proc.h>
-.Fd #include <sys/ucred.h>
+.Fd #include <sys/systm.h>
 .Ft int
 .Fn suser "struct proc *proc"
 .Ft int
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index e557d1f..6eadbf8 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -95,7 +95,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/ucred.h>
 #include <sys/socket.h>
 #ifdef ANCACHE
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 30dcfca..bfcabb2 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -181,7 +181,6 @@ static dpt_sig_S ASR_sig = {
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 052ab35..c3509cf 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index ef105ba..023796b 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -100,7 +100,6 @@
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c
index 308cfcb..a8f76ec 100644
--- a/sys/dev/awi/awi_wep.c
+++ b/sys/dev/awi/awi_wep.c
@@ -55,7 +55,6 @@
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/awi/awi_wicfg.c b/sys/dev/awi/awi_wicfg.c
index 76ff3ef..80882ba 100644
--- a/sys/dev/awi/awi_wicfg.c
+++ b/sys/dev/awi/awi_wicfg.c
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index a3997f9..4006807 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -70,7 +70,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index a3997f9..4006807 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -70,7 +70,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 3fa1aaf..c62de45 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index b74b804..6dd9f68 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -49,7 +49,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 2f3e4a3..13230db 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -37,7 +37,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
-#include <sys/proc.h>
 #include <sys/select.h>
 #include <sys/random.h>
 #include <sys/vnode.h>
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 11da8ac..2b55c52 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -42,7 +42,6 @@
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 7014a5e..a12110e 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -41,7 +41,6 @@
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/dkstat.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index d102430..28e6a42 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -48,7 +48,6 @@ static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International
 #include <sys/ioctl_compat.h>
 #endif
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/dkstat.h>
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 5c89ba2..648a6a5 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -23,7 +23,6 @@
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 #include <sys/ioctl_compat.h>
 #endif
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 49a1248..34f914b 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
 #include <sys/consio.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 9d584d9..f559faa 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -61,7 +61,6 @@
 #include <machine/cpu.h>
 #endif
 #endif
-#include <sys/proc.h>
 #include <sys/queue.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 63b456c..bbc74c0 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -73,7 +73,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/ucred.h>
 #include <sys/socket.h>
 #include <sys/module.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 66e8422..e1aec04 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -199,7 +199,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
 #include <sys/bus.h>
 
 #include <sys/sysctl.h>
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index e3c717e..fd74abd 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -42,7 +42,6 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index f060e5b..839f752 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index ebf9ce4..6457897 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index d7b95f3..f27dd28 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/kernel.h>
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 3fa1aaf..c62de45 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index b74b804..6dd9f68 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -49,7 +49,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 3bca982..094dc6f 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -27,7 +27,6 @@
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index a3997f9..4006807 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -70,7 +70,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 63b456c..bbc74c0 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -73,7 +73,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/ucred.h>
 #include <sys/socket.h>
 #include <sys/module.h>
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 66e8422..e1aec04 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -199,7 +199,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
 #include <sys/bus.h>
 
 #include <sys/sysctl.h>
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index d8e9d68..a9341ff 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -47,7 +47,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/uio.h>
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 11da8ac..2b55c52 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -42,7 +42,6 @@
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 82d9a1f..8162a45 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -47,7 +47,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
-#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/bus.h>
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index d219ae3..eddd9ed 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -34,6 +34,7 @@
 #include "opt_sysvipc.h"
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/ipc.h>
 #include <sys/proc.h>
 #include <sys/ucred.h>
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index f4e2bd4..2931dc5 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/uio.h>
 
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 5c89ba2..648a6a5 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -23,7 +23,6 @@
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 #include <sys/ioctl_compat.h>
 #endif
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index ebf9ce4..6457897 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index d7b95f3..f27dd28 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/kernel.h>
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index aabe8c3..45483bb 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -70,7 +70,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/dkstat.h>
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 07b316d..102ae69 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 9f54cb7..bdaeb6c 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 9fa9789..167c0b3 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 9fa9789..167c0b3 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index fb27fc4..41c2fd9 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -36,7 +36,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/sockio.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index a0c109a..a917bcb 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -50,7 +50,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/domain.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 313ad7b..e217f3a 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -62,7 +62,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 79e5721..7dcfe87 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -38,7 +38,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index b2f92b8..04e931a 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -51,7 +51,6 @@
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 
 #include <vm/vm_zone.h>
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index ed3d873..2e7976b 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -51,7 +51,6 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 5544782..e15ee4e 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 40b0df4..2c0bc74 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -76,7 +76,6 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 7e83bf5..6ded430 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -82,7 +82,6 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 328e7ea..f990d44 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -80,7 +80,6 @@
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index c6d831f..ee05019 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -77,7 +77,6 @@
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 5035256..7ba85ae 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -40,7 +40,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/sockio.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 034751b..61af5c3 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -39,7 +39,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index e674262..22b2e2f 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -42,7 +42,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
-#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index f060e5b..839f752 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 722dc50..14b7f6c 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/bio.h>
 #include <sys/disklabel.h>
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index f3d20dc..55a1d3b 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index b2cffb6..af24b30 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -394,8 +394,6 @@ MALLOC_DECLARE(M_ZOMBIE);
 MALLOC_DECLARE(M_PARGS);
 #endif
 
-/* flags for suser_xxx() */
-#define PRISON_ROOT	1
 
 /* Handy macro to determine of p1 can mangle p2 */
 
@@ -501,9 +499,6 @@ void	schedclock __P((struct proc *));
 void	setrunnable __P((struct proc *));
 void	setrunqueue __P((struct proc *));
 void	sleepinit __P((void));
-int	suser __P((const struct proc *));
-int	suser_xxx __P((const struct ucred *cred, const struct proc *proc,
-    int flag));
 void	remrunqueue __P((struct proc *));
 void	cpu_switch __P((void));
 void	cpu_throw __P((void)) __dead2;
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index ae0dea9..45fae62 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -96,6 +96,7 @@ struct mtx;
 struct proc;
 struct timeval;
 struct tty;
+struct ucred;
 struct uio;
 
 void	Debugger __P((const char *msg));
@@ -166,6 +167,13 @@ void	startprofclock __P((struct proc *));
 void	stopprofclock __P((struct proc *));
 void	setstatclockrate __P((int hzrate));
 
+/* flags for suser_xxx() */
+#define PRISON_ROOT	1
+
+int	suser __P((const struct proc *));
+int	suser_xxx __P((const struct ucred *cred, const struct proc *proc,
+    int flag));
+
 char	*getenv __P((char *name));
 int	getenv_int __P((char *name, int *data));
 quad_t	getenv_quad __P((char *name, quad_t *data));
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 7201d49..00977f9 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -50,7 +50,6 @@
 #include <sys/stat.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>