8 files changed, 15 insertions, 53 deletions
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 1c113ddf7a..50d605dbdc 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -24,7 +24,9 @@
 #include "base/plugins.h"
 
 #include "engines/advancedDetector.h"
-#include "common/file.h"
+#include "common/savefile.h"
+#include "common/str-array.h"
+#include "common/system.h"
 
 #include "toltecs/toltecs.h"
 
diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h
index 0a6a865055..46c2384f98 100644
--- a/engines/toltecs/movie.h
+++ b/engines/toltecs/movie.h
@@ -24,18 +24,7 @@
 #ifndef TOLTECS_MOVIE_H
 #define TOLTECS_MOVIE_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/array.h"
-
-#include "engines/engine.h"
+#include "sound/audiostream.h"
 
 namespace Toltecs {
 
diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp
index 1236d98431..0b5eb65cbb 100644
--- a/engines/toltecs/palette.cpp
+++ b/engines/toltecs/palette.cpp
@@ -21,17 +21,6 @@
  *
  */
 
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "sound/mixer.h"
-
 #include "toltecs/toltecs.h"
 #include "toltecs/palette.h"
 #include "toltecs/resource.h"
diff --git a/engines/toltecs/palette.h b/engines/toltecs/palette.h
index 59f0504091..140d59b431 100644
--- a/engines/toltecs/palette.h
+++ b/engines/toltecs/palette.h
@@ -24,19 +24,10 @@
 #ifndef TOLTECS_PALETTE_H
 #define TOLTECS_PALETTE_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/stream.h"
-#include "common/system.h"
-#include "common/hash-str.h"
-#include "common/events.h"
-#include "common/keyboard.h"
 #include "common/array.h"
+#include "common/system.h"
 
-#include "engines/engine.h"
+#include "toltecs/toltecs.h"
 
 namespace Toltecs {
 
diff --git a/engines/toltecs/render.cpp b/engines/toltecs/render.cpp
index 642b299d3d..b7e859a619 100644
--- a/engines/toltecs/render.cpp
+++ b/engines/toltecs/render.cpp
@@ -21,14 +21,7 @@
  *
  */
 
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/file.h"
-#include "common/savefile.h"
-#include "common/config-manager.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
+#include "common/system.h"
 
 #include "toltecs/toltecs.h"
 #include "toltecs/render.h"
@@ -80,6 +73,7 @@ void RenderQueue::addSprite(SpriteDrawItem &sprite) {
 
 void RenderQueue::addText(int16 x, int16 y, byte color, uint fontResIndex, byte *text, int len) {
 
+	// TODO: Font caching?
 	Font font(_vm->_res->load(fontResIndex)->data);
 
 	RenderQueueItem item;
diff --git a/engines/toltecs/segmap.h b/engines/toltecs/segmap.h
index 92b6b19632..30182a6b71 100644
--- a/engines/toltecs/segmap.h
+++ b/engines/toltecs/segmap.h
@@ -24,6 +24,8 @@
 #ifndef TOLTECS_SEGMAP_H
 #define TOLTECS_SEGMAP_H
 
+#include "common/array.h"
+
 #include "toltecs/screen.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp
index 5e63ee6198..c3b099d6d3 100644
--- a/engines/toltecs/sound.cpp
+++ b/engines/toltecs/sound.cpp
@@ -21,6 +21,7 @@
  *
  */
 
+#include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/decoders/raw.h"
 
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index e77a1bb52c..24e7f166d3 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -26,21 +26,15 @@
 
 #include "common/scummsys.h"
 #include "common/endian.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/random.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
 #include "common/events.h"
+#include "common/file.h"
 #include "common/keyboard.h"
-
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/voc.h"
+#include "common/random.h"
 
 #include "engines/engine.h"
 
+#include "graphics/surface.h"
+
 namespace Toltecs {
 
 struct ToltecsGameDescription;