22 files changed, 39 insertions, 21 deletions
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"