diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh
index 7d62d3fed0..5c3982f385 100644
--- a/src/arch/generic/debugfaults.hh
+++ b/src/arch/generic/debugfaults.hh
@@ -41,6 +41,7 @@
 #include <string>
 
 #include "base/logging.hh"
+#include "cpu/thread_context.hh"
 #include "sim/faults.hh"
 
 namespace GenericISA
diff --git a/src/cpu/o3/rename_map.hh b/src/cpu/o3/rename_map.hh
index 5f779bd8ef..46d5400dcd 100644
--- a/src/cpu/o3/rename_map.hh
+++ b/src/cpu/o3/rename_map.hh
@@ -46,6 +46,7 @@
 #include <utility>
 #include <vector>
 
+#include "arch/generic/isa.hh"
 #include "arch/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/free_list.hh"