diff --git a/src/base/vnc/vncserver.hh b/src/base/vnc/vncserver.hh
index 17c0975368..cd1f186f58 100644
--- a/src/base/vnc/vncserver.hh
+++ b/src/base/vnc/vncserver.hh
@@ -53,7 +53,6 @@
 #include "base/circlebuf.hh"
 #include "base/pollevent.hh"
 #include "base/socket.hh"
-#include "cpu/intr_control.hh"
 #include "params/VncServer.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh
index ee7b3ea7f5..f8ded6f39d 100644
--- a/src/cpu/intr_control.hh
+++ b/src/cpu/intr_control.hh
@@ -35,7 +35,6 @@
 #include <vector>
 
 #include "base/misc.hh"
-#include "cpu/base.hh"
 #include "params/IntrControl.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 507decbdf5..0464eda145 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -46,20 +46,14 @@
 #include "sim/fault_fwd.hh"
 
 // forward declarations
-struct AlphaSimpleImpl;
-struct OzoneImpl;
-struct SimpleImpl;
-class DynInst;
 class Packet;
 
 struct O3CPUImpl;
 template <class Impl> class BaseO3DynInst;
 typedef BaseO3DynInst<O3CPUImpl> O3DynInst;
-template <class Impl> class OzoneDynInst;
 class InOrderDynInst;
 
 class CheckerCPU;
-class FastCPU;
 class AtomicSimpleCPU;
 class TimingSimpleCPU;
 class InorderCPU;
diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc
index 67f8e0345a..9a6ea5c6b4 100644
--- a/src/dev/ns_gige.cc
+++ b/src/dev/ns_gige.cc
@@ -40,7 +40,6 @@
 #include "base/inet.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "debug/EthernetAll.hh"
 #include "dev/etherlink.hh"
 #include "dev/ns_gige.hh"
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index c2d5fb49d0..02eb8a1136 100644
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -38,8 +38,6 @@
 #include "base/inet.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
-#include "cpu/intr_control.hh"
-#include "cpu/thread_context.hh"
 #include "debug/EthernetAll.hh"
 #include "dev/etherlink.hh"
 #include "dev/sinic.hh"
diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index d5abde83f9..0c8ed248ae 100644
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -34,13 +34,10 @@
 
 #include <string>
 
-#include "cpu/static_inst.hh"
+#include "config/the_isa.hh"
 #include "sim/serialize.hh"
 #include "sim/stats.hh"
 
-class BaseCPU;
-class ThreadContext;
-class FnEvent;
 // What does kernel stats expect is included?
 class System;
 
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index 715bb54aa5..5429861d6f 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -59,7 +59,7 @@
 #include "cpu/base.hh"
 #endif
 
-#include "sim/eventq.hh"
+#include "sim/eventq_impl.hh"
 #include "sim/stat_control.hh"
 
 using namespace std;