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.

17 files changed, 117 insertions, 117 deletions

diff --git a/src/mem/slicc/symbols/Action.hh b/src/mem/slicc/symbols/Action.hh
index 0f6e49290..dbb0c836a 100644
--- a/src/mem/slicc/symbols/Action.hh
+++ b/src/mem/slicc/symbols/Action.hh
@@ -34,7 +34,7 @@
 #ifndef ACTION_H
 #define ACTION_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Action : public Symbol {
 public:
diff --git a/src/mem/slicc/symbols/Event.hh b/src/mem/slicc/symbols/Event.hh
index f272e8eb1..40cefc982 100644
--- a/src/mem/slicc/symbols/Event.hh
+++ b/src/mem/slicc/symbols/Event.hh
@@ -34,7 +34,7 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Event : public Symbol {
 public:
diff --git a/src/mem/slicc/symbols/Func.cc b/src/mem/slicc/symbols/Func.cc
index 1af1e299c..0ccca7598 100644
--- a/src/mem/slicc/symbols/Func.cc
+++ b/src/mem/slicc/symbols/Func.cc
@@ -36,10 +36,10 @@
  *
  */
 
-#include "Func.hh"
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Func::Func(string id, const Location& location,
            Type* type_ptr, const Vector<Type*>& param_type_vec,
@@ -98,8 +98,8 @@ void Func::writeCFiles(string path) const
     // Header
     out << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
     out << endl;
-    out << "#include \"Types.hh\"" << endl;
-    out << "#include \"Chip.hh\"" << endl;
+    out << "#include \"mem/protocol/Types.hh\"" << endl;
+    out << "#include \"mem/protocol/Chip.hh\"" << endl;
     if (m_isInternalMachineFunc) {
       out << "#include \"" << m_machineStr << "_Controller.hh\"" << endl;
     }
diff --git a/src/mem/slicc/symbols/Func.hh b/src/mem/slicc/symbols/Func.hh
index 763827701..c7e78838e 100644
--- a/src/mem/slicc/symbols/Func.hh
+++ b/src/mem/slicc/symbols/Func.hh
@@ -39,8 +39,8 @@
 #ifndef FUNC_H
 #define FUNC_H
 
-#include "slicc_global.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Type.hh"
 class StateMachine;
 
 class Func : public Symbol {
diff --git a/src/mem/slicc/symbols/State.hh b/src/mem/slicc/symbols/State.hh
index cac743e57..39900d506 100644
--- a/src/mem/slicc/symbols/State.hh
+++ b/src/mem/slicc/symbols/State.hh
@@ -34,7 +34,7 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class State : public Symbol {
 public:
diff --git a/src/mem/slicc/symbols/StateMachine.cc b/src/mem/slicc/symbols/StateMachine.cc
index d4436870e..6aaa0ebca 100644
--- a/src/mem/slicc/symbols/StateMachine.cc
+++ b/src/mem/slicc/symbols/StateMachine.cc
@@ -32,17 +32,17 @@
  *
  * */
 
-#include "StateMachine.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "Action.hh"
-#include "Event.hh"
-#include "State.hh"
-#include "Transition.hh"
-#include "Var.hh"
-#include "SymbolTable.hh"
-#include "util.hh"
-#include "Vector.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/gems_common/Vector.hh"
 
 StateMachine::StateMachine(string ident, const Location& location, const Map<string, string>& pairs)
   : Symbol(ident, location, pairs)
@@ -230,11 +230,11 @@ void StateMachine::printControllerH(ostream& out, string component) const
   out << "#ifndef " << component << "_CONTROLLER_H" << endl;
   out << "#define " << component << "_CONTROLLER_H" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"Consumer.hh\"" << endl;
-  out << "#include \"TransitionResult.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"" << component << "_Profiler.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Consumer.hh\"" << endl;
+  out << "#include \"mem/protocol/TransitionResult.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
   out << endl;
 
   // for adding information to the protocol debug trace
@@ -302,14 +302,14 @@ void StateMachine::printControllerC(ostream& out, string component) const
   out << "  * Created by slicc definition of Module \"" << getShorthand() << "\"" << endl;
   out << "  */" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"RubySlicc_includes.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
 
   // for adding information to the protocol debug trace
@@ -399,14 +399,14 @@ void StateMachine::printCWakeup(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"RubySlicc_includes.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
   out << "void " << component << "_Controller::wakeup()" << endl;
   out << "{" << endl;
@@ -447,13 +447,13 @@ void StateMachine::printCSwitch(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
   out << "#define HASH_FUN(state, event)  ((int(state)*" << component
       << "_Event_NUM)+int(event))" << endl;
@@ -650,9 +650,9 @@ void StateMachine::printProfilerH(ostream& out, string component) const
   out << "#ifndef " << component << "_PROFILER_H" << endl;
   out << "#define " << component << "_PROFILER_H" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
   out << endl;
   out << "class " << component << "_Profiler {" << endl;
   out << "public:" << endl;
@@ -674,7 +674,7 @@ void StateMachine::printProfilerC(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"" << component << "_Profiler.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
   out << endl;
 
   // Constructor
diff --git a/src/mem/slicc/symbols/StateMachine.hh b/src/mem/slicc/symbols/StateMachine.hh
index 9f3663ed4..02ab12881 100644
--- a/src/mem/slicc/symbols/StateMachine.hh
+++ b/src/mem/slicc/symbols/StateMachine.hh
@@ -35,10 +35,10 @@
 #ifndef STATEMACHINE_H
 #define STATEMACHINE_H
 
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Transition;
 class Event;
diff --git a/src/mem/slicc/symbols/Symbol.cc b/src/mem/slicc/symbols/Symbol.cc
index 3365c94eb..25af5ad47 100644
--- a/src/mem/slicc/symbols/Symbol.cc
+++ b/src/mem/slicc/symbols/Symbol.cc
@@ -32,7 +32,7 @@
  *
  */
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 Symbol::Symbol(string id, const Location& location, const Map<string, string>& pairs)
 {
diff --git a/src/mem/slicc/symbols/Symbol.hh b/src/mem/slicc/symbols/Symbol.hh
index bca7d32db..1b4bd517a 100644
--- a/src/mem/slicc/symbols/Symbol.hh
+++ b/src/mem/slicc/symbols/Symbol.hh
@@ -34,9 +34,9 @@
 #ifndef SYMBOL_H
 #define SYMBOL_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Location.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/ast/Location.hh"
 
 class Symbol {
 public:
diff --git a/src/mem/slicc/symbols/SymbolTable.cc b/src/mem/slicc/symbols/SymbolTable.cc
index 37e233e88..70391f838 100644
--- a/src/mem/slicc/symbols/SymbolTable.cc
+++ b/src/mem/slicc/symbols/SymbolTable.cc
@@ -27,11 +27,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "mif_gen.hh"
-#include "Action.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
 
 SymbolTable g_sym_table;
 
@@ -163,15 +163,15 @@ void SymbolTable::writeCFiles(string path) const
 {
   int size = m_sym_vec.size();
   {
-    // Write the Types.hh include file for the types
+    // Write the mem/protocol/Types.hh include file for the types
     ostringstream sstr;
     sstr << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
     sstr << endl;
-    sstr << "#include \"RubySlicc_includes.hh\"" << endl;
+    sstr << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
     for(int i=0; i<size; i++) {
       Type* type = dynamic_cast<Type*>(m_sym_vec[i]);
       if (type != NULL && !type->isPrimitive()) {
-        sstr << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+        sstr << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
       }
     }
     conditionally_write_file(path + "/Types.hh", sstr);
@@ -187,7 +187,7 @@ void SymbolTable::writeCFiles(string path) const
 
 void SymbolTable::writeChipFiles(string path) const
 {
-  // Create Chip.cc and Chip.hh
+  // Create Chip.cc and mem/protocol/Chip.hh
 
   // FIXME - Note: this method is _really_ ugly.  Most of this
   // functionality should be pushed into each type of symbol and use
@@ -208,9 +208,9 @@ void SymbolTable::writeChipFiles(string path) const
     sstr << endl;
 
     // Includes
-    sstr << "#include \"Global.hh\"" << endl;
-    sstr << "#include \"Types.hh\"" << endl;
-    sstr << "#include \"AbstractChip.hh\"" << endl;
+    sstr << "#include \"mem/ruby/common/Global.hh\"" << endl;
+    sstr << "#include \"mem/protocol/Types.hh\"" << endl;
+    sstr << "#include \"mem/ruby/slicc_interface/AbstractChip.hh\"" << endl;
     sstr << "class Network;" << endl;
     sstr << endl;
 
@@ -331,16 +331,16 @@ void SymbolTable::writeChipFiles(string path) const
   {
     ostringstream sstr;
     sstr << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<<endl<<endl;
-    sstr << "#include \"Chip.hh\"" << endl;
-    sstr << "#include \"Network.hh\"" << endl;
-    sstr << "#include \"CacheRecorder.hh\"" << endl;
+    sstr << "#include \"mem/protocol/Chip.hh\"" << endl;
+    sstr << "#include \"mem/ruby/network/Network.hh\"" << endl;
+    sstr << "#include \"mem/ruby/recorder/CacheRecorder.hh\"" << endl;
     sstr << "" << endl;
 
     sstr << "// Includes for controllers" << endl;
     for(int i=0; i<size; i++) {
       StateMachine* machine = dynamic_cast<StateMachine*>(m_sym_vec[i]);
       if (machine != NULL) {
-        sstr << "#include \"" << machine->getIdent() << "_Controller.hh\"" << endl;
+        sstr << "#include \"mem/protocol/" << machine->getIdent() << "_Controller.hh\"" << endl;
       }
     }
 
diff --git a/src/mem/slicc/symbols/SymbolTable.hh b/src/mem/slicc/symbols/SymbolTable.hh
index 8f40fe8c5..5e032e65d 100644
--- a/src/mem/slicc/symbols/SymbolTable.hh
+++ b/src/mem/slicc/symbols/SymbolTable.hh
@@ -39,15 +39,15 @@
 #ifndef SYMBOLTABLE_H
 #define SYMBOLTABLE_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Vector.hh"
-
-#include "Symbol.hh"
-#include "Type.hh"
-#include "Var.hh"
-#include "Func.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/gems_common/Vector.hh"
+
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 class SymbolTable;
 
diff --git a/src/mem/slicc/symbols/Transition.cc b/src/mem/slicc/symbols/Transition.cc
index 7c144c101..d6d348166 100644
--- a/src/mem/slicc/symbols/Transition.cc
+++ b/src/mem/slicc/symbols/Transition.cc
@@ -32,12 +32,12 @@
  *
  * */
 
-#include "Transition.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "util.hh"
-#include "Var.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/slicc/symbols/Var.hh"
 
 Transition::Transition(string state, string event, string nextState,
                        const Vector<string>& actionList,
diff --git a/src/mem/slicc/symbols/Transition.hh b/src/mem/slicc/symbols/Transition.hh
index af8eb3a05..7d39447b0 100644
--- a/src/mem/slicc/symbols/Transition.hh
+++ b/src/mem/slicc/symbols/Transition.hh
@@ -39,9 +39,9 @@
 #ifndef TRANSITION_H
 #define TRANSITION_H
 
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class State;
 class Event;
diff --git a/src/mem/slicc/symbols/Type.cc b/src/mem/slicc/symbols/Type.cc
index a49e9d7ba..a1de381ec 100644
--- a/src/mem/slicc/symbols/Type.cc
+++ b/src/mem/slicc/symbols/Type.cc
@@ -27,10 +27,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Type.hh"
-#include "fileio.hh"
-#include "Map.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Type::Type(string id, const Location& location,
            const Map<string, string>& pairs,
@@ -198,18 +198,18 @@ void Type::printTypeH(string path) const
   out << endl;
 
   // Include all of the #includes needed
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"Allocator.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/gems_common/Allocator.hh\"" << endl;
   for (int i=0; i < size; i++) {
     Type* type = m_data_member_type_vec[i];
     if (!type->isPrimitive()) {
-      out << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+      out << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
     }
   }
   string interface = "";
   if(existPair("interface")) {
     interface = lookupPair("interface");
-    out << "#include \"" << interface << ".hh\"" << endl;
+    out << "#include \"mem/protocol/" << interface << ".hh\"" << endl;
   }
 
   // Class definition
@@ -445,7 +445,7 @@ void Type::printTypeC(string path) const
   out << "  * Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "  */" << endl;
   out << endl;
-  out << "#include \"" << type_name << ".hh\"" << endl;
+  out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
   out << endl;
   if (isMessage()) {
     out << "Allocator<" << type_name << ">* " << type_name << "::s_allocator_ptr = NULL;" << endl;
@@ -490,9 +490,9 @@ void Type::printEnumH(string path) const
   out << "#define " << type_name << "_H" << endl;
   out << endl;
   // Include all of the #includes needed
-  out << "#include \"Global.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
   if (m_isMachineType) {
-    out << "#include \"RubyConfig.hh\"" << endl << endl;
+    out << "#include \"mem/ruby/config/RubyConfig.hh\"" << endl << endl;
   }
   out << endl;
 
@@ -568,7 +568,7 @@ void Type::printEnumC(string path) const
   out << "  */" << endl;
 
   out << endl;
-  out << "#include \"" << type_name << ".hh\"" << endl;
+  out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
   out << endl;
 
   // Code for output operator
@@ -629,7 +629,7 @@ void Type::printEnumC(string path) const
     out << "/** \\brief returns the base vector index for each machine type to be used by NetDest " << endl;
     out << "  * " << endl;
     out << "  * \\return the base vector index for each machine type to be used by NetDest" << endl;
-    out << "  * \\see NetDest.hh" << endl;
+    out << "  * \\see mem/ruby/common/NetDest.hh" << endl;
     out << "  */" << endl;
     out << "int " << type_name << "_base_level(const " << type_name << "& obj)" << endl;
     out << "{" << endl;
diff --git a/src/mem/slicc/symbols/Type.hh b/src/mem/slicc/symbols/Type.hh
index c6f891326..4187d8ad5 100644
--- a/src/mem/slicc/symbols/Type.hh
+++ b/src/mem/slicc/symbols/Type.hh
@@ -39,9 +39,9 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class StateMachine;
 
diff --git a/src/mem/slicc/symbols/Var.cc b/src/mem/slicc/symbols/Var.cc
index a16c86967..a6e8dfd55 100644
--- a/src/mem/slicc/symbols/Var.cc
+++ b/src/mem/slicc/symbols/Var.cc
@@ -32,8 +32,8 @@
  *
  * */
 
-#include "Var.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Var::Var(string id, const Location& location,
          Type* type_ptr, string code,
diff --git a/src/mem/slicc/symbols/Var.hh b/src/mem/slicc/symbols/Var.hh
index 277be0f74..7b1a2c77d 100644
--- a/src/mem/slicc/symbols/Var.hh
+++ b/src/mem/slicc/symbols/Var.hh
@@ -39,9 +39,9 @@
 #ifndef VAR_H
 #define VAR_H
 
-#include "slicc_global.hh"
-#include "Symbol.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
 
 class StateMachine;