diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index ed45b58e8f..ebc5529f36 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -43,19 +43,17 @@
 #define __CPU_STATIC_INST_HH__
 
 #include <bitset>
+#include <cstdint>
 #include <memory>
 #include <string>
 
-#include "arch/registers.hh"
 #include "arch/types.hh"
 #include "base/logging.hh"
 #include "base/refcnt.hh"
-#include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/op_class.hh"
 #include "cpu/reg_class.hh"
 #include "cpu/static_inst_fwd.hh"
-#include "cpu/thread_context.hh"
 #include "enums/StaticInstFlags.hh"
 #include "sim/byteswap.hh"
 
@@ -63,6 +61,7 @@
 class Packet;
 
 class ExecContext;
+class ThreadContext;
 
 namespace Loader
 {