Undo part of the tangle of having sys/lock.h and sys/mutex.h included in

other "system" header files.

Also help the deprecation of lockmgr.h by making it a sub-include of
sys/lock.h and removing sys/lockmgr.h form kernel .c files.

Sort sys/*.h includes where possible in affected files.

OK'ed by:	bde (with reservations)

sys/alpha/alpha/interrupt.c

@@ -41,18 +41,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/vmmeter.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
 #include <sys/unistd.h>
+#include <sys/vmmeter.h>
 
 #include <machine/reg.h>
 #include <machine/frame.h>

sys/alpha/alpha/procfs_machdep.c

@@ -66,20 +66,21 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
+#include <sys/user.h>
 #include <sys/vnode.h>
-#include <machine/reg.h>
+
 #include <machine/md_var.h>
+#include <machine/reg.h>
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#include <sys/user.h>
-
 int
 procfs_read_regs(p, regs)
 	struct proc *p;

sys/alpha/alpha/sys_machdep.c

@@ -37,18 +37,18 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 #include <machine/cpu.h>
 #include <machine/sysarch.h>
 

sys/alpha/linux/linux_machdep.c

@@ -29,19 +29,20 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/sysproto.h>
-#include <sys/systm.h>
 #include <sys/unistd.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#include <sys/proc.h>
-#include <sys/user.h>
-
 #include <alpha/linux/linux.h>
 #include <alpha/linux/linux_proto.h>
 #include <compat/linux/linux_signal.h>

sys/alpha/linux/linux_sysvec.c

@@ -37,20 +37,24 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sysent.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/imgact_aout.h>
 #include <sys/imgact_elf.h>
-#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
+#include <sys/sysent.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
-#include <sys/exec.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
+
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 

sys/alpha/osf1/osf1_misc.c

@@ -35,50 +35,48 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/stat.h>
+#include <sys/bus.h>
+#include <sys/dkstat.h>
+#include <sys/exec.h>
+#include <sys/fcntl.h>
 #include <sys/filedesc.h>
+#include <sys/imgact.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/file.h>		/* Must come after sys/malloc.h */
 #include <sys/mman.h>
+#include <sys/module.h>
 #include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
+#include <sys/resource.h>
+#include <sys/resourcevar.h>
+#include <sys/selinfo.h>
+#include <sys/pipe.h>		/* Must come after sys/selinfo.h */
 #include <sys/signal.h>
 #include <sys/signalvar.h>
-#include <sys/reboot.h>
-#include <sys/exec.h>
-#include <sys/vnode.h>
-#include <sys/socketvar.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-#include <sys/resource.h>
-#include <sys/signalvar.h>
-#include <sys/fcntl.h>
 #include <sys/socket.h>
-#include <sys/pipe.h>
+#include <sys/socketvar.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
+#include <sys/systm.h>
+#include <sys/unistd.h>
+#include <sys/user.h>
+#include <sys/utsname.h>
+#include <sys/vnode.h>
+
+#include <alpha/osf1/exec_ecoff.h>
 #include <alpha/osf1/osf1_signal.h>
 #include <alpha/osf1/osf1_proto.h>
 #include <alpha/osf1/osf1_syscall.h>
 #include <alpha/osf1/osf1_util.h>
 #include <alpha/osf1/osf1.h>
-#include <sys/proc.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-
-#include <vm/vm.h>
-#include <alpha/osf1/exec_ecoff.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/resourcevar.h>
-#include <sys/exec.h>
-#include <sys/mman.h>
-#include <sys/imgact.h>
-
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/vnode.h>
-#include <sys/unistd.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -86,17 +84,10 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
-#include <alpha/osf1/exec_ecoff.h>
 
-#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/cpuconf.h>
 #include <machine/fpu.h>
-
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include <sys/dkstat.h>
-
 #include <machine/rpb.h>
 
 static void cvtstat2osf1 __P((struct stat *, struct osf1_stat *));

sys/amd64/amd64/fpu.c

@@ -43,11 +43,13 @@
 #include <sys/bus.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <sys/mutex.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #ifdef NPX_DEBUG

sys/amd64/amd64/mp_machdep.c

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>

sys/amd64/amd64/mptable.c

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>

sys/amd64/amd64/pmap.c

@@ -74,15 +74,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/msgbuf.h>
-#include <sys/vmmeter.h>
+#include <sys/lock.h>
 #include <sys/mman.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
 #include <sys/sx.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
@@ -92,8 +93,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_zone.h>
 
-#include <sys/user.h>
-
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>

sys/amd64/amd64/sys_machdep.c

@@ -37,20 +37,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/ipl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/smp.h>
+#include <sys/sysproto.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 #include <machine/cpu.h>
 #include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>

sys/amd64/include/mptable.h

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>

sys/amd64/isa/intr_machdep.c

@@ -42,23 +42,24 @@
 #include "opt_mca.h"
 
 #include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h> 
+#include <sys/errno.h>
+#include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/errno.h>
-#include <sys/interrupt.h>
+
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/intrcnt.h>
-#include <sys/bus.h> 
 
 #if defined(APIC_IO)
 #include <machine/smptests.h>			/** FAST_HI */

sys/amd64/isa/nmi.c

@@ -42,23 +42,24 @@
 #include "opt_mca.h"
 
 #include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h> 
+#include <sys/errno.h>
+#include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/errno.h>
-#include <sys/interrupt.h>
+
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/intrcnt.h>
-#include <sys/bus.h> 
 
 #if defined(APIC_IO)
 #include <machine/smptests.h>			/** FAST_HI */

sys/amd64/isa/npx.c

@@ -43,11 +43,13 @@
 #include <sys/bus.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <sys/mutex.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #ifdef NPX_DEBUG

sys/coda/coda_fbsd.c

@@ -35,12 +35,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/conf.h>
 #include <sys/fcntl.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/ucred.h>
 #include <sys/vnode.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>

sys/coda/coda_namecache.c

@@ -77,14 +77,12 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/ucred.h>
 
-#ifndef insque
-#include <sys/systm.h>
-#endif /* insque */
-
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 

sys/coda/coda_psdev.c

@@ -58,15 +58,16 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <sys/file.h>
 #include <sys/ioccom.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h>		/* must come after sys/malloc.h */
+#include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/coda/coda_subr.c

@@ -59,10 +59,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/coda/coda_venus.c

@@ -33,10 +33,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/ioccom.h>
 #include <sys/fcntl.h>
+#include <sys/ioccom.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/coda/coda_vfsops.c

@@ -48,14 +48,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
-#include <sys/namei.h>
-#include <net/radix.h>
-#include <sys/socket.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/coda/coda_vnops.c

@@ -47,18 +47,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <sys/errno.h>
 #include <sys/acct.h>
-#include <sys/file.h>
+#include <sys/errno.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h>		/* Must come after sys/malloc.h */
+#include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>

sys/compat/linprocfs/linprocfs.c

@@ -42,18 +42,19 @@
  */
 
 #include <sys/param.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 #include <sys/blist.h>
+#include <sys/conf.h>
 #include <sys/dkstat.h>
+#include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/sbuf.h>
-#include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
-#include <sys/jail.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

sys/compat/linprocfs/linprocfs_misc.c

@@ -42,18 +42,19 @@
  */
 
 #include <sys/param.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 #include <sys/blist.h>
+#include <sys/conf.h>
 #include <sys/dkstat.h>
+#include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/sbuf.h>
-#include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
-#include <sys/jail.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

sys/compat/linprocfs/linprocfs_subr.c

@@ -43,9 +43,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
+
 #include <compat/linprocfs/linprocfs.h>
 
 static struct pfsnode *pfshead;

sys/compat/linprocfs/linprocfs_vnops.c

@@ -48,22 +48,26 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
+#include <sys/dirent.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/pioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/sx.h>
+#include <sys/time.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/dirent.h>
-#include <sys/malloc.h>
+
 #include <machine/reg.h>
+
 #include <vm/vm_zone.h>
+
 #include <compat/linprocfs/linprocfs.h>
-#include <sys/pioctl.h>
 
 extern struct vnode *procfs_findtextvp __P((struct proc *));
 extern int	procfs_kmemaccess __P((struct proc *));

sys/compat/linux/linux_file.c

@@ -32,18 +32,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
+#include <sys/conf.h>
+#include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/lock.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/dirent.h>
-#include <sys/conf.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sysproto.h>
 #include <sys/tty.h>
+#include <sys/vnode.h>
 
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>

sys/compat/linux/linux_misc.c

@@ -32,23 +32,25 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/mman.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/imgact_aout.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mman.h>
 #include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
+#include <sys/signalvar.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/sysproto.h>
+#include <sys/time.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/signalvar.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

sys/compat/linux/linux_signal.c

@@ -30,9 +30,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
+#include <sys/sysproto.h>
 
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>

sys/compat/pecoff/imgact_pecoff.c

@@ -46,14 +46,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sysent.h>
 #include <sys/imgact.h>
-#include <sys/signalvar.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
-#include <sys/vnode.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
+#include <sys/sysent.h>
+#include <sys/vnode.h>
 
 #include <machine/reg.h>
 
@@ -61,7 +62,6 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>

sys/compat/svr4/imgact_svr4.c

@@ -34,14 +34,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/resourcevar.h>
 #include <sys/exec.h>
-#include <sys/mman.h>
 #include <sys/imgact.h>
 #include <sys/imgact_aout.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mman.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/resourcevar.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>

sys/compat/svr4/svr4_fcntl.c

@@ -32,15 +32,17 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/filedesc.h>
 /*#include <sys/ioctl.h>*/
+#include <sys/lock.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/stat.h>
 #include <sys/unistd.h>
+#include <sys/vnode.h>
 
 #include <sys/sysproto.h>
 

sys/compat/svr4/svr4_misc.c

@@ -37,33 +37,33 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/dirent.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h>		/* Must come after sys/malloc.h */
 #include <sys/mman.h>
 #include <sys/mount.h>
+#include <sys/msg.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
+#include <sys/sem.h>
+#include <sys/stat.h>
 #include <sys/sx.h>
-#include <sys/vnode.h>
+#include <sys/sysproto.h>
+#include <sys/time.h>
+#include <sys/times.h>
 #include <sys/uio.h>
 #include <sys/user.h>
+#include <sys/vnode.h>
 #include <sys/wait.h>
-#include <sys/times.h>
-#include <sys/fcntl.h>
-#include <sys/sem.h>
-#include <sys/msg.h>
-#include <sys/ptrace.h>
-
-#include <sys/sysproto.h>
 
 #include <compat/svr4/svr4.h>
 #include <compat/svr4/svr4_types.h>

sys/compat/svr4/svr4_resource.c

@@ -74,8 +74,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/file.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 

sys/compat/svr4/svr4_signal.c

@@ -30,8 +30,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/filedesc.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>

sys/compat/svr4/svr4_stream.c

@@ -41,25 +41,27 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
 #include <sys/fcntl.h>
+#include <sys/filedesc.h>
 #include <sys/filio.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/un.h>
-#include <netinet/in.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h> 		/* Must come after sys/malloc.h */
 #include <sys/mbuf.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
-#include <sys/uio.h>
-#include <sys/ktrace.h>
-#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
 #include <sys/stat.h>
-
 #include <sys/sysproto.h>
+#include <sys/uio.h>
+#include <sys/ktrace.h>		/* Must come after sys/uio.h */
+#include <sys/un.h>
+
+#include <netinet/in.h>
 
 #include <compat/svr4/svr4.h>
 #include <compat/svr4/svr4_types.h>

sys/ddb/db_watch.c

@@ -33,9 +33,10 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 

sys/dev/acpica/acpi.c

@@ -32,6 +32,7 @@
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>

sys/dev/bktr/bktr_core.c

@@ -116,6 +116,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>

sys/dev/cy/cy.c

@@ -69,17 +69,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/tty.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/syslog.h>
+#include <sys/tty.h>
+
 #include <machine/psl.h>
 
 #include <i386/isa/isa_device.h>

sys/dev/cy/cy_isa.c

@@ -69,17 +69,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/tty.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/syslog.h>
+#include <sys/tty.h>
+
 #include <machine/psl.h>
 
 #include <i386/isa/isa_device.h>

sys/dev/fdc/fdc.c

@@ -56,15 +56,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/disklabel.h>
 #include <sys/devicestat.h>
+#include <sys/disklabel.h>
 #include <sys/fcntl.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 

sys/dev/md/md.c

@@ -66,16 +66,18 @@
 #include <sys/conf.h>
 #include <sys/devicestat.h>
 #include <sys/disk.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/sysctl.h>
-#include <sys/linker.h>
-#include <sys/queue.h>
-#include <sys/mdioctl.h>
-#include <sys/vnode.h>
-#include <sys/namei.h>
 #include <sys/fcntl.h>
+#include <sys/kernel.h>
+#include <sys/linker.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mdioctl.h>
+#include <sys/namei.h>
 #include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/sysctl.h>
+#include <sys/vnode.h>
+
 #include <machine/atomic.h>
 
 #include <vm/vm.h>

sys/dev/pdq/pdqvar.h

@@ -62,10 +62,13 @@ enum _pdq_type_t {
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #ifndef M_MCAST
 #include <sys/mbuf.h>
 #endif /* M_CAST */
 #include <sys/malloc.h>
+#include <sys/mutex.h>
+
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 

sys/dev/random/randomdev.c

@@ -27,23 +27,25 @@
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/filio.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
+#include <sys/filio.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/bus.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
-#include <sys/selinfo.h>
+#include <sys/queue.h>
 #include <sys/random.h>
+#include <sys/selinfo.h>
 #include <sys/sysctl.h>
-#include <sys/vnode.h>
+#include <sys/uio.h>
 #include <sys/unistd.h>
+#include <sys/vnode.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>

sys/dev/sio/sio.c

@@ -52,22 +52,24 @@
  *	- Added PC-Card driver table and handlers
  */
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
-#include <sys/reboot.h>
-#include <sys/malloc.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
 #include <sys/sysctl.h>
-#include <sys/bus.h>
+#include <sys/syslog.h>
+#include <sys/tty.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/sound/midi/midi.h

@@ -40,6 +40,7 @@
 #include <sys/ioccom.h>
 
 #include <sys/filio.h>
+#include <sys/lock.h>
 #include <sys/sockio.h>
 #include <sys/fcntl.h>
 #include <sys/tty.h>

sys/dev/syscons/scmouse.c

@@ -32,14 +32,16 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/signalvar.h>
-#include <sys/proc.h>
-#include <sys/random.h>
-#include <sys/tty.h>
-#include <sys/malloc.h>
 #include <sys/consio.h>
 #include <sys/fbio.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mouse.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/random.h>
+#include <sys/signalvar.h>
+#include <sys/tty.h>
 
 #include <dev/syscons/syscons.h>
 

sys/dev/syscons/syscons.c

@@ -37,20 +37,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/eventhandler.h>
-#include <sys/reboot.h>
 #include <sys/conf.h>
+#include <sys/cons.h>
+#include <sys/consio.h>
+#include <sys/eventhandler.h>
+#include <sys/fbio.h>
+#include <sys/kbio.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/random.h>
+#include <sys/reboot.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/cons.h>
-#include <sys/random.h>
-#include <sys/consio.h>
-#include <sys/kbio.h>
-#include <sys/fbio.h>
 
 #include <machine/clock.h>
 #include <machine/psl.h>

sys/dev/usb/uhid.c

@@ -45,7 +45,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/signalvar.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>

sys/dev/usb/usb.c

@@ -47,7 +47,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
 #include <sys/kthread.h>

sys/fs/coda/coda_fbsd.c

@@ -35,12 +35,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/conf.h>
 #include <sys/fcntl.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/ucred.h>
 #include <sys/vnode.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>

sys/fs/coda/coda_namecache.c

@@ -77,14 +77,12 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/errno.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/ucred.h>
 
-#ifndef insque
-#include <sys/systm.h>
-#endif /* insque */
-
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 

sys/fs/coda/coda_psdev.c

@@ -58,15 +58,16 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <sys/file.h>
 #include <sys/ioccom.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h>		/* must come after sys/malloc.h */
+#include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/fs/coda/coda_subr.c

@@ -59,10 +59,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
 #include <sys/mount.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/fs/coda/coda_venus.c

@@ -33,10 +33,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/ioccom.h>
 #include <sys/fcntl.h>
+#include <sys/ioccom.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/fs/coda/coda_vfsops.c

@@ -48,14 +48,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
-#include <sys/namei.h>
-#include <net/radix.h>
-#include <sys/socket.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>

sys/fs/coda/coda_vnops.c

@@ -47,18 +47,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
-#include <sys/errno.h>
 #include <sys/acct.h>
-#include <sys/file.h>
+#include <sys/errno.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h>		/* Must come after sys/malloc.h */
+#include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>

sys/fs/deadfs/dead_vnops.c

@@ -38,10 +38,9 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/vnode.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
-
-#include <machine/mutex.h>
+#include <sys/vnode.h>
 
 static int	chkvnlock __P((struct vnode *));
 /*

sys/fs/devfs/devfs_devs.c

@@ -33,13 +33,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/dirent.h>
 #include <sys/conf.h>
-#include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/sysctl.h>
+#include <sys/dirent.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <machine/atomic.h>
 

sys/fs/devfs/devfs_vfsops.c

@@ -39,11 +39,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vnode.h>
-#include <net/radix.h>
-#include <sys/socket.h>
-#include <sys/mount.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/vnode.h>
 
 #include <fs/devfs/devfs.h>
 

sys/fs/devfs/devfs_vnops.c

@@ -37,16 +37,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
 #include <sys/conf.h>
-#include <sys/vnode.h>
+#include <sys/dirent.h>
+#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/namei.h>
-#include <sys/dirent.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
 
 #include <fs/devfs/devfs.h>
 

sys/fs/fdescfs/fdesc_vfsops.c

@@ -44,15 +44,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/filedesc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
-#include <sys/filedesc.h>
-#include <sys/vnode.h>
-#include <net/radix.h>
 #include <sys/socket.h>
-#include <sys/mount.h>
-#include <sys/malloc.h>
+#include <sys/vnode.h>
+
 #include <miscfs/fdesc/fdesc.h>
 
 static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");

sys/fs/fdescfs/fdesc_vnops.c

@@ -44,19 +44,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>	/* boottime */
+#include <sys/conf.h>
+#include <sys/dirent.h>
 #include <sys/filedesc.h>
-#include <sys/vnode.h>
+#include <sys/kernel.h>	/* boottime */
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <net/radix.h>
-#include <sys/socket.h>
+#include <sys/file.h>	/* Must come after sys/malloc.h */
 #include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/dirent.h>
-#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/vnode.h>
+
 #include <miscfs/fdesc/fdesc.h>
 
 #define FDL_WANT	0x01

sys/fs/nullfs/null_subr.c

@@ -41,9 +41,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+
 #include <miscfs/nullfs/null.h>
 
 #define LOG2_SIZEVNODE 7		/* log2(sizeof struct vnode) */

sys/fs/nullfs/null_vfsops.c

@@ -47,10 +47,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+
 #include <miscfs/nullfs/null.h>
 
 static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");

sys/fs/nullfs/null_vnops.c

@@ -175,13 +175,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/malloc.h>
+
 #include <miscfs/nullfs/null.h>
 
 #include <vm/vm.h>

sys/fs/nwfs/nwfs_node.c

@@ -34,17 +34,20 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <sys/queue.h>
 
 #include <netncp/ncp.h>
 #include <netncp/ncp_conn.h>

sys/fs/portalfs/portal_vfsops.c

@@ -44,17 +44,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/domain.h>
 #include <sys/filedesc.h>
-#include <sys/file.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/file.h>		/* Must come after sys/malloc.h */
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
+#include <sys/vnode.h>
+
 #include <miscfs/portal/portal.h>
 
 static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");

sys/fs/procfs/procfs_ctl.c

@@ -40,11 +40,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/ptrace.h>
 #include <sys/signalvar.h>
 #include <sys/sx.h>
+#include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>

sys/fs/procfs/procfs_dbregs.c

@@ -44,11 +44,16 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 
 int

sys/fs/procfs/procfs_fpregs.c

@@ -41,11 +41,16 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 
 int

sys/fs/procfs/procfs_map.c

@@ -41,12 +41,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>

sys/fs/procfs/procfs_mem.c

@@ -47,20 +47,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/proc.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
 #include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <sys/user.h>
-#include <sys/ptrace.h>
 
 static int	procfs_rwmem __P((struct proc *curp,
 				  struct proc *p, struct uio *uio));

sys/fs/procfs/procfs_regs.c

@@ -41,14 +41,19 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
-#include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
+#include <miscfs/procfs/procfs.h>
+
 int
 procfs_doregs(curp, p, pfs, uio)
 	struct proc *curp;

sys/fs/procfs/procfs_status.c

@@ -42,18 +42,21 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
+#include <sys/exec.h>
 #include <sys/jail.h>
-#include <sys/vnode.h>
-#include <sys/tty.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/resourcevar.h>
-#include <miscfs/procfs/procfs.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_param.h>
-#include <sys/exec.h>
+
+#include <miscfs/procfs/procfs.h>
 
 #define DOCHECK() do { if (ps >= psbuf+sizeof(psbuf)) goto bailout; } while (0)
 int

sys/fs/procfs/procfs_subr.c

@@ -41,13 +41,14 @@
 
 #include <sys/param.h>
 #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/lock.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <miscfs/procfs/procfs.h>
 

sys/fs/procfs/procfs_vnops.c

@@ -45,23 +45,28 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
+#include <sys/dirent.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/pioctl.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
+#include <sys/socket.h>
 #include <sys/sx.h>
-#include <sys/vnode.h>
+#include <sys/time.h>
 #include <sys/uio.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/dirent.h>
-#include <sys/malloc.h>
+#include <sys/vnode.h>
+
 #include <machine/reg.h>
+
 #include <vm/vm_zone.h>
+
 #include <miscfs/procfs/procfs.h>
-#include <sys/pioctl.h>
 
 static int	procfs_access __P((struct vop_access_args *));
 static int	procfs_badop __P((void));

sys/fs/smbfs/smbfs_node.c

@@ -34,22 +34,24 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/sysctl.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-/*#include <vm/vm_page.h>
-#include <vm/vm_object.h>*/
+#include <sys/mount.h>
+#include <sys/proc.h>
 #include <sys/queue.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
 
 #include <netsmb/smb.h>
 #include <netsmb/smb_conn.h>
 #include <netsmb/smb_subr.h>
 
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+/*#include <vm/vm_page.h>
+#include <vm/vm_object.h>*/
+
 #include <fs/smbfs/smbfs.h>
 #include <fs/smbfs/smbfs_node.h>
 #include <fs/smbfs/smbfs_subr.h>

sys/fs/umapfs/umap_subr.c

@@ -40,9 +40,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+
 #include <miscfs/umapfs/umap.h>
 
 #define LOG2_SIZEVNODE 7		/* log2(sizeof struct vnode) */

sys/fs/umapfs/umap_vfsops.c

@@ -46,10 +46,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+
 #include <miscfs/umapfs/umap.h>
 
 static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure");

sys/fs/umapfs/umap_vnops.c

@@ -44,11 +44,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/vnode.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/malloc.h>
+#include <sys/sysctl.h>
+#include <sys/vnode.h>
+
 #include <miscfs/umapfs/umap.h>
 #include <miscfs/nullfs/null.h>
 

sys/fs/unionfs/union_subr.c

@@ -40,20 +40,23 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/vnode.h>
-#include <sys/namei.h>
-#include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mount.h>
+#include <sys/namei.h>
 #include <sys/stat.h>
+#include <sys/vnode.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>	/* for vnode_pager_setsize */
 #include <vm/vm_zone.h>
 #include <vm/vm_object.h>	/* for vm cache coherency */
+
 #include <miscfs/union/union.h>
 
 #include <sys/proc.h>

sys/gnu/ext2fs/ext2_subr.c

@@ -41,19 +41,22 @@
  */
 
 #include <sys/param.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
 
-#include <sys/lock.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/ucred.h>
-#include <sys/vnode.h>
-#include <gnu/ext2fs/ext2_extern.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
+#include <sys/ucred.h>
+#include <sys/vnode.h>
+
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 
+#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/ext2fs/fs.h>
+
 #include "opt_ddb.h"
 
 #ifdef DDB

sys/gnu/fs/ext2fs/ext2_subr.c

@@ -41,19 +41,22 @@
  */
 
 #include <sys/param.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
 
-#include <sys/lock.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/ucred.h>
-#include <sys/vnode.h>
-#include <gnu/ext2fs/ext2_extern.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
+#include <sys/ucred.h>
+#include <sys/vnode.h>
+
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 
+#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/ext2fs/fs.h>
+
 #include "opt_ddb.h"
 
 #ifdef DDB

sys/gnu/i386/fpemul/fpu_entry.c

@@ -73,8 +73,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>

sys/i386/i386/math_emulate.c

@@ -37,18 +37,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/user.h>
 
 #include <machine/frame.h>
 #include <machine/reg.h>
 
-#include <sys/proc.h>
-#include <sys/kernel.h>
-
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
 
 #define __ALIGNED_TEMP_REAL 1
 #include <i386/i386/math_emu.h>

sys/i386/i386/mp_machdep.c

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>

sys/i386/i386/mpapic.c

@@ -26,10 +26,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/bus.h>
 #include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <machine/smptests.h>	/** TEST_TEST1 */
 #include <machine/smp.h>

sys/i386/i386/mptable.c

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>

sys/i386/i386/pmap.c

@@ -74,15 +74,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/msgbuf.h>
-#include <sys/vmmeter.h>
+#include <sys/lock.h>
 #include <sys/mman.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
 #include <sys/sx.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
@@ -92,8 +93,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_zone.h>
 
-#include <sys/user.h>
-
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>

sys/i386/i386/procfs_machdep.c

@@ -68,16 +68,18 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
 #include <machine/md_var.h>
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 

sys/i386/i386/sys_machdep.c

@@ -37,20 +37,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/ipl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/smp.h>
+#include <sys/sysproto.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 #include <machine/cpu.h>
 #include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>

sys/i386/ibcs2/ibcs2_fcntl.c

@@ -34,8 +34,10 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/ttycom.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
+#include <sys/ttycom.h>
 
 #include <i386/ibcs2/ibcs2_fcntl.h>
 #include <i386/ibcs2/ibcs2_signal.h>

sys/i386/ibcs2/ibcs2_ioctl.c

@@ -30,16 +30,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/consio.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
 #include <sys/ioctl_compat.h>
-#include <sys/tty.h>
 #include <sys/kbio.h>
-#include <sys/consio.h>
-
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
+#include <sys/tty.h>
 
 #include <i386/ibcs2/ibcs2_signal.h>
 #include <i386/ibcs2/ibcs2_socksys.h>

sys/i386/ibcs2/ibcs2_misc.c

@@ -55,19 +55,20 @@
  * handled here.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
-#include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/file.h>			/* Must come after sys/malloc.h */
+#include <sys/mutex.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
-#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/vnode.h>

sys/i386/ibcs2/ibcs2_other.c

@@ -32,6 +32,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
 
 #include <i386/ibcs2/ibcs2_types.h>

sys/i386/ibcs2/ibcs2_signal.c

@@ -30,6 +30,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
 

sys/i386/ibcs2/imgact_coff.c

@@ -31,11 +31,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mman.h>
+#include <sys/fcntl.h>
 #include <sys/imgact.h>
 #include <sys/kernel.h>
-#include <sys/fcntl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>

sys/i386/include/mptable.h

@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>