diff -r 87cafa076695 src/cpu/base.hh
--- a/src/cpu/base.hh	Thu Mar 08 02:10:03 2012 -0800
+++ b/src/cpu/base.hh	Fri Mar 09 21:40:35 2012 +0800
@@ -58,7 +58,7 @@
 #include "sim/full_system.hh"
 #include "sim/insttracer.hh"
 
-class BaseCPUParams;
+struct BaseCPUParams;
 class BranchPred;
 class CheckerCPU;
 class ThreadContext;
diff -r 87cafa076695 src/sim/full_system.hh
--- a/src/sim/full_system.hh	Thu Mar 08 02:10:03 2012 -0800
+++ b/src/sim/full_system.hh	Fri Mar 09 21:40:35 2012 +0800
@@ -31,6 +31,6 @@
 #ifndef __SIM_FULL_SYSTEM_HH__
 #define __SIM_FULL_SYSTEM_HH__
 
-extern bool FullSystem;
+extern int FullSystem;
 
 #endif // __SIM_FULL_SYSTEM_HH__
diff -r 87cafa076695 src/sim/root.cc
--- a/src/sim/root.cc	Thu Mar 08 02:10:03 2012 -0800
+++ b/src/sim/root.cc	Fri Mar 09 21:40:35 2012 +0800
@@ -124,7 +124,7 @@
     timeSyncEnable(params()->time_sync_enable);
 }
 
-bool FullSystem;
+int FullSystem;
 
 Root *
 RootParams::create()