DIRECTOR: Furhter decrease of header dependency

engines/director/cast.cpp

@@ -26,19 +26,19 @@
 #include "common/substream.h"
 
 #include "graphics/macgui/macfontmanager.h"
+#include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/images.h"
-#include "director/lingo/lingo.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/stxt.h"
 #include "director/util.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 

engines/director/castmember.cpp

@@ -20,18 +20,13 @@
  *
  */
 
-#include "graphics/surface.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/mactext.h"
 #include "graphics/macgui/macbutton.h"
 #include "image/image_decoder.h"
 
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/castmember.h"
 #include "director/movie.h"
-#include "director/score.h"
-#include "director/sound.h"
+#include "director/stage.h"
 #include "director/stxt.h"
 
 namespace Director {

engines/director/director.cpp

@@ -25,8 +25,6 @@
 #include "common/error.h"
 #include "common/substream.h"
 
-#include "audio/mixer.h"
-
 #include "common/macresman.h"
 
 #include "graphics/macgui/macwindowmanager.h"
@@ -38,8 +36,8 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/stage.h"
-#include "director/lingo/lingo.h"
 #include "director/util.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 

engines/director/events.cpp

@@ -25,7 +25,6 @@
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
-#include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sprite.h"

engines/director/frame.cpp

@@ -20,15 +20,10 @@
  *
  */
 
-#include "common/system.h"
 #include "common/substream.h"
 
-#include "graphics/primitives.h"
-
 #include "director/director.h"
-#include "director/castmember.h"
 #include "director/frame.h"
-#include "director/score.h"
 #include "director/sprite.h"
 #include "director/util.h"
 

engines/director/lingo/lingo-builtins.cpp

@@ -33,6 +33,7 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/sprite.h"
+#include "director/stage.h"
 #include "director/stxt.h"
 #include "director/util.h"
 

engines/director/lingo/lingo-the.cpp

@@ -34,6 +34,7 @@
 #include "director/sound.h"
 #include "director/sprite.h"
 #include "director/score.h"
+#include "director/stage.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-the.h"

engines/director/movie.cpp

@@ -26,10 +26,10 @@
 #include "director/director.h"
 #include "director/archive.h"
 #include "director/cast.h"
-#include "director/lingo/lingo.h"
 #include "director/movie.h"
 #include "director/score.h"
-#include "director/util.h"
+#include "director/stage.h"
+#include "director/lingo/lingo.h"
 
 namespace Director {
 

engines/director/movie.h

@@ -23,13 +23,9 @@
 #ifndef DIRECTOR_MOVIE_H
 #define DIRECTOR_MOVIE_H
 
-#include "common/hash-str.h"
-#include "common/rect.h"
-#include "director/types.h"
-
 namespace Common {
-	class ReadStreamEndian;
-	class SeekableSubReadStreamEndian;
+class ReadStreamEndian;
+class SeekableSubReadStreamEndian;
 }
 
 namespace Director {

engines/director/resource.cpp

@@ -22,19 +22,12 @@
 
 #include "common/config-manager.h"
 #include "common/macresman.h"
-#include "common/substream.h"
 #include "common/file.h"
 
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/macfontmanager.h"
-
 #include "director/director.h"
-#include "director/archive.h"
 #include "director/cast.h"
 #include "director/castmember.h"
 #include "director/movie.h"
-#include "director/score.h"
-#include "director/util.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {

engines/director/score.cpp

@@ -44,6 +44,7 @@
 #include "director/movie.h"
 #include "director/sound.h"
 #include "director/sprite.h"
+#include "director/stage.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"
 

engines/director/score.h

@@ -23,9 +23,7 @@
 #ifndef DIRECTOR_SCORE_H
 #define DIRECTOR_SCORE_H
 
-#include "common/hash-str.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "director/stage.h"
+//#include "graphics/macgui/macwindowmanager.h"
 
 namespace Graphics {
 	class ManagedSurface;

engines/director/stage.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "graphics/primitives.h"
+#include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/movie.h"

engines/director/stage.h

@@ -23,11 +23,8 @@
 #ifndef DIRECTOR_STAGE_H
 #define DIRECTOR_STAGE_H
 
-#include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/macwindow.h"
 
-#include "director/types.h"
-
 namespace Graphics {
 class ManagedSurface;
 class MacWindow;

engines/director/transitions.cpp

@@ -30,6 +30,7 @@
 #include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
+#include "director/stage.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"