diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
index 88e661cad7..71a69b3dca 100644
--- a/src/mem/cache/tags/cacheset.hh
+++ b/src/mem/cache/tags/cacheset.hh
@@ -45,12 +45,11 @@
  * Declaration of an associative set
  */
 
-#ifndef __CACHESET_HH__
-#define __CACHESET_HH__
+#ifndef __MEM_CACHE_TAGS_CACHESET_HH__
+#define __MEM_CACHE_TAGS_CACHESET_HH__
 
 #include <cassert>
 
-#include "mem/cache/blk.hh" // base class
 
 /**
  * An associative set of cache blocks.
@@ -133,10 +132,7 @@ CacheSet<Blktype>::moveToHead(Blktype *blk)
 
     do {
         assert(i < assoc);
-        // swap blks[i] and next
-        Blktype *tmp = blks[i];
-        blks[i] = next;
-        next = tmp;
+        std::swap(blks[i], next);
         ++i;
     } while (next != blk);
 }
@@ -158,10 +154,7 @@ CacheSet<Blktype>::moveToTail(Blktype *blk)
 
     do {
         assert(i >= 0);
-        // swap blks[i] and next
-        Blktype *tmp = blks[i];
-        blks[i] = next;
-        next = tmp;
+        std::swap(blks[i], next);
         --i;
     } while (next != blk);
 }