DIRECTOR: Furhter work on header dependency decrease

20 files changed, 67 insertions, 53 deletions

diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index 8a83859853..d7f6537694 100644
--- a/engines/director/cachedmactext.cpp
+++ b/engines/director/cachedmactext.cpp
@@ -25,6 +25,7 @@
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
+#include "director/cast.h"
 #include "director/cachedmactext.h"
 
 namespace Director {
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index c46340ddd6..83d5a9d002 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/substream.h"
+
 #include "director/director.h"
 #include "director/cachedmactext.h"
 #include "director/cast.h"
diff --git a/engines/director/cast.h b/engines/director/cast.h
index 5095944458..9637b17114 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -23,9 +23,6 @@
 #ifndef DIRECTOR_CAST_H
 #define DIRECTOR_CAST_H
 
-#include "common/rect.h"
-#include "common/substream.h"
-
 #include "director/archive.h"
 #include "director/types.h"
 
@@ -91,33 +88,6 @@ public:
 	byte _lineDirection;
 };
 
-enum TextType {
-	kTextTypeAdjustToFit,
-	kTextTypeScrolling,
-	kTextTypeFixed
-};
-
-enum TextAlignType {
-	kTextAlignRight = -1,
-	kTextAlignLeft,
-	kTextAlignCenter
-};
-
-enum TextFlag {
-	kTextFlagEditable,
-	kTextFlagAutoTab,
-	kTextFlagDoNotWrap
-};
-
-enum SizeType {
-	kSizeNone,
-	kSizeSmallest,
-	kSizeSmall,
-	kSizeMedium,
-	kSizeLarge,
-	kSizeLargest
-};
-
 class TextCast : public Cast {
 public:
 	TextCast(Common::ReadStreamEndian &stream, uint16 version = 2);
@@ -145,12 +115,6 @@ public:
 	CachedMacText *_cachedMacText;
 };
 
-enum ButtonType {
-	kTypeButton,
-	kTypeCheckBox,
-	kTypeRadio
-};
-
 class ButtonCast : public TextCast {
 public:
 	ButtonCast(Common::ReadStreamEndian &stream, uint16 version = 2);
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index ae5e6485df..ba64cc67e1 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -24,6 +24,8 @@
 #include "common/debug-channels.h"
 #include "common/error.h"
 
+#include "audio/mixer.h"
+
 #include "common/macresman.h"
 #include "graphics/fonts/macfont.h"
 
diff --git a/engines/director/director.h b/engines/director/director.h
index 0bd9cbc510..aa2d797644 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -24,15 +24,18 @@
 #define DIRECTOR_DIRECTOR_H
 
 #include "common/random.h"
+#include "common/rect.h"
 
 #include "common/hashmap.h"
 #include "engines/engine.h"
-#include "director/cast.h"
+#include "director/types.h"
 
 #define CHANNEL_COUNT 30
 
 namespace Common {
 class MacResManager;
+class SeekableReadStream;
+class SeekableSubReadStreamEndian;
 }
 
 namespace Graphics {
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 58f06b4ec4..f15da5a079 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "common/system.h"
+#include "common/substream.h"
+
 #include "graphics/font.h"
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/macwindowmanager.h"
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 1f64d491ef..3c20dea822 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -20,8 +20,6 @@
  *
  */
 
-#include "common/rect.h"
-
 #ifndef DIRECTOR_FRAME_H
 #define DIRECTOR_FRAME_H
 
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 8a317eb1f1..9500997457 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/substream.h"
+
 #include "director/director.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-bytecode.h"
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 4541686cd3..57eae5112c 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -44,6 +44,7 @@
 // THIS SOFTWARE.
 
 #include "director/director.h"
+#include "director/cast.h"
 #include "director/score.h"
 #include "director/util.h"
 #include "director/lingo/lingo.h"
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 969ae3064a..fd0bd1a4c0 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -23,6 +23,7 @@
 #include "audio/decoders/wave.h"
 #include "common/file.h"
 #include "common/macresman.h"
+#include "common/system.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index a73eb6b0b8..2e460eb3d6 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -21,10 +21,11 @@
  */
 
 #include "director/director.h"
-#include "director/lingo/lingo.h"
+#include "director/cast.h"
 #include "director/sprite.h"
-#include "director/lingo/lingo-the.h"
 #include "director/score.h"
+#include "director/lingo/lingo.h"
+#include "director/lingo/lingo-the.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 738bc363a2..797f05315d 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -26,6 +26,7 @@
 
 #include "director/director.h"
 #include "director/lingo/lingo.h"
+#include "director/cast.h"
 #include "director/frame.h"
 #include "director/score.h"
 #include "director/sprite.h"
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 1ca406fe9d..39a76d8a70 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -25,6 +25,7 @@
 #include "common/events.h"
 #include "common/file.h"
 #include "common/memstream.h"
+#include "common/substream.h"
 
 #include "engines/util.h"
 #include "graphics/font.h"
@@ -34,6 +35,7 @@
 #include "graphics/macgui/macwindowmanager.h"
 #include "image/bmp.h"
 
+#include "director/director.h"
 #include "director/cast.h"
 #include "director/images.h"
 #include "director/score.h"
diff --git a/engines/director/score.h b/engines/director/score.h
index 2b605b8360..1025194d4e 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -25,8 +25,6 @@
 
 #include "common/hash-str.h"
 
-#include "director/types.h"
-
 namespace Graphics {
 	class ManagedSurface;
 	class Font;
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 0fc1a43666..17626cfeef 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -20,11 +20,14 @@
  *
  */
 
-#include "audio/decoders/wave.h"
 #include "common/file.h"
-#include "audio/decoders/aiff.h"
 #include "common/system.h"
 
+#include "audio/decoders/wave.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
+#include "audio/decoders/aiff.h"
+
 #include "director/sound.h"
 
 namespace Director {
diff --git a/engines/director/sound.h b/engines/director/sound.h
index 6a770314a3..1205a9f8ef 100644
--- a/engines/director/sound.h
+++ b/engines/director/sound.h
@@ -20,13 +20,15 @@
  *
  */
 
-#include "audio/audiostream.h"
-#include "audio/mixer.h"
-#include "audio/softsynth/pcspk.h"
-
 #ifndef DIRECTOR_SOUND_H
 #define DIRECTOR_SOUND_H
 
+namespace Audio {
+	class AudioStream;
+	class SoundHandle;
+	class PCSpeaker;
+}
+
 namespace Director {
 
 class DirectorSound {
diff --git a/engines/director/sprite.h b/engines/director/sprite.h
index adfa219d07..f9facd9d4f 100644
--- a/engines/director/sprite.h
+++ b/engines/director/sprite.h
@@ -23,8 +23,6 @@
 #ifndef DIRECTOR_SPRITE_H
 #define DIRECTOR_SPRITE_H
 
-#include "common/rect.h"
-
 namespace Director {
 
 class BitmapCast;
diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 0851771121..9dc0b75902 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -22,6 +22,7 @@
 
 #include "common/substream.h"
 
+#include "director/director.h"
 #include "director/stxt.h"
 
 namespace Director {
diff --git a/engines/director/stxt.h b/engines/director/stxt.h
index a08c687fe6..a16b12b51e 100644
--- a/engines/director/stxt.h
+++ b/engines/director/stxt.h
@@ -23,8 +23,6 @@
 #ifndef DIRECTOR_STXT_H
 #define DIRECTOR_STXT_H
 
-#include "director/director.h"
-
 namespace Director {
 
 class Stxt {
diff --git a/engines/director/types.h b/engines/director/types.h
index 5fa6f7ee50..601aa87153 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -51,6 +51,40 @@ enum ScriptType {
 	kMaxScriptType = 4	// Sync with score.cpp:45, array scriptTypes[]
 };
 
+enum TextType {
+	kTextTypeAdjustToFit,
+	kTextTypeScrolling,
+	kTextTypeFixed
+};
+
+enum TextAlignType {
+	kTextAlignRight = -1,
+	kTextAlignLeft,
+	kTextAlignCenter
+};
+
+enum TextFlag {
+	kTextFlagEditable,
+	kTextFlagAutoTab,
+	kTextFlagDoNotWrap
+};
+
+enum SizeType {
+	kSizeNone,
+	kSizeSmallest,
+	kSizeSmall,
+	kSizeMedium,
+	kSizeLarge,
+	kSizeLargest
+};
+
+enum ButtonType {
+	kTypeButton,
+	kTypeCheckBox,
+	kTypeRadio
+};
+
+
 const char *scriptType2str(ScriptType scr);
 
 } // End of namespace Director