12 files changed, 35 insertions, 35 deletions
diff --git a/base/loader/aout_object.cc b/base/loader/aout_object.cc
index c0f43a687..0270e02a3 100644
--- a/base/loader/aout_object.cc
+++ b/base/loader/aout_object.cc
@@ -28,14 +28,14 @@
 
 #include <string>
 
-#include "aout_object.hh"
+#include "base/loader/aout_object.hh"
 
-#include "functional_memory.hh"
-#include "symtab.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "base/loader/symtab.hh"
 
-#include "trace.hh"	// for DPRINTF
+#include "base/trace.hh"	// for DPRINTF
 
-#include "exec_aout.h"
+#include "base/loader/exec_aout.h"
 
 using namespace std;
 
diff --git a/base/loader/aout_object.hh b/base/loader/aout_object.hh
index baa8904a8..77c59aef6 100644
--- a/base/loader/aout_object.hh
+++ b/base/loader/aout_object.hh
@@ -29,7 +29,7 @@
 #ifndef __AOUT_OBJECT_HH__
 #define __AOUT_OBJECT_HH__
 
-#include "object_file.hh"
+#include "base/loader/object_file.hh"
 
 // forward decls: avoid including exec_aout.h here
 struct aout_exechdr;
diff --git a/base/loader/ecoff_object.cc b/base/loader/ecoff_object.cc
index 87ad6fdca..5e726a1c5 100644
--- a/base/loader/ecoff_object.cc
+++ b/base/loader/ecoff_object.cc
@@ -28,16 +28,16 @@
 
 #include <string>
 
-#include "ecoff_object.hh"
+#include "base/loader/ecoff_object.hh"
 
-#include "functional_memory.hh"
-#include "symtab.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "base/loader/symtab.hh"
 
-#include "trace.hh"	// for DPRINTF
+#include "base/trace.hh"	// for DPRINTF
 
-#include "exec_ecoff.h"
-#include "coff_sym.h"
-#include "coff_symconst.h"
+#include "base/loader/exec_ecoff.h"
+#include "base/loader/coff_sym.h"
+#include "base/loader/coff_symconst.h"
 
 using namespace std;
 
diff --git a/base/loader/ecoff_object.hh b/base/loader/ecoff_object.hh
index af757cd0e..94b11c720 100644
--- a/base/loader/ecoff_object.hh
+++ b/base/loader/ecoff_object.hh
@@ -29,7 +29,7 @@
 #ifndef __ECOFF_OBJECT_HH__
 #define __ECOFF_OBJECT_HH__
 
-#include "object_file.hh"
+#include "base/loader/object_file.hh"
 
 // forward decls: avoid including exec_ecoff.h here
 struct ecoff_exechdr;
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc
index 97f50e289..605895c9c 100644
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -28,14 +28,14 @@
 
 #include <string>
 
-#include "elf_object.hh"
+#include "base/loader/elf_object.hh"
 
-#include "functional_memory.hh"
-#include "symtab.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "base/loader/symtab.hh"
 
-#include "trace.hh"	// for DPRINTF
+#include "base/trace.hh"	// for DPRINTF
 
-#include "exec_elf.h"
+#include "base/loader/exec_elf.h"
 
 using namespace std;
 
diff --git a/base/loader/elf_object.hh b/base/loader/elf_object.hh
index c90f6ebd5..28f6bb243 100644
--- a/base/loader/elf_object.hh
+++ b/base/loader/elf_object.hh
@@ -29,7 +29,7 @@
 #ifndef __ELF_OBJECT_HH__
 #define __ELF_OBJECT_HH__
 
-#include "object_file.hh"
+#include "base/loader/object_file.hh"
 
 // forward decls: avoid including exec_elf.hh here
 struct Elf64_Ehdr;
diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h
index baed30c42..498e313cb 100644
--- a/base/loader/exec_aout.h
+++ b/base/loader/exec_aout.h
@@ -57,6 +57,6 @@
         (N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \
         N_GETMAGIC(ex) != ZMAGIC)
 
-#include "aout_machdep.h"
+#include "targetarch/aout_machdep.h"
 
 #endif /* !_SYS_EXEC_AOUT_H_ */
diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h
index 8c559ab90..0289c94ef 100644
--- a/base/loader/exec_ecoff.h
+++ b/base/loader/exec_ecoff.h
@@ -39,7 +39,7 @@
 #ifndef	_SYS_EXEC_ECOFF_H_
 #define	_SYS_EXEC_ECOFF_H_
 
-#include "ecoff_machdep.h"
+#include "targetarch/ecoff_machdep.h"
 
 struct ecoff_filehdr {
         coff_ushort f_magic;	/* magic number */
diff --git a/base/loader/object_file.cc b/base/loader/object_file.cc
index 07b10b5ee..5a13d180c 100644
--- a/base/loader/object_file.cc
+++ b/base/loader/object_file.cc
@@ -35,13 +35,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "cprintf.hh"
-#include "object_file.hh"
-#include "symtab.hh"
+#include "base/cprintf.hh"
+#include "base/loader/object_file.hh"
+#include "base/loader/symtab.hh"
 
-#include "ecoff_object.hh"
-#include "aout_object.hh"
-#include "elf_object.hh"
+#include "base/loader/ecoff_object.hh"
+#include "base/loader/aout_object.hh"
+#include "base/loader/elf_object.hh"
 
 using namespace std;
 
diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh
index 1e37b7b70..5950ea326 100644
--- a/base/loader/object_file.hh
+++ b/base/loader/object_file.hh
@@ -29,7 +29,7 @@
 #ifndef __OBJECT_FILE_HH__
 #define __OBJECT_FILE_HH__
 
-#include "isa_traits.hh"	// for Addr
+#include "targetarch/isa_traits.hh"	// for Addr
 
 class FunctionalMemory;
 class SymbolTable;
diff --git a/base/loader/symtab.cc b/base/loader/symtab.cc
index 7beee182b..075c197a6 100644
--- a/base/loader/symtab.cc
+++ b/base/loader/symtab.cc
@@ -31,10 +31,10 @@
 #include <string>
 #include <vector>
 
-#include "host.hh"
-#include "misc.hh"
-#include "str.hh"
-#include "symtab.hh"
+#include "sim/host.hh"
+#include "base/misc.hh"
+#include "base/str.hh"
+#include "base/loader/symtab.hh"
 
 using namespace std;
 
diff --git a/base/loader/symtab.hh b/base/loader/symtab.hh
index 073325eba..49a811018 100644
--- a/base/loader/symtab.hh
+++ b/base/loader/symtab.hh
@@ -29,8 +29,8 @@
 #ifndef __SYMTAB_HH__
 #define __SYMTAB_HH__
 
-#include "hashmap.hh"
-#include "isa_traits.hh"	// for Addr
+#include "base/hashmap.hh"
+#include "targetarch/isa_traits.hh"	// for Addr
 
 class SymbolTable
 {