includes: sort all includes

9 files changed, 18 insertions, 14 deletions

diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc
index d1de00fcd..09c1a6760 100644
--- a/src/kern/kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -33,8 +33,8 @@
 
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "kern/kernel_stats.hh"
 #include "kern/tru64/tru64_syscalls.hh"
+#include "kern/kernel_stats.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index 5395b3337..e4ca67fcb 100644
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -35,8 +35,8 @@
 #include <string>
 
 #include "cpu/static_inst.hh"
-#include "sim/stats.hh"
 #include "sim/serialize.hh"
+#include "sim/stats.hh"
 
 class BaseCPU;
 class ThreadContext;
diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 651dae3d6..2133172e2 100644
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -43,8 +43,8 @@
 
 #include <sstream>
 
-#include "base/trace.hh"
 #include "arch/utility.hh"
+#include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index 577245f95..a19d81b08 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -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 --git a/src/kern/operatingsystem.cc b/src/kern/operatingsystem.cc
index 8951b8193..62fcdba7a 100644
--- a/src/kern/operatingsystem.cc
+++ b/src/kern/operatingsystem.cc
@@ -29,8 +29,8 @@
  */
 
 
-#include "kern/operatingsystem.hh"
 #include "base/misc.hh"
+#include "kern/operatingsystem.hh"
 
 int
 OperatingSystem::openSpecialFile(std::string path, LiveProcess *process, ThreadContext *tc)
diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc
index 207d30792..fda1753d3 100644
--- a/src/kern/tru64/dump_mbuf.cc
+++ b/src/kern/tru64/dump_mbuf.cc
@@ -29,12 +29,13 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 921b028a5..600e96818 100644
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -29,6 +29,7 @@
  */
 
 #include <sys/types.h>
+
 #include <algorithm>
 
 #include "arch/vtophys.hh"
diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh
index aa3c4bb50..7e7fedbc3 100644
--- a/src/kern/tru64/tru64.hh
+++ b/src/kern/tru64/tru64.hh
@@ -42,23 +42,24 @@ class Tru64 {};
 
 #else //!FULL_SYSTEM
 
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
-#include <sys/param.h>
 #include <sys/mount.h>
+#include <sys/param.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 "config/the_isa.hh"
+#include <cerrno>
+#include <cstring>     // for memset()
+
 #include "arch/alpha/registers.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "sim/core.hh"
 #include "sim/syscall_emul.hh"
diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc
index 460f75dea..7b8cf0db9 100644
--- a/src/kern/tru64/tru64_events.cc
+++ b/src/kern/tru64/tru64_events.cc
@@ -32,12 +32,12 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
-#include "kern/system_events.hh"
-#include "kern/tru64/tru64_events.hh"
+#include "cpu/thread_context.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"