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.

5 files changed, 11 insertions, 5 deletions

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
 };