diff --git a/src/cpu/pred/indirect.hh b/src/cpu/pred/indirect.hh
index f4e6e816db..5c070869e1 100644
--- a/src/cpu/pred/indirect.hh
+++ b/src/cpu/pred/indirect.hh
@@ -29,7 +29,7 @@
 #ifndef __CPU_PRED_INDIRECT_BASE_HH__
 #define __CPU_PRED_INDIRECT_BASE_HH__
 
-#include "arch/isa_traits.hh"
+#include "arch/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "params/IndirectPredictor.hh"
diff --git a/src/sim/vma.hh b/src/sim/vma.hh
index 3d5d104100..8dd385342b 100644
--- a/src/sim/vma.hh
+++ b/src/sim/vma.hh
@@ -31,8 +31,8 @@
 
 #include <string>
 
-#include "arch/isa_traits.hh"
 #include "base/addr_range.hh"
+#include "base/trace.hh"
 #include "base/types.hh"
 #include "debug/Vma.hh"
 #include "mem/se_translating_port_proxy.hh"