diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index ad9cf0881d..e1917f9102 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -29,10 +29,7 @@
 #ifndef __ARCH_SPARC_ISA_TRAITS_HH__
 #define __ARCH_SPARC_ISA_TRAITS_HH__
 
-#include "arch/sparc/sparc_traits.hh"
-#include "arch/sparc/types.hh"
 #include "base/types.hh"
-#include "cpu/static_inst_fwd.hh"
 
 namespace SparcISA
 {
@@ -42,8 +39,6 @@ const ByteOrder GuestByteOrder = BigEndianByteOrder;
 const Addr PageShift = 13;
 const Addr PageBytes = ULL(1) << PageShift;
 
-StaticInstPtr decodeInst(ExtMachInst);
-
 }
 
 #endif // __ARCH_SPARC_ISA_TRAITS_HH__
diff --git a/src/arch/sparc/pagetable.hh b/src/arch/sparc/pagetable.hh
index 73435c029f..8bf8176a38 100644
--- a/src/arch/sparc/pagetable.hh
+++ b/src/arch/sparc/pagetable.hh
@@ -34,8 +34,7 @@
 #include "arch/sparc/isa_traits.hh"
 #include "base/bitfield.hh"
 #include "base/logging.hh"
-
-class Checkpoint;
+#include "sim/serialize.hh"
 
 namespace SparcISA
 {