13 files changed, 22 insertions, 2 deletions
diff --git a/src/arch/arm/interrupts.hh b/src/arch/arm/interrupts.hh
index a94408a4f..884bb7b9f 100644
--- a/src/arch/arm/interrupts.hh
+++ b/src/arch/arm/interrupts.hh
@@ -48,6 +48,7 @@
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/registers.hh"
 #include "cpu/thread_context.hh"
+#include "debug/Interrupt.hh"
 #include "params/ArmInterrupts.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 0d34121b4..1190a7f3a 100644
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -47,6 +47,7 @@
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
+#include "debug/Loader.hh"
 #include "kern/linux/events.hh"
 #include "mem/physical.hh"
 
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 9296b951a..c0c177e85 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -42,6 +42,9 @@
 #include "arch/arm/tlb.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/TLB.hh"
+#include "debug/TLBVerbose.hh"
 #include "dev/io_device.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index b2948b803..a9a163fd2 100644
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -41,6 +41,7 @@
  */
 
 #include "base/trace.hh"
+#include "debug/AMBA.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/arm/amba_fake.cc b/src/dev/arm/amba_fake.cc
index f2115048b..cc1f51761 100644
--- a/src/dev/arm/amba_fake.cc
+++ b/src/dev/arm/amba_fake.cc
@@ -41,6 +41,7 @@
  */
 
 #include "base/trace.hh"
+#include "debug/AMBA.hh"
 #include "dev/arm/amba_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/arm/gic.cc b/src/dev/arm/gic.cc
index ee8008144..b4fbb96b1 100644
--- a/src/dev/arm/gic.cc
+++ b/src/dev/arm/gic.cc
@@ -43,6 +43,8 @@
 
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/GIC.hh"
 #include "dev/arm/gic.hh"
 #include "dev/platform.hh"
 #include "dev/terminal.hh"
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index 1b8c15b83..92b5ee8cb 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -43,6 +43,7 @@
 
 #include "base/vnc/vncserver.hh"
 #include "base/trace.hh"
+#include "debug/Pl050.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/kmi.hh"
 #include "dev/ps2.hh"
diff --git a/src/dev/arm/pl011.cc b/src/dev/arm/pl011.cc
index dd1c8863e..2ab92c1db 100644
--- a/src/dev/arm/pl011.cc
+++ b/src/dev/arm/pl011.cc
@@ -41,6 +41,8 @@
  */
 
 #include "base/trace.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/Uart.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/gic.hh"
 #include "dev/arm/pl011.hh"
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index 410c8d361..1bf6f1485 100644
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -42,6 +42,8 @@
 #include "base/bitmap.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
+#include "debug/PL111.hh"
+#include "debug/Uart.hh"
 #include "dev/arm/amba_device.hh"
 #include "dev/arm/gic.hh"
 #include "dev/arm/pl111.hh"
diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc
index e6d2657ea..5ecfebc71 100644
--- a/src/dev/arm/timer_sp804.cc
+++ b/src/dev/arm/timer_sp804.cc
@@ -39,6 +39,8 @@
 
 #include "base/intmath.hh"
 #include "base/trace.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/Timer.hh"
 #include "dev/arm/gic.hh"
 #include "dev/arm/timer_sp804.hh"
 #include "mem/packet.hh"
diff --git a/src/mem/slicc/symbols/Func.py b/src/mem/slicc/symbols/Func.py
index e1670e3ed..28a0cf93c 100644
--- a/src/mem/slicc/symbols/Func.py
+++ b/src/mem/slicc/symbols/Func.py
@@ -77,6 +77,7 @@ class Func(Symbol):
         code('''
 /** Auto generated C++ code started by $__file__:$__line__ */
 
+#include "debug/RubySlicc.hh"
 #include "mem/protocol/Types.hh"
 ''')
 
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index cdaecc1cc..b0034c10d 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -144,6 +144,8 @@ def interact(scope):
         code.InteractiveConsole(scope).interact(banner)
 
 def main(*args):
+    import m5
+
     import core
     import debug
     import defines
@@ -154,7 +156,6 @@ def main(*args):
 
     from util import fatal
 
-    global options
     if len(args) == 0:
         options, arguments = parse_options()
     elif len(args) == 2:
@@ -162,6 +163,8 @@ def main(*args):
     else:
         raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args)
 
+    m5.options = options
+
     def check_tracing():
         if defines.TRACING_ON:
             return
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 184c2c6f7..9a5dc836d 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -47,7 +47,7 @@ MaxTick = 2**63 - 1
 # The final hook to generate .ini files.  Called from the user script
 # once the config is built.
 def instantiate(ckpt_dir=None):
-    from main import options
+    from m5 import options
 
     root = objects.Root.getInstance()