From bb1d2f39575795f0b369bb3cabb52c9d42a8b1c6 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 4 Sep 2013 13:22:55 -0400
Subject: arch: Header clean up for NOISA resurrection

This patch is a first step to getting NOISA working again. A number of
redundant includes make life more difficult than it has to be and this
patch simply removes them. There are also some redundant forward
declarations removed.
---
 src/cpu/intr_control.hh | 1 -
 src/cpu/static_inst.hh  | 6 ------
 2 files changed, 7 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh
index ee7b3ea7f..f8ded6f39 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 507decbdf..0464eda14 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;
-- 
cgit v1.2.3