diff --git a/src/mem/ruby/structures/AbstractReplacementPolicy.hh b/src/mem/ruby/structures/AbstractReplacementPolicy.hh
index 743d5ce0d..5601d8537 100644
--- a/src/mem/ruby/structures/AbstractReplacementPolicy.hh
+++ b/src/mem/ruby/structures/AbstractReplacementPolicy.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
 
 #include "base/types.hh"
 
@@ -86,4 +86,4 @@ AbstractReplacementPolicy::getLastAccess(int64 set, int64 way)
     return m_last_ref_ptr[set][way];
 }
 
-#endif // __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
diff --git a/src/mem/ruby/structures/BankedArray.hh b/src/mem/ruby/structures/BankedArray.hh
index c594458e6..7cc6563d4 100644
--- a/src/mem/ruby/structures/BankedArray.hh
+++ b/src/mem/ruby/structures/BankedArray.hh
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__
-#define __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
+#define __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
 
 #include <vector>
 
diff --git a/src/mem/ruby/structures/CacheMemory.hh b/src/mem/ruby/structures/CacheMemory.hh
index 2a8a09fe9..4724da2b8 100644
--- a/src/mem/ruby/structures/CacheMemory.hh
+++ b/src/mem/ruby/structures/CacheMemory.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
 
 #include <string>
 #include <vector>
@@ -170,4 +170,4 @@ class CacheMemory : public SimObject
 
 std::ostream& operator<<(std::ostream& out, const CacheMemory& obj);
 
-#endif // __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
diff --git a/src/mem/ruby/structures/DirectoryMemory.hh b/src/mem/ruby/structures/DirectoryMemory.hh
index cc390e428..db98cc838 100644
--- a/src/mem/ruby/structures/DirectoryMemory.hh
+++ b/src/mem/ruby/structures/DirectoryMemory.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
 
 #include <iostream>
 #include <string>
@@ -101,4 +101,4 @@ operator<<(std::ostream& out, const DirectoryMemory& obj)
     return out;
 }
 
-#endif // __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
diff --git a/src/mem/ruby/structures/LRUPolicy.hh b/src/mem/ruby/structures/LRUPolicy.hh
index 0d18e208d..c6203a4a6 100644
--- a/src/mem/ruby/structures/LRUPolicy.hh
+++ b/src/mem/ruby/structures/LRUPolicy.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
 
 #include "mem/ruby/structures/AbstractReplacementPolicy.hh"
 
@@ -92,4 +92,4 @@ LRUPolicy::getVictim(int64 set) const
     return smallest_index;
 }
 
-#endif // __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
diff --git a/src/mem/ruby/structures/MemoryControl.hh b/src/mem/ruby/structures/MemoryControl.hh
index 7285e0021..52064adf1 100644
--- a/src/mem/ruby/structures/MemoryControl.hh
+++ b/src/mem/ruby/structures/MemoryControl.hh
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
-#define __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
+#ifndef __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
+#define __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
 
 #include <iostream>
 #include <list>
@@ -111,4 +111,4 @@ protected:
     MemCntrlEvent m_event;
 };
 
-#endif //   __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
+#endif //   __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
diff --git a/src/mem/ruby/structures/MemoryNode.hh b/src/mem/ruby/structures/MemoryNode.hh
index f215ab649..3f40e3648 100644
--- a/src/mem/ruby/structures/MemoryNode.hh
+++ b/src/mem/ruby/structures/MemoryNode.hh
@@ -35,8 +35,8 @@
  * message is enqueued to be sent back to the directory.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
-#define __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
 
 #include <iostream>
 
@@ -89,4 +89,4 @@ operator<<(std::ostream& out, const MemoryNode& obj)
     return out;
 }
 
-#endif // __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
diff --git a/src/mem/ruby/structures/MemoryVector.hh b/src/mem/ruby/structures/MemoryVector.hh
index f2488b591..384c68ad6 100644
--- a/src/mem/ruby/structures/MemoryVector.hh
+++ b/src/mem/ruby/structures/MemoryVector.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
-#define __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
 
 #include "base/trace.hh"
 #include "debug/RubyCacheTrace.hh"
@@ -234,4 +234,4 @@ MemoryVector::populatePages(uint8_t *raw_data)
     }
 }
 
-#endif // __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
diff --git a/src/mem/ruby/structures/PerfectCacheMemory.hh b/src/mem/ruby/structures/PerfectCacheMemory.hh
index b56543c41..555f24b71 100644
--- a/src/mem/ruby/structures/PerfectCacheMemory.hh
+++ b/src/mem/ruby/structures/PerfectCacheMemory.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
 
 #include "base/hashmap.hh"
 #include "mem/protocol/AccessPermission.hh"
@@ -189,4 +189,4 @@ PerfectCacheMemory<ENTRY>::print(std::ostream& out) const
 {
 }
 
-#endif // __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
diff --git a/src/mem/ruby/structures/PersistentTable.hh b/src/mem/ruby/structures/PersistentTable.hh
index b023987a4..7e10b328c 100644
--- a/src/mem/ruby/structures/PersistentTable.hh
+++ b/src/mem/ruby/structures/PersistentTable.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
-#define __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
+#define __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
 
 #include <iostream>
 
@@ -97,4 +97,4 @@ operator<<(std::ostream& out, const PersistentTableEntry& obj)
     return out;
 }
 
-#endif // __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
diff --git a/src/mem/ruby/structures/PseudoLRUPolicy.hh b/src/mem/ruby/structures/PseudoLRUPolicy.hh
index 8722728cf..9534fa781 100644
--- a/src/mem/ruby/structures/PseudoLRUPolicy.hh
+++ b/src/mem/ruby/structures/PseudoLRUPolicy.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
 
 #include "mem/ruby/structures/AbstractReplacementPolicy.hh"
 
@@ -134,4 +134,4 @@ PseudoLRUPolicy::getVictim(int64 set) const
     return (index > (m_assoc - 1)) ? m_assoc - 1 : index;
 }
 
-#endif // __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
diff --git a/src/mem/ruby/structures/RubyMemoryControl.hh b/src/mem/ruby/structures/RubyMemoryControl.hh
index f7fb17975..e7f1c54cc 100644
--- a/src/mem/ruby/structures/RubyMemoryControl.hh
+++ b/src/mem/ruby/structures/RubyMemoryControl.hh
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
-#define __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
 
 #include <iostream>
 #include <list>
@@ -169,4 +169,4 @@ class RubyMemoryControl : public MemoryControl
 
 std::ostream& operator<<(std::ostream& out, const RubyMemoryControl& obj);
 
-#endif // __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
diff --git a/src/mem/ruby/structures/SparseMemory.hh b/src/mem/ruby/structures/SparseMemory.hh
index 9d3c6a844..d5bf31403 100644
--- a/src/mem/ruby/structures/SparseMemory.hh
+++ b/src/mem/ruby/structures/SparseMemory.hh
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
 
 #include <iostream>
 #include <string>
@@ -95,4 +95,4 @@ class SparseMemory
     Stats::Vector m_removes_per_level;
 };
 
-#endif // __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
diff --git a/src/mem/ruby/structures/TBETable.hh b/src/mem/ruby/structures/TBETable.hh
index 018da6cbb..a3282af7d 100644
--- a/src/mem/ruby/structures/TBETable.hh
+++ b/src/mem/ruby/structures/TBETable.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_TBETABLE_HH__
-#define __MEM_RUBY_SYSTEM_TBETABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_TBETABLE_HH__
+#define __MEM_RUBY_STRUCTURES_TBETABLE_HH__
 
 #include <iostream>
 
@@ -121,4 +121,4 @@ TBETable<ENTRY>::print(std::ostream& out) const
 {
 }
 
-#endif // __MEM_RUBY_SYSTEM_TBETABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_TBETABLE_HH__
diff --git a/src/mem/ruby/structures/TimerTable.hh b/src/mem/ruby/structures/TimerTable.hh
index b271d3e37..c5277818b 100644
--- a/src/mem/ruby/structures/TimerTable.hh
+++ b/src/mem/ruby/structures/TimerTable.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
-#define __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
+#define __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
 
 #include <cassert>
 #include <iostream>
@@ -104,4 +104,4 @@ operator<<(std::ostream& out, const TimerTable& obj)
     return out;
 }
 
-#endif // __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
diff --git a/src/mem/ruby/structures/WireBuffer.hh b/src/mem/ruby/structures/WireBuffer.hh
index 6dee01ae0..a362d524e 100644
--- a/src/mem/ruby/structures/WireBuffer.hh
+++ b/src/mem/ruby/structures/WireBuffer.hh
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __MEM_RUBY_SYSTEM_WIREBUFFER_HH__
-#define __MEM_RUBY_SYSTEM_WIREBUFFER_HH__
+#ifndef __MEM_RUBY_STRUCTURES_WIREBUFFER_HH__
+#define __MEM_RUBY_STRUCTURES_WIREBUFFER_HH__
 
 #include <iostream>
 #include <string>
@@ -99,4 +99,4 @@ class WireBuffer : public SimObject
 
 std::ostream& operator<<(std::ostream& out, const WireBuffer& obj);
 
-#endif // __MEM_RUBY_SYSTEM_WireBuffer_HH__
+#endif // __MEM_RUBY_STRUCTURES_WireBuffer_HH__