diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index ebf971f71e5..1e16802291f 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -98,6 +98,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
 #include <sys/imgact.h>
@@ -112,9 +115,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/pcpu.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
 #include <sys/cons.h>
 #include <sys/mbuf.h>
 #include <sys/vmmeter.h>
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 06d33c382fd..b6f229b2ae7 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -48,6 +48,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/sysproto.h>
 #include <sys/signalvar.h>
@@ -61,8 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/cons.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/uio.h>
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index c54f3363b23..5f225a66df6 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -64,9 +64,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/cpu.h>
-#include <sys/kdb.h>
 #include <sys/eventhandler.h>
+#include <sys/kdb.h>
 #include <sys/imgact.h>
 #include <sys/sysproto.h>
 #include <sys/lock.h>
@@ -77,9 +80,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index c54f3363b23..5f225a66df6 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -64,9 +64,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/cpu.h>
-#include <sys/kdb.h>
 #include <sys/eventhandler.h>
+#include <sys/kdb.h>
 #include <sys/imgact.h>
 #include <sys/sysproto.h>
 #include <sys/lock.h>
@@ -77,9 +80,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 7fe6acdd41f..9e14f063371 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -43,8 +43,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/cons.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/cpu.h>
+#include <sys/cons.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
@@ -57,9 +60,6 @@
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
 #include <sys/eventhandler.h>
 #include <sys/interrupt.h>
 #include <sys/ptrace.h>