6 files changed, 38 insertions, 28 deletions
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index b14b368..2906381 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/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/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 99f9761..2e9eabc3 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/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 */
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 99f9761..2e9eabc3 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/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 */
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 6ec2738..91dbcad 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/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
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 1151298..4c9f540 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -52,18 +52,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/tty.h>
-#include <sys/uio.h>
 #include <sys/callout.h>
+#include <sys/conf.h>
+#include <sys/cons.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/signalvar.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <sys/time.h>
-#include <sys/cons.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
 
 #include <machine/bus.h>
 #include <machine/psl.h>
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index bd47467..39e9e33 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -56,12 +56,14 @@ error "Can only have 1 spigot configured."
 
 #include	<sys/param.h>
 #include	<sys/systm.h>
-#include	<sys/kernel.h>
+#include	<sys/bus.h>
 #include	<sys/conf.h>
+#include	<sys/kernel.h>
+#include	<sys/lock.h>
+#include	<sys/mman.h>
+#include	<sys/mutex.h>
 #include	<sys/proc.h>
 #include	<sys/signalvar.h>
-#include	<sys/mman.h>
-#include	<sys/bus.h>
 
 #include	<machine/frame.h>
 #include	<machine/md_var.h>