DIRECTOR: Further simplification of include dependencies

6 files changed, 3 insertions, 10 deletions

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,