diff --git a/src/emucore/CompuMate.hxx b/src/emucore/CompuMate.hxx
index ef7523e19..96e0b2b09 100644
--- a/src/emucore/CompuMate.hxx
+++ b/src/emucore/CompuMate.hxx
@@ -24,6 +24,7 @@
 #include "CartCM.hxx"
 #include "Control.hxx"
 #include "Event.hxx"
+#include "Console.hxx"
 
 /**
   Handler for SpectraVideo CompuMate bankswitched games.
diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx
index d3d6ebc3b..5afc01ce8 100644
--- a/src/emucore/OSystem.hxx
+++ b/src/emucore/OSystem.hxx
@@ -460,8 +460,10 @@ class OSystem
     unique_ptr<Launcher> myLauncher;
     bool myLauncherUsed;
 
+  #ifdef DEBUGGER_SUPPORT
     // Pointer to the Debugger object
     unique_ptr<Debugger> myDebugger;
+  #endif
 
     // Pointer to the CheatManager object
     unique_ptr<CheatManager> myCheatManager;