13 files changed, 44 insertions, 11 deletions
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 {