DIRECTOR: Further reduction of include dependency

11 files changed, 10 insertions, 42 deletions

diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 01b5085e60..9aeba7150b 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -20,31 +20,19 @@
  *
  */
 
-#include "audio/mixer.h"
-
 #include "common/config-manager.h"
-#include "common/debug.h"
 #include "common/debug-channels.h"
-#include "common/scummsys.h"
 #include "common/error.h"
-#include "common/events.h"
 #include "common/macresman.h"
-#include "common/stream.h"
-#include "common/system.h"
-#include "common/textconsole.h"
-#include "common/fs.h"
-
-#include "engines/util.h"
 
-#include "graphics/surface.h"
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/images.h"
 #include "director/resource.h"
 #include "director/score.h"
-#include "director/lingo/lingo.h"
 #include "director/sound.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index db149eba1f..6295d5bc52 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -20,17 +20,8 @@
  *
  */
 
-#include "common/stream.h"
 #include "common/substream.h"
 #include "common/textconsole.h"
-#include "graphics/pixelformat.h"
-#include "graphics/surface.h"
-#include "graphics/palette.h"
-#include "image/codecs/codec.h"
-#include "common/util.h"
-#include "common/debug.h"
-#include "image/codecs/bmp_raw.h"
-#include "common/system.h"
 
 #include "director/images.h"
 
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 754b60a492..9e3350a1df 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -44,9 +44,6 @@
 // THIS SOFTWARE.
 
 #include "director/lingo/lingo.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
 #include "director/lingo/lingo-gr.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index dec6d68037..a921f49e4b 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -25,6 +25,7 @@
 
 #include "audio/audiostream.h"
 #include "common/hash-str.h"
+
 #include "director/director.h"
 #include "director/score.h"
 #include "director/lingo/lingo-gr.h"
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 3c34e2d432..fef2b57ff3 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -21,11 +21,12 @@
  *
  */
 
+#include "common/system.h"
 #include "video/qt_decoder.h"
+
 #include "director/movie.h"
 #include "director/score.h"
-#include "common/debug.h"
-#include "common/system.h"
+
 namespace Director {
 
 Movie::Movie(Common::String fileName, DirectorEngine *vm) {
diff --git a/engines/director/movie.h b/engines/director/movie.h
index e26d10a7c7..84bc116134 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -24,9 +24,8 @@
 #ifndef DIRECTOR_MOVIE_H
 #define DIRECTOR_MOVIE_H
 
-#include "common/str.h"
-#include "common/rect.h"
 #include "graphics/managed_surface.h"
+
 #include "director/director.h"
 
 namespace Video {
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index aef7d39b79..787becf28c 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -24,9 +24,6 @@
 
 #include "common/debug.h"
 #include "common/macresman.h"
-#include "common/substream.h"
-#include "common/util.h"
-#include "common/textconsole.h"
 
 namespace Director {
 
diff --git a/engines/director/resource.h b/engines/director/resource.h
index fda8b79d82..2d5a4aeba1 100644
--- a/engines/director/resource.h
+++ b/engines/director/resource.h
@@ -23,12 +23,7 @@
 #ifndef DIRECTOR_RESOURCE_H
 #define DIRECTOR_RESOURCE_H
 
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/func.h"
-#include "common/hashmap.h"
 #include "common/file.h"
-#include "common/str.h"
 #include "common/substream.h"
 
 namespace Common {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index cf9aef1445..9b4f57245d 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -20,13 +20,13 @@
  *
  */
 
+#include "common/system.h"
 #include "common/config-manager.h"
+#include "common/events.h"
 
 #include "engines/util.h"
 #include "graphics/font.h"
 #include "graphics/palette.h"
-#include "common/events.h"
-#include "common/system.h"
 
 #include "director/score.h"
 #include "director/frame.h"
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index d6c78a51ea..af6e0d2e1c 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -20,12 +20,12 @@
 *
 */
 
-#include "director/sound.h"
 #include "audio/decoders/wave.h"
 #include "common/file.h"
 #include "audio/decoders/aiff.h"
 #include "common/system.h"
-#include "common/debug.h"
+
+#include "director/sound.h"
 
 namespace Director {
 
diff --git a/engines/director/sound.h b/engines/director/sound.h
index 4327b63310..850842be21 100644
--- a/engines/director/sound.h
+++ b/engines/director/sound.h
@@ -22,7 +22,6 @@
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
-#include "common/str.h"
 
 #ifndef DIRECTOR_SOUND_H
 #define DIRECTOR_SOUND_H