106 files changed, 347 insertions, 191 deletions

diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp
index 47eea18ec5..bc99e846e9 100644
--- a/engines/titanic/carry/carry.cpp
+++ b/engines/titanic/carry/carry.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/carry/carry.h"
+#include "titanic/debugger.h"
 #include "titanic/messages/messages.h"
 #include "titanic/npcs/character.h"
 #include "titanic/npcs/succubus.h"
diff --git a/engines/titanic/continue_save_dialog.cpp b/engines/titanic/continue_save_dialog.cpp
index c74e1c7634..3b447135bd 100644
--- a/engines/titanic/continue_save_dialog.cpp
+++ b/engines/titanic/continue_save_dialog.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "titanic/continue_save_dialog.h"
+#include "titanic/support/movie_manager.h"
 #include "titanic/titanic.h"
+#include "common/error.h"
+#include "common/str-array.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 11b8b58451..ae517a2689 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -24,13 +24,16 @@
 #include "titanic/core/mail_man.h"
 #include "titanic/core/resource_key.h"
 #include "titanic/core/room_item.h"
+#include "titanic/core/project_item.h"
+#include "titanic/debugger.h"
+#include "titanic/events.h"
+#include "titanic/game_manager.h"
 #include "titanic/npcs/true_talk_npc.h"
 #include "titanic/pet_control/pet_control.h"
 #include "titanic/star_control/star_control.h"
 #include "titanic/support/files_manager.h"
 #include "titanic/support/screen_manager.h"
 #include "titanic/support/video_surface.h"
-#include "titanic/game_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 13bcdfc4b4..0fa5d44511 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -20,17 +20,18 @@
  *
  */
 
-#include "common/file.h"
-#include "common/savefile.h"
-#include "graphics/scaler.h"
-#include "graphics/thumbnail.h"
-#include "titanic/game_manager.h"
-#include "titanic/titanic.h"
 #include "titanic/core/dont_save_file_item.h"
 #include "titanic/core/node_item.h"
 #include "titanic/core/project_item.h"
 #include "titanic/core/view_item.h"
+#include "titanic/events.h"
+#include "titanic/game_manager.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/titanic.h"
+#include "common/file.h"
+#include "common/savefile.h"
+#include "graphics/scaler.h"
+#include "graphics/thumbnail.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/core/resource_key.cpp b/engines/titanic/core/resource_key.cpp
index e10b3be4cb..c7c48b5fdc 100644
--- a/engines/titanic/core/resource_key.cpp
+++ b/engines/titanic/core/resource_key.cpp
@@ -20,10 +20,11 @@
  *
  */
 
-#include "common/file.h"
-#include "titanic/titanic.h"
-#include "titanic/support/simple_file.h"
 #include "titanic/core/resource_key.h"
+#include "titanic/support/files_manager.h"
+#include "titanic/support/simple_file.h"
+#include "titanic/titanic.h"
+#include "common/file.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 60e08a5582..489ef810e6 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -20,13 +20,14 @@
  *
  */
 
-#include "titanic/game_manager.h"
-#include "titanic/support/screen_manager.h"
+#include "titanic/core/view_item.h"
 #include "titanic/core/project_item.h"
 #include "titanic/core/room_item.h"
-#include "titanic/core/view_item.h"
+#include "titanic/events.h"
+#include "titanic/game_manager.h"
 #include "titanic/messages/messages.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/support/screen_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp
index ec38291c65..15d098a99a 100644
--- a/engines/titanic/debugger.cpp
+++ b/engines/titanic/debugger.cpp
@@ -21,11 +21,17 @@
  */
 
 #include "titanic/debugger.h"
-#include "titanic/titanic.h"
+#include "titanic/core/node_item.h"
+#include "titanic/core/room_item.h"
 #include "titanic/core/tree_item.h"
+#include "titanic/core/view_item.h"
+#include "titanic/game_manager.h"
 #include "titanic/game/movie_tester.h"
+#include "titanic/main_game_window.h"
 #include "titanic/pet_control/pet_control.h"
 #include "titanic/support/movie.h"
+#include "titanic/titanic.h"
+#include "common/str-array.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/debugger.h b/engines/titanic/debugger.h
index 36da1d33f4..3e53feec2a 100644
--- a/engines/titanic/debugger.h
+++ b/engines/titanic/debugger.h
@@ -23,16 +23,27 @@
 #ifndef TITANIC_DEBUGGER_H
 #define TITANIC_DEBUGGER_H
 
-#include "common/scummsys.h"
 #include "gui/debugger.h"
-#include "titanic/core/room_item.h"
-#include "titanic/core/node_item.h"
-#include "titanic/core/view_item.h"
+#include "common/scummsys.h"
 
 namespace Titanic {
 
+#define DEBUG_BASIC 1
+#define DEBUG_INTERMEDIATE 2
+#define DEBUG_DETAILED 3
+
+class CNodeItem;
+class CRoomItem;
+class CViewItem;
 class TitanicEngine;
 
+enum TitanicDebugChannels {
+	kDebugCore      = 1 << 0,
+	kDebugScripts	= 1 << 1,
+	kDebugGraphics	= 1 << 2,
+	kDebugStarfield = 1 << 3
+};
+
 class Debugger : public GUI::Debugger {
 private:
 	/**
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index 5fad72a9df..b33ac51bed 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "titanic/titanic.h"
 #include "titanic/core/project_item.h"
+#include "titanic/events.h"
 #include "titanic/support/simple_file.h"
-
+#include "titanic/titanic.h"
 #include "base/plugins.h"
 #include "common/savefile.h"
 #include "common/str-array.h"
diff --git a/engines/titanic/events.cpp b/engines/titanic/events.cpp
index f946f7b214..4cf7e77eff 100644
--- a/engines/titanic/events.cpp
+++ b/engines/titanic/events.cpp
@@ -20,14 +20,17 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "common/events.h"
-#include "common/system.h"
-#include "engines/util.h"
 #include "titanic/events.h"
-#include "titanic/titanic.h"
+#include "titanic/debugger.h"
+#include "titanic/game_manager.h"
 #include "titanic/main_game_window.h"
 #include "titanic/star_control/star_control.h"
+#include "titanic/titanic.h"
+#include "common/events.h"
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "engines/util.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp
index 9ae2a0e99f..c2f181d529 100644
--- a/engines/titanic/game/missiveomat.cpp
+++ b/engines/titanic/game/missiveomat.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/game/missiveomat.h"
 #include "titanic/core/room_item.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/game/music_console_button.cpp b/engines/titanic/game/music_console_button.cpp
index 872202891c..5da4c74022 100644
--- a/engines/titanic/game/music_console_button.cpp
+++ b/engines/titanic/game/music_console_button.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/game/music_console_button.h"
 #include "titanic/core/room_item.h"
+#include "titanic/sound/music_room.h"
 #include "titanic/sound/music_room_handler.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
index c32a06db39..a28e3017c9 100644
--- a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
+++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/parrot/parrot_lobby_link_updater.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp
index 756111bf11..7775ad38dc 100644
--- a/engines/titanic/game/sgt/bedhead.cpp
+++ b/engines/titanic/game/sgt/bedhead.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/sgt/bedhead.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp
index 80404fa9d3..7c1e33cce4 100644
--- a/engines/titanic/game/television.cpp
+++ b/engines/titanic/game/television.cpp
@@ -21,11 +21,11 @@
  */
 
 #include "titanic/game/television.h"
-#include "titanic/game/get_lift_eye2.h"
-#include "titanic/core/project_item.h"
 #include "titanic/carry/magazine.h"
+#include "titanic/core/project_item.h"
+#include "titanic/debugger.h"
+#include "titanic/game/get_lift_eye2.h"
 #include "titanic/pet_control/pet_control.h"
-#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 17f1783494..2dfede3d63 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "titanic/game/transport/lift.h"
-#include "titanic/pet_control/pet_control.h"
+#include "titanic/debugger.h"
 #include "titanic/moves/multi_move.h"
-#include "titanic/titanic.h"
+#include "titanic/pet_control/pet_control.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp
index 37fa7a0dba..c0616a99aa 100644
--- a/engines/titanic/game/transport/lift_indicator.cpp
+++ b/engines/titanic/game/transport/lift_indicator.cpp
@@ -22,8 +22,8 @@
 
 #include "titanic/game/transport/lift_indicator.h"
 #include "titanic/game/transport/lift.h"
+#include "titanic/debugger.h"
 #include "titanic/pet_control/pet_control.h"
-#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 65a2a278c8..e5f46bc7b7 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -20,13 +20,16 @@
  *
  */
 
-#include "titanic/titanic.h"
 #include "titanic/game_manager.h"
-#include "titanic/game_view.h"
-#include "titanic/support/screen_manager.h"
 #include "titanic/core/project_item.h"
+#include "titanic/events.h"
+#include "titanic/game_view.h"
 #include "titanic/messages/messages.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/sound/background_sound_maker.h"
+#include "titanic/support/files_manager.h"
+#include "titanic/support/screen_manager.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h
index 0d740f6d75..89c40d0356 100644
--- a/engines/titanic/game_manager.h
+++ b/engines/titanic/game_manager.h
@@ -27,18 +27,24 @@
 #include "titanic/game_state.h"
 #include "titanic/input_handler.h"
 #include "titanic/input_translator.h"
-#include "titanic/support/simple_file.h"
-#include "titanic/support/time_event_info.h"
-#include "titanic/support/video_surface.h"
-#include "titanic/true_talk/true_talk_manager.h"
-#include "titanic/sound/background_sound_maker.h"
+#include "titanic/support/time_event_info.h" // class CTimeEventInfo
+#include "titanic/true_talk/true_talk_manager.h" // class CTrueTalkManager
 #include "titanic/sound/music_room.h"
 #include "titanic/sound/sound.h"
 
 namespace Titanic {
 
-class CProjectItem;
+class CBackgroundSoundMaker;
 class CGameView;
+class CMovie;
+class CMovieClip;
+class CProjectItem;
+class CRoomItem;
+class CScreenManager;
+class CTreeItem;
+class CViewItem;
+class CVideoSurface;
+class SimpleFile;
 
 class CGameManager {
 private:
diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index 7ddd16ab22..9bb83cc03a 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -21,9 +21,11 @@
  */
 
 #include "titanic/game_state.h"
-#include "titanic/titanic.h"
+#include "titanic/game_view.h"
+#include "titanic/events.h"
 #include "titanic/game_manager.h"
 #include "titanic/support/screen_manager.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/game_view.h b/engines/titanic/game_view.h
index e17d72b472..d4a1be2c99 100644
--- a/engines/titanic/game_view.h
+++ b/engines/titanic/game_view.h
@@ -24,13 +24,15 @@
 #define TITANIC_GAME_VIEW_H
 
 #include "common/scummsys.h"
-#include "titanic/core/view_item.h"
-#include "titanic/support/video_surface.h"
 
 namespace Titanic {
 
 class CMainGameWindow;
 class CGameManager;
+class CResourceKey;
+class CViewItem;
+class CVideoSurface;
+class Rect;
 
 class CGameView {
 protected:
diff --git a/engines/titanic/gfx/text_control.cpp b/engines/titanic/gfx/text_control.cpp
index f731dbb340..d1d2e1c530 100644
--- a/engines/titanic/gfx/text_control.cpp
+++ b/engines/titanic/gfx/text_control.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/gfx/text_control.h"
+#include "titanic/support/strings.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/gfx/text_control.h b/engines/titanic/gfx/text_control.h
index d4ef19a7cf..ddcb791062 100644
--- a/engines/titanic/gfx/text_control.h
+++ b/engines/titanic/gfx/text_control.h
@@ -24,18 +24,22 @@
 #define TITANIC_TEXT_CONTROL_H
 
 #include "common/keyboard.h"
-#include "titanic/support/simple_file.h"
 #include "titanic/support/screen_manager.h"
-#include "titanic/support/text_cursor.h"
+#include "titanic/support/strings.h"
 
 namespace Titanic {
 
+class CScreenManager;
+class CTextCursor;
+class SimpleFile;
+
 class CTextControl {
 	struct ArrayEntry {
 		CString _line;
 		CString _rgb;
 		CString _string3;
 	};
+
 private:
 	Common::Array<ArrayEntry> _array;
 	CString _lines;
diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index 8bd8bba9a9..9b9bacdc68 100644
--- a/engines/titanic/input_handler.cpp
+++ b/engines/titanic/input_handler.cpp
@@ -21,11 +21,14 @@
  */
 
 #include "titanic/input_handler.h"
+#include "titanic/events.h"
 #include "titanic/game_manager.h"
-#include "titanic/titanic.h"
+#include "titanic/core/project_item.h"
 #include "titanic/messages/mouse_messages.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/support/screen_manager.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/input_handler.h b/engines/titanic/input_handler.h
index 3fd93a2ac8..53b11f8cc4 100644
--- a/engines/titanic/input_handler.h
+++ b/engines/titanic/input_handler.h
@@ -23,13 +23,15 @@
 #ifndef TITANIC_INPUT_HANDLER_H
 #define TITANIC_INPUT_HANDLER_H
 
-#include "titanic/support/rect.h"
-#include "titanic/input_translator.h"
-#include "titanic/core/tree_item.h"
+#include "titanic/support/rect.h" // Point
 
 namespace Titanic {
 
+class CGameObject;
 class CGameManager;
+class CInputTranslator;
+class CMessage;
+class CTreeItem;
 
 class CInputHandler {
 private:
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index cfea98cdf1..2d98c813a6 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -20,14 +20,17 @@
  *
  */
 
-#include "common/config-manager.h"
-#include "titanic/titanic.h"
+#include "titanic/main_game_window.h"
 #include "titanic/continue_save_dialog.h"
+#include "titanic/debugger.h"
 #include "titanic/game_manager.h"
 #include "titanic/game_view.h"
-#include "titanic/main_game_window.h"
 #include "titanic/messages/messages.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/support/files_manager.h"
+#include "titanic/titanic.h"
+#include "common/config-manager.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h
index e573217058..3e4d03e1fe 100644
--- a/engines/titanic/main_game_window.h
+++ b/engines/titanic/main_game_window.h
@@ -23,16 +23,21 @@
 #ifndef TITANIC_MAIN_GAME_WINDOW_H
 #define TITANIC_MAIN_GAME_WINDOW_H
 
-#include "common/scummsys.h"
-#include "common/array.h"
-#include "titanic/game_manager.h"
-#include "titanic/game_view.h"
-#include "titanic/support/image.h"
 #include "titanic/core/project_item.h"
 #include "titanic/events.h"
+#include "common/array.h"
+#include "common/scummsys.h"
+
+namespace Common {
+class Point;
+}
 
 namespace Titanic {
 
+class CGameManager;
+class CGameView;
+class CScreenManager;
+class Image;
 class TitanicEngine;
 
 class CMainGameWindow : public CEventTarget {
diff --git a/engines/titanic/messages/bilge_dispensor_event.cpp b/engines/titanic/messages/bilge_dispensor_event.cpp
index 336a1caf0d..c0bb289a00 100644
--- a/engines/titanic/messages/bilge_dispensor_event.cpp
+++ b/engines/titanic/messages/bilge_dispensor_event.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/messages/bilge_dispensor_event.h"
+#include "titanic/events.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/messages/messages.cpp b/engines/titanic/messages/messages.cpp
index 83c09688c4..e082733763 100644
--- a/engines/titanic/messages/messages.cpp
+++ b/engines/titanic/messages/messages.cpp
@@ -21,10 +21,12 @@
  */
 
 #include "titanic/messages/messages.h"
-#include "titanic/messages/mouse_messages.h"
 #include "titanic/core/game_object.h"
 #include "titanic/core/message_target.h"
+#include "titanic/core/project_item.h"
 #include "titanic/core/tree_item.h"
+#include "titanic/main_game_window.h"
+#include "titanic/messages/mouse_messages.h"
 #include "titanic/pet_control/pet_control.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp
index 21644bc150..2ba150a38c 100644
--- a/engines/titanic/npcs/barbot.cpp
+++ b/engines/titanic/npcs/barbot.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/npcs/barbot.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 002af21e9b..56420ba0de 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -23,8 +23,8 @@
 #include "titanic/npcs/bellbot.h"
 #include "titanic/carry/carry.h"
 #include "titanic/core/room_item.h"
+#include "titanic/game_manager.h"
 #include "titanic/pet_control/pet_control.h"
-#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp
index a5e8542db0..8d8f7ed07a 100644
--- a/engines/titanic/npcs/callbot.cpp
+++ b/engines/titanic/npcs/callbot.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/npcs/callbot.h"
 #include "titanic/core/room_item.h"
+#include "titanic/game_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index e8536c28a9..7567311ebb 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -22,7 +22,7 @@
 
 #include "titanic/npcs/doorbot.h"
 #include "titanic/core/room_item.h"
-#include "titanic/titanic.h"
+#include "titanic/debugger.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index c1b17950c6..d67fd3628e 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -22,9 +22,9 @@
 
 #include "titanic/npcs/true_talk_npc.h"
 #include "titanic/core/view_item.h"
-#include "titanic/pet_control/pet_control.h"
+#include "titanic/debugger.h"
 #include "titanic/game_manager.h"
-#include "titanic/titanic.h"
+#include "titanic/pet_control/pet_control.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 37ff3d8e9f..8157e1ce82 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/pet_control/pet_conversations.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/debugger.h"
 #include "titanic/game_manager.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/pet_control/pet_load.cpp b/engines/titanic/pet_control/pet_load.cpp
index 81ea85874f..1d81435bed 100644
--- a/engines/titanic/pet_control/pet_load.cpp
+++ b/engines/titanic/pet_control/pet_load.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "titanic/pet_control/pet_load.h"
-#include "titanic/pet_control/pet_control.h"
 #include "titanic/core/project_item.h"
 #include "titanic/game_manager.h"
+#include "titanic/main_game_window.h"
+#include "titanic/pet_control/pet_control.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index 7aae879646..2bd87fcd64 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "titanic/pet_control/pet_remote_glyphs.h"
-#include "titanic/pet_control/pet_remote.h"
-#include "titanic/pet_control/pet_control.h"
+#include "titanic/game_manager.h"
 #include "titanic/messages/pet_messages.h"
+#include "titanic/pet_control/pet_control.h"
+#include "titanic/pet_control/pet_remote.h"
 #include "titanic/star_control/star_control.h"
 #include "titanic/support/strings.h"
 #include "titanic/titanic.h"
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
index 1a5d5e139e..c14b9e79e7 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
@@ -21,10 +21,12 @@
  */
 
 #include "titanic/pet_control/pet_rooms_glyphs.h"
+#include "titanic/events.h"
 #include "titanic/pet_control/pet_control.h"
 #include "titanic/pet_control/pet_section.h"
-#include "titanic/support/screen_manager.h"
 #include "titanic/room_flags.h"
+#include "titanic/support/screen_manager.h"
+#include "titanic/support/simple_file.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.h b/engines/titanic/pet_control/pet_rooms_glyphs.h
index 3a43bdc06c..e10eafcd60 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.h
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.h
@@ -24,11 +24,12 @@
 #define TITANIC_PET_ROOMS_GLYPHS_H
 
 #include "titanic/pet_control/pet_glyphs.h"
-#include "titanic/support/simple_file.h"
 #include "titanic/game_location.h"
 
 namespace Titanic {
 
+class SimpleFile;
+
 enum RoomGlyphMode {
 	RGM_UNASSIGNED = 0, RGM_ASSIGNED_ROOM = 1, RGM_PREV_ASSIGNED_ROOM = 2
 };
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index 76d7043d0c..dbbe4e4ca8 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/sound/music_room_handler.h"
 #include "titanic/sound/sound_manager.h"
+#include "titanic/events.h"
 #include "titanic/core/project_item.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp
index a5527da356..ea5f29a536 100644
--- a/engines/titanic/sound/music_song.cpp
+++ b/engines/titanic/sound/music_song.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/sound/music_song.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 #include "common/util.h"
 
diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp
index beb1502ab4..a3c06da2f8 100644
--- a/engines/titanic/sound/qmixer.cpp
+++ b/engines/titanic/sound/qmixer.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "common/system.h"
 #include "titanic/sound/qmixer.h"
-#include "titanic/titanic.h"
+#include "titanic/debugger.h"
+#include "common/system.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index 4b5887b1e7..a4d838ce2f 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/sound/sound_manager.h"
+#include "titanic/events.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp
index c22260ea98..bb902e558e 100644
--- a/engines/titanic/star_control/base_stars.cpp
+++ b/engines/titanic/star_control/base_stars.cpp
@@ -22,7 +22,9 @@
 
 #include "titanic/star_control/base_stars.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/star_ref.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/support/simple_file.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/star_control/base_stars.h b/engines/titanic/star_control/base_stars.h
index 4333e3231e..aa6ce5ebd2 100644
--- a/engines/titanic/star_control/base_stars.h
+++ b/engines/titanic/star_control/base_stars.h
@@ -23,15 +23,21 @@
 #ifndef TITANIC_BASE_STARS_H
 #define TITANIC_BASE_STARS_H
 
-#include "titanic/star_control/frange.h"
-#include "titanic/star_control/star_closeup.h"
-#include "titanic/star_control/surface_area.h"
+#include "titanic/star_control/frange.h" // class Fvector
+#include "common/array.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Titanic {
 
 enum StarMode { MODE_STARFIELD = 0, MODE_PHOTO = 1 };
 
 class CStarCamera;
+class CStarCloseup;
+class CString;
+class CSurfaceArea;
 class SimpleFile;
 
 struct CBaseStarEntry {
diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp
index 0bde4722d1..201cd9440a 100644
--- a/engines/titanic/star_control/camera_auto_mover.cpp
+++ b/engines/titanic/star_control/camera_auto_mover.cpp
@@ -22,9 +22,6 @@
 
 #include "titanic/star_control/camera_auto_mover.h"
 #include "titanic/star_control/fmatrix.h"
-#include "titanic/star_control/error_code.h"
-#include "common/textconsole.h"
-
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/camera_mover.cpp b/engines/titanic/star_control/camera_mover.cpp
index f6392d5ea2..95981a951c 100644
--- a/engines/titanic/star_control/camera_mover.cpp
+++ b/engines/titanic/star_control/camera_mover.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "titanic/star_control/camera_mover.h"
-#include "common/textconsole.h"
+#include "titanic/star_control/base_stars.h" // includes class CStarVector
+#include "titanic/star_control/error_code.h"
+#include "titanic/star_control/fmatrix.h" // Also has class FVector
+#include "titanic/support/simple_file.h"
+// Not currently being used: #include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/camera_mover.h b/engines/titanic/star_control/camera_mover.h
index c3ec0c6f30..9bd9d48700 100644
--- a/engines/titanic/star_control/camera_mover.h
+++ b/engines/titanic/star_control/camera_mover.h
@@ -23,13 +23,18 @@
 #ifndef TITANIC_CAMERA_MOVER_H
 #define TITANIC_CAMERA_MOVER_H
 
-#include "titanic/support/simple_file.h"
-#include "titanic/star_control/base_stars.h"
-#include "titanic/star_control/error_code.h"
-#include "titanic/star_control/fmatrix.h"
+//#include "titanic/support/simple_file.h"
+//#include "titanic/star_control/error_code.h"
+//#include "titanic/star_control/fmatrix.h" // class FVector
 
 namespace Titanic {
 
+class CErrorCode;
+class CStarVector;
+class FMatrix;
+class FVector;
+class SimpleFile;
+
 struct CNavigationInfo {
 	double _speed;
 	double _speedChangeCtr;
diff --git a/engines/titanic/star_control/daffine.cpp b/engines/titanic/star_control/daffine.cpp
index 8cfd9ec612..5b935838fa 100644
--- a/engines/titanic/star_control/daffine.cpp
+++ b/engines/titanic/star_control/daffine.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "titanic/star_control/daffine.h"
-#include "titanic/star_control/fmatrix.h"
+#include "titanic/star_control/fmatrix.h" // includes FVector
 #include "titanic/star_control/matrix_transform.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/daffine.h b/engines/titanic/star_control/daffine.h
index 6e1eccc399..041d376933 100644
--- a/engines/titanic/star_control/daffine.h
+++ b/engines/titanic/star_control/daffine.h
@@ -24,7 +24,7 @@
 #define TITANIC_DAFFINE_H
 
 #include "titanic/star_control/dvector.h"
-#include "titanic/star_control/fvector.h"
+#include "titanic/star_control/fvector.h" // definition of Axis enum
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/dvector.cpp b/engines/titanic/star_control/dvector.cpp
index d1236ecdb7..88390ebc3f 100644
--- a/engines/titanic/star_control/dvector.cpp
+++ b/engines/titanic/star_control/dvector.cpp
@@ -22,7 +22,6 @@
 
 #include "titanic/star_control/dvector.h"
 #include "titanic/star_control/daffine.h"
-#include "common/algorithm.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/fpoint.cpp b/engines/titanic/star_control/fpoint.cpp
index e70cd64ebd..f426c099d0 100644
--- a/engines/titanic/star_control/fpoint.cpp
+++ b/engines/titanic/star_control/fpoint.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "titanic/star_control/fpoint.h"
-#include "common/algorithm.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/frange.cpp b/engines/titanic/star_control/frange.cpp
index e70976d6cd..7e42bade97 100644
--- a/engines/titanic/star_control/frange.cpp
+++ b/engines/titanic/star_control/frange.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "common/algorithm.h"
 #include "titanic/star_control/frange.h"
+#include "common/algorithm.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index fee74e6eba..d880a134f5 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -23,8 +23,8 @@
 #include "titanic/star_control/fvector.h"
 #include "titanic/star_control/dvector.h"
 #include "titanic/star_control/fpose.h"
-#include "common/algorithm.h"
-#include "common/textconsole.h"
+//#include "common/algorithm.h"
+//#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/marked_auto_mover.cpp b/engines/titanic/star_control/marked_auto_mover.cpp
index 0a1a7e4d49..a154bfddf2 100644
--- a/engines/titanic/star_control/marked_auto_mover.cpp
+++ b/engines/titanic/star_control/marked_auto_mover.cpp
@@ -22,8 +22,7 @@
 
 #include "titanic/star_control/marked_auto_mover.h"
 #include "titanic/star_control/error_code.h"
-#include "common/array.h"
-#include "common/textconsole.h"
+// Not currently being used: #include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/marked_camera_mover.cpp b/engines/titanic/star_control/marked_camera_mover.cpp
index 61b7c05b60..79e74cdd05 100644
--- a/engines/titanic/star_control/marked_camera_mover.cpp
+++ b/engines/titanic/star_control/marked_camera_mover.cpp
@@ -21,8 +21,9 @@
  */
 
 #include "titanic/star_control/marked_camera_mover.h"
-#include "common/array.h"
-#include "common/textconsole.h"
+#include "titanic/star_control/base_stars.h" // includes class CStarVector
+#include "titanic/star_control/error_code.h"
+// Not currently being used: #include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/matrix_transform.cpp b/engines/titanic/star_control/matrix_transform.cpp
index 226dffa2ca..4f1324d310 100644
--- a/engines/titanic/star_control/matrix_transform.cpp
+++ b/engines/titanic/star_control/matrix_transform.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/star_control/matrix_transform.h"
+#include "titanic/star_control/daffine.h"
 #include "common/textconsole.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/matrix_transform.h b/engines/titanic/star_control/matrix_transform.h
index 52f1a20e34..92d4fbff22 100644
--- a/engines/titanic/star_control/matrix_transform.h
+++ b/engines/titanic/star_control/matrix_transform.h
@@ -23,10 +23,12 @@
 #ifndef TITANIC_MATRIX_TRANSFORM_H
 #define TITANIC_MATRIX_TRANSFORM_H
 
-#include "titanic/star_control/daffine.h"
+#include "titanic/star_control/dvector.h"
 
 namespace Titanic {
 
+class Daffine;
+
 class CMatrixTransform {
 private:
 	double fn2(const CMatrixTransform &src);
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 68427a3452..6b4527e79d 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/star_control/star_camera.h"
+#include "titanic/debugger.h"
 #include "titanic/star_control/camera_mover.h"
 #include "titanic/star_control/daffine.h"
 #include "titanic/star_control/fmatrix.h"
diff --git a/engines/titanic/star_control/star_closeup.cpp b/engines/titanic/star_control/star_closeup.cpp
index d5d1aaf54c..82c88dae39 100644
--- a/engines/titanic/star_control/star_closeup.cpp
+++ b/engines/titanic/star_control/star_closeup.cpp
@@ -21,7 +21,9 @@
  */
 
 #include "titanic/star_control/star_closeup.h"
+#include "titanic/star_control/error_code.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/surface_area.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/star_closeup.h b/engines/titanic/star_control/star_closeup.h
index edd09ac124..fae3731300 100644
--- a/engines/titanic/star_control/star_closeup.h
+++ b/engines/titanic/star_control/star_closeup.h
@@ -23,15 +23,16 @@
 #ifndef TITANIC_STAR_CLOSEUP_H
 #define TITANIC_STAR_CLOSEUP_H
 
-#include "common/array.h"
 #include "titanic/star_control/fvector.h"
 #include "titanic/star_control/fpose.h"
-#include "titanic/star_control/error_code.h"
 #include "titanic/star_control/surface_area.h"
+#include "common/array.h"
 
 namespace Titanic {
 
+class CErrorCode;
 class CStarCamera;
+class CSurfaceArea;
 
 /**
  * Handles drawing a 3D rendered closeup of a star
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index 743cfd0979..cc414305eb 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -21,17 +21,13 @@
  */
 
 #include "titanic/star_control/star_control.h"
-#include "titanic/star_control/daffine.h"
-#include "titanic/star_control/fpose.h"
-#include "titanic/star_control/camera_mover.h"
-#include "titanic/star_control/star_camera.h"
-#include "titanic/star_control/error_code.h"
 #include "titanic/core/dont_save_file_item.h"
 #include "titanic/core/project_item.h"
-#include "titanic/core/view_item.h"
+#include "titanic/game_manager.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/star_control/camera_mover.h"
+#include "titanic/star_control/error_code.h" // CErrorCode
 #include "titanic/support/screen_manager.h"
-#include "titanic/game_manager.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h
index 90de2eb3eb..e4072d7d62 100644
--- a/engines/titanic/star_control/star_control.h
+++ b/engines/titanic/star_control/star_control.h
@@ -23,13 +23,14 @@
 #ifndef TITANIC_STAR_CONTROL_H
 #define TITANIC_STAR_CONTROL_H
 
-#include "titanic/core/game_object.h"
+#include "titanic/core/game_object.h" // class SimpleFile
 #include "titanic/star_control/star_field.h"
 #include "titanic/star_control/star_view.h"
-#include "titanic/pet_control/pet_control.h"
 
 namespace Titanic {
 
+class CPetControl;
+
 class CStarControl : public CGameObject {
 	DECLARE_MESSAGE_MAP;
 	bool MouseButtonDownMsg(CMouseButtonDownMsg *msg);
diff --git a/engines/titanic/star_control/star_crosshairs.cpp b/engines/titanic/star_control/star_crosshairs.cpp
index ec2aa1f409..0393da5dce 100644
--- a/engines/titanic/star_control/star_crosshairs.cpp
+++ b/engines/titanic/star_control/star_crosshairs.cpp
@@ -25,6 +25,7 @@
 #include "titanic/star_control/star_camera.h"
 #include "titanic/star_control/star_field.h"
 #include "titanic/star_control/star_ref.h"
+#include "titanic/support/simple_file.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_crosshairs.h b/engines/titanic/star_control/star_crosshairs.h
index ebd6f0d07b..d60541c205 100644
--- a/engines/titanic/star_control/star_crosshairs.h
+++ b/engines/titanic/star_control/star_crosshairs.h
@@ -23,19 +23,19 @@
 #ifndef TITANIC_STAR_CROSSHAIRS_H
 #define TITANIC_STAR_CROSSHAIRS_H
 
-#include "common/array.h"
-#include "common/rect.h"
 #include "titanic/star_control/base_stars.h"
-#include "titanic/star_control/surface_area.h"
 #include "titanic/star_control/fpoint.h"
-#include "titanic/support/simple_file.h"
+#include "titanic/star_control/surface_area.h"
 #include "titanic/support/video_surface.h"
+#include "common/array.h"
+#include "common/rect.h"
 
 namespace Titanic {
 
 class CStarField;
 class CStarMarkers;
 class CStarCamera;
+class SimpleFile;
 
 class CStarCrosshairs {
 private:
diff --git a/engines/titanic/star_control/star_field_base.cpp b/engines/titanic/star_control/star_field_base.cpp
index 7641e4a951..101180d1e0 100644
--- a/engines/titanic/star_control/star_field_base.cpp
+++ b/engines/titanic/star_control/star_field_base.cpp
@@ -21,8 +21,9 @@
  */
 
 #include "titanic/star_control/star_field_base.h"
+#include "titanic/debugger.h"
 #include "titanic/star_control/star_camera.h"
-#include "titanic/titanic.h"
+#include "titanic/support/simple_file.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_markers.cpp b/engines/titanic/star_control/star_markers.cpp
index ce8f053854..61c0c5b8f0 100644
--- a/engines/titanic/star_control/star_markers.cpp
+++ b/engines/titanic/star_control/star_markers.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/star_control/star_markers.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/surface_area.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_markers.h b/engines/titanic/star_control/star_markers.h
index 96b76d3c3b..7699e47fc7 100644
--- a/engines/titanic/star_control/star_markers.h
+++ b/engines/titanic/star_control/star_markers.h
@@ -24,6 +24,7 @@
 #define TITANIC_STAR_MARKERS_H
 
 #include "titanic/star_control/base_stars.h"
+
 namespace Titanic {
 
 class CStarMarkers : public CBaseStars {
diff --git a/engines/titanic/star_control/star_points1.cpp b/engines/titanic/star_control/star_points1.cpp
index 91bcf953a8..d8a0bdc405 100644
--- a/engines/titanic/star_control/star_points1.cpp
+++ b/engines/titanic/star_control/star_points1.cpp
@@ -22,6 +22,8 @@
 
 #include "titanic/star_control/star_points1.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/surface_area.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/star_points1.h b/engines/titanic/star_control/star_points1.h
index aeab68f72f..28b7f68455 100644
--- a/engines/titanic/star_control/star_points1.h
+++ b/engines/titanic/star_control/star_points1.h
@@ -23,13 +23,13 @@
 #ifndef TITANIC_STAR_POINTS1_H
 #define TITANIC_STAR_POINTS1_H
 
-#include "common/array.h"
-#include "titanic/star_control/surface_area.h"
 #include "titanic/star_control/fvector.h"
+#include "common/array.h"
 
 namespace Titanic {
 
 class CStarCamera;
+class CSurfaceArea;
 
 class CStarPoints1 {
 	struct CStarPointEntry : public FVector {
diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp
index 2d239038bd..23cef4ce4c 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -22,6 +22,8 @@
 
 #include "titanic/star_control/star_points2.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/surface_area.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/star_points2.h b/engines/titanic/star_control/star_points2.h
index b8077120d9..e57ea122c1 100644
--- a/engines/titanic/star_control/star_points2.h
+++ b/engines/titanic/star_control/star_points2.h
@@ -23,13 +23,13 @@
 #ifndef TITANIC_STAR_POINTS2_H
 #define TITANIC_STAR_POINTS2_H
 
-#include "common/array.h"
 #include "titanic/star_control/fvector.h"
-#include "titanic/star_control/surface_area.h"
+#include "common/array.h"
 
 namespace Titanic {
 
 class CStarCamera;
+class CSurfaceArea;
 
 class CStarPoints2 {
 	struct CStarPointEntry {
diff --git a/engines/titanic/star_control/star_ref.cpp b/engines/titanic/star_control/star_ref.cpp
index 5d1bf9abe5..f7e71d8f6e 100644
--- a/engines/titanic/star_control/star_ref.cpp
+++ b/engines/titanic/star_control/star_ref.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "titanic/star_control/star_ref.h"
+#include "titanic/star_control/star_camera.h"
+#include "titanic/star_control/surface_area.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_ref.h b/engines/titanic/star_control/star_ref.h
index 4e66db061f..dd71bf8428 100644
--- a/engines/titanic/star_control/star_ref.h
+++ b/engines/titanic/star_control/star_ref.h
@@ -20,16 +20,17 @@
  *
  */
 
-#include "common/rect.h"
 #include "titanic/star_control/base_stars.h"
-#include "titanic/star_control/star_camera.h"
-#include "titanic/star_control/surface_area.h"
+#include "common/rect.h"
 
 #ifndef TITANIC_STAR_REF_H
 #define TITANIC_STAR_REF_H
 
 namespace Titanic {
 
+class CStarCamera;
+class CSurfaceArea;
+
 class CBaseStarRef {
 protected:
 	CBaseStars *_stars;
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index ec972d12b5..bc2c096f9c 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -22,14 +22,15 @@
 
 #include "titanic/star_control/star_view.h"
 #include "titanic/star_control/camera_mover.h"
+#include "titanic/star_control/error_code.h"
 #include "titanic/star_control/fvector.h"
 #include "titanic/star_control/star_control.h"
 #include "titanic/star_control/star_field.h"
-#include "titanic/star_control/error_code.h"
 #include "titanic/support/screen_manager.h"
 #include "titanic/support/simple_file.h"
 #include "titanic/core/game_object.h"
 #include "titanic/messages/pet_messages.h"
+#include "titanic/pet_control/pet_control.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h
index b7d50969a6..2ce27c6b99 100644
--- a/engines/titanic/star_control/star_view.h
+++ b/engines/titanic/star_control/star_view.h
@@ -24,12 +24,14 @@
 #define TITANIC_STAR_VIEW_H
 
 #include "titanic/star_control/star_camera.h"
-#include "titanic/star_control/viewport.h"
 #include "titanic/star_control/surface_fader.h"
+#include "titanic/star_control/viewport.h"
+#include "titanic/support/rect.h"
 
 namespace Titanic {
 
 class CErrorCode;
+class CGameObject;
 class CStarControl;
 class CStarField;
 class CVideoSurface;
diff --git a/engines/titanic/star_control/surface_area.cpp b/engines/titanic/star_control/surface_area.cpp
index f243f60f65..a4b8d44ff7 100644
--- a/engines/titanic/star_control/surface_area.cpp
+++ b/engines/titanic/star_control/surface_area.cpp
@@ -22,7 +22,6 @@
 
 #include "titanic/star_control/surface_area.h"
 #include "graphics/primitives.h"
-#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/surface_fader.cpp b/engines/titanic/star_control/surface_fader.cpp
index e2ef828574..d2cf61934c 100644
--- a/engines/titanic/star_control/surface_fader.cpp
+++ b/engines/titanic/star_control/surface_fader.cpp
@@ -21,6 +21,9 @@
  */
 
 #include "titanic/star_control/surface_fader.h"
+#include "titanic/star_control/surface_area.h"
+#include "titanic/support/screen_manager.h"
+#include "titanic/support/video_surface.h"
 #include "common/system.h"
 #include "graphics/pixelformat.h"
 
diff --git a/engines/titanic/star_control/surface_fader.h b/engines/titanic/star_control/surface_fader.h
index 3d962b2729..d209e835b4 100644
--- a/engines/titanic/star_control/surface_fader.h
+++ b/engines/titanic/star_control/surface_fader.h
@@ -23,12 +23,14 @@
 #ifndef TITANIC_SURFACE_FADER_H
 #define TITANIC_SURFACE_FADER_H
 
-#include "titanic/support/video_surface.h"
-#include "titanic/support/screen_manager.h"
-#include "titanic/star_control/surface_area.h"
+#include "common/scummsys.h" // typedef for byte
 
 namespace Titanic {
 
+class CVideoSurface;
+class CScreenManager;
+class CSurfaceArea;
+
 class CSurfaceFader {
 private:
 	byte *_dataP;
diff --git a/engines/titanic/star_control/unmarked_auto_mover.cpp b/engines/titanic/star_control/unmarked_auto_mover.cpp
index 429e42d29c..1a5d886796 100644
--- a/engines/titanic/star_control/unmarked_auto_mover.cpp
+++ b/engines/titanic/star_control/unmarked_auto_mover.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "titanic/star_control/unmarked_auto_mover.h"
+#include "titanic/star_control/fmatrix.h"
 #include "titanic/star_control/error_code.h"
-#include "common/array.h"
-#include "common/textconsole.h"
+// Not currently being used: #include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp
index ce42b3949d..bba49e925b 100644
--- a/engines/titanic/star_control/unmarked_camera_mover.cpp
+++ b/engines/titanic/star_control/unmarked_camera_mover.cpp
@@ -21,11 +21,13 @@
  */
 
 #include "titanic/star_control/unmarked_camera_mover.h"
+#include "titanic/debugger.h"
+#include "titanic/star_control/base_stars.h" // includes class CStarVector
 #include "titanic/star_control/dvector.h"
 #include "titanic/star_control/daffine.h"
 #include "titanic/star_control/error_code.h"
-#include "common/textconsole.h"
 #include "titanic/titanic.h"
+// Not currently being used: #include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp
index 529b4bec3a..d2bdce00e0 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "titanic/star_control/viewport.h"
+#include "titanic/debugger.h"
+#include "titanic/support/simple_file.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/viewport.h b/engines/titanic/star_control/viewport.h
index 1780889081..1b4ab313b6 100644
--- a/engines/titanic/star_control/viewport.h
+++ b/engines/titanic/star_control/viewport.h
@@ -23,10 +23,10 @@
 #ifndef TITANIC_VIEWPORT_H
 #define TITANIC_VIEWPORT_H
 
-#include "titanic/support/simple_file.h"
-#include "titanic/star_control/base_stars.h"
-#include "titanic/star_control/fpose.h"
-#include "titanic/star_control/fmatrix.h"
+#include "titanic/star_control/base_stars.h" // Includes StarMode enum
+#include "titanic/star_control/fpose.h" // Includes FMatrix and FVector
+
+class SimpleFile;
 
 namespace Titanic {
 
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 7673c37c37..a7d6ef5fb6 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -20,13 +20,15 @@
  *
  */
 
-#include "common/system.h"
-#include "graphics/pixelformat.h"
-#include "video/avi_decoder.h"
 #include "titanic/support/avi_surface.h"
 #include "titanic/support/screen_manager.h"
 #include "titanic/support/video_surface.h"
+#include "titanic/events.h"
 #include "titanic/titanic.h"
+#include "common/system.h"
+#include "graphics/pixelformat.h"
+#include "graphics/screen.h"
+#include "video/avi_decoder.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp
index 6ee17a2b95..fa30bce988 100644
--- a/engines/titanic/support/credit_text.cpp
+++ b/engines/titanic/support/credit_text.cpp
@@ -21,6 +21,10 @@
  */
 
 #include "titanic/support/credit_text.h"
+#include "titanic/core/game_object.h"
+#include "titanic/events.h"
+#include "titanic/support/files_manager.h"
+#include "titanic/support/screen_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/support/direct_draw.cpp b/engines/titanic/support/direct_draw.cpp
index 9fbfe0c5ee..71a90ad00d 100644
--- a/engines/titanic/support/direct_draw.cpp
+++ b/engines/titanic/support/direct_draw.cpp
@@ -20,11 +20,13 @@
  *
  */
 
+#include "titanic/support/direct_draw.h"
+#include "titanic/debugger.h"
+#include "titanic/titanic.h"
 #include "common/debug.h"
 #include "engines/util.h"
 #include "graphics/pixelformat.h"
-#include "titanic/support/direct_draw.h"
-#include "titanic/titanic.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/support/image.cpp b/engines/titanic/support/image.cpp
index 2da2179af0..1993f44c4c 100644
--- a/engines/titanic/support/image.cpp
+++ b/engines/titanic/support/image.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/support/image.h"
+#include "titanic/support/files_manager.h"
 #include "image/bmp.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index eb58296502..1c5e0da487 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -20,11 +20,16 @@
  *
  */
 
-#include "graphics/cursorman.h"
 #include "titanic/support/mouse_cursor.h"
+#include "titanic/support/screen_manager.h"
 #include "titanic/support/transparency_surface.h"
 #include "titanic/support/video_surface.h"
+#include "titanic/events.h"
+#include "titanic/input_handler.h"
+#include "titanic/messages/mouse_messages.h"
 #include "titanic/titanic.h"
+#include "graphics/cursorman.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index a57a84d5b0..56e7b7e6f2 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -21,9 +21,13 @@
  */
 
 #include "titanic/support/movie.h"
+#include "titanic/core/game_object.h"
+#include "titanic/events.h"
+#include "titanic/messages/messages.h"
 #include "titanic/support/avi_surface.h"
+#include "titanic/support/screen_manager.h"
+#include "titanic/support/video_surface.h"
 #include "titanic/sound/sound_manager.h"
-#include "titanic/messages/messages.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp
index 3082344216..29cca4fc33 100644
--- a/engines/titanic/support/screen_manager.cpp
+++ b/engines/titanic/support/screen_manager.cpp
@@ -23,6 +23,7 @@
 #include "titanic/support/screen_manager.h"
 #include "titanic/support/video_surface.h"
 #include "titanic/titanic.h"
+#include "graphics/screen.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/support/strings.cpp b/engines/titanic/support/strings.cpp
index a8ab45800f..5ef2a6c6ac 100644
--- a/engines/titanic/support/strings.cpp
+++ b/engines/titanic/support/strings.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/support/strings.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/support/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp
index 1da98c1cf7..bf41fd30fb 100644
--- a/engines/titanic/support/text_cursor.cpp
+++ b/engines/titanic/support/text_cursor.cpp
@@ -20,10 +20,11 @@
  *
  */
 
-#include "common/textconsole.h"
 #include "titanic/support/text_cursor.h"
+#include "titanic/events.h"
 #include "titanic/support/screen_manager.h"
 #include "titanic/titanic.h"
+#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index f6c4c562ef..de28e073a9 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -20,32 +20,38 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "common/archive.h"
-#include "common/config-manager.h"
-#include "common/debug-channels.h"
-#include "common/events.h"
-#include "common/translation.h"
-#include "engines/util.h"
-#include "graphics/scaler.h"
-#include "graphics/thumbnail.h"
-#include "gui/saveload.h"
 #include "titanic/titanic.h"
-#include "titanic/debugger.h"
 #include "titanic/carry/hose.h"
 #include "titanic/core/saveable_object.h"
+#include "titanic/debugger.h"
+#include "titanic/events.h"
+#include "titanic/game_manager.h"
 #include "titanic/game/get_lift_eye2.h"
 #include "titanic/game/television.h"
 #include "titanic/game/parrot/parrot_lobby_object.h"
 #include "titanic/game/sgt/sgt_navigation.h"
 #include "titanic/game/sgt/sgt_state_room.h"
+#include "titanic/main_game_window.h"
 #include "titanic/moves/enter_exit_first_class_state.h"
 #include "titanic/moves/enter_exit_sec_class_mini_lift.h"
 #include "titanic/moves/exit_pellerator.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/sound/music_room.h"
 #include "titanic/sound/music_room_instrument.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/support/simple_file.h"
 #include "titanic/true_talk/tt_npc_script.h"
+#include "common/archive.h"
+#include "common/config-manager.h"
+#include "common/debug-channels.h"
+#include "common/events.h"
+#include "common/scummsys.h"
+#include "common/translation.h"
+#include "engines/util.h"
+#include "graphics/scaler.h"
+#include "graphics/thumbnail.h"
+#include "graphics/screen.h"
+#include "gui/saveload.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index 4742f51d82..c49a13747f 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -23,23 +23,13 @@
 #ifndef TITANIC_TITANIC_H
 #define TITANIC_TITANIC_H
 
-#include "common/scummsys.h"
-#include "common/random.h"
-#include "common/str-array.h"
-#include "common/system.h"
-#include "common/serializer.h"
-#include "engines/advancedDetector.h"
-#include "engines/engine.h"
-#include "graphics/screen.h"
-#include "titanic/debugger.h"
-#include "titanic/events.h"
-#include "titanic/support/files_manager.h"
-#include "titanic/main_game_window.h"
-#include "titanic/support/exe_resources.h"
-#include "titanic/support/movie_manager.h"
-#include "titanic/support/screen_manager.h"
-#include "titanic/support/string.h"
-#include "titanic/true_talk/tt_script_base.h"
+#include "common/random.h" // getRandomNumber and getRandomFloat
+#include "engines/engine.h" // class Engine
+#include "titanic/support/exe_resources.h" // class CExeResources
+#include "titanic/support/movie_manager.h" // class CMovieManager
+#include "titanic/support/string.h" // class StringArray;
+#include "titanic/support/strings.h" // class Strings;
+#include "common/language.h" // Language enum
 
 /**
  * This is the namespace of the Titanic engine.
@@ -49,24 +39,25 @@
  * Games using this engine:
  * - Starship Titanic
  */
-namespace Titanic {
 
-enum TitanicDebugChannels {
-	kDebugCore      = 1 << 0,
-	kDebugScripts	= 1 << 1,
-	kDebugGraphics	= 1 << 2,
-	kDebugStarfield = 1 << 3
-};
+class OSystem;
+
+namespace Graphics {
+class Screen;
+}
+
+namespace Common {
+class Error;
+class FSNode;
+}
+
+namespace Titanic {
 
 #define TITANIC_SAVEGAME_VERSION 1
 
 #define SCREEN_WIDTH 640
 #define SCREEN_HEIGHT 480
 
-#define DEBUG_BASIC 1
-#define DEBUG_INTERMEDIATE 2
-#define DEBUG_DETAILED 3
-
 #define TOTAL_ITEMS 46
 #define TOTAL_ROOMS 34
 
@@ -80,8 +71,16 @@ enum TitanicDebugChannels {
 // the game redundantly suggest removing the fuse, which is wrong
 //#define FIX_DISPENSOR_TEMPATURE
 
+class CFilesManager;
+class CMainGameWindow;
+class CString;
+class CTrueTalkManager;
+class Debugger;
+class Events;
+class OSScreenManager;
+class CScriptHandler;
+class TTscriptBase;
 struct TitanicGameDescription;
-class TitanicEngine;
 
 class TitanicEngine : public Engine {
 private:
@@ -172,14 +171,14 @@ public:
 	bool isGerman() const { return getLanguage() == Common::DE_DEU; }
 
 	/**
-	 * Gets a random number
+	 * Returns a uniform random unsigned integer in the interval [0, max]
 	 */
 	uint getRandomNumber(uint max) { return _randomSource.getRandomNumber(max); }
 
 	/**
-	 * Returns a random floating point number between 0.0 to 65535.0
+	 * Returns a uniform random floating point number in the interval [0.0, 65535.0]
 	 */
-	double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.000015259022; }
+	double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.00001525855623540901; } // fffffffe=4294967294 and 0.00001525855623540901 ~= 1/65537.0 
 
 	/**
 	 * Support method that generates a savegame name
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp
index 95ebbb5bfb..b3f25d0056 100644
--- a/engines/titanic/true_talk/parrot_script.cpp
+++ b/engines/titanic/true_talk/parrot_script.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "common/textconsole.h"
 #include "titanic/true_talk/parrot_script.h"
+#include "titanic/true_talk/true_talk_manager.h"
 #include "titanic/titanic.h"
+#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp
index be0b89bc65..f716a96130 100644
--- a/engines/titanic/true_talk/script_handler.cpp
+++ b/engines/titanic/true_talk/script_handler.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "titanic/true_talk/script_handler.h"
+#include "titanic/true_talk/title_engine.h"
 #include "titanic/true_talk/tt_concept.h"
-#include "titanic/true_talk/tt_sentence.h"
 #include "titanic/true_talk/tt_parser.h"
+#include "titanic/true_talk/tt_sentence.h"
 #include "titanic/true_talk/tt_word.h"
 #include "titanic/titanic.h"
 
diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp
index 52676139f0..bba708fb78 100644
--- a/engines/titanic/true_talk/script_support.cpp
+++ b/engines/titanic/true_talk/script_support.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/true_talk/script_support.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/true_talk/title_engine.cpp b/engines/titanic/true_talk/title_engine.cpp
index bfa97e3f92..23327014d6 100644
--- a/engines/titanic/true_talk/title_engine.cpp
+++ b/engines/titanic/true_talk/title_engine.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/true_talk/title_engine.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index a713688854..e2e411559f 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -22,8 +22,8 @@
 
 #include "titanic/true_talk/true_talk_manager.h"
 #include "titanic/core/tree_item.h"
-#include "titanic/npcs/true_talk_npc.h"
 #include "titanic/game_manager.h"
+#include "titanic/npcs/true_talk_npc.h"
 #include "titanic/titanic.h"
 
 #define MKTAG_BE(a3,a2,a1,a0) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24)))
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index b7ad0b3690..a1bb1bcc32 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/true_talk/tt_concept.h"
+#include "titanic/true_talk/script_handler.h"
 #include "titanic/true_talk/tt_script_base.h"
 #include "titanic/true_talk/tt_word.h"
 #include "titanic/titanic.h"
diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index f12d02c05f..2140f45203 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -20,15 +20,17 @@
  *
  */
 
-#include "common/algorithm.h"
-#include "common/textconsole.h"
+#include "titanic/true_talk/tt_npc_script.h"
+#include "titanic/core/project_item.h"
+#include "titanic/game_manager.h"
 #include "titanic/messages/messages.h"
 #include "titanic/pet_control/pet_control.h"
-#include "titanic/true_talk/tt_npc_script.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/true_talk/tt_sentence.h"
 #include "titanic/true_talk/true_talk_manager.h"
-#include "titanic/game_manager.h"
 #include "titanic/titanic.h"
+#include "common/algorithm.h"
+#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 8c8157370a..49f233888b 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -21,7 +21,9 @@
  */
 
 #include "titanic/true_talk/tt_parser.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/true_talk/script_handler.h"
+#include "titanic/true_talk/true_talk_manager.h"
 #include "titanic/true_talk/tt_action.h"
 #include "titanic/true_talk/tt_concept.h"
 #include "titanic/true_talk/tt_picture.h"
diff --git a/engines/titanic/true_talk/tt_quotes.cpp b/engines/titanic/true_talk/tt_quotes.cpp
index c1a1e16eea..2857a7bc6c 100644
--- a/engines/titanic/true_talk/tt_quotes.cpp
+++ b/engines/titanic/true_talk/tt_quotes.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "common/algorithm.h"
 #include "titanic/true_talk/tt_quotes.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
+#include "common/algorithm.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/true_talk/tt_quotes_tree.cpp b/engines/titanic/true_talk/tt_quotes_tree.cpp
index e2293887a8..7fe3fe2b19 100644
--- a/engines/titanic/true_talk/tt_quotes_tree.cpp
+++ b/engines/titanic/true_talk/tt_quotes_tree.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "common/algorithm.h"
 #include "titanic/true_talk/tt_quotes_tree.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
+#include "common/algorithm.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/true_talk/tt_script_base.cpp b/engines/titanic/true_talk/tt_script_base.cpp
index 5162f4dde6..7df8153098 100644
--- a/engines/titanic/true_talk/tt_script_base.cpp
+++ b/engines/titanic/true_talk/tt_script_base.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "common/textconsole.h"
 #include "titanic/true_talk/tt_script_base.h"
+#include "titanic/true_talk/script_handler.h"
 #include "titanic/titanic.h"
+#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 97a1cbb90a..20df6bd4bb 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -20,15 +20,15 @@
  *

  */

 

-#include "common/file.h"

 #include "titanic/true_talk/tt_vocab.h"

-#include "titanic/true_talk/tt_adj.h"

+#include "titanic/true_talk/script_handler.h"

 #include "titanic/true_talk/tt_action.h"

 #include "titanic/true_talk/tt_adj.h"

 #include "titanic/true_talk/tt_major_word.h"

 #include "titanic/true_talk/tt_picture.h"

 #include "titanic/true_talk/tt_pronoun.h"

 #include "titanic/titanic.h"

+#include "common/file.h"

 

 namespace Titanic {