13 files changed, 2 insertions, 48 deletions
diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index d7d32cc66..bce746a83 100644
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -28,24 +28,19 @@
 
 /**
  * @file
- * Modifications for the FreeBSD kernel.  Based off of kern/linux/linux_system.cc.
+ * Modifications for the FreeBSD kernel.
+ * Based on kern/linux/linux_system.cc.
  * Currently only used to skip DELAY function.
  *
  */
 
 #include "base/loader/symtab.hh"
-#include "base/trace.hh"
 #include "cpu/exec_context.hh"
-#include "cpu/base.hh"
 #include "kern/freebsd/freebsd_system.hh"
-#include "kern/system_events.hh"
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/builder.hh"
-#include "dev/platform.hh"
-#include "targetarch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
-#include "sim/debug.hh"
 
 using namespace std;
 
diff --git a/kern/freebsd/freebsd_system.hh b/kern/freebsd/freebsd_system.hh
index a3c5f8b92..6b236e52e 100644
--- a/kern/freebsd/freebsd_system.hh
+++ b/kern/freebsd/freebsd_system.hh
@@ -29,12 +29,8 @@
 #ifndef __KERN_FREEBSD_FREEBSD_SYSTEM_HH__
 #define __KERN_FREEBSD_FREEBSD_SYSTEM_HH__
 
-#include "sim/host.hh"
-#include "sim/system.hh"
-#include "targetarch/isa_traits.hh"
 #include "kern/freebsd/freebsd_events.hh"
 
-
 class FreebsdSystem : public System
 {
   private:
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc
index 6e4a77f4e..3a7d12443 100644
--- a/kern/kernel_stats.cc
+++ b/kern/kernel_stats.cc
@@ -32,13 +32,8 @@
 
 #include "arch/alpha/osfpal.hh"
 #include "base/trace.hh"
-#include "base/statistics.hh"
-#include "base/stats/bin.hh"
 #include "cpu/exec_context.hh"
-#include "cpu/pc_event.hh"
-#include "cpu/static_inst.hh"
 #include "kern/kernel_stats.hh"
-#include "kern/linux/linux_syscalls.hh"
 #include "kern/tru64/tru64_syscalls.hh"
 
 using namespace std;
diff --git a/kern/kernel_stats.hh b/kern/kernel_stats.hh
index 66364d2d7..7b931ef79 100644
--- a/kern/kernel_stats.hh
+++ b/kern/kernel_stats.hh
@@ -34,10 +34,6 @@
 #include <string>
 #include <vector>
 
-#include "base/statistics.hh"
-#include "sim/serialize.hh"
-#include "targetarch/isa_traits.hh"
-
 class BaseCPU;
 class ExecContext;
 class FnEvent;
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh
index 426299b5d..18d1b43c0 100644
--- a/kern/linux/aligned.hh
+++ b/kern/linux/aligned.hh
@@ -30,9 +30,6 @@
 #define __KERN_LINUX_ALIGNED_HH__
 
 
-#include "sim/host.hh"
-#include "targetarch/isa_traits.hh"
-
 /* GCC 3.3.X has a bug in which attributes+typedefs don't work. 3.2.X is fine
  * as in 3.4.X, but the bug is marked will not fix in 3.3.X so here is
  * the work around.
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index 21450e400..8c57ce29c 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -36,19 +36,15 @@
  */
 
 #include "base/loader/symtab.hh"
-#include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "cpu/base.hh"
 #include "kern/linux/linux_events.hh"
 #include "kern/linux/linux_system.hh"
-#include "kern/system_events.hh"
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/builder.hh"
 #include "dev/platform.hh"
-#include "targetarch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
-#include "sim/debug.hh"
 
 using namespace std;
 
diff --git a/kern/linux/linux_system.hh b/kern/linux/linux_system.hh
index f870b7744..32b92f310 100644
--- a/kern/linux/linux_system.hh
+++ b/kern/linux/linux_system.hh
@@ -29,10 +29,6 @@
 #ifndef __KERN_LINUX_LINUX_SYSTEM_HH__
 #define __KERN_LINUX_LINUX_SYSTEM_HH__
 
-#include "sim/host.hh"
-#include "sim/system.hh"
-#include "targetarch/isa_traits.hh"
-
 /**
  * MAGIC address where the kernel arguments should go. Defined as
  * PARAM in linux kernel alpha-asm.
diff --git a/kern/linux/linux_threadinfo.hh b/kern/linux/linux_threadinfo.hh
index 92cc181db..253b122bc 100644
--- a/kern/linux/linux_threadinfo.hh
+++ b/kern/linux/linux_threadinfo.hh
@@ -30,9 +30,7 @@
 #define __LINUX_TREADNIFO_HH__
 
 
-#include "targetarch/isa_traits.hh"
 #include "targetarch/vptr.hh"
-#include "cpu/exec_context.hh"
 #include "kern/linux/thread_info.hh"
 #include "kern/linux/sched.hh"
 
diff --git a/kern/linux/printk.cc b/kern/linux/printk.cc
index cafc9172a..fbc8bdad1 100644
--- a/kern/linux/printk.cc
+++ b/kern/linux/printk.cc
@@ -29,12 +29,8 @@
 #include <sys/types.h>
 #include <algorithm>
 
-#include "base/cprintf.hh"
 #include "base/trace.hh"
-#include "sim/host.hh"
 #include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
-#include "kern/linux/printk.hh"
 
 using namespace std;
 
diff --git a/kern/linux/sched.hh b/kern/linux/sched.hh
index e3febb298..a11fa590d 100644
--- a/kern/linux/sched.hh
+++ b/kern/linux/sched.hh
@@ -29,9 +29,6 @@
 #ifndef __KERN_LINUX_SCHED_HH__
 #define __KERN_LINUX_SCHED_HH__
 
-#include "targetarch/isa_traits.hh"
-#include "kern/linux/aligned.hh"
-
 namespace Linux {
     struct task_struct {
         uint8_t junk1[0xf4];
diff --git a/kern/linux/thread_info.hh b/kern/linux/thread_info.hh
index c8bcc726a..cf24ef939 100644
--- a/kern/linux/thread_info.hh
+++ b/kern/linux/thread_info.hh
@@ -30,7 +30,6 @@
 #define __KERN_LINUX_THREAD_INFO_H__
 
 #include "kern/linux/hwrpb.hh"
-#include "kern/linux/aligned.hh"
 
 namespace Linux {
     struct thread_info {
diff --git a/kern/system_events.cc b/kern/system_events.cc
index 40c223b5e..d5c0d242a 100644
--- a/kern/system_events.cc
+++ b/kern/system_events.cc
@@ -26,13 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpu/exec_context.hh"
-#include "cpu/base.hh"
-#include "encumbered/cpu/full/bpred.hh"
 #include "encumbered/cpu/full/cpu.hh"
 #include "kern/kernel_stats.hh"
-#include "kern/system_events.hh"
-#include "sim/system.hh"
 
 void
 SkipFuncEvent::process(ExecContext *xc)
diff --git a/kern/system_events.hh b/kern/system_events.hh
index 24aa8f154..94f6efeba 100644
--- a/kern/system_events.hh
+++ b/kern/system_events.hh
@@ -29,8 +29,6 @@
 #ifndef __SYSTEM_EVENTS_HH__
 #define __SYSTEM_EVENTS_HH__
 
-#include "cpu/pc_event.hh"
-
 class System;
 
 class SkipFuncEvent : public PCEvent