[Scummvm-git-logs] scummvm master -> 61183fd300eaa447c0810475b9d54ac86ec3212b

[djsrv]

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:
61183fd300 DIRECTOR: JANITORIAL: Remove header dependencies


Commit: 61183fd300eaa447c0810475b9d54ac86ec3212b
    https://github.com/scummvm/scummvm/commit/61183fd300eaa447c0810475b9d54ac86ec3212b
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-12T12:21:31-04:00

Commit Message:
DIRECTOR: JANITORIAL: Remove header dependencies

Changed paths:
    engines/director/director.h
    engines/director/lingo/xlibs/fileio.cpp
    engines/director/lingo/xlibs/fileio.h
    engines/director/stxt.h


diff --git a/engines/director/director.h b/engines/director/director.h
index aa757de497..81dfb631e5 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -31,7 +31,6 @@
 #include "engines/engine.h"
 #include "graphics/managed_surface.h"
 
-#include "director/stxt.h"
 #include "director/types.h"
 
 namespace Common {
@@ -59,6 +58,7 @@ class DirectorSound;
 class Lingo;
 class Score;
 class Cast;
+class Stxt;
 
 enum {
 	kDebugLingoExec		= 1 << 0,
diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index 6cb19bca6b..2eefa5ea07 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -22,6 +22,9 @@
 
 #include "gui/filebrowser-dialog.h"
 
+#include "common/memstream.h"
+#include "common/savefile.h"
+
 #include "director/director.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/xlibs/fileio.h"
diff --git a/engines/director/lingo/xlibs/fileio.h b/engines/director/lingo/xlibs/fileio.h
index fc38cd8073..69acbf8cde 100644
--- a/engines/director/lingo/xlibs/fileio.h
+++ b/engines/director/lingo/xlibs/fileio.h
@@ -23,8 +23,12 @@
 #ifndef DIRECTOR_LINGO_XOBJECT_FILEIO_H
 #define DIRECTOR_LINGO_XOBJECT_FILEIO_H
 
-#include "common/memstream.h"
-#include "common/savefile.h"
+namespace Common {
+class SeekableReadStream;
+typedef SeekableReadStream InSaveFile;
+class OutSaveFile;
+class MemoryWriteStreamDynamic;
+}
 
 namespace Director {
 
diff --git a/engines/director/stxt.h b/engines/director/stxt.h
index b86d991e25..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/cast.h"
-
 namespace Director {
 
 class Stxt {