diff -r 9d7c1dc54954 -r bb033f64128c src/arch/arm/vtophys.hh
--- a/src/arch/arm/vtophys.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/arch/arm/vtophys.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -38,7 +38,6 @@
 #include "arch/arm/utility.hh"
 
 class ThreadContext;
-class FunctionalPort;
 
 namespace ArmISA {
     inline Addr PteAddr(Addr a) { return (a & PteMask) << PteShift; }
diff -r 9d7c1dc54954 -r bb033f64128c src/arch/mips/vtophys.hh
--- a/src/arch/mips/vtophys.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/arch/mips/vtophys.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -38,7 +38,6 @@
 #include "arch/mips/utility.hh"
 
 class ThreadContext;
-class FunctionalPort;
 
 namespace MipsISA {
     inline Addr PteAddr(Addr a) { return (a & PteMask) << PteShift; }
diff -r 9d7c1dc54954 -r bb033f64128c src/arch/power/vtophys.hh
--- a/src/arch/power/vtophys.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/arch/power/vtophys.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -40,7 +40,6 @@
 #include "arch/power/utility.hh"
 
 class ThreadContext;
-class FunctionalPort;
 
 namespace PowerISA {
 
diff -r 9d7c1dc54954 -r bb033f64128c src/arch/sparc/vtophys.hh
--- a/src/arch/sparc/vtophys.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/arch/sparc/vtophys.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -36,13 +36,9 @@
 #include "arch/sparc/pagetable.hh"
 
 class ThreadContext;
-class FunctionalPort;
 
 namespace SparcISA {
 
-PageTableEntry
-kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, SparcISA::VAddr vaddr);
-
 Addr vtophys(Addr vaddr);
 Addr vtophys(ThreadContext *tc, Addr vaddr);
 
diff -r 9d7c1dc54954 -r bb033f64128c src/cpu/inorder/thread_context.hh
--- a/src/cpu/inorder/thread_context.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/cpu/inorder/thread_context.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -44,8 +44,6 @@
     class Statistics;
 };
 
-class TranslatingPort;
-
 /**
  * Derived ThreadContext class for use with the InOrderCPU.  It
  * provides the interface for any external objects to access a
diff -r 9d7c1dc54954 -r bb033f64128c src/cpu/o3/thread_context.hh
--- a/src/cpu/o3/thread_context.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/cpu/o3/thread_context.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -40,8 +40,6 @@
     class Statistics;
 };
 
-class TranslatingPort;
-
 /**
  * Derived ThreadContext class for use with the O3CPU.  It
  * provides the interface for any external objects to access a
diff -r 9d7c1dc54954 -r bb033f64128c src/cpu/simple_thread.hh
--- a/src/cpu/simple_thread.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/cpu/simple_thread.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -58,8 +58,6 @@
 
 class FunctionProfile;
 class ProfileNode;
-class FunctionalPort;
-class PhysicalPort;
 
 namespace TheISA {
     namespace Kernel {
@@ -71,7 +69,6 @@
 
 #include "mem/page_table.hh"
 #include "sim/process.hh"
-class TranslatingPort;
 
 #endif // FULL_SYSTEM
 
diff -r 9d7c1dc54954 -r bb033f64128c src/kern/solaris/solaris.hh
--- a/src/kern/solaris/solaris.hh	Sat Jan 28 19:33:37 2012 -0600
+++ b/src/kern/solaris/solaris.hh	Sun Jan 29 18:51:03 2012 +0000
@@ -42,8 +42,6 @@
 
 #include "kern/operatingsystem.hh"
 
-class TranslatingPort;
-
 ///
 /// This class encapsulates the types, structures, constants,
 /// functions, and syscall-number mappings specific to the Solaris