5 files changed, 12 insertions, 12 deletions
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index b1c05eed1..9c81442ee 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -31,8 +31,8 @@
 #ifndef __BASE_STATS_INFO_HH__
 #define __BASE_STATS_INFO_HH__
 
-#include "base/flags.hh"
 #include "base/stats/types.hh"
+#include "base/flags.hh"
 
 namespace Stats {
 
diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index af13582b4..c08394605 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -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 --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index d3cb9da61..6e1ba1c3b 100644
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -30,8 +30,8 @@
 
 #include <list>
 
-#include "base/statistics.hh"
 #include "base/stats/output.hh"
+#include "base/statistics.hh"
 #include "base/types.hh"
 #include "sim/eventq.hh"
 
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 385b92a1a..05bad04bf 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -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/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"
+#include "base/cast.hh"
+#include "base/misc.hh"
+#include "base/str.hh"
 
 using namespace std;
 
diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index ab8512859..de2bf9401 100644
--- a/src/base/stats/text.hh
+++ b/src/base/stats/text.hh
@@ -34,8 +34,8 @@
 #include <iosfwd>
 #include <string>
 
-#include "base/output.hh"
 #include "base/stats/output.hh"
+#include "base/output.hh"
 
 namespace Stats {