GRAPHICS: Move graphics/video/ to video/. Step 2/2

svn-id: r55474

42 files changed, 107 insertions, 107 deletions

diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 4796d39097..64a712682d 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -28,9 +28,9 @@
 #ifndef SWORD2_ANIMATION_H
 #define SWORD2_ANIMATION_H
 
-#include "graphics/video/dxa_decoder.h"
-#include "graphics/video/smk_decoder.h"
-#include "graphics/video/video_decoder.h"
+#include "video/dxa_decoder.h"
+#include "video/smk_decoder.h"
+#include "video/video_decoder.h"
 #include "sound/mixer.h"
 
 #include "sword2/screen.h"
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index ed0b063147..73edfca052 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -31,18 +31,18 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
-#include "graphics/video/avi_decoder.h"
+#include "video/avi_decoder.h"
 
 // Audio Codecs
 #include "sound/decoders/adpcm.h"
 #include "sound/decoders/raw.h"
 
 // Video Codecs
-#include "graphics/video/codecs/cinepak.h"
-#include "graphics/video/codecs/indeo3.h"
-#include "graphics/video/codecs/msvideo1.h"
-#include "graphics/video/codecs/msrle.h"
-#include "graphics/video/codecs/truemotion1.h"
+#include "video/codecs/cinepak.h"
+#include "video/codecs/indeo3.h"
+#include "video/codecs/msvideo1.h"
+#include "video/codecs/msrle.h"
+#include "video/codecs/truemotion1.h"
 
 namespace Graphics {
 
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 9f9f5ed617..a89b378c10 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_AVI_PLAYER_H
-#define GRAPHICS_AVI_PLAYER_H
+#ifndef VIDEO_AVI_PLAYER_H
+#define VIDEO_AVI_PLAYER_H
 
-#include "graphics/video/video_decoder.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/video_decoder.h"
+#include "video/codecs/codec.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
diff --git a/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp
index c3d00d8702..cd43f744e6 100644
--- a/video/codecs/cdtoons.cpp
+++ b/video/codecs/cdtoons.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/codecs/cdtoons.h"
+#include "video/codecs/cdtoons.h"
 #include "common/stream.h"
 
 #include "common/system.h"
diff --git a/video/codecs/cdtoons.h b/video/codecs/cdtoons.h
index 3695302fec..bb6fefa5de 100644
--- a/video/codecs/cdtoons.h
+++ b/video/codecs/cdtoons.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_CDTOONS_H
-#define GRAPHICS_VIDEO_CDTOONS_H
+#ifndef VIDEO_CODECS_CDTOONS_H
+#define VIDEO_CODECS_CDTOONS_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 #include "common/hashmap.h"
 
diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp
index 3264810908..27be2d05ff 100644
--- a/video/codecs/cinepak.cpp
+++ b/video/codecs/cinepak.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/codecs/cinepak.h"
+#include "video/codecs/cinepak.h"
 
 #include "common/system.h"
 
diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h
index b1daece1f3..c200c75e8c 100644
--- a/video/codecs/cinepak.h
+++ b/video/codecs/cinepak.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_CINEPAK_H
-#define GRAPHICS_CINEPAK_H
+#ifndef VIDEO_CODECS_CINEPAK_H
+#define VIDEO_CODECS_CINEPAK_H
 
 #include "common/scummsys.h"
 #include "common/stream.h"
@@ -32,7 +32,7 @@
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/codec.h b/video/codecs/codec.h
index 4fa1a041a2..380f087d40 100644
--- a/video/codecs/codec.h
+++ b/video/codecs/codec.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_CODEC_H
-#define GRAPHICS_CODEC_H
+#ifndef VIDEO_CODECS_CODEC_H
+#define VIDEO_CODECS_CODEC_H
 
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp
index a19764dc11..8fa4a2d530 100644
--- a/video/codecs/indeo3.cpp
+++ b/video/codecs/indeo3.cpp
@@ -40,7 +40,7 @@
 
 #include "graphics/conversion.h"
 
-#include "graphics/video/codecs/indeo3.h"
+#include "video/codecs/indeo3.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/indeo3.h b/video/codecs/indeo3.h
index d074facea2..1e5d45f742 100644
--- a/video/codecs/indeo3.h
+++ b/video/codecs/indeo3.h
@@ -34,10 +34,10 @@
  * written, produced, and directed by Alan Smithee
  */
 
-#ifndef GRAPHICS_INDEO3_H
-#define GRAPHICS_INDEO3_H
+#ifndef VIDEO_CODECS_INDEO3_H
+#define VIDEO_CODECS_INDEO3_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
@@ -89,6 +89,6 @@ private:
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_INDEO3_H
+#endif // VIDEO_CODECS_INDEO3_H
 
 #endif // USE_INDEO3
diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp
index dc8eb4a58b..5f41699e10 100644
--- a/video/codecs/mjpeg.cpp
+++ b/video/codecs/mjpeg.cpp
@@ -26,7 +26,7 @@
 #include "common/system.h"
 #include "graphics/conversion.h" // For YUV2RGB
 
-#include "graphics/video/codecs/mjpeg.h"
+#include "video/codecs/mjpeg.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h
index daa8b12dbb..da3719ea84 100644
--- a/video/codecs/mjpeg.h
+++ b/video/codecs/mjpeg.h
@@ -23,12 +23,12 @@
  *
  */
 
-#ifndef GRAPHICS_MJPEG_H
-#define GRAPHICS_MJPEG_H
+#ifndef VIDEO_CODECS_MJPEG_H
+#define VIDEO_CODECS_MJPEG_H
 
 #include "common/scummsys.h"
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 #include "graphics/jpeg.h"
 #include "graphics/pixelformat.h"
 
diff --git a/video/codecs/msrle.cpp b/video/codecs/msrle.cpp
index a3929fc1fd..556f0ee670 100644
--- a/video/codecs/msrle.cpp
+++ b/video/codecs/msrle.cpp
@@ -25,7 +25,7 @@
 
 // Based off ffmpeg's msrledec.c
 
-#include "graphics/video/codecs/msrle.h"
+#include "video/codecs/msrle.h"
 #include "common/stream.h"
 
 namespace Graphics {
diff --git a/video/codecs/msrle.h b/video/codecs/msrle.h
index 02b9199e4e..e710c25ae8 100644
--- a/video/codecs/msrle.h
+++ b/video/codecs/msrle.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_MSRLE_H
-#define GRAPHICS_MSRLE_H
+#ifndef VIDEO_CODECS_MSRLE_H
+#define VIDEO_CODECS_MSRLE_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp
index 176efc037f..94537e1f9f 100644
--- a/video/codecs/msvideo1.cpp
+++ b/video/codecs/msvideo1.cpp
@@ -25,7 +25,7 @@
 
  // Based off ffmpeg's msvideo.cpp
 
-#include "graphics/video/codecs/msvideo1.h"
+#include "video/codecs/msvideo1.h"
 #include "common/stream.h"
 
 namespace Graphics {
diff --git a/video/codecs/msvideo1.h b/video/codecs/msvideo1.h
index 1b908a6243..8dadf311fe 100644
--- a/video/codecs/msvideo1.h
+++ b/video/codecs/msvideo1.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_MSVIDEO1_H
-#define GRAPHICS_MSVIDEO1_H
+#ifndef VIDEO_CODECS_MSVIDEO1_H
+#define VIDEO_CODECS_MSVIDEO1_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index e34c569feb..6721788d8c 100644
--- a/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
@@ -26,12 +26,12 @@
 // Based off ffmpeg's QDM2 decoder
 
 #include "common/scummsys.h"
-#include "graphics/video/codecs/qdm2.h"
+#include "video/codecs/qdm2.h"
 
 #ifdef GRAPHICS_QDM2_H
 
 #include "sound/audiostream.h"
-#include "graphics/video/codecs/qdm2data.h"
+#include "video/codecs/qdm2data.h"
 
 #include "common/array.h"
 #include "common/stream.h"
diff --git a/video/codecs/qdm2.h b/video/codecs/qdm2.h
index 9eb566d04d..98e0fa54b6 100644
--- a/video/codecs/qdm2.h
+++ b/video/codecs/qdm2.h
@@ -26,8 +26,8 @@
 // Only compile if Mohawk is enabled or if we're building dynamic modules
 #if defined(ENABLE_MOHAWK) || defined(DYNAMIC_MODULES)
 
-#ifndef GRAPHICS_QDM2_H
-#define GRAPHICS_QDM2_H
+#ifndef VIDEO_CODECS_QDM2_H
+#define VIDEO_CODECS_QDM2_H
 
 namespace Common {
 	class SeekableReadStream;
@@ -50,5 +50,5 @@ Audio::AudioStream *makeQDM2Stream(Common::SeekableReadStream *stream, Common::S
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_QDM2_H
+#endif // VIDEO_CODECS_QDM2_H
 #endif // Mohawk/Plugins guard
diff --git a/video/codecs/qdm2data.h b/video/codecs/qdm2data.h
index 25ed102c4e..17d3948eb1 100644
--- a/video/codecs/qdm2data.h
+++ b/video/codecs/qdm2data.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_QDM2DATA_H
-#define GRAPHICS_QDM2DATA_H
+#ifndef VIDEO_CODECS_QDM2DATA_H
+#define VIDEO_CODECS_QDM2DATA_H
 
 #include "common/scummsys.h"
 
diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp
index 380b89903c..1dcc94e417 100644
--- a/video/codecs/qtrle.cpp
+++ b/video/codecs/qtrle.cpp
@@ -26,7 +26,7 @@
 // QuickTime RLE Decoder
 // Based off ffmpeg's QuickTime RLE decoder (written by Mike Melanson)
 
-#include "graphics/video/codecs/qtrle.h"
+#include "video/codecs/qtrle.h"
 
 #include "common/scummsys.h"
 #include "common/stream.h"
diff --git a/video/codecs/qtrle.h b/video/codecs/qtrle.h
index f0d2587f30..d40404ecb7 100644
--- a/video/codecs/qtrle.h
+++ b/video/codecs/qtrle.h
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_QTRLE_H
-#define GRAPHICS_VIDEO_QTRLE_H
+#ifndef VIDEO_CODECS_QTRLE_H
+#define VIDEO_CODECS_QTRLE_H
 
 #include "graphics/pixelformat.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/rpza.cpp b/video/codecs/rpza.cpp
index 6869eaca7d..95cffb4015 100644
--- a/video/codecs/rpza.cpp
+++ b/video/codecs/rpza.cpp
@@ -25,7 +25,7 @@
 
  // Based off ffmpeg's RPZA decoder
 
-#include "graphics/video/codecs/rpza.h"
+#include "video/codecs/rpza.h"
 
 #include "common/system.h"
 #include "common/stream.h"
diff --git a/video/codecs/rpza.h b/video/codecs/rpza.h
index 8be9088bc3..bc82465a1e 100644
--- a/video/codecs/rpza.h
+++ b/video/codecs/rpza.h
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_RPZA_H
-#define GRAPHICS_VIDEO_RPZA_H
+#ifndef VIDEO_CODECS_RPZA_H
+#define VIDEO_CODECS_RPZA_H
 
 #include "graphics/pixelformat.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/smc.cpp b/video/codecs/smc.cpp
index 1b92d3bf85..017fe04ab6 100644
--- a/video/codecs/smc.cpp
+++ b/video/codecs/smc.cpp
@@ -25,7 +25,7 @@
 
 // Based off ffmpeg's SMC decoder
 
-#include "graphics/video/codecs/smc.h"
+#include "video/codecs/smc.h"
 #include "common/stream.h"
 
 namespace Graphics {
diff --git a/video/codecs/smc.h b/video/codecs/smc.h
index 158cffbce8..35fd76f76b 100644
--- a/video/codecs/smc.h
+++ b/video/codecs/smc.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_SMC_H
-#define GRAPHICS_VIDEO_SMC_H
+#ifndef VIDEO_CODECS_SMC_H
+#define VIDEO_CODECS_SMC_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp
index 6ea766ffe1..e9a790924e 100644
--- a/video/codecs/truemotion1.cpp
+++ b/video/codecs/truemotion1.cpp
@@ -26,11 +26,11 @@
 // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg
 
 #include "common/scummsys.h"
-#include "graphics/video/codecs/truemotion1.h"
+#include "video/codecs/truemotion1.h"
 
-#ifdef GRAPHICS_TRUEMOTION1_H
+#ifdef VIDEO_CODECS_TRUEMOTION1_H
 
-#include "graphics/video/codecs/truemotion1data.h"
+#include "video/codecs/truemotion1data.h"
 #include "common/stream.h"
 
 namespace Graphics {
diff --git a/video/codecs/truemotion1.h b/video/codecs/truemotion1.h
index ab8fb221f8..c80598afdc 100644
--- a/video/codecs/truemotion1.h
+++ b/video/codecs/truemotion1.h
@@ -28,10 +28,10 @@
 // Only compile if SCI32 is enabled or if we're building dynamic modules
 #if defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES)
 
-#ifndef GRAPHICS_TRUEMOTION1_H
-#define GRAPHICS_TRUEMOTION1_H
+#ifndef VIDEO_CODECS_TRUEMOTION1_H
+#define VIDEO_CODECS_TRUEMOTION1_H
  
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
@@ -102,5 +102,5 @@ private:
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_TRUEMOTION1_H
+#endif // VIDEO_CODECS_TRUEMOTION1_H
 #endif // SCI32/Plugins guard
diff --git a/video/codecs/truemotion1data.h b/video/codecs/truemotion1data.h
index ce01178fd4..8199135a29 100644
--- a/video/codecs/truemotion1data.h
+++ b/video/codecs/truemotion1data.h
@@ -26,8 +26,8 @@
 // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg
 // These tables were originally part of VpVision from On2
 
-#ifndef GRAPHICS_TRUEMOTION1DATA_H
-#define GRAPHICS_TRUEMOTION1DATA_H
+#ifndef VIDEO_CODECS_TRUEMOTION1DATA_H
+#define VIDEO_CODECS_TRUEMOTION1DATA_H
 
 #include "common/scummsys.h"
 
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index fdb244ddf2..1cb94498c3 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -25,12 +25,12 @@
 
 #include "common/scummsys.h"
 
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
 
-#include "graphics/video/codecs/codec.h"
-#include "graphics/video/codecs/indeo3.h"
+#include "video/codecs/codec.h"
+#include "video/codecs/indeo3.h"
 
-#ifdef GRAPHICS_VIDEO_COKTELDECODER_H
+#ifdef VIDEO_COKTELDECODER_H
 
 #include "sound/audiostream.h"
 #include "sound/decoders/raw.h"
@@ -2754,4 +2754,4 @@ bool VMDDecoder::isPaletted() const {
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_VIDEO_COKTELDECODER_H
+#endif // VIDEO_COKTELDECODER_H
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index e0c91533a3..1b043d9dd2 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -30,14 +30,14 @@
 
 #else
 
-#ifndef GRAPHICS_VIDEO_COKTELDECODER_H
-#define GRAPHICS_VIDEO_COKTELDECODER_H
+#ifndef VIDEO_COKTELDECODER_H
+#define VIDEO_COKTELDECODER_H
 
 #include "common/list.h"
 #include "common/array.h"
 #include "common/rect.h"
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 #include "sound/mixer.h"
 
@@ -515,6 +515,6 @@ private:
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_VIDEO_COKTELDECODER_H
+#endif // VIDEO_COKTELDECODER_H
 
 #endif // Engine and dynamic plugins guard
diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index 3c52c0fc58..7e468371d0 100644
--- a/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
@@ -30,7 +30,7 @@
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "graphics/video/dxa_decoder.h"
+#include "video/dxa_decoder.h"
 
 #ifdef USE_ZLIB
   #include "common/zlib.h"
diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h
index a9a656e46d..e2fa97a7db 100644
--- a/video/dxa_decoder.h
+++ b/video/dxa_decoder.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_DXA_PLAYER_H
-#define GRAPHICS_VIDEO_DXA_PLAYER_H
+#ifndef VIDEO_DXA_DECODER_H
+#define VIDEO_DXA_DECODER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 namespace Graphics {
 
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 51c487861e..34b667234a 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/flic_decoder.h"
+#include "video/flic_decoder.h"
 #include "common/archive.h"
 #include "common/stream.h"
 #include "common/endian.h"
diff --git a/video/flic_decoder.h b/video/flic_decoder.h
index e403ff212a..37068c2fb3 100644
--- a/video/flic_decoder.h
+++ b/video/flic_decoder.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_FLICDECODER_H
-#define GRAPHICS_VIDEO_FLICDECODER_H
+#ifndef VIDEO_FLICDECODER_H
+#define VIDEO_FLICDECODER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 #include "common/list.h"
 #include "common/rect.h"
 
diff --git a/video/mpeg_player.cpp b/video/mpeg_player.cpp
index ea1fa4ec1c..74f097500d 100644
--- a/video/mpeg_player.cpp
+++ b/video/mpeg_player.cpp
@@ -86,7 +86,7 @@
 // BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
 // SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-#include "graphics/video/mpeg_player.h"
+#include "video/mpeg_player.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/util.h"
diff --git a/video/mpeg_player.h b/video/mpeg_player.h
index 4dedf12f57..d6890f78b6 100644
--- a/video/mpeg_player.h
+++ b/video/mpeg_player.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_MPEG_PLAYER_H
-#define GRAPHICS_VIDEO_MPEG_PLAYER_H
+#ifndef VIDEO_MPEG_PLAYER_H
+#define VIDEO_MPEG_PLAYER_H
 
 #include "common/scummsys.h"
 #include "graphics/pixelformat.h"
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 9329966652..77752cc47f 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -31,7 +31,7 @@
 // Seek function by Gael Chardon gael.dev@4now.net
 //
 
-#include "graphics/video/qt_decoder.h"
+#include "video/qt_decoder.h"
 
 #include "common/debug.h"
 #include "common/endian.h"
@@ -43,15 +43,15 @@
 // Audio codecs
 #include "sound/decoders/adpcm.h"
 #include "sound/decoders/raw.h"
-#include "graphics/video/codecs/qdm2.h"
+#include "video/codecs/qdm2.h"
 
 // Video codecs
-#include "graphics/video/codecs/cinepak.h"
-#include "graphics/video/codecs/mjpeg.h"
-#include "graphics/video/codecs/qtrle.h"
-#include "graphics/video/codecs/rpza.h"
-#include "graphics/video/codecs/smc.h"
-#include "graphics/video/codecs/cdtoons.h"
+#include "video/codecs/cinepak.h"
+#include "video/codecs/mjpeg.h"
+#include "video/codecs/qtrle.h"
+#include "video/codecs/rpza.h"
+#include "video/codecs/smc.h"
+#include "video/codecs/cdtoons.h"
 
 namespace Graphics {
 
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 186e257553..ed6634e38c 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -31,15 +31,15 @@
 // Seek function by Gael Chardon gael.dev@4now.net
 //
 
-#ifndef GRAPHICS_QT_DECODER_H
-#define GRAPHICS_QT_DECODER_H
+#ifndef VIDEO_QT_DECODER_H
+#define VIDEO_QT_DECODER_H
 
 #include "common/scummsys.h"
 #include "common/queue.h"
 #include "common/rational.h"
 
-#include "graphics/video/video_decoder.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/video_decoder.h"
+#include "video/codecs/codec.h"
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index e4d577acd2..8052df61fc 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -27,7 +27,7 @@
 // and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
 // http://git.ffmpeg.org/?p=ffmpeg;a=blob;f=libavcodec/smacker.c;hb=b8437a00a2f14d4a437346455d624241d726128e
 
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
 
 #include "common/archive.h"
 #include "common/endian.h"
diff --git a/video/smk_decoder.h b/video/smk_decoder.h
index b441d1d64d..cb73810df9 100644
--- a/video/smk_decoder.h
+++ b/video/smk_decoder.h
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_SMK_PLAYER_H
-#define GRAPHICS_VIDEO_SMK_PLAYER_H
+#ifndef VIDEO_SMK_PLAYER_H
+#define VIDEO_SMK_PLAYER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 #include "sound/mixer.h"
 
 namespace Audio {
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 81a8aecb30..94e31b6323 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 #include "common/file.h"
 #include "common/system.h"
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 402bcfe751..5d07753809 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_DECODER_H
-#define GRAPHICS_VIDEO_DECODER_H
+#ifndef VIDEO_DECODER_H
+#define VIDEO_DECODER_H
 
 #include "common/events.h"
 #include "common/list.h"