12 files changed, 24 insertions, 13 deletions

diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc
index 5cf01f230..510109d8a 100644
--- a/src/cpu/o3/base_dyn_inst.cc
+++ b/src/cpu/o3/base_dyn_inst.cc
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<O3CPUImpl>;
diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc
index be685d7c2..970af5300 100644
--- a/src/cpu/o3/checker.cc
+++ b/src/cpu/o3/checker.cc
@@ -40,8 +40,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/checker/cpu_impl.hh"
 #include "cpu/o3/checker.hh"
+
+#include "cpu/checker/cpu_impl.hh"
 #include "params/O3Checker.hh"
 
 class MemObject;
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 9bda09bf8..d85895030 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -44,14 +44,15 @@
  *          Rick Strong
  */
 
+#include "cpu/o3/cpu.hh"
+
 #include "arch/kernel_stats.hh"
 #include "config/the_isa.hh"
+#include "cpu/activity.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/checker/thread_context.hh"
-#include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/thread_context.hh"
-#include "cpu/activity.hh"
 #include "cpu/quiesce_event.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
@@ -69,6 +70,7 @@
 #if THE_ISA == ALPHA_ISA
 #include "arch/alpha/osfpal.hh"
 #include "debug/Activity.hh"
+
 #endif
 
 struct BaseCPUParams;
diff --git a/src/cpu/o3/deriv.cc b/src/cpu/o3/deriv.cc
index 9f41b989f..6b2af76e0 100644
--- a/src/cpu/o3/deriv.cc
+++ b/src/cpu/o3/deriv.cc
@@ -28,9 +28,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/deriv.hh"
+
 #include <string>
 
-#include "cpu/o3/deriv.hh"
 #include "params/DerivO3CPU.hh"
 
 DerivO3CPU *
diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc
index a9544587e..d4b3a2fd3 100644
--- a/src/cpu/o3/free_list.cc
+++ b/src/cpu/o3/free_list.cc
@@ -29,10 +29,11 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/free_list.hh"
+
 #include "arch/registers.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/o3/free_list.hh"
 #include "debug/FreeList.hh"
 
 UnifiedFreeList::UnifiedFreeList(const std::string &_my_name,
diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc
index b99eeab69..414066e40 100644
--- a/src/cpu/o3/fu_pool.cc
+++ b/src/cpu/o3/fu_pool.cc
@@ -40,9 +40,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/fu_pool.hh"
+
 #include <sstream>
 
-#include "cpu/o3/fu_pool.hh"
 #include "cpu/func_unit.hh"
 
 using namespace std;
diff --git a/src/cpu/o3/probe/simple_trace.cc b/src/cpu/o3/probe/simple_trace.cc
index 35d1365cb..060b4df13 100644
--- a/src/cpu/o3/probe/simple_trace.cc
+++ b/src/cpu/o3/probe/simple_trace.cc
@@ -37,8 +37,9 @@
  * Authors: Matt Horsnell
  */
 
-#include "base/trace.hh"
 #include "cpu/o3/probe/simple_trace.hh"
+
+#include "base/trace.hh"
 #include "debug/SimpleTrace.hh"
 
 void SimpleTrace::traceCommit(const O3CPUImpl::DynInstPtr &dynInst)
diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc
index 96ce44bdd..e1d84c683 100644
--- a/src/cpu/o3/regfile.cc
+++ b/src/cpu/o3/regfile.cc
@@ -31,9 +31,9 @@
  *          Steve Reinhardt
  */
 
-#include "cpu/o3/free_list.hh"
 #include "cpu/o3/regfile.hh"
 
+#include "cpu/o3/free_list.hh"
 
 PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs,
                          unsigned _numPhysicalFloatRegs,
diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc
index b0232df20..18c20cf8c 100644
--- a/src/cpu/o3/rename_map.cc
+++ b/src/cpu/o3/rename_map.cc
@@ -29,9 +29,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/rename_map.hh"
+
 #include <vector>
 
-#include "cpu/o3/rename_map.hh"
 #include "debug/Rename.hh"
 
 using namespace std;
diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc
index 11b2858da..2b2b091af 100644
--- a/src/cpu/o3/scoreboard.cc
+++ b/src/cpu/o3/scoreboard.cc
@@ -30,8 +30,9 @@
  *          Kevin Lim
  */
 
-#include "config/the_isa.hh"
 #include "cpu/o3/scoreboard.hh"
+
+#include "config/the_isa.hh"
 #include "debug/Scoreboard.hh"
 
 Scoreboard::Scoreboard(const std::string &_my_name,
diff --git a/src/cpu/o3/store_set.cc b/src/cpu/o3/store_set.cc
index acd4a8d0a..9c21fbff3 100644
--- a/src/cpu/o3/store_set.cc
+++ b/src/cpu/o3/store_set.cc
@@ -28,10 +28,11 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/store_set.hh"
+
 #include "base/intmath.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "cpu/o3/store_set.hh"
 #include "debug/StoreSet.hh"
 
 StoreSet::StoreSet(uint64_t clear_period, int _SSIT_size, int _LFST_size)
diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc
index 7ca716dd1..672491193 100755
--- a/src/cpu/o3/thread_context.cc
+++ b/src/cpu/o3/thread_context.cc
@@ -28,8 +28,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context.hh"
+
+#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context_impl.hh"
 
 template class O3ThreadContext<O3CPUImpl>;