diff -r 1b97529a49ca -r 01aa63683966 src/mem/ruby/common/Address.hh
--- a/src/mem/ruby/common/Address.hh	Tue Jul 26 10:58:50 2011 -0500
+++ b/src/mem/ruby/common/Address.hh	Tue Jul 26 11:00:12 2011 -0500
@@ -34,7 +34,6 @@
 
 #include "base/hashmap.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/MachineID.hh"
 #include "mem/ruby/system/NodeID.hh"
 
 const int ADDRESS_WIDTH = 64; // address width in bytes
diff -r 1b97529a49ca -r 01aa63683966 src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh	Tue Jul 26 10:58:50 2011 -0500
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh	Tue Jul 26 11:00:12 2011 -0500
@@ -34,7 +34,6 @@
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/common/Set.hh"
 #include "mem/ruby/system/DirectoryMemory.hh"
 #include "mem/ruby/system/MachineID.hh"
 #include "mem/ruby/system/NodeID.hh"
diff -r 1b97529a49ca -r 01aa63683966 src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc	Tue Jul 26 10:58:50 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/CacheMemory.hh"
diff -r 1b97529a49ca -r 01aa63683966 src/mem/ruby/slicc_interface/SConscript
--- a/src/mem/ruby/slicc_interface/SConscript	Tue Jul 26 10:58:50 2011 -0500
+++ b/src/mem/ruby/slicc_interface/SConscript	Tue Jul 26 11:00:12 2011 -0500
@@ -40,4 +40,3 @@
 Source('AbstractCacheEntry.cc')
 Source('RubyRequest.cc')
 Source('RubySlicc_Profiler_interface.cc')
-Source('RubySlicc_ComponentMapping.cc')
diff -r 1b97529a49ca -r 01aa63683966 src/mem/ruby/system/System.hh
--- a/src/mem/ruby/system/System.hh	Tue Jul 26 10:58:50 2011 -0500
+++ b/src/mem/ruby/system/System.hh	Tue Jul 26 11:00:12 2011 -0500
@@ -44,7 +44,6 @@
 #include "sim/sim_object.hh"
 
 class AbstractController;
-class AbstractMemory;
 class CacheRecorder;
 class MemoryVector;
 class Network;
@@ -134,7 +133,6 @@
     void registerNetwork(Network*);
     void registerProfiler(Profiler*);
     void registerTracer(Tracer*);
-    void registerAbstractMemory(AbstractMemory*);
     void registerAbstractController(AbstractController*);
 
   private: