13 files changed, 6 insertions, 49 deletions
diff --git a/engines/toltecs/animation.h b/engines/toltecs/animation.h
index 581934a1f5..8b1ac7bab1 100644
--- a/engines/toltecs/animation.h
+++ b/engines/toltecs/animation.h
@@ -35,11 +35,6 @@
 #include "common/keyboard.h"
 #include "common/array.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 #include "toltecs/toltecs.h"
diff --git a/engines/toltecs/menu.h b/engines/toltecs/menu.h
index 22936706d6..5860afd0b3 100644
--- a/engines/toltecs/menu.h
+++ b/engines/toltecs/menu.h
@@ -37,11 +37,6 @@
 #include "common/rect.h"
 #include "common/str.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 8cc627477c..2fd0d186c9 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -31,7 +31,7 @@
 #include "base/version.h"
 
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "toltecs/toltecs.h"
 #include "toltecs/movie.h"
diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h
index 00af2ee429..0a6a865055 100644
--- a/engines/toltecs/movie.h
+++ b/engines/toltecs/movie.h
@@ -35,11 +35,6 @@
 #include "common/keyboard.h"
 #include "common/array.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/palette.h b/engines/toltecs/palette.h
index 6a2bb59370..920adedeec 100644
--- a/engines/toltecs/palette.h
+++ b/engines/toltecs/palette.h
@@ -36,11 +36,6 @@
 #include "common/keyboard.h"
 #include "common/array.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/render.h b/engines/toltecs/render.h
index 0f5554b127..ce8faebf8d 100644
--- a/engines/toltecs/render.h
+++ b/engines/toltecs/render.h
@@ -39,11 +39,6 @@
 
 #include "graphics/surface.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 #include "toltecs/segmap.h"
diff --git a/engines/toltecs/resource.h b/engines/toltecs/resource.h
index 1c618aedeb..8164b9ea15 100644
--- a/engines/toltecs/resource.h
+++ b/engines/toltecs/resource.h
@@ -36,11 +36,6 @@
 #include "common/keyboard.h"
 #include "common/array.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/screen.h b/engines/toltecs/screen.h
index c9a70607fe..4aeeb78a01 100644
--- a/engines/toltecs/screen.h
+++ b/engines/toltecs/screen.h
@@ -38,11 +38,6 @@
 
 #include "graphics/surface.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h
index 83ee628d25..e82e3da6cd 100644
--- a/engines/toltecs/script.h
+++ b/engines/toltecs/script.h
@@ -36,11 +36,6 @@
 #include "common/array.h"
 #include "common/func.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "engines/engine.h"
 
 namespace Toltecs {
diff --git a/engines/toltecs/segmap.h b/engines/toltecs/segmap.h
index 394d4ae10d..3fcf5bf7e2 100644
--- a/engines/toltecs/segmap.h
+++ b/engines/toltecs/segmap.h
@@ -35,11 +35,6 @@
 #include "common/keyboard.h"
 #include "common/array.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/voc.h"
-#include "sound/audiocd.h"
-
 #include "graphics/surface.h"
 
 #include "engines/engine.h"
diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp
index d4f18be222..655da3cf5b 100644
--- a/engines/toltecs/sound.cpp
+++ b/engines/toltecs/sound.cpp
@@ -33,7 +33,7 @@
 #include "graphics/cursorman.h"
 
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "toltecs/toltecs.h"
 #include "toltecs/palette.h"
diff --git a/engines/toltecs/sound.h b/engines/toltecs/sound.h
index 7552d85ae8..1f82378ed9 100644
--- a/engines/toltecs/sound.h
+++ b/engines/toltecs/sound.h
@@ -37,8 +37,8 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/voc.h"
 #include "sound/audiocd.h"
+#include "sound/decoders/voc.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index e870137fae..9a2ed704fd 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -36,7 +36,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/voc.h"
+#include "sound/decoders/voc.h"
 #include "sound/audiocd.h"
 
 #include "engines/engine.h"
@@ -57,6 +57,8 @@ class Screen;
 class SegmentMap;
 class Sound;
 
+// TODO/FIXME: The includes of the Toltecs engine need serious clean-up
+
 class ToltecsEngine : public ::Engine {
 	Common::KeyState _keyPressed;