27 files changed, 153 insertions, 34 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index db33f1fb8a..47322c86b7 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -23,10 +23,9 @@
  *
  */
 
-#include "common/endian.h"
-#include "common/file.h"
 #include "common/stream.h"
-#include "common/events.h"
+#include "common/system.h"
+#include "common/textconsole.h"
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 33189910c7..0154b57ea6 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -26,13 +26,34 @@
 #ifndef VIDEO_AVI_PLAYER_H
 #define VIDEO_AVI_PLAYER_H
 
+#include "common/endian.h"
+#include "common/rational.h"
+#include "common/rect.h"
+#include "common/str.h"
+
 #include "video/video_decoder.h"
-#include "video/codecs/codec.h"
-#include "audio/audiostream.h"
 #include "audio/mixer.h"
 
+namespace Audio {
+class QueuingAudioStream;
+}
+
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace Graphics {
+struct PixelFormat;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
 namespace Video {
 
+class Codec;
+
 #define UNKNOWN_HEADER(a) error("Unknown header found -- \'%s\'", tag2str(a))
 
 // IDs used throughout the AVI files
diff --git a/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp
index d4552b78d7..f26cc35a2b 100644
--- a/video/codecs/cdtoons.cpp
+++ b/video/codecs/cdtoons.cpp
@@ -24,9 +24,9 @@
  */
 
 #include "video/codecs/cdtoons.h"
+#include "common/rect.h"
 #include "common/stream.h"
-
-#include "common/system.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp
index 2f5cb73561..bc73b831fe 100644
--- a/video/codecs/cinepak.cpp
+++ b/video/codecs/cinepak.cpp
@@ -25,7 +25,13 @@
 
 #include "video/codecs/cinepak.h"
 
+#include "common/debug.h"
+#include "common/stream.h"
 #include "common/system.h"
+#include "common/textconsole.h"
+#include "common/util.h"
+
+#include "graphics/surface.h"
 
 // Code here partially based off of ffmpeg ;)
 
diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h
index 8b4c0216a3..34e4fe98eb 100644
--- a/video/codecs/cinepak.h
+++ b/video/codecs/cinepak.h
@@ -27,13 +27,19 @@
 #define VIDEO_CODECS_CINEPAK_H
 
 #include "common/scummsys.h"
-#include "common/stream.h"
 #include "common/rect.h"
-#include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 
 #include "video/codecs/codec.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
 namespace Video {
 
 struct CinepakCodebook {
diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp
index e7f470bd3a..c8f62d2452 100644
--- a/video/codecs/indeo3.cpp
+++ b/video/codecs/indeo3.cpp
@@ -35,8 +35,8 @@
 
 #include "common/system.h"
 #include "common/endian.h"
-#include "common/frac.h"
-#include "common/file.h"
+#include "common/stream.h"
+#include "common/textconsole.h"
 
 #include "graphics/conversion.h"
 
diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp
index d6ec391a84..2cef2b582b 100644
--- a/video/codecs/mjpeg.cpp
+++ b/video/codecs/mjpeg.cpp
@@ -24,10 +24,16 @@
  */
 
 #include "common/system.h"
-#include "graphics/conversion.h" // For YUV2RGB
+#include "common/textconsole.h"
+#include "graphics/jpeg.h"
+#include "graphics/surface.h"
 
 #include "video/codecs/mjpeg.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace Video {
 
 JPEGDecoder::JPEGDecoder() : Codec() {
diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h
index c9f931f091..d1395a8248 100644
--- a/video/codecs/mjpeg.h
+++ b/video/codecs/mjpeg.h
@@ -26,12 +26,18 @@
 #ifndef VIDEO_CODECS_MJPEG_H
 #define VIDEO_CODECS_MJPEG_H
 
-#include "common/scummsys.h"
-
 #include "video/codecs/codec.h"
-#include "graphics/jpeg.h"
 #include "graphics/pixelformat.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace Graphics {
+class JPEG;
+struct Surface;
+}
+
 namespace Video {
 
 // Motion JPEG Decoder
diff --git a/video/codecs/msrle.cpp b/video/codecs/msrle.cpp
index 46158c49d7..48a17d2ac3 100644
--- a/video/codecs/msrle.cpp
+++ b/video/codecs/msrle.cpp
@@ -27,6 +27,7 @@
 
 #include "video/codecs/msrle.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp
index 2075d7f013..e173f45239 100644
--- a/video/codecs/msvideo1.cpp
+++ b/video/codecs/msvideo1.cpp
@@ -27,6 +27,7 @@
 
 #include "video/codecs/msvideo1.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index 61e59c8aba..8126b57a95 100644
--- a/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
@@ -34,8 +34,9 @@
 #include "video/codecs/qdm2data.h"
 
 #include "common/array.h"
+#include "common/debug.h"
 #include "common/stream.h"
-#include "common/system.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp
index 26b2f02ce1..19835aed78 100644
--- a/video/codecs/qtrle.cpp
+++ b/video/codecs/qtrle.cpp
@@ -28,9 +28,11 @@
 
 #include "video/codecs/qtrle.h"
 
+#include "common/debug.h"
 #include "common/scummsys.h"
 #include "common/stream.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
diff --git a/video/codecs/rpza.cpp b/video/codecs/rpza.cpp
index cc9739b673..bfea88b26f 100644
--- a/video/codecs/rpza.cpp
+++ b/video/codecs/rpza.cpp
@@ -27,8 +27,10 @@
 
 #include "video/codecs/rpza.h"
 
+#include "common/debug.h"
 #include "common/system.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 #include "graphics/colormasks.h"
 
 namespace Video {
diff --git a/video/codecs/smc.cpp b/video/codecs/smc.cpp
index d03c60490f..745fdc0260 100644
--- a/video/codecs/smc.cpp
+++ b/video/codecs/smc.cpp
@@ -27,6 +27,7 @@
 
 #include "video/codecs/smc.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp
index a0456869ab..b8273c21a8 100644
--- a/video/codecs/truemotion1.cpp
+++ b/video/codecs/truemotion1.cpp
@@ -32,6 +32,7 @@
 
 #include "video/codecs/truemotion1data.h"
 #include "common/stream.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 0ab12e91cc..609c8d118b 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -24,6 +24,13 @@
  */
 
 #include "common/scummsys.h"
+#include "common/rect.h"
+#include "common/endian.h"
+#include "common/stream.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+#include "common/types.h"
+#include "common/util.h"
 
 #include "video/coktel_decoder.h"
 
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index 8d97fcfd31..46007d55da 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -35,16 +35,27 @@
 
 #include "common/list.h"
 #include "common/array.h"
-#include "common/rect.h"
+#include "common/rational.h"
+#include "common/str.h"
+
+#include "graphics/surface.h"
 
 #include "video/video_decoder.h"
 
 #include "audio/mixer.h"
 
+namespace Common {
+struct Rect;
+class SeekableReadStream;
+}
 namespace Audio {
 class QueuingAudioStream;
 }
 
+namespace Graphics {
+struct PixelFormat;
+}
+
 namespace Video {
 
 class Codec;
diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index a64b8f6fee..3fb0a81acb 100644
--- a/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
@@ -25,10 +25,11 @@
 
 #include "common/debug.h"
 #include "common/endian.h"
-#include "common/archive.h"
 #include "common/system.h"
 #include "common/stream.h"
-#include "common/util.h"
+#include "common/textconsole.h"
+
+#include "graphics/surface.h"
 
 #include "video/dxa_decoder.h"
 
diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h
index 614cb2d90b..498f4630d4 100644
--- a/video/dxa_decoder.h
+++ b/video/dxa_decoder.h
@@ -26,8 +26,18 @@
 #ifndef VIDEO_DXA_DECODER_H
 #define VIDEO_DXA_DECODER_H
 
+#include "common/rational.h"
+#include "graphics/pixelformat.h"
 #include "video/video_decoder.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
 namespace Video {
 
 /**
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 90f7a8e9ac..adceb4565f 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -24,10 +24,11 @@
  */
 
 #include "video/flic_decoder.h"
-#include "common/archive.h"
-#include "common/stream.h"
 #include "common/endian.h"
+#include "common/rect.h"
+#include "common/stream.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 namespace Video {
 
diff --git a/video/flic_decoder.h b/video/flic_decoder.h
index 36f1c9e740..42e7863fc6 100644
--- a/video/flic_decoder.h
+++ b/video/flic_decoder.h
@@ -28,9 +28,12 @@
 
 #include "video/video_decoder.h"
 #include "common/list.h"
-#include "common/rect.h"
+#include "common/rational.h"
+#include "graphics/pixelformat.h"
+#include "graphics/surface.h"
 
 namespace Common {
+struct Rect;
 class SeekableReadStream;
 }
 
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 826b7bfcaf..9e125fe99b 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -39,20 +39,32 @@
 #include "common/memstream.h"
 #include "common/util.h"
 #include "common/zlib.h"
+#include "common/stream.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+#include "common/types.h"
+
+#include "graphics/pixelformat.h"
+#include "graphics/surface.h"
+
+
+#include "audio/audiostream.h"
 
 // Audio codecs
 #include "audio/decoders/adpcm.h"
 #include "audio/decoders/raw.h"
-#include "video/codecs/qdm2.h"
 
 // Video codecs
+#include "video/codecs/codec.h"
 #include "video/codecs/cinepak.h"
 #include "video/codecs/mjpeg.h"
+#include "video/codecs/qdm2.h"
 #include "video/codecs/qtrle.h"
 #include "video/codecs/rpza.h"
 #include "video/codecs/smc.h"
 #include "video/codecs/cdtoons.h"
 
+
 namespace Video {
 
 ////////////////////////////////////////////
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 60262187ac..624134a26a 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -35,22 +35,32 @@
 #define VIDEO_QT_DECODER_H
 
 #include "common/scummsys.h"
-#include "common/queue.h"
 #include "common/rational.h"
 
 #include "video/video_decoder.h"
-#include "video/codecs/codec.h"
 
-#include "audio/audiostream.h"
 #include "audio/mixer.h"
+#include "audio/timestamp.h"
 
 namespace Common {
-class File;
 class MacResManager;
+class SeekableReadStream;
+}
+
+namespace Audio {
+class AudioStream;
+class QueuingAudioStream;
+}
+
+namespace Graphics {
+struct PixelFormat;
+struct Surface;
 }
 
 namespace Video {
 
+class Codec;
+
 /**
  * Decoder for QuickTime videos.
  *
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index 760d0045d9..d25e055235 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -29,11 +29,11 @@
 
 #include "video/smk_decoder.h"
 
-#include "common/archive.h"
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/stream.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
diff --git a/video/smk_decoder.h b/video/smk_decoder.h
index 62ef9a15af..b4eda88203 100644
--- a/video/smk_decoder.h
+++ b/video/smk_decoder.h
@@ -26,6 +26,9 @@
 #ifndef VIDEO_SMK_PLAYER_H
 #define VIDEO_SMK_PLAYER_H
 
+#include "common/rational.h"
+#include "graphics/pixelformat.h"
+#include "graphics/surface.h"
 #include "video/video_decoder.h"
 #include "audio/mixer.h"
 
@@ -33,6 +36,10 @@ namespace Audio {
 class QueuingAudioStream;
 }
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace Video {
 
 class BigHuffmanTree;
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index a6317bac8f..dde2c09082 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -25,9 +25,12 @@
 
 #include "video/video_decoder.h"
 
+#include "common/rational.h"
 #include "common/file.h"
 #include "common/system.h"
 
+#include "graphics/palette.h"
+
 namespace Video {
 
 VideoDecoder::VideoDecoder() {
diff --git a/video/video_decoder.h b/video/video_decoder.h
index d8296b586f..b5574fd3fc 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -26,20 +26,21 @@
 #ifndef VIDEO_DECODER_H
 #define VIDEO_DECODER_H
 
-#include "common/events.h"
-#include "common/list.h"
-#include "common/rational.h"
-
-#include "graphics/surface.h"
-#include "graphics/pixelformat.h"
+#include "common/str.h"
 
 #include "audio/timestamp.h"	// TODO: Move this to common/ ?
 
 
 namespace Common {
+class Rational;
 class SeekableReadStream;
 }
 
+namespace Graphics {
+struct PixelFormat;
+struct Surface;
+}
+
 namespace Video {
 
 /**