diff -r 3baf50481316 -r 91a7a511ab04 src/arch/power/isa/includes.isa
--- a/src/arch/power/isa/includes.isa	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/arch/power/isa/includes.isa	Sat Dec 25 20:08:02 2010 -0800
@@ -71,14 +71,13 @@
 
 output exec {{
 #include <cmath>
+#if defined(linux)
+#include <fenv.h>
+#endif
 
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-#if defined(linux)
-#include <fenv.h>
-#endif
-
 #include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
diff -r 3baf50481316 -r 91a7a511ab04 src/base/stats/mysql.hh
--- a/src/base/stats/mysql.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/base/stats/mysql.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -31,6 +31,8 @@
 #ifndef __BASE_STATS_MYSQL_HH__
 #define __BASE_STATS_MYSQL_HH__
 
+#include <cstdio>
+#include <list>
 #include <map>
 #include <string>
 
@@ -40,7 +42,8 @@
 namespace MySQL { class Connection; }
 namespace Stats {
 
-class DistInfo;
+class DistData;
+class DistParams;
 class MySqlRun;
 
 struct SetupStat
@@ -70,9 +73,9 @@
 {
   private:
     char *query;
-    size_type size;
+    std::size_t size;
     bool first;
-    static const size_type maxsize = 1024*1024;
+    static const std::size_t maxsize = 1024*1024;
 
   public:
     MySqlRun *run;
diff -r 3baf50481316 -r 91a7a511ab04 src/base/stats/visit.hh
--- a/src/base/stats/visit.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/base/stats/visit.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -37,7 +37,6 @@
 class ScalarInfo;
 class VectorInfo;
 class DistInfo;
-class DistInfo;
 class VectorDistInfo;
 class Vector2dInfo;
 class FormulaInfo;
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/commit.hh
--- a/src/cpu/o3/commit.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/commit.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -32,6 +32,8 @@
 #ifndef __CPU_O3_COMMIT_HH__
 #define __CPU_O3_COMMIT_HH__
 
+#include <queue>
+
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "cpu/exetrace.hh"
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/commit_impl.hh
--- a/src/cpu/o3/commit_impl.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/commit_impl.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -55,6 +55,7 @@
 #include "cpu/o3/thread_state.hh"
 #include "cpu/exetrace.hh"
 #include "params/DerivO3CPU.hh"
+#include "sim/faults.hh"
 
 #if USE_CHECKER
 #include "cpu/checker/cpu.hh"
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/decode_impl.hh
--- a/src/cpu/o3/decode_impl.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/decode_impl.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -28,8 +28,12 @@
  * Authors: Kevin Lim
  */
 
+#include "arch/types.hh"
+#include "base/trace.hh"
+#include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/decode.hh"
+#include "cpu/inst_seq.hh"
 #include "params/DerivO3CPU.hh"
 
 using namespace std;
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/iew.hh
--- a/src/cpu/o3/iew.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/iew.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -44,6 +44,7 @@
 #define __CPU_O3_IEW_HH__
 
 #include <queue>
+#include <set>
 
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/iew_impl.hh
--- a/src/cpu/o3/iew_impl.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/iew_impl.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -46,6 +46,7 @@
 
 #include <queue>
 
+#include "arch/utility.hh"
 #include "base/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/fu_pool.hh"
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/o3/rob.hh
--- a/src/cpu/o3/rob.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/o3/rob.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -36,6 +36,8 @@
 #include <utility>
 #include <vector>
 
+#include "arch/registers.hh"
+#include "base/types.hh"
 #include "config/the_isa.hh"
 
 /**
diff -r 3baf50481316 -r 91a7a511ab04 src/cpu/smt.hh
--- a/src/cpu/smt.hh	Sat Dec 25 20:07:32 2010 -0800
+++ b/src/cpu/smt.hh	Sat Dec 25 20:08:02 2010 -0800
@@ -36,6 +36,8 @@
 #ifndef __SMT_HH__
 #define __SMT_HH__
 
+#include "base/types.hh"
+
 #ifndef SMT_MAX_THREADS
 /** The number of TPUs in any processor. */
 #define SMT_MAX_THREADS 4