COMMON: Split common/stream.h into several headers

svn-id: r54385

4 files changed, 15 insertions, 3 deletions

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index c83375f610..d0e9b168ae 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -24,6 +24,8 @@
  */
 
 #include "toon/audio.h"
+#include "common/memstream.h"
+#include "common/substream.h"
 
 namespace Toon {
 
diff --git a/engines/toon/resource.cpp b/engines/toon/resource.cpp
index 3f879df781..61e3ffb111 100644
--- a/engines/toon/resource.cpp
+++ b/engines/toon/resource.cpp
@@ -25,6 +25,8 @@
 
 #include "toon/resource.h"
 #include "common/file.h"
+#include "common/memstream.h"
+#include "common/substream.h"
 #include "toon/toon.h"
 
 
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index d86beadcd1..61b6e1bfe3 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -30,6 +30,8 @@
 #include "common/config-manager.h"
 #include "common/EventRecorder.h"
 #include "common/savefile.h"
+#include "common/memstream.h"
+
 #include "engines/util.h"
 #include "graphics/surface.h"
 #include "graphics/thumbnail.h"
@@ -1799,6 +1801,10 @@ void ToonEngine::drawInfoLine() {
 	}
 }
 
+Common::WriteStream *ToonEngine::getSaveBufferStream() {
+	return _saveBufferStream;
+}
+
 const char *ToonEngine::getLocationString(int32 locationId, bool alreadyVisited) {
 	if (alreadyVisited)
 		return _locationDirVisited[locationId];
diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index 920ec080aa..05b2bac47c 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -43,6 +43,10 @@
 #include "toon/audio.h"
 #include "toon/console.h"
 
+namespace Common {
+class MemoryWriteStreamDynamic;
+}
+
 #define TOON_DAT_VER_MAJ 0  // 1 byte
 #define TOON_DAT_VER_MIN 3  // 1 byte
 #define TOON_SAVEGAME_VERSION 4
@@ -308,9 +312,7 @@ public:
 		return _pathFinding;
 	}
 
-	Common::WriteStream *getSaveBufferStream() {
-		return _saveBufferStream;
-	}
+	Common::WriteStream *getSaveBufferStream();
 
 	bool shouldQuitGame() const {
 		return _shouldQuit;