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

110 files changed, 198 insertions, 97 deletions

diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index 8bb781c13..8a6e469f2 100644
--- a/src/arch/alpha/faults.cc
+++ b/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 {
 
diff --git a/src/arch/alpha/freebsd/system.cc b/src/arch/alpha/freebsd/system.cc
index 303d5f762..4599c70b0 100644
--- a/src/arch/alpha/freebsd/system.cc
+++ b/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"
diff --git a/src/arch/alpha/idle_event.cc b/src/arch/alpha/idle_event.cc
index bb68782e7..85e1d4410 100644
--- a/src/arch/alpha/idle_event.cc
+++ b/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"
 
diff --git a/src/arch/alpha/ipr.cc b/src/arch/alpha/ipr.cc
index 502ada5eb..909f15385 100644
--- a/src/arch/alpha/ipr.cc
+++ b/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] = {
diff --git a/src/arch/alpha/isa.cc b/src/arch/alpha/isa.cc
index 8240037cc..fd2dda67c 100644
--- a/src/arch/alpha/isa.cc
+++ b/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"
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index ada79c757..fed8b09e4 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/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"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index ebe06510d..9a26bb9b8 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/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"
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 80d13cdfa..3ecf42f0b 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/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"
diff --git a/src/arch/alpha/pagetable.cc b/src/arch/alpha/pagetable.cc
index f2b1147f7..30d8b3367 100644
--- a/src/arch/alpha/pagetable.cc
+++ b/src/arch/alpha/pagetable.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/alpha/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace AlphaISA {
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 9e298f0c6..be286e30e 100644
--- a/src/arch/alpha/process.cc
+++ b/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"
diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index f32d49e97..8c01005da 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/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;
diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc
index f48955715..1dc5956c7 100644
--- a/src/arch/alpha/stacktrace.cc
+++ b/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"
diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc
index d2be5492f..302942981 100644
--- a/src/arch/alpha/system.cc
+++ b/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"
diff --git a/src/arch/alpha/utility.cc b/src/arch/alpha/utility.cc
index 2dfe00f96..de4b4e34d 100644
--- a/src/arch/alpha/utility.cc
+++ b/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"
diff --git a/src/arch/alpha/vtophys.cc b/src/arch/alpha/vtophys.cc
index 8ca23fce2..baf30418a 100644
--- a/src/arch/alpha/vtophys.cc
+++ b/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"
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 0a39dbba6..b0d7700d1 100644
--- a/src/arch/arm/faults.cc
+++ b/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"
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 154039a77..9a3e70616 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/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"
 
diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc
index 15702ff83..558235340 100644
--- a/src/arch/arm/insts/mem.cc
+++ b/src/arch/arm/insts/mem.cc
@@ -41,6 +41,7 @@
  */
 
 #include "arch/arm/insts/mem.hh"
+
 #include "base/loader/symtab.hh"
 
 using namespace std;
diff --git a/src/arch/arm/insts/mem64.cc b/src/arch/arm/insts/mem64.cc
index 4d1fdd302..52e2fc7db 100644
--- a/src/arch/arm/insts/mem64.cc
+++ b/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"
diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc
index 7432f436e..790989d9d 100644
--- a/src/arch/arm/insts/misc.cc
+++ b/src/arch/arm/insts/misc.cc
@@ -39,6 +39,7 @@
  */
 
 #include "arch/arm/insts/misc.hh"
+
 #include "cpu/reg_class.hh"
 
 std::string
diff --git a/src/arch/arm/insts/pseudo.cc b/src/arch/arm/insts/pseudo.cc
index 526369b33..ab38e29ea 100644
--- a/src/arch/arm/insts/pseudo.cc
+++ b/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)
diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc
index 3defc07c2..df27ed822 100644
--- a/src/arch/arm/insts/static_inst.cc
+++ b/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
diff --git a/src/arch/arm/interrupts.cc b/src/arch/arm/interrupts.cc
index d3ba16142..3d841e9f8 100644
--- a/src/arch/arm/interrupts.cc
+++ b/src/arch/arm/interrupts.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/arm/interrupts.hh"
+
 #include "arch/arm/system.hh"
 
 ArmISA::Interrupts *
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 4f099bf90..0db6d433d 100644
--- a/src/arch/arm/isa.cc
+++ b/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"
diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index b802cd600..e511fd661 100644
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/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) |               \
diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index 48aebadc8..67f25893b 100644
--- a/src/arch/arm/linux/process.cc
+++ b/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"
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 311d81a37..52e075d8f 100644
--- a/src/arch/arm/linux/system.cc
+++ b/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"
diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc
index 525d44810..09af405ad 100644
--- a/src/arch/arm/miscregs.cc
+++ b/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"
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index 20f13e69e..fcb13fb2a 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/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"
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index a787b1f66..cc3d3e200 100644
--- a/src/arch/arm/process.cc
+++ b/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"
diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index 42ca941a8..b0f6d8e5e 100644
--- a/src/arch/arm/remote_gdb.cc
+++ b/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"
diff --git a/src/arch/arm/stacktrace.cc b/src/arch/arm/stacktrace.cc
index 0246ffd4e..a7e26c618 100644
--- a/src/arch/arm/stacktrace.cc
+++ b/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"
diff --git a/src/arch/arm/stage2_lookup.cc b/src/arch/arm/stage2_lookup.cc
index 04d50afbf..82a29e84f 100755
--- a/src/arch/arm/stage2_lookup.cc
+++ b/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"
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index b61666339..322f686dc 100644
--- a/src/arch/arm/system.cc
+++ b/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;
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 6658657aa..85bc12c5b 100644
--- a/src/arch/arm/tlb.cc
+++ b/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"
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 56a21ae2d..1437801a2 100644
--- a/src/arch/arm/utility.cc
+++ b/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"
diff --git a/src/arch/arm/vtophys.cc b/src/arch/arm/vtophys.cc
index 24fc5a5c7..872867819 100644
--- a/src/arch/arm/vtophys.cc
+++ b/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"
diff --git a/src/arch/generic/decode_cache.cc b/src/arch/generic/decode_cache.cc
index 7211ba355..782dfca43 100644
--- a/src/arch/generic/decode_cache.cc
+++ b/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"
diff --git a/src/arch/generic/mmapped_ipr.cc b/src/arch/generic/mmapped_ipr.cc
index 1a356a5d5..c908eff01 100644
--- a/src/arch/generic/mmapped_ipr.cc
+++ b/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"
diff --git a/src/arch/generic/pseudo_inst.cc b/src/arch/generic/pseudo_inst.cc
index e914b05a0..46667c158 100644
--- a/src/arch/generic/pseudo_inst.cc
+++ b/src/arch/generic/pseudo_inst.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/generic/pseudo_inst.hh"
+
 #include "base/misc.hh"
 
 class ThreadContext;
diff --git a/src/arch/mips/bare_iron/system.cc b/src/arch/mips/bare_iron/system.cc
index ff928acfc..e1f5462aa 100755
--- a/src/arch/mips/bare_iron/system.cc
+++ b/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)
diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index 3f6c6866e..c999955e4 100755
--- a/src/arch/mips/dsp.cc
+++ b/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"
diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index eae6bc927..9ab1500ec 100644
--- a/src/arch/mips/faults.cc
+++ b/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"
diff --git a/src/arch/mips/idle_event.cc b/src/arch/mips/idle_event.cc
index 8c98c5078..a57988c10 100644
--- a/src/arch/mips/idle_event.cc
+++ b/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"
 
diff --git a/src/arch/mips/interrupts.cc b/src/arch/mips/interrupts.cc
index 98c1b8e23..17bb146c4 100755
--- a/src/arch/mips/interrupts.cc
+++ b/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"
diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index 5090e0b92..6310f67e7 100644
--- a/src/arch/mips/isa.cc
+++ b/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"
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index c6c40188e..deb6e8b80 100644
--- a/src/arch/mips/linux/process.cc
+++ b/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"
diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc
index dc2ac7da5..4a23aae66 100644
--- a/src/arch/mips/linux/system.cc
+++ b/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"
diff --git a/src/arch/mips/pagetable.cc b/src/arch/mips/pagetable.cc
index 26d9bf408..0c1734b42 100644
--- a/src/arch/mips/pagetable.cc
+++ b/src/arch/mips/pagetable.cc
@@ -32,6 +32,7 @@
  */
 
 #include "arch/mips/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace MipsISA
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 6947eeafd..dd97fe7f1 100644
--- a/src/arch/mips/process.cc
+++ b/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"
diff --git a/src/arch/mips/remote_gdb.cc b/src/arch/mips/remote_gdb.cc
index 68d8eaa57..4fa7cac70 100644
--- a/src/arch/mips/remote_gdb.cc
+++ b/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"
diff --git a/src/arch/mips/stacktrace.cc b/src/arch/mips/stacktrace.cc
index 78457c09c..f584855dc 100644
--- a/src/arch/mips/stacktrace.cc
+++ b/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"
diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc
index c6a043e46..815674702 100755
--- a/src/arch/mips/system.cc
+++ b/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"
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index 340c83021..87a459488 100644
--- a/src/arch/mips/tlb.cc
+++ b/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"
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 80047fbfd..c56321612 100644
--- a/src/arch/mips/utility.cc
+++ b/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;
 
diff --git a/src/arch/mips/vtophys.cc b/src/arch/mips/vtophys.cc
index 60d9bc1ba..237b67524 100755
--- a/src/arch/mips/vtophys.cc
+++ b/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"
diff --git a/src/arch/power/insts/branch.cc b/src/arch/power/insts/branch.cc
index 352c4ea57..f9876db8c 100644
--- a/src/arch/power/insts/branch.cc
+++ b/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"
 
diff --git a/src/arch/power/insts/mem.cc b/src/arch/power/insts/mem.cc
index 447efa2f4..68a33c6a3 100644
--- a/src/arch/power/insts/mem.cc
+++ b/src/arch/power/insts/mem.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/power/insts/mem.hh"
+
 #include "base/loader/symtab.hh"
 
 using namespace PowerISA;
diff --git a/src/arch/power/insts/static_inst.cc b/src/arch/power/insts/static_inst.cc
index 087e1f740..db8c03002 100644
--- a/src/arch/power/insts/static_inst.cc
+++ b/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;
diff --git a/src/arch/power/isa.cc b/src/arch/power/isa.cc
index 0b49c9714..faf6dfb91 100644
--- a/src/arch/power/isa.cc
+++ b/src/arch/power/isa.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/power/isa.hh"
+
 #include "params/PowerISA.hh"
 
 namespace PowerISA
diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc
index b00e02a87..f9c424cea 100644
--- a/src/arch/power/linux/process.cc
+++ b/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"
diff --git a/src/arch/power/pagetable.cc b/src/arch/power/pagetable.cc
index 4af0b7919..81314a74b 100644
--- a/src/arch/power/pagetable.cc
+++ b/src/arch/power/pagetable.cc
@@ -36,6 +36,7 @@
  */
 
 #include "arch/power/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace PowerISA
diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc
index 10e4a85a0..880d7dd6f 100644
--- a/src/arch/power/process.cc
+++ b/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"
diff --git a/src/arch/power/stacktrace.cc b/src/arch/power/stacktrace.cc
index f241dfecb..2952c74fa 100644
--- a/src/arch/power/stacktrace.cc
+++ b/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;
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index 90a341d85..417277830 100644
--- a/src/arch/power/tlb.cc
+++ b/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"
diff --git a/src/arch/power/utility.cc b/src/arch/power/utility.cc
index 7be195b8d..c8076a697 100644
--- a/src/arch/power/utility.cc
+++ b/src/arch/power/utility.cc
@@ -33,6 +33,7 @@
  */
 
 #include "arch/power/utility.hh"
+
 #include "base/misc.hh"
 
 namespace PowerISA {
diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc
index 8ace3cb25..c181e3021 100644
--- a/src/arch/sparc/faults.cc
+++ b/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;
 
diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc
index aa10a0b46..b8906e95f 100644
--- a/src/arch/sparc/isa.cc
+++ b/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"
diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index ce6094060..fd4dd9818 100644
--- a/src/arch/sparc/linux/process.cc
+++ b/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"
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 8987aa518..509e3adb9 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/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"
diff --git a/src/arch/sparc/pagetable.cc b/src/arch/sparc/pagetable.cc
index f0d2c10cf..0a14f0b80 100644
--- a/src/arch/sparc/pagetable.cc
+++ b/src/arch/sparc/pagetable.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace SparcISA
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 09d52ae6b..f863eb018 100644
--- a/src/arch/sparc/process.cc
+++ b/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"
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 46788af17..b7ecd3b7a 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/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"
diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index f929877f3..38159720a 100644
--- a/src/arch/sparc/solaris/process.cc
+++ b/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"
diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index 5c7f06db3..a68b11cad 100644
--- a/src/arch/sparc/system.cc
+++ b/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"
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index b4a761293..51eb83ac2 100644
--- a/src/arch/sparc/tlb.cc
+++ b/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"
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index 2c100957f..274301b37 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/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;
diff --git a/src/arch/sparc/utility.cc b/src/arch/sparc/utility.cc
index 34d4f79b3..8f997aabf 100644
--- a/src/arch/sparc/utility.cc
+++ b/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"
 
diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index e3d4f5066..6ba62eb9c 100644
--- a/src/arch/sparc/vtophys.cc
+++ b/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"
diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc
index 4382a3d6b..4f279c87b 100644
--- a/src/arch/x86/bios/acpi.cc
+++ b/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"
diff --git a/src/arch/x86/bios/e820.cc b/src/arch/x86/bios/e820.cc
index c966916f5..a1daf0a04 100644
--- a/src/arch/x86/bios/e820.cc
+++ b/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"
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 98b3a6f08..8d0a9be7d 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/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"
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 9072664bf..26785f5a8 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/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"
diff --git a/src/arch/x86/cpuid.cc b/src/arch/x86/cpuid.cc
index f1424cce4..c78b72030 100644
--- a/src/arch/x86/cpuid.cc
+++ b/src/arch/x86/cpuid.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/cpuid.hh"
+
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
 
diff --git a/src/arch/x86/decoder.cc b/src/arch/x86/decoder.cc
index 38394875d..324eb0219 100644
--- a/src/arch/x86/decoder.cc
+++ b/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"
diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc
index 49df32eca..8abfb6398 100644
--- a/src/arch/x86/emulenv.cc
+++ b/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;
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 7724c0217..4198bcc7c 100644
--- a/src/arch/x86/faults.cc
+++ b/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"
diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index 96125f175..21af1281b 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/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
diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc
index 000cbf635..52004d9ba 100644
--- a/src/arch/x86/insts/microfpop.cc
+++ b/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
diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc
index ea38ebfe1..e99e0b9f8 100644
--- a/src/arch/x86/insts/microldstop.cc
+++ b/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,
diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc
index fa4d3a473..dc524dafe 100644
--- a/src/arch/x86/insts/micromediaop.cc
+++ b/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
diff --git a/src/arch/x86/insts/microop.cc b/src/arch/x86/insts/microop.cc
index 35ee9efaa..923fb15b0 100644
--- a/src/arch/x86/insts/microop.cc
+++ b/src/arch/x86/insts/microop.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/insts/microop.hh"
+
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index b49cda376..5bc6e2fd8 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/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"
diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc
index 709e0a610..ff425f6bf 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/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"
 
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 10387c07a..b869a929e 100644
--- a/src/arch/x86/interrupts.cc
+++ b/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)
diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc
index ad7248841..eaedfbee3 100644
--- a/src/arch/x86/isa.cc
+++ b/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"
diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 8eb064ae4..88bb20483 100644
--- a/src/arch/x86/linux/process.cc
+++ b/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"
diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index f473af40e..fc5bc2d25 100644
--- a/src/arch/x86/linux/system.cc
+++ b/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"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index d8b3564a3..d7472ef1f 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/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"
diff --git a/src/arch/x86/pagetable.cc b/src/arch/x86/pagetable.cc
index 4e8c39eb9..a1bcee0b3 100644
--- a/src/arch/x86/pagetable.cc
+++ b/src/arch/x86/pagetable.cc
@@ -37,9 +37,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/pagetable.hh"
+
 #include <cmath>
+
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/pagetable.hh"
 #include "sim/serialize.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc
index 5545bfa64..998ea856a 100644
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -49,10 +49,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/pagetable_walker.hh"
+
 #include <memory>
 
 #include "arch/x86/pagetable.hh"
-#include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/tlb.hh"
 #include "arch/x86/vtophys.hh"
 #include "base/bitfield.hh"
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 4b71357b0..3a347e509 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -42,10 +42,11 @@
  *          Ali Saidi
  */
 
+#include "arch/x86/process.hh"
+
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/process.hh"
 #include "arch/x86/system.hh"
 #include "arch/x86/types.hh"
 #include "base/loader/elf_object.hh"
diff --git a/src/arch/x86/pseudo_inst.cc b/src/arch/x86/pseudo_inst.cc
index f243df73a..edba0474a 100644
--- a/src/arch/x86/pseudo_inst.cc
+++ b/src/arch/x86/pseudo_inst.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/pseudo_inst.hh"
+
 #include "arch/x86/system.hh"
 #include "debug/PseudoInst.hh"
 #include "sim/process.hh"
diff --git a/src/arch/x86/remote_gdb.cc b/src/arch/x86/remote_gdb.cc
index 99800385a..4a9140e64 100644
--- a/src/arch/x86/remote_gdb.cc
+++ b/src/arch/x86/remote_gdb.cc
@@ -40,17 +40,18 @@
  *          Boris Shingarov
  */
 
+#include "arch/x86/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
 #include <string>
 
-#include "arch/x86/regs/int.hh"
-#include "arch/x86/regs/misc.hh"
+#include "arch/vtophys.hh"
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/process.hh"
-#include "arch/x86/remote_gdb.hh"
-#include "arch/vtophys.hh"
+#include "arch/x86/regs/int.hh"
+#include "arch/x86/regs/misc.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/stacktrace.cc b/src/arch/x86/stacktrace.cc
index d887ac293..ca2a691b4 100644
--- a/src/arch/x86/stacktrace.cc
+++ b/src/arch/x86/stacktrace.cc
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/x86/stacktrace.hh"
+
 #include <string>
 
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/stacktrace.hh"
 #include "arch/x86/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index d8ea274a6..25a1bd0df 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -37,15 +37,16 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/system.hh"
+
+#include "arch/vtophys.hh"
 #include "arch/x86/bios/intelmp.hh"
 #include "arch/x86/bios/smbios.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/system.hh"
-#include "arch/vtophys.hh"
+#include "arch/x86/regs/misc.hh"
+#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
-#include "base/intmath.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 0e0878669..2e24b20e5 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -37,17 +37,18 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/tlb.hh"
+
 #include <cstring>
 #include <memory>
 
 #include "arch/generic/mmapped_ipr.hh"
-#include "arch/x86/insts/microldstop.hh"
-#include "arch/x86/regs/misc.hh"
-#include "arch/x86/regs/msr.hh"
 #include "arch/x86/faults.hh"
+#include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/pagetable_walker.hh"
-#include "arch/x86/tlb.hh"
+#include "arch/x86/regs/misc.hh"
+#include "arch/x86/regs/msr.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/types.cc b/src/arch/x86/types.cc
index 59f8b91de..6d7306049 100644
--- a/src/arch/x86/types.cc
+++ b/src/arch/x86/types.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/types.hh"
+
 #include "sim/serialize.hh"
 
 using namespace X86ISA;
diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index eb0247d7f..ae0a833e6 100644
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -38,10 +38,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/utility.hh"
+
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/registers.hh"
 #include "arch/x86/tlb.hh"
-#include "arch/x86/utility.hh"
 #include "arch/x86/x86_traits.hh"
 #include "cpu/base.hh"
 #include "fputils/fp80.h"
diff --git a/src/arch/x86/vtophys.cc b/src/arch/x86/vtophys.cc
index 4bbeb7119..9b76d89a5 100644
--- a/src/arch/x86/vtophys.cc
+++ b/src/arch/x86/vtophys.cc
@@ -37,11 +37,12 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/vtophys.hh"
+
 #include <string>
 
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/tlb.hh"
-#include "arch/x86/vtophys.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/VtoPhys.hh"