11 files changed, 23 insertions, 21 deletions
diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 811f95f54..05d8129d0 100644
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -31,19 +31,20 @@
 #ifndef __BASE__CP_ANNOTATE_HH__
 #define __BASE__CP_ANNOTATE_HH__
 
-#include "base/loader/symtab.hh"
-#include "config/cp_annotate.hh"
-#include "base/types.hh"
-#include "sim/serialize.hh"
-#include "sim/startup.hh"
-#include "sim/system.hh"
-
 #include <string>
 #include <list>
 #include <vector>
 #include <map>
+
 #include "base/hashmap.hh"
+#include "base/loader/symtab.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
+#include "config/cp_annotate.hh"
+#include "sim/serialize.hh"
+#include "sim/startup.hh"
+#include "sim/system.hh"
+
 #if CP_ANNOTATE
 #include "params/CPA.hh"
 #endif
diff --git a/src/base/crc.cc b/src/base/crc.cc
index eb1f4b641..d4b0de70e 100644
--- a/src/base/crc.cc
+++ b/src/base/crc.cc
@@ -33,8 +33,8 @@
 
 #include <string>
 
-#include "base/types.hh"
 #include "base/crc.hh"
+#include "base/types.hh"
 
 #define ETHER_CRC_POLY_LE 0xedb88320
 #define ETHER_CRC_POLY_BE 0x04c11db6
diff --git a/src/base/inet.cc b/src/base/inet.cc
index 84379b135..898a189ef 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -32,8 +32,8 @@
 #include <string>
 
 #include "base/cprintf.hh"
-#include "base/types.hh"
 #include "base/inet.hh"
+#include "base/types.hh"
 
 using namespace std;
 namespace Net {
diff --git a/src/base/inet.hh b/src/base/inet.hh
index 61d432036..ef9a7d81c 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -38,8 +38,8 @@
 #include <vector>
 
 #include "base/range.hh"
-#include "dev/etherpkt.hh"
 #include "base/types.hh"
+#include "dev/etherpkt.hh"
 
 #include "dnet/os.h"
 #include "dnet/eth.h"
diff --git a/src/base/intmath.hh b/src/base/intmath.hh
index 139f6bf15..a2960e750 100644
--- a/src/base/intmath.hh
+++ b/src/base/intmath.hh
@@ -28,10 +28,10 @@
  * Authors: Nathan Binkert
  */
 
-#ifndef __INTMATH_HH__
-#define __INTMATH_HH__
+#ifndef __BASE_INTMATH_HH__
+#define __BASE_INTMATH_HH__
 
-#include <assert.h>
+#include <cassert>
 
 #include "base/types.hh"
 
@@ -229,4 +229,4 @@ hex2Int(char c)
   return 0;
 }
 
-#endif // __INTMATH_HH__
+#endif // __BASE_INTMATH_HH__
diff --git a/src/base/misc.cc b/src/base/misc.cc
index 55c324aaa..65cb13356 100644
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -38,8 +38,8 @@
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
-#include "base/varargs.hh"
 #include "base/types.hh"
+#include "base/varargs.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 0f237566a..7dcaa094d 100644
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -38,10 +38,10 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "sim/async.hh"
-#include "base/types.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
+#include "base/types.hh"
+#include "sim/async.hh"
 #include "sim/core.hh"
 #include "sim/serialize.hh"
 
diff --git a/src/base/res_list.hh b/src/base/res_list.hh
index 024b56982..fd2204321 100644
--- a/src/base/res_list.hh
+++ b/src/base/res_list.hh
@@ -32,8 +32,9 @@
 #ifndef __RES_LIST_HH__
 #define __RES_LIST_HH__
 
+#include <cassert>
+
 #include "base/cprintf.hh"
-#include <assert.h>
 
 #define DEBUG_REMOVE 0
 
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 243d56c3a..52c0111d8 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -63,10 +63,10 @@
 #include "base/cprintf.hh"
 #include "base/intmath.hh"
 #include "base/refcnt.hh"
-#include "base/str.hh"
 #include "base/stats/info.hh"
 #include "base/stats/types.hh"
 #include "base/stats/visit.hh"
+#include "base/str.hh"
 #include "base/types.hh"
 
 class Callback;
diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index 91bea4540..1e3ab0f84 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -42,8 +42,8 @@
 #include "base/stats/mysql_run.hh"
 #include "base/stats/types.hh"
 #include "base/str.hh"
-#include "base/userinfo.hh"
 #include "base/types.hh"
+#include "base/userinfo.hh"
 
 using namespace std;
 
diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index f3a549b44..ae2c9db5e 100644
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -32,8 +32,8 @@
 
 #include "base/statistics.hh"
 #include "base/stats/output.hh"
-#include "sim/eventq.hh"
 #include "base/types.hh"
+#include "sim/eventq.hh"
 
 using namespace std;