diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/libruby.cc
--- a/src/mem/ruby/libruby.cc	Fri Feb 25 10:13:57 2011 -0600
+++ b/src/mem/ruby/libruby.cc	Fri Feb 25 10:28:25 2011 -0600
@@ -32,7 +32,6 @@
 #include "config/gems_root.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
-#include "mem/ruby/libruby_internal.hh"
 #include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/system/MemoryVector.hh"
 #include "mem/ruby/system/RubyPort.hh"
diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/libruby_internal.hh
--- a/src/mem/ruby/libruby_internal.hh	Fri Feb 25 10:13:57 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2009 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.
- */
-
-#ifndef __MEM_RUBY_LIBRUBY_INTERNAL_HH__
-#define __MEM_RUBY_LIBRUBY_INTERNAL_HH__
-
-#include <ostream>
-#include <string>
-
-#include "mem/ruby/libruby.hh"
-
-std::string RubyRequestType_to_string(const RubyRequestType& obj);
-RubyRequestType string_to_RubyRequestType(std::string);
-std::ostream& operator<<(std::ostream& out, const RubyRequestType& obj);
-
-#endif // __MEM_RUBY_LIBRUBY_INTERNAL_HH__
diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/recorder/CacheRecorder.hh
--- a/src/mem/ruby/recorder/CacheRecorder.hh	Fri Feb 25 10:13:57 2011 -0600
+++ b/src/mem/ruby/recorder/CacheRecorder.hh	Fri Feb 25 10:28:25 2011 -0600
@@ -40,7 +40,6 @@
 
 #include "mem/protocol/CacheRequestType.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/libruby_internal.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/recorder/TraceRecord.hh"
 
diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh	Fri Feb 25 10:13:57 2011 -0600
+++ b/src/mem/ruby/libruby.hh	Fri Feb 25 10:28:25 2011 -0600
@@ -86,6 +86,10 @@
     {}
 };
 
+std::string RubyRequestType_to_string(const RubyRequestType& obj);
+RubyRequestType string_to_RubyRequestType(std::string);
+std::ostream& operator<<(std::ostream& out, const RubyRequestType& obj);
+
 std::ostream& operator<<(std::ostream& out, const RubyRequest& obj);
 std::ostream& operator<<(std::ostream& out, const RubyRequestType& obj);
 
diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/recorder/TraceRecord.hh
--- a/src/mem/ruby/recorder/TraceRecord.hh	Fri Feb 25 10:13:57 2011 -0600
+++ b/src/mem/ruby/recorder/TraceRecord.hh	Fri Feb 25 10:28:25 2011 -0600
@@ -38,7 +38,6 @@
 
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/libruby_internal.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/system/Sequencer.hh"
 
diff -r 8d6642a5ef39 -r d7e5860bcc1b src/mem/ruby/recorder/Tracer.hh
--- a/src/mem/ruby/recorder/Tracer.hh	Fri Feb 25 10:13:57 2011 -0600
+++ b/src/mem/ruby/recorder/Tracer.hh	Fri Feb 25 10:28:25 2011 -0600
@@ -41,7 +41,7 @@
 
 #include "mem/protocol/CacheRequestType.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/libruby_internal.hh"
+#include "mem/ruby/libruby.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "params/RubyTracer.hh"
 #include "sim/sim_object.hh"