5 files changed, 34 insertions, 34 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 5c6d3113da..5c6cfc96ce 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,35 +17,35 @@
  */
 
 #include "config.h"
-#include "options.h"
+#include "core/options.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "mp_msg.h"
+#include "core/mp_msg.h"
 
 #include "osdep/timer.h"
 #include "osdep/shmem.h"
 
 #include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
+#include "demux/demux.h"
 
-#include "codec-cfg.h"
+#include "core/codec-cfg.h"
 
-#include "libvo/video_out.h"
-#include "libvo/csputils.h"
+#include "video/out/vo.h"
+#include "video/csputils.h"
 
-#include "libmpdemux/stheader.h"
-#include "vd.h"
-#include "vf.h"
+#include "demux/stheader.h"
+#include "video/decode/vd.h"
+#include "video/filter/vf.h"
 
-#include "dec_video.h"
+#include "video/decode/dec_video.h"
 
 // ===================================================================
 
-#include "cpudetect.h"
+#include "core/cpudetect.h"
 
 int field_dominance = -1;
 
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index f871198988..9eb90a5d5a 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_DEC_VIDEO_H
 #define MPLAYER_DEC_VIDEO_H
 
-#include "libmpdemux/stheader.h"
+#include "demux/stheader.h"
 
 struct osd_state;
 
diff --git a/video/decode/vd.c b/video/decode/vd.c
index 3bfc17c895..31b40e46da 100644
--- a/video/decode/vd.c
+++ b/video/decode/vd.c
@@ -21,21 +21,21 @@
 #include <string.h>
 
 #include "config.h"
-#include "mp_msg.h"
-#include "options.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
 
-#include "codec-cfg.h"
+#include "core/codec-cfg.h"
 
-#include "img_format.h"
+#include "video/img_format.h"
 
 #include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
+#include "demux/demux.h"
+#include "demux/stheader.h"
 #include "dec_video.h"
 
 #include "vd.h"
-#include "vf.h"
-#include "libvo/video_out.h"
+#include "video/filter/vf.h"
+#include "video/out/vo.h"
 
 extern const vd_functions_t mpcodecs_vd_ffmpeg;
 
diff --git a/video/decode/vd.h b/video/decode/vd.h
index 6b9803a611..2495a22dc3 100644
--- a/video/decode/vd.h
+++ b/video/decode/vd.h
@@ -19,9 +19,9 @@
 #ifndef MPLAYER_VD_H
 #define MPLAYER_VD_H
 
-#include "mp_image.h"
-#include "mpc_info.h"
-#include "libmpdemux/stheader.h"
+#include "video/mp_image.h"
+#include "core/mpc_info.h"
+#include "demux/stheader.h"
 
 typedef struct mp_codec_info vd_info_t;
 
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index e078de4419..929c6c77f3 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -29,20 +29,20 @@
 
 #include "talloc.h"
 #include "config.h"
-#include "mp_msg.h"
-#include "options.h"
-#include "av_opts.h"
+#include "core/mp_msg.h"
+#include "core/options.h"
+#include "core/av_opts.h"
 
-#include "mpbswap.h"
-#include "fmt-conversion.h"
+#include "compat/mpbswap.h"
+#include "video/fmt-conversion.h"
 
 #include "vd.h"
-#include "img_format.h"
-#include "libmpdemux/stheader.h"
-#include "libmpdemux/demux_packet.h"
-#include "codec-cfg.h"
+#include "video/img_format.h"
+#include "demux/stheader.h"
+#include "demux/demux_packet.h"
+#include "core/codec-cfg.h"
 #include "osdep/numcores.h"
-#include "libvo/csputils.h"
+#include "video/csputils.h"
 
 static const vd_info_t info = {
     "libavcodec video codecs",
@@ -76,7 +76,7 @@ typedef struct {
     enum AVDiscard skip_frame;
 } vd_ffmpeg_ctx;
 
-#include "m_option.h"
+#include "core/m_option.h"
 
 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
 static void release_buffer(AVCodecContext *avctx, AVFrame *pic);