12 files changed, 32 insertions, 38 deletions
diff --git a/engines/director/director.h b/engines/director/director.h
index cccae8f879..23519f135e 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -23,14 +23,11 @@
 #ifndef DIRECTOR_DIRECTOR_H
 #define DIRECTOR_DIRECTOR_H
 
-#include "common/scummsys.h"
 #include "common/random.h"
 #include "common/substream.h"
 
-#include "common/str.h"
 #include "common/hashmap.h"
 #include "engines/engine.h"
-#include "engines/director/sound.h"
 
 namespace Common {
 class MacResManager;
@@ -49,6 +46,7 @@ enum DirectorGameID {
 
 class Archive;
 struct DirectorGameDescription;
+class DirectorSound;
 class Lingo;
 class Score;
 struct Cast;
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index abb880a6cf..1409120dd3 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -21,12 +21,14 @@
  */
 
 #include "common/system.h"
+#include "graphics/font.h"
 #include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
 #include "director/director.h"
 #include "director/frame.h"
 #include "director/images.h"
+#include "director/resource.h"
 #include "director/score.h"
 #include "director/sprite.h"
 
diff --git a/engines/director/frame.h b/engines/director/frame.h
index f9cef676cd..c06157c2cc 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -24,7 +24,10 @@
 #define DIRECTOR_FRAME_H
 
 #include "graphics/managed_surface.h"
-#include "image/image_decoder.h"
+
+namespace Image {
+	class ImageDecoder;
+}
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index b7d4b4de3f..bad585cfe1 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 1e78b2db13..754b60a492 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -43,7 +43,7 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 9f3b1e26fa..c145184a19 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -43,7 +43,7 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index da2cd5f358..2189f1f7aa 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -43,11 +43,12 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 #include "common/util.h"
 #include "director/lingo/lingo-gr.h"
+#include "director/sound.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 879ff4854d..2bf6cfb724 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/director/lingo/lingo.h"
+#include "director/lingo/lingo.h"
 #include "director/sprite.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 21a5b5347a..529738043c 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/archive.h"
+#include "common/file.h"
 #include "common/str-array.h"
 
 #include "director/lingo/lingo.h"
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index a4eea7aa60..dec6d68037 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -23,13 +23,10 @@
 #ifndef DIRECTOR_LINGO_LINGO_H
 #define DIRECTOR_LINGO_LINGO_H
 
-#include "common/debug.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
 #include "audio/audiostream.h"
-#include "common/str.h"
-#include "engines/director/director.h"
-#include "engines/director/score.h"
+#include "common/hash-str.h"
+#include "director/director.h"
+#include "director/score.h"
 #include "director/lingo/lingo-gr.h"
 #include "director/lingo/lingo-the.h"
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 2812f29919..cf9aef1445 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -20,28 +20,20 @@
  *
  */
 
-#include "common/stream.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/archive.h"
 #include "common/config-manager.h"
-#include "common/unzip.h"
 
+#include "engines/util.h"
+#include "graphics/font.h"
 #include "graphics/palette.h"
 #include "common/events.h"
-#include "engines/util.h"
-#include "graphics/managed_surface.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/fontman.h"
-#include "graphics/fonts/bdf.h"
+#include "common/system.h"
 
 #include "director/score.h"
 #include "director/frame.h"
-#include "director/sprite.h"
-#include "director/images.h"
 #include "director/resource.h"
-#include "director/lingo/lingo.h"
 #include "director/sound.h"
+#include "director/sprite.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/score.h b/engines/director/score.h
index 9d92de9538..dc6a62b971 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -23,23 +23,22 @@
 #ifndef DIRECTOR_SCORE_H
 #define DIRECTOR_SCORE_H
 
+#include "common/substream.h"
 #include "common/rect.h"
-#include "common/stream.h"
-#include "common/array.h"
-#include "director/resource.h"
-#include "graphics/managed_surface.h"
-#include "common/str.h"
-#include "image/image_decoder.h"
-#include "graphics/font.h"
+
+namespace Graphics {
+	class ManagedSurface;
+	class Font;
+}
 
 namespace Director {
 
-class Lingo;
+class Archive;
+class DirectorEngine;
 class DirectorSound;
 class Frame;
+class Lingo;
 class Sprite;
-class Score;
-class DirectorEngine;
 
 enum CastType {
 	kCastBitmap = 1,