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)

14 files changed, 66 insertions, 39 deletions

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 47ab349..93464e4 100644
--- a/sys/dev/acpica/acpi.c
+++ b/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>
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index ecc0041..50e8511 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/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>
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index b14b368..2906381 100644
--- a/sys/dev/cy/cy.c
+++ b/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>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index b14b368..2906381 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/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>
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 4b7789b..285aed8 100644
--- a/sys/dev/fdc/fdc.c
+++ b/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>
 
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 8611872..a82a341 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -66,16 +66,18 @@
 #include <sys/conf.h>
 #include <sys/devicestat.h>
 #include <sys/disk.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/sysctl.h>
 #include <sys/linker.h>
-#include <sys/queue.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mdioctl.h>
-#include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/fcntl.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>
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 1819747..5828047 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/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>
 
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 252662d..a99fe6d 100644
--- a/sys/dev/random/randomdev.c
+++ b/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>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d1a876b..ab9cf09 100644
--- a/sys/dev/sio/sio.c
+++ b/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>
diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
index f6e54b1..bcc7f89 100644
--- a/sys/dev/sound/midi/midi.h
+++ b/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>
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index ccfc2f2..b4ad727 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/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>
 
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 2601c4e..da11de9 100644
--- a/sys/dev/syscons/syscons.c
+++ b/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>
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index d34329e..869e94e 100644
--- a/sys/dev/usb/uhid.c
+++ b/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>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 338871a..c99f8bf 100644
--- a/sys/dev/usb/usb.c
+++ b/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>