DIRECTOR: Finish work on reducing header dependency

13 files changed, 6 insertions, 31 deletions

diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 30f04a001d..80645e7f7b 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -22,11 +22,10 @@
 
 #include "common/file.h"
 #include "common/substream.h"
+#include "common/macresman.h"
 
-#include "director/archive.h"
 #include "director/director.h"
-
-#include "common/macresman.h"
+#include "director/archive.h"
 
 namespace Director {
 
diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index d7f6537694..edcb0f74f7 100644
--- a/engines/director/cachedmactext.cpp
+++ b/engines/director/cachedmactext.cpp
@@ -22,7 +22,6 @@
 
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/mactext.h"
-#include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/cast.h"
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 4368478b09..f282bddd6d 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -26,9 +26,6 @@
 
 #include "common/file.h"
 #include "common/config-manager.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/textconsole.h"
 
 #include "director/director.h"
 
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index ba64cc67e1..769b216f60 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -27,7 +27,6 @@
 #include "audio/mixer.h"
 
 #include "common/macresman.h"
-#include "graphics/fonts/macfont.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 85889f937b..53b24ee396 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "common/system.h"
-#include "common/events.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index f15da5a079..9364babb1b 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -23,23 +23,17 @@
 #include "common/system.h"
 #include "common/substream.h"
 
-#include "graphics/font.h"
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/mactext.h"
 #include "graphics/primitives.h"
-#include "image/bmp.h"
 
 #include "director/director.h"
 #include "director/cachedmactext.h"
 #include "director/cast.h"
 #include "director/frame.h"
-#include "director/images.h"
-#include "director/archive.h"
 #include "director/score.h"
 #include "director/sprite.h"
 #include "director/util.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index 9745d9fe29..685419ca9f 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -19,12 +19,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include "common/events.h"
 #include "common/macresman.h"
 #include "common/system.h"
 #include "engines/util.h"
 
-#include "graphics/palette.h"
 #include "graphics/fonts/macfont.h"
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/macwindowmanager.h"
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index a78f662431..793456ddd1 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "common/substream.h"
-#include "common/debug.h"
-#include "common/textconsole.h"
 #include "image/codecs/bmp_raw.h"
 
 #include "director/director.h"
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 209acae1ec..8a9144a755 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "common/system.h"
-#include "common/events.h"
 
 #include "director/director.h"
 #include "director/lingo/lingo.h"
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 797f05315d..0956adeaa8 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -22,7 +22,6 @@
 
 #include "common/file.h"
 #include "common/str-array.h"
-#include "common/debug.h"
 
 #include "director/director.h"
 #include "director/lingo/lingo.h"
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 39a76d8a70..95efba8dd8 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -22,14 +22,11 @@
 
 #include "common/system.h"
 #include "common/config-manager.h"
-#include "common/events.h"
 #include "common/file.h"
 #include "common/memstream.h"
 #include "common/substream.h"
 
 #include "engines/util.h"
-#include "graphics/font.h"
-#include "graphics/palette.h"
 #include "graphics/primitives.h"
 #include "graphics/macgui/macfontmanager.h"
 #include "graphics/macgui/macwindowmanager.h"
@@ -40,7 +37,6 @@
 #include "director/images.h"
 #include "director/score.h"
 #include "director/frame.h"
-#include "director/archive.h"
 #include "director/sound.h"
 #include "director/sprite.h"
 #include "director/stxt.h"
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 17626cfeef..95939e49c3 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "common/file.h"
-#include "common/system.h"
 
 #include "audio/decoders/wave.h"
 #include "audio/mixer.h"
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 9d219d6076..53d65dceae 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -22,7 +22,6 @@
 
 #include "director/director.h"
 #include "director/cast.h"
-#include "director/score.h"
 #include "director/sprite.h"
 
 namespace Director {
@@ -115,13 +114,13 @@ Sprite::Sprite(const Sprite &sprite) {
 }
 
 Sprite::~Sprite() {
-	if (_bitmapCast) 
+	if (_bitmapCast)
 		delete _bitmapCast;
-	if (_shapeCast) 
+	if (_shapeCast)
 		delete _shapeCast;
-	if (_textCast) 
+	if (_textCast)
 		delete _textCast;
-	if (_buttonCast) 
+	if (_buttonCast)
 		delete _buttonCast;
 }