ALL: Push down deps on stream.h from .h to .cpp files

svn-id: r54358

23 files changed, 49 insertions, 11 deletions

diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 14ef169c48..6e9a996756 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -30,6 +30,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "graphics/thumbnail.h"
+#include "graphics/surface.h"
 
 #include "agi/agi.h"
 #include "agi/preagi.h"
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 1a968816d4..94df063609 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -29,9 +29,10 @@
 //
 
 #include "common/file.h"
-#include "graphics/thumbnail.h"
 #include "common/config-manager.h"
 #include "common/savefile.h"
+#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 917bdc66c5..3d29c2ce26 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -500,7 +500,7 @@ bool VideoPlayer::hasEmbeddedFile(const Common::String &fileName, int slot) cons
 	return video->decoder->hasEmbeddedFile(fileName);
 }
 
-Common::MemoryReadStream *VideoPlayer::getEmbeddedFile(const Common::String &fileName, int slot) {
+Common::SeekableReadStream *VideoPlayer::getEmbeddedFile(const Common::String &fileName, int slot) {
 	const Video *video = getVideoBySlot(slot);
 	if (!video)
 		return 0;
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index c154254455..45b3a7b82d 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -121,7 +121,7 @@ public:
 	const Common::List<Common::Rect> *getDirtyRects(int slot = 0) const;
 
 	bool                      hasEmbeddedFile(const Common::String &fileName, int slot = 0) const;
-	Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName, int slot = 0);
+	Common::SeekableReadStream *getEmbeddedFile(const Common::String &fileName, int slot = 0);
 
 	int32 getSubtitleIndex(int slot = 0) const;
 
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index c5658c0445..cd5ef52b92 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -27,6 +27,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"
+#include "graphics/surface.h"
 
 #include "kyra/kyra_v1.h"
 #include "kyra/util.h"
diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp
index 5ac9f8bf00..f3179749c0 100644
--- a/engines/lastexpress/data/animation.cpp
+++ b/engines/lastexpress/data/animation.cpp
@@ -35,6 +35,7 @@
 
 #include "common/events.h"
 #include "common/rational.h"
+#include "common/stream.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/lastexpress/data/animation.h b/engines/lastexpress/data/animation.h
index 435621eb8e..9bc2ba99cb 100644
--- a/engines/lastexpress/data/animation.h
+++ b/engines/lastexpress/data/animation.h
@@ -41,7 +41,10 @@
 #include "lastexpress/drawable.h"
 
 #include "common/array.h"
-#include "common/stream.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/background.cpp b/engines/lastexpress/data/background.cpp
index 94d7fb16c3..8b0d338f64 100644
--- a/engines/lastexpress/data/background.cpp
+++ b/engines/lastexpress/data/background.cpp
@@ -31,6 +31,8 @@
 
 #include "lastexpress/debug.h"
 
+#include "common/stream.h"
+
 namespace LastExpress {
 
 Background::Background() : _data(NULL) {
diff --git a/engines/lastexpress/data/background.h b/engines/lastexpress/data/background.h
index 5fbdbc13ed..994b216ff9 100644
--- a/engines/lastexpress/data/background.h
+++ b/engines/lastexpress/data/background.h
@@ -46,7 +46,9 @@
 
 #include "lastexpress/drawable.h"
 
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/cursor.cpp b/engines/lastexpress/data/cursor.cpp
index 4e7003578a..5489fc3d21 100644
--- a/engines/lastexpress/data/cursor.cpp
+++ b/engines/lastexpress/data/cursor.cpp
@@ -27,6 +27,7 @@
 
 #include "lastexpress/lastexpress.h"
 
+#include "common/stream.h"
 #include "common/system.h"
 #include "graphics/cursorman.h"
 
diff --git a/engines/lastexpress/data/cursor.h b/engines/lastexpress/data/cursor.h
index 992266569f..0e9556aa6e 100644
--- a/engines/lastexpress/data/cursor.h
+++ b/engines/lastexpress/data/cursor.h
@@ -43,7 +43,9 @@
 
 #include "lastexpress/shared.h"
 
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/font.cpp b/engines/lastexpress/data/font.cpp
index 5f4b3b40b8..99239606ab 100644
--- a/engines/lastexpress/data/font.cpp
+++ b/engines/lastexpress/data/font.cpp
@@ -25,6 +25,7 @@
 
 #include "lastexpress/data/font.h"
 
+#include "common/stream.h"
 #include "common/system.h"
 
 namespace LastExpress {
diff --git a/engines/lastexpress/data/font.h b/engines/lastexpress/data/font.h
index 457c0c3432..d49db35ba5 100644
--- a/engines/lastexpress/data/font.h
+++ b/engines/lastexpress/data/font.h
@@ -39,9 +39,12 @@
 	byte {x}      - Unknown data (probably just garbage)
 */
 
-#include "common/stream.h"
 #include "graphics/surface.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace LastExpress {
 
 class Font {
diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp
index 47266358f2..5a943982c4 100644
--- a/engines/lastexpress/data/scene.cpp
+++ b/engines/lastexpress/data/scene.cpp
@@ -31,6 +31,8 @@
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
+#include "common/stream.h"
+
 namespace LastExpress {
 
 SceneHotspot::~SceneHotspot() {
diff --git a/engines/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h
index d4c8e7d0da..7fc9425f28 100644
--- a/engines/lastexpress/data/scene.h
+++ b/engines/lastexpress/data/scene.h
@@ -72,7 +72,10 @@
 #include "lastexpress/shared.h"
 
 #include "common/array.h"
-#include "common/stream.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp
index cf71bd6a61..2308d70a2b 100644
--- a/engines/lastexpress/data/sequence.cpp
+++ b/engines/lastexpress/data/sequence.cpp
@@ -29,6 +29,8 @@
 
 #include "lastexpress/debug.h"
 
+#include "common/stream.h"
+
 namespace LastExpress {
 
 void FrameInfo::read(Common::SeekableReadStream *in, bool isSequence) {
diff --git a/engines/lastexpress/data/sequence.h b/engines/lastexpress/data/sequence.h
index 25170993df..7ad0a57254 100644
--- a/engines/lastexpress/data/sequence.h
+++ b/engines/lastexpress/data/sequence.h
@@ -77,7 +77,10 @@
 #include "lastexpress/shared.h"
 
 #include "common/array.h"
-#include "common/stream.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h
index 2e0bc8c1b0..f76f8ff6ca 100644
--- a/engines/lastexpress/data/snd.h
+++ b/engines/lastexpress/data/snd.h
@@ -39,7 +39,6 @@
 	    byte {x}     - IMA ADPCM sample codes
 */
 
-#include "common/stream.h"
 #include "sound/mixer.h"
 
 namespace Audio {
@@ -47,6 +46,10 @@ namespace Audio {
 	class QueuingAudioStream;
 }
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace LastExpress {
 
 class SimpleSound {
diff --git a/engines/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp
index 67d6445ab9..953edd1d1a 100644
--- a/engines/lastexpress/data/subtitle.cpp
+++ b/engines/lastexpress/data/subtitle.cpp
@@ -33,6 +33,7 @@
 #include "lastexpress/debug.h"
 
 #include "common/debug.h"
+#include "common/stream.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/data/subtitle.h b/engines/lastexpress/data/subtitle.h
index 9acb7068f1..6d8e7535cb 100644
--- a/engines/lastexpress/data/subtitle.h
+++ b/engines/lastexpress/data/subtitle.h
@@ -45,7 +45,10 @@
 #include "lastexpress/drawable.h"
 
 #include "common/array.h"
-#include "common/stream.h"
+
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace LastExpress {
 
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 35c7a70b0e..a4914e57b4 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -29,6 +29,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"
+#include "graphics/surface.h"
 
 #include "sci/sci.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp
index 58fd60621d..a08f837866 100644
--- a/engines/sci/video/seq_decoder.cpp
+++ b/engines/sci/video/seq_decoder.cpp
@@ -26,6 +26,7 @@
 #include "common/debug.h"
 #include "common/endian.h"
 #include "common/archive.h"
+#include "common/stream.h"
 #include "common/system.h"
 #include "common/util.h"
 
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 9fc24e75e8..855c7d1f83 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -33,6 +33,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"
+#include "graphics/surface.h"
 
 #include "engines/metaengine.h"