diff --git a/arch/alpha/system.cc b/arch/alpha/system.cc
index b841a6d53..1e80c7768 100644
--- a/arch/alpha/system.cc
+++ b/arch/alpha/system.cc
@@ -27,6 +27,7 @@
  */
 
 #include "arch/alpha/system.hh"
+#include "arch/vtophys.hh"
 #include "base/remote_gdb.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
@@ -35,7 +36,6 @@
 #include "mem/functional/physical.hh"
 #include "sim/byteswap.hh"
 #include "sim/builder.hh"
-#include "targetarch/vtophys.hh"
 
 using namespace LittleEndianGuest;
 
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc
index 9dd9f9d00..fd69c9e56 100644
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -38,8 +38,8 @@
 #define __LIBELF_NEED_LINK_H    0
 #define __LIBELF_SYMBOL_VERSIONS 0
 
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
+#include "libelf/libelf.h"
+#include "libelf/gelf.h"
 
 #include "base/loader/elf_object.hh"