2 files changed, 2 insertions, 3 deletions
diff --git a/src/cpu/o3/alpha/cpu.hh b/src/cpu/o3/alpha/cpu.hh
index b961341d5..9d97f9701 100644
--- a/src/cpu/o3/alpha/cpu.hh
+++ b/src/cpu/o3/alpha/cpu.hh
@@ -31,7 +31,8 @@
 #ifndef __CPU_O3_ALPHA_CPU_HH__
 #define __CPU_O3_ALPHA_CPU_HH__
 
-#include "arch/isa_traits.hh"
+#include "arch/regfile.hh"
+#include "arch/types.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/o3/cpu.hh"
 #include "sim/byteswap.hh"
diff --git a/src/cpu/o3/alpha/cpu_impl.hh b/src/cpu/o3/alpha/cpu_impl.hh
index 0473e60c2..c07595024 100644
--- a/src/cpu/o3/alpha/cpu_impl.hh
+++ b/src/cpu/o3/alpha/cpu_impl.hh
@@ -53,8 +53,6 @@
 #include "sim/system.hh"
 #endif
 
-using namespace TheISA;
-
 template <class Impl>
 AlphaO3CPU<Impl>::AlphaO3CPU(Params *params)
 #if FULL_SYSTEM