diff -r ed43466c5eec -r 0b5848686cf8 src/dev/baddev.cc
--- a/src/dev/baddev.cc	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/dev/baddev.cc	Fri Feb 11 18:42:18 2011 -0600
@@ -45,7 +45,6 @@
 #include "sim/system.hh"
 
 using namespace std;
-using namespace TheISA;
 
 BadDevice::BadDevice(Params *p)
     : BasicPioDevice(p), devname(p->devicename)
diff -r ed43466c5eec -r 0b5848686cf8 src/dev/platform.hh
--- a/src/dev/platform.hh	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/dev/platform.hh	Fri Feb 11 18:42:18 2011 -0600
@@ -41,7 +41,6 @@
 #include <set>
 
 #include "sim/sim_object.hh"
-#include "arch/isa_traits.hh"
 #include "params/Platform.hh"
 
 class PciConfigAll;
diff -r ed43466c5eec -r 0b5848686cf8 src/dev/platform.cc
--- a/src/dev/platform.cc	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/dev/platform.cc	Fri Feb 11 18:42:18 2011 -0600
@@ -35,7 +35,6 @@
 #include "sim/sim_exit.hh"
 
 using namespace std;
-using namespace TheISA;
 
 Platform::Platform(const Params *p)
     : SimObject(p), intrctrl(p->intrctrl)
diff -r ed43466c5eec -r 0b5848686cf8 src/dev/simple_disk.hh
--- a/src/dev/simple_disk.hh	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/dev/simple_disk.hh	Fri Feb 11 18:42:18 2011 -0600
@@ -36,7 +36,6 @@
 #define __DEV_SIMPLE_DISK_HH__
 
 #include "sim/sim_object.hh"
-#include "arch/isa_traits.hh"
 #include "params/SimpleDisk.hh"
 
 class DiskImage;
diff -r ed43466c5eec -r 0b5848686cf8 src/mem/cache/blk.hh
--- a/src/mem/cache/blk.hh	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/mem/cache/blk.hh	Fri Feb 11 18:42:18 2011 -0600
@@ -39,7 +39,6 @@
 
 #include "base/printable.hh"
 #include "sim/core.hh"          // for Tick
-#include "arch/isa_traits.hh"   // for Addr
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff -r ed43466c5eec -r 0b5848686cf8 src/mem/cache/builder.cc
--- a/src/mem/cache/builder.cc	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/mem/cache/builder.cc	Fri Feb 11 18:42:18 2011 -0600
@@ -64,7 +64,6 @@
 
 
 using namespace std;
-using namespace TheISA;
 
 #define BUILD_CACHE(TAGS, tags)                         \
     do {                                                \
diff -r ed43466c5eec -r 0b5848686cf8 src/mem/cache/prefetch/tagged.cc
--- a/src/mem/cache/prefetch/tagged.cc	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/mem/cache/prefetch/tagged.cc	Fri Feb 11 18:42:18 2011 -0600
@@ -33,7 +33,6 @@
  * Describes a tagged prefetcher based on template policies.
  */
 
-#include "arch/isa_traits.hh"
 #include "mem/cache/prefetch/tagged.hh"
 
 TaggedPrefetcher::TaggedPrefetcher(const BaseCacheParams *p)
diff -r ed43466c5eec -r 0b5848686cf8 src/mem/physical.cc
--- a/src/mem/physical.cc	Fri Feb 11 18:42:14 2011 -0600
+++ b/src/mem/physical.cc	Fri Feb 11 18:42:18 2011 -0600
@@ -53,6 +53,7 @@
 #include <iostream>
 #include <string>
 
+#include "arch/isa_traits.hh"
 #include "arch/registers.hh"
 #include "base/intmath.hh"
 #include "base/misc.hh"