Finish the job of sorting all includes and fix the build by including

malloc.h before proc.h on sparc64.  Noticed by das@

Compiled on:	alpha, amd64, i386, pc98, sparc64

10 files changed, 190 insertions, 183 deletions

diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 1e16802291f1..b965af97b579 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -97,60 +97,62 @@ __FBSDID("$FreeBSD$");
 #include "opt_maxmem.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
-#include <sys/sysproto.h>
-#include <sys/ktr.h>
-#include <sys/signalvar.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/ktr.h>
+#include <sys/linker.h>
 #include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pcpu.h>
 #include <sys/malloc.h>
-#include <sys/reboot.h>
-#include <sys/cons.h>
 #include <sys/mbuf.h>
-#include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
-#include <sys/exec.h>
+#include <sys/mutex.h>
+#include <sys/pcpu.h>
+#include <sys/ptrace.h>
+#include <sys/reboot.h>
+#include <sys/signalvar.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
+#include <sys/sysproto.h>
+#include <sys/ucontext.h>
 #include <sys/uio.h>
-#include <sys/linker.h>
-#include <sys/cons.h>
+#include <sys/vmmeter.h>
+#include <sys/vnode.h>
+
 #include <net/netisr.h>
+
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/ptrace.h>
-#include <sys/ucontext.h>
+
+#include <machine/bootinfo.h>
+#include <machine/chipset.h>
 #include <machine/clock.h>
-#include <machine/md_var.h>
+#include <machine/cpuconf.h>
+#include <machine/elf.h>
 #include <machine/fpu.h>
+#include <machine/md_var.h>
 #include <machine/pal.h>
-#include <machine/cpuconf.h>
-#include <machine/bootinfo.h>
 #include <machine/pcb.h>
-#include <machine/rpb.h>
 #include <machine/prom.h>
-#include <machine/chipset.h>
-#include <machine/vmparam.h>
-#include <machine/elf.h>
-#include <alpha/alpha/db_instruction.h>
-#include <sys/vnode.h>
+#include <machine/rpb.h>
 #include <machine/sigframe.h>
+#include <machine/vmparam.h>
 
+#include <alpha/alpha/db_instruction.h>
 
 u_int64_t cycles_per_usec;
 u_int32_t cycles_per_sec;
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 422c0fb949d2..ae0f28d9e981 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -55,13 +55,16 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
@@ -70,33 +73,27 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
+#include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
-#include <sys/proc.h>
+#include <sys/ptrace.h>
 #include <sys/reboot.h>
-#include <sys/msgbuf.h>
 #include <sys/sched.h>
 #include <sys/signalvar.h>
-#include <sys/sysent.h>
 #include <sys/sysctl.h>
+#include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/ucontext.h>
 #include <sys/vmmeter.h>
 
-#include <machine/clock.h>
-#include <machine/pcb.h>
-
 #include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-
-#include <sys/exec.h>
-#include <sys/cons.h>
+#include <vm/vm_param.h>
 
 #ifdef DDB
 #ifndef KDB
@@ -107,16 +104,18 @@ __FBSDID("$FreeBSD$");
 
 #include <net/netisr.h>
 
+#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/reg.h>
-#include <machine/clock.h>
-#include <machine/specialreg.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
-#include <machine/pc/bios.h>
 #include <machine/metadata.h>
+#include <machine/pc/bios.h>
+#include <machine/pcb.h>
 #include <machine/proc.h>
+#include <machine/reg.h>
+#include <machine/sigframe.h>
+#include <machine/specialreg.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -129,8 +128,6 @@ __FBSDID("$FreeBSD$");
 
 #include <isa/isareg.h>
 #include <isa/rtc.h>
-#include <sys/ptrace.h>
-#include <machine/sigframe.h>
 
 /* Sanity check for __curthread() */
 CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index b6f229b2ae78..b58b2535a07f 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -47,13 +47,14 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
-#include <sys/sysproto.h>
-#include <sys/signalvar.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
@@ -61,32 +62,31 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
-#include <sys/proc.h>
 #include <sys/ptrace.h>
-#include <sys/cons.h>
-#include <sys/exec.h>
+#include <sys/signalvar.h>
 #include <sys/sysent.h>
+#include <sys/sysproto.h>
 #include <sys/uio.h>
-#include <machine/reg.h>
-#include <machine/cpu.h>
-#include <machine/trap.h>
 
-#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm.h>
+#include <vm/vm_map.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_map.h>
 #include <vm/vnode_pager.h>
-#include <machine/pmap.h>
-#include <machine/vmparam.h>
-#include <machine/pcb.h>
-#include <machine/undefined.h>
-#include <machine/machdep.h>
-#include <machine/metadata.h>
+
 #include <machine/armreg.h>
+#include <machine/cpu.h>
+#include <machine/machdep.h>
 #include <machine/md_var.h>
+#include <machine/metadata.h>
+#include <machine/pcb.h>
+#include <machine/pmap.h>
+#include <machine/reg.h>
+#include <machine/trap.h>
+#include <machine/undefined.h>
+#include <machine/vmparam.h>
 
 #define MDROOT_ADDR 0xd0400000
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 2c60c00b6d6f..bd2a9cf7fed0 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -55,13 +55,16 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
@@ -73,7 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
-#include <sys/proc.h>
+#include <sys/ptrace.h>
 #include <sys/reboot.h>
 #include <sys/sched.h>
 #include <sys/signalvar.h>
@@ -84,16 +87,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-
-#include <sys/exec.h>
-#include <sys/cons.h>
+#include <vm/vm_param.h>
 
 #ifdef DDB
 #ifndef KDB
@@ -103,21 +103,24 @@ __FBSDID("$FreeBSD$");
 #include <ddb/db_sym.h>
 #endif
 
+#include <isa/rtc.h>
+
 #include <net/netisr.h>
 
+#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/reg.h>
-#include <machine/clock.h>
-#include <machine/specialreg.h>
-#include <machine/bootinfo.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 #include <machine/pcb.h>
 #include <machine/pcb_ext.h>
 #include <machine/proc.h>
+#include <machine/reg.h>
+#include <machine/sigframe.h>
+#include <machine/specialreg.h>
+#include <machine/vm86.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -130,11 +133,6 @@ __FBSDID("$FreeBSD$");
 #include <i386/isa/icu.h>
 #endif
 
-#include <isa/rtc.h>
-#include <machine/vm86.h>
-#include <sys/ptrace.h>
-#include <machine/sigframe.h>
-
 /* Sanity check for __curthread() */
 CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
 
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 3c09e14707ce..7492c4eeff38 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -34,65 +34,70 @@ __FBSDID("$FreeBSD$");
 #include "opt_msgbuf.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
-#include <sys/kdb.h>
-#include <sys/sysproto.h>
-#include <sys/signalvar.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/linker.h>
 #include <sys/lock.h>
-#include <sys/pcpu.h>
 #include <sys/malloc.h>
-#include <sys/reboot.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
 #include <sys/mbuf.h>
-#include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
-#include <sys/exec.h>
+#include <sys/pcpu.h>
+#include <sys/ptrace.h>
+#include <sys/random.h>
+#include <sys/reboot.h>
+#include <sys/signalvar.h>
+#include <sys/syscall.h>
 #include <sys/sysctl.h>
+#include <sys/sysproto.h>
+#include <sys/ucontext.h>
 #include <sys/uio.h>
-#include <sys/linker.h>
-#include <sys/random.h>
-#include <sys/cons.h>
 #include <sys/uuid.h>
-#include <sys/syscall.h>
+#include <sys/vmmeter.h>
+#include <sys/vnode.h>
+
+#include <ddb/ddb.h>
+
 #include <net/netisr.h>
+
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/ptrace.h>
+
+#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/md_var.h>
-#include <machine/reg.h>
+#include <machine/efi.h>
+#include <machine/elf.h>
 #include <machine/fpu.h>
 #include <machine/mca.h>
+#include <machine/md_var.h>
+#include <machine/mutex.h>
 #include <machine/pal.h>
+#include <machine/pcb.h>
+#include <machine/reg.h>
 #include <machine/sal.h>
+#include <machine/sigframe.h>
 #ifdef SMP
 #include <machine/smp.h>
 #endif
-#include <machine/bootinfo.h>
-#include <machine/mutex.h>
-#include <machine/vmparam.h>
-#include <machine/elf.h>
-#include <ddb/ddb.h>
-#include <sys/vnode.h>
-#include <sys/ucontext.h>
-#include <machine/sigframe.h>
-#include <machine/efi.h>
 #include <machine/unwind.h>
+#include <machine/vmparam.h>
+
 #include <i386/include/specialreg.h>
-#include <machine/pcb.h>
 
 u_int64_t processor_frequency;
 u_int64_t bus_frequency;
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index cb4f75a6f3b6..e5492fff9f2f 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -52,13 +52,16 @@
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
@@ -70,6 +73,7 @@
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
+#include <sys/ptrace.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/sched.h>
@@ -81,16 +85,13 @@
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-
-#include <sys/exec.h>
-#include <sys/cons.h>
+#include <vm/vm_param.h>
 
 #ifdef DDB
 #ifndef KDB
@@ -102,19 +103,20 @@
 
 #include <net/netisr.h>
 
+#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/reg.h>
-#include <machine/clock.h>
-#include <machine/specialreg.h>
-#include <machine/bootinfo.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 #include <machine/pcb.h>
 #include <machine/pcb_ext.h>
 #include <machine/proc.h>
+#include <machine/reg.h>
+#include <machine/sigframe.h>
+#include <machine/specialreg.h>
+#include <machine/vm86.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -133,9 +135,6 @@
 #else
 #include <isa/rtc.h>
 #endif
-#include <machine/vm86.h>
-#include <sys/ptrace.h>
-#include <machine/sigframe.h>
 
 /* Sanity check for __curthread() */
 CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index cb4f75a6f3b6..e5492fff9f2f 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -52,13 +52,16 @@
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
@@ -70,6 +73,7 @@
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
+#include <sys/ptrace.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/sched.h>
@@ -81,16 +85,13 @@
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-
-#include <sys/exec.h>
-#include <sys/cons.h>
+#include <vm/vm_param.h>
 
 #ifdef DDB
 #ifndef KDB
@@ -102,19 +103,20 @@
 
 #include <net/netisr.h>
 
+#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/reg.h>
-#include <machine/clock.h>
-#include <machine/specialreg.h>
-#include <machine/bootinfo.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 #include <machine/pcb.h>
 #include <machine/pcb_ext.h>
 #include <machine/proc.h>
+#include <machine/reg.h>
+#include <machine/sigframe.h>
+#include <machine/specialreg.h>
+#include <machine/vm86.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -133,9 +135,6 @@
 #else
 #include <isa/rtc.h>
 #endif
-#include <machine/vm86.h>
-#include <sys/ptrace.h>
-#include <machine/sigframe.h>
 
 /* Sanity check for __curthread() */
 CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 5f225a66df6a..f9512b90c4aa 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -63,60 +63,64 @@ __FBSDID("$FreeBSD$");
 #include "opt_msgbuf.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
-#include <sys/kdb.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
-#include <sys/sysproto.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/ktr.h>
-#include <sys/signalvar.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/ktr.h>
+#include <sys/linker.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/reboot.h>
 #include <sys/mbuf.h>
-#include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
-#include <sys/exec.h>
+#include <sys/mutex.h>
+#include <sys/ptrace.h>
+#include <sys/reboot.h>
+#include <sys/signalvar.h>
 #include <sys/sysctl.h>
-#include <sys/uio.h>
-#include <sys/linker.h>
-#include <sys/cons.h>
-#include <sys/ucontext.h>
 #include <sys/sysent.h>
+#include <sys/sysproto.h>
+#include <sys/ucontext.h>
+#include <sys/uio.h>
+#include <sys/vmmeter.h>
+#include <sys/vnode.h>
+
 #include <net/netisr.h>
+
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/ptrace.h>
+
 #include <machine/bat.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
+#include <machine/elf.h>
+#include <machine/fpu.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/pcb.h>
-#include <machine/reg.h>
-#include <machine/fpu.h>
-#include <machine/vmparam.h>
-#include <machine/elf.h>
-#include <machine/trap.h>
 #include <machine/powerpc.h>
-#include <dev/ofw/openfirm.h>
-#include <sys/vnode.h>
+#include <machine/reg.h>
 #include <machine/sigframe.h>
+#include <machine/trap.h>
+#include <machine/vmparam.h>
 
 #include <ddb/ddb.h>
 
+#include <dev/ofw/openfirm.h>
+
 #ifdef DDB
 extern vm_offset_t ksym_start, ksym_end;
 #endif
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index 5f225a66df6a..f9512b90c4aa 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -63,60 +63,64 @@ __FBSDID("$FreeBSD$");
 #include "opt_msgbuf.h"
 
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
-#include <sys/kdb.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
-#include <sys/sysproto.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/ktr.h>
-#include <sys/signalvar.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/ktr.h>
+#include <sys/linker.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/reboot.h>
 #include <sys/mbuf.h>
-#include <sys/vmmeter.h>
 #include <sys/msgbuf.h>
-#include <sys/exec.h>
+#include <sys/mutex.h>
+#include <sys/ptrace.h>
+#include <sys/reboot.h>
+#include <sys/signalvar.h>
 #include <sys/sysctl.h>
-#include <sys/uio.h>
-#include <sys/linker.h>
-#include <sys/cons.h>
-#include <sys/ucontext.h>
 #include <sys/sysent.h>
+#include <sys/sysproto.h>
+#include <sys/ucontext.h>
+#include <sys/uio.h>
+#include <sys/vmmeter.h>
+#include <sys/vnode.h>
+
 #include <net/netisr.h>
+
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/ptrace.h>
+
 #include <machine/bat.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
+#include <machine/elf.h>
+#include <machine/fpu.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/pcb.h>
-#include <machine/reg.h>
-#include <machine/fpu.h>
-#include <machine/vmparam.h>
-#include <machine/elf.h>
-#include <machine/trap.h>
 #include <machine/powerpc.h>
-#include <dev/ofw/openfirm.h>
-#include <sys/vnode.h>
+#include <machine/reg.h>
 #include <machine/sigframe.h>
+#include <machine/trap.h>
+#include <machine/vmparam.h>
 
 #include <ddb/ddb.h>
 
+#include <dev/ofw/openfirm.h>
+
 #ifdef DDB
 extern vm_offset_t ksym_start, ksym_end;
 #endif
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 9e14f0633715..bc1729531ab8 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -42,46 +42,45 @@
 #include "opt_msgbuf.h"
 
 #include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/cons.h>
+#include <sys/eventhandler.h>
+#include <sys/exec.h>
 #include <sys/imgact.h>
+#include <sys/interrupt.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
-#include <sys/eventhandler.h>
-#include <sys/interrupt.h>
 #include <sys/ptrace.h>
+#include <sys/reboot.h>
 #include <sys/signalvar.h>
 #include <sys/smp.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/timetc.h>
 #include <sys/ucontext.h>
-#include <sys/ucontext.h>
-#include <sys/exec.h>
 
 #include <dev/ofw/openfirm.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
+#include <vm/vm_param.h>
 
 #include <ddb/ddb.h>
 
@@ -97,11 +96,11 @@
 #include <machine/ofw_machdep.h>
 #include <machine/ofw_mem.h>
 #include <machine/pcb.h>
-#include <machine/smp.h>
 #include <machine/pmap.h>
 #include <machine/pstate.h>
 #include <machine/reg.h>
 #include <machine/sigframe.h>
+#include <machine/smp.h>
 #include <machine/tick.h>
 #include <machine/tlb.h>
 #include <machine/tstate.h>