[Scummvm-git-logs] scummvm master -> 9b07378c244004b7fe6800f984aebd3716f6bb62

dreammaster dreammaster at scummvm.org
Fri Aug 25 13:23:39 CEST 2017


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c96b01b82e TITANIC: Reduce header includes for titanic.h
9b10f5dc29 TITANIC: Fixed titanic.h float random function range
d01354ab0d TITANIC: Reduce header includes for star_control files
9b07378c24 Merge pull request #999 from dafioram/header_reduce


Commit: c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7
    https://github.com/scummvm/scummvm/commit/c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-08-24T04:06:54-07:00

Commit Message:
TITANIC: Reduce header includes for titanic.h

I reduced the header includes a lot in Titanic.h and forward
declared when I could. Titanic.h was including a lot and
a lot of functions that were including it were not using its
API. This will help make it more clear which implementation
files are using which class since they will just need to include
which ones they need.

I also moved the debug related items in Titanic.h into the debugger
header.

I also reordered several of the the header includes to be local to
global.

Changed paths:
    engines/titanic/carry/carry.cpp
    engines/titanic/continue_save_dialog.cpp
    engines/titanic/core/game_object.cpp
    engines/titanic/core/project_item.cpp
    engines/titanic/core/resource_key.cpp
    engines/titanic/core/view_item.cpp
    engines/titanic/debugger.cpp
    engines/titanic/debugger.h
    engines/titanic/detection.cpp
    engines/titanic/events.cpp
    engines/titanic/game/missiveomat.cpp
    engines/titanic/game/music_console_button.cpp
    engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
    engines/titanic/game/sgt/bedhead.cpp
    engines/titanic/game/television.cpp
    engines/titanic/game/transport/lift.cpp
    engines/titanic/game/transport/lift_indicator.cpp
    engines/titanic/game_manager.cpp
    engines/titanic/game_manager.h
    engines/titanic/game_state.cpp
    engines/titanic/game_view.h
    engines/titanic/gfx/text_control.cpp
    engines/titanic/gfx/text_control.h
    engines/titanic/input_handler.cpp
    engines/titanic/input_handler.h
    engines/titanic/main_game_window.cpp
    engines/titanic/main_game_window.h
    engines/titanic/messages/bilge_dispensor_event.cpp
    engines/titanic/messages/messages.cpp
    engines/titanic/npcs/barbot.cpp
    engines/titanic/npcs/bellbot.cpp
    engines/titanic/npcs/callbot.cpp
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/npcs/true_talk_npc.cpp
    engines/titanic/pet_control/pet_conversations.cpp
    engines/titanic/pet_control/pet_load.cpp
    engines/titanic/pet_control/pet_remote_glyphs.cpp
    engines/titanic/pet_control/pet_rooms_glyphs.cpp
    engines/titanic/pet_control/pet_rooms_glyphs.h
    engines/titanic/sound/music_room_handler.cpp
    engines/titanic/sound/music_song.cpp
    engines/titanic/sound/qmixer.cpp
    engines/titanic/sound/sound_manager.cpp
    engines/titanic/star_control/base_stars.cpp
    engines/titanic/star_control/star_camera.cpp
    engines/titanic/star_control/star_field_base.cpp
    engines/titanic/star_control/star_points1.cpp
    engines/titanic/star_control/star_points2.cpp
    engines/titanic/star_control/unmarked_camera_mover.cpp
    engines/titanic/star_control/viewport.cpp
    engines/titanic/support/avi_surface.cpp
    engines/titanic/support/credit_text.cpp
    engines/titanic/support/direct_draw.cpp
    engines/titanic/support/image.cpp
    engines/titanic/support/mouse_cursor.cpp
    engines/titanic/support/movie.cpp
    engines/titanic/support/screen_manager.cpp
    engines/titanic/support/strings.cpp
    engines/titanic/support/text_cursor.cpp
    engines/titanic/titanic.cpp
    engines/titanic/titanic.h
    engines/titanic/true_talk/parrot_script.cpp
    engines/titanic/true_talk/script_handler.cpp
    engines/titanic/true_talk/script_support.cpp
    engines/titanic/true_talk/title_engine.cpp
    engines/titanic/true_talk/true_talk_manager.cpp
    engines/titanic/true_talk/tt_concept.cpp
    engines/titanic/true_talk/tt_npc_script.cpp
    engines/titanic/true_talk/tt_parser.cpp
    engines/titanic/true_talk/tt_quotes.cpp
    engines/titanic/true_talk/tt_quotes_tree.cpp
    engines/titanic/true_talk/tt_script_base.cpp
    engines/titanic/true_talk/tt_vocab.cpp


diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp
index 47eea18..bc99e84 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 c74e1c7..3b44713 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 11b8b58..ae517a2 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 13bcdfc..0fa5d44 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 e10b3be..c7c48b5 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 60e08a5..489ef81 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 ec38291..15d098a 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 36da1d3..3e53fee 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 5fad72a..b33ac51 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 f946f7b..4cf7e77 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 9ae2a0e..c2f181d 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 8722028..5da4c74 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 c32a06d..a28e301 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 756111b..7775ad3 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 80404fa..7c1e33c 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 17f1783..2dfede3 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 37fa7a0..c0616a9 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 65a2a27..e5f46bc 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 0d740f6..89c40d0 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 7ddd16a..9bb83cc 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 e17d72b..d4a1be2 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 f731dbb..d1d2e1c 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 d4ef19a..ddcb791 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 8bd8bba..9b9bacd 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 3fd93a2..53b11f8 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 cfea98c..2d98c81 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 e573217..3e4d03e 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 336a1ca..c0bb289 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 83c0968..e082733 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 21644bc..2ba150a 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 002af21..56420ba 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 a5e8542..8d8f7ed 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 e8536c2..7567311 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 c1b1795..d67fd36 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 37ff3d8..8157e1c 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 81ea858..1d81435 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 7aae879..2bd87fc 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 1a5d5e1..c14b9e7 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 3a43bdc..e10eafc 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 76d7043..dbbe4e4 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 a5527da..ea5f29a 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 beb1502..a3c06da 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 4b5887b..a4d838c 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 c22260e..9e182f9 100644
--- a/engines/titanic/star_control/base_stars.cpp
+++ b/engines/titanic/star_control/base_stars.cpp
@@ -23,6 +23,7 @@
 #include "titanic/star_control/base_stars.h"
 #include "titanic/star_control/star_camera.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/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 68427a3..6b4527e 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_field_base.cpp b/engines/titanic/star_control/star_field_base.cpp
index 7641e4a..4df27be 100644
--- a/engines/titanic/star_control/star_field_base.cpp
+++ b/engines/titanic/star_control/star_field_base.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "titanic/star_control/star_field_base.h"
+#include "titanic/debugger.h"
 #include "titanic/star_control/star_camera.h"
-#include "titanic/titanic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/star_points1.cpp b/engines/titanic/star_control/star_points1.cpp
index 91bcf95..44ff9e1 100644
--- a/engines/titanic/star_control/star_points1.cpp
+++ b/engines/titanic/star_control/star_points1.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/star_control/star_points1.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp
index 2d23903..7d45dfc 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/star_control/star_points2.h"
 #include "titanic/star_control/star_camera.h"
+#include "titanic/support/files_manager.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp
index ce42b39..644c946 100644
--- a/engines/titanic/star_control/unmarked_camera_mover.cpp
+++ b/engines/titanic/star_control/unmarked_camera_mover.cpp
@@ -21,11 +21,12 @@
  */
 
 #include "titanic/star_control/unmarked_camera_mover.h"
+#include "titanic/debugger.h"
 #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"
+#include "common/textconsole.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp
index 529b4be..32f17f4 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/star_control/viewport.h"
+#include "titanic/debugger.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 7673c37..a7d6ef5 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 6ee17a2..fa30bce 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 9fbfe0c..71a90ad 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 2da2179..1993f44 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 eb58296..1c5e0da 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 a57a84d..56e7b7e 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 3082344..29cca4f 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 a8ab458..5ef2a6c 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 1da98c1..bf41fd3 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 f6c4c56..de28e07 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 4742f51..cf0a4d3 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,12 +171,12 @@ 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; }
 
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp
index 95ebbb5..b3f25d0 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 be0b89b..f716a96 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 5267613..bba708f 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 bfa97e3..2332701 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 a713688..e2e4115 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 b7ad0b3..a1bb1bc 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 f12d02c..2140f45 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 8c81573..49f2338 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 c1a1e16..2857a7b 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 e229388..7fe3fe2 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 5162f4d..7df8153 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 97a1cbb..20df6bd 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 {
 


Commit: 9b10f5dc293015911f9205b07778a3b654321935
    https://github.com/scummvm/scummvm/commit/9b10f5dc293015911f9205b07778a3b654321935
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-08-24T04:30:59-07:00

Commit Message:
TITANIC: Fixed titanic.h float random function range

Fixed float random number function of titanic.h which could of given
65537 instead of a max of 65535.

Changed paths:
    engines/titanic/titanic.h


diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index cf0a4d3..c49a137 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -178,7 +178,7 @@ public:
 	/**
 	 * 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


Commit: d01354ab0d33bb5a7eb113027eaf599e1339804a
    https://github.com/scummvm/scummvm/commit/d01354ab0d33bb5a7eb113027eaf599e1339804a
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-08-24T04:31:04-07:00

Commit Message:
TITANIC: Reduce header includes for star_control files

Minimized a lot of the unncessary files includes in the
implementation files as well.

Changed paths:
    engines/titanic/star_control/base_stars.cpp
    engines/titanic/star_control/base_stars.h
    engines/titanic/star_control/camera_auto_mover.cpp
    engines/titanic/star_control/camera_mover.cpp
    engines/titanic/star_control/camera_mover.h
    engines/titanic/star_control/daffine.cpp
    engines/titanic/star_control/daffine.h
    engines/titanic/star_control/dvector.cpp
    engines/titanic/star_control/fpoint.cpp
    engines/titanic/star_control/frange.cpp
    engines/titanic/star_control/fvector.cpp
    engines/titanic/star_control/marked_auto_mover.cpp
    engines/titanic/star_control/marked_camera_mover.cpp
    engines/titanic/star_control/matrix_transform.cpp
    engines/titanic/star_control/matrix_transform.h
    engines/titanic/star_control/star_closeup.cpp
    engines/titanic/star_control/star_closeup.h
    engines/titanic/star_control/star_control.cpp
    engines/titanic/star_control/star_control.h
    engines/titanic/star_control/star_crosshairs.cpp
    engines/titanic/star_control/star_crosshairs.h
    engines/titanic/star_control/star_field_base.cpp
    engines/titanic/star_control/star_markers.cpp
    engines/titanic/star_control/star_markers.h
    engines/titanic/star_control/star_points1.cpp
    engines/titanic/star_control/star_points1.h
    engines/titanic/star_control/star_points2.cpp
    engines/titanic/star_control/star_points2.h
    engines/titanic/star_control/star_ref.cpp
    engines/titanic/star_control/star_ref.h
    engines/titanic/star_control/star_view.cpp
    engines/titanic/star_control/star_view.h
    engines/titanic/star_control/surface_area.cpp
    engines/titanic/star_control/surface_fader.cpp
    engines/titanic/star_control/surface_fader.h
    engines/titanic/star_control/unmarked_auto_mover.cpp
    engines/titanic/star_control/unmarked_camera_mover.cpp
    engines/titanic/star_control/viewport.cpp
    engines/titanic/star_control/viewport.h


diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp
index 9e182f9..bb902e5 100644
--- a/engines/titanic/star_control/base_stars.cpp
+++ b/engines/titanic/star_control/base_stars.cpp
@@ -22,6 +22,7 @@
 
 #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"
diff --git a/engines/titanic/star_control/base_stars.h b/engines/titanic/star_control/base_stars.h
index 4333e32..aa6ce5e 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 0bde472..201cd94 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 f6392d5..95981a9 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 c3ec0c6..9bd9d48 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 8cfd9ec..5b93583 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 6e1eccc..041d376 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 d1236ec..88390eb 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 e70cd64..f426c09 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 e70976d..7e42bad 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 fee74e6..d880a13 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 0a1a7e4..a154bfd 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 61b7c05..79e74cd 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 226dffa..4f1324d 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 52f1a20..92d4fbf 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_closeup.cpp b/engines/titanic/star_control/star_closeup.cpp
index d5d1aaf..82c88da 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 edd09ac..fae3731 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 743cfd0..cc41430 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 90de2eb..e4072d7 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 ec2aa1f..0393da5 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 ebd6f0d..d60541c 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 4df27be..101180d 100644
--- a/engines/titanic/star_control/star_field_base.cpp
+++ b/engines/titanic/star_control/star_field_base.cpp
@@ -23,6 +23,7 @@
 #include "titanic/star_control/star_field_base.h"
 #include "titanic/debugger.h"
 #include "titanic/star_control/star_camera.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 ce8f053..61c0c5b 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 96b76d3..7699e47 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 44ff9e1..d8a0bdc 100644
--- a/engines/titanic/star_control/star_points1.cpp
+++ b/engines/titanic/star_control/star_points1.cpp
@@ -22,6 +22,7 @@
 
 #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"
 
diff --git a/engines/titanic/star_control/star_points1.h b/engines/titanic/star_control/star_points1.h
index aeab68f..28b7f68 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 7d45dfc..23cef4c 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -22,6 +22,7 @@
 
 #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"
 
diff --git a/engines/titanic/star_control/star_points2.h b/engines/titanic/star_control/star_points2.h
index b807712..e57ea12 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 5d1bf9a..f7e71d8 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 4e66db0..dd71bf8 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 ec972d1..bc2c096 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 b7d5096..2ce27c6 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 f243f60..a4b8d44 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 e2ef828..d2cf619 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 3d962b2..d209e83 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 429e42d..1a5d886 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 644c946..bba49e9 100644
--- a/engines/titanic/star_control/unmarked_camera_mover.cpp
+++ b/engines/titanic/star_control/unmarked_camera_mover.cpp
@@ -22,11 +22,12 @@
 
 #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 "titanic/titanic.h"
-#include "common/textconsole.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 32f17f4..d2bdce0 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -22,6 +22,7 @@
 
 #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 1780889..1b4ab31 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 {
 


Commit: 9b07378c244004b7fe6800f984aebd3716f6bb62
    https://github.com/scummvm/scummvm/commit/9b07378c244004b7fe6800f984aebd3716f6bb62
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-25T07:23:35-04:00

Commit Message:
Merge pull request #999 from dafioram/header_reduce

TITANIC: Reduce header includes

Changed paths:
    engines/titanic/carry/carry.cpp
    engines/titanic/continue_save_dialog.cpp
    engines/titanic/core/game_object.cpp
    engines/titanic/core/project_item.cpp
    engines/titanic/core/resource_key.cpp
    engines/titanic/core/view_item.cpp
    engines/titanic/debugger.cpp
    engines/titanic/debugger.h
    engines/titanic/detection.cpp
    engines/titanic/events.cpp
    engines/titanic/game/missiveomat.cpp
    engines/titanic/game/music_console_button.cpp
    engines/titanic/game/parrot/parrot_lobby_link_updater.cpp
    engines/titanic/game/sgt/bedhead.cpp
    engines/titanic/game/television.cpp
    engines/titanic/game/transport/lift.cpp
    engines/titanic/game/transport/lift_indicator.cpp
    engines/titanic/game_manager.cpp
    engines/titanic/game_manager.h
    engines/titanic/game_state.cpp
    engines/titanic/game_view.h
    engines/titanic/gfx/text_control.cpp
    engines/titanic/gfx/text_control.h
    engines/titanic/input_handler.cpp
    engines/titanic/input_handler.h
    engines/titanic/main_game_window.cpp
    engines/titanic/main_game_window.h
    engines/titanic/messages/bilge_dispensor_event.cpp
    engines/titanic/messages/messages.cpp
    engines/titanic/npcs/barbot.cpp
    engines/titanic/npcs/bellbot.cpp
    engines/titanic/npcs/callbot.cpp
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/npcs/true_talk_npc.cpp
    engines/titanic/pet_control/pet_conversations.cpp
    engines/titanic/pet_control/pet_load.cpp
    engines/titanic/pet_control/pet_remote_glyphs.cpp
    engines/titanic/pet_control/pet_rooms_glyphs.cpp
    engines/titanic/pet_control/pet_rooms_glyphs.h
    engines/titanic/sound/music_room_handler.cpp
    engines/titanic/sound/music_song.cpp
    engines/titanic/sound/qmixer.cpp
    engines/titanic/sound/sound_manager.cpp
    engines/titanic/star_control/base_stars.cpp
    engines/titanic/star_control/base_stars.h
    engines/titanic/star_control/camera_auto_mover.cpp
    engines/titanic/star_control/camera_mover.cpp
    engines/titanic/star_control/camera_mover.h
    engines/titanic/star_control/daffine.cpp
    engines/titanic/star_control/daffine.h
    engines/titanic/star_control/dvector.cpp
    engines/titanic/star_control/fpoint.cpp
    engines/titanic/star_control/frange.cpp
    engines/titanic/star_control/fvector.cpp
    engines/titanic/star_control/marked_auto_mover.cpp
    engines/titanic/star_control/marked_camera_mover.cpp
    engines/titanic/star_control/matrix_transform.cpp
    engines/titanic/star_control/matrix_transform.h
    engines/titanic/star_control/star_camera.cpp
    engines/titanic/star_control/star_closeup.cpp
    engines/titanic/star_control/star_closeup.h
    engines/titanic/star_control/star_control.cpp
    engines/titanic/star_control/star_control.h
    engines/titanic/star_control/star_crosshairs.cpp
    engines/titanic/star_control/star_crosshairs.h
    engines/titanic/star_control/star_field_base.cpp
    engines/titanic/star_control/star_markers.cpp
    engines/titanic/star_control/star_markers.h
    engines/titanic/star_control/star_points1.cpp
    engines/titanic/star_control/star_points1.h
    engines/titanic/star_control/star_points2.cpp
    engines/titanic/star_control/star_points2.h
    engines/titanic/star_control/star_ref.cpp
    engines/titanic/star_control/star_ref.h
    engines/titanic/star_control/star_view.cpp
    engines/titanic/star_control/star_view.h
    engines/titanic/star_control/surface_area.cpp
    engines/titanic/star_control/surface_fader.cpp
    engines/titanic/star_control/surface_fader.h
    engines/titanic/star_control/unmarked_auto_mover.cpp
    engines/titanic/star_control/unmarked_camera_mover.cpp
    engines/titanic/star_control/viewport.cpp
    engines/titanic/star_control/viewport.h
    engines/titanic/support/avi_surface.cpp
    engines/titanic/support/credit_text.cpp
    engines/titanic/support/direct_draw.cpp
    engines/titanic/support/image.cpp
    engines/titanic/support/mouse_cursor.cpp
    engines/titanic/support/movie.cpp
    engines/titanic/support/screen_manager.cpp
    engines/titanic/support/strings.cpp
    engines/titanic/support/text_cursor.cpp
    engines/titanic/titanic.cpp
    engines/titanic/titanic.h
    engines/titanic/true_talk/parrot_script.cpp
    engines/titanic/true_talk/script_handler.cpp
    engines/titanic/true_talk/script_support.cpp
    engines/titanic/true_talk/title_engine.cpp
    engines/titanic/true_talk/true_talk_manager.cpp
    engines/titanic/true_talk/tt_concept.cpp
    engines/titanic/true_talk/tt_npc_script.cpp
    engines/titanic/true_talk/tt_parser.cpp
    engines/titanic/true_talk/tt_quotes.cpp
    engines/titanic/true_talk/tt_quotes_tree.cpp
    engines/titanic/true_talk/tt_script_base.cpp
    engines/titanic/true_talk/tt_vocab.cpp







More information about the Scummvm-git-logs mailing list