diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/faults.cc
--- a/src/arch/alpha/faults.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/faults.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,13 +32,13 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/tlb.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
 
 #if !FULL_SYSTEM
+#include "mem/page_table.hh"
 #include "sim/process.hh"
-#include "mem/page_table.hh"
 #endif
 
 namespace AlphaISA {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/isa.hh
--- a/src/arch/alpha/isa.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/isa.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,9 @@
 #ifndef __ARCH_ALPHA_ISA_HH__
 #define __ARCH_ALPHA_ISA_HH__
 
-#include <string.h>
-
+#include <cstring>
+#include <iostream>
 #include <string>
-#include <iostream>
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/isa/main.isa
--- a/src/arch/alpha/isa/main.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/isa/main.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -41,16 +41,16 @@
 //
 
 output header {{
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <iostream>
-#include <iomanip>
 
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/types.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/static_inst.hh"
+#include "mem/packet.hh"
 #include "mem/request.hh"  // some constructors use MemReq flags
-#include "mem/packet.hh"
 }};
 
 output decoder {{
@@ -58,9 +58,9 @@
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
 #include "base/fenv.hh"
-#include "base/loader/symtab.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -71,16 +71,16 @@
 output exec {{
 #include <math.h>
 
+#include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
 #include "base/cp_annotate.hh"
-#include "sim/pseudo_inst.hh"
-#include "arch/alpha/registers.hh"
 #include "base/fenv.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/pseudo_inst.hh"
 #include "sim/sim_exit.hh"
 
 using namespace AlphaISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/linux/system.cc
--- a/src/arch/alpha/linux/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/linux/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,17 +40,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/linux/system.hh"
 #include "arch/alpha/linux/threadinfo.hh"
+#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/system.hh"
+#include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "dev/platform.hh"
+#include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
-#include "kern/linux/events.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/arguments.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/mt.hh
--- a/src/arch/alpha/mt.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/mt.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,12 +38,12 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/isa_traits.hh"
 #include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "base/trace.hh"
-#include "base/misc.hh"
-
-#include <iostream>
 using namespace std;
 
 namespace AlphaISA
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/process.cc
--- a/src/arch/alpha/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/process.hh"
+#include "base/loader/elf_object.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"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/remote_gdb.hh
--- a/src/arch/alpha/remote_gdb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/remote_gdb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,12 +33,12 @@
 
 #include <map>
 
+#include "arch/alpha/kgdb.h"
 #include "arch/alpha/types.hh"
-#include "arch/alpha/kgdb.h"
+#include "base/pollevent.hh"
 #include "base/remote_gdb.hh"
+#include "base/socket.hh"
 #include "cpu/pc_event.hh"
-#include "base/pollevent.hh"
-#include "base/socket.hh"
 
 class System;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/remote_gdb.cc
--- a/src/arch/alpha/remote_gdb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/remote_gdb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -127,15 +127,15 @@
 #endif
 
 #include "arch/alpha/kgdb.h"
-#include "arch/alpha/utility.hh"
 #include "arch/alpha/regredir.hh"
 #include "arch/alpha/remote_gdb.hh"
+#include "arch/alpha/utility.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/tlb.cc
--- a/src/arch/alpha/tlb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/tlb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,9 @@
 #include <string>
 #include <vector>
 
+#include "arch/alpha/faults.hh"
 #include "arch/alpha/pagetable.hh"
 #include "arch/alpha/tlb.hh"
-#include "arch/alpha/faults.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/tru64/process.cc
--- a/src/arch/alpha/tru64/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/tru64/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  *          Ali Saidi
  */
 
+#include "arch/alpha/tru64/process.hh"
 #include "arch/alpha/tru64/tru64.hh"
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/tru64/process.hh"
 #include "cpu/thread_context.hh"
 #include "kern/tru64/tru64.hh"
 #include "sim/byteswap.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/types.hh
--- a/src/arch/alpha/types.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/types.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #ifndef __ARCH_ALPHA_TYPES_HH__
 #define __ARCH_ALPHA_TYPES_HH__
 
+#include "arch/generic/types.hh"
 #include "base/types.hh"
-#include "arch/generic/types.hh"
 
 namespace AlphaISA {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/alpha/utility.hh
--- a/src/arch/alpha/utility.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/alpha/utility.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,9 +32,9 @@
 #ifndef __ARCH_ALPHA_UTILITY_HH__
 #define __ARCH_ALPHA_UTILITY_HH__
 
-#include "arch/alpha/types.hh"
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/registers.hh"
+#include "arch/alpha/types.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/faults.hh
--- a/src/arch/arm/faults.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/faults.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -47,9 +47,9 @@
 
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/types.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "sim/faults.hh"
-#include "base/misc.hh"
 
 // The design of the "name" and "vect" functions is in sim/faults.hh
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/faults.cc
--- a/src/arch/arm/faults.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/faults.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -43,9 +43,9 @@
  */
 
 #include "arch/arm/faults.hh"
+#include "base/trace.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "base/trace.hh"
 
 namespace ArmISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/insts/static_inst.cc
--- a/src/arch/arm/insts/static_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/insts/static_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,11 +40,11 @@
  * Authors: Stephen Hines
  */
 
+#include "arch/arm/insts/static_inst.hh"
 #include "arch/arm/faults.hh"
-#include "arch/arm/insts/static_inst.hh"
+#include "base/loader/symtab.hh"
 #include "base/condcodes.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 
 namespace ArmISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/insts/vfp.hh
--- a/src/arch/arm/insts/vfp.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/insts/vfp.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,10 +40,12 @@
 #ifndef __ARCH_ARM_INSTS_VFP_HH__
 #define __ARCH_ARM_INSTS_VFP_HH__
 
+#include <fenv.h>
+
+#include <cmath>
+
 #include "arch/arm/insts/misc.hh"
 #include "arch/arm/miscregs.hh"
-#include <fenv.h>
-#include <cmath>
 
 namespace ArmISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/intregs.hh
--- a/src/arch/arm/intregs.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/intregs.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,7 +40,7 @@
  * Authors: Gabe Black
  */
 
-#include <assert.h>
+#include <cassert>
 
 #ifndef __ARCH_ARM_INTREGS_HH__
 #define __ARCH_ARM_INTREGS_HH__
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/isa/includes.isa
--- a/src/arch/arm/isa/includes.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -46,8 +46,8 @@
 //
 
 output header {{
+#include <iostream>
 #include <sstream>
-#include <iostream>
 
 #include "arch/arm/insts/branch.hh"
 #include "arch/arm/insts/macromem.hh"
@@ -67,21 +67,21 @@
 #include "arch/arm/intregs.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
 
 using namespace ArmISA;
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/arm/faults.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/condcodes.hh"
 #include "sim/pseudo_inst.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/linux/atag.hh
--- a/src/arch/arm/linux/atag.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/linux/atag.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,6 +42,7 @@
 
 #include <cstring>
 #include <string>
+
 #include "base/types.hh"
 
 enum {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/linux/linux.cc
--- a/src/arch/arm/linux/linux.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/linux/linux.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,10 +29,10 @@
  * Authors: Stephen Hines
  */
 
+#include <fcntl.h>
+
 #include "arch/arm/linux/linux.hh"
 
-#include <fcntl.h>
-
 // open(2) flags translation table
 OpenFlagTransTable ArmLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/linux/process.hh
--- a/src/arch/arm/linux/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/linux/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,7 +33,6 @@
 
 #include "arch/arm/process.hh"
 
-
 /// A process with emulated Arm/Linux syscalls.
 class ArmLinuxProcess : public ArmLiveProcess
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/linux/process.cc
--- a/src/arch/arm/linux/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/linux/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -46,11 +46,9 @@
 #include "arch/arm/linux/linux.hh"
 #include "arch/arm/linux/process.hh"
 #include "arch/arm/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"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/linux/system.cc
--- a/src/arch/arm/linux/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/linux/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/isa_traits.hh"
 #include "arch/arm/linux/atag.hh"
 #include "arch/arm/linux/system.hh"
+#include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/locked_mem.hh
--- a/src/arch/arm/locked_mem.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/locked_mem.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -41,7 +41,6 @@
 
 #include "mem/request.hh"
 
-
 namespace ArmISA
 {
 template <class XC>
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/pagetable.hh
--- a/src/arch/arm/pagetable.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/pagetable.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -47,7 +47,6 @@
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "config/full_system.hh"
-
 #include "sim/serialize.hh"
 
 namespace ArmISA {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/predecoder.hh
--- a/src/arch/arm/predecoder.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/predecoder.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -45,8 +45,8 @@
 #ifndef __ARCH_ARM_PREDECODER_HH__
 #define __ARCH_ARM_PREDECODER_HH__
 
+#include "arch/arm/miscregs.hh"
 #include "arch/arm/types.hh"
-#include "arch/arm/miscregs.hh"
 #include "base/types.hh"
 
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/process.hh
--- a/src/arch/arm/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+
 #include "base/loader/object_file.hh"
 #include "sim/process.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/registers.hh
--- a/src/arch/arm/registers.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/registers.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -43,8 +43,8 @@
 #ifndef __ARCH_ARM_REGISTERS_HH__
 #define __ARCH_ARM_REGISTERS_HH__
 
+#include "arch/arm/intregs.hh"
 #include "arch/arm/max_inst_regs.hh"
-#include "arch/arm/intregs.hh"
 #include "arch/arm/miscregs.hh"
 
 namespace ArmISA {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/remote_gdb.cc
--- a/src/arch/arm/remote_gdb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/remote_gdb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -139,22 +139,22 @@
 #include "arch/arm/vtophys.hh"
 #endif
 
+#include "arch/arm/pagetable.hh"
+#include "arch/arm/registers.hh"
+#include "arch/arm/remote_gdb.hh"
 #include "arch/arm/utility.hh"
-#include "arch/arm/remote_gdb.hh"
-#include "arch/arm/registers.hh"
 #include "arch/arm/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/thread_state.hh"
-#include "cpu/static_inst.hh"
+#include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"
-#include "arch/arm/pagetable.hh"
-#include "mem/page_table.hh"
 
 using namespace std;
 using namespace ArmISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/system.hh
--- a/src/arch/arm/system.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/system.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -46,10 +46,10 @@
 #include <string>
 #include <vector>
 
+#include "kern/linux/events.hh"
 #include "params/ArmSystem.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
-#include "kern/linux/events.hh"
 
 class ArmSystem : public System
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/system.cc
--- a/src/arch/arm/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,9 @@
  * Authors: Ali Saidi
  */
 
+#include <iostream>
+
 #include "arch/arm/system.hh"
-#include <iostream>
 
 using namespace std;
 using namespace Linux;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/table_walker.hh
--- a/src/arch/arm/table_walker.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/table_walker.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -46,7 +46,6 @@
 #include "arch/arm/tlb.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
-#include "mem/request.hh"
 #include "params/ArmTableWalker.hh"
 #include "sim/eventq.hh"
 #include "sim/fault.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/table_walker.cc
--- a/src/arch/arm/table_walker.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/table_walker.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #include "arch/arm/faults.hh"
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"
-#include "dev/io_device.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "dev/io_device.hh"
 #include "sim/system.hh"
 
 using namespace ArmISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/tlb.hh
--- a/src/arch/arm/tlb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/tlb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -46,9 +46,9 @@
 #include <map>
 
 #include "arch/arm/isa_traits.hh"
+#include "arch/arm/pagetable.hh"
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
-#include "arch/arm/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/ArmTLB.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/arm/vtophys.hh
--- a/src/arch/arm/vtophys.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/arm/vtophys.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,7 +37,6 @@
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/generic/types.hh
--- a/src/arch/generic/types.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/generic/types.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 
 #include <iostream>
 
+#include "base/trace.hh"
 #include "base/types.hh"
-#include "base/trace.hh"
 #include "sim/serialize.hh"
 
 namespace GenericISA
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/dsp.hh
--- a/src/arch/mips/dsp.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/dsp.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_DSP_HH__
 #define __ARCH_MIPS_DSP_HH__
 
+#include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
-#include "arch/mips/isa_traits.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/dsp.cc
--- a/src/arch/mips/dsp.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/dsp.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,13 +28,13 @@
  * Authors: Brett Miller
  */
 
+#include "arch/mips/dsp.hh"
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/dsp.hh"
+#include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
 #include "sim/serialize.hh"
-#include "base/bitfield.hh"
-#include "base/misc.hh"
 
 using namespace MipsISA;
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/isa.hh
--- a/src/arch/mips/isa.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/isa.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_ISA_HH__
 #define __ARCH_MIPS_ISA_HH__
 
+#include <queue>
 #include <string>
-#include <queue>
 #include <vector>
 
 #include "arch/mips/registers.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/isa.cc
--- a/src/arch/mips/isa.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/isa.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 #include "arch/mips/isa.hh"
+#include "arch/mips/mt.hh"
 #include "arch/mips/mt_constants.hh"
-#include "arch/mips/mt.hh"
 #include "arch/mips/pra_constants.hh"
 #include "base/bitfield.hh"
 #include "cpu/base.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/isa/includes.isa
--- a/src/arch/mips/isa/includes.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 //
 
 output header {{
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <iostream>
-#include <iomanip>
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
@@ -45,20 +45,19 @@
 }};
 
 output decoder {{
-#include "arch/mips/isa_traits.hh"
-#include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
-#include "arch/mips/mt_constants.hh"
 #include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
+#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-
-#include <math.h>
 #if defined(linux)
 #include <fenv.h>
 #endif
@@ -67,29 +66,27 @@
 }};
 
 output exec {{
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/mt.hh"
+#include "arch/mips/mt_constants.hh"
+#include "arch/mips/pra_constants.hh"
 #include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
-#include "arch/mips/mt.hh"
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
-#include "arch/mips/mt_constants.hh"
-
-#include <math.h>
 #if defined(linux)
 #include <fenv.h>
 #endif
 
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
-
-#include "sim/sim_exit.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
 
 using namespace MipsISA;
 }};
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/isa_traits.hh
--- a/src/arch/mips/isa_traits.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/isa_traits.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #ifndef __ARCH_MIPS_ISA_TRAITS_HH__
 #define __ARCH_MIPS_ISA_TRAITS_HH__
 
+#include "arch/mips/mips_core_specific.hh"
 #include "arch/mips/types.hh"
-#include "arch/mips/mips_core_specific.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/linux/linux.cc
--- a/src/arch/mips/linux/linux.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/linux/linux.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,10 @@
  * Authors: Korey Sewell
  */
 
+#include <fcntl.h>
+
 #include "arch/mips/linux/linux.hh"
 
-#include <fcntl.h>
-
 // open(2) flags translation table
 OpenFlagTransTable MipsLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/linux/process.hh
--- a/src/arch/mips/linux/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/linux/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #ifndef __MIPS_LINUX_PROCESS_HH__
 #define __MIPS_LINUX_PROCESS_HH__
 
+#include "arch/mips/linux/linux.hh"
 #include "arch/mips/process.hh"
-#include "arch/mips/linux/linux.hh"
 #include "sim/eventq.hh"
 
 /// A process with emulated Mips/Linux syscalls.
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/linux/process.cc
--- a/src/arch/mips/linux/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/linux/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,10 +36,10 @@
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
+#include "sim/eventq.hh"
 #include "sim/process.hh"
+#include "sim/syscall_emul.hh"
 #include "sim/system.hh"
-#include "sim/syscall_emul.hh"
-#include "sim/eventq.hh"
 
 using namespace std;
 using namespace MipsISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/linux/system.cc
--- a/src/arch/mips/linux/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/linux/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,17 +39,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/mips/idle_event.hh"
 #include "arch/mips/linux/system.hh"
 #include "arch/mips/linux/threadinfo.hh"
+#include "arch/mips/idle_event.hh"
 #include "arch/mips/system.hh"
+#include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "dev/platform.hh"
+#include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
-#include "kern/linux/events.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/arguments.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/mt.hh
--- a/src/arch/mips/mt.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/mt.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,16 +37,16 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
 #include "arch/mips/registers.hh"
 #include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "base/trace.hh"
-#include "base/misc.hh"
-
-#include <iostream>
 
 namespace MipsISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/process.hh
--- a/src/arch/mips/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/process.cc
--- a/src/arch/mips/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
+#include "base/loader/elf_object.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"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/system.hh
--- a/src/arch/mips/system.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/system.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,13 +37,13 @@
 #include <string>
 #include <vector>
 
-#include "sim/system.hh"
+#include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
-#include "base/loader/hex_file.hh"
 #include "cpu/pc_event.hh"
 #include "kern/system_events.hh"
 #include "params/MipsSystem.hh"
 #include "sim/sim_object.hh"
+#include "sim/system.hh"
 
 class MipsSystem : public System
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/system.cc
--- a/src/arch/mips/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,15 +33,14 @@
 
 #include "arch/mips/system.hh"
 #include "arch/vtophys.hh"
+#include "base/loader/hex_file.hh"
 #include "base/loader/object_file.hh"
-#include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "mem/physical.hh"
 #include "params/MipsSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 
 MipsSystem::MipsSystem(Params *p) : System(p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/tlb.hh
--- a/src/arch/mips/tlb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/tlb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,15 +38,15 @@
 #include <map>
 
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/pagetable.hh"
 #include "arch/mips/utility.hh"
 #include "arch/mips/vtophys.hh"
-#include "arch/mips/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/MipsTLB.hh"
 #include "sim/fault.hh"
+#include "sim/sim_object.hh"
 #include "sim/tlb.hh"
-#include "sim/sim_object.hh"
 
 class ThreadContext;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/tlb.cc
--- a/src/arch/mips/tlb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/tlb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,18 +34,18 @@
 #include <string>
 #include <vector>
 
+#include "arch/mips/faults.hh"
+#include "arch/mips/pagetable.hh"
 #include "arch/mips/pra_constants.hh"
-#include "arch/mips/pagetable.hh"
 #include "arch/mips/tlb.hh"
-#include "arch/mips/faults.hh"
 #include "arch/mips/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "sim/process.hh"
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
+#include "sim/process.hh"
 
 using namespace std;
 using namespace MipsISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/utility.hh
--- a/src/arch/mips/utility.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/utility.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,8 @@
 
 #ifndef __ARCH_MIPS_UTILITY_HH__
 #define __ARCH_MIPS_UTILITY_HH__
-#include "config/full_system.hh"
+#include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
-#include "arch/mips/isa_traits.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/utility.cc
--- a/src/arch/mips/utility.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/utility.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,12 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
-#include "config/full_system.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
-#include "sim/serialize.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
+#include "config/full_system.hh"
+#include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
+#include "sim/serialize.hh"
 
 #if FULL_SYSTEM
 #include "arch/mips/registers.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/mips/vtophys.hh
--- a/src/arch/mips/vtophys.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/mips/vtophys.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,7 +37,6 @@
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/insts/floating.hh
--- a/src/arch/power/insts/floating.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/insts/floating.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 #define __ARCH_POWER_INSTS_FLOATING_HH__
 
 #include "arch/power/insts/static_inst.hh"
+#include "base/bitfield.hh"
 #include "base/cprintf.hh"
-#include "base/bitfield.hh"
 
 namespace PowerISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/insts/integer.hh
--- a/src/arch/power/insts/integer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/insts/integer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #define __ARCH_POWER_INSTS_INTEGER_HH__
 
 #include "arch/power/insts/static_inst.hh"
+#include "base/bitfield.hh"
 #include "base/cprintf.hh"
-#include "base/bitfield.hh"
 
 namespace PowerISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/isa/includes.isa
--- a/src/arch/power/isa/includes.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -34,15 +34,15 @@
 //
 
 output header {{
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <iostream>
-#include <iomanip>
 
 #include "arch/power/insts/branch.hh"
+#include "arch/power/insts/condition.hh"
+#include "arch/power/insts/floating.hh"
+#include "arch/power/insts/integer.hh"
 #include "arch/power/insts/mem.hh"
-#include "arch/power/insts/integer.hh"
-#include "arch/power/insts/floating.hh"
-#include "arch/power/insts/condition.hh"
 #include "arch/power/insts/misc.hh"
 #include "arch/power/insts/static_inst.hh"
 #include "arch/power/isa_traits.hh"
@@ -61,8 +61,8 @@
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
 
 using namespace PowerISA;
@@ -70,11 +70,11 @@
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/linux/linux.cc
--- a/src/arch/power/linux/linux.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/linux/linux.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,10 +29,10 @@
  * Authors: Timothy M. Jones
  */
 
+#include <fcntl.h>
+
 #include "arch/power/linux/linux.hh"
 
-#include <fcntl.h>
-
 // open(2) flags translation table
 OpenFlagTransTable PowerLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/linux/process.hh
--- a/src/arch/power/linux/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/linux/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,7 +35,6 @@
 
 #include "arch/power/process.hh"
 
-
 /// A process with emulated PPC/Linux syscalls.
 class PowerLinuxProcess : public PowerLiveProcess
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/linux/process.cc
--- a/src/arch/power/linux/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/linux/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -35,11 +35,9 @@
 #include "arch/power/linux/linux.hh"
 #include "arch/power/linux/process.hh"
 #include "arch/power/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"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/process.hh
--- a/src/arch/power/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,6 +35,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/tlb.hh
--- a/src/arch/power/tlb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/tlb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #include <map>
 
 #include "arch/power/isa_traits.hh"
+#include "arch/power/pagetable.hh"
 #include "arch/power/utility.hh"
 #include "arch/power/vtophys.hh"
-#include "arch/power/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/PowerTLB.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/power/vtophys.hh
--- a/src/arch/power/vtophys.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/power/vtophys.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,7 +39,6 @@
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/isa.hh
--- a/src/arch/sparc/isa.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/isa.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,14 +31,14 @@
 #ifndef __ARCH_SPARC_ISA_HH__
 #define __ARCH_SPARC_ISA_HH__
 
+#include <ostream>
+#include <string>
+
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
 #include "config/full_system.hh"
 #include "cpu/cpuevent.hh"
 
-#include <string>
-#include <ostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/isa/includes.isa
--- a/src/arch/sparc/isa/includes.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 
 output header {{
 #include <cstring>
+#include <iostream>
 #include <sstream>
-#include <iostream>
 
 #include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
@@ -49,14 +49,14 @@
 }};
 
 output decoder {{
+#include <algorithm>
+
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
+#include "base/fenv.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
 
-#include "base/fenv.hh"
-#include <algorithm>
-
 using namespace SparcISA;
 }};
 
@@ -67,16 +67,16 @@
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
 #include "arch/sparc/asi.hh"
 #include "base/bigint.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/sim_exit.hh"
 
 using namespace SparcISA;
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/isa_traits.hh
--- a/src/arch/sparc/isa_traits.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/isa_traits.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #ifndef __ARCH_SPARC_ISA_TRAITS_HH__
 #define __ARCH_SPARC_ISA_TRAITS_HH__
 
+#include "arch/sparc/sparc_traits.hh"
 #include "arch/sparc/types.hh"
-#include "arch/sparc/sparc_traits.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/linux/linux.cc
--- a/src/arch/sparc/linux/linux.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/linux/linux.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
+#include <fcntl.h>
+
 #include "arch/sparc/linux/linux.hh"
-#include <fcntl.h>
 
 // open(2) flags translation table
 OpenFlagTransTable SparcLinux::openFlagTable[] = {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/linux/process.cc
--- a/src/arch/sparc/linux/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/linux/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,14 +30,12 @@
  *          Ali Saidi
  */
 
+#include "arch/sparc/linux/process.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/linux/process.hh"
 #include "arch/sparc/registers.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 -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/locked_mem.hh
--- a/src/arch/sparc/locked_mem.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/locked_mem.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,7 +39,6 @@
 
 #include "mem/request.hh"
 
-
 namespace SparcISA
 {
 template <class XC>
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/mmaped_ipr.hh
--- a/src/arch/sparc/mmaped_ipr.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/mmaped_ipr.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,11 +37,10 @@
  * ISA-specific helper functions for memory mapped IPR accesses.
  */
 
+#include "arch/sparc/tlb.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-#include "arch/sparc/tlb.hh"
-
 
 namespace SparcISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/nativetrace.cc
--- a/src/arch/sparc/nativetrace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/nativetrace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 #include "arch/sparc/isa_traits.hh"
+#include "arch/sparc/nativetrace.hh"
 #include "arch/sparc/registers.hh"
-#include "arch/sparc/nativetrace.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"
 #include "sim/byteswap.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/process.hh
--- a/src/arch/sparc/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/byteswap.hh"
 #include "sim/process.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/process.cc
--- a/src/arch/sparc/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,16 +32,16 @@
 #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/process.hh"
 #include "arch/sparc/types.hh"
+#include "base/loader/elf_object.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 "mem/translating_port.hh"
 #include "sim/process_impl.hh"
-#include "mem/translating_port.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/remote_gdb.hh
--- a/src/arch/sparc/remote_gdb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/remote_gdb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 #include <map>
 
 #include "arch/sparc/types.hh"
+#include "base/pollevent.hh"
 #include "base/remote_gdb.hh"
 #include "cpu/pc_event.hh"
-#include "base/pollevent.hh"
 
 class System;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/remote_gdb.cc
--- a/src/arch/sparc/remote_gdb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/remote_gdb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -117,19 +117,19 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <string>
-#include <unistd.h>
 
+#include "arch/sparc/remote_gdb.hh"
 #include "arch/vtophys.hh"
-#include "arch/sparc/remote_gdb.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/solaris/process.cc
--- a/src/arch/sparc/solaris/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/solaris/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,14 +28,12 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/sparc/solaris/process.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/solaris/process.hh"
 #include "arch/sparc/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/solaris/solaris.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/solaris/solaris.cc
--- a/src/arch/sparc/solaris/solaris.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/solaris/solaris.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,10 @@
  * Authors: Ali Saidi
  */
 
+#include <fcntl.h>
+
 #include "arch/sparc/solaris/solaris.hh"
 
-#include <fcntl.h>
-
 // open(2) flags translation table
 OpenFlagTransTable SparcSolaris::openFlagTable[] = {
 #ifdef _MSC_VER
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/system.cc
--- a/src/arch/sparc/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,7 +37,6 @@
 #include "params/SparcSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace BigEndianGuest;
 
 SparcSystem::SparcSystem(Params *p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/tlb.cc
--- a/src/arch/sparc/tlb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/tlb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,8 @@
 #include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/tlb_map.hh
--- a/src/arch/sparc/tlb_map.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/tlb_map.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,9 @@
 #ifndef __ARCH_SPARC_TLB_MAP_HH__
 #define __ARCH_SPARC_TLB_MAP_HH__
 
+#include <map>
+
 #include "arch/sparc/pagetable.hh"
-#include <map>
 
 namespace SparcISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/types.hh
--- a/src/arch/sparc/types.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/types.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 #ifndef __ARCH_SPARC_TYPES_HH__
 #define __ARCH_SPARC_TYPES_HH__
 
+#include "arch/generic/types.hh"
 #include "base/bigint.hh"
 #include "base/types.hh"
-#include "arch/generic/types.hh"
 
 namespace SparcISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/utility.hh
--- a/src/arch/sparc/utility.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/utility.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/tlb.hh"
+#include "base/bitfield.hh"
 #include "base/misc.hh"
-#include "base/bitfield.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "sim/fault.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/sparc/vtophys.cc
--- a/src/arch/sparc/vtophys.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/sparc/vtophys.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,10 +30,10 @@
 
 #include <string>
 
+#include "arch/sparc/tlb.hh"
 #include "arch/sparc/vtophys.hh"
-#include "arch/sparc/tlb.hh"
+#include "base/chunk_generator.hh"
 #include "base/compiler.hh"
-#include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/vport.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/bios/acpi.cc
--- a/src/arch/x86/bios/acpi.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/bios/acpi.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,15 +39,13 @@
 
 #include "arch/x86/bios/acpi.hh"
 #include "mem/port.hh"
+#include "params/X86ACPIRSDP.hh"
+#include "params/X86ACPIRSDT.hh"
+#include "params/X86ACPISysDescTable.hh"
+#include "params/X86ACPIXSDT.hh"
 #include "sim/byteswap.hh"
 #include "sim/sim_object.hh"
 
-#include "params/X86ACPIRSDP.hh"
-
-#include "params/X86ACPISysDescTable.hh"
-#include "params/X86ACPIRSDT.hh"
-#include "params/X86ACPIXSDT.hh"
-
 using namespace std;
 
 const char X86ISA::ACPI::RSDP::signature[] = "RSD PTR ";
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/bios/intelmp.hh
--- a/src/arch/x86/bios/intelmp.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/bios/intelmp.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -44,13 +44,12 @@
 #include <vector>
 
 #include "base/bitfield.hh"
-#include "sim/sim_object.hh"
-
 #include "enums/X86IntelMPAddressType.hh"
 #include "enums/X86IntelMPInterruptType.hh"
 #include "enums/X86IntelMPPolarity.hh"
 #include "enums/X86IntelMPRangeList.hh"
 #include "enums/X86IntelMPTriggerMode.hh"
+#include "sim/sim_object.hh"
 
 class FunctionalPort;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/emulenv.hh
--- a/src/arch/x86/emulenv.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/emulenv.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_EMULENV_HH__
 #define __ARCH_X86_EMULENV_HH__
 
-#include "arch/x86/registers.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
 
 namespace X86ISA
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/faults.hh
--- a/src/arch/x86/faults.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/faults.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_FAULTS_HH__
 #define __ARCH_X86_FAULTS_HH__
 
+#include <string>
+
 #include "base/bitunion.hh"
 #include "base/misc.hh"
 #include "sim/faults.hh"
 #include "sim/tlb.hh"
 
-#include <string>
-
 namespace X86ISA
 {
     // Base class for all x86 "faults" where faults is in the m5 sense
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/insts/macroop.hh
--- a/src/arch/x86/insts/macroop.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/insts/macroop.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_INSTS_MACROOP_HH__
 #define __ARCH_X86_INSTS_MACROOP_HH__
 
+#include "arch/x86/insts/static_inst.hh"
 #include "arch/x86/emulenv.hh"
 #include "arch/x86/types.hh"
-#include "arch/x86/insts/static_inst.hh"
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/insts/microfpop.cc
--- a/src/arch/x86/insts/microfpop.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/insts/microfpop.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/insts/microldstop.cc
--- a/src/arch/x86/insts/microldstop.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/insts/microldstop.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,9 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microldstop.hh"
-#include <string>
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/insts/micromediaop.cc
--- a/src/arch/x86/insts/micromediaop.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/insts/micromediaop.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/interrupts.hh
--- a/src/arch/x86/interrupts.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/interrupts.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_INTERRUPTS_HH__
 #define __ARCH_X86_INTERRUPTS_HH__
 
+#include "arch/x86/regs/apic.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/regs/apic.hh"
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
+#include "dev/x86/intdev.hh"
 #include "dev/io_device.hh"
-#include "dev/x86/intdev.hh"
 #include "params/X86LocalApic.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/interrupts.cc
--- a/src/arch/x86/interrupts.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/interrupts.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
+#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 "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/isa.hh
--- a/src/arch/x86/isa.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/isa.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,14 +31,14 @@
 #ifndef __ARCH_X86_ISA_HH__
 #define __ARCH_X86_ISA_HH__
 
-#include "arch/x86/registers.hh"
+#include <iostream>
+#include <string>
+
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/registers.hh"
 #include "base/types.hh"
 
-#include <string>
-#include <iostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/isa/includes.isa
--- a/src/arch/x86/isa/includes.isa	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
@@ -50,16 +50,16 @@
 
 output header {{
 #include <cstring>
+#include <iostream>
 #include <sstream>
-#include <iostream>
 
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/macroop.hh"
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/insts/static_inst.hh"
+#include "arch/x86/emulenv.hh"
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
@@ -72,14 +72,14 @@
 }};
 
 output decoder {{
-#include "arch/x86/faults.hh"
-#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/tlb.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -105,22 +105,22 @@
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/cpuid.hh"
 #include "arch/x86/faults.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "base/bigint.hh"
 #include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/pseudo_inst.hh"
+#include "sim/sim_exit.hh"
 
 using namespace X86ISA;
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/linux.cc
--- a/src/arch/x86/linux/linux.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/linux.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,9 @@
  * Authors: Gabe Black
  */
 
+#include <fcntl.h>
+
 #include "arch/x86/linux/linux.hh"
-#include <fcntl.h>
 
 // open(2) flags translation table
 OpenFlagTransTable X86Linux64::openFlagTable[] = {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/process.hh
--- a/src/arch/x86/linux/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #ifndef __X86_LINUX_PROCESS_HH__
 #define __X86_LINUX_PROCESS_HH__
 
-#include "sim/process.hh"
 #include "arch/x86/linux/linux.hh"
 #include "arch/x86/process.hh"
+#include "sim/process.hh"
 
 namespace X86ISA {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/process.cc
--- a/src/arch/x86/linux/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,14 +37,12 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/linux/process.hh"
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/linux/process.hh"
 #include "arch/x86/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/syscalls.cc
--- a/src/arch/x86/linux/syscalls.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/syscalls.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,8 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/linux/linux.hh"
 #include "arch/x86/linux/process.hh"
-#include "arch/x86/linux/linux.hh"
 #include "arch/x86/regs/misc.hh"
 #include "kern/linux/linux.hh"
 #include "sim/syscall_emul.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/system.hh
--- a/src/arch/x86/linux/system.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/system.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -43,9 +43,9 @@
 #include <string>
 #include <vector>
 
-#include "params/LinuxX86System.hh"
 #include "arch/x86/bios/e820.hh"
 #include "arch/x86/system.hh"
+#include "params/LinuxX86System.hh"
 
 class LinuxX86System : public X86System
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/linux/system.cc
--- a/src/arch/x86/linux/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/linux/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/linux/system.hh"
 #include "arch/x86/regs/int.hh"
+#include "arch/x86/isa_traits.hh"
 #include "arch/vtophys.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
@@ -47,7 +47,6 @@
 #include "params/LinuxX86System.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 using namespace X86ISA;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/nativetrace.cc
--- a/src/arch/x86/nativetrace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/nativetrace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/regs/float.hh"
+#include "arch/x86/regs/int.hh"
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/nativetrace.hh"
-#include "arch/x86/regs/float.hh"
-#include "arch/x86/regs/int.hh"
 #include "cpu/thread_context.hh"
 #include "params/X86NativeTrace.hh"
 #include "sim/byteswap.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/pagetable_walker.cc
--- a/src/arch/x86/pagetable_walker.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/pagetable_walker.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,8 +41,8 @@
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/tlb.hh"
 #include "base/bitfield.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/predecoder.hh
--- a/src/arch/x86/predecoder.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/predecoder.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,8 +42,8 @@
 
 #include <cassert>
 
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/types.hh"
-#include "arch/x86/regs/misc.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/process.hh
--- a/src/arch/x86/process.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/process.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,6 +42,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class SyscallDesc;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/process.cc
--- a/src/arch/x86/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,13 +41,13 @@
  *          Ali Saidi
  */
 
+#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/regs/misc.hh"
-#include "arch/x86/regs/segment.hh"
 #include "arch/x86/types.hh"
+#include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/loader/elf_object.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/registers.hh
--- a/src/arch/x86/registers.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/registers.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_REGISTERS_HH__
 #define __ARCH_X86_REGISTERS_HH__
 
-#include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/x86_traits.hh"
 
 namespace X86ISA
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/remote_gdb.cc
--- a/src/arch/x86/remote_gdb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/remote_gdb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,12 +38,12 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <string>
-#include <unistd.h>
 
+#include "arch/x86/remote_gdb.hh"
 #include "arch/vtophys.hh"
-#include "arch/x86/remote_gdb.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/system.cc
--- a/src/arch/x86/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,21 +37,20 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/bios/intelmp.hh"
 #include "arch/x86/bios/smbios.hh"
-#include "arch/x86/bios/intelmp.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/system.hh"
 #include "arch/vtophys.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/physical.hh"
 #include "params/X86System.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 using namespace X86ISA;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/tlb.hh
--- a/src/arch/x86/tlb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/tlb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -41,18 +41,18 @@
 #define __ARCH_X86_TLB_HH__
 
 #include <list>
+#include <string>
 #include <vector>
-#include <string>
 
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/pagetable.hh"
-#include "arch/x86/regs/segment.hh"
 #include "config/full_system.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
 #include "params/X86TLB.hh"
 #include "sim/fault.hh"
+#include "sim/sim_object.hh"
 #include "sim/tlb.hh"
-#include "sim/sim_object.hh"
 
 class ThreadContext;
 class Packet;
diff -r 8e0ea3a48928 -r 3baf50481316 src/arch/x86/tlb.cc
--- a/src/arch/x86/tlb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/arch/x86/tlb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,19 +39,17 @@
 
 #include <cstring>
 
-#include "config/full_system.hh"
-
+#include "arch/x86/insts/microldstop.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/faults.hh"
-#include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/pagetable.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/compression/lzss_compression.cc
--- a/src/base/compression/lzss_compression.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/compression/lzss_compression.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 
 #include <cassert>
 #include <cstring>
+
 #include "base/compression/lzss_compression.hh"
-
 #include "base/misc.hh" //for fatal
 
 void
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/compression/null_compression.hh
--- a/src/base/compression/null_compression.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/compression/null_compression.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,8 @@
  * This file defines a doNothing compression algorithm.
  */
 
+#include "base/compression/base.hh"
 #include "base/misc.hh" // for fatal()
-#include "base/compression/base.hh"
-
 
 /**
  * A dummy compression class to use when no data compression is desired.
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/cp_annotate.hh
--- a/src/base/cp_annotate.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/cp_annotate.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,13 +31,13 @@
 #ifndef __BASE__CP_ANNOTATE_HH__
 #define __BASE__CP_ANNOTATE_HH__
 
+#include <list>
+#include <map>
 #include <string>
-#include <list>
 #include <vector>
-#include <map>
 
+#include "base/loader/symtab.hh"
 #include "base/hashmap.hh"
-#include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/cp_annotate.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/cp_annotate.cc
--- a/src/base/cp_annotate.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/cp_annotate.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,11 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/alpha/linux/threadinfo.hh"
 #include "arch/utility.hh"
-#include "arch/alpha/linux/threadinfo.hh"
+#include "base/loader/object_file.hh"
+#include "base/callback.hh"
 #include "base/cp_annotate.hh"
-#include "base/callback.hh"
-#include "base/loader/object_file.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/cprintf.hh
--- a/src/base/cprintf.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/cprintf.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,8 @@
 #include <list>
 #include <string>
 
+#include "base/cprintf_formats.hh"
 #include "base/varargs.hh"
-#include "base/cprintf_formats.hh"
 
 namespace cp {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/debug.cc
--- a/src/base/debug.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/debug.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,10 @@
  */
 
 #include <sys/types.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <csignal>
+
 #include "base/cprintf.hh"
 
 void
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/fast_alloc.hh
--- a/src/base/fast_alloc.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/fast_alloc.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -62,9 +62,9 @@
 // collapse the destructor call chain back up the inheritance
 // hierarchy.
 
-#include "config/no_fast_alloc.hh"
 #include "config/fast_alloc_debug.hh"
 #include "config/fast_alloc_stats.hh"
+#include "config/no_fast_alloc.hh"
 
 #if NO_FAST_ALLOC
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/fenv.c
--- a/src/base/fenv.c	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/fenv.c	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 #include <assert.h>
+#include <fenv.h>
 #include <stdlib.h>
-#include <fenv.h>
 
 void m5_fesetround(int rm);
 int m5_fegetround();
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/fifo_buffer.hh
--- a/src/base/fifo_buffer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/fifo_buffer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,7 +34,6 @@
 
 #include "base/res_list.hh"
 
-
 //
 //  The FifoBuffer requires only that the objects to be used have a default
 //  constructor and a dump() method
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/hostinfo.cc
--- a/src/base/hostinfo.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/hostinfo.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,12 +28,12 @@
  * Authors: Nathan Binkert
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
 #include <unistd.h>
 
-#include <stdio.h>
+#include <cctype>
+#include <cerrno>
+#include <cmath>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <string>
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/hybrid_pred.cc
--- a/src/base/hybrid_pred.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/hybrid_pred.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  *          Lisa Hsu
  */
 
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "base/hybrid_pred.hh"
 #include "base/statistics.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/inet.hh
--- a/src/base/inet.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/inet.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,7 +42,6 @@
 #include "base/range.hh"
 #include "base/types.hh"
 #include "dev/etherpkt.hh"
-
 #include "dnet/os.h"
 #include "dnet/eth.h"
 #include "dnet/ip.h"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/inifile.cc
--- a/src/base/inifile.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/inifile.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 
 #include <fstream>
 #include <iostream>
+#include <string>
 #include <vector>
-#include <string>
 
 #include "base/inifile.hh"
 #include "base/str.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/aout_object.cc
--- a/src/base/loader/aout_object.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/aout_object.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "base/loader/aout_object.hh"
+#include "base/loader/exec_aout.h"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
-#include "base/loader/exec_aout.h"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/elf_object.hh
--- a/src/base/loader/elf_object.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/elf_object.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,11 @@
 #ifndef __ELF_OBJECT_HH__
 #define __ELF_OBJECT_HH__
 
-#include "base/loader/object_file.hh"
 #include <set>
 #include <vector>
 
+#include "base/loader/object_file.hh"
+
 class ElfObject : public ObjectFile
 {
   protected:
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/elf_object.cc
--- a/src/base/loader/elf_object.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/elf_object.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,13 @@
 #include <cassert>
 #include <string>
 
-#include "gelf.h"
-
-#include "base/bitfield.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
+#include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "sim/byteswap.hh"
+#include "gelf.h"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/hex_file.cc
--- a/src/base/loader/hex_file.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/hex_file.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,9 @@
 #include <list>
 #include <string>
 
-#include "base/cprintf.hh"
 #include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "mem/translating_port.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/object_file.cc
--- a/src/base/loader/object_file.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/object_file.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,24 +29,22 @@
  *          Steve Reinhardt
  */
 
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <cstdio>
 #include <list>
 #include <string>
 
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
+#include "base/loader/aout_object.hh"
+#include "base/loader/ecoff_object.hh"
+#include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
+#include "base/loader/raw_object.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/object_file.hh"
-#include "base/loader/symtab.hh"
-
-#include "base/loader/ecoff_object.hh"
-#include "base/loader/aout_object.hh"
-#include "base/loader/elf_object.hh"
-#include "base/loader/raw_object.hh"
-
 #include "mem/translating_port.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/loader/symtab.cc
--- a/src/base/loader/symtab.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/loader/symtab.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include <fstream>
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/misc.cc
--- a/src/base/misc.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/misc.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include <zlib.h>
+
 #include <cstdlib>
 #include <iostream>
 #include <string>
-#include <zlib.h>
 
 #include "base/cprintf.hh"
 #include "base/hostinfo.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/mysql.hh
--- a/src/base/mysql.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/mysql.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,12 +33,13 @@
 
 #define TO_BE_INCLUDED_LATER 0
 
+#include <mysql.h>
+#include <mysql_version.h>
+
 #include <cassert>
 #include <iosfwd>
-#include <mysql_version.h>
-#include <mysql.h>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 namespace MySQL {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/output.cc
--- a/src/base/output.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/output.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,12 +28,12 @@
  * Authors: Nathan Binkert
  */
 
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cerrno>
+#include <climits>
+#include <cstdlib>
 #include <fstream>
 
 #include <gzstream.hh>
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/pollevent.hh
--- a/src/base/pollevent.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/pollevent.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,10 @@
 #ifndef __POLLEVENT_H__
 #define __POLLEVENT_H__
 
+#include <poll.h>
+
 #include <vector>
-#include <poll.h>
+
 #include "sim/core.hh"
 
 class Checkpoint;
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/pollevent.cc
--- a/src/base/pollevent.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/pollevent.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -35,9 +35,10 @@
 #endif
 
 #include <fcntl.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <csignal>
+
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "base/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/range_map.hh
--- a/src/base/range_map.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/range_map.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 #ifndef __BASE_RANGE_MAP_HH__
 #define __BASE_RANGE_MAP_HH__
 
+#include <map>
+
 #include "base/range.hh"
 
-#include <map>
-
 template <class T,class V>
 class range_map
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/remote_gdb.hh
--- a/src/base/remote_gdb.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/remote_gdb.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,13 +31,14 @@
 #ifndef __REMOTE_GDB_HH__
 #define __REMOTE_GDB_HH__
 
-#include <map>
 #include <sys/signal.h>
 
+#include <map>
+
 #include "arch/types.hh"
-#include "cpu/pc_event.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
+#include "cpu/pc_event.hh"
 
 class System;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/remote_gdb.cc
--- a/src/base/remote_gdb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/remote_gdb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -117,10 +117,10 @@
  */
 
 #include <sys/signal.h>
+#include <unistd.h>
 
 #include <cstdio>
 #include <string>
-#include <unistd.h>
 
 #include "config/full_system.hh"
 
@@ -134,8 +134,8 @@
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
 #include "mem/port.hh"
 #include "mem/translating_port.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/sat_counter.hh
--- a/src/base/sat_counter.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/sat_counter.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,7 +35,6 @@
 #include <string>
 
 #include "base/predictor.hh"
-
 #include "base/statistics.hh"
 #include "sim/stats.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/sat_counter.cc
--- a/src/base/sat_counter.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/sat_counter.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -35,7 +35,6 @@
 #include "base/statistics.hh"
 #include "sim/stats.hh"
 
-
 using namespace std;
 
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/sched_list.hh
--- a/src/base/sched_list.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/sched_list.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,10 +32,10 @@
 #define SCHED_LIST_HH
 
 #include <list>
+
 #include "base/intmath.hh"
 #include "base/misc.hh"
 
-
 //  Any types you use this class for must be covered here...
 namespace {
     void ClearEntry(int &i) { i = 0; };
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/socket.cc
--- a/src/base/socket.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/socket.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,18 +28,17 @@
  * Authors: Nathan Binkert
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-
-#include <errno.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "base/types.hh"
+#include <cerrno>
+
 #include "base/misc.hh"
 #include "base/socket.hh"
+#include "base/types.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/statistics.hh
--- a/src/base/statistics.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/statistics.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -50,7 +50,7 @@
 #include <algorithm>
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
 #endif
 #include <cmath>
 #include <functional>
@@ -59,13 +59,13 @@
 #include <string>
 #include <vector>
 
+#include "base/stats/info.hh"
+#include "base/stats/types.hh"
+#include "base/stats/visit.hh"
 #include "base/cast.hh"
 #include "base/cprintf.hh"
 #include "base/intmath.hh"
 #include "base/refcnt.hh"
-#include "base/stats/info.hh"
-#include "base/stats/types.hh"
-#include "base/stats/visit.hh"
 #include "base/str.hh"
 #include "base/types.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/statistics.cc
--- a/src/base/statistics.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/statistics.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include <fstream>
 #include <iomanip>
-#include <fstream>
 #include <list>
 #include <map>
 #include <string>
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/stats/info.hh
--- a/src/base/stats/info.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/stats/info.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __BASE_STATS_INFO_HH__
 #define __BASE_STATS_INFO_HH__
 
+#include "base/stats/types.hh"
 #include "base/flags.hh"
-#include "base/stats/types.hh"
 
 namespace Stats {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/stats/mysql.cc
--- a/src/base/stats/mysql.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/stats/mysql.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -35,13 +35,13 @@
 #include <string>
 #include <vector>
 
-#include "base/misc.hh"
-#include "base/mysql.hh"
-#include "base/statistics.hh"
 #include "base/stats/info.hh"
 #include "base/stats/mysql.hh"
 #include "base/stats/mysql_run.hh"
 #include "base/stats/types.hh"
+#include "base/misc.hh"
+#include "base/mysql.hh"
+#include "base/statistics.hh"
 #include "base/str.hh"
 #include "base/types.hh"
 #include "base/userinfo.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/stats/output.cc
--- a/src/base/stats/output.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/stats/output.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include <list>
 
+#include "base/stats/output.hh"
 #include "base/statistics.hh"
-#include "base/stats/output.hh"
 #include "base/types.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/stats/text.hh
--- a/src/base/stats/text.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/stats/text.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include <iosfwd>
 #include <string>
 
+#include "base/stats/output.hh"
 #include "base/output.hh"
-#include "base/stats/output.hh"
 
 namespace Stats {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/stats/text.cc
--- a/src/base/stats/text.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/stats/text.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,25 +33,25 @@
 #endif
 
 #if defined(__sun)
-#include <math.h>
+#include <cmath>
 #endif
 
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
 #endif
 #include <cmath>
+#include <fstream>
 #include <iostream>
 #include <sstream>
-#include <fstream>
 #include <string>
 
+#include "base/stats/info.hh"
+#include "base/stats/text.hh"
+#include "base/stats/visit.hh"
 #include "base/cast.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
-#include "base/stats/info.hh"
-#include "base/stats/text.hh"
-#include "base/stats/visit.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/str.hh
--- a/src/base/str.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/str.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,11 @@
 #ifndef __STR_HH__
 #define __STR_HH__
 
+#include <cctype>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <ctype.h>
-
 template<class> class Hash;
 template<>
 class Hash<std::string> {
diff -r 8e0ea3a48928 -r 3baf50481316 src/base/trace.cc
--- a/src/base/trace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/base/trace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-#include <ctype.h>
+#include <cctype>
 #include <fstream>
 #include <iostream>
 #include <list>
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/base.hh
--- a/src/cpu/base.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/base.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,9 +39,9 @@
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "mem/mem_object.hh"
 #include "sim/eventq.hh"
 #include "sim/insttracer.hh"
-#include "mem/mem_object.hh"
 
 #if FULL_SYSTEM
 #include "arch/interrupts.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/base.cc
--- a/src/cpu/base.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/base.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,23 +30,23 @@
  */
 
 #include <iostream>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "arch/tlb.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/cpuevent.hh"
+#include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/profile.hh"
 #include "params/BaseCPU.hh"
-#include "sim/sim_exit.hh"
 #include "sim/process.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
 #include "sim/system.hh"
 
 // Hack
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/base_dyn_inst_impl.hh
--- a/src/cpu/base_dyn_inst_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/base_dyn_inst_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <set>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "base/cprintf.hh"
 #include "base/trace.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/checker/cpu.hh
--- a/src/cpu/checker/cpu.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/checker/cpu.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,16 +32,16 @@
 #define __CPU_CHECKER_CPU_HH__
 
 #include <list>
+#include <map>
 #include <queue>
-#include <map>
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "cpu/base.hh"
 #include "cpu/base_dyn_inst.hh"
+#include "cpu/pc_event.hh"
 #include "cpu/simple_thread.hh"
-#include "cpu/pc_event.hh"
 #include "cpu/static_inst.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/checker/cpu.cc
--- a/src/cpu/checker/cpu.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/checker/cpu.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #include <list>
 #include <string>
 
+#include "cpu/checker/cpu.hh"
 #include "cpu/base.hh"
-#include "cpu/checker/cpu.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/checker/cpu_impl.hh
--- a/src/cpu/checker/cpu_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/checker/cpu_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,11 +33,11 @@
 
 #include "base/refcnt.hh"
 #include "config/the_isa.hh"
+#include "cpu/checker/cpu.hh"
 #include "cpu/base_dyn_inst.hh"
-#include "cpu/checker/cpu.hh"
 #include "cpu/simple_thread.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/cpuevent.hh
--- a/src/cpu/cpuevent.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/cpuevent.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,6 +32,7 @@
 #define __CPU_CPUEVENT_HH__
 
 #include <vector>
+
 #include "sim/eventq.hh"
 
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/exetrace.cc
--- a/src/cpu/exetrace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/exetrace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,11 +36,11 @@
 #include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/loader/symtab.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "config/the_isa.hh"
 #include "enums/OpClass.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/func_unit.hh
--- a/src/cpu/func_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/func_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,8 @@
 #include <vector>
 
 #include "cpu/op_class.hh"
+#include "params/FUDesc.hh"
 #include "params/OpDesc.hh"
-#include "params/FUDesc.hh"
 #include "sim/sim_object.hh"
 
 ////////////////////////////////////////////////////////////////////////////
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/cpu.hh
--- a/src/cpu/inorder/cpu.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/cpu.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,23 +39,23 @@
 #include <vector>
 
 #include "arch/isa_traits.hh"
+#include "arch/registers.hh"
 #include "arch/types.hh"
-#include "arch/registers.hh"
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_stage.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/thread_state.hh"
+#include "cpu/o3/dep_graph.hh"
+#include "cpu/o3/rename_map.hh"
 #include "cpu/activity.hh"
 #include "cpu/base.hh"
 #include "cpu/simple_thread.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/pipeline_stage.hh"
-#include "cpu/inorder/thread_state.hh"
-#include "cpu/inorder/reg_dep_map.hh"
-#include "cpu/o3/dep_graph.hh"
-#include "cpu/o3/rename_map.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
 #include "mem/request.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/cpu.cc
--- a/src/cpu/inorder/cpu.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/cpu.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,17 +34,17 @@
 #include "arch/utility.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/exetrace.hh"
+#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/first_stage.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/thread_context.hh"
 #include "cpu/inorder/thread_state.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/exetrace.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
 #include "mem/translating_port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/first_stage.hh
--- a/src/cpu/inorder/first_stage.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/first_stage.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,11 +37,11 @@
 
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
+#include "cpu/inorder/comm.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/comm.hh"
 #include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_stage.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/pipeline_stage.hh"
 
 class InOrderCPU;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/first_stage.cc
--- a/src/cpu/inorder/first_stage.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/first_stage.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,10 +30,10 @@
  */
 
 #include "base/str.hh"
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/cpu.hh"
 #include "params/InOrderTrace.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/inorder_cpu_builder.cc
--- a/src/cpu/inorder/inorder_cpu_builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/inorder_cpu_builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,12 +31,12 @@
 
 #include <string>
 
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/base.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/static_inst.hh"
-#include "cpu/inorder/cpu.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "params/InOrderCPU.hh"
 
 InOrderCPU *
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/inorder_dyn_inst.hh
--- a/src/cpu/inorder/inorder_dyn_inst.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/inorder_dyn_inst.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -47,12 +47,12 @@
 #include "base/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/inorder_trace.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
 #include "cpu/inorder/resource_sked.hh"
 #include "cpu/inorder/thread_state.hh"
+#include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/op_class.hh"
 #include "cpu/static_inst.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/inorder_dyn_inst.cc
--- a/src/cpu/inorder/inorder_dyn_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/inorder_dyn_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,16 +31,16 @@
 
 #include <iostream>
 #include <set>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "arch/faults.hh"
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/exetrace.hh"
 #include "mem/request.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/inorder_trace.cc
--- a/src/cpu/inorder/inorder_trace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/inorder_trace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,10 +32,10 @@
 #include <iomanip>
 
 #include "config/the_isa.hh"
+#include "cpu/inorder/inorder_trace.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/inorder/inorder_trace.hh"
 #include "cpu/static_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/thread_context.hh"
 #include "params/InOrderTrace.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_stage.hh
--- a/src/cpu/inorder/pipeline_stage.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_stage.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,10 +37,10 @@
 
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
+#include "cpu/inorder/comm.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/comm.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "params/InOrderCPU.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 
 class InOrderCPU;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_stage.cc
--- a/src/cpu/inorder/pipeline_stage.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_stage.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 
 #include "base/str.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/pipeline_stage.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace std;
 using namespace ThePipeline;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.5stage.hh
--- a/src/cpu/inorder/pipeline_traits.5stage.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.5stage.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,7 +39,6 @@
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.5stage.cc
--- a/src/cpu/inorder/pipeline_traits.5stage.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.5stage.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  *
  */
 
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.9stage.hh
--- a/src/cpu/inorder/pipeline_traits.9stage.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.9stage.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,14 +33,13 @@
 #define __CPU_INORDER_PIPELINE_IMPL_HH__
 
 #include <list>
+#include <map>
 #include <queue>
 #include <vector>
-#include <map>
 
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.9stage.cc
--- a/src/cpu/inorder/pipeline_traits.9stage.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.9stage.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  *
  */
 
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.9stage.smt2.hh
--- a/src/cpu/inorder/pipeline_traits.9stage.smt2.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,14 +33,13 @@
 #define __CPU_INORDER_PIPELINE_IMPL_HH__
 
 #include <list>
+#include <map>
 #include <queue>
 #include <vector>
-#include <map>
 
 #include "arch/isa_traits.hh"
 #include "cpu/inorder/params.hh"
 
-
 class InOrderDynInst;
 
 /* This Namespace contains constants, typedefs, functions and
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.9stage.smt2.cc
--- a/src/cpu/inorder/pipeline_traits.9stage.smt2.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  *
  */
 
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.hh
--- a/src/cpu/inorder/pipeline_traits.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,7 +38,6 @@
 
 #include "arch/isa_traits.hh"
 #include "cpu/base.hh"
-
 #include "params/InOrderCPU.hh"
 
 class InOrderDynInst;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/pipeline_traits.cc
--- a/src/cpu/inorder/pipeline_traits.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/pipeline_traits.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  *
  */
 
+#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resources/resource_list.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/reg_dep_map.cc
--- a/src/cpu/inorder/reg_dep_map.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/reg_dep_map.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/reg_dep_map.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource.hh
--- a/src/cpu/inorder/resource.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_RESOURCE_HH__
 #define __CPU_INORDER_RESOURCE_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inst_seq.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource.cc
--- a/src/cpu/inorder/resource.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,10 +29,11 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
+
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/resource.hh"
-#include "cpu/inorder/cpu.hh"
 using namespace std;
 
 Resource::Resource(string res_name, int res_id, int res_width,
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource_pool.9stage.cc
--- a/src/cpu/inorder/resource_pool.9stage.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource_pool.9stage.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,11 +29,11 @@
  *
  */
 
+#include <list>
+#include <vector>
+
+#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
-
-#include <vector>
-#include <list>
 
 using namespace std;
 using namespace ThePipeline;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource_pool.hh
--- a/src/cpu/inorder/resource_pool.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource_pool.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,17 +32,17 @@
 #ifndef __CPU_INORDER_RESOURCE_POOL_HH__
 #define __CPU_INORDER_RESOURCE_POOL_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/params.hh"
 #include "params/InOrderCPU.hh"
-#include "cpu/inorder/cpu.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource_pool.cc
--- a/src/cpu/inorder/resource_pool.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource_pool.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,11 +29,11 @@
  *
  */
 
+#include <list>
+#include <vector>
+
+#include "cpu/inorder/resources/resource_list.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/resources/resource_list.hh"
-
-#include <vector>
-#include <list>
 
 using namespace std;
 using namespace ThePipeline;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource_sked.hh
--- a/src/cpu/inorder/resource_sked.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource_sked.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #ifndef __CPU_INORDER_RESOURCE_SKED_HH__
 #define __CPU_INORDER_RESOURCE_SKED_HH__
 
+#include <list>
 #include <vector>
-#include <list>
 
 class ScheduleEntry {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resource_sked.cc
--- a/src/cpu/inorder/resource_sked.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resource_sked.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,12 +29,12 @@
  *
  */
 
+#include <cstdio>
+#include <list>
+#include <vector>
+
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource_sked.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-
-#include <vector>
-#include <list>
-#include <stdio.h>
 
 using namespace std;
 using namespace ThePipeline;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/agen_unit.hh
--- a/src/cpu/inorder/resources/agen_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/agen_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_AGEN_UNIT_HH__
 #define __CPU_INORDER_AGEN_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
-#include "cpu/inorder/params.hh"
 
 class AGENUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/bpred_unit.hh
--- a/src/cpu/inorder/resources/bpred_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/bpred_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,7 +36,6 @@
 
 #include "arch/isa_traits.hh"
 #include "base/statistics.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resource.hh"
@@ -44,6 +43,7 @@
 #include "cpu/pred/btb.hh"
 #include "cpu/pred/ras.hh"
 #include "cpu/pred/tournament.hh"
+#include "cpu/inst_seq.hh"
 #include "params/InOrderCPU.hh"
 
 /**
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/branch_predictor.hh
--- a/src/cpu/inorder/resources/branch_predictor.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/branch_predictor.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_BRANCH_PREDICTOR_HH__
 #define __CPU_INORDER_BRANCH_PREDICTOR_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/resources/bpred_unit.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/resources/bpred_unit.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class BranchPredictor : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/cache_unit.hh
--- a/src/cpu/inorder/resources/cache_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/cache_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,9 +32,9 @@
 #ifndef __CPU_INORDER_CACHE_UNIT_HH__
 #define __CPU_INORDER_CACHE_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "arch/predecoder.hh"
 #include "arch/tlb.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/cache_unit.cc
--- a/src/cpu/inorder/resources/cache_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/cache_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,17 +29,17 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
 
 #include "arch/isa_traits.hh"
 #include "arch/locked_mem.hh"
+#include "arch/predecoder.hh"
 #include "arch/utility.hh"
-#include "arch/predecoder.hh"
 #include "config/the_isa.hh"
 #include "cpu/inorder/resources/cache_unit.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/resource_pool.hh"
 #include "mem/request.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/decode_unit.hh
--- a/src/cpu/inorder/resources/decode_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/decode_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_DECODE_UNIT_HH__
 #define __CPU_INORDER_DECODE_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/resource.hh"
 
 class DecodeUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/execution_unit.hh
--- a/src/cpu/inorder/resources/execution_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/execution_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_EXECUTION_UNIT_HH__
 #define __CPU_INORDER_EXECUTION_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
+#include "cpu/inorder/first_stage.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/resource.hh"
 #include "cpu/func_unit.hh"
-#include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 
 class ExecutionUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/execution_unit.cc
--- a/src/cpu/inorder/resources/execution_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/execution_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,11 +29,12 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
+
 #include "cpu/inorder/resources/execution_unit.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace std;
 using namespace ThePipeline;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/fetch_seq_unit.hh
--- a/src/cpu/inorder/resources/fetch_seq_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/fetch_seq_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_FETCH_SEQ_UNIT_HH__
 #define __CPU_INORDER_FETCH_SEQ_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "config/the_isa.hh"
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class FetchSeqUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/graduation_unit.hh
--- a/src/cpu/inorder/resources/graduation_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/graduation_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_GRAD_UNIT_HH__
 #define __CPU_INORDER_GRAD_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class GraduationUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/inst_buffer.hh
--- a/src/cpu/inorder/resources/inst_buffer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/inst_buffer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_INST_BUFF_UNIT_HH__
 #define __CPU_INORDER_INST_BUFF_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class InstBuffer : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/inst_buffer.cc
--- a/src/cpu/inorder/resources/inst_buffer.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/inst_buffer.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,14 +29,14 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/inst_buffer.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/inst_buffer_new.hh
--- a/src/cpu/inorder/resources/inst_buffer_new.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/inst_buffer_new.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_INST_BUFF_UNIT_HH__
 #define __CPU_INORDER_INST_BUFF_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class InstBuffer : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/inst_buffer_new.cc
--- a/src/cpu/inorder/resources/inst_buffer_new.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/inst_buffer_new.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,14 +29,14 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/inst_buffer.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/mem_dep_unit.hh
--- a/src/cpu/inorder/resources/mem_dep_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/mem_dep_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,14 +32,14 @@
 #ifndef __CPU_INORDER_MEM_DEP_UNIT_HH__
 #define __CPU_INORDER_MEM_DEP_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/resource.hh"
 
 class MemDepUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/mult_div_unit.hh
--- a/src/cpu/inorder/resources/mult_div_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/mult_div_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_MULT_DIV_UNIT_HH__
 #define __CPU_INORDER_MULT_DIV_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
+#include "cpu/inorder/first_stage.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/resource.hh"
 #include "cpu/func_unit.hh"
 #include "cpu/op_class.hh"
-#include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
 
 class MDUEvent;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/mult_div_unit.cc
--- a/src/cpu/inorder/resources/mult_div_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/mult_div_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,11 +29,12 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
+
 #include "cpu/inorder/resources/mult_div_unit.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/resource_pool.hh"
-#include "cpu/inorder/cpu.hh"
 #include "cpu/op_class.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/resource_list.hh
--- a/src/cpu/inorder/resources/resource_list.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/resource_list.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,16 +32,16 @@
 #ifndef CPU_INORDER_RESOURCE_LIST_HH
 #define CPU_INORDER_RESOURCE_LIST_HH
 
+#include "cpu/inorder/resources/agen_unit.hh"
+#include "cpu/inorder/resources/branch_predictor.hh"
 #include "cpu/inorder/resources/cache_unit.hh"
+#include "cpu/inorder/resources/decode_unit.hh"
 #include "cpu/inorder/resources/execution_unit.hh"
+#include "cpu/inorder/resources/fetch_seq_unit.hh"
+#include "cpu/inorder/resources/graduation_unit.hh"
+#include "cpu/inorder/resources/inst_buffer.hh"
+#include "cpu/inorder/resources/mult_div_unit.hh"
+#include "cpu/inorder/resources/tlb_unit.hh"
 #include "cpu/inorder/resources/use_def.hh"
-#include "cpu/inorder/resources/inst_buffer.hh"
-#include "cpu/inorder/resources/decode_unit.hh"
-#include "cpu/inorder/resources/graduation_unit.hh"
-#include "cpu/inorder/resources/tlb_unit.hh"
-#include "cpu/inorder/resources/fetch_seq_unit.hh"
-#include "cpu/inorder/resources/branch_predictor.hh"
-#include "cpu/inorder/resources/agen_unit.hh"
-#include "cpu/inorder/resources/mult_div_unit.hh"
 
 #endif
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/tlb_unit.hh
--- a/src/cpu/inorder/resources/tlb_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/tlb_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_TLB_UNIT_HH__
 #define __CPU_INORDER_TLB_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
 #include "config/the_isa.hh"
 #include "cpu/inorder/resources/inst_buffer.hh"
+#include "cpu/inorder/cpu.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/cpu.hh"
 
 class TLBUnit : public Resource
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/tlb_unit.cc
--- a/src/cpu/inorder/resources/tlb_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/tlb_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,15 +29,15 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/first_stage.hh"
 #include "cpu/inorder/resources/tlb_unit.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/first_stage.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/use_def.hh
--- a/src/cpu/inorder/resources/use_def.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/use_def.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,16 +32,16 @@
 #ifndef __CPU_INORDER_USE_DEF_UNIT_HH__
 #define __CPU_INORDER_USE_DEF_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/func_unit.hh"
 #include "cpu/inorder/first_stage.hh"
-#include "cpu/inorder/resource.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/reg_dep_map.hh"
+#include "cpu/inorder/resource.hh"
+#include "cpu/func_unit.hh"
 
 class UseDefUnit : public Resource {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/resources/use_def.cc
--- a/src/cpu/inorder/resources/use_def.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/resources/use_def.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,14 +29,14 @@
  *
  */
 
+#include <list>
 #include <vector>
-#include <list>
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/use_def.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/pipeline_traits.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/thread_context.hh
--- a/src/cpu/inorder/thread_context.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/thread_context.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,10 +33,10 @@
 #define __CPU_INORDER_THREAD_CONTEXT_HH__
 
 #include "config/the_isa.hh"
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/thread_state.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/inorder/thread_state.hh"
-#include "cpu/inorder/cpu.hh"
 
 class TranslatingPort;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/thread_context.cc
--- a/src/cpu/inorder/thread_context.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/thread_context.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
+#include "cpu/inorder/thread_context.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/inorder/thread_context.hh"
 
 using namespace TheISA;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/inorder/thread_state.cc
--- a/src/cpu/inorder/thread_state.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/inorder/thread_state.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,9 +30,9 @@
  */
 
 #include "arch/isa_traits.hh"
+#include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/thread_state.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/inorder/thread_state.hh"
-#include "cpu/inorder/cpu.hh"
 
 using namespace TheISA;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/intr_control.hh
--- a/src/cpu/intr_control.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/intr_control.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,13 +33,13 @@
 #define __INTR_CONTROL_HH__
 
 #include <vector>
+
 #include "base/misc.hh"
 #include "cpu/base.hh"
 #include "params/IntrControl.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
 
-
 class IntrControl : public SimObject
 {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/intr_control.cc
--- a/src/cpu/intr_control.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/intr_control.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 
 #include "base/trace.hh"
 #include "cpu/base.hh"
+#include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/intr_control.hh"
 #include "sim/sim_object.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/nativetrace.hh
--- a/src/cpu/nativetrace.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/nativetrace.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,10 @@
 #ifndef __CPU_NATIVETRACE_HH__
 #define __CPU_NATIVETRACE_HH__
 
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
+
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/base_dyn_inst.cc
--- a/src/cpu/o3/base_dyn_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/base_dyn_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -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 -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/bpred_unit.hh
--- a/src/cpu/o3/bpred_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/bpred_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,11 +35,11 @@
 
 #include "base/statistics.hh"
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/pred/2bit_local.hh"
 #include "cpu/pred/btb.hh"
 #include "cpu/pred/ras.hh"
 #include "cpu/pred/tournament.hh"
+#include "cpu/inst_seq.hh"
 
 class DerivO3CPUParams;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/bpred_unit_impl.hh
--- a/src/cpu/o3/bpred_unit_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/bpred_unit_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,9 +30,9 @@
 
 #include <algorithm>
 
+#include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "arch/utility.hh"
-#include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "config/the_isa.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/checker_builder.cc
--- a/src/cpu/o3/checker_builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/checker_builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "cpu/checker/cpu_impl.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/alpha/dyn_inst.hh"
 #include "cpu/o3/alpha/impl.hh"
+#include "cpu/inst_seq.hh"
 #include "params/O3Checker.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/commit.cc
--- a/src/cpu/o3/commit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/commit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/commit_impl.hh"
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/commit_impl.hh"
 
 template class DefaultCommit<O3CPUImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/commit_impl.hh
--- a/src/cpu/o3/commit_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/commit_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -45,15 +45,15 @@
 #include <string>
 
 #include "arch/utility.hh"
+#include "base/loader/symtab.hh"
 #include "base/cp_annotate.hh"
-#include "base/loader/symtab.hh"
 #include "base/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/o3/commit.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/exetrace.hh"
 #include "params/DerivO3CPU.hh"
 
 #if USE_CHECKER
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/cpu.hh
--- a/src/cpu/o3/cpu.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/cpu.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -44,18 +44,17 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/o3/comm.hh"
 #include "cpu/o3/cpu_policy.hh"
 #include "cpu/o3/scoreboard.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/simple_thread.hh"
 //#include "cpu/o3/thread_context.hh"
+#include "params/DerivO3CPU.hh"
 #include "sim/process.hh"
 
-#include "params/DerivO3CPU.hh"
-
 template <class>
 class Checker;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/cpu.cc
--- a/src/cpu/o3/cpu.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/cpu.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,12 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
+#include "cpu/o3/cpu.hh"
+#include "cpu/o3/isa_specific.hh"
+#include "cpu/o3/thread_context.hh"
 #include "cpu/activity.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/cpu.hh"
-#include "cpu/o3/thread_context.hh"
 #include "enums/MemoryMode.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/cpu_policy.hh
--- a/src/cpu/o3/cpu_policy.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/cpu_policy.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,24 +32,22 @@
 #define __CPU_O3_CPU_POLICY_HH__
 
 #include "cpu/o3/bpred_unit.hh"
+#include "cpu/o3/comm.hh"
+#include "cpu/o3/commit.hh"
+#include "cpu/o3/decode.hh"
+#include "cpu/o3/fetch.hh"
 #include "cpu/o3/free_list.hh"
+#include "cpu/o3/iew.hh"
 #include "cpu/o3/inst_queue.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
 #include "cpu/o3/mem_dep_unit.hh"
 #include "cpu/o3/regfile.hh"
+#include "cpu/o3/rename.hh"
 #include "cpu/o3/rename_map.hh"
 #include "cpu/o3/rob.hh"
 #include "cpu/o3/store_set.hh"
 
-#include "cpu/o3/commit.hh"
-#include "cpu/o3/decode.hh"
-#include "cpu/o3/fetch.hh"
-#include "cpu/o3/iew.hh"
-#include "cpu/o3/rename.hh"
-
-#include "cpu/o3/comm.hh"
-
 /**
  * Struct that defines the key classes to be used by the CPU.  All
  * classes use the typedefs defined here to determine what are the
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/decode.cc
--- a/src/cpu/o3/decode.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/decode.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/decode_impl.hh"
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/decode_impl.hh"
 
 template class DefaultDecode<O3CPUImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/dyn_inst.hh
--- a/src/cpu/o3/dyn_inst.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/dyn_inst.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -45,10 +45,10 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
+#include "cpu/o3/cpu.hh"
+#include "cpu/o3/isa_specific.hh"
 #include "cpu/base_dyn_inst.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/o3/cpu.hh"
-#include "cpu/o3/isa_specific.hh"
 
 class Packet;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/fetch.hh
--- a/src/cpu/o3/fetch.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/fetch.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #ifndef __CPU_O3_FETCH_HH__
 #define __CPU_O3_FETCH_HH__
 
+#include "arch/predecoder.hh"
 #include "arch/utility.hh"
-#include "arch/predecoder.hh"
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "config/the_isa.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/fetch.cc
--- a/src/cpu/o3/fetch.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/fetch.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/fetch_impl.hh"
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/fetch_impl.hh"
 
 template class DefaultFetch<O3CPUImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/fetch_impl.hh
--- a/src/cpu/o3/fetch_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/fetch_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/checker/cpu.hh"
+#include "cpu/o3/fetch.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/o3/fetch.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "params/DerivO3CPU.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/free_list.cc
--- a/src/cpu/o3/free_list.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/free_list.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,7 +29,6 @@
  */
 
 #include "base/trace.hh"
-
 #include "cpu/o3/free_list.hh"
 
 SimpleFreeList::SimpleFreeList(ThreadID activeThreads,
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/iew.hh
--- a/src/cpu/o3/iew.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/iew.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -49,8 +49,8 @@
 #include "base/timebuf.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
+#include "cpu/o3/lsq.hh"
 #include "cpu/o3/scoreboard.hh"
-#include "cpu/o3/lsq.hh"
 
 class DerivO3CPUParams;
 class FUPool;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/iew.cc
--- a/src/cpu/o3/iew.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/iew.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/iew_impl.hh"
 #include "cpu/o3/inst_queue.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultIEW<O3CPUImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/impl.hh
--- a/src/cpu/o3/impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,7 +35,6 @@
 #include "config/the_isa.hh"
 #include "cpu/o3/cpu_policy.hh"
 
-
 // Forward declarations.
 template <class Impl>
 class BaseO3DynInst;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/inst_queue.hh
--- a/src/cpu/o3/inst_queue.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/inst_queue.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,8 +39,8 @@
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "base/types.hh"
+#include "cpu/o3/dep_graph.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/o3/dep_graph.hh"
 #include "cpu/op_class.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/inst_queue.cc
--- a/src/cpu/o3/inst_queue.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/inst_queue.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/inst_queue_impl.hh"
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/inst_queue_impl.hh"
 
 // Force instantiation of InstructionQueue.
 template class InstructionQueue<O3CPUImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/isa_specific.hh
--- a/src/cpu/o3/isa_specific.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/isa_specific.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -28,7 +28,6 @@
  * Authors: Korey Sewell
  */
 
+#include "cpu/o3/dyn_inst.hh"
+#include "cpu/o3/impl.hh"
 #include "cpu/base.hh"
-
-#include "cpu/o3/impl.hh"
-#include "cpu/o3/dyn_inst.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/lsq.hh
--- a/src/cpu/o3/lsq.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/lsq.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #include <queue>
 
 #include "config/full_system.hh"
+#include "cpu/o3/lsq_unit.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/o3/lsq_unit.hh"
 #include "mem/port.hh"
 #include "sim/sim_object.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/lsq_unit.hh
--- a/src/cpu/o3/lsq_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/lsq_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,10 +39,10 @@
 
 #include "arch/faults.hh"
 #include "arch/locked_mem.hh"
+#include "base/fast_alloc.hh"
+#include "base/hashmap.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "base/fast_alloc.hh"
-#include "base/hashmap.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/lsq_unit_impl.hh
--- a/src/cpu/o3/lsq_unit_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/lsq_unit_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,11 +42,11 @@
  */
 
 #include "arch/locked_mem.hh"
+#include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
-#include "base/str.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/mem_dep_unit.cc
--- a/src/cpu/o3/mem_dep_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/mem_dep_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/o3/mem_dep_unit_impl.hh"
 #include "cpu/o3/store_set.hh"
-#include "cpu/o3/mem_dep_unit_impl.hh"
 
 // Force instantation of memory dependency unit using store sets and
 // O3CPUImpl.
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/scoreboard.hh
--- a/src/cpu/o3/scoreboard.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/scoreboard.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <utility>
 #include <vector>
+
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "cpu/o3/comm.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/thread_context.hh
--- a/src/cpu/o3/thread_context.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/thread_context.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #define __CPU_O3_THREAD_CONTEXT_HH__
 
 #include "config/the_isa.hh"
+#include "cpu/o3/isa_specific.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/o3/isa_specific.hh"
 
 class EndQuiesceEvent;
 namespace Kernel {
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/o3/thread_context.cc
--- a/src/cpu/o3/thread_context.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/o3/thread_context.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context.hh"
 #include "cpu/o3/thread_context_impl.hh"
-#include "cpu/o3/impl.hh"
 
 template class O3ThreadContext<O3CPUImpl>;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/back_end.hh
--- a/src/cpu/ozone/back_end.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/back_end.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,13 +35,13 @@
 #include <queue>
 #include <string>
 
-#include "sim/faults.hh"
 #include "base/timebuf.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 class ThreadContext;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/back_end_impl.hh
--- a/src/cpu/ozone/back_end_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/back_end_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/back_end.hh"
 #include "encumbered/cpu/full/op_class.hh"
-#include "cpu/ozone/back_end.hh"
 
 template <class Impl>
 BackEnd<Impl>::InstQueue::InstQueue(Params *params)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/base_dyn_inst.cc
--- a/src/cpu/ozone/base_dyn_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/base_dyn_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/base_dyn_inst_impl.hh"
-#include "cpu/ozone/ozone_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<OzoneImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/checker_builder.cc
--- a/src/cpu/ozone/checker_builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/checker_builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "cpu/checker/cpu_impl.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/ozone_impl.hh"
+#include "cpu/inst_seq.hh"
 #include "params/OzoneChecker.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/cpu.hh
--- a/src/cpu/ozone/cpu.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/cpu.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,13 +37,13 @@
 #include "base/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "cpu/base.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/base.hh"
+#include "cpu/inst_seq.hh"
 #include "cpu/pc_event.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/cpu_builder.cc
--- a/src/cpu/ozone/cpu_builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/cpu_builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 #include <string>
 
 #include "cpu/checker/cpu.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/cpu.hh"
 #include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/simple_params.hh"
+#include "cpu/inst_seq.hh"
 #include "params/DerivOzoneCPU.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/cpu_impl.hh
--- a/src/cpu/ozone/cpu_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/cpu_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -29,28 +29,27 @@
  *          Nathan Binkert
  */
 
-#include "config/full_system.hh"
-#include "config/use_checker.hh"
-
 #include "arch/isa_traits.hh" // For MachInst
 #include "base/trace.hh"
+#include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "config/use_checker.hh"
+#include "cpu/ozone/cpu.hh"
 #include "cpu/base.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/quiesce_event.hh"
 #include "cpu/simple_thread.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/exetrace.hh"
-#include "cpu/ozone/cpu.hh"
-#include "cpu/quiesce_event.hh"
-#include "cpu/static_inst.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 
 #if FULL_SYSTEM
+#include "arch/alpha/osfpal.hh"
 #include "arch/faults.hh"
-#include "arch/alpha/osfpal.hh"
+#include "arch/kernel_stats.hh"
 #include "arch/tlb.hh"
 #include "arch/types.hh"
-#include "arch/kernel_stats.hh"
 #include "arch/vtophys.hh"
 #include "base/callback.hh"
 #include "cpu/profile.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/dyn_inst.hh
--- a/src/cpu/ozone/dyn_inst.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/dyn_inst.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,17 +31,17 @@
 #ifndef __CPU_OZONE_DYN_INST_HH__
 #define __CPU_OZONE_DYN_INST_HH__
 
+#include <list>
+#include <vector>
+
 #include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "cpu/ozone/cpu.hh"   // MUST include this
+#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/base_dyn_inst.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/ozone/cpu.hh"   // MUST include this
-#include "cpu/ozone/ozone_impl.hh"
-
-#include <list>
-#include <vector>
 
 template <class Impl>
 class OzoneDynInst : public BaseDynInst<Impl>
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/dyn_inst_impl.hh
--- a/src/cpu/ozone/dyn_inst_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/dyn_inst_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,10 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/dyn_inst.hh"
+#include "sim/faults.hh"
 
 #if FULL_SYSTEM
 #include "kern/kernel_stats.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/ea_list.cc
--- a/src/cpu/ozone/ea_list.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/ea_list.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
  */
 
 #include "arch/isa_traits.hh"
+#include "cpu/ooo_cpu/ea_list.hh"
 #include "cpu/inst_seq.hh"
-#include "cpu/ooo_cpu/ea_list.hh"
 
 void
 EAList::addAddr(const InstSeqNum &new_sn, const Addr &new_ea)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/front_end.hh
--- a/src/cpu/ozone/front_end.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/front_end.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,9 +36,9 @@
 #include "arch/utility.hh"
 #include "base/timebuf.hh"
 #include "config/the_isa.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/bpred_unit.hh"
 #include "cpu/ozone/rename_table.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/port.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/front_end_impl.hh
--- a/src/cpu/ozone/front_end_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/front_end_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -28,18 +28,18 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/statistics.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
+#include "cpu/ozone/front_end.hh"
+#include "cpu/exetrace.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/exetrace.hh"
-#include "cpu/ozone/front_end.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
+#include "sim/faults.hh"
 
 #if USE_CHECKER
 #include "cpu/checker/cpu.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/inorder_back_end.hh
--- a/src/cpu/ozone/inorder_back_end.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/inorder_back_end.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,14 +33,14 @@
 
 #include <list>
 
-#include "sim/faults.hh"
 #include "base/timebuf.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
+#include "cpu/thread_context.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 template <class Impl>
 class InorderBackEnd
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/inorder_back_end_impl.hh
--- a/src/cpu/ozone/inorder_back_end_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/inorder_back_end_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,11 @@
  * Authors: Kevin Lim
  */
 
-#include "sim/faults.hh"
 #include "arch/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/inorder_back_end.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "sim/faults.hh"
 
 template <class Impl>
 InorderBackEnd<Impl>::InorderBackEnd(Params *params)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/inst_queue.cc
--- a/src/cpu/ozone/inst_queue.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/inst_queue.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  */
 
 #include "cpu/ozone/dyn_inst.hh"
+#include "cpu/ozone/inst_queue_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
-#include "cpu/ozone/inst_queue_impl.hh"
 
 // Force instantiation of InstructionQueue.
 template class InstQueue<SimpleImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/inst_queue_impl.hh
--- a/src/cpu/ozone/inst_queue_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/inst_queue_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,9 +38,8 @@
 
 #include <vector>
 
+#include "cpu/ozone/inst_queue.hh"
 #include "sim/core.hh"
-
-#include "cpu/ozone/inst_queue.hh"
 #if 0
 template <class Impl>
 InstQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst,
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lsq_unit.hh
--- a/src/cpu/ozone/lsq_unit.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lsq_unit.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,15 +31,15 @@
 #ifndef __CPU_OZONE_LSQ_UNIT_HH__
 #define __CPU_OZONE_LSQ_UNIT_HH__
 
+#include <algorithm>
 #include <map>
 #include <queue>
-#include <algorithm>
 
 #include "arch/faults.hh"
 #include "arch/types.hh"
+#include "base/hashmap.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "base/hashmap.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/mem_interface.hh"
 //#include "mem/page_table.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lsq_unit.cc
--- a/src/cpu/ozone/lsq_unit.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lsq_unit.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/lsq_unit_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
-#include "cpu/ozone/lsq_unit_impl.hh"
 
 // Force the instantiation of LDSTQ for all the implementations we care about.
 template class OzoneLSQ<OzoneImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lw_back_end.hh
--- a/src/cpu/ozone/lw_back_end.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lw_back_end.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,13 +36,13 @@
 #include <set>
 #include <string>
 
-#include "sim/faults.hh"
 #include "base/timebuf.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"
+#include "sim/faults.hh"
 
 template <class>
 class Checker;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lw_lsq.hh
--- a/src/cpu/ozone/lw_lsq.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lw_lsq.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,17 +31,17 @@
 #ifndef __CPU_OZONE_LW_LSQ_HH__
 #define __CPU_OZONE_LW_LSQ_HH__
 
+#include <algorithm>
 #include <list>
 #include <map>
 #include <queue>
-#include <algorithm>
 
 #include "arch/faults.hh"
 #include "arch/types.hh"
+#include "base/fast_alloc.hh"
+#include "base/hashmap.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
-#include "base/fast_alloc.hh"
-#include "base/hashmap.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lw_lsq.cc
--- a/src/cpu/ozone/lw_lsq.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lw_lsq.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/lw_lsq_impl.hh"
 #include "cpu/ozone/ozone_impl.hh"
-#include "cpu/ozone/lw_lsq_impl.hh"
 
 // Force the instantiation of LDSTQ for all the implementations we care about.
 template class OzoneLWLSQ<OzoneImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/lw_lsq_impl.hh
--- a/src/cpu/ozone/lw_lsq_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/lw_lsq_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
+#include "cpu/checker/cpu.hh"
 #include "cpu/ozone/lw_lsq.hh"
-#include "cpu/checker/cpu.hh"
 
 template<class Impl>
 OzoneLWLSQ<Impl>::WritebackEvent::WritebackEvent(DynInstPtr &_inst, PacketPtr _pkt,
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/ozone_base_dyn_inst.cc
--- a/src/cpu/ozone/ozone_base_dyn_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/ozone_base_dyn_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/base_dyn_inst_impl.hh"
-#include "cpu/ozone/ozone_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<OzoneImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/ozone_impl.hh
--- a/src/cpu/ozone/ozone_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/ozone_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,12 @@
 #define __CPU_OZONE_OZONE_IMPL_HH__
 
 #include "cpu/o3/bpred_unit.hh"
+#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/front_end.hh"
 #include "cpu/ozone/inst_queue.hh"
+#include "cpu/ozone/lw_back_end.hh"
 #include "cpu/ozone/lw_lsq.hh"
-#include "cpu/ozone/lw_back_end.hh"
 #include "cpu/ozone/null_predictor.hh"
-#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/simple_params.hh"
 
 template <class Impl>
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/rename_table.cc
--- a/src/cpu/ozone/rename_table.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/rename_table.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/ozone_impl.hh"
 #include "cpu/ozone/rename_table_impl.hh"
-#include "cpu/ozone/ozone_impl.hh"
 //#include "cpu/ozone/simple_impl.hh"
 
 template class RenameTable<OzoneImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/simple_base_dyn_inst.cc
--- a/src/cpu/ozone/simple_base_dyn_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/simple_base_dyn_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/ozone/simple_impl.hh"
 #include "cpu/base_dyn_inst_impl.hh"
-#include "cpu/ozone/simple_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<SimpleImpl>;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/simple_cpu_builder.cc
--- a/src/cpu/ozone/simple_cpu_builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/simple_cpu_builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 #include <string>
 
 #include "cpu/checker/cpu.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/ozone/cpu_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
 #include "cpu/ozone/simple_params.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/cache/base.hh"
 #include "sim/SimpleOzoneCPU.hh"
 #include "sim/process.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/ozone/simple_impl.hh
--- a/src/cpu/ozone/simple_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/ozone/simple_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,10 +33,10 @@
 
 #include "cpu/o3/bpred_unit.hh"
 #include "cpu/ozone/cpu.hh"
+#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/front_end.hh"
 #include "cpu/ozone/inorder_back_end.hh"
 #include "cpu/ozone/null_predictor.hh"
-#include "cpu/ozone/dyn_inst.hh"
 #include "cpu/ozone/simple_params.hh"
 
 //template <class Impl>
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/pc_event.cc
--- a/src/cpu/pc_event.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/pc_event.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #include "base/trace.hh"
 #include "config/full_system.hh"
 #include "cpu/base.hh"
+#include "cpu/pc_event.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/pc_event.hh"
 #include "sim/core.hh"
 #include "sim/system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/profile.hh
--- a/src/cpu/profile.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/profile.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 #include <map>
 
 #include "arch/stacktrace.hh"
+#include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/static_inst.hh"
-#include "base/types.hh"
 
 class ThreadContext;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/profile.cc
--- a/src/cpu/profile.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/profile.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,14 +30,14 @@
 
 #include <string>
 
+#include "base/loader/symtab.hh"
 #include "base/bitfield.hh"
 #include "base/callback.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
-#include "base/loader/symtab.hh"
 #include "cpu/base.hh"
+#include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/profile.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/quiesce_event.cc
--- a/src/cpu/quiesce_event.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/quiesce_event.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 #include "cpu/base.hh"
+#include "cpu/quiesce_event.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/quiesce_event.hh"
 
 EndQuiesceEvent::EndQuiesceEvent(ThreadContext *_tc)
     : tc(_tc)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple/atomic.cc
--- a/src/cpu/simple/atomic.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple/atomic.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "config/the_isa.hh"
+#include "cpu/simple/atomic.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/simple/atomic.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/AtomicSimpleCPU.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple/base.hh
--- a/src/cpu/simple/base.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple/base.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
+#include "cpu/pc_event.hh"
 #include "cpu/simple_thread.hh"
-#include "cpu/pc_event.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple/base.cc
--- a/src/cpu/simple/base.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple/base.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -42,20 +42,20 @@
 
 #include "arch/faults.hh"
 #include "arch/utility.hh"
+#include "base/loader/symtab.hh"
 #include "base/cp_annotate.hh"
 #include "base/cprintf.hh"
 #include "base/inifile.hh"
-#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "base/range.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
+#include "cpu/simple/base.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/profile.hh"
-#include "cpu/simple/base.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/smt.hh"
 #include "cpu/static_inst.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple/timing.hh
--- a/src/cpu/simple/timing.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple/timing.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,7 +33,6 @@
 
 #include "cpu/simple/base.hh"
 #include "cpu/translation.hh"
-
 #include "params/TimingSimpleCPU.hh"
 
 class TimingSimpleCPU : public BaseSimpleCPU
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple/timing.cc
--- a/src/cpu/simple/timing.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple/timing.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -45,8 +45,8 @@
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "config/the_isa.hh"
+#include "cpu/simple/timing.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/simple/timing.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/TimingSimpleCPU.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/simple_thread.hh
--- a/src/cpu/simple_thread.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/simple_thread.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -66,8 +66,8 @@
 
 #else // !FULL_SYSTEM
 
+#include "mem/page_table.hh"
 #include "sim/process.hh"
-#include "mem/page_table.hh"
 class TranslatingPort;
 
 #endif // FULL_SYSTEM
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/static_inst.hh
--- a/src/cpu/static_inst.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/static_inst.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,13 +35,13 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
+#include "arch/registers.hh"
 #include "arch/types.hh"
-#include "arch/registers.hh"
-#include "config/the_isa.hh"
 #include "base/hashmap.hh"
 #include "base/misc.hh"
 #include "base/refcnt.hh"
 #include "base/types.hh"
+#include "config/the_isa.hh"
 #include "cpu/op_class.hh"
 #include "sim/fault.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/static_inst.cc
--- a/src/cpu/static_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/static_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,6 +30,7 @@
  */
 
 #include <iostream>
+
 #include "cpu/static_inst.hh"
 #include "sim/core.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/directedtest/InvalidateGenerator.hh
--- a/src/cpu/testers/directedtest/InvalidateGenerator.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/directedtest/InvalidateGenerator.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #ifndef __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__
 #define __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__
 
+#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/RubyDirectedTester.hh"
-#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "mem/protocol/InvalidateGeneratorStatus.hh"
 #include "params/InvalidateGenerator.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/directedtest/InvalidateGenerator.cc
--- a/src/cpu/testers/directedtest/InvalidateGenerator.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -27,9 +27,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 #include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/InvalidateGenerator.hh"
+#include "cpu/testers/directedtest/RubyDirectedTester.hh"
 
 InvalidateGenerator::InvalidateGenerator(const Params *p)
     : DirectedGenerator(p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/directedtest/RubyDirectedTester.hh
--- a/src/cpu/testers/directedtest/RubyDirectedTester.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,15 +31,15 @@
 #define __CPU_DIRECTEDTEST_RUBYDIRECTEDTESTER_HH__
 
 #include <iostream>
+#include <string>
 #include <vector>
-#include <string>
 
-#include "mem/mem_object.hh"
-#include "mem/packet.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/mem_object.hh"
+#include "mem/packet.hh"
 #include "params/RubyDirectedTester.hh"
 
 class DirectedGenerator;
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/memtest/memtest.hh
--- a/src/cpu/testers/memtest/memtest.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/memtest/memtest.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,15 +34,15 @@
 
 #include <set>
 
+#include "base/fast_alloc.hh"
 #include "base/statistics.hh"
-#include "base/fast_alloc.hh"
+#include "mem/mem_object.hh"
+#include "mem/port.hh"
 #include "params/MemTest.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
-#include "mem/mem_object.hh"
-#include "mem/port.hh"
 
 class Packet;
 class MemTest : public MemObject
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/memtest/memtest.cc
--- a/src/cpu/testers/memtest/memtest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/memtest/memtest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,8 @@
 #include "base/statistics.hh"
 #include "cpu/testers/memtest/memtest.hh"
 #include "mem/mem_object.hh"
+#include "mem/packet.hh"
 #include "mem/port.hh"
-#include "mem/packet.hh"
 #include "mem/request.hh"
 #include "sim/sim_events.hh"
 #include "sim/stats.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/rubytest/CheckTable.cc
--- a/src/cpu/testers/rubytest/CheckTable.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/rubytest/CheckTable.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,7 +30,6 @@
 #include "base/intmath.hh"
 #include "cpu/testers/rubytest/Check.hh"
 #include "cpu/testers/rubytest/CheckTable.hh"
-#include "cpu/testers/rubytest/CheckTable.hh"
 
 CheckTable::CheckTable(int _num_cpu_sequencers, RubyTester* _tester)
     : m_num_cpu_sequencers(_num_cpu_sequencers), m_tester_ptr(_tester)
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/testers/rubytest/RubyTester.hh
--- a/src/cpu/testers/rubytest/RubyTester.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/testers/rubytest/RubyTester.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,16 +31,16 @@
 #define __CPU_RUBYTEST_RUBYTESTER_HH__
 
 #include <iostream>
+#include <string>
 #include <vector>
-#include <string>
 
 #include "cpu/testers/rubytest/CheckTable.hh"
-#include "mem/mem_object.hh"
-#include "mem/packet.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/mem_object.hh"
+#include "mem/packet.hh"
 #include "params/RubyTester.hh"
 
 class RubyTester : public MemObject
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/thread_context.hh
--- a/src/cpu/thread_context.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/thread_context.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __CPU_THREAD_CONTEXT_HH__
 #define __CPU_THREAD_CONTEXT_HH__
 
+#include <iostream>
 #include <string>
-#include <iostream>
 
 #include "arch/registers.hh"
 #include "arch/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/thread_state.hh
--- a/src/cpu/thread_state.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/thread_state.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,9 @@
 
 #include "arch/types.hh"
 #include "config/the_isa.hh"
+#include "cpu/base.hh"
 #include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 
 #if !FULL_SYSTEM
 #include "mem/mem_object.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/trace/opt_cpu.cc
--- a/src/cpu/trace/opt_cpu.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/trace/opt_cpu.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For heap functions.
 
+#include "cpu/trace/reader/mem_trace_reader.hh"
 #include "cpu/trace/opt_cpu.hh"
-#include "cpu/trace/reader/mem_trace_reader.hh"
 #include "params/OptCPU.hh"
 #include "sim/sim_events.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/trace/reader/ibm_reader.hh
--- a/src/cpu/trace/reader/ibm_reader.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/trace/reader/ibm_reader.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,7 +36,8 @@
 #ifndef __IBM_READER_HH__
 #define __IBM_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
+
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/trace/reader/itx_reader.hh
--- a/src/cpu/trace/reader/itx_reader.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/trace/reader/itx_reader.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,13 +36,12 @@
 #ifndef __ITX_READER_HH__
 #define __ITX_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 
-
 /**
  * A memory trace reader for the Intel ITX memory trace format.
  */
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/trace/reader/mem_trace_reader.hh
--- a/src/cpu/trace/reader/mem_trace_reader.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/trace/reader/mem_trace_reader.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #ifndef __MEM_TRACE_READER_HH__
 #define __MEM_TRACE_READER_HH__
 
+#include "mem/mem_req.hh" // For MemReqPtr
 #include "sim/sim_object.hh"
-#include "mem/mem_req.hh" // For MemReqPtr
 
 /**
  * Pure virtual base class for memory trace readers.
diff -r 8e0ea3a48928 -r 3baf50481316 src/cpu/trace/trace_cpu.cc
--- a/src/cpu/trace/trace_cpu.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/cpu/trace/trace_cpu.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For min
 
+#include "cpu/trace/reader/mem_trace_reader.hh"
 #include "cpu/trace/trace_cpu.hh"
-#include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/base_mem.hh" // For PARAM constructor
 #include "mem/mem_interface.hh"
 #include "params/TraceCPU.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/alpha/tsunami.cc
--- a/src/dev/alpha/tsunami.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/alpha/tsunami.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,10 +38,10 @@
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
+#include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunami_pchip.hh"
-#include "dev/alpha/tsunami_io.hh"
-#include "dev/alpha/tsunami.hh"
 #include "dev/terminal.hh"
 #include "sim/system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/alpha/tsunami_io.hh
--- a/src/dev/alpha/tsunami_io.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/alpha/tsunami_io.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/intel_8254_timer.hh"
+#include "dev/io_device.hh"
 #include "dev/mc146818.hh"
-#include "dev/io_device.hh"
 #include "params/TsunamiIO.hh"
 #include "sim/eventq.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/alpha/tsunami_io.cc
--- a/src/dev/alpha/tsunami_io.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/alpha/tsunami_io.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
-#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunamireg.h"
+#include "dev/rtcreg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/alpha/tsunami_pchip.cc
--- a/src/dev/alpha/tsunami_pchip.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/alpha/tsunami_pchip.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_pchip.hh"
 #include "dev/alpha/tsunamireg.h"
-#include "dev/alpha/tsunami.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/arm/amba_device.hh
--- a/src/dev/arm/amba_device.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/arm/amba_device.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -50,8 +50,8 @@
 #define __DEV_ARM_AMBA_DEVICE_HH__
 
 #include "base/range.hh"
+#include "dev/arm/gic.hh"
 #include "dev/io_device.hh"
-#include "dev/arm/gic.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/AmbaDevice.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/arm/amba_device.cc
--- a/src/dev/arm/amba_device.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/arm/amba_device.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,8 +41,8 @@
  */
 
 #include "base/trace.hh"
+#include "dev/arm/amba_device.hh"
 #include "dev/arm/amba_fake.hh"
-#include "dev/arm/amba_device.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/disk_image.hh
--- a/src/dev/disk_image.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/disk_image.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,10 +38,10 @@
 #include <fstream>
 
 #include "base/hashmap.hh"
+#include "params/CowDiskImage.hh"
+#include "params/DiskImage.hh"
+#include "params/RawDiskImage.hh"
 #include "sim/sim_object.hh"
-#include "params/DiskImage.hh"
-#include "params/CowDiskImage.hh"
-#include "params/RawDiskImage.hh"
 
 #define SectorSize (512)
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/disk_image.cc
--- a/src/dev/disk_image.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/disk_image.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <cstring>
 #include <fstream>
 #include <string>
@@ -45,8 +45,8 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "dev/disk_image.hh"
+#include "sim/byteswap.hh"
 #include "sim/sim_exit.hh"
-#include "sim/byteswap.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/etherbus.hh
--- a/src/dev/etherbus.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/etherbus.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,12 +35,11 @@
 #ifndef __ETHERBUS_H__
 #define __ETHERBUS_H__
 
+#include "dev/etherobject.hh"
+#include "dev/etherpkt.hh"
+#include "params/EtherBus.hh"
 #include "sim/eventq.hh"
-#include "dev/etherpkt.hh"
-#include "dev/etherobject.hh"
-#include "params/EtherBus.hh"
 #include "sim/sim_object.hh"
-#include "params/EtherBus.hh"
 
 class EtherDump;
 class EtherInt;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/etherdump.hh
--- a/src/dev/etherdump.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/etherdump.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,9 +36,10 @@
 #define __ETHERDUMP_H__
 
 #include <fstream>
+
 #include "dev/etherpkt.hh"
+#include "params/EtherDump.hh"
 #include "sim/sim_object.hh"
-#include "params/EtherDump.hh"
 
 /*
  * Simple object for creating a simple pcap style packet trace
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/etherint.cc
--- a/src/dev/etherint.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/etherint.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "base/misc.hh"
 #include "dev/etherint.hh"
-#include "base/misc.hh"
 #include "sim/sim_object.hh"
 
 void
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/etherlink.hh
--- a/src/dev/etherlink.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/etherlink.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,7 +40,6 @@
 #include "dev/etherobject.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
-#include "params/EtherLink.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/etherlink.cc
--- a/src/dev/etherlink.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/etherlink.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -45,9 +45,9 @@
 #include "dev/etherlink.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
+#include "sim/core.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"
-#include "sim/core.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/ethertap.hh
--- a/src/dev/ethertap.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/ethertap.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,8 +39,8 @@
 #include <string>
 
 #include "base/pollevent.hh"
+#include "dev/etherint.hh"
 #include "dev/etherobject.hh"
-#include "dev/etherint.hh"
 #include "dev/etherpkt.hh"
 #include "params/EtherTap.hh"
 #include "sim/eventq.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/ethertap.cc
--- a/src/dev/ethertap.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/ethertap.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #endif
 #include <netinet/in.h>
-
 #include <unistd.h>
 
 #include <deque>
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/ide_ctrl.hh
--- a/src/dev/ide_ctrl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/ide_ctrl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,9 +38,9 @@
 #define __IDE_CTRL_HH__
 
 #include "base/bitunion.hh"
+#include "dev/io_device.hh"
 #include "dev/pcidev.hh"
 #include "dev/pcireg.h"
-#include "dev/io_device.hh"
 #include "params/IdeController.hh"
 
 class IdeDisk;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/ide_disk.hh
--- a/src/dev/ide_disk.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/ide_disk.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -41,9 +41,8 @@
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_wdcreg.h"
 #include "dev/io_device.hh"
+#include "params/IdeDisk.hh"
 #include "sim/eventq.hh"
-#include "params/IdeDisk.hh"
-
 
 class ChunkGenerator;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/ide_disk.cc
--- a/src/dev/ide_disk.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/ide_disk.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,10 +39,10 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
-#include "config/the_isa.hh"
 #include "base/chunk_generator.hh"
 #include "base/cprintf.hh" // csprintf
 #include "base/trace.hh"
+#include "config/the_isa.hh"
 #include "dev/disk_image.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_disk.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/intel_8254_timer.hh
--- a/src/dev/intel_8254_timer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/intel_8254_timer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 #ifndef __DEV_8254_HH__
 #define __DEV_8254_HH__
 
+#include <iostream>
 #include <string>
-#include <iostream>
 
 #include "base/bitunion.hh"
 #include "base/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/io_device.cc
--- a/src/dev/io_device.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/io_device.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,7 +34,6 @@
 #include "dev/io_device.hh"
 #include "sim/system.hh"
 
-
 PioPort::PioPort(PioDevice *dev, System *s, std::string pname)
     : SimpleTimingPort(dev->name() + pname, dev), device(dev)
 { }
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/isa_fake.hh
--- a/src/dev/isa_fake.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/isa_fake.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/io_device.hh"
 // #include "dev/alpha/tsunami.hh"
+#include "mem/packet.hh"
 #include "params/IsaFake.hh"
-#include "mem/packet.hh"
 
 /**
  * IsaFake is a device that returns, BadAddr, 1 or 0 on all reads and
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mc146818.cc
--- a/src/dev/mc146818.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mc146818.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
  */
 
 #include <sys/time.h>
-#include <time.h>
 
+#include <ctime>
 #include <string>
 
 #include "base/bitfield.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mips/malta.cc
--- a/src/dev/mips/malta.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mips/malta.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,10 +39,10 @@
 
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
+#include "dev/mips/malta_io.hh"
 #include "dev/mips/malta_pchip.hh"
-#include "dev/mips/malta_io.hh"
-#include "dev/mips/malta.hh"
 #include "dev/terminal.hh"
 #include "params/Malta.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mips/malta_cchip.hh
--- a/src/dev/mips/malta_cchip.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mips/malta_cchip.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,8 @@
 #ifndef __MALTA_CCHIP_HH__
 #define __MALTA_CCHIP_HH__
 
+#include "base/range.hh"
 #include "dev/mips/malta.hh"
-#include "base/range.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaCChip.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mips/malta_io.cc
--- a/src/dev/mips/malta_io.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mips/malta_io.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -43,11 +43,11 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
-#include "dev/mips/malta.hh"
 #include "dev/mips/malta_io.hh"
 #include "dev/mips/maltareg.h"
+#include "dev/rtcreg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mips/malta_pchip.hh
--- a/src/dev/mips/malta_pchip.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mips/malta_pchip.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #ifndef __MALTA_PCHIP_HH__
 #define __MALTA_PCHIP_HH__
 
+#include "base/range.hh"
 #include "dev/mips/malta.hh"
-#include "base/range.hh"
 #include "dev/io_device.hh"
 #include "params/MaltaPChip.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/mips/malta_pchip.cc
--- a/src/dev/mips/malta_pchip.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/mips/malta_pchip.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,9 +39,9 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "dev/mips/malta.hh"
 #include "dev/mips/malta_pchip.hh"
 #include "dev/mips/maltareg.h"
-#include "dev/mips/malta.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/system.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/pciconfigall.hh
--- a/src/dev/pciconfigall.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/pciconfigall.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,12 +37,11 @@
 #ifndef __PCICONFIGALL_HH__
 #define __PCICONFIGALL_HH__
 
-#include "dev/pcireg.h"
 #include "base/range.hh"
 #include "dev/io_device.hh"
+#include "dev/pcireg.h"
 #include "params/PciConfigAll.hh"
 
-
 /**
  * PCI Config Space
  * All of PCI config space needs to return -1 on Tsunami, except
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/platform.hh
--- a/src/dev/platform.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/platform.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 #include <bitset>
 #include <set>
 
-#include "sim/sim_object.hh"
 #include "arch/isa_traits.hh"
 #include "params/Platform.hh"
+#include "sim/sim_object.hh"
 
 class PciConfigAll;
 class IntrControl;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/simple_disk.hh
--- a/src/dev/simple_disk.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/simple_disk.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,9 +35,9 @@
 #ifndef __DEV_SIMPLE_DISK_HH__
 #define __DEV_SIMPLE_DISK_HH__
 
-#include "sim/sim_object.hh"
 #include "arch/isa_traits.hh"
 #include "params/SimpleDisk.hh"
+#include "sim/sim_object.hh"
 
 class DiskImage;
 class System;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/sparc/iob.hh
--- a/src/dev/sparc/iob.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/sparc/iob.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_IOB_HH__
 
 #include "base/range.hh"
+#include "dev/disk_image.hh"
 #include "dev/io_device.hh"
-#include "dev/disk_image.hh"
 #include "params/Iob.hh"
 
 class IntrControl;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/sparc/iob.cc
--- a/src/dev/sparc/iob.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/sparc/iob.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,15 +37,15 @@
 
 #include <cstring>
 
+#include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/faults.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
 #include "dev/sparc/iob.hh"
 #include "dev/platform.hh"
+#include "mem/packet_access.hh"
 #include "mem/port.hh"
-#include "mem/packet_access.hh"
 #include "sim/faults.hh"
 #include "sim/system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/sparc/mm_disk.hh
--- a/src/dev/sparc/mm_disk.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/sparc/mm_disk.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,8 @@
 #define __DEV_SPARC_MM_DISK_HH__
 
 #include "base/range.hh"
+#include "dev/disk_image.hh"
 #include "dev/io_device.hh"
-#include "dev/disk_image.hh"
 #include "params/MmDisk.hh"
 
 class MmDisk : public BasicPioDevice
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/sparc/mm_disk.cc
--- a/src/dev/sparc/mm_disk.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/sparc/mm_disk.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #include "base/trace.hh"
 #include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
+#include "mem/packet_access.hh"
 #include "mem/port.hh"
-#include "mem/packet_access.hh"
 #include "sim/byteswap.hh"
 #include "sim/system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/terminal.hh
--- a/src/dev/terminal.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/terminal.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,11 +39,11 @@
 #include <iostream>
 
 #include "base/circlebuf.hh"
-#include "cpu/intr_control.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
+#include "cpu/intr_control.hh"
+#include "params/Terminal.hh"
 #include "sim/sim_object.hh"
-#include "params/Terminal.hh"
 
 class TerminalListener;
 class Uart;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/terminal.cc
--- a/src/dev/terminal.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/terminal.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -35,13 +35,13 @@
 
 #include <sys/ioctl.h>
 #include <sys/termios.h>
-#include <errno.h>
 #include <poll.h>
 #include <unistd.h>
 
 #include <cctype>
+#include <cerrno>
+#include <fstream>
 #include <iostream>
-#include <fstream>
 #include <sstream>
 #include <string>
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/i8042.hh
--- a/src/dev/x86/i8042.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/i8042.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,12 +31,12 @@
 #ifndef __DEV_X86_I8042_HH__
 #define __DEV_X86_I8042_HH__
 
+#include <queue>
+
+#include "dev/x86/intdev.hh"
 #include "dev/io_device.hh"
-#include "dev/x86/intdev.hh"
 #include "params/I8042.hh"
 
-#include <queue>
-
 namespace X86ISA
 {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/i82094aa.hh
--- a/src/dev/x86/i82094aa.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/i82094aa.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,14 +31,14 @@
 #ifndef __DEV_X86_I82094AA_HH__
 #define __DEV_X86_I82094AA_HH__
 
+#include <map>
+
 #include "base/bitunion.hh"
 #include "base/range_map.hh"
+#include "dev/x86/intdev.hh"
 #include "dev/io_device.hh"
-#include "dev/x86/intdev.hh"
 #include "params/I82094AA.hh"
 
-#include <map>
-
 namespace X86ISA
 {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/i8259.hh
--- a/src/dev/x86/i8259.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/i8259.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 #ifndef __DEV_X86_I8259_HH__
 #define __DEV_X86_I8259_HH__
 
+#include "dev/x86/intdev.hh"
 #include "dev/io_device.hh"
-#include "dev/x86/intdev.hh"
+#include "enums/X86I8259CascadeMode.hh"
 #include "params/I8259.hh"
-#include "enums/X86I8259CascadeMode.hh"
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/intdev.hh
--- a/src/dev/x86/intdev.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/intdev.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,18 +32,17 @@
 #define __DEV_X86_INTDEV_HH__
 
 #include <cassert>
+#include <list>
 #include <string>
 
+#include "arch/x86/intmessage.hh"
 #include "arch/x86/x86_traits.hh"
-#include "arch/x86/intmessage.hh"
 #include "mem/mem_object.hh"
 #include "mem/mport.hh"
+#include "params/X86IntLine.hh"
+#include "params/X86IntSinkPin.hh"
+#include "params/X86IntSourcePin.hh"
 #include "sim/sim_object.hh"
-#include "params/X86IntSourcePin.hh"
-#include "params/X86IntSinkPin.hh"
-#include "params/X86IntLine.hh"
-
-#include <list>
 
 namespace X86ISA {
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/pc.cc
--- a/src/dev/x86/pc.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/pc.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,12 +40,12 @@
 #include "arch/x86/x86_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
-#include "dev/terminal.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/i8259.hh"
 #include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
+#include "dev/terminal.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/dev/x86/south_bridge.hh
--- a/src/dev/x86/south_bridge.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/dev/x86/south_bridge.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __DEV_X86_SOUTH_BRIDGE_HH__
 #define __DEV_X86_SOUTH_BRIDGE_HH__
 
+#include "params/SouthBridge.hh"
 #include "sim/sim_object.hh"
-#include "params/SouthBridge.hh"
 
 namespace X86ISA
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/kernel_stats.hh
--- a/src/kern/kernel_stats.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/kernel_stats.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #include <string>
 
 #include "cpu/static_inst.hh"
+#include "sim/serialize.hh"
 #include "sim/stats.hh"
-#include "sim/serialize.hh"
 
 class BaseCPU;
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/kernel_stats.cc
--- a/src/kern/kernel_stats.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/kernel_stats.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
+#include "kern/tru64/tru64_syscalls.hh"
 #include "kern/kernel_stats.hh"
-#include "kern/tru64/tru64_syscalls.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/linux/printk.cc
--- a/src/kern/linux/printk.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/linux/printk.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,11 +30,12 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
-#include "sim/arguments.hh"
 #include "base/trace.hh"
 #include "kern/linux/printk.hh"
+#include "sim/arguments.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/operatingsystem.cc
--- a/src/kern/operatingsystem.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/operatingsystem.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
  */
 
 
+#include "base/misc.hh"
 #include "kern/operatingsystem.hh"
-#include "base/misc.hh"
 
 int
 OperatingSystem::openSpecialFile(std::string path, LiveProcess *process, ThreadContext *tc)
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/tru64/dump_mbuf.cc
--- a/src/kern/tru64/dump_mbuf.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/tru64/dump_mbuf.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,12 +29,13 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/tru64/printf.cc
--- a/src/kern/tru64/printf.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/tru64/printf.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,6 +29,7 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/vtophys.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/tru64/tru64.hh
--- a/src/kern/tru64/tru64.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/tru64/tru64.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -42,23 +42,24 @@
 
 #else //!FULL_SYSTEM
 
+#include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
+#include <sys/mount.h>
 #include <sys/param.h>
-#include <sys/mount.h>
 #else
 #include <sys/statfs.h>
 #endif
 
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <string.h>     // for memset()
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstring>     // for memset()
+
+#include "arch/alpha/registers.hh"
 #include "config/the_isa.hh"
-#include "arch/alpha/registers.hh"
 #include "cpu/base.hh"
 #include "sim/core.hh"
 #include "sim/syscall_emul.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/kern/tru64/tru64_events.cc
--- a/src/kern/tru64/tru64_events.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/kern/tru64/tru64_events.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,12 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
-#include "kern/system_events.hh"
-#include "kern/tru64/tru64_events.hh"
 #include "kern/tru64/dump_mbuf.hh"
 #include "kern/tru64/printf.hh"
+#include "kern/tru64/tru64_events.hh"
+#include "kern/system_events.hh"
 #include "sim/arguments.hh"
 #include "sim/system.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/bridge.hh
--- a/src/mem/bridge.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/bridge.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,9 @@
 #ifndef __MEM_BRIDGE_HH__
 #define __MEM_BRIDGE_HH__
 
-#include <string>
 #include <list>
 #include <queue>
+#include <string>
 
 #include "base/fast_alloc.hh"
 #include "base/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/bus.hh
--- a/src/mem/bus.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/bus.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,9 +37,9 @@
 #ifndef __MEM_BUS_HH__
 #define __MEM_BUS_HH__
 
+#include <list>
+#include <set>
 #include <string>
-#include <set>
-#include <list>
 
 #include "base/hashmap.hh"
 #include "base/range.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/base.hh
--- a/src/mem/cache/base.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/base.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -51,8 +51,8 @@
 #include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
+#include "mem/request.hh"
 #include "mem/tport.hh"
-#include "mem/request.hh"
 #include "params/BaseCache.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/blk.hh
--- a/src/mem/cache/blk.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/blk.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,11 +37,11 @@
 
 #include <list>
 
+#include "arch/isa_traits.hh"   // for Addr
 #include "base/printable.hh"
-#include "sim/core.hh"          // for Tick
-#include "arch/isa_traits.hh"   // for Addr
 #include "mem/packet.hh"
 #include "mem/request.hh"
+#include "sim/core.hh"          // for Tick
 
 /**
  * Cache block status bit assignments
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/builder.cc
--- a/src/mem/cache/builder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/builder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,9 +38,9 @@
 
 #include "config/the_isa.hh"
 #include "enums/Prefetch.hh"
-#include "mem/config/cache.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/cache.hh"
+#include "mem/config/cache.hh"
 #include "mem/bus.hh"
 #include "params/BaseCache.hh"
 
@@ -59,9 +59,8 @@
 
 //Prefetcher Headers
 #include "mem/cache/prefetch/ghb.hh"
+#include "mem/cache/prefetch/stride.hh"
 #include "mem/cache/prefetch/tagged.hh"
-#include "mem/cache/prefetch/stride.hh"
-
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/cache.hh
--- a/src/mem/cache/cache.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/cache.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,11 +40,9 @@
 #define __CACHE_HH__
 
 #include "base/misc.hh" // fatal, panic, and warn
-
 #include "mem/cache/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/mshr.hh"
-
 #include "sim/eventq.hh"
 
 //Forward decleration
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/cache_impl.hh
--- a/src/mem/cache/cache_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/cache_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -54,10 +54,10 @@
 #include "base/misc.hh"
 #include "base/range.hh"
 #include "base/types.hh"
+#include "mem/cache/prefetch/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/cache.hh"
 #include "mem/cache/mshr.hh"
-#include "mem/cache/prefetch/base.hh"
 #include "sim/sim_exit.hh"
 
 template<class TagStore>
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/mshr_queue.hh
--- a/src/mem/cache/mshr_queue.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/mshr_queue.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,8 +37,8 @@
 
 #include <vector>
 
+#include "mem/cache/mshr.hh"
 #include "mem/packet.hh"
-#include "mem/cache/mshr.hh"
 
 /**
  * A Class for maintaining a list of pending and allocated memory requests.
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/prefetch/base.cc
--- a/src/mem/cache/prefetch/base.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/prefetch/base.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "mem/cache/prefetch/base.hh"
 #include "mem/cache/base.hh"
-#include "mem/cache/prefetch/base.hh"
 #include "mem/request.hh"
 
 BasePrefetcher::BasePrefetcher(const BaseCacheParams *p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/prefetch/stride.hh
--- a/src/mem/cache/prefetch/stride.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/prefetch/stride.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,7 +36,8 @@
 #ifndef __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 
-#include <limits.h>
+#include <climits>
+
 #include "mem/cache/prefetch/base.hh"
 
 class StridePrefetcher : public BasePrefetcher
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/base.hh
--- a/src/mem/cache/tags/base.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/base.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,9 @@
 #define __BASE_TAGS_HH__
 
 #include <string>
+
+#include "base/callback.hh"
 #include "base/statistics.hh"
-#include "base/callback.hh"
 
 class BaseCache;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/base.cc
--- a/src/mem/cache/tags/base.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/base.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,10 +34,9 @@
  * Definitions of BaseTags.
  */
 
+#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "mem/cache/tags/base.hh"
-
 #include "mem/cache/base.hh"
-#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "sim/sim_exit.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/cacheset.hh
--- a/src/mem/cache/tags/cacheset.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/cacheset.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -36,9 +36,9 @@
 #ifndef __CACHESET_HH__
 #define __CACHESET_HH__
 
+#include <cassert>
+
 #include "mem/cache/blk.hh" // base class
-#include <assert.h>
-
 
 /**
  * An associative set of cache blocks.
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/fa_lru.hh
--- a/src/mem/cache/tags/fa_lru.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/fa_lru.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,8 +39,8 @@
 #include <list>
 
 #include "base/hashmap.hh"
+#include "mem/cache/tags/base.hh"
 #include "mem/cache/blk.hh"
-#include "mem/cache/tags/base.hh"
 #include "mem/packet.hh"
 
 /**
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/iic.hh
--- a/src/mem/cache/tags/iic.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/iic.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,11 +39,11 @@
 #include <list>
 #include <vector>
 
+#include "base/statistics.hh"
+#include "mem/cache/tags/iic_repl/repl.hh"
+#include "mem/cache/tags/base.hh"
 #include "mem/cache/blk.hh"
-#include "mem/cache/tags/iic_repl/repl.hh"
 #include "mem/packet.hh"
-#include "base/statistics.hh"
-#include "mem/cache/tags/base.hh"
 
 class BaseCache; // Forward declaration
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/iic.cc
--- a/src/mem/cache/tags/iic.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/iic.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,8 @@
 
 #include "base/intmath.hh"
 #include "base/trace.hh"
+#include "mem/cache/tags/iic.hh"
 #include "mem/cache/base.hh"
-#include "mem/cache/tags/iic.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/iic_repl/gen.cc
--- a/src/mem/cache/tags/iic_repl/gen.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/iic_repl/gen.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 
 #include "base/misc.hh"
 #include "base/types.hh"
+#include "mem/cache/tags/iic_repl/gen.hh"
 #include "mem/cache/tags/iic.hh"
-#include "mem/cache/tags/iic_repl/gen.hh"
 #include "params/GenRepl.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/iic_repl/repl.hh
--- a/src/mem/cache/tags/iic_repl/repl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/iic_repl/repl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,8 +38,8 @@
 #ifndef __REPL_HH__
 #define __REPL_HH__
 
+#include <list>
 #include <string>
-#include <list>
 
 #include "base/types.hh"
 #include "cpu/smt.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/lru.hh
--- a/src/mem/cache/tags/lru.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/lru.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,8 +40,8 @@
 #include <cstring>
 #include <list>
 
+#include "mem/cache/tags/base.hh"
 #include "mem/cache/blk.hh"
-#include "mem/cache/tags/base.hh"
 #include "mem/packet.hh"
 
 class BaseCache;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/cache/tags/lru.cc
--- a/src/mem/cache/tags/lru.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/cache/tags/lru.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,9 +36,9 @@
 #include <string>
 
 #include "base/intmath.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
+#include "mem/cache/base.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/packet.hh
--- a/src/mem/packet.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/packet.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -39,9 +39,9 @@
 #ifndef __MEM_PACKET_HH__
 #define __MEM_PACKET_HH__
 
+#include <bitset>
 #include <cassert>
 #include <list>
-#include <bitset>
 
 #include "base/cast.hh"
 #include "base/compiler.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/packet.cc
--- a/src/mem/packet.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/packet.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -36,8 +36,9 @@
  * between a single level of the memory heirarchy (ie L1->L2).
  */
 
+#include <cstring>
 #include <iostream>
-#include <cstring>
+
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/page_table.cc
--- a/src/mem/page_table.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/page_table.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
  * @file
  * Definitions of page table.
  */
+#include <fstream>
+#include <map>
 #include <string>
-#include <map>
-#include <fstream>
 
 #include "base/bitfield.hh"
 #include "base/intmath.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/physical.cc
--- a/src/mem/physical.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/physical.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,14 +41,14 @@
  *          Ali Saidi
  */
 
+#include <sys/mman.h>
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <sys/user.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <zlib.h>
 
+#include <cerrno>
 #include <cstdio>
 #include <iostream>
 #include <string>
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/buffers/MessageBuffer.hh
--- a/src/mem/ruby/buffers/MessageBuffer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/buffers/MessageBuffer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,15 +37,15 @@
 #include <algorithm>
 #include <functional>
 #include <iostream>
+#include <string>
 #include <vector>
-#include <string>
 
 #include "mem/ruby/buffers/MessageBufferNode.hh"
+#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/common/Address.hh"
 
 class MessageBuffer
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/common/Debug.hh
--- a/src/mem/ruby/common/Debug.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/common/Debug.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,10 +37,9 @@
 #include <vector>
 
 #include "mem/ruby/common/Global.hh"
+#include "params/RubyDebug.hh"
 #include "sim/sim_object.hh"
 
-#include "params/RubyDebug.hh"
-
 extern std::ostream * debug_cout_ptr;
 
 // component enumeration
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/common/Debug.cc
--- a/src/mem/ruby/common/Debug.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/common/Debug.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cstdarg>
 #include <fstream>
-#include <stdarg.h>
 
 #include "base/misc.hh"
 #include "mem/ruby/common/Debug.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/common/Global.hh
--- a/src/mem/ruby/common/Global.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/common/Global.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 #define __MEM_RUBY_COMMON_GLOBAL_HH__
 
 // external includes for all classes
+#include "mem/ruby/common/Debug.hh"
 #include "mem/ruby/common/TypeDefines.hh"
-#include "mem/ruby/common/Debug.hh"
 
 // simple type declarations
 typedef Time LogicalTime;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/common/NetDest.cc
--- a/src/mem/ruby/common/NetDest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/common/NetDest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/protocol/Protocol.hh"
 
 NetDest::NetDest()
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/common/Set.hh
--- a/src/mem/ruby/common/Set.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/common/Set.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,9 +35,9 @@
 #include <iostream>
 #include <limits>
 
-#include "mem/ruby/system/System.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/System.hh"
 
 class Set
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/filters/GenericBloomFilter.hh
--- a/src/mem/ruby/filters/GenericBloomFilter.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/filters/GenericBloomFilter.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #include <iostream>
 #include <string>
 
+#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/filters/AbstractBloomFilter.hh"
 
 class GenericBloomFilter
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/libruby.cc
--- a/src/mem/ruby/libruby.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/libruby.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -27,16 +27,17 @@
  */
 
 #include <sys/wait.h>
+
 #include <algorithm>
 
 #include "config/gems_root.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
-#include "mem/ruby/libruby_internal.hh"
 #include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/system/MemoryVector.hh"
 #include "mem/ruby/system/RubyPort.hh"
 #include "mem/ruby/system/System.hh"
+#include "mem/ruby/libruby_internal.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/Network.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
 
 #include "base/misc.hh"
 #include "mem/protocol/MachineType.hh"
+#include "mem/ruby/network/simple/Topology.hh"
 #include "mem/ruby/network/Network.hh"
-#include "mem/ruby/network/simple/Topology.hh"
 
 Network::Network(const Params *p)
     : SimObject(p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
 #include "mem/ruby/network/Network.hh"
 #include "params/GarnetNetwork_d.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,15 +29,15 @@
  */
 
 #include "base/stl_helpers.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
-#include "mem/protocol/MachineType.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/simple/Topology.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
-#include "mem/ruby/common/NetDest.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,13 +34,13 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
-#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
 
 class NetworkMessage;
 class MessageBuffer;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #include <cmath>
 
 #include "base/stl_helpers.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/network/orion/power_bus.hh"
 
 class GarnetNetwork_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 
 NetworkLink_d::NetworkLink_d(int id, int link_latency, GarnetNetwork_d *net_ptr)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__
 
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 
 class OutVcState_d
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
-#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
-#include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/orion/power_router_init.hh"
 
 class GarnetNetwork_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,16 +29,16 @@
  */
 
 #include "base/stl_helpers.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,10 +31,10 @@
 #ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_HH__
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_HH__
 
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
-#include "mem/ruby/common/NetDest.hh"
 
 class InputUnit_d;
 class Router_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,9 +28,9 @@
  * Authors: Niket Agarwal
  */
 
+#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 RoutingUnit_d::RoutingUnit_d(Router_d *router)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,11 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh"
 
 SWallocator_d::SWallocator_d(Router_d *router)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class Router_d;
 class OutputUnit_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,9 +29,9 @@
  */
 
 #include "base/stl_helpers.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
 
 using m5::stl_helpers::deletePointers;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,11 +32,11 @@
 #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_VC_ALLOCATOR_D_HH__
 
 #include <iostream>
+#include <utility>
 #include <vector>
-#include <utility>
 
+#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,11 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh"
 
 VCallocator_d::VCallocator_d(Router_d *router)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 
 #include <utility>
 
+#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 
 class VirtualChannel_d
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,8 +35,8 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
 
 class flitBuffer_d
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
 #define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__
 
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/NetDest.hh"
 
 class FlexibleConsumer : public Consumer
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
 #include "mem/ruby/network/Network.hh"
 #include "params/GarnetNetwork.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,16 +29,16 @@
  */
 
 #include "base/stl_helpers.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
-#include "mem/protocol/MachineType.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
 #include "mem/ruby/network/simple/Topology.hh"
-#include "mem/ruby/network/simple/SimpleNetwork.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
-#include "mem/ruby/common/NetDest.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,12 +34,12 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
-#include "mem/ruby/slicc_interface/Message.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class NetworkMessage;
 class MessageBuffer;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #include <cmath>
 
 #include "base/stl_helpers.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <vector>
 
-#include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
-#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/NetworkHeader.hh"
 
 class GarnetNetwork;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
+#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
 
 NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,14 +34,14 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
-#include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
 
 class VCarbiter;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,11 +29,11 @@
  */
 
 #include "base/stl_helpers.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
-#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -33,8 +33,8 @@
 
 #include <iostream>
 
+#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/common/Consumer.hh"
 
 class Router;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
+#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
 
 VCarbiter::VCarbiter(Router *router)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,8 +34,8 @@
 #include <iostream>
 #include <vector>
 
+#include "mem/ruby/network/garnet/flexible-pipeline/flit.hh"
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/flit.hh"
 
 class flitBuffer
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/NetworkPower.cc
--- a/src/mem/ruby/network/orion/NetworkPower.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/NetworkPower.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,20 +26,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
 
-#include "mem/ruby/network/orion/power_router_init.hh"
-#include "mem/ruby/network/orion/power_array.hh"
-#include "mem/ruby/network/orion/power_crossbar.hh"
-#include "mem/ruby/network/orion/power_arbiter.hh"
-#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 #include "mem/ruby/network/orion/NetworkPower.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
 #include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
 
 /* --------- Static energy calculation functions ------------ */
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/SIM_power.hh
--- a/src/mem/ruby/network/orion/SIM_power.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/SIM_power.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,6 +30,7 @@
 #define _SIM_POWER_H
 
 #include <sys/types.h>
+
 #include "mem/ruby/network/orion/SIM_power_test.hh"
 
 #define SIM_NO_MODEL    0
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/SIM_power_test.hh
--- a/src/mem/ruby/network/orion/SIM_power_test.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/SIM_power_test.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 #ifndef _SIM_POWER_TEST_H
 #define _SIM_POWER_TEST_H
 
+#include <sys/types.h>
 #include <unistd.h>
-#include <sys/types.h>
 
 #define LIB_Type_max_uint       unsigned long int
 #define LIB_Type_max_int        long int
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_arbiter.cc
--- a/src/mem/ruby/network/orion/power_arbiter.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_arbiter.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,20 +26,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 #include "mem/ruby/network/orion/power_arbiter.hh"
 #include "mem/ruby/network/orion/power_array.hh"
 #include "mem/ruby/network/orion/power_ll.hh"
-#include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/power_static.hh"
 #include "mem/ruby/network/orion/power_utils.hh"
 
-
-
-
-
 /******************************* Power model for flip flop *****************************/
 
 /* ------- flip flop model ---------- */
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_array.cc
--- a/src/mem/ruby/network/orion/power_array.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_array.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,13 +26,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
 
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 #include "mem/ruby/network/orion/power_array.hh"
 #include "mem/ruby/network/orion/power_ll.hh"
-#include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/power_static.hh"
 #include "mem/ruby/network/orion/power_utils.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_bus.cc
--- a/src/mem/ruby/network/orion/power_bus.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_bus.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,12 +26,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 #include "mem/ruby/network/orion/power_bus.hh"
 #include "mem/ruby/network/orion/power_ll.hh"
-#include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/power_static.hh"
 #include "mem/ruby/network/orion/power_utils.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_crossbar.cc
--- a/src/mem/ruby/network/orion/power_crossbar.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_crossbar.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,13 +26,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
 
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
 #include "mem/ruby/network/orion/power_ll.hh"
-#include "mem/ruby/network/orion/power_crossbar.hh"
-#include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/power_static.hh"
 #include "mem/ruby/network/orion/power_utils.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_ll.cc
--- a/src/mem/ruby/network/orion/power_ll.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_ll.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -70,10 +70,10 @@
 #include <cassert>
 #include <cmath>
 
+#include "mem/ruby/network/orion/SIM_port.hh"
 #include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
 #include "mem/ruby/network/orion/power_static.hh"
-#include "mem/ruby/network/orion/power_ll.hh"
 
 /*----------------------------------------------------------------------*/
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_router_init.hh
--- a/src/mem/ruby/network/orion/power_router_init.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_router_init.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
 #ifndef _POWER_ROUTER_INIT_H
 #define _POWER_ROUTER_INIT_H
 
+#include "mem/ruby/network/orion/power_arbiter.hh"
 #include "mem/ruby/network/orion/power_array.hh"
-#include "mem/ruby/network/orion/power_arbiter.hh"
 #include "mem/ruby/network/orion/power_crossbar.hh"
 
 /* ------------ Models ------------------------ */
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/orion/power_router_init.cc
--- a/src/mem/ruby/network/orion/power_router_init.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/orion/power_router_init.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,15 +26,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
-#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
 #include "mem/ruby/network/orion/power_array.hh"
-#include "mem/ruby/network/orion/power_arbiter.hh"
 #include "mem/ruby/network/orion/power_crossbar.hh"
 #include "mem/ruby/network/orion/power_ll.hh"
-#include "mem/ruby/network/orion/parm_technology.hh"
-#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
 #include "mem/ruby/network/orion/power_static.hh"
 #include "mem/ruby/network/orion/power_utils.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/simple/Switch.cc
--- a/src/mem/ruby/network/simple/Switch.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/simple/Switch.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,10 +32,10 @@
 #include "mem/protocol/MessageSizeType.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/Switch.hh"
 #include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/network/Network.hh"
 
 using namespace std;
 using m5::stl_helpers::deletePointers;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/simple/Throttle.cc
--- a/src/mem/ruby/network/simple/Throttle.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/simple/Throttle.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,8 +29,8 @@
 #include "base/cprintf.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
 #include "mem/ruby/network/Network.hh"
-#include "mem/ruby/network/simple/Throttle.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/system/System.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/network/simple/Topology.cc
--- a/src/mem/ruby/network/simple/Topology.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/network/simple/Topology.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 #include "mem/protocol/Protocol.hh"
 #include "mem/protocol/TopologyType.hh"
 #include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/simple/Topology.hh"
 #include "mem/ruby/network/Network.hh"
-#include "mem/ruby/network/simple/Topology.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/system/System.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/profiler/Profiler.hh
--- a/src/mem/ruby/profiler/Profiler.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/profiler/Profiler.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -62,10 +62,10 @@
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Histogram.hh"
 #include "mem/ruby/common/Set.hh"
-#include "mem/ruby/libruby.hh"
 #include "mem/ruby/system/MachineID.hh"
 #include "mem/ruby/system/MemoryControl.hh"
 #include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/libruby.hh"
 #include "params/RubyProfiler.hh"
 #include "sim/sim_object.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/profiler/Profiler.cc
--- a/src/mem/ruby/profiler/Profiler.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/profiler/Profiler.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -58,7 +58,6 @@
 #include "mem/ruby/profiler/AddressProfiler.hh"
 #include "mem/ruby/profiler/Profiler.hh"
 #include "mem/ruby/system/System.hh"
-#include "mem/ruby/system/System.hh"
 
 using namespace std;
 using m5::stl_helpers::operator<<;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/recorder/CacheRecorder.hh
--- a/src/mem/ruby/recorder/CacheRecorder.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/recorder/CacheRecorder.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,9 +40,9 @@
 
 #include "mem/protocol/CacheRequestType.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/libruby_internal.hh"
-#include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/recorder/TraceRecord.hh"
 
 class Address;
 class TraceRecord;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/recorder/CacheRecorder.cc
--- a/src/mem/ruby/recorder/CacheRecorder.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/recorder/CacheRecorder.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,9 @@
 
 #include <algorithm>
 
-#include "gzstream.hh"
-
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "mem/ruby/recorder/CacheRecorder.hh"
+#include "gzstream.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/recorder/TraceRecord.hh
--- a/src/mem/ruby/recorder/TraceRecord.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/recorder/TraceRecord.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,9 +38,9 @@
 
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/libruby_internal.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/libruby_internal.hh"
 
 class CacheMsg;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/recorder/Tracer.hh
--- a/src/mem/ruby/recorder/Tracer.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/recorder/Tracer.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,14 +37,13 @@
 #include <iostream>
 #include <string>
 
-#include "gzstream.hh"
-
 #include "mem/protocol/CacheRequestType.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/libruby_internal.hh"
-#include "mem/ruby/system/NodeID.hh"
 #include "params/RubyTracer.hh"
 #include "sim/sim_object.hh"
+#include "gzstream.hh"
 
 class Address;
 class TraceRecord;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/slicc_interface/AbstractEntry.hh
--- a/src/mem/ruby/slicc_interface/AbstractEntry.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/slicc_interface/AbstractEntry.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,9 @@
 
 #include <iostream>
 
+#include "mem/protocol/AccessPermission.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/protocol/AccessPermission.hh"
 
 class DataBlock;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,5 +28,3 @@
 
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 #include "mem/ruby/system/CacheMemory.hh"
-
-
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/slicc_interface/RubySlicc_includes.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 #define __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__
 
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
-#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
 
 #endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/system/RubyPort.hh
--- a/src/mem/ruby/system/RubyPort.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/system/RubyPort.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,10 +32,10 @@
 #include <cassert>
 #include <string>
 
+#include "mem/protocol/RequestStatus.hh"
+#include "mem/ruby/libruby.hh"
 #include "mem/mem_object.hh"
 #include "mem/physical.hh"
-#include "mem/protocol/RequestStatus.hh"
-#include "mem/ruby/libruby.hh"
 #include "mem/tport.hh"
 #include "params/RubyPort.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/system/RubyPort.cc
--- a/src/mem/ruby/system/RubyPort.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/system/RubyPort.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -27,9 +27,9 @@
  */
 
 #include "cpu/testers/rubytest/RubyTester.hh"
-#include "mem/physical.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/system/RubyPort.hh"
+#include "mem/physical.hh"
 
 RubyPort::RubyPort(const Params *p)
     : MemObject(p)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/system/Sequencer.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -26,22 +26,21 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "base/misc.hh"
 #include "base/str.hh"
-#include "base/misc.hh"
 #include "cpu/testers/rubytest/RubyTester.hh"
 #include "mem/protocol/CacheMsg.hh"
 #include "mem/protocol/Protocol.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"
-#include "mem/ruby/libruby.hh"
 #include "mem/ruby/profiler/Profiler.hh"
 #include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/system/CacheMemory.hh"
 #include "mem/ruby/system/Sequencer.hh"
 #include "mem/ruby/system/System.hh"
+#include "mem/ruby/libruby.hh"
 #include "mem/packet.hh"
 #include "params/RubySequencer.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/DeterministicDriver.hh
--- a/src/mem/ruby/tester/DeterministicDriver.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/DeterministicDriver.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,19 +40,19 @@
 #include <map>
 #include <vector>
 
+#include "mem/protocol/CacheRequestType.hh"     // includes global, but doesn't use anything, so it should be fine
+#include "mem/protocol/SpecifiedGeneratorType.hh"
+#include "mem/ruby/common/Address.hh"       // we redefined the address
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Driver.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Histogram.hh"            // includes global, but doesn't use anything, so it should be fine
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/tester/DetermGETXGenerator.hh"  // this is our file
+#include "mem/ruby/tester/DetermInvGenerator.hh"  // this is our file
+#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"  // this is our file
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/common/Histogram.hh"            // includes global, but doesn't use anything, so it should be fine
-#include "mem/protocol/CacheRequestType.hh"     // includes global, but doesn't use anything, so it should be fine
-#include "mem/ruby/common/Address.hh"       // we redefined the address
-#include "mem/ruby/tester/DetermGETXGenerator.hh"  // this is our file
-#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"  // this is our file
-#include "mem/ruby/tester/DetermInvGenerator.hh"  // this is our file
 #include "mem/ruby/libruby.hh"
-#include "mem/ruby/common/Driver.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/eventqueue/RubyEventQueue.hh"
-#include "mem/protocol/SpecifiedGeneratorType.hh"
 
 //class DMAGenerator;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/DeterministicDriver.cc
--- a/src/mem/ruby/tester/DeterministicDriver.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/DeterministicDriver.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 
 #include "base/misc.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/tester/DeterministicDriver.hh"
-#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 //#include "DMAGenerator.hh"
 #include "mem/ruby/tester/DetermGETXGenerator.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/RaceyDriver.hh
--- a/src/mem/ruby/tester/RaceyDriver.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/RaceyDriver.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -40,10 +40,10 @@
 #include <map>
 #include <vector>
 
+#include "mem/ruby/common/Driver.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/tester/RaceyPseudoThread.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/common/Driver.hh"
-#include "mem/ruby/tester/RaceyPseudoThread.hh"
 #include "mem/ruby/libruby.hh"
 
 #define g_DEADLOCK_THRESHOLD 5000
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/RaceyDriver.cc
--- a/src/mem/ruby/tester/RaceyDriver.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/RaceyDriver.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,10 +32,10 @@
  *
  */
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/tester/RaceyDriver.hh"
+#include "mem/ruby/tester/RaceyPseudoThread.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/tester/RaceyDriver.hh"
-#include "mem/ruby/eventqueue/RubyEventQueue.hh"
-#include "mem/ruby/tester/RaceyPseudoThread.hh"
 
 RaceyDriver::RaceyDriver(int num_procs, int tester_length)
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/RaceyPseudoThread.hh
--- a/src/mem/ruby/tester/RaceyPseudoThread.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/RaceyPseudoThread.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -35,11 +35,11 @@
 #ifndef RACEYPSEUDOTHREAD_H
 #define RACEYPSEUDOTHREAD_H
 
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/libruby.hh"
 
 class RaceyDriver;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/RaceyPseudoThread.cc
--- a/src/mem/ruby/tester/RaceyPseudoThread.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/RaceyPseudoThread.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
  * Description: see RaceyPseudoThread.h
  */
 
+#include "mem/ruby/tester/RaceyDriver.hh"
 #include "mem/ruby/tester/RaceyPseudoThread.hh"
-#include "mem/ruby/tester/RaceyDriver.hh"
 #include "gzstream.hh"
 
 RaceyPseudoThread::RaceyPseudoThread(NodeID id, RaceyDriver& driver)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/SpecifiedGenerator.hh
--- a/src/mem/ruby/tester/SpecifiedGenerator.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/SpecifiedGenerator.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,11 +37,11 @@
 #ifndef SPECIFIEDGENERATOR_H
 #define SPECIFIEDGENERATOR_H
 
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/common/Address.hh"
 
 class SpecifiedGenerator : public Consumer {
 public:
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/getopt.cc
--- a/src/mem/ruby/tester/getopt.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/getopt.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -38,7 +38,7 @@
 #endif
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -56,7 +56,7 @@
 #ifdef  __GNU_LIBRARY__
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
+#include <cstdlib>
 #endif  /* GNU C library.  */
 
 /* This is for other GNU distributions with internationalized messages.
@@ -168,15 +168,15 @@
    because there are many ways it can cause trouble.
    On some systems, it contains special magic macros that don't work
    in GCC.  */
-#include <string.h>
+#include <cstring>
 #define my_index        strchr
 #else
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 //char *getenv();
 
 static char *
@@ -795,7 +795,7 @@
 #endif
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -811,7 +811,7 @@
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
 #ifdef __GNU_LIBRARY__
-#include <stdlib.h>
+#include <cstdlib>
 #else
 
 #endif
@@ -852,7 +852,7 @@
 
 #ifdef TEST
 
-#include <stdio.h>
+#include <cstdio>
 
 int
 main (argc, argv)
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/main.cc
--- a/src/mem/ruby/tester/main.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/main.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,8 @@
  *
  */
 
+#include "mem/ruby/tester/test_framework.hh"
 #include "mem/slicc/main.hh"
-#include "mem/ruby/tester/test_framework.hh"
 
 // *******************
 // *** tester main ***
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/ruby/tester/test_framework.cc
--- a/src/mem/ruby/tester/test_framework.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/ruby/tester/test_framework.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -34,26 +34,24 @@
 
 using namespace std;
 
+#include <sys/wait.h>
+
+#include <cassert>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
 #include "base/misc.hh"
-#include "mem/ruby/tester/test_framework.hh"
 #include "mem/protocol/protocol_name.hh"
-#include "getopt.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/tester/DeterministicDriver.hh"
 #include "mem/ruby/tester/RaceyDriver.hh"
-#include "mem/ruby/common/Driver.hh"
-#include "mem/ruby/recorder/Tracer.hh"
-
-
-#include <string>
-#include <map>
-#include <iostream>
-#include <assert.h>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <sys/wait.h>
-
+#include "mem/ruby/tester/test_framework.hh"
 #include "mem/ruby/libruby.hh"
+#include "getopt.hh"
 
 // FIXME: should really make this a class if can't figure out how to make a function to get the ruby parameter
 static void set_defaults();
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/slicc/symbols/StateMachine.py
--- a/src/mem/slicc/symbols/StateMachine.py	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/slicc/symbols/StateMachine.py	Sat Dec 25 20:07:32 2010 -0800
@@ -202,15 +202,14 @@
 #include <sstream>
 #include <string>
 
-#include "params/$c_ident.hh"
-
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "mem/protocol/${ident}_ProfileDumper.hh"
+#include "mem/protocol/${ident}_Profiler.hh"
 #include "mem/protocol/TransitionResult.hh"
 #include "mem/protocol/Types.hh"
-#include "mem/protocol/${ident}_Profiler.hh"
-#include "mem/protocol/${ident}_ProfileDumper.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "params/$c_ident.hh"
 ''')
 
         seen_types = set()
@@ -343,8 +342,8 @@
 
 #include "base/cprintf.hh"
 #include "mem/protocol/${ident}_Controller.hh"
+#include "mem/protocol/${ident}_Event.hh"
 #include "mem/protocol/${ident}_State.hh"
-#include "mem/protocol/${ident}_Event.hh"
 #include "mem/protocol/Types.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_includes.hh"
@@ -761,12 +760,12 @@
 // ${ident}: ${{self.short}}
 
 #include "base/misc.hh"
+#include "mem/protocol/${ident}_Controller.hh"
+#include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
+#include "mem/protocol/Types.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_includes.hh"
-#include "mem/protocol/${ident}_Controller.hh"
-#include "mem/protocol/${ident}_State.hh"
-#include "mem/protocol/${ident}_Event.hh"
-#include "mem/protocol/Types.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
@@ -830,11 +829,11 @@
 // ${ident}: ${{self.short}}
 
 #include "base/misc.hh"
+#include "mem/protocol/${ident}_Controller.hh"
+#include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
+#include "mem/protocol/Types.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/protocol/${ident}_Controller.hh"
-#include "mem/protocol/${ident}_State.hh"
-#include "mem/protocol/${ident}_Event.hh"
-#include "mem/protocol/Types.hh"
 #include "mem/ruby/system/System.hh"
 
 #define HASH_FUN(state, event)  ((int(state)*${ident}_Event_NUM)+int(event))
@@ -996,8 +995,8 @@
 #include <iostream>
 #include <vector>
 
+#include "${ident}_Event.hh"
 #include "${ident}_Profiler.hh"
-#include "${ident}_Event.hh"
 
 typedef std::vector<${ident}_Profiler *> ${ident}_profilers;
 
@@ -1090,9 +1089,9 @@
 
 #include <iostream>
 
+#include "mem/protocol/${ident}_Event.hh"
+#include "mem/protocol/${ident}_State.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/protocol/${ident}_State.hh"
-#include "mem/protocol/${ident}_Event.hh"
 
 class ${ident}_Profiler
 {
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/tport.hh
--- a/src/mem/tport.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/tport.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -37,10 +37,11 @@
  * Declaration of SimpleTimingPort.
  */
 
+#include <list>
+#include <string>
+
 #include "mem/port.hh"
 #include "sim/eventq.hh"
-#include <list>
-#include <string>
 
 /**
  * A simple port for interfacing objects that basically have only
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/translating_port.cc
--- a/src/mem/translating_port.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/translating_port.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,9 @@
 
 #include "base/chunk_generator.hh"
 #include "config/the_isa.hh"
+#include "mem/page_table.hh"
 #include "mem/port.hh"
 #include "mem/translating_port.hh"
-#include "mem/page_table.hh"
 #include "sim/process.hh"
 
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/mem/vport.hh
--- a/src/mem/vport.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/mem/vport.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,10 +38,9 @@
 #ifndef __MEM_VPORT_HH__
 #define __MEM_VPORT_HH__
 
+#include "arch/vtophys.hh"
+#include "config/full_system.hh"
 #include "mem/port_impl.hh"
-#include "config/full_system.hh"
-#include "arch/vtophys.hh"
-
 
 /** A class that translates a virtual address to a physical address and then
  * calls the above read/write functions. If a thread context is provided the
diff -r 8e0ea3a48928 -r 3baf50481316 src/python/swig/core.i
--- a/src/python/swig/core.i	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/python/swig/core.i	Sat Dec 25 20:07:32 2010 -0800
@@ -32,11 +32,10 @@
 %module(package="m5.internal") core
 
 %{
-#include "python/swig/pyobject.hh"
-
 #include "base/misc.hh"
 #include "base/socket.hh"
 #include "base/types.hh"
+#include "python/swig/pyobject.hh"
 #include "sim/core.hh"
 
 extern const char *compileDate;
diff -r 8e0ea3a48928 -r 3baf50481316 src/python/swig/pyobject.cc
--- a/src/python/swig/pyobject.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/python/swig/pyobject.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,8 +41,8 @@
 
 #if FULL_SYSTEM
 #include "dev/etherdevice.hh"
+#include "dev/etherint.hh"
 #include "dev/etherobject.hh"
-#include "dev/etherint.hh"
 #endif
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 src/python/swig/stats.i
--- a/src/python/swig/stats.i	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/python/swig/stats.i	Sat Dec 25 20:07:32 2010 -0800
@@ -34,9 +34,9 @@
 %include "std_string.i"
 
 %{
-#include "base/statistics.hh"
 #include "base/stats/mysql.hh"
 #include "base/stats/text.hh"
+#include "base/statistics.hh"
 #include "sim/stat_control.hh"
 %}
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/faults.hh
--- a/src/sim/faults.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/faults.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -34,10 +34,10 @@
 
 #include "base/refcnt.hh"
 #include "base/types.hh"
+#include "config/full_system.hh"
+#include "cpu/static_inst.hh"
 #include "sim/fault.hh"
 #include "sim/stats.hh"
-#include "config/full_system.hh"
-#include "cpu/static_inst.hh"
 
 class ThreadContext;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/faults.cc
--- a/src/sim/faults.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/faults.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -31,11 +31,11 @@
 
 #include "arch/isa_traits.hh"
 #include "base/misc.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
+#include "mem/page_table.hh"
 #include "sim/faults.hh"
 #include "sim/process.hh"
-#include "mem/page_table.hh"
 
 #if !FULL_SYSTEM
 void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/init.cc
--- a/src/sim/init.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/init.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,13 +30,14 @@
  */
 
 #include <Python.h>
+
 #include <marshal.h>
-#include <signal.h>
+#include <zlib.h>
 
+#include <csignal>
+#include <iostream>
 #include <list>
-#include <iostream>
 #include <string>
-#include <zlib.h>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/process.cc
--- a/src/sim/process.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/process.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,15 +30,15 @@
  *          Ali Saidi
  */
 
+#include <fcntl.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <cstdio>
 #include <string>
 
-#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/intmath.hh"
 #include "base/statistics.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
@@ -46,8 +46,8 @@
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/translating_port.hh"
+#include "params/LiveProcess.hh"
 #include "params/Process.hh"
-#include "params/LiveProcess.hh"
 #include "sim/debug.hh"
 #include "sim/process.hh"
 #include "sim/process_impl.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/process_impl.hh
--- a/src/sim/process_impl.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/process_impl.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -47,7 +47,6 @@
 #include "mem/translating_port.hh"
 #include "sim/byteswap.hh"
 
-
 //This needs to be templated for cases where 32 bit pointers are needed.
 template<class AddrType>
 void
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/pseudo_inst.cc
--- a/src/sim/pseudo_inst.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/pseudo_inst.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,10 +28,10 @@
  * Authors: Nathan Binkert
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <fstream>
 #include <string>
 
@@ -40,8 +40,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
+#include "cpu/quiesce_event.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/quiesce_event.hh"
 #include "params/BaseCPU.hh"
 #include "sim/pseudo_inst.hh"
 #include "sim/serialize.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/serialize.hh
--- a/src/sim/serialize.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/serialize.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -38,10 +38,10 @@
 #define __SERIALIZE_HH__
 
 
+#include <iostream>
 #include <list>
+#include <map>
 #include <vector>
-#include <iostream>
-#include <map>
 
 #include "base/types.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/serialize.cc
--- a/src/sim/serialize.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/serialize.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,11 +30,11 @@
  *          Steve Reinhardt
  */
 
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 
+#include <cerrno>
 #include <fstream>
 #include <list>
 #include <string>
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/stat_control.cc
--- a/src/sim/stat_control.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/stat_control.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -39,7 +39,6 @@
 #include "base/hostinfo.hh"
 #include "base/statistics.hh"
 #include "base/time.hh"
-
 #include "config/the_isa.hh"
 #if THE_ISA == NO_ISA
 #include "arch/noisa/cpu_dummy.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/syscall_emul.hh
--- a/src/sim/syscall_emul.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/syscall_emul.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -45,11 +45,11 @@
 #include <sys/fcntl.h>  // for O_BINARY
 #endif
 #include <sys/stat.h>
-#include <errno.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 #include <fcntl.h>
-#include <sys/uio.h>
-#include <sys/time.h>
 
+#include <cerrno>
 #include <string>
 
 #include "base/chunk_generator.hh"
@@ -60,11 +60,11 @@
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "mem/page_table.hh"
 #include "mem/translating_port.hh"
-#include "mem/page_table.hh"
 #include "sim/byteswap.hh"
+#include "sim/process.hh"
 #include "sim/system.hh"
-#include "sim/process.hh"
 
 ///
 /// System call descriptor.
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/syscall_emul.cc
--- a/src/sim/syscall_emul.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/syscall_emul.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,16 +37,16 @@
 #include <string>
 
 #include "arch/utility.hh"
-#include "sim/syscall_emul.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "mem/page_table.hh"
 #include "sim/process.hh"
+#include "sim/sim_exit.hh"
+#include "sim/syscall_emul.hh"
 #include "sim/system.hh"
-#include "sim/sim_exit.hh"
 
 using namespace std;
 using namespace TheISA;
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/system.cc
--- a/src/sim/system.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/system.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -37,14 +37,14 @@
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
+#include "cpu/thread_context.hh"
 #include "mem/mem_object.hh"
 #include "mem/physical.hh"
 #include "sim/byteswap.hh"
+#include "sim/debug.hh"
 #include "sim/system.hh"
-#include "sim/debug.hh"
 
 #if FULL_SYSTEM
 #include "arch/vtophys.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/tlb.cc
--- a/src/sim/tlb.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/tlb.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
+#include "sim/faults.hh"
 #include "sim/process.hh"
-#include "sim/faults.hh"
 #include "sim/tlb.hh"
 
 Fault
diff -r 8e0ea3a48928 -r 3baf50481316 src/sim/vptr.hh
--- a/src/sim/vptr.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/sim/vptr.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,8 @@
 #ifndef __ARCH_ALPHA_VPTR_HH__
 #define __ARCH_ALPHA_VPTR_HH__
 
+#include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
-#include "arch/isa_traits.hh"
 #include "mem/vport.hh"
 
 class ThreadContext;
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/cprintftest.cc
--- a/src/unittest/cprintftest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/cprintftest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/cprintftime.cc
--- a/src/unittest/cprintftime.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/cprintftime.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include <iostream>
 #include <list>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 #include "base/cprintf.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/initest.cc
--- a/src/unittest/initest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/initest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -29,13 +29,13 @@
  *          Steve Reinhardt
  */
 
+#include <fstream>
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 
+#include "base/cprintf.hh"
 #include "base/inifile.hh"
-#include "base/cprintf.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/rangemaptest.cc
--- a/src/unittest/rangemaptest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/rangemaptest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Ali Saidi
  */
 
+#include <cassert>
 #include <iostream>
-#include <cassert>
 
 #include "base/range_map.hh"
 #include "base/types.hh"
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/stattest.cc
--- a/src/unittest/stattest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/stattest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,11 +32,11 @@
 #include <iostream>
 #include <string>
 
+#include "base/stats/mysql.hh"
+#include "base/stats/text.hh"
 #include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "base/statistics.hh"
-#include "base/stats/text.hh"
-#include "base/stats/mysql.hh"
 #include "base/types.hh"
 #include "sim/stat_control.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 src/unittest/symtest.cc
--- a/src/unittest/symtest.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/src/unittest/symtest.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -30,8 +30,8 @@
 
 #include <iostream>
 
+#include "base/loader/symtab.hh"
 #include "base/str.hh"
-#include "base/loader/symtab.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/ccdrv/devtime.c
--- a/util/ccdrv/devtime.c	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/ccdrv/devtime.c	Sat Dec 25 20:07:32 2010 -0800
@@ -28,20 +28,20 @@
  * Authors: Ali Saidi
  */
 
-#include <linux/module.h>
-#include <linux/config.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <asm/uaccess.h>
-#include <linux/kernel.h>
 #include <asm/io.h>
 #include <asm/page.h>
+#include <asm/uaccess.h>
+#include <linux/config.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 
 #ifdef __i386__
+#include <asm/msr.h>
 #include <asm/processor.h>
-#include <asm/msr.h>
 #endif
 
 #define DRIVER_AUTHOR "Ali Saidi"
diff -r 8e0ea3a48928 -r 3baf50481316 util/m5/m5.c
--- a/util/m5/m5.c	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/m5/m5.c	Sat Dec 25 20:07:32 2010 -0800
@@ -33,9 +33,9 @@
 #include <sched.h>
 #endif
 
-#include <inttypes.h>
 #include <err.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_amd64.hh
--- a/util/statetrace/arch/tracechild_amd64.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_amd64.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,9 +31,10 @@
 #ifndef REGSTATE_AMD64_HH
 #define REGSTATE_AMD64_HH
 
+#include <sys/ptrace.h>
+#include <sys/types.h>
 #include <sys/user.h>
-#include <sys/types.h>
-#include <sys/ptrace.h>
+
 #include <cassert>
 #include <string>
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_amd64.cc
--- a/util/statetrace/arch/tracechild_amd64.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_amd64.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,12 +28,13 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <iomanip>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
-#include <string.h>
+
+#include <cerrno>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
 
 #include "tracechild_amd64.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_arm.hh
--- a/util/statetrace/arch/tracechild_arm.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_arm.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -44,13 +44,14 @@
 #ifndef TRACECHILD_ARM_HH
 #define TRACECHILD_ARM_HH
 
+#include <sys/ptrace.h>
+#include <sys/user.h>
+
 #include <cassert>
 #include <string>
-#include <sys/user.h>
-#include <sys/ptrace.h>
+
 #include "tracechild.hh"
 
-
 class ARMTraceChild : public TraceChild
 {
   public:
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_arm.cc
--- a/util/statetrace/arch/tracechild_arm.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_arm.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -41,11 +41,12 @@
  *          Gabe Black
  */
 
+#include <stdint.h>
+
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <iostream>
-#include <errno.h>
-#include <stdint.h>
-#include <cstring>
-#include <cstdio>
 
 #include "tracechild_arm.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_i386.hh
--- a/util/statetrace/arch/tracechild_i386.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_i386.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,8 +32,9 @@
 #define REGSTATE_I386_HH
 
 #include <linux/user.h>
+#include <sys/ptrace.h>
 #include <sys/types.h>
-#include <sys/ptrace.h>
+
 #include <cassert>
 #include <string>
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_i386.cc
--- a/util/statetrace/arch/tracechild_i386.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_i386.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
 
+#include <cerrno>
+#include <iostream>
+
 #include "tracechild_i386.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_sparc.hh
--- a/util/statetrace/arch/tracechild_sparc.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_sparc.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -32,12 +32,13 @@
 #define TRACECHILD_SPARC_HH
 
 #include <asm-sparc64/reg.h>
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <stdint.h>
+
 #include <cassert>
 #include <ostream>
-#include <stdint.h>
 #include <string>
-#include <sys/ptrace.h>
-#include <sys/types.h>
 
 #include "tracechild.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/arch/tracechild_sparc.cc
--- a/util/statetrace/arch/tracechild_sparc.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/arch/tracechild_sparc.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
-#include <iostream>
-#include <errno.h>
 #include <sys/ptrace.h>
 #include <stdint.h>
 
+#include <cerrno>
+#include <iostream>
+
 #include "tracechild_sparc.hh"
 
 using namespace std;
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/printer.cc
--- a/util/statetrace/printer.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/printer.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,8 +28,8 @@
  * Authors: Gabe Black
  */
 
+#include "printer.hh"
 #include "tracechild.hh"
-#include "printer.hh"
 
 using namespace std;
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/refcnt.hh
--- a/util/statetrace/refcnt.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/refcnt.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,7 +31,7 @@
 #ifndef __REFCNT_HH__
 #define __REFCNT_HH__
 
-#include <stddef.h> //For the NULL macro definition
+#include <cstddef> //For the NULL macro definition
 
 class RefCounted
 {
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/regstate.hh
--- a/util/statetrace/regstate.hh	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/regstate.hh	Sat Dec 25 20:07:32 2010 -0800
@@ -31,8 +31,9 @@
 #ifndef REGSTATE_H
 #define REGSTATE_H
 
+#include <stdint.h>
+
 #include <string>
-#include <stdint.h>
 
 class RegState
 {
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/statetrace.cc
--- a/util/statetrace/statetrace.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/statetrace.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,20 +28,21 @@
  * Authors: Gabe Black
  */
 
-#include <cstring>
-#include <errno.h>
-#include <fstream>
-#include <iostream>
-#include <netdb.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <string>
 #include <sys/ptrace.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <netdb.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <string>
+
 #include "printer.hh"
 #include "tracechild.hh"
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/statetrace/tracechild.cc
--- a/util/statetrace/tracechild.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/statetrace/tracechild.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -28,13 +28,15 @@
  * Authors: Gabe Black
  */
 
-#include "tracechild.hh"
-#include <cstring>
-#include <errno.h>
-#include <iostream>
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 
+#include <cerrno>
+#include <cstring>
+#include <iostream>
+
+#include "tracechild.hh"
+
 using namespace std;
 
 bool TraceChild::startTracing(const char * pathToFile, char * const argv[])
diff -r 8e0ea3a48928 -r 3baf50481316 util/tap/tap.cc
--- a/util/tap/tap.cc	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/tap/tap.cc	Sat Dec 25 20:07:32 2010 -0800
@@ -32,25 +32,21 @@
 #include <pcap.h>
 }
 
-#include <dnet.h>
-
 #include <arpa/inet.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-
-#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <dnet.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <netdb.h>
 #include <poll.h>
-#include <signal.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <csignal>
 #include <list>
 #include <string>
 
diff -r 8e0ea3a48928 -r 3baf50481316 util/term/term.c
--- a/util/term/term.c	Sat Dec 25 20:07:19 2010 -0800
+++ b/util/term/term.c	Sat Dec 25 20:07:32 2010 -0800
@@ -26,17 +26,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include <arpa/telnet.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/termios.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/un.h>
-
-#include <netinet/in.h>
-#include <arpa/telnet.h>
-
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <poll.h>
 #include <stdarg.h>
@@ -44,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 void    readwrite(int);