11 files changed, 64 insertions, 64 deletions
diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
index 3d0e70408..6bb936248 100644
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include "AbstractCacheEntry.hh"
+#include "mem/ruby/slicc_interface/AbstractCacheEntry.hh"
 
 AbstractCacheEntry::AbstractCacheEntry() {
 }
diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
index ff678d342..18dc16ca8 100644
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
@@ -37,9 +37,9 @@
 #ifndef AbstractCacheEntry_H
 #define AbstractCacheEntry_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "AccessPermission.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessPermission.hh"
 
 class AbstractCacheEntry {
 public:
diff --git a/src/mem/ruby/slicc_interface/AbstractChip.cc b/src/mem/ruby/slicc_interface/AbstractChip.cc
index 1f2eda741..5ef39b238 100644
--- a/src/mem/ruby/slicc_interface/AbstractChip.cc
+++ b/src/mem/ruby/slicc_interface/AbstractChip.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include "AbstractChip.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 AbstractChip::AbstractChip(NodeID id, Network* net_ptr) {
   m_id = id;
diff --git a/src/mem/ruby/slicc_interface/AbstractChip.hh b/src/mem/ruby/slicc_interface/AbstractChip.hh
index 05039d09d..d47dd6306 100644
--- a/src/mem/ruby/slicc_interface/AbstractChip.hh
+++ b/src/mem/ruby/slicc_interface/AbstractChip.hh
@@ -37,12 +37,12 @@
 #ifndef ABSTRACT_CHIP_H
 #define ABSTRACT_CHIP_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
-#include "L1Cache_Entry.hh"
-#include "Address.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/L1Cache_Entry.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/gems_common/Vector.hh"
 
 class Network;
 class Sequencer;
diff --git a/src/mem/ruby/slicc_interface/Message.hh b/src/mem/ruby/slicc_interface/Message.hh
index 596e1c12f..c8917795b 100644
--- a/src/mem/ruby/slicc_interface/Message.hh
+++ b/src/mem/ruby/slicc_interface/Message.hh
@@ -34,10 +34,10 @@
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 class Message;
 typedef RefCnt<Message> MsgPtr;
diff --git a/src/mem/ruby/slicc_interface/NetworkMessage.hh b/src/mem/ruby/slicc_interface/NetworkMessage.hh
index 357b89402..81c7dc2b0 100644
--- a/src/mem/ruby/slicc_interface/NetworkMessage.hh
+++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh
@@ -39,12 +39,12 @@
 #ifndef NetworkMessage_H
 #define NetworkMessage_H
 
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "Message.hh"
-#include "MessageSizeType.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class Address;
 
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
index 90f7a702b..bf5778479 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
@@ -34,14 +34,14 @@
 #ifndef COMPONENTMAPPINGFNS_H
 #define COMPONENTMAPPINGFNS_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "NetDest.hh"
-#include "GenericMachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/protocol/GenericMachineType.hh"
 
 #ifdef MACHINETYPE_L1Cache
 #define MACHINETYPE_L1CACHE_ENUM MachineType_L1Cache
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
index 19018c218..0d5b48c34 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
@@ -36,13 +36,13 @@
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "AddressProfiler.hh"
-#include "Protocol.hh"
-#include "RubySlicc_Profiler_interface.hh"
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 // #include "TransactionInterfaceManager.hh"
 
 void profile_request(int cache_state, Directory_State directory_state, GenericRequestType request_type)
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
index fa83c84c1..6cc3c6cd2 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
@@ -39,14 +39,14 @@
 #ifndef RUBYSLICC_PROFILER_INTERFACE_H
 #define RUBYSLICC_PROFILER_INTERFACE_H
 
-#include "Global.hh"
-#include "Profiler.hh"
-#include "Address.hh"
-#include "L1Cache_State.hh"
-#include "AccessType.hh"
-#include "GenericRequestType.hh"
-#include "Directory_State.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Set;
 
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index a3233af5d..d4db1bb28 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -39,23 +39,23 @@
 #ifndef SLICC_UTIL_H
 #define SLICC_UTIL_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "RubyConfig.hh"
-#include "CacheMsg.hh"
-#include "GenericRequestType.hh"
-#include "CacheRequestType.hh"
-#include "AccessType.hh"
-#include "MachineType.hh"
-#include "Directory_State.hh"
-#include "L1Cache_State.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "PrefetchBit.hh"
-
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/PrefetchBit.hh"
+
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 
 class Set;
 class NetDest;
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
index 8f552db29..0ac5496c4 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
@@ -1,9 +1,9 @@
 #ifndef RUBYSLICC_INCLUDES_H
 #define RUBYSLICC_INCLUDES_H
 
-#include "RubySlicc_ComponentMapping.hh"
-#include "RubySlicc_Util.hh"
-#include "RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
 
 #endif