diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp
index 9e182f9c75d7..bb902e558e4b 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 4333e3231ec5..aa6ce5ebd250 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 0bde4722d1cc..201cd9440aa4 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 f6392d5ea2d4..95981a951c37 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 c3ec0c6f30f1..9bd9d48700c0 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 8cfd9ec61263..5b935838fa3c 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 6e1eccc3991b..041d376933c1 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 d1236ecdb7d9..88390ebc3fd1 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 e70cd64ebdfa..f426c099d050 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 e70976d6cda6..7e42bade97c4 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 fee74e6eba9b..d880a134f5c4 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 0a1a7e4d4964..a154bfddf2bc 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 61b7c05b60d0..79e74cdd05e7 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 226dffa2caff..4f1324d31092 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 52f1a20e3436..92d4fbff22b4 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 d5d1aaf54ce3..82c88dae3989 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 edd09ac12423..fae373130058 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 743cfd097997..cc414305eb22 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 90de2eb3ebde..e4072d7d62ca 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 ec2aa1f4092c..0393da5dcec7 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 ebd6f0d07b26..d60541c205a6 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 4df27bec29e1..101180d1e0b2 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 ce8f053854fe..61c0c5b8f0df 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 96b76d3c3b6a..7699e47fc7e1 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 44ff9e1d5e96..d8a0bdc4057e 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 aeab68f72f0f..28b7f6845505 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 7d45dfc0556e..23cef4ce4c8b 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 b8077120d969..e57ea122c141 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 5d1bf9abe566..f7e71d8f6e4f 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 4e66db061ff9..dd71bf8428cf 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 ec972d12b57d..bc2c096f9c62 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 b7d50969a6f8..2ce27c6b99f5 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 f243f60f655d..a4b8d44ff7bc 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 e2ef828574db..d2cf61934cb5 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 3d962b27290c..d209e835b43d 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 429e42d29cc9..1a5d88679665 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 644c946bb320..bba49e925b5e 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 32f17f4f1c27..d2bdce00e0f3 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 178088908126..1b4ab313b619 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 {