diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 56b5d99df..22224f867 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -24,16 +24,22 @@
 #include "MediaFactory.hxx"
 #include "Sound.hxx"
 
-#ifdef DEBUGGER_SUPPORT
-  #include "Debugger.hxx"
-#endif
-
 #ifdef CHEATCODE_SUPPORT
   #include "CheatManager.hxx"
 #endif
-
+#ifdef DEBUGGER_SUPPORT
+  #include "Debugger.hxx"
+#endif
+#ifdef GUI_SUPPORT
+  #include "Menu.hxx"
+  #include "CommandMenu.hxx"
+  #include "Launcher.hxx"
+  #include "TimeMachine.hxx"
+  #include "Widget.hxx"
+#endif
 #ifdef SQLITE_SUPPORT
   #include "KeyValueRepositorySqlite.hxx"
+  #include "SettingsDb.hxx"
 #endif
 
 #include "FSNode.hxx"
@@ -59,14 +65,6 @@
 #include "repository/KeyValueRepositoryNoop.hxx"
 #include "repository/KeyValueRepositoryConfigfile.hxx"
 
-#ifdef GUI_SUPPORT
-  #include "Menu.hxx"
-  #include "CommandMenu.hxx"
-  #include "Launcher.hxx"
-  #include "TimeMachine.hxx"
-  #include "Widget.hxx"
-#endif
-
 #include "OSystem.hxx"
 
 using namespace std::chrono;
diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx
index cc770f855..0bedddb4c 100644
--- a/src/emucore/OSystem.hxx
+++ b/src/emucore/OSystem.hxx
@@ -18,12 +18,7 @@
 #ifndef OSYSTEM_HXX
 #define OSYSTEM_HXX
 
-class CommandMenu;
 class Console;
-class Debugger;
-class Launcher;
-class Menu;
-class TimeMachine;
 class FrameBuffer;
 class EventHandler;
 class Properties;
@@ -32,15 +27,26 @@ class Random;
 class Sound;
 class StateManager;
 class TimerManager;
-class VideoDialog;
 class EmulationWorker;
 class AudioSettings;
-class SettingsDb;
+#ifdef CHEATCODE_SUPPORT
+  class CheatManager;
+#endif
+#ifdef DEBUGGER_SUPPORT
+  class Debugger;
+#endif
+#ifdef GUI_SUPPORT
+  class CommandMenu;
+  class Launcher;
+  class Menu;
+  class TimeMachine;
+  class VideoDialog;
+#endif
 #ifdef PNG_SUPPORT
   class PNGLibrary;
 #endif
-#ifdef CHEATCODE_SUPPORT
-  class CheatManager;
+#ifdef SQLITE_SUPPORT
+  class SettingsDb;
 #endif
 
 #include <chrono>
@@ -63,9 +69,11 @@ class SettingsDb;
 class OSystem
 {
   friend class EventHandler;
+#ifdef GUI_SUPPORT
   friend class VideoDialog;
   friend class StellaSettingsDialog;
   friend class DeveloperDialog;
+#endif
 
   public:
     OSystem();