8 files changed, 16 insertions, 17 deletions
diff --git a/src/sim/arguments.cc b/src/sim/arguments.cc
index 5aa57755a..339a57f90 100644
--- a/src/sim/arguments.cc
+++ b/src/sim/arguments.cc
@@ -28,11 +28,10 @@
  * Authors: Nathan Binkert
  */
 
-#include "sim/arguments.hh"
 #include "arch/utility.hh"
+#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
-
-using namespace TheISA;
+#include "sim/arguments.hh"
 
 Arguments::Data::~Data()
 {
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 55bd2f209..ec6ac0449 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -40,6 +40,7 @@
 #include "base/loader/symtab.hh"
 #include "base/statistics.hh"
 #include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
@@ -53,7 +54,6 @@
 #include "sim/syscall_emul.hh"
 #include "sim/system.hh"
 
-#include "arch/isa_specific.hh"
 #if THE_ISA == ALPHA_ISA
 #include "arch/alpha/linux/process.hh"
 #include "arch/alpha/tru64/process.hh"
diff --git a/src/sim/process.hh b/src/sim/process.hh
index 05a48071a..7922ce073 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -47,9 +47,11 @@
 #include "arch/registers.hh"
 #include "base/statistics.hh"
 #include "base/types.hh"
+#include "config/the_isa.hh"
 #include "sim/sim_object.hh"
 #include "sim/syscallreturn.hh"
 
+class BaseRemoteGDB;
 class GDBListener;
 class PageTable;
 class ProcessParams;
@@ -58,10 +60,6 @@ class SyscallDesc;
 class System;
 class ThreadContext;
 class TranslatingPort;
-namespace TheISA
-{
-    class RemoteGDB;
-}
 
 template<class IntType>
 struct AuxVector
@@ -94,7 +92,7 @@ class Process : public SimObject
     std::vector<int> contextIds;
 
     // remote gdb objects
-    std::vector<TheISA::RemoteGDB *> remoteGDB;
+    std::vector<BaseRemoteGDB *> remoteGDB;
     std::vector<GDBListener *> gdbListen;
     bool breakpoint();
 
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 6182150d4..cf063818b 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -35,10 +35,10 @@
 #include <fstream>
 #include <string>
 
-#include "config/full_system.hh"
-
 #include "arch/vtophys.hh"
 #include "base/debug.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/quiesce_event.hh"
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 811bdb73a..bd66594af 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -38,12 +38,12 @@
 #include "sim/syscall_emul.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
+#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/base.hh"
 #include "mem/page_table.hh"
 #include "sim/process.hh"
 #include "sim/system.hh"
-
 #include "sim/sim_exit.hh"
 
 using namespace std;
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index c00edfdc6..c9ce4b14f 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -55,6 +55,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/translating_port.hh"
diff --git a/src/sim/system.cc b/src/sim/system.cc
index f10167bba..da77f1995 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -38,11 +38,14 @@
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "mem/mem_object.hh"
 #include "mem/physical.hh"
 #include "sim/byteswap.hh"
 #include "sim/system.hh"
 #include "sim/debug.hh"
+
 #if FULL_SYSTEM
 #include "arch/vtophys.hh"
 #include "kern/kernel_stats.hh"
diff --git a/src/sim/system.hh b/src/sim/system.hh
index aa89866bd..eabbc8351 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -45,6 +45,7 @@
 #include "mem/port.hh"
 #include "params/System.hh"
 #include "sim/sim_object.hh"
+
 #if FULL_SYSTEM
 #include "kern/system_events.hh"
 #include "mem/vport.hh"
@@ -59,10 +60,7 @@ class PhysicalMemory;
 class Platform;
 #endif
 class GDBListener;
-namespace TheISA
-{
-    class RemoteGDB;
-}
+class BaseRemoteGDB;
 
 class System : public SimObject
 {
@@ -187,7 +185,7 @@ class System : public SimObject
 
 #endif
   public:
-    std::vector<TheISA::RemoteGDB *> remoteGDB;
+    std::vector<BaseRemoteGDB *> remoteGDB;
     std::vector<GDBListener *> gdbListen;
     bool breakpoint();