style: fix sorting of includes and whitespace in some files

3 files changed, 9 insertions, 12 deletions

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 94cdc959c..867d77121 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -38,10 +38,10 @@
 #ifndef __BASE_CACHE_HH__
 #define __BASE_CACHE_HH__
 
-#include <vector>
-#include <string>
-#include <list>
 #include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"
diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index b5bd66366..1315a17ee 100644
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -34,18 +34,15 @@
  */
 
 #include <algorithm>
+#include <cmath>
 #include <string>
 #include <vector>
 
-#include <math.h>
-
+#include "base/intmath.hh"
+#include "base/trace.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
-#include "base/intmath.hh"
-#include "sim/core.hh" // for curTick
-
-#include "base/trace.hh" // for DPRINTF
-
+#include "sim/core.hh"
 
 using namespace std;
 
diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index a99936abf..8a8b0d0d6 100644
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -35,11 +35,11 @@
 
 #include <string>
 
-#include "mem/cache/base.hh"
 #include "base/intmath.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
 #include "sim/core.hh"
-#include "cacheset.hh"
 
 using namespace std;