8 files changed, 11 insertions, 17 deletions
diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh
index 349332170..852de5554 100644
--- a/src/arch/alpha/isa_traits.hh
+++ b/src/arch/alpha/isa_traits.hh
@@ -37,8 +37,7 @@ namespace LittleEndianGuest {}
 #include "arch/alpha/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
-
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
 
 namespace AlphaISA {
 
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index e056856b6..48e561c95 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -140,12 +140,12 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
         } else if (load) {
             *++uop = new MicroUopRegMov(machInst, regIdx, INTREG_UREG1);
             if (reg == INTREG_PC) {
-                (*uop)->setFlag(StaticInstBase::IsControl);
-                (*uop)->setFlag(StaticInstBase::IsCondControl);
-                (*uop)->setFlag(StaticInstBase::IsIndirectControl);
+                (*uop)->setFlag(StaticInst::IsControl);
+                (*uop)->setFlag(StaticInst::IsCondControl);
+                (*uop)->setFlag(StaticInst::IsIndirectControl);
                 // This is created as a RAS POP
                 if (rn == INTREG_SP)
-                    (*uop)->setFlag(StaticInstBase::IsReturn);
+                    (*uop)->setFlag(StaticInst::IsReturn);
 
             }
         }
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index 40371e065..43b3674d4 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -47,13 +47,12 @@
 
 #include "arch/arm/types.hh"
 #include "base/types.hh"
+#include "cpu/static_inst_fwd.hh"
 
 namespace LittleEndianGuest {}
 
 #define TARGET_ARM
 
-class StaticInstPtr;
-
 namespace ArmISA
 {
     using namespace LittleEndianGuest;
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index 2f789c6bf..5cef45523 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -38,11 +38,10 @@
 #include "arch/mips/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
+#include "cpu/static_inst_fwd.hh"
 
 namespace LittleEndianGuest {}
 
-class StaticInstPtr;
-
 namespace MipsISA
 {
 
diff --git a/src/arch/power/isa_traits.hh b/src/arch/power/isa_traits.hh
index f0f50b9e9..3db4ab5aa 100644
--- a/src/arch/power/isa_traits.hh
+++ b/src/arch/power/isa_traits.hh
@@ -37,11 +37,10 @@
 
 #include "arch/power/types.hh"
 #include "base/types.hh"
+#include "cpu/static_inst_fwd.hh"
 
 namespace BigEndianGuest {}
 
-class StaticInstPtr;
-
 namespace PowerISA
 {
 
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 6992cfee1..620d9c402 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -36,8 +36,7 @@
 #include "arch/sparc/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
-
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
 
 namespace BigEndianGuest {}
 
diff --git a/src/arch/x86/insts/badmicroop.hh b/src/arch/x86/insts/badmicroop.hh
index 0185af0d9..b9830c56f 100644
--- a/src/arch/x86/insts/badmicroop.hh
+++ b/src/arch/x86/insts/badmicroop.hh
@@ -40,7 +40,7 @@
 #ifndef __ARCH_X86_INSTS_BADMICROOP_HH__
 #define __ARCH_X86_INSTS_BADMICROOP_HH__
 
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
 
 namespace X86ISA
 {
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index f67b58788..09a280215 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -43,8 +43,7 @@
 #include "arch/x86/types.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/types.hh"
-
-class StaticInstPtr;
+#include "cpu/static_inst_fwd.hh"
 
 namespace LittleEndianGuest {}