DIRECTOR: Further simplification of include dependencies

12 files changed, 10 insertions, 21 deletions

diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index bbcf26bef5..7352793763 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -23,7 +23,6 @@
 #include "director/archive.h"
 #include "director/director.h"
 
-#include "common/debug.h"
 #include "common/macresman.h"
 
 namespace Director {
@@ -357,8 +356,8 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 
 	uint32 rifxType = subStream.readUint32();
 
-	if (rifxType != MKTAG('M', 'V', '9', '3') && 
-		rifxType != MKTAG('A', 'P', 'P', 'L') && 
+	if (rifxType != MKTAG('M', 'V', '9', '3') &&
+		rifxType != MKTAG('A', 'P', 'P', 'L') &&
 		rifxType != MKTAG('M', 'C', '9', '5'))
 		return false;
 
diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index 69c75755b0..8a83859853 100644
--- a/engines/director/cachedmactext.cpp
+++ b/engines/director/cachedmactext.cpp
@@ -26,7 +26,6 @@
 
 #include "director/director.h"
 #include "director/cachedmactext.h"
-#include "director/cast.h"
 
 namespace Director {
 
diff --git a/engines/director/cast.h b/engines/director/cast.h
index ca588d1d6f..2f5e97fad6 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -24,9 +24,11 @@
 #define DIRECTOR_CAST_H
 
 #include "common/rect.h"
-#include "common/substream.h"
 #include "director/archive.h"
-#include "graphics/surface.h"
+
+namespace Graphics {
+struct Surface;
+}
 
 namespace Director {
 
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 1e02ea810f..0ede50004b 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -23,8 +23,6 @@
 #ifndef DIRECTOR_FRAME_H
 #define DIRECTOR_FRAME_H
 
-#include "graphics/managed_surface.h"
-
 namespace Image {
 	class ImageDecoder;
 }
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 8a8d56c432..a78f662431 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -23,6 +23,7 @@
 #include "common/substream.h"
 #include "common/debug.h"
 #include "common/textconsole.h"
+#include "image/codecs/bmp_raw.h"
 
 #include "director/director.h"
 #include "director/images.h"
diff --git a/engines/director/images.h b/engines/director/images.h
index 7ffda68e52..419b24fc8c 100644
--- a/engines/director/images.h
+++ b/engines/director/images.h
@@ -23,10 +23,7 @@
 #ifndef DIRECTOR_IMAGES_H
 #define DIRECTOR_IMAGES_H
 
-#include "common/scummsys.h"
-#include "common/str.h"
 #include "image/image_decoder.h"
-#include "image/codecs/bmp_raw.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index eff9d4905a..34094f01f9 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "director/lingo/lingo.h"
+#include "director/lingo/lingo-bytecode.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 13e825724e..605de28351 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -43,10 +43,8 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 // THIS SOFTWARE.
 
-#include "director/cast.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"
-#include "director/lingo/lingo-gr.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 36ae67e517..ffa5c7ac5f 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -44,10 +44,7 @@
 // THIS SOFTWARE.
 
 #include "director/lingo/lingo.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
 
-#include "director/lingo/lingo-gr.h"
 #include "director/util.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index ecb43337d4..fd9bee0b0a 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -21,14 +21,11 @@
  */
 
 #include "audio/decoders/wave.h"
-#include "common/file.h"
 #include "common/macresman.h"
-#include "common/util.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/lingo/lingo.h"
-#include "director/lingo/lingo-gr.h"
 #include "director/sound.h"
 #include "director/util.h"
 
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index f9bcb1e1c1..fa939984c8 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "director/lingo/lingo.h"
-#include "director/cast.h"
 #include "director/sprite.h"
 #include "director/lingo/lingo-the.h"
 
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index c584e24827..c770e264e5 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -29,12 +29,13 @@
 
 #include "director/score.h"
 #include "director/lingo/lingo-gr.h"
-#include "director/lingo/lingo-bytecode.h"
 
 namespace Director {
 
 struct TheEntity;
 struct TheEntityField;
+struct LingoV4Bytecode;
+struct LingoV4TheEntity;
 
 enum LEvent {
 	kEventPrepareMovie,