COMMON: Split common/stream.h into several headers

svn-id: r54385

8 files changed, 11 insertions, 10 deletions

diff --git a/engines/draci/animation.cpp b/engines/draci/animation.cpp
index 2bedbe1801..d7582ec31d 100644
--- a/engines/draci/animation.cpp
+++ b/engines/draci/animation.cpp
@@ -31,6 +31,8 @@
 #include "draci/sound.h"
 #include "draci/surface.h"
 
+#include "common/memstream.h"
+
 namespace Draci {
 
 Animation::Animation(DraciEngine *vm, int id, uint z, bool playing) : _vm(vm) {
diff --git a/engines/draci/barchive.cpp b/engines/draci/barchive.cpp
index 8f9e836ba3..5307e04250 100644
--- a/engines/draci/barchive.cpp
+++ b/engines/draci/barchive.cpp
@@ -25,7 +25,7 @@
 
 #include "common/debug.h"
 #include "common/str.h"
-#include "common/stream.h"
+#include "common/memstream.h"
 
 #include "draci/barchive.h"
 #include "draci/draci.h"
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index cb2832552a..eef81d808e 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -25,7 +25,7 @@
 
 #include "common/keyboard.h"
 #include "common/serializer.h"
-#include "common/stream.h"
+#include "common/memstream.h"
 #include "common/system.h"
 #include "common/util.h"
 
diff --git a/engines/draci/screen.cpp b/engines/draci/screen.cpp
index 9e91a14cfc..987bbf2ac1 100644
--- a/engines/draci/screen.cpp
+++ b/engines/draci/screen.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stream.h"
+#include "common/memstream.h"
 #include "common/system.h"
 
 #include "draci/draci.h"
diff --git a/engines/draci/script.cpp b/engines/draci/script.cpp
index 583afa736f..2a27541ad9 100644
--- a/engines/draci/script.cpp
+++ b/engines/draci/script.cpp
@@ -25,7 +25,7 @@
 
 #include "common/array.h"
 #include "common/debug.h"
-#include "common/stream.h"
+#include "common/memstream.h"
 #include "common/stack.h"
 
 #include "draci/draci.h"
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp
index 6828066c3a..af096256ea 100644
--- a/engines/draci/sound.cpp
+++ b/engines/draci/sound.cpp
@@ -28,7 +28,8 @@
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/str.h"
-#include "common/stream.h"
+#include "common/substream.h"
+#include "common/memstream.h"
 #include "common/unzip.h"
 
 #include "draci/sound.h"
@@ -301,7 +302,7 @@ uint Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundSample &buffe
 	// only used for dubbing, which is only played from one place in
 	// script.cpp, which blocks until the dubbed sentence has finished
 	// playing.
-	Common::SeekableReadStream* stream;
+	Common::SeekableReadStream *stream;
 	const int skip = buffer._format == RAW80 ? 80 : 0;
 	if (buffer._stream) {
 		stream = new Common::SeekableSubReadStream(
diff --git a/engines/draci/sprite.cpp b/engines/draci/sprite.cpp
index cb3aa58cfa..65c6e21ee4 100644
--- a/engines/draci/sprite.cpp
+++ b/engines/draci/sprite.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stream.h"
+#include "common/memstream.h"
 
 #include "draci/draci.h"
 #include "draci/font.h"
diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index 02612832d2..c6f9a58a85 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -23,9 +23,7 @@
  *
  */
 
-#include <stdlib.h>
-
-#include "common/stream.h"
+#include "common/memstream.h"
 
 #include "draci/draci.h"
 #include "draci/animation.h"