includes: fix up code after sorting

4 files changed, 9 insertions, 7 deletions

diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index bf2139caa..de5540272 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -50,7 +50,7 @@
 #include <algorithm>
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <cmath>
+#include <math.h>
 #endif
 #include <cmath>
 #include <functional>
diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index a09ee095c..3422e48f9 100644
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -31,6 +31,8 @@
 #ifndef __BASE_STATS_MYSQL_HH__
 #define __BASE_STATS_MYSQL_HH__
 
+#include <cstdio>
+#include <list>
 #include <map>
 #include <string>
 
@@ -40,7 +42,8 @@
 namespace MySQL { class Connection; }
 namespace Stats {
 
-class DistInfo;
+class DistData;
+class DistParams;
 class MySqlRun;
 
 struct SetupStat
@@ -70,9 +73,9 @@ class InsertData
 {
   private:
     char *query;
-    size_type size;
+    std::size_t size;
     bool first;
-    static const size_type maxsize = 1024*1024;
+    static const std::size_t maxsize = 1024*1024;
 
   public:
     MySqlRun *run;
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 05bad04bf..ab5c7e8a9 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -33,12 +33,12 @@
 #endif
 
 #if defined(__sun)
-#include <cmath>
+#include <math.h>
 #endif
 
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <cmath>
+#include <math.h>
 #endif
 #include <cmath>
 #include <fstream>
diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index fae7a8883..606d1c633 100644
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -37,7 +37,6 @@ class Info;
 class ScalarInfo;
 class VectorInfo;
 class DistInfo;
-class DistInfo;
 class VectorDistInfo;
 class Vector2dInfo;
 class FormulaInfo;