diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh
index d3886e0eb6..f54bd7ca23 100644
--- a/src/arch/generic/debugfaults.hh
+++ b/src/arch/generic/debugfaults.hh
@@ -42,6 +42,7 @@
 
 #include "base/logging.hh"
 #include "cpu/null_static_inst.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "sim/faults.hh"
 
diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh
index 013ef99b75..fc108484d3 100644
--- a/src/cpu/o3/comm.hh
+++ b/src/cpu/o3/comm.hh
@@ -46,6 +46,7 @@
 
 #include "arch/pcstate.hh"
 #include "base/types.hh"
+#include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/o3/dyn_inst_ptr.hh"
 #include "cpu/o3/limits.hh"
diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index b1c358c66b..d2e091ef2e 100644
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -43,7 +43,7 @@
 
 #include "base/types.hh"
 #include "cpu/null_static_inst.hh"
-#include "cpu/static_inst.hh"
+#include "cpu/static_inst_fwd.hh"
 #include "mem/htm.hh"
 #include "sim/stats.hh"