14 files changed, 29 insertions, 30 deletions
diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index fbe8fb32a..adf6b2466 100644
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -31,11 +31,11 @@
 
 #include "arch/isa_traits.hh"
 #include "base/misc.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.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 --git a/src/sim/faults.hh b/src/sim/faults.hh
index 779e34c8f..7f431b313 100644
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -34,10 +34,10 @@
 
 #include "base/refcnt.hh"
 #include "base/types.hh"
-#include "sim/fault_fwd.hh"
-#include "sim/stats.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
+#include "sim/fault_fwd.hh"
+#include "sim/stats.hh"
 
 class ThreadContext;
 
diff --git a/src/sim/init.cc b/src/sim/init.cc
index a9aa905ee..4c795eac4 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -30,13 +30,14 @@
  */
 
 #include <Python.h>
+
 #include <marshal.h>
-#include <signal.h>
+#include <zlib.h>
 
-#include <list>
+#include <csignal>
 #include <iostream>
+#include <list>
 #include <string>
-#include <zlib.h>
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"
diff --git a/src/sim/process.cc b/src/sim/process.cc
index d4b1fba90..c0eebb371 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -30,15 +30,15 @@
  *          Ali Saidi
  */
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.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/Process.hh"
 #include "params/LiveProcess.hh"
+#include "params/Process.hh"
 #include "sim/debug.hh"
 #include "sim/process.hh"
 #include "sim/process_impl.hh"
diff --git a/src/sim/process_impl.hh b/src/sim/process_impl.hh
index 1db533428..b5333858c 100644
--- a/src/sim/process_impl.hh
+++ b/src/sim/process_impl.hh
@@ -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 --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index bcff2f5c1..65dd7a1a1 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -40,10 +40,10 @@
  * Authors: Nathan Binkert
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <fstream>
 #include <string>
 
@@ -52,8 +52,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/quiesce_event.hh"
+#include "cpu/thread_context.hh"
 #include "params/BaseCPU.hh"
 #include "sim/pseudo_inst.hh"
 #include "sim/serialize.hh"
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index 44fe7b2e7..03f900837 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -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 --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 6be8ce3b6..12b787a5e 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -38,10 +38,10 @@
 #define __SERIALIZE_HH__
 
 
-#include <list>
-#include <vector>
 #include <iostream>
+#include <list>
 #include <map>
+#include <vector>
 
 #include "base/types.hh"
 
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index ad1d4a9e4..80aec224e 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -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 --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 506b22fdf..76fa8a239 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -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/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "sim/process.hh"
-#include "sim/system.hh"
 #include "sim/sim_exit.hh"
+#include "sim/syscall_emul.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace TheISA;
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 5091c275d..06fadf516 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -45,11 +45,11 @@
 #include <sys/fcntl.h>  // for O_BINARY
 #endif
 #include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/uio.h>
 #include <sys/time.h>
+#include <sys/uio.h>
+#include <fcntl.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/translating_port.hh"
 #include "mem/page_table.hh"
+#include "mem/translating_port.hh"
 #include "sim/byteswap.hh"
-#include "sim/system.hh"
 #include "sim/process.hh"
+#include "sim/system.hh"
 
 ///
 /// System call descriptor.
diff --git a/src/sim/system.cc b/src/sim/system.cc
index e9fd727f1..e710bc5e8 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -39,14 +39,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/system.hh"
 #include "sim/debug.hh"
+#include "sim/system.hh"
 
 #if FULL_SYSTEM
 #include "arch/vtophys.hh"
diff --git a/src/sim/tlb.cc b/src/sim/tlb.cc
index e2f4f9135..8cde0db2e 100644
--- a/src/sim/tlb.cc
+++ b/src/sim/tlb.cc
@@ -30,8 +30,8 @@
 
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process.hh"
 #include "sim/faults.hh"
+#include "sim/process.hh"
 #include "sim/tlb.hh"
 
 Fault
diff --git a/src/sim/vptr.hh b/src/sim/vptr.hh
index 09aa2d213..2033339f9 100644
--- a/src/sim/vptr.hh
+++ b/src/sim/vptr.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_ALPHA_VPTR_HH__
 #define __ARCH_ALPHA_VPTR_HH__
 
-#include "arch/vtophys.hh"
 #include "arch/isa_traits.hh"
+#include "arch/vtophys.hh"
 #include "mem/vport.hh"
 
 class ThreadContext;