includes: sort all includes

18 files changed, 23 insertions, 25 deletions

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 28ddf5054..d1ddedbd4 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -51,8 +51,8 @@
 #include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
-#include "mem/tport.hh"
 #include "mem/request.hh"
+#include "mem/tport.hh"
 #include "params/BaseCache.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
diff --git a/src/mem/cache/blk.hh b/src/mem/cache/blk.hh
index bf17a303a..e70760edd 100644
--- a/src/mem/cache/blk.hh
+++ b/src/mem/cache/blk.hh
@@ -38,9 +38,9 @@
 #include <list>
 
 #include "base/printable.hh"
-#include "sim/core.hh"          // for Tick
 #include "mem/packet.hh"
 #include "mem/request.hh"
+#include "sim/core.hh"          // for Tick
 
 /**
  * Cache block status bit assignments
diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index d4ef886f0..e2c14ef5b 100644
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -38,9 +38,9 @@
 
 #include "config/the_isa.hh"
 #include "enums/Prefetch.hh"
-#include "mem/config/cache.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/cache.hh"
+#include "mem/config/cache.hh"
 #include "mem/bus.hh"
 #include "params/BaseCache.hh"
 
@@ -59,9 +59,8 @@
 
 //Prefetcher Headers
 #include "mem/cache/prefetch/ghb.hh"
-#include "mem/cache/prefetch/tagged.hh"
 #include "mem/cache/prefetch/stride.hh"
-
+#include "mem/cache/prefetch/tagged.hh"
 
 using namespace std;
 
diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh
index e15747c3f..1ed138bb5 100644
--- a/src/mem/cache/cache.hh
+++ b/src/mem/cache/cache.hh
@@ -40,11 +40,9 @@
 #define __CACHE_HH__
 
 #include "base/misc.hh" // fatal, panic, and warn
-
 #include "mem/cache/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/mshr.hh"
-
 #include "sim/eventq.hh"
 
 //Forward decleration
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 0b2b273f9..5fb95fc06 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -54,10 +54,10 @@
 #include "base/misc.hh"
 #include "base/range.hh"
 #include "base/types.hh"
+#include "mem/cache/prefetch/base.hh"
 #include "mem/cache/blk.hh"
 #include "mem/cache/cache.hh"
 #include "mem/cache/mshr.hh"
-#include "mem/cache/prefetch/base.hh"
 #include "sim/sim_exit.hh"
 
 template<class TagStore>
diff --git a/src/mem/cache/mshr_queue.hh b/src/mem/cache/mshr_queue.hh
index 5a8739fc7..89dd87fb4 100644
--- a/src/mem/cache/mshr_queue.hh
+++ b/src/mem/cache/mshr_queue.hh
@@ -37,8 +37,8 @@
 
 #include <vector>
 
-#include "mem/packet.hh"
 #include "mem/cache/mshr.hh"
+#include "mem/packet.hh"
 
 /**
  * A Class for maintaining a list of pending and allocated memory requests.
diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc
index ad7a0c882..c81f02933 100644
--- a/src/mem/cache/prefetch/base.cc
+++ b/src/mem/cache/prefetch/base.cc
@@ -38,8 +38,8 @@
 #include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/prefetch/base.hh"
+#include "mem/cache/base.hh"
 #include "mem/request.hh"
 
 BasePrefetcher::BasePrefetcher(const BaseCacheParams *p)
diff --git a/src/mem/cache/prefetch/stride.hh b/src/mem/cache/prefetch/stride.hh
index 6ccd32b91..c78739b4e 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -36,7 +36,8 @@
 #ifndef __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 
-#include <limits.h>
+#include <climits>
+
 #include "mem/cache/prefetch/base.hh"
 
 class StridePrefetcher : public BasePrefetcher
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 41cc11b23..d4d7542a0 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -34,10 +34,9 @@
  * Definitions of BaseTags.
  */
 
+#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "mem/cache/tags/base.hh"
-
 #include "mem/cache/base.hh"
-#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "sim/sim_exit.hh"
 
 using namespace std;
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 62ae4a032..93856c19e 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -38,8 +38,9 @@
 #define __BASE_TAGS_HH__
 
 #include <string>
-#include "base/statistics.hh"
+
 #include "base/callback.hh"
+#include "base/statistics.hh"
 
 class BaseCache;
 
diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
index 135e993aa..a1cf937cf 100644
--- a/src/mem/cache/tags/cacheset.hh
+++ b/src/mem/cache/tags/cacheset.hh
@@ -36,9 +36,9 @@
 #ifndef __CACHESET_HH__
 #define __CACHESET_HH__
 
-#include "mem/cache/blk.hh" // base class
-#include <assert.h>
+#include <cassert>
 
+#include "mem/cache/blk.hh" // base class
 
 /**
  * An associative set of cache blocks.
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 94ffeaa58..78f9ce1b4 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -39,8 +39,8 @@
 #include <list>
 
 #include "base/hashmap.hh"
-#include "mem/cache/blk.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
 #include "mem/packet.hh"
 
 /**
diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index 743c6894f..d0e97de02 100644
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -40,8 +40,8 @@
 
 #include "base/intmath.hh"
 #include "base/trace.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
+#include "mem/cache/base.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff --git a/src/mem/cache/tags/iic.hh b/src/mem/cache/tags/iic.hh
index 5553b8ca3..0c3ea7a13 100644
--- a/src/mem/cache/tags/iic.hh
+++ b/src/mem/cache/tags/iic.hh
@@ -39,11 +39,11 @@
 #include <list>
 #include <vector>
 
-#include "mem/cache/blk.hh"
-#include "mem/cache/tags/iic_repl/repl.hh"
-#include "mem/packet.hh"
 #include "base/statistics.hh"
+#include "mem/cache/tags/iic_repl/repl.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
+#include "mem/packet.hh"
 
 class BaseCache; // Forward declaration
 
diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 0d1b30220..7a1e7a110 100644
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -38,8 +38,8 @@
 
 #include "base/misc.hh"
 #include "base/types.hh"
-#include "mem/cache/tags/iic.hh"
 #include "mem/cache/tags/iic_repl/gen.hh"
+#include "mem/cache/tags/iic.hh"
 #include "params/GenRepl.hh"
 
 using namespace std;
diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh
index c792e3350..994af5164 100644
--- a/src/mem/cache/tags/iic_repl/repl.hh
+++ b/src/mem/cache/tags/iic_repl/repl.hh
@@ -38,8 +38,8 @@
 #ifndef __REPL_HH__
 #define __REPL_HH__
 
-#include <string>
 #include <list>
+#include <string>
 
 #include "base/types.hh"
 #include "cpu/smt.hh"
diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index 25e98d293..33517a5f5 100644
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -36,9 +36,9 @@
 #include <string>
 
 #include "base/intmath.hh"
-#include "mem/cache/base.hh"
 #include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/tags/lru.hh"
+#include "mem/cache/base.hh"
 #include "sim/core.hh"
 
 using namespace std;
diff --git a/src/mem/cache/tags/lru.hh b/src/mem/cache/tags/lru.hh
index ff9811046..4eb66b708 100644
--- a/src/mem/cache/tags/lru.hh
+++ b/src/mem/cache/tags/lru.hh
@@ -40,8 +40,8 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/blk.hh"
 #include "mem/cache/tags/base.hh"
+#include "mem/cache/blk.hh"
 #include "mem/packet.hh"
 
 class BaseCache;