ruby: Make ruby #includes use full paths to the files they're including.

This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths.  Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.

48 files changed, 264 insertions, 264 deletions

diff --git a/src/mem/ruby/system/AbstractBloomFilter.hh b/src/mem/ruby/system/AbstractBloomFilter.hh
index 3b0c703ae..f5fe209c0 100644
--- a/src/mem/ruby/system/AbstractBloomFilter.hh
+++ b/src/mem/ruby/system/AbstractBloomFilter.hh
@@ -38,10 +38,10 @@
 #ifndef ABSTRACT_BLOOM_FILTER_H
 #define ABSTRACT_BLOOM_FILTER_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 class AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/AbstractMemOrCache.hh b/src/mem/ruby/system/AbstractMemOrCache.hh
index a96a1328f..8e214c74b 100644
--- a/src/mem/ruby/system/AbstractMemOrCache.hh
+++ b/src/mem/ruby/system/AbstractMemOrCache.hh
@@ -10,10 +10,10 @@
 #ifndef ABSTRACT_MEM_OR_CACHE_H
 #define ABSTRACT_MEM_OR_CACHE_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 class AbstractMemOrCache {
 public:
diff --git a/src/mem/ruby/system/AbstractReplacementPolicy.hh b/src/mem/ruby/system/AbstractReplacementPolicy.hh
index 497226fad..e8b504b8a 100644
--- a/src/mem/ruby/system/AbstractReplacementPolicy.hh
+++ b/src/mem/ruby/system/AbstractReplacementPolicy.hh
@@ -2,7 +2,7 @@
 #ifndef ABSTRACTREPLACEMENTPOLICY_H
 #define ABSTRACTREPLACEMENTPOLICY_H
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 class AbstractReplacementPolicy {
 
diff --git a/src/mem/ruby/system/BlockBloomFilter.cc b/src/mem/ruby/system/BlockBloomFilter.cc
index dbb0b5458..d81f34ab1 100644
--- a/src/mem/ruby/system/BlockBloomFilter.cc
+++ b/src/mem/ruby/system/BlockBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "BlockBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 BlockBloomFilter::BlockBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/BlockBloomFilter.hh b/src/mem/ruby/system/BlockBloomFilter.hh
index 82f457157..ea7c0807a 100644
--- a/src/mem/ruby/system/BlockBloomFilter.hh
+++ b/src/mem/ruby/system/BlockBloomFilter.hh
@@ -38,12 +38,12 @@
 #ifndef BLOCK_BLOOM_FILTER_H
 #define BLOCK_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class BlockBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/BulkBloomFilter.cc b/src/mem/ruby/system/BulkBloomFilter.cc
index 3408dfada..6d5c3f240 100644
--- a/src/mem/ruby/system/BulkBloomFilter.cc
+++ b/src/mem/ruby/system/BulkBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "BulkBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 BulkBloomFilter::BulkBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/BulkBloomFilter.hh b/src/mem/ruby/system/BulkBloomFilter.hh
index f05b83a87..8c5276517 100644
--- a/src/mem/ruby/system/BulkBloomFilter.hh
+++ b/src/mem/ruby/system/BulkBloomFilter.hh
@@ -38,12 +38,12 @@
 #ifndef BULK_BLOOM_FILTER_H
 #define BULK_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class BulkBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index 9344f1463..4217a8685 100644
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -38,18 +38,18 @@
 #ifndef CACHEMEMORY_H
 #define CACHEMEMORY_H
 
-#include "AbstractChip.hh"
-#include "Global.hh"
-#include "AccessPermission.hh"
-#include "Address.hh"
-#include "CacheRecorder.hh"
-#include "CacheRequestType.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "MachineType.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "PseudoLRUPolicy.hh"
-#include "LRUPolicy.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/system/PseudoLRUPolicy.hh"
+#include "mem/ruby/system/LRUPolicy.hh"
 #include <vector>
 
 template<class ENTRY>
diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc
index 3a37884db..d4c85cbea 100644
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/system/DirectoryMemory.cc
@@ -36,12 +36,12 @@
  *
  */
 
-#include "System.hh"
-#include "Driver.hh"
-#include "DirectoryMemory.hh"
-#include "RubySlicc_Util.hh"
-#include "RubyConfig.hh"
-#include "Chip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/system/DirectoryMemory.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/Chip.hh"
 
 DirectoryMemory::DirectoryMemory(Chip* chip_ptr, int version)
 {
diff --git a/src/mem/ruby/system/DirectoryMemory.hh b/src/mem/ruby/system/DirectoryMemory.hh
index 7c0831af6..94b7de9aa 100644
--- a/src/mem/ruby/system/DirectoryMemory.hh
+++ b/src/mem/ruby/system/DirectoryMemory.hh
@@ -39,9 +39,9 @@
 #ifndef DIRECTORYMEMORY_H
 #define DIRECTORYMEMORY_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "Directory_Entry.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/Directory_Entry.hh"
 
 class Chip;
 
diff --git a/src/mem/ruby/system/GenericBloomFilter.cc b/src/mem/ruby/system/GenericBloomFilter.cc
index 38dd7f437..da8ec4262 100644
--- a/src/mem/ruby/system/GenericBloomFilter.cc
+++ b/src/mem/ruby/system/GenericBloomFilter.cc
@@ -35,19 +35,19 @@
  *
  */
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-
-#include "GenericBloomFilter.hh"
-#include "LSB_CountingBloomFilter.hh"
-#include "NonCountingBloomFilter.hh"
-#include "BulkBloomFilter.hh"
-#include "BlockBloomFilter.hh"
-#include "MultiGrainBloomFilter.hh"
-#include "MultiBitSelBloomFilter.hh"
-#include "H3BloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+
+#include "mem/ruby/system/GenericBloomFilter.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
 
 GenericBloomFilter::GenericBloomFilter(AbstractChip* chip_ptr, string config)
 {
diff --git a/src/mem/ruby/system/GenericBloomFilter.hh b/src/mem/ruby/system/GenericBloomFilter.hh
index 91cfdfd6e..11603b06f 100644
--- a/src/mem/ruby/system/GenericBloomFilter.hh
+++ b/src/mem/ruby/system/GenericBloomFilter.hh
@@ -38,11 +38,11 @@
 #ifndef GENERIC_BLOOM_FILTER_H
 #define GENERIC_BLOOM_FILTER_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class GenericBloomFilter {
 public:
diff --git a/src/mem/ruby/system/H3BloomFilter.cc b/src/mem/ruby/system/H3BloomFilter.cc
index 43a47e873..8fed32814 100644
--- a/src/mem/ruby/system/H3BloomFilter.cc
+++ b/src/mem/ruby/system/H3BloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "H3BloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 H3BloomFilter::H3BloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/H3BloomFilter.hh b/src/mem/ruby/system/H3BloomFilter.hh
index 9da6cdef5..0797b0c08 100644
--- a/src/mem/ruby/system/H3BloomFilter.hh
+++ b/src/mem/ruby/system/H3BloomFilter.hh
@@ -38,14 +38,14 @@
 #ifndef H3_BLOOM_FILTER_H
 #define H3_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 static int H3[64][16] = {
 {
diff --git a/src/mem/ruby/system/LRUPolicy.hh b/src/mem/ruby/system/LRUPolicy.hh
index ea621bf4b..184eb876d 100644
--- a/src/mem/ruby/system/LRUPolicy.hh
+++ b/src/mem/ruby/system/LRUPolicy.hh
@@ -2,7 +2,7 @@
 #ifndef LRUPOLICY_H
 #define LRUPOLICY_H
 
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
 
 /* Simple true LRU replacement policy */
 
diff --git a/src/mem/ruby/system/LSB_CountingBloomFilter.cc b/src/mem/ruby/system/LSB_CountingBloomFilter.cc
index ddfa97f5f..f3b533b90 100644
--- a/src/mem/ruby/system/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/system/LSB_CountingBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "LSB_CountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 LSB_CountingBloomFilter::LSB_CountingBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/LSB_CountingBloomFilter.hh b/src/mem/ruby/system/LSB_CountingBloomFilter.hh
index 5b0cdc87c..fb039cea7 100644
--- a/src/mem/ruby/system/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/system/LSB_CountingBloomFilter.hh
@@ -38,12 +38,12 @@
 #ifndef LSB_COUNTING_BLOOM_FILTER_H
 #define LSB_COUNTING_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class LSB_CountingBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/MachineID.hh b/src/mem/ruby/system/MachineID.hh
index 2f294dc54..4515fe7fa 100644
--- a/src/mem/ruby/system/MachineID.hh
+++ b/src/mem/ruby/system/MachineID.hh
@@ -39,9 +39,9 @@
 #ifndef MACHINEID_H
 #define MACHINEID_H
 
-#include "Global.hh"
-#include "util.hh"
-#include "MachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
 
 struct MachineID {
   MachineType type;
diff --git a/src/mem/ruby/system/MemoryControl.cc b/src/mem/ruby/system/MemoryControl.cc
index e9f8a5ca8..eeb2f2fef 100644
--- a/src/mem/ruby/system/MemoryControl.cc
+++ b/src/mem/ruby/system/MemoryControl.cc
@@ -110,19 +110,19 @@
  *
  */
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "NetworkMessage.hh"
-#include "Network.hh"
-
-#include "Consumer.hh"
-
-#include "MemoryControl.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/network/Network.hh"
+
+#include "mem/ruby/common/Consumer.hh"
+
+#include "mem/ruby/system/MemoryControl.hh"
 
 #include <list>
 
diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh
index ee71b8f51..a98181b0b 100644
--- a/src/mem/ruby/system/MemoryControl.hh
+++ b/src/mem/ruby/system/MemoryControl.hh
@@ -39,19 +39,19 @@
 #ifndef MEMORY_CONTROL_H
 #define MEMORY_CONTROL_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Message.hh"
-#include "util.hh"
-#include "MemoryNode.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/system/MemoryNode.hh"
 // Note that "MemoryMsg" is in the "generated" directory:
-#include "MemoryMsg.hh"
-#include "Consumer.hh"
-#include "AbstractMemOrCache.hh"
+#include "mem/protocol/MemoryMsg.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/AbstractMemOrCache.hh"
 
 #include <list>
 
diff --git a/src/mem/ruby/system/MemoryNode.cc b/src/mem/ruby/system/MemoryNode.cc
index 5cba14eff..be93fae85 100644
--- a/src/mem/ruby/system/MemoryNode.cc
+++ b/src/mem/ruby/system/MemoryNode.cc
@@ -25,7 +25,7 @@
  *
  */
 
-#include "MemoryNode.hh"
+#include "mem/ruby/system/MemoryNode.hh"
 
 void MemoryNode::print(ostream& out) const
 {
diff --git a/src/mem/ruby/system/MemoryNode.hh b/src/mem/ruby/system/MemoryNode.hh
index e6cce6c45..95d4227f9 100644
--- a/src/mem/ruby/system/MemoryNode.hh
+++ b/src/mem/ruby/system/MemoryNode.hh
@@ -28,9 +28,9 @@
 #ifndef MEMORYNODE_H
 #define MEMORYNODE_H
 
-#include "Global.hh"
-#include "Message.hh"
-#include "MemoryRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MemoryRequestType.hh"
 
 class MemoryNode {
 
diff --git a/src/mem/ruby/system/MultiBitSelBloomFilter.cc b/src/mem/ruby/system/MultiBitSelBloomFilter.cc
index a42463d1e..8083506db 100644
--- a/src/mem/ruby/system/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/system/MultiBitSelBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "MultiBitSelBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 MultiBitSelBloomFilter::MultiBitSelBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/MultiBitSelBloomFilter.hh b/src/mem/ruby/system/MultiBitSelBloomFilter.hh
index eaf4ff943..1fa7e7e63 100644
--- a/src/mem/ruby/system/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/system/MultiBitSelBloomFilter.hh
@@ -38,14 +38,14 @@
 #ifndef MULTIBITSEL_BLOOM_FILTER_H
 #define MULTIBITSEL_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class MultiBitSelBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/MultiGrainBloomFilter.cc b/src/mem/ruby/system/MultiGrainBloomFilter.cc
index f1e110b12..2af95514f 100644
--- a/src/mem/ruby/system/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/system/MultiGrainBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "MultiGrainBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 MultiGrainBloomFilter::MultiGrainBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/MultiGrainBloomFilter.hh b/src/mem/ruby/system/MultiGrainBloomFilter.hh
index 692960853..943e5283b 100644
--- a/src/mem/ruby/system/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/system/MultiGrainBloomFilter.hh
@@ -38,12 +38,12 @@
 #ifndef MULTIGRAIN_BLOOM_FILTER_H
 #define MULTIGRAIN_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class MultiGrainBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/NodeID.hh b/src/mem/ruby/system/NodeID.hh
index 23df8bb46..04c339acc 100644
--- a/src/mem/ruby/system/NodeID.hh
+++ b/src/mem/ruby/system/NodeID.hh
@@ -39,8 +39,8 @@
 #ifndef NODEID_H
 #define NODEID_H
 
-#include "Global.hh"
-#include "util.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
 
 typedef int NodeID;
 
diff --git a/src/mem/ruby/system/NodePersistentTable.cc b/src/mem/ruby/system/NodePersistentTable.cc
index df2076c1e..0edd66c6b 100644
--- a/src/mem/ruby/system/NodePersistentTable.cc
+++ b/src/mem/ruby/system/NodePersistentTable.cc
@@ -32,12 +32,12 @@
  *
  */
 
-#include "NodePersistentTable.hh"
-#include "Set.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/NodePersistentTable.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 // randomize so that handoffs are not locality-aware
 // int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
diff --git a/src/mem/ruby/system/NodePersistentTable.hh b/src/mem/ruby/system/NodePersistentTable.hh
index ac25552b8..32de2613e 100644
--- a/src/mem/ruby/system/NodePersistentTable.hh
+++ b/src/mem/ruby/system/NodePersistentTable.hh
@@ -37,9 +37,9 @@
 #ifndef NodePersistentTable_H
 #define NodePersistentTable_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/AccessType.hh"
 
 class AbstractChip;
 
diff --git a/src/mem/ruby/system/NonCountingBloomFilter.cc b/src/mem/ruby/system/NonCountingBloomFilter.cc
index 81e4adbcd..b8f35322d 100644
--- a/src/mem/ruby/system/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/system/NonCountingBloomFilter.cc
@@ -35,9 +35,9 @@
  *
  */
 
-#include "NonCountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 NonCountingBloomFilter::NonCountingBloomFilter(string str)
 {
diff --git a/src/mem/ruby/system/NonCountingBloomFilter.hh b/src/mem/ruby/system/NonCountingBloomFilter.hh
index f2912c08c..46ae3e84a 100644
--- a/src/mem/ruby/system/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/system/NonCountingBloomFilter.hh
@@ -38,12 +38,12 @@
 #ifndef NONCOUNTING_BLOOM_FILTER_H
 #define NONCOUNTING_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class NonCountingBloomFilter : public AbstractBloomFilter {
 public:
diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/system/PerfectCacheMemory.hh
index 39ad7a7b3..4578d0a44 100644
--- a/src/mem/ruby/system/PerfectCacheMemory.hh
+++ b/src/mem/ruby/system/PerfectCacheMemory.hh
@@ -39,12 +39,12 @@
 #ifndef PERFECTCACHEMEMORY_H
 #define PERFECTCACHEMEMORY_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "AccessPermission.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 template<class ENTRY>
 class PerfectCacheLineState {
diff --git a/src/mem/ruby/system/PersistentArbiter.cc b/src/mem/ruby/system/PersistentArbiter.cc
index a0bbf6979..b44393301 100644
--- a/src/mem/ruby/system/PersistentArbiter.cc
+++ b/src/mem/ruby/system/PersistentArbiter.cc
@@ -27,10 +27,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "PersistentArbiter.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentArbiter.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 PersistentArbiter::PersistentArbiter(AbstractChip* chip_ptr)
 {
diff --git a/src/mem/ruby/system/PersistentArbiter.hh b/src/mem/ruby/system/PersistentArbiter.hh
index cf78a5920..705d833f4 100644
--- a/src/mem/ruby/system/PersistentArbiter.hh
+++ b/src/mem/ruby/system/PersistentArbiter.hh
@@ -39,13 +39,13 @@
 #ifndef PERSISTENTARBITER_H
 #define PERSISTENTARBITER_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "AbstractChip.hh"
-#include "AccessPermission.hh"
-#include "AccessType.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 struct ArbiterEntry {
   bool valid;
diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/system/PersistentTable.cc
index 18c8b5736..146b91fed 100644
--- a/src/mem/ruby/system/PersistentTable.cc
+++ b/src/mem/ruby/system/PersistentTable.cc
@@ -32,12 +32,12 @@
  *
  */
 
-#include "PersistentTable.hh"
-#include "NetDest.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentTable.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 // randomize so that handoffs are not locality-aware
 // int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
diff --git a/src/mem/ruby/system/PersistentTable.hh b/src/mem/ruby/system/PersistentTable.hh
index 306f66e1d..9f2e38fd7 100644
--- a/src/mem/ruby/system/PersistentTable.hh
+++ b/src/mem/ruby/system/PersistentTable.hh
@@ -37,9 +37,9 @@
 #ifndef PersistentTable_H
 #define PersistentTable_H
 
-#include "Global.hh"
-#include "MachineID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/AccessType.hh"
 
 class AbstractChip;
 
diff --git a/src/mem/ruby/system/PseudoLRUPolicy.hh b/src/mem/ruby/system/PseudoLRUPolicy.hh
index 9d4d13a95..57a0b40e9 100644
--- a/src/mem/ruby/system/PseudoLRUPolicy.hh
+++ b/src/mem/ruby/system/PseudoLRUPolicy.hh
@@ -2,7 +2,7 @@
 #ifndef PSEUDOLRUPOLICY_H
 #define PSEUDOLRUPOLICY_H
 
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
 
 /**
  * Implementation of tree-based pseudo-LRU replacement
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 23efb9a0c..980152589 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -32,20 +32,20 @@
  *
  */
 
-#include "Global.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "Protocol.hh"
-#include "Profiler.hh"
-#include "CacheMemory.hh"
-#include "RubyConfig.hh"
-//#include "Tracer.hh"
-#include "AbstractChip.hh"
-#include "Chip.hh"
-#include "Tester.hh"
-#include "SubBlock.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/CacheMemory.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
 
 Sequencer::Sequencer(AbstractChip* chip_ptr, int version) {
   m_chip_ptr = chip_ptr;
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index a3924b949..f4cc03131 100644
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -37,15 +37,15 @@
 #ifndef SEQUENCER_H
 #define SEQUENCER_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Consumer.hh"
-#include "CacheRequestType.hh"
-#include "AccessModeType.hh"
-#include "GenericMachineType.hh"
-#include "PrefetchBit.hh"
-#include "Map.hh"
-#include "packet.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/packet.hh"
 
 class DataBlock;
 class AbstractChip;
diff --git a/src/mem/ruby/system/StoreBuffer.cc b/src/mem/ruby/system/StoreBuffer.cc
index 7e5682fde..4d67e55a5 100644
--- a/src/mem/ruby/system/StoreBuffer.cc
+++ b/src/mem/ruby/system/StoreBuffer.cc
@@ -32,18 +32,18 @@
  *
  */
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "StoreBuffer.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "RubyEventQueue.hh"
-#include "AddressProfiler.hh"
-#include "Sequencer.hh"
-#include "SubBlock.hh"
-#include "Profiler.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/StoreBuffer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/profiler/Profiler.hh"
 
 // *** Begin Helper class ***
 struct StoreBufferEntry {
diff --git a/src/mem/ruby/system/StoreBuffer.hh b/src/mem/ruby/system/StoreBuffer.hh
index 832e4f0bb..2fae52643 100644
--- a/src/mem/ruby/system/StoreBuffer.hh
+++ b/src/mem/ruby/system/StoreBuffer.hh
@@ -37,12 +37,12 @@
 #ifndef StoreBuffer_H
 #define StoreBuffer_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "Address.hh"
-#include "AccessModeType.hh"
-#include "CacheRequestType.hh"
-#include "StoreCache.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/ruby/system/StoreCache.hh"
 
 class CacheMsg;
 class DataBlock;
diff --git a/src/mem/ruby/system/StoreCache.cc b/src/mem/ruby/system/StoreCache.cc
index bc25c50d6..a11b2ac50 100644
--- a/src/mem/ruby/system/StoreCache.cc
+++ b/src/mem/ruby/system/StoreCache.cc
@@ -32,13 +32,13 @@
  *
  */
 
-#include "StoreCache.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "SubBlock.hh"
-#include "Map.hh"
+#include "mem/ruby/system/StoreCache.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/gems_common/Map.hh"
 
 // Helper class
 struct StoreCacheEntry {
diff --git a/src/mem/ruby/system/StoreCache.hh b/src/mem/ruby/system/StoreCache.hh
index d92d39888..81eecde38 100644
--- a/src/mem/ruby/system/StoreCache.hh
+++ b/src/mem/ruby/system/StoreCache.hh
@@ -37,8 +37,8 @@
 #ifndef StoreCache_H
 #define StoreCache_H
 
-#include "Global.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
 
 
 class DataBlock;
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index a38809e94..ae77d2a85 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -37,19 +37,19 @@
  */
 
 
-#include "System.hh"
-#include "Profiler.hh"
-#include "Network.hh"
-#include "Tester.hh"
-#include "SyntheticDriver.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
-//#include "Tracer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/protocol/Protocol.hh"
 //#include "XactIsolationChecker.hh"  // gem5:Arka for decomissioning of log_tm
 //#include "XactCommitArbiter.hh"
 //#include "XactVisualizer.hh"
-#include "M5Driver.hh"
+#include "mem/ruby/interfaces/M5Driver.hh"
 
 RubySystem::RubySystem()
 {
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index f5b107240..12063eeed 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -41,12 +41,12 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Address.hh"
-#include "RubyConfig.hh"
-#include "MachineType.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 class Profiler;
 class Network;
diff --git a/src/mem/ruby/system/TBETable.hh b/src/mem/ruby/system/TBETable.hh
index ad1674dca..aa7e0df6e 100644
--- a/src/mem/ruby/system/TBETable.hh
+++ b/src/mem/ruby/system/TBETable.hh
@@ -39,12 +39,12 @@
 #ifndef TBETABLE_H
 #define TBETABLE_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
 
 template<class ENTRY>
 class TBETable {
diff --git a/src/mem/ruby/system/TimerTable.cc b/src/mem/ruby/system/TimerTable.cc
index 48e548b5c..edc2de230 100644
--- a/src/mem/ruby/system/TimerTable.cc
+++ b/src/mem/ruby/system/TimerTable.cc
@@ -31,9 +31,9 @@
  * $Id$
  */
 
-#include "Global.hh"
-#include "TimerTable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/TimerTable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 TimerTable::TimerTable(Chip* chip_ptr)
 {
diff --git a/src/mem/ruby/system/TimerTable.hh b/src/mem/ruby/system/TimerTable.hh
index c7f77efb1..36ac83fc6 100644
--- a/src/mem/ruby/system/TimerTable.hh
+++ b/src/mem/ruby/system/TimerTable.hh
@@ -39,9 +39,9 @@
 #ifndef TIMERTABLE_H
 #define TIMERTABLE_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 class Consumer;
 class Chip;