8 files changed, 16 insertions, 17 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 4a350dbfc..b9187a92e 100644
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -30,13 +30,13 @@
 #include <string>
 #include <vector>
 
+#include "arch/alpha/alpha_memory.hh"
+#include "arch/alpha/ev5.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "sim/builder.hh"
-#include "targetarch/alpha_memory.hh"
-#include "targetarch/ev5.hh"
 
 using namespace std;
 
diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc
index 2dca3f51e..905d6b9ae 100644
--- a/arch/alpha/arguments.cc
+++ b/arch/alpha/arguments.cc
@@ -26,10 +26,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "arch/alpha/arguments.hh"
+#include "arch/alpha/vtophys.hh"
 #include "cpu/exec_context.hh"
 #include "mem/functional_mem/physical_memory.hh"
-#include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
 
 AlphaArguments::Data::~Data()
 {
diff --git a/arch/alpha/arguments.hh b/arch/alpha/arguments.hh
index 78e66b3fd..b4dc0eea8 100644
--- a/arch/alpha/arguments.hh
+++ b/arch/alpha/arguments.hh
@@ -31,9 +31,9 @@
 
 #include <assert.h>
 
+#include "arch/alpha/vtophys.hh"
 #include "base/refcnt.hh"
 #include "sim/host.hh"
-#include "targetarch/vtophys.hh"
 
 class ExecContext;
 
diff --git a/arch/alpha/faults.cc b/arch/alpha/faults.cc
index a800f9886..c98bb91a5 100644
--- a/arch/alpha/faults.cc
+++ b/arch/alpha/faults.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "targetarch/faults.hh"
+#include "arch/alpha/faults.hh"
 
 namespace {
     const char *
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 6559368e4..c73e79024 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -29,9 +29,9 @@
 #ifndef __ISA_TRAITS_HH__
 #define __ISA_TRAITS_HH__
 
-#include "sim/host.hh"
-#include "targetarch/faults.hh"
+#include "arch/alpha/faults.hh"
 #include "base/misc.hh"
+#include "sim/host.hh"
 
 class FastCPU;
 class FullCPU;
@@ -125,7 +125,7 @@ class AlphaISA
 
     typedef uint64_t InternalProcReg;
 
-#include "targetarch/isa_fullsys_traits.hh"
+#include "arch/alpha/isa_fullsys_traits.hh"
 
 #else
     enum {
@@ -278,7 +278,7 @@ const int NumInterruptLevels = TheISA::NumInterruptLevels;
 
 // more stuff that should be imported here, but I'm too tired to do it
 // right now...
-#include "targetarch/ev5.hh"
+#include "arch/alpha/ev5.hh"
 #endif
 
 #endif // __ALPHA_ISA_H__
diff --git a/arch/alpha/osfpal.cc b/arch/alpha/osfpal.cc
index 2717079ab..3cdc3864a 100644
--- a/arch/alpha/osfpal.cc
+++ b/arch/alpha/osfpal.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "targetarch/osfpal.hh"
+#include "arch/alpha/osfpal.hh"
 
 namespace {
     const char *strings[PAL::NumCodes] = {
diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc
index ca6c280bc..493a2380e 100644
--- a/arch/alpha/vtophys.cc
+++ b/arch/alpha/vtophys.cc
@@ -28,12 +28,11 @@
 
 #include <string>
 
-#include "targetarch/pmap.h"
-
+#include "arch/alpha/pmap.h"
+#include "arch/alpha/vtophys.hh"
+#include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "mem/functional_mem/physical_memory.hh"
-#include "base/trace.hh"
-#include "targetarch/vtophys.hh"
 
 using namespace std;
 
diff --git a/arch/alpha/vtophys.hh b/arch/alpha/vtophys.hh
index 7c22e3371..f26404924 100644
--- a/arch/alpha/vtophys.hh
+++ b/arch/alpha/vtophys.hh
@@ -29,8 +29,8 @@
 #ifndef __VTOPHYS_H__
 #define __VTOPHYS_H__
 
-#include "targetarch/isa_traits.hh"
-#include "targetarch/pmap.h"
+#include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/pmap.h"
 
 inline bool entry_valid(uint64_t entry)
 { return (entry & ALPHA_PTE_VALID) != 0; }