9 files changed, 8 insertions, 15 deletions
diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index ff6de8d03..3264fc8b2 100644
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -35,6 +35,7 @@
 #include "cpu/thread_context.hh"
 #include "cpu/base.hh"
 #include "base/trace.hh"
+
 #if !FULL_SYSTEM
 #include "sim/process.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index a653d7845..0e3c4ea37 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -32,11 +32,9 @@
 #include "arch/alpha/linux/linux.hh"
 #include "arch/alpha/linux/process.hh"
 #include "arch/alpha/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 
diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index 815784388..68ee86455 100644
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -32,13 +32,14 @@
  */
 
 #include "arch/mips/faults.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
 #include "arch/mips/pra_constants.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
+
 #if !FULL_SYSTEM
-#include "sim/process.hh"
 #include "mem/page_table.hh"
+#include "sim/process.hh"
 #endif
 
 namespace MipsISA
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index 4c3581ecb..f3cac84e8 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -33,11 +33,9 @@
 #include "arch/mips/linux/linux.hh"
 #include "arch/mips/linux/process.hh"
 #include "arch/mips/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/system.hh"
 #include "sim/syscall_emul.hh"
diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 8cf94df98..21777e440 100644
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -42,7 +42,6 @@
 #include "base/trace.hh"
 #include "mem/request.hh"
 
-
 namespace MipsISA
 {
 
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 7f1e94709..fa3e3bff9 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,14 +32,11 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
-
 #include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
-
 #include "mem/page_table.hh"
-
 #include "sim/process.hh"
 #include "sim/process_impl.hh"
 #include "sim/system.hh"
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index cf1230745..e104b0bd2 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -47,7 +47,6 @@
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
 
-
 using namespace std;
 using namespace MipsISA;
 
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index a0ff69391..aa47b83c0 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -50,7 +50,6 @@
 #include "params/PowerTLB.hh"
 #include "sim/process.hh"
 
-
 using namespace std;
 using namespace PowerISA;
 
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index 56ac4e946..6aee87449 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -37,10 +37,11 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
-#include <string>
 
 namespace X86ISA
 {