[Scummvm-git-logs] scummvm master -> 8bccc1278698f497e585ecdba21eaf1ff308ad0c

sev- noreply at scummvm.org
Wed Aug 2 19:05:28 UTC 2023 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8bccc12786 DIRECTOR: Reduce header dependency


Commit: 8bccc1278698f497e585ecdba21eaf1ff308ad0c
    https://github.com/scummvm/scummvm/commit/8bccc1278698f497e585ecdba21eaf1ff308ad0c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-08-02T21:05:06+02:00

Commit Message:
DIRECTOR: Reduce header dependency

Changed paths:
    engines/director/archive.cpp
    engines/director/archive.h
    engines/director/cast.cpp
    engines/director/castmember/bitmap.cpp
    engines/director/castmember/castmember.cpp
    engines/director/castmember/castmember.h
    engines/director/castmember/digitalvideo.cpp
    engines/director/castmember/filmloop.cpp
    engines/director/castmember/text.cpp
    engines/director/channel.cpp
    engines/director/debugger.cpp
    engines/director/debugger.h
    engines/director/director.cpp
    engines/director/director.h
    engines/director/events.cpp
    engines/director/fonts.cpp
    engines/director/frame.cpp
    engines/director/game-quirks.cpp
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/lingo-bytecode.cpp
    engines/director/lingo/lingo-code.cpp
    engines/director/lingo/lingo-codegen.h
    engines/director/lingo/lingo-events.cpp
    engines/director/lingo/lingo-funcs.cpp
    engines/director/lingo/lingo-mci.cpp
    engines/director/lingo/lingo-object.cpp
    engines/director/lingo/lingo-object.h
    engines/director/lingo/lingo-patcher.cpp
    engines/director/lingo/lingo-the.cpp
    engines/director/lingo/lingo-utils.cpp
    engines/director/lingo/lingo.cpp
    engines/director/lingo/lingo.h
    engines/director/lingo/xlibs/developerStack.cpp
    engines/director/lingo/xlibs/fileexists.cpp
    engines/director/lingo/xlibs/fileio.cpp
    engines/director/lingo/xlibs/porta.cpp
    engines/director/lingo/xlibs/registercomponent.cpp
    engines/director/metaengine.cpp
    engines/director/movie.cpp
    engines/director/resource.cpp
    engines/director/score.cpp
    engines/director/score.h
    engines/director/sound.cpp
    engines/director/sprite.cpp
    engines/director/tests.cpp
    engines/director/transitions.cpp
    engines/director/types.cpp
    engines/director/types.h
    engines/director/util.cpp
    engines/director/window.cpp
    engines/director/window.h


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 2417fad7893..142dcfa09ed 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -29,7 +29,6 @@
 #include "director/archive.h"
 #include "director/movie.h"
 #include "director/window.h"
-#include "director/util.h"
 
 namespace Director {
 
diff --git a/engines/director/archive.h b/engines/director/archive.h
index 2774ac50fc1..6553437566c 100644
--- a/engines/director/archive.h
+++ b/engines/director/archive.h
@@ -22,6 +22,8 @@
 #ifndef DIRECTOR_ARCHIVE_H
 #define DIRECTOR_ARCHIVE_H
 
+#include "common/file.h"
+
 namespace Common {
 class MacResManager;
 class SeekableMemoryWriteStream;
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index ec3fb9adfff..5504610925e 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -23,7 +23,6 @@
 #include "common/file.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
-#include "common/stream.h"
 #include "common/substream.h"
 
 #include "graphics/macgui/macfontmanager.h"
@@ -36,8 +35,8 @@
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sound.h"
+#include "director/sprite.h"
 #include "director/stxt.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
 #include "director/castmember/bitmap.h"
 #include "director/castmember/digitalvideo.h"
@@ -49,8 +48,6 @@
 #include "director/castmember/sound.h"
 #include "director/castmember/text.h"
 #include "director/castmember/transition.h"
-#include "director/lingo/lingo.h"
-#include "director/lingo/lingo-object.h"
 
 namespace Director {
 
diff --git a/engines/director/castmember/bitmap.cpp b/engines/director/castmember/bitmap.cpp
index a2ef7cbd583..1bc8f253412 100644
--- a/engines/director/castmember/bitmap.cpp
+++ b/engines/director/castmember/bitmap.cpp
@@ -23,7 +23,6 @@
 #include "graphics/surface.h"
 #include "graphics/macgui/macwidget.h"
 #include "image/bmp.h"
-#include "image/image_decoder.h"
 #include "image/jpeg.h"
 #include "image/pict.h"
 
@@ -35,7 +34,6 @@
 #include "director/score.h"
 #include "director/window.h"
 #include "director/castmember/bitmap.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/castmember/castmember.cpp b/engines/director/castmember/castmember.cpp
index 4b5eb6f848a..63529dd778c 100644
--- a/engines/director/castmember/castmember.cpp
+++ b/engines/director/castmember/castmember.cpp
@@ -23,7 +23,6 @@
 #include "director/director.h"
 #include "director/cast.h"
 #include "director/castmember/castmember.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/castmember/castmember.h b/engines/director/castmember/castmember.h
index af16b96b8e8..4e200aaa4dc 100644
--- a/engines/director/castmember/castmember.h
+++ b/engines/director/castmember/castmember.h
@@ -22,10 +22,7 @@
 #ifndef DIRECTOR_CASTMEMBER_CASTMEMBER_H
 #define DIRECTOR_CASTMEMBER_CASTMEMBER_H
 
-#include "graphics/font.h"
-
 #include "director/archive.h"
-#include "director/sprite.h"
 #include "director/stxt.h"
 
 #include "director/lingo/lingo-object.h"
diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 3e8489c01ff..a6b09d021a0 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -31,7 +31,6 @@
 #include "director/movie.h"
 #include "director/window.h"
 #include "director/castmember/digitalvideo.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/castmember/filmloop.cpp b/engines/director/castmember/filmloop.cpp
index 9d545c10c56..1372fe9fe5c 100644
--- a/engines/director/castmember/filmloop.cpp
+++ b/engines/director/castmember/filmloop.cpp
@@ -31,6 +31,7 @@
 #include "director/channel.h"
 #include "director/frame.h"
 #include "director/movie.h"
+#include "director/sprite.h"
 #include "director/window.h"
 #include "director/castmember/bitmap.h"
 #include "director/castmember/filmloop.h"
diff --git a/engines/director/castmember/text.cpp b/engines/director/castmember/text.cpp
index 94e88087f62..f5c243a0dac 100644
--- a/engines/director/castmember/text.cpp
+++ b/engines/director/castmember/text.cpp
@@ -20,16 +20,15 @@
  */
 
 #include "graphics/macgui/macbutton.h"
-#include "graphics/macgui/mactext.h"
 
 #include "director/director.h"
 #include "director/cast.h"
 #include "director/channel.h"
 #include "director/movie.h"
 #include "director/score.h"
+#include "director/sprite.h"
 #include "director/window.h"
 #include "director/castmember/text.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 00c24e76dda..1a69e5d9106 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -22,11 +22,9 @@
 #include "director/director.h"
 #include "director/movie.h"
 #include "director/score.h"
-#include "director/cursor.h"
 #include "director/cast.h"
 #include "director/channel.h"
 #include "director/sprite.h"
-#include "director/types.h"
 #include "director/window.h"
 #include "director/castmember/castmember.h"
 #include "director/castmember/bitmap.h"
diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index 8f7869c746a..01d10486569 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -198,6 +198,51 @@ bool Debugger::cmdHelp(int argc, const char **argv) {
 	return true;
 }
 
+Common::String Breakpoint::format() {
+	Common::String result = Common::String::format("Breakpoint %d, ", id);
+	switch (type) {
+	case kBreakpointFunction:
+		result += "Function ";
+		if (scriptId)
+			result += Common::String::format("%d:", scriptId);
+		result += funcName;
+		if (funcOffset)
+			result += Common::String::format(" [%5d]", funcOffset);
+		break;
+	case kBreakpointMovie:
+		result += "Movie " + moviePath;
+		break;
+	case kBreakpointMovieFrame:
+		result += Common::String::format("Movie %s:%d", moviePath.c_str(), frameOffset);
+		break;
+	case kBreakpointVariable:
+		result += "Variable "+ varName + ":";
+		result += varRead ? "r" : "";
+		result += varWrite ? "w" : "";
+		break;
+	case kBreakpointEntity:
+		result += "Entity ";
+		result += g_lingo->entity2str(entity);
+		result += field ? ":" : "";
+		result += field ? g_lingo->field2str(field) : "";
+		result += ":";
+		result += varRead ? "r" : "";
+		result += varWrite ? "w" : "";
+		break;
+	case kBreakpointEvent:
+		result += "Event ";
+		if (eventId == kEventNone) {
+			result += "none";
+		} else {
+			result += g_lingo->_eventHandlerTypes[eventId];
+		}
+		break;
+	default:
+		break;
+	}
+	return result;
+}
+
 bool Debugger::cmdVersion(int argc, const char **argv) {
 	debugPrintf("Director version: %d\n", g_director->getVersion());
 	debugPrintf("Director platform: %s\n", Common::getPlatformCode(g_director->getPlatform()));
diff --git a/engines/director/debugger.h b/engines/director/debugger.h
index 776bca2ff07..bfdea47549d 100644
--- a/engines/director/debugger.h
+++ b/engines/director/debugger.h
@@ -23,13 +23,14 @@
 #define DIRECTOR_DEBUGGER_H
 
 #include "common/array.h"
+#include "common/file.h"
 #include "common/str.h"
 #include "gui/debugger.h"
-#include "director/director.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
+struct Symbol;
+
 enum BreakpointType {
 	kBreakpointTypeNull = 0,
 	kBreakpointFunction = 1,
@@ -57,50 +58,7 @@ struct Breakpoint {
 	bool varRead = false;
 	bool varWrite = false;
 
-	Common::String format() {
-		Common::String result = Common::String::format("Breakpoint %d, ", id);
-		switch (type) {
-		case kBreakpointFunction:
-			result += "Function ";
-			if (scriptId)
-				result += Common::String::format("%d:", scriptId);
-			result += funcName;
-			if (funcOffset)
-				result += Common::String::format(" [%5d]", funcOffset);
-			break;
-		case kBreakpointMovie:
-			result += "Movie " + moviePath;
-			break;
-		case kBreakpointMovieFrame:
-			result += Common::String::format("Movie %s:%d", moviePath.c_str(), frameOffset);
-			break;
-		case kBreakpointVariable:
-			result += "Variable "+ varName + ":";
-			result += varRead ? "r" : "";
-			result += varWrite ? "w" : "";
-			break;
-		case kBreakpointEntity:
-			result += "Entity ";
-			result += g_lingo->entity2str(entity);
-			result += field ? ":" : "";
-			result += field ? g_lingo->field2str(field) : "";
-			result += ":";
-			result += varRead ? "r" : "";
-			result += varWrite ? "w" : "";
-			break;
-		case kBreakpointEvent:
-			result += "Event ";
-			if (eventId == kEventNone) {
-				result += "none";
-			} else {
-				result += g_lingo->_eventHandlerTypes[eventId];
-			}
-			break;
-		default:
-			break;
-		}
-		return result;
-	}
+	Common::String format();
 };
 
 
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index c663a1f257e..9fca4ff4174 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -21,8 +21,6 @@
 
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
-#include "common/error.h"
-#include "common/punycode.h"
 #include "common/tokenizer.h"
 
 #include "graphics/macgui/macwindowmanager.h"
@@ -37,8 +35,6 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/window.h"
-#include "director/lingo/lingo.h"
-#include "director/detection.h"
 
 /**
  * When detection is compiled dynamically, directory globs end up in detection plugin and
diff --git a/engines/director/director.h b/engines/director/director.h
index dc285dcd091..818244af496 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -22,20 +22,12 @@
 #ifndef DIRECTOR_DIRECTOR_H
 #define DIRECTOR_DIRECTOR_H
 
-#include "common/file.h"
-#include "common/hashmap.h"
 #include "common/hash-ptr.h"
-#include "common/hash-str.h"
-#include "common/rect.h"
-#include "common/str-array.h"
 
-#include "engines/engine.h"
-#include "graphics/pixelformat.h"
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/types.h"
 #include "director/util.h"
-#include "director/debugger.h"
 #include "director/detection.h"
 
 namespace Common {
@@ -58,10 +50,12 @@ namespace Director {
 class Archive;
 class MacArchive;
 class Cast;
+class Debugger;
 class DirectorSound;
 class Lingo;
 class Movie;
 class Window;
+struct Picture;
 class Score;
 class Channel;
 class CastMember;
diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index ba9c7e0b0c8..dc1215a874e 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -31,12 +31,10 @@
 #include "director/director.h"
 #include "director/movie.h"
 #include "director/score.h"
-#include "director/cursor.h"
 #include "director/channel.h"
 #include "director/sprite.h"
 #include "director/window.h"
 #include "director/castmember/castmember.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/fonts.cpp b/engines/director/fonts.cpp
index 0b4019c4e52..d782e4a3a34 100644
--- a/engines/director/fonts.cpp
+++ b/engines/director/fonts.cpp
@@ -26,7 +26,6 @@
 
 #include "director/director.h"
 #include "director/cast.h"
-#include "director/util.h"
 
 namespace Director {
 
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 884e0b135be..faeb2c58534 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -27,7 +27,6 @@
 #include "director/score.h"
 #include "director/movie.h"
 #include "director/sprite.h"
-#include "director/util.h"
 
 namespace Director {
 
diff --git a/engines/director/game-quirks.cpp b/engines/director/game-quirks.cpp
index 255110d5862..e1963e41d8d 100644
--- a/engines/director/game-quirks.cpp
+++ b/engines/director/game-quirks.cpp
@@ -23,7 +23,6 @@
 #include "common/macresman.h"
 #include "common/memstream.h"
 #include "director/director.h"
-#include "graphics/macgui/macfontmanager.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 2886af9e9e6..e4a2782bb3d 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -20,36 +20,31 @@
  */
 
 #include "common/system.h"
-#include "common/tokenizer.h"
 #include "common/translation.h"
 
 #include "director/types.h"
 #include "gui/message.h"
 
 #include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/macmenu.h"
 
 #include "director/director.h"
 #include "director/cast.h"
+#include "director/debugger.h"
 #include "director/frame.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/sprite.h"
-#include "director/cursor.h"
 #include "director/channel.h"
 #include "director/window.h"
 #include "director/stxt.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
 #include "director/castmember/bitmap.h"
 #include "director/castmember/palette.h"
 #include "director/castmember/text.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-builtins.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-codegen.h"
-#include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
 
 #include "image/pict.h"
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index b90f820d26d..fea5a8edc12 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -27,16 +27,13 @@
 #include "director/director.h"
 #include "director/cast.h"
 #include "director/movie.h"
-#include "director/util.h"
 #include "director/window.h"
 #include "director/castmember/castmember.h"
 #include "director/castmember/script.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-codegen.h"
 #include "director/lingo/lingo-builtins.h"
 #include "director/lingo/lingo-bytecode.h"
-#include "director/lingo/lingo-object.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 5e30d424255..130a8ed0ca1 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -46,18 +46,15 @@
 #include "graphics/macgui/mactext.h"
 
 #include "director/director.h"
+#include "director/debugger.h"
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/sprite.h"
 #include "director/window.h"
-#include "director/cursor.h"
 #include "director/channel.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-builtins.h"
 #include "director/lingo/lingo-code.h"
-#include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-the.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo-codegen.h b/engines/director/lingo/lingo-codegen.h
index 11079b90c02..9d233687bf3 100644
--- a/engines/director/lingo/lingo-codegen.h
+++ b/engines/director/lingo/lingo-codegen.h
@@ -22,7 +22,6 @@
 #ifndef DIRECTOR_LINGO_LINGO_CODEGEN_H
 #define DIRECTOR_LINGO_LINGO_CODEGEN_H
 
-#include "director/types.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-ast.h"
 
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index ba9a5af58c0..7dfda8cb40a 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "director/director.h"
+#include "director/debugger.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-object.h"
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 830915f779c..b3f19d1d494 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "audio/audiostream.h"
-#include "audio/decoders/wave.h"
 #include "common/file.h"
 #include "common/macresman.h"
 #include "common/system.h"
@@ -34,9 +33,7 @@
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/window.h"
-#include "director/util.h"
 
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-builtins.h"
 
 
diff --git a/engines/director/lingo/lingo-mci.cpp b/engines/director/lingo/lingo-mci.cpp
index f1c5e4861ea..0464dea8b10 100644
--- a/engines/director/lingo/lingo-mci.cpp
+++ b/engines/director/lingo/lingo-mci.cpp
@@ -29,6 +29,9 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/wave.h"
 
+#include "common/file.h"
+
+#include "director/director.h"
 #include "director/score.h"
 #include "director/sound.h"
 #include "director/window.h"
diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index d51a6b70705..296eb24c3a6 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -26,10 +26,7 @@
 #include "director/director.h"
 #include "director/movie.h"
 #include "director/window.h"
-#include "director/util.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
-#include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-the.h"
 
 #include "director/lingo/xlibs/aiff.h"
diff --git a/engines/director/lingo/lingo-object.h b/engines/director/lingo/lingo-object.h
index 1924813be1e..8d0d0cb3d26 100644
--- a/engines/director/lingo/lingo-object.h
+++ b/engines/director/lingo/lingo-object.h
@@ -22,7 +22,6 @@
 #ifndef DIRECTOR_LINGO_OBJECT_H
 #define DIRECTOR_LINGO_OBJECT_H
 
-#include "director/director.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo-patcher.cpp b/engines/director/lingo/lingo-patcher.cpp
index 27c1bd05863..74012a9af4d 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -25,7 +25,6 @@
 #include "director/movie.h"
 #include "director/lingo/lingo-codegen.h"
 
-
 namespace Director {
 
 using namespace Common;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index e8325183f4e..6719a432c99 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -21,14 +21,13 @@
 
 #include "common/config-manager.h"
 #include "common/fs.h"
-#include "common/util.h"
 #include "graphics/macgui/macbutton.h"
-#include "graphics/macgui/macmenu.h"
 
 #include "director/director.h"
 #include "director/cast.h"
 #include "director/cursor.h"
 #include "director/channel.h"
+#include "director/debugger.h"
 #include "director/frame.h"
 #include "director/movie.h"
 #include "director/sound.h"
@@ -38,11 +37,10 @@
 #include "director/castmember/castmember.h"
 #include "director/castmember/digitalvideo.h"
 #include "director/castmember/text.h"
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-builtins.h"
 #include "director/lingo/lingo-code.h"
-#include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-the.h"
+
 namespace Director {
 
 class Sprite;
diff --git a/engines/director/lingo/lingo-utils.cpp b/engines/director/lingo/lingo-utils.cpp
index 949cba00495..5f93a371d8f 100644
--- a/engines/director/lingo/lingo-utils.cpp
+++ b/engines/director/lingo/lingo-utils.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "director/director.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 5724fd53228..376d2905803 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -20,29 +20,25 @@
  */
 
 #include "common/file.h"
-#include "common/config-manager.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/cast.h"
+#include "director/debugger.h"
 #include "director/frame.h"
 #include "director/movie.h"
 #include "director/picture.h"
 #include "director/score.h"
 #include "director/sprite.h"
 #include "director/window.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
 #include "director/castmember/text.h"
 
-#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-ast.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-codegen.h"
-#include "director/lingo/lingo-gr.h"
 #include "director/lingo/lingo-the.h"
-#include "director/lingo/lingo-object.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index ce15eae66c1..24a9bb38e16 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -22,14 +22,6 @@
 #ifndef DIRECTOR_LINGO_LINGO_H
 #define DIRECTOR_LINGO_LINGO_H
 
-#include "common/hash-ptr.h"
-#include "common/hash-str.h"
-#include "common/str-array.h"
-#include "common/queue.h"
-#include "common/rect.h"
-
-#include "director/types.h"
-
 namespace Audio {
 class AudioStream;
 }
diff --git a/engines/director/lingo/xlibs/developerStack.cpp b/engines/director/lingo/xlibs/developerStack.cpp
index 552ca3648d8..6cec4e835aa 100644
--- a/engines/director/lingo/xlibs/developerStack.cpp
+++ b/engines/director/lingo/xlibs/developerStack.cpp
@@ -22,6 +22,7 @@
 #include "audio/mixer.h"
 
 #include "director/director.h"
+#include "director/lingo/lingo.h"
 #include "director/lingo/xlibs/developerStack.h"
 
 /*************************************
diff --git a/engines/director/lingo/xlibs/fileexists.cpp b/engines/director/lingo/xlibs/fileexists.cpp
index 33a792a1a0b..602f2f7a87c 100644
--- a/engines/director/lingo/xlibs/fileexists.cpp
+++ b/engines/director/lingo/xlibs/fileexists.cpp
@@ -31,11 +31,13 @@
  * FileExists(pathname «, “noDialog”:errGlobal»)
  */
 
+#include "common/file.h"
+#include "common/savefile.h"
+
 #include "director/director.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/xlibs/fileexists.h"
-#include "common/savefile.h"
 
 
 namespace Director {
diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index bb85b431a77..0300d5b137a 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -89,6 +89,7 @@
 
 #include "gui/filebrowser-dialog.h"
 
+#include "common/file.h"
 #include "common/memstream.h"
 #include "common/savefile.h"
 
diff --git a/engines/director/lingo/xlibs/porta.cpp b/engines/director/lingo/xlibs/porta.cpp
index 86ccfc0e036..b0b59b8df09 100644
--- a/engines/director/lingo/xlibs/porta.cpp
+++ b/engines/director/lingo/xlibs/porta.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "director/director.h"
+#include "director/lingo/lingo.h"
 #include "director/lingo/xlibs/porta.h"
 
 /*************************************
diff --git a/engines/director/lingo/xlibs/registercomponent.cpp b/engines/director/lingo/xlibs/registercomponent.cpp
index 4a2353f3d8b..4aab22a0da1 100644
--- a/engines/director/lingo/xlibs/registercomponent.cpp
+++ b/engines/director/lingo/xlibs/registercomponent.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "director/director.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/xlibs/registercomponent.h"
 
diff --git a/engines/director/metaengine.cpp b/engines/director/metaengine.cpp
index 35a8c8af191..5189ce4e411 100644
--- a/engines/director/metaengine.cpp
+++ b/engines/director/metaengine.cpp
@@ -24,10 +24,8 @@
 #include "engines/advancedDetector.h"
 
 #include "common/file.h"
-#include "common/config-manager.h"
 
 #include "director/director.h"
-#include "director/detection.h"
 
 namespace Director {
 
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 31afdc751f4..cc2adceed34 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -35,8 +35,6 @@
 #include "director/score.h"
 #include "director/window.h"
 #include "director/castmember/castmember.h"
-#include "director/lingo/lingo.h"
-#include "director/lingo/lingo-object.h"
 
 namespace Director {
 
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 6cba68db3de..fca6e151d55 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -34,9 +34,7 @@
 #include "director/cast.h"
 #include "director/movie.h"
 #include "director/score.h"
-#include "director/util.h"
 #include "director/window.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index e0aba399c62..2d7aa5337f9 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -23,7 +23,6 @@
 
 #include "common/config-manager.h"
 #include "common/file.h"
-#include "common/md5.h"
 #include "common/rational.h"
 #include "common/memstream.h"
 #include "common/punycode.h"
@@ -38,19 +37,17 @@
 #endif
 
 #include "director/director.h"
+#include "director/debugger.h"
 #include "director/cast.h"
+#include "director/frame.h"
 #include "director/score.h"
 #include "director/movie.h"
 #include "director/sound.h"
-#include "director/cursor.h"
 #include "director/channel.h"
 #include "director/sprite.h"
 #include "director/window.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
-#include "director/castmember/palette.h"
 #include "director/castmember/transition.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/score.h b/engines/director/score.h
index 3cee4eeed98..8707c8889bc 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -22,10 +22,7 @@
 #ifndef DIRECTOR_SCORE_H
 #define DIRECTOR_SCORE_H
 
-//#include "graphics/macgui/macwindowmanager.h"
-
 #include "director/cursor.h"
-#include "director/frame.h"
 
 namespace Graphics {
 	struct Surface;
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index b7b7b6d9f4a..7534ceac630 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -36,7 +36,6 @@
 #include "director/director.h"
 #include "director/movie.h"
 #include "director/sound.h"
-#include "director/util.h"
 #include "director/window.h"
 #include "director/castmember/sound.h"
 
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 5a63d9c5c68..a3232e0014a 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -27,10 +27,7 @@
 #include "director/score.h"
 #include "director/sprite.h"
 #include "director/castmember/castmember.h"
-#include "director/castmember/bitmap.h"
 #include "director/castmember/shape.h"
-#include "director/lingo/lingo.h"
-#include "director/lingo/lingo-object.h"
 
 namespace Director {
 
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index 98b795eb48f..e6b2907dbc8 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -36,9 +36,7 @@
 #include "director/archive.h"
 #include "director/movie.h"
 #include "director/picture.h"
-#include "director/util.h"
 #include "director/window.h"
-#include "director/lingo/lingo.h"
 
 #include "image/pict.h"
 
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 7dc4260497f..b39e93f2cc6 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -28,8 +28,6 @@
 #include "director/movie.h"
 #include "director/score.h"
 #include "director/window.h"
-#include "director/util.h"
-#include "director/lingo/lingo.h"
 
 namespace Director {
 
diff --git a/engines/director/types.cpp b/engines/director/types.cpp
index 638d6605886..c172d6cb955 100644
--- a/engines/director/types.cpp
+++ b/engines/director/types.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "common/array.h"
-#include "common/str.h"
 #include "director/types.h"
 
 namespace Director {
diff --git a/engines/director/types.h b/engines/director/types.h
index cd170807e1f..991647f7036 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -22,8 +22,6 @@
 #ifndef DIRECTOR_TYPES_H
 #define DIRECTOR_TYPES_H
 
-#include "common/hashmap.h"
-
 namespace Director {
 
 #define CONTINUATION (0xAC)
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 34820b7631a..53b4b3b0f23 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -20,23 +20,19 @@
  */
 
 #include "common/file.h"
-#include "common/fs.h"
 #include "common/keyboard.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
 #include "common/punycode.h"
-#include "common/str-array.h"
 #include "common/tokenizer.h"
 #include "common/compression/zlib.h"
 
 #include "director/types.h"
 #include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/macfontmanager.h"
 
 #include "director/director.h"
 #include "director/movie.h"
 #include "director/lingo/lingo.h"
-#include "director/util.h"
 
 namespace Director {
 
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 2442f8d2e9f..5985c091828 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -23,21 +23,19 @@
 #include "common/system.h"
 #include "common/macresman.h"
 
-#include "graphics/primitives.h"
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "director/director.h"
 #include "director/archive.h"
 #include "director/cast.h"
+#include "director/debugger.h"
 #include "director/lingo/lingo.h"
 #include "director/movie.h"
 #include "director/window.h"
 #include "director/score.h"
-#include "director/cursor.h"
 #include "director/channel.h"
 #include "director/sound.h"
 #include "director/sprite.h"
-#include "director/util.h"
 #include "director/castmember/castmember.h"
 
 namespace Director {
diff --git a/engines/director/window.h b/engines/director/window.h
index a22dd256a3b..45baa5f41c9 100644
--- a/engines/director/window.h
+++ b/engines/director/window.h
@@ -22,7 +22,6 @@
 #ifndef DIRECTOR_STAGE_H
 #define DIRECTOR_STAGE_H
 
-#include "graphics/macgui/macwindow.h"
 #include "director/lingo/lingo-object.h"
 
 namespace Common {

More information about the Scummvm-git-logs mailing list