style: [patch 1/22] use /r/3648/ to reorganize includes

src/arch/alpha/faults.cc

@@ -29,15 +29,16 @@
  *          Kevin Lim
  */
 
-#include "arch/alpha/ev5.hh"
 #include "arch/alpha/faults.hh"
+
+#include "arch/alpha/ev5.hh"
 #include "arch/alpha/tlb.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process.hh"
 #include "sim/full_system.hh"
+#include "sim/process.hh"
 
 namespace AlphaISA {
 

src/arch/alpha/freebsd/system.cc

@@ -36,6 +36,7 @@
  */
 
 #include "arch/alpha/freebsd/system.hh"
+
 #include "arch/alpha/system.hh"
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"

src/arch/alpha/idle_event.cc

@@ -30,6 +30,7 @@
  */
 
 #include "arch/alpha/idle_event.hh"
+
 #include "arch/alpha/kernel_stats.hh"
 #include "cpu/thread_context.hh"
 

src/arch/alpha/ipr.cc

@@ -28,11 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/alpha/ipr.hh"
+
 #include <cassert>
 #include <cstring>
 
-#include "arch/alpha/ipr.hh"
-
 namespace AlphaISA {
 
 md_ipr_names MiscRegIndexToIpr[NumInternalProcRegs] = {

src/arch/alpha/isa.cc

@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/alpha/isa.hh"
+
 #include <cassert>
 
-#include "arch/alpha/isa.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "params/AlphaISA.hh"

src/arch/alpha/kernel_stats.cc

@@ -29,13 +29,14 @@
  *          Nathan Binkert
  */
 
+#include "arch/alpha/kernel_stats.hh"
+
 #include <map>
 #include <stack>
 #include <string>
 
-#include "arch/generic/linux/threadinfo.hh"
-#include "arch/alpha/kernel_stats.hh"
 #include "arch/alpha/osfpal.hh"
+#include "arch/generic/linux/threadinfo.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Context.hh"

src/arch/alpha/linux/process.cc

@@ -29,9 +29,10 @@
  *          Ali Saidi
  */
 
-#include "arch/alpha/linux/linux.hh"
 #include "arch/alpha/linux/process.hh"
+
 #include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/linux/linux.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/SyscallVerbose.hh"

src/arch/alpha/linux/system.cc

@@ -41,6 +41,7 @@
  */
 
 #include "arch/alpha/linux/system.hh"
+
 #include "arch/alpha/idle_event.hh"
 #include "arch/alpha/system.hh"
 #include "arch/generic/linux/threadinfo.hh"

src/arch/alpha/pagetable.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/alpha/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace AlphaISA {

src/arch/alpha/process.cc

@@ -29,8 +29,9 @@
  *          Ali Saidi
  */
 
-#include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/process.hh"
+
+#include "arch/alpha/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
 #include "base/misc.hh"

src/arch/alpha/remote_gdb.cc

@@ -117,15 +117,15 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
+#include "arch/alpha/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
 #include <string>
 
-
 #include "arch/alpha/decoder.hh"
 #include "arch/alpha/regredir.hh"
-#include "arch/alpha/remote_gdb.hh"
 #include "arch/alpha/utility.hh"
 #include "arch/alpha/vtophys.hh"
 #include "base/intmath.hh"
@@ -138,8 +138,8 @@
 #include "debug/GDBMisc.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace AlphaISA;

src/arch/alpha/stacktrace.cc

@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/alpha/stacktrace.hh"
+
 #include <string>
 
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/stacktrace.hh"
 #include "arch/alpha/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"

src/arch/alpha/system.cc

@@ -29,10 +29,11 @@
  *          Nathan Binkert
  */
 
+#include "arch/alpha/system.hh"
+
 #include <sys/signal.h>
 
 #include "arch/alpha/ev5.hh"
-#include "arch/alpha/system.hh"
 #include "arch/vtophys.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"

src/arch/alpha/utility.cc

@@ -30,6 +30,7 @@
  */
 
 #include "arch/alpha/utility.hh"
+
 #include "arch/alpha/vtophys.hh"
 #include "mem/fs_translating_port_proxy.hh"
 #include "sim/full_system.hh"

src/arch/alpha/vtophys.cc

@@ -30,10 +30,11 @@
  *          Ali Saidi
  */
 
+#include "arch/alpha/vtophys.hh"
+
 #include <string>
 
 #include "arch/alpha/ev5.hh"
-#include "arch/alpha/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

src/arch/arm/faults.cc

@@ -45,9 +45,10 @@
  */
 
 #include "arch/arm/faults.hh"
+
+#include "arch/arm/insts/static_inst.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/utility.hh"
-#include "arch/arm/insts/static_inst.hh"
 #include "base/compiler.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"

src/arch/arm/insts/macromem.cc

@@ -40,10 +40,10 @@
  * Authors: Stephen Hines
  */
 
-#include <sstream>
-
 #include "arch/arm/insts/macromem.hh"
 
+#include <sstream>
+
 #include "arch/arm/generated/decoder.hh"
 #include "arch/arm/insts/neon64_mem.hh"
 

src/arch/arm/insts/mem.cc

@@ -41,6 +41,7 @@
  */
 
 #include "arch/arm/insts/mem.hh"
+
 #include "base/loader/symtab.hh"
 
 using namespace std;

src/arch/arm/insts/mem64.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/arm/insts/mem64.hh"
+
 #include "arch/arm/tlb.hh"
 #include "base/loader/symtab.hh"
 #include "mem/request.hh"

src/arch/arm/insts/misc.cc

@@ -39,6 +39,7 @@
  */
 
 #include "arch/arm/insts/misc.hh"
+
 #include "cpu/reg_class.hh"
 
 std::string

src/arch/arm/insts/pseudo.cc

@@ -42,6 +42,7 @@
  */
 
 #include "arch/arm/insts/pseudo.hh"
+
 #include "cpu/exec_context.hh"
 
 DecoderFaultInst::DecoderFaultInst(ExtMachInst _machInst)

src/arch/arm/insts/static_inst.cc

@@ -42,10 +42,11 @@
  */
 
 #include "arch/arm/insts/static_inst.hh"
+
 #include "arch/arm/faults.hh"
-#include "base/loader/symtab.hh"
 #include "base/condcodes.hh"
 #include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
 #include "cpu/reg_class.hh"
 
 namespace ArmISA

src/arch/arm/interrupts.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/arm/interrupts.hh"
+
 #include "arch/arm/system.hh"
 
 ArmISA::Interrupts *

src/arch/arm/isa.cc

@@ -39,10 +39,11 @@
  */
 
 #include "arch/arm/isa.hh"
+
 #include "arch/arm/pmu.hh"
 #include "arch/arm/system.hh"
-#include "cpu/checker/cpu.hh"
 #include "cpu/base.hh"
+#include "cpu/checker/cpu.hh"
 #include "debug/Arm.hh"
 #include "debug/MiscRegs.hh"
 #include "dev/arm/generic_timer.hh"

src/arch/arm/kvm/base_cpu.cc

@@ -44,7 +44,6 @@
 #include "debug/KvmInt.hh"
 #include "params/BaseArmKvmCPU.hh"
 
-
 #define INTERRUPT_ID(type, vcpu, irq) (                    \
         ((type) << KVM_ARM_IRQ_TYPE_SHIFT) |               \
         ((vcpu) << KVM_ARM_IRQ_VCPU_SHIFT) |               \

src/arch/arm/linux/process.cc

@@ -44,9 +44,10 @@
  *          Giacomo Gabrielli
  */
 
-#include "arch/arm/linux/linux.hh"
 #include "arch/arm/linux/process.hh"
+
 #include "arch/arm/isa_traits.hh"
+#include "arch/arm/linux/linux.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"

src/arch/arm/linux/system.cc

@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/linux/atag.hh"
 #include "arch/arm/linux/system.hh"
+
 #include "arch/arm/isa_traits.hh"
+#include "arch/arm/linux/atag.hh"
 #include "arch/arm/utility.hh"
 #include "arch/generic/linux/threadinfo.hh"
 #include "base/loader/dtb_object.hh"

src/arch/arm/miscregs.cc

@@ -39,8 +39,9 @@
  *          Giacomo Gabrielli
  */
 
-#include "arch/arm/isa.hh"
 #include "arch/arm/miscregs.hh"
+
+#include "arch/arm/isa.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "sim/full_system.hh"

src/arch/arm/nativetrace.cc

@@ -40,9 +40,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/arm/nativetrace.hh"
+
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/miscregs.hh"
-#include "arch/arm/nativetrace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/ExecRegDelta.hh"
 #include "params/ArmNativeTrace.hh"

src/arch/arm/process.cc

@@ -41,8 +41,9 @@
  *          Ali Saidi
  */
 
-#include "arch/arm/isa_traits.hh"
 #include "arch/arm/process.hh"
+
+#include "arch/arm/isa_traits.hh"
 #include "arch/arm/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"

src/arch/arm/remote_gdb.cc

@@ -132,6 +132,8 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
+#include "arch/arm/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
@@ -140,7 +142,6 @@
 #include "arch/arm/decoder.hh"
 #include "arch/arm/pagetable.hh"
 #include "arch/arm/registers.hh"
-#include "arch/arm/remote_gdb.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"

src/arch/arm/stacktrace.cc

@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/arm/stacktrace.hh"
+
 #include <string>
 
 #include "arch/arm/isa_traits.hh"
-#include "arch/arm/stacktrace.hh"
 #include "arch/arm/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"

src/arch/arm/stage2_lookup.cc

@@ -38,8 +38,9 @@
  *          Giacomo Gabrielli
  */
 
-#include "arch/arm/faults.hh"
 #include "arch/arm/stage2_lookup.hh"
+
+#include "arch/arm/faults.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"

src/arch/arm/system.cc

@@ -40,14 +40,15 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/arm/system.hh"
+
 #include <iostream>
 
-#include "arch/arm/system.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
-#include "mem/physical.hh"
 #include "mem/fs_translating_port_proxy.hh"
+#include "mem/physical.hh"
 #include "sim/full_system.hh"
 
 using namespace std;

src/arch/arm/tlb.cc

@@ -50,10 +50,10 @@
 
 #include "arch/arm/faults.hh"
 #include "arch/arm/pagetable.hh"
-#include "arch/arm/system.hh"
-#include "arch/arm/table_walker.hh"
 #include "arch/arm/stage2_lookup.hh"
 #include "arch/arm/stage2_mmu.hh"
+#include "arch/arm/system.hh"
+#include "arch/arm/table_walker.hh"
 #include "arch/arm/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"

src/arch/arm/utility.cc

@@ -37,16 +37,17 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/arm/utility.hh"
+
 #include <memory>
 
 #include "arch/arm/faults.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/tlb.hh"
-#include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
-#include "cpu/checker/cpu.hh"
 #include "cpu/base.hh"
+#include "cpu/checker/cpu.hh"
 #include "cpu/thread_context.hh"
 #include "mem/fs_translating_port_proxy.hh"
 #include "sim/full_system.hh"

src/arch/arm/vtophys.cc

@@ -43,12 +43,13 @@
  *          Stephen Hines
  */
 
+#include "arch/arm/vtophys.hh"
+
 #include <string>
 
 #include "arch/arm/faults.hh"
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"
-#include "arch/arm/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

src/arch/generic/decode_cache.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/generic/decode_cache.hh"
+
 #include "arch/decoder.hh"
 #include "arch/types.hh"
 #include "config/the_isa.hh"

src/arch/generic/mmapped_ipr.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/generic/mmapped_ipr.hh"
+
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/pseudo_inst.hh"

src/arch/generic/pseudo_inst.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/generic/pseudo_inst.hh"
+
 #include "base/misc.hh"
 
 class ThreadContext;

src/arch/mips/bare_iron/system.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/mips/bare_iron/system.hh"
+
 #include "params/BareIronMipsSystem.hh"
 
 BareIronMipsSystem::BareIronMipsSystem(Params *p)

src/arch/mips/dsp.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/mips/dsp.hh"
+
 #include "arch/mips/isa_traits.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"

src/arch/mips/faults.cc

@@ -34,6 +34,7 @@
  */
 
 #include "arch/mips/faults.hh"
+
 #include "arch/mips/pra_constants.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"

src/arch/mips/idle_event.cc

@@ -31,6 +31,7 @@
  */
 
 #include "arch/mips/idle_event.hh"
+
 #include "arch/mips/kernel_stats.hh"
 #include "cpu/thread_context.hh"
 

src/arch/mips/interrupts.cc

@@ -32,6 +32,7 @@
  */
 
 #include "arch/mips/interrupts.hh"
+
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/pra_constants.hh"
 #include "base/trace.hh"

src/arch/mips/isa.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/mips/isa.hh"
+
 #include "arch/mips/mt.hh"
 #include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"

src/arch/mips/linux/process.cc

@@ -30,9 +30,10 @@
  *          Korey Sewell
  */
 
-#include "arch/mips/linux/linux.hh"
 #include "arch/mips/linux/process.hh"
+
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/linux/linux.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/SyscallVerbose.hh"

src/arch/mips/linux/system.cc

@@ -39,8 +39,9 @@
  * up boot time.
  */
 
-#include "arch/generic/linux/threadinfo.hh"
 #include "arch/mips/linux/system.hh"
+
+#include "arch/generic/linux/threadinfo.hh"
 #include "arch/mips/idle_event.hh"
 #include "arch/mips/system.hh"
 #include "arch/vtophys.hh"

src/arch/mips/pagetable.cc

@@ -32,6 +32,7 @@
  */
 
 #include "arch/mips/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace MipsISA

src/arch/mips/process.cc

@@ -30,8 +30,9 @@
  *          Korey Sewell
  */
 
-#include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
+
+#include "arch/mips/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
 #include "base/misc.hh"

src/arch/mips/remote_gdb.cc

@@ -133,13 +133,14 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
+#include "arch/mips/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
 #include <string>
 
 #include "arch/mips/decoder.hh"
-#include "arch/mips/remote_gdb.hh"
 #include "arch/mips/vtophys.hh"
 #include "cpu/thread_state.hh"
 #include "debug/GDBAcc.hh"

src/arch/mips/stacktrace.cc

@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/mips/stacktrace.hh"
+
 #include <string>
 
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/stacktrace.hh"
 #include "arch/mips/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"

src/arch/mips/system.cc

@@ -32,6 +32,7 @@
  */
 
 #include "arch/mips/system.hh"
+
 #include "arch/vtophys.hh"
 #include "base/loader/hex_file.hh"
 #include "base/loader/object_file.hh"

src/arch/mips/tlb.cc

@@ -33,13 +33,14 @@
  *          Deyuan Guo
  */
 
+#include "arch/mips/tlb.hh"
+
 #include <string>
 #include <vector>
 
 #include "arch/mips/faults.hh"
 #include "arch/mips/pagetable.hh"
 #include "arch/mips/pra_constants.hh"
-#include "arch/mips/tlb.hh"
 #include "arch/mips/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"

src/arch/mips/utility.cc

@@ -28,11 +28,12 @@
  * Authors: Korey Sewell
  */
 
+#include "arch/mips/utility.hh"
+
 #include <cmath>
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/registers.hh"
-#include "arch/mips/utility.hh"
 #include "arch/mips/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
@@ -41,7 +42,6 @@
 #include "mem/fs_translating_port_proxy.hh"
 #include "sim/serialize.hh"
 
-
 using namespace MipsISA;
 using namespace std;
 

src/arch/mips/vtophys.cc

@@ -31,9 +31,10 @@
  *          Jaidev Patwardhan
  */
 
+#include "arch/mips/vtophys.hh"
+
 #include <string>
 
-#include "arch/mips/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

src/arch/power/insts/branch.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/power/insts/branch.hh"
+
 #include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
 

src/arch/power/insts/mem.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/power/insts/mem.hh"
+
 #include "base/loader/symtab.hh"
 
 using namespace PowerISA;

src/arch/power/insts/static_inst.cc

@@ -30,6 +30,7 @@
  */
 
 #include "arch/power/insts/static_inst.hh"
+
 #include "cpu/reg_class.hh"
 
 using namespace PowerISA;

src/arch/power/isa.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/power/isa.hh"
+
 #include "params/PowerISA.hh"
 
 namespace PowerISA

src/arch/power/linux/process.cc

@@ -32,9 +32,10 @@
  *          Timothy M. Jones
  */
 
-#include "arch/power/linux/linux.hh"
 #include "arch/power/linux/process.hh"
+
 #include "arch/power/isa_traits.hh"
+#include "arch/power/linux/linux.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"

src/arch/power/pagetable.cc

@@ -36,6 +36,7 @@
  */
 
 #include "arch/power/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace PowerISA

src/arch/power/process.cc

@@ -30,8 +30,9 @@
  *          Timothy M. Jones
  */
 
-#include "arch/power/isa_traits.hh"
 #include "arch/power/process.hh"
+
+#include "arch/power/isa_traits.hh"
 #include "arch/power/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"

src/arch/power/stacktrace.cc

@@ -28,9 +28,10 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/power/stacktrace.hh"
+
 #include <string>
 
-#include "arch/power/stacktrace.hh"
 #include "base/trace.hh"
 
 using namespace std;

src/arch/power/tlb.cc

@@ -35,12 +35,13 @@
  *          Timothy M. Jones
  */
 
+#include "arch/power/tlb.hh"
+
 #include <string>
 #include <vector>
 
 #include "arch/power/faults.hh"
 #include "arch/power/pagetable.hh"
-#include "arch/power/tlb.hh"
 #include "arch/power/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"

src/arch/power/utility.cc

@@ -33,6 +33,7 @@
  */
 
 #include "arch/power/utility.hh"
+
 #include "base/misc.hh"
 
 namespace PowerISA {

src/arch/sparc/faults.cc

@@ -29,20 +29,20 @@
  *          Kevin Lim
  */
 
+#include "arch/sparc/faults.hh"
+
 #include <algorithm>
 
-#include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/process.hh"
 #include "arch/sparc/types.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
-#include "sim/full_system.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process.hh"
 #include "sim/full_system.hh"
+#include "sim/process.hh"
 
 using namespace std;
 

src/arch/sparc/isa.cc

@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/sparc/isa.hh"
+
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/decoder.hh"
-#include "arch/sparc/isa.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"

src/arch/sparc/linux/process.cc

@@ -31,6 +31,7 @@
  */
 
 #include "arch/sparc/linux/process.hh"
+
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "base/trace.hh"

src/arch/sparc/nativetrace.cc

@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/nativetrace.hh"
+
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"

src/arch/sparc/pagetable.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace SparcISA

src/arch/sparc/process.cc

@@ -29,10 +29,11 @@
  *          Ali Saidi
  */
 
+#include "arch/sparc/process.hh"
+
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/handlers.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/process.hh"
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
 #include "base/loader/elf_object.hh"

src/arch/sparc/remote_gdb.cc

@@ -119,13 +119,14 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
-#include <signal.h>
+#include "arch/sparc/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
+#include <csignal>
 #include <string>
 
-#include "arch/sparc/remote_gdb.hh"
 #include "arch/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"

src/arch/sparc/solaris/process.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/solaris/process.hh"
+
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "base/trace.hh"

src/arch/sparc/system.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/system.hh"
+
 #include "arch/vtophys.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"

src/arch/sparc/tlb.cc

@@ -28,12 +28,13 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/sparc/tlb.hh"
+
 #include <cstring>
 
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/faults.hh"
 #include "arch/sparc/registers.hh"
-#include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"

src/arch/sparc/ua2005.cc

@@ -35,8 +35,8 @@
 #include "cpu/thread_context.hh"
 #include "debug/Quiesce.hh"
 #include "debug/Timer.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 using namespace SparcISA;
 using namespace std;

src/arch/sparc/utility.cc

@@ -29,8 +29,9 @@
  *          Ali Saidi
  */
 
-#include "arch/sparc/faults.hh"
 #include "arch/sparc/utility.hh"
+
+#include "arch/sparc/faults.hh"
 #include "arch/sparc/vtophys.hh"
 #include "mem/fs_translating_port_proxy.hh"
 

src/arch/sparc/vtophys.cc

@@ -28,10 +28,11 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/sparc/vtophys.hh"
+
 #include <string>
 
 #include "arch/sparc/tlb.hh"
-#include "arch/sparc/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/compiler.hh"
 #include "base/trace.hh"

src/arch/x86/bios/acpi.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/acpi.hh"
+
 #include "mem/port.hh"
 #include "params/X86ACPIRSDP.hh"
 #include "params/X86ACPIRSDT.hh"

src/arch/x86/bios/e820.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/e820.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "mem/port_proxy.hh"
 #include "sim/byteswap.hh"

src/arch/x86/bios/intelmp.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/intelmp.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "base/misc.hh"
 #include "base/types.hh"

src/arch/x86/bios/smbios.cc

@@ -41,6 +41,7 @@
  */
 
 #include "arch/x86/bios/smbios.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "base/types.hh"
 #include "mem/port_proxy.hh"

src/arch/x86/cpuid.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/cpuid.hh"
+
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
 

src/arch/x86/decoder.cc

@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/decoder.hh"
+
 #include "arch/x86/regs/misc.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"

src/arch/x86/emulenv.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/emulenv.hh"
+
 #include <cassert>
 
-#include "arch/x86/emulenv.hh"
 #include "base/misc.hh"
 
 using namespace X86ISA;

src/arch/x86/faults.cc

@@ -40,8 +40,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/faults.hh"
+
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

src/arch/x86/insts/badmicroop.cc

@@ -37,8 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/insts/badmicroop.hh"
+
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 
 namespace X86ISA

src/arch/x86/insts/microfpop.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microfpop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA

src/arch/x86/insts/microldstop.cc

@@ -38,10 +38,10 @@
  * Authors: Gabe Black
  */
 
-#include <string>
-
 #include "arch/x86/insts/microldstop.hh"
 
+#include <string>
+
 namespace X86ISA
 {
     std::string LdStOp::generateDisassembly(Addr pc,

src/arch/x86/insts/micromediaop.cc

@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/micromediaop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA

src/arch/x86/insts/microop.cc

@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/insts/microop.hh"
+
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA

src/arch/x86/insts/microregop.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microregop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
 #include "debug/X86.hh"

src/arch/x86/insts/static_inst.cc

@@ -39,6 +39,7 @@
  */
 
 #include "arch/x86/insts/static_inst.hh"
+
 #include "arch/x86/regs/segment.hh"
 #include "cpu/reg_class.hh"
 

src/arch/x86/interrupts.cc

@@ -49,19 +49,20 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/interrupts.hh"
+
 #include <memory>
 
-#include "arch/x86/regs/apic.hh"
-#include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
+#include "arch/x86/regs/apic.hh"
 #include "cpu/base.hh"
 #include "debug/LocalApic.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
 #include "mem/packet_access.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 int
 divideFromConf(uint32_t conf)

src/arch/x86/isa.cc

@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/decoder.hh"
 #include "arch/x86/isa.hh"
+
+#include "arch/x86/decoder.hh"
 #include "arch/x86/tlb.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"

src/arch/x86/linux/process.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/linux/linux.hh"
 #include "arch/x86/linux/process.hh"
+
 #include "arch/x86/isa_traits.hh"
+#include "arch/x86/linux/linux.hh"
 #include "arch/x86/registers.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"

src/arch/x86/linux/system.cc

@@ -38,9 +38,10 @@
  */
 
 #include "arch/x86/linux/system.hh"
-#include "arch/x86/regs/int.hh"
+
-#include "arch/x86/isa_traits.hh"
 #include "arch/vtophys.hh"
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/regs/int.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"

src/arch/x86/nativetrace.cc

@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/nativetrace.hh"
+
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/int.hh"
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/nativetrace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/ExecRegDelta.hh"
 #include "params/X86NativeTrace.hh"

src/arch/x86/pagetable.cc

@@ -37,9 +37,11 @@
  * Authors: Gabe Black
  */
 
-#include <cmath>
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/pagetable.hh"
+
+#include <cmath>
+
+#include "arch/x86/isa_traits.hh"
 #include "sim/serialize.hh"
 
 namespace X86ISA