diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index 7b621891c..3ea8760ee 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -45,6 +45,8 @@
 #include "Settings.hxx"
 #include "Vec.hxx"
 
+#include "TIA.hxx"
+#include "M6532.hxx"
 #include "System.hxx"
 #include "M6502.hxx"
 #include "DispatchResult.hxx"
diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 5b05259a4..469ec738e 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -670,8 +670,10 @@ double OSystem::dispatchEmulation(EmulationWorker& emulationWorker)
   // Stop the worker and wait until it has finished
   uInt64 totalCycles = emulationWorker.stop();
 
+#ifdef DEBUGGER_SUPPORT
   // Break or trap? -> start debugger
   if (dispatchResult.getStatus() == DispatchResult::Status::debugger) myDebugger->start();
+#endif
 
   // Handle frying
   if (dispatchResult.getStatus() == DispatchResult::Status::ok && myEventHandler->frying())