Merging in changes from trunk

svn-id: r41989

1 files changed, 13 insertions, 1 deletions

diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h
index 46d3bd48fb..98e279bd29 100644
--- a/engines/kyra/vqa.h
+++ b/engines/kyra/vqa.h
@@ -26,13 +26,24 @@
 #ifndef KYRA_VQA_H
 #define KYRA_VQA_H
 
-#include "common/stream.h"
+#include "common/scummsys.h"
+
+#include "sound/mixer.h"
 
 class OSystem;
 
+namespace Audio {
+class AppendableAudioStream;
+} // end of namespace Audio
+
+namespace Common {
+class SeekableReadStream;
+} // end of namespace Common
+
 namespace Kyra {
 
 class KyraEngine_v1;
+class Screen;
 
 class VQAMovie {
 public:
@@ -57,6 +68,7 @@ public:
 protected:
 	OSystem *_system;
 	KyraEngine_v1 *_vm;
+	Screen *_screen;
 
 	bool _opened;
 	int _x, _y;