summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--audio/filter/af.c4
-rw-r--r--audio/filter/af.h2
-rw-r--r--audio/filter/af_bs2b.c2
-rw-r--r--audio/filter/af_export.c2
-rw-r--r--audio/filter/af_format.c2
-rw-r--r--audio/filter/af_lavfi.c2
-rw-r--r--audio/filter/af_lavrresample.c2
-rw-r--r--audio/filter/af_scaletempo.c2
-rw-r--r--audio/out/ao.c4
-rw-r--r--audio/out/ao_alsa.c4
-rw-r--r--audio/out/ao_coreaudio.c2
-rw-r--r--audio/out/ao_dsound.c2
-rw-r--r--audio/out/ao_jack.c2
-rw-r--r--audio/out/ao_lavc.c2
-rw-r--r--audio/out/ao_null.c2
-rw-r--r--audio/out/ao_openal.c2
-rw-r--r--audio/out/ao_oss.c2
-rw-r--r--audio/out/ao_pcm.c2
-rw-r--r--audio/out/ao_portaudio.c2
-rw-r--r--audio/out/ao_rsound.c2
-rw-r--r--audio/out/ao_sdl.c2
-rw-r--r--audio/out/ao_sndio.c2
-rw-r--r--audio/out/ao_wasapi.c2
-rw-r--r--demux/demux.c2
-rw-r--r--demux/demux_lavf.c4
-rw-r--r--demux/demux_libass.c2
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--demux/demux_playlist.c4
-rw-r--r--demux/demux_raw.c2
-rw-r--r--demux/demux_subreader.c2
-rw-r--r--demux/mf.c2
-rw-r--r--input/input.c7
-rw-r--r--input/input.h2
-rw-r--r--mpvcore/encode_lavc.c2
-rw-r--r--mpvcore/playlist.c2
-rw-r--r--mpvcore/playlist_parser.c3
-rw-r--r--old-makefile14
-rw-r--r--options/m_config.c (renamed from mpvcore/m_config.c)2
-rw-r--r--options/m_config.h (renamed from mpvcore/m_config.h)0
-rw-r--r--options/m_option.c (renamed from mpvcore/m_option.c)4
-rw-r--r--options/m_option.h (renamed from mpvcore/m_option.h)0
-rw-r--r--options/m_property.c (renamed from mpvcore/m_property.c)2
-rw-r--r--options/m_property.h (renamed from mpvcore/m_property.h)0
-rw-r--r--options/options.c (renamed from mpvcore/options.c)6
-rw-r--r--options/options.h (renamed from mpvcore/options.h)2
-rw-r--r--options/parse_commandline.c (renamed from mpvcore/parser-mpcmd.c)8
-rw-r--r--options/parse_commandline.h (renamed from mpvcore/parser-mpcmd.h)0
-rw-r--r--options/parse_configfile.c (renamed from mpvcore/parser-cfg.c)4
-rw-r--r--options/parse_configfile.h (renamed from mpvcore/parser-cfg.h)0
-rw-r--r--options/path.c (renamed from mpvcore/path.c)2
-rw-r--r--options/path.h (renamed from mpvcore/path.h)0
-rw-r--r--osdep/path-win.c2
-rw-r--r--player/audio.c2
-rw-r--r--player/command.c8
-rw-r--r--player/configfiles.c10
-rw-r--r--player/core.h2
-rw-r--r--player/loadfile.c10
-rw-r--r--player/lua.c6
-rw-r--r--player/main.c12
-rw-r--r--player/misc.c4
-rw-r--r--player/osd.c4
-rw-r--r--player/playloop.c4
-rw-r--r--player/screenshot.c2
-rw-r--r--player/sub.c2
-rw-r--r--player/timeline/tl_cue.c2
-rw-r--r--player/timeline/tl_matroska.c2
-rw-r--r--player/timeline/tl_mpv_edl.c2
-rw-r--r--player/video.c4
-rw-r--r--stream/cookies.c2
-rw-r--r--stream/resolve/resolve_quvi.c2
-rw-r--r--stream/resolve/resolve_quvi9.c2
-rw-r--r--stream/stream.c6
-rw-r--r--stream/stream_bluray.c2
-rw-r--r--stream/stream_cdda.c2
-rw-r--r--stream/stream_dvb.c4
-rw-r--r--stream/stream_dvd.c2
-rw-r--r--stream/stream_dvd.h2
-rw-r--r--stream/stream_dvdnav.c4
-rw-r--r--stream/stream_file.c2
-rw-r--r--stream/stream_lavf.c4
-rw-r--r--stream/stream_radio.c2
-rw-r--r--stream/stream_rar.c2
-rw-r--r--stream/stream_smb.c2
-rw-r--r--stream/stream_tv.c2
-rw-r--r--stream/stream_vcd.c2
-rw-r--r--sub/ass_mp.c4
-rw-r--r--sub/dec_sub.c2
-rw-r--r--sub/find_subfiles.c4
-rw-r--r--sub/osd.c2
-rw-r--r--sub/osd.h2
-rw-r--r--sub/osd_libass.c2
-rw-r--r--sub/sd_ass.c2
-rw-r--r--sub/sd_lavc.c2
-rw-r--r--sub/sd_spu.c2
-rw-r--r--video/decode/dec_video.c2
-rw-r--r--video/decode/vd_lavc.c4
-rw-r--r--video/filter/vf.c6
-rw-r--r--video/filter/vf_crop.c4
-rw-r--r--video/filter/vf_delogo.c2
-rw-r--r--video/filter/vf_divtc.c2
-rw-r--r--video/filter/vf_dlopen.c2
-rw-r--r--video/filter/vf_dsize.c2
-rw-r--r--video/filter/vf_eq.c2
-rw-r--r--video/filter/vf_expand.c4
-rw-r--r--video/filter/vf_format.c2
-rw-r--r--video/filter/vf_gradfun.c2
-rw-r--r--video/filter/vf_hqdn3d.c2
-rw-r--r--video/filter/vf_ilpack.c2
-rw-r--r--video/filter/vf_lavfi.c2
-rw-r--r--video/filter/vf_lavfi.h2
-rw-r--r--video/filter/vf_noformat.c2
-rw-r--r--video/filter/vf_noise.c2
-rw-r--r--video/filter/vf_phase.c2
-rw-r--r--video/filter/vf_pp.c2
-rw-r--r--video/filter/vf_pullup.c2
-rw-r--r--video/filter/vf_rotate.c2
-rw-r--r--video/filter/vf_scale.c4
-rw-r--r--video/filter/vf_stereo3d.c4
-rw-r--r--video/filter/vf_sub.c4
-rw-r--r--video/filter/vf_unsharp.c2
-rw-r--r--video/filter/vf_vavpp.c2
-rw-r--r--video/filter/vf_yadif.c2
-rw-r--r--video/image_writer.c2
-rw-r--r--video/out/aspect.c2
-rw-r--r--video/out/gl_common.c4
-rw-r--r--video/out/gl_lcms.c4
-rw-r--r--video/out/vo.c4
-rw-r--r--video/out/vo.h2
-rw-r--r--video/out/vo_corevideo.c2
-rw-r--r--video/out/vo_direct3d.c4
-rw-r--r--video/out/vo_image.c4
-rw-r--r--video/out/vo_lavc.c2
-rw-r--r--video/out/vo_opengl.c2
-rw-r--r--video/out/vo_opengl_old.c2
-rw-r--r--video/out/vo_sdl.c2
-rw-r--r--video/out/vo_vdpau.c4
-rw-r--r--video/out/vo_x11.c2
-rw-r--r--video/out/vo_xv.c4
-rw-r--r--video/out/w32_common.c2
-rw-r--r--video/out/wayland_common.c2
-rw-r--r--video/out/x11_common.c2
-rw-r--r--wscript_build.py16
144 files changed, 210 insertions, 210 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index f972bc581f..8b2c2d1727 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -32,7 +32,7 @@
#include "mpvcore/av_common.h"
#include "mpvcore/codecs.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/av_opts.h"
#include "ad.h"
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index 8c3c7c3ea7..fdc12772b8 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -28,7 +28,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/av_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "ad.h"
#define OUTBUF_SIZE 65536
diff --git a/audio/filter/af.c b/audio/filter/af.c
index e2f712d09e..dfe1666e0a 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -22,8 +22,8 @@
#include <string.h>
#include <assert.h>
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
#include "af.h"
diff --git a/audio/filter/af.h b/audio/filter/af.h
index fb7f2b3b1d..260d4dae7e 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -25,7 +25,7 @@
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "audio/format.h"
#include "audio/chmap.h"
#include "audio/audio.h"
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index aaada29a74..48df9197dc 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
/// Internal specific data of the filter
struct af_bs2b {
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index d39154755b..bbea56cab9 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -43,7 +43,7 @@
#include "talloc.h"
#include "af.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#define DEF_SZ 512 // default buffer size (in samples)
#define SHARED_FILE "mpv-af_export" /* default file name
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 552587b56e..17af1c43c9 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -19,7 +19,7 @@
#include <libavutil/common.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "af.h"
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index ab5b8d5495..e764d4fae8 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -38,7 +38,7 @@
#include "audio/fmt-conversion.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 7386c27fa6..65d380e873 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -55,7 +55,7 @@
#endif
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#include "audio/filter/af.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index 960aaf8c2e..c54fe44e36 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -39,7 +39,7 @@
#include "mpvcore/mp_common.h"
#include "af.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// Data for specific instances of this filter
typedef struct af_scaletempo_s
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 9c09730ec8..6434949cd9 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -27,8 +27,8 @@
#include "ao.h"
#include "audio/format.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_config.h"
+#include "options/options.h"
+#include "options/m_config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index b8de922cb9..372b490e9f 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -36,8 +36,8 @@
#include <string.h>
#include "config.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index d61ce63d01..2fb7976c67 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -39,7 +39,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_ring.h"
#include "mpvcore/mp_msg.h"
#include "audio/out/ao_coreaudio_properties.h"
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index ec5e83bd50..1ace4093b4 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -41,7 +41,7 @@
#include "audio/reorder_ch.h"
#include "mpvcore/mp_msg.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
/**
\todo use the definitions from the win32 api headers when they define these
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 8a55a54239..8c54796e2b 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -34,7 +34,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_ring.h"
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 3b1bb20de6..713b952229 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -30,7 +30,7 @@
#include "compat/libav.h"
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "audio/format.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 14ff16b5d7..282511ae40 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -30,7 +30,7 @@
#include "config.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#include "audio/format.h"
#include "ao.h"
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index c126852389..c6c2e9e8b8 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -40,7 +40,7 @@
#include "ao.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#define MAX_CHANS MP_NUM_CHANNELS
#define NUM_BUF 128
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index 3f37b34b60..9ff7d1a165 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -35,7 +35,7 @@
#include <string.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#if HAVE_SYS_SOUNDCARD_H
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 1d88fc6665..2a086c549f 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -30,7 +30,7 @@
#include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "audio/reorder_ch.h"
#include "ao.h"
diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c
index fad1dc12d8..6e3d9680fd 100644
--- a/audio/out/ao_portaudio.c
+++ b/audio/out/ao_portaudio.c
@@ -26,7 +26,7 @@
#include <portaudio.h>
#include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "audio/format.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_ring.h"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 4340deccba..6bd99030a1 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -29,7 +29,7 @@
#include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#include "audio/format.h"
#include "ao.h"
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index c2b1c9d947..dd2fb894be 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -24,7 +24,7 @@
#include "talloc.h"
#include "ao.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#include <libavutil/fifo.h>
diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c
index cfe0616943..6cf08cd095 100644
--- a/audio/out/ao_sndio.c
+++ b/audio/out/ao_sndio.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <sndio.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#include "audio/format.h"
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index f1032f1c36..b2ac1f2343 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -30,7 +30,7 @@
#include <avrt.h>
#include "config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/m_config.h"
#include "audio/format.h"
#include "mpvcore/mp_msg.h"
diff --git a/demux/demux.c b/demux/demux.c
index 7ae9328e3b..626804fcef 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -29,7 +29,7 @@
#include <sys/stat.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/av_common.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 4accb6d8fb..c541f345e1 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -35,7 +35,7 @@
#include "compat/libav.h"
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/av_opts.h"
#include "mpvcore/av_common.h"
@@ -44,7 +44,7 @@
#include "stream/stream.h"
#include "demux.h"
#include "stheader.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
#define PROBE_BUF_SIZE FFMIN(STREAM_MAX_BUFFER_SIZE, 2 * 1024 * 1024)
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index f304757ae3..15e149212b 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -21,7 +21,7 @@
#include <ass/ass.h>
#include <ass/ass_types.h>
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/charset_conv.h"
#include "stream/stream.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 94af8bf6b9..b3cf253be5 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -42,7 +42,7 @@
#endif
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "stream/stream.h"
#include "demux.h"
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index dc42c2ea1f..1a4882f92b 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -16,10 +16,10 @@
*/
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/playlist.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "stream/stream.h"
#include "demux.h"
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index ecabd2e714..12fa1741a8 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <string.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "stream/stream.h"
#include "demux.h"
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 21bcf21614..a3cee1794b 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -34,7 +34,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "stream/stream.h"
#include "demux/demux.h"
diff --git a/demux/mf.c b/demux/mf.c
index 443e2e411b..7b5b7aee3e 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -39,7 +39,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "stream/stream.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "mpvcore/mp_talloc.h"
#include "mf.h"
diff --git a/input/input.c b/input/input.c
index c7b27240c7..4d2c873211 100644
--- a/input/input.c
+++ b/input/input.c
@@ -43,11 +43,10 @@
#include "osdep/timer.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "stream/stream.h"
#include "mpvcore/mp_common.h"
diff --git a/input/input.h b/input/input.h
index 1698c9cf9f..43c5742cf6 100644
--- a/input/input.h
+++ b/input/input.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
#include "mpvcore/bstr.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// All command IDs
enum mp_command_type {
diff --git a/mpvcore/encode_lavc.c b/mpvcore/encode_lavc.c
index d2017a7f37..0ea4be486a 100644
--- a/mpvcore/encode_lavc.c
+++ b/mpvcore/encode_lavc.c
@@ -25,7 +25,7 @@
#include "encode_lavc.h"
#include "mpvcore/mp_msg.h"
#include "video/vfcap.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "osdep/timer.h"
#include "video/out/vo.h"
#include "talloc.h"
diff --git a/mpvcore/playlist.c b/mpvcore/playlist.c
index 3396a5d78b..e88838fde2 100644
--- a/mpvcore/playlist.c
+++ b/mpvcore/playlist.c
@@ -20,7 +20,7 @@
#include "playlist.h"
#include "mpvcore/mp_common.h"
#include "talloc.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
struct playlist_entry *playlist_entry_new(const char *filename)
{
diff --git a/mpvcore/playlist_parser.c b/mpvcore/playlist_parser.c
index 4103467f86..17679ddf1f 100644
--- a/mpvcore/playlist_parser.c
+++ b/mpvcore/playlist_parser.c
@@ -36,13 +36,12 @@
#include "talloc.h"
#include "asxparser.h"
-#include "m_config.h"
#include "playlist.h"
#include "playlist_parser.h"
#include "stream/stream.h"
#include "demux/demux.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#define BUF_STEP 1024
diff --git a/old-makefile b/old-makefile
index 01a6a2e0b6..4241955581 100644
--- a/old-makefile
+++ b/old-makefile
@@ -201,19 +201,19 @@ SOURCES = audio/audio.c \
mpvcore/charset_conv.c \
mpvcore/codecs.c \
mpvcore/cpudetect.c \
- mpvcore/m_config.c \
- mpvcore/m_option.c \
- mpvcore/m_property.c \
mpvcore/mp_common.c \
mpvcore/mp_msg.c \
mpvcore/mp_ring.c \
- mpvcore/options.c \
- mpvcore/parser-cfg.c \
- mpvcore/parser-mpcmd.c \
- mpvcore/path.c \
mpvcore/playlist.c \
mpvcore/playlist_parser.c \
mpvcore/version.c \
+ options/m_config.c \
+ options/m_option.c \
+ options/m_property.c \
+ options/options.c \
+ options/parse_commandline.c \
+ options/parse_configfile.c \
+ options/path.c \
osdep/io.c \
osdep/numcores.c \
osdep/timer.c \
diff --git a/mpvcore/m_config.c b/options/m_config.c
index 203796055f..5040482c84 100644
--- a/mpvcore/m_config.c
+++ b/options/m_config.c
@@ -31,7 +31,7 @@
#include "talloc.h"
#include "m_config.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
static const union m_option_value default_value;
diff --git a/mpvcore/m_config.h b/options/m_config.h
index 8a8865d68e..8a8865d68e 100644
--- a/mpvcore/m_config.h
+++ b/options/m_config.h
diff --git a/mpvcore/m_option.c b/options/m_option.c
index 85ac974861..b4bd50a23f 100644
--- a/mpvcore/m_option.c
+++ b/options/m_option.c
@@ -37,9 +37,9 @@
#include "talloc.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
#include "mpvcore/mp_msg.h"
+#include "m_option.h"
+#include "m_config.h"
char *m_option_strerror(int code)
{
diff --git a/mpvcore/m_option.h b/options/m_option.h
index dfc9e28a9b..dfc9e28a9b 100644
--- a/mpvcore/m_option.h
+++ b/options/m_option.h
diff --git a/mpvcore/m_property.c b/options/m_property.c
index aba9ca4ec8..38f6a742c9 100644
--- a/mpvcore/m_property.c
+++ b/options/m_property.c
@@ -30,7 +30,7 @@
#include <libavutil/common.h>
#include "talloc.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
#include "m_property.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_common.h"
diff --git a/mpvcore/m_property.h b/options/m_property.h
index 8398ad321f..8398ad321f 100644
--- a/mpvcore/m_property.h
+++ b/options/m_property.h
diff --git a/mpvcore/options.c b/options/options.c
index e98009efab..e3d13076f4 100644
--- a/mpvcore/options.c
+++ b/options/options.c
@@ -27,11 +27,11 @@
#include <sys/types.h>
#include <limits.h>
-#include "mpvcore/options.h"
+#include "options.h"
#include "config.h"
#include "version.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
+#include "m_config.h"
+#include "m_option.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
#include "video/csputils.h"
diff --git a/mpvcore/options.h b/options/options.h
index 1544e37edb..d8f1d46488 100644
--- a/mpvcore/options.h
+++ b/options/options.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "mpvcore/m_option.h"
+#include "m_option.h"
typedef struct mp_vo_opts {
struct m_obj_settings *video_driver_list, *vo_defs;
diff --git a/mpvcore/parser-mpcmd.c b/options/parse_commandline.c
index 97398954cc..a6feee82c3 100644
--- a/mpvcore/parser-mpcmd.c
+++ b/options/parse_commandline.c
@@ -26,11 +26,11 @@
#include <stdbool.h>
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
#include "m_config.h"
-#include "playlist.h"
-#include "playlist_parser.h"
-#include "parser-mpcmd.h"
+#include "mpvcore/playlist.h"
+#include "mpvcore/playlist_parser.h"
+#include "parse_commandline.h"
#define GLOBAL 0
#define LOCAL 1
diff --git a/mpvcore/parser-mpcmd.h b/options/parse_commandline.h
index 256bc514b2..256bc514b2 100644
--- a/mpvcore/parser-mpcmd.h
+++ b/options/parse_commandline.h
diff --git a/mpvcore/parser-cfg.c b/options/parse_configfile.c
index 3395a67432..f82e740df9 100644
--- a/mpvcore/parser-cfg.c
+++ b/options/parse_configfile.c
@@ -27,9 +27,9 @@
#include "osdep/io.h"
-#include "parser-cfg.h"
+#include "parse_configfile.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "m_option.h"
#include "m_config.h"
/// Maximal include depth.
diff --git a/mpvcore/parser-cfg.h b/options/parse_configfile.h
index 65a4b49496..65a4b49496 100644
--- a/mpvcore/parser-cfg.h
+++ b/options/parse_configfile.h
diff --git a/mpvcore/path.c b/options/path.c
index 9de11b24d1..a2b2f135c5 100644
--- a/mpvcore/path.c
+++ b/options/path.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "talloc.h"
#include "osdep/io.h"
#include "osdep/path.h"
diff --git a/mpvcore/path.h b/options/path.h
index e0c61321d2..e0c61321d2 100644
--- a/mpvcore/path.h
+++ b/options/path.h
diff --git a/osdep/path-win.c b/osdep/path-win.c
index 80a2bb5e41..af5e43765c 100644
--- a/osdep/path-win.c
+++ b/osdep/path-win.c
@@ -20,7 +20,7 @@
#include "osdep/path.h"
#include "osdep/io.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
// Warning: do not use PATH_MAX. Cygwin messed it up.
diff --git a/player/audio.c b/player/audio.c
index 8be2f9cddc..32f93d869a 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -26,7 +26,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "audio/mixer.h"
diff --git a/player/command.c b/player/command.c
index 258251e948..532372e3ca 100644
--- a/player/command.c
+++ b/player/command.c
@@ -42,9 +42,9 @@
#include "mpvcore/playlist_parser.h"
#include "sub/osd.h"
#include "sub/dec_sub.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
+#include "options/m_config.h"
#include "video/filter/vf.h"
#include "video/decode/vd.h"
#include "video/out/vo.h"
@@ -55,7 +55,7 @@
#include "audio/filter/af.h"
#include "video/decode/dec_video.h"
#include "audio/decode/dec_audio.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
#include "stream/pvr.h"
diff --git a/player/configfiles.c b/player/configfiles.c
index eb72de08ed..01b05ec6bc 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -32,12 +32,12 @@
#include "osdep/io.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
#include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
#include "stream/stream.h"
diff --git a/player/core.h b/player/core.h
index e1c7997907..551b902f9d 100644
--- a/player/core.h
+++ b/player/core.h
@@ -22,7 +22,7 @@
#include <stdbool.h>
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
// definitions used internally by the core player code
diff --git a/player/loadfile.c b/player/loadfile.c
index b1e41a08b8..7132ca972e 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -31,12 +31,12 @@
#include "osdep/timer.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
#include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/encode.h"
#include "input/input.h"
diff --git a/player/lua.c b/player/lua.c
index c72e1b7d1b..56a9d74332 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -8,11 +8,11 @@
#include "talloc.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "input/input.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "mpvcore/bstr.h"
#include "osdep/timer.h"
#include "sub/osd.h"
diff --git a/player/main.c b/player/main.c
index cfaf6f47d5..dfab92eefc 100644
--- a/player/main.c
+++ b/player/main.c
@@ -36,17 +36,17 @@
#include "mpvcore/codecs.h"
#include "mpvcore/cpudetect.h"
#include "mpvcore/encode.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
+#include "options/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
-#include "mpvcore/parser-cfg.h"
-#include "mpvcore/parser-mpcmd.h"
+#include "options/parse_configfile.h"
+#include "options/parse_commandline.h"
#include "mpvcore/playlist.h"
#include "mpvcore/playlist_parser.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "input/input.h"
#include "audio/decode/dec_audio.h"
diff --git a/player/misc.c b/player/misc.c
index 928b56f88c..f57695dae1 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -27,8 +27,8 @@
#include "osdep/timer.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/encode.h"
#include "mpvcore/playlist.h"
diff --git a/player/osd.c b/player/osd.c
index f2a81b961b..1ee8c52aa5 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -27,9 +27,9 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
#include "mpvcore/encode.h"
#include "osdep/getch2.h"
diff --git a/player/playloop.c b/player/playloop.c
index 9bfd2f82a4..cb6b72f710 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -26,10 +26,10 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
#include "mpvcore/playlist.h"
#include "input/input.h"
diff --git a/player/screenshot.c b/player/screenshot.c
index f501a073b7..fd09474904 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -30,7 +30,7 @@
#include "command.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "video/mp_image.h"
#include "video/decode/dec_video.h"
#include "video/filter/vf.h"
diff --git a/player/sub.c b/player/sub.c
index 6270d3e69d..ea6eaee89a 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -26,7 +26,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "stream/stream.h"
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index 3a6eb379fc..48336ed467 100644
--- a/player/timeline/tl_cue.c
+++ b/player/timeline/tl_cue.c
@@ -27,7 +27,7 @@
#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_common.h"
#include "stream/stream.h"
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index 85bdf4e57e..4b52ad834f 100644
--- a/player/timeline/tl_matroska.c
+++ b/player/timeline/tl_matroska.c
@@ -33,7 +33,7 @@
#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/playlist.h"
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index aa343a3f47..6a41bcb3c3 100644
--- a/player/timeline/tl_mpv_edl.c
+++ b/player/timeline/tl_mpv_edl.c
@@ -27,7 +27,7 @@
#include "player/core.h"
#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_common.h"
#include "stream/stream.h"
diff --git a/player/video.c b/player/video.c
index e94a0db71b..fd3f4ed658 100644
--- a/player/video.c
+++ b/player/video.c
@@ -26,10 +26,10 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
#include "audio/out/ao.h"
#include "demux/demux.h"
diff --git a/stream/cookies.c b/stream/cookies.c
index b5815da6e5..f4d5b863f4 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -33,7 +33,7 @@
#include "osdep/io.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "cookies.h"
#include "mpvcore/mp_msg.h"
diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c
index 00279c568f..b45995dad8 100644
--- a/stream/resolve/resolve_quvi.c
+++ b/stream/resolve/resolve_quvi.c
@@ -20,7 +20,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "resolve.h"
static void add_source(struct mp_resolve_result *res, const char *url,
diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c
index ea96f521e3..62464be0b5 100644
--- a/stream/resolve/resolve_quvi9.c
+++ b/stream/resolve/resolve_quvi9.c
@@ -23,7 +23,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/playlist.h"
#include "resolve.h"
diff --git a/stream/stream.c b/stream/stream.c
index 2429d55576..7ceecf390e 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -40,12 +40,12 @@
#include "mpvcore/mp_common.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "osdep/timer.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
// Includes additional padding in case sizes get rounded up by sector size.
#define TOTAL_BUFFER_SIZE (STREAM_MAX_BUFFER_SIZE + STREAM_MAX_SECTOR_SIZE)
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index f32e2b72d3..9f11a917d2 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -38,7 +38,7 @@
#include "config.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "stream.h"
#define BLURAY_SECTOR_SIZE 6144
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 678b06f343..48f5a7b465 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -42,7 +42,7 @@
#include "talloc.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "libavutil/common.h"
#include "compat/mpbswap.h"
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 71e9b87199..698c497d48 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "osdep/io.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
#include "dvbin.h"
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index b006b52cc7..b3be35fd27 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -38,7 +38,7 @@
#define FIRST_PCM_AID 160
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "stream_dvd.h"
#include "stream_dvd_common.h"
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 509e84801a..29087c93d9 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -26,7 +26,7 @@
#include <dvdread/ifo_read.h>
#include <dvdread/nav_read.h>
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
typedef struct {
dvd_reader_t *dvd;
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 88c94f3f26..168091155d 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -28,10 +28,10 @@
#include <dvdnav/dvdnav.h>
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "input/input.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#include "stream.h"
#include "demux/demux.h"
diff --git a/stream/stream_file.c b/stream/stream_file.c
index dc53aeed82..73de4c266d 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -31,7 +31,7 @@
#include "mpvcore/mp_msg.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
struct priv {
int fd;
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 1adf8177e4..8f82aedf05 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -21,10 +21,10 @@
#include <libavutil/opt.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "cookies.h"
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 31b9d38bd9..b3fd501e33 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -42,7 +42,7 @@
#include <libavutil/avstring.h>
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/mp_msg.h"
#include "stream_radio.h"
diff --git a/stream/stream_rar.c b/stream/stream_rar.c
index 8402517dc3..1cab4a8f48 100644
--- a/stream/stream_rar.c
+++ b/stream/stream_rar.c
@@ -35,7 +35,7 @@
#include "mpvcore/mp_msg.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "rar.h"
/*
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index 50f62fc1ae..2ec3c83d8d 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -25,7 +25,7 @@
#include "mpvcore/mp_msg.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
struct priv {
int fd;
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 89d22e9a3d..3bd18c3ffa 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "tv.h"
#include <stdio.h>
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 20fab8d9e5..4b591aba46 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -26,7 +26,7 @@
#include "mpvcore/mp_msg.h"
#include "stream.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include <fcntl.h>
#include <stdlib.h>
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index 44b59e34d5..75178d804d 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -31,11 +31,11 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "ass_mp.h"
#include "osd.h"
#include "stream/stream.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
// res_y should be track->PlayResY
// It determines scaling of font sizes and more.
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 425db1b3e8..c5d45f81df 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -26,7 +26,7 @@
#include "demux/demux.h"
#include "sd.h"
#include "dec_sub.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/charset_conv.h"
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index 479e8a0785..ce23bd50c4 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -7,8 +7,8 @@
#include "osdep/io.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
-#include "mpvcore/path.h"
+#include "options/options.h"
+#include "options/path.h"
#include "mpvcore/mp_common.h"
#include "sub/find_subfiles.h"
diff --git a/sub/osd.c b/sub/osd.c
index 02b28b3885..2432859782 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -30,7 +30,7 @@
#include "osdep/timer.h"
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "osd.h"
#include "dec_sub.h"
diff --git a/sub/osd.h b/sub/osd.h
index d869700a92..d98d111228 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -23,7 +23,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// NOTE: VOs must support at least SUBBITMAP_RGBA.
enum sub_bitmap_format {
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 44154b8997..16e90eea1e 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -34,7 +34,7 @@ static const char osd_font_pfb[] =
;
#include "sub/ass_mp.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#define ASS_USE_OSD_FONT "{\\fnmpv-osd-symbols}"
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 631c81a083..a8d5be633d 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -25,7 +25,7 @@
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/mp_msg.h"
#include "video/csputils.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index da8a07e48e..0e7121a279 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -24,7 +24,7 @@
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/av_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/mp_image.h"
#include "sd.h"
#include "dec_sub.h"
diff --git a/sub/sd_spu.c b/sub/sd_spu.c
index 15ea351159..1f815c93aa 100644
--- a/sub/sd_spu.c
+++ b/sub/sd_spu.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/mp_image.h"
#include "sd.h"
#include "spudec.h"
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index a77e77ec6d..06b00be84f 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -17,7 +17,7 @@
*/
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 7e24cbcd90..506481cf1c 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -33,7 +33,7 @@
#include "talloc.h"
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "mpvcore/av_opts.h"
#include "mpvcore/av_common.h"
@@ -57,7 +57,7 @@
#error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE
#endif
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static void init_avctx(struct dec_video *vd, const char *decoder,
struct vd_lavc_hwdec *hwdec);
diff --git a/video/filter/vf.c b/video/filter/vf.c
index c1e9084b0d..4143a835b1 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -27,10 +27,10 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index fffcc62921..dde297f910 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -22,13 +22,13 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static const struct vf_priv_s {
int crop_w,crop_h;
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index 3ec6755f03..0c80bec057 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -36,7 +36,7 @@
#include "vf_lavfi.h"
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
//===========================================================================//
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index c471d4a774..6c8574039d 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "libavutil/common.h"
#include "compat/mpbswap.h"
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 5bf8198ce7..4b7551167b 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "vf_dlopen.h"
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index 9aa5f719ad..ed4d3ef871 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c
index e423b301ff..542627cb3b 100644
--- a/video/filter/vf_eq.c
+++ b/video/filter/vf_eq.c
@@ -32,7 +32,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 2e72f6bff7..fe4b8baccb 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -33,7 +33,7 @@
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
// These four values are a backup of the values parsed from the command line.
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index e673fd8f60..bdbefec542 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int fmt;
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index 7c9a0ecab3..ea3b615caa 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -43,7 +43,7 @@
#include "video/memcpy_pic.h"
#include "compat/x86_cpu.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "vf_lavfi.h"
diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
index 1a5736f98e..07cea5ad28 100644
--- a/video/filter/vf_hqdn3d.c
+++ b/video/filter/vf_hqdn3d.c
@@ -25,7 +25,7 @@
#include <math.h>
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index bd7e863dee..d79f557652 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c
index 47701ed1f9..98216c08e4 100644
--- a/video/filter/vf_lavfi.c
+++ b/video/filter/vf_lavfi.c
@@ -37,7 +37,7 @@
#include <libavfilter/buffersrc.h>
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "mpvcore/av_opts.h"
#include "video/img_format.h"
diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h
index 45765d9dea..aef8a93448 100644
--- a/video/filter/vf_lavfi.h
+++ b/video/filter/vf_lavfi.h
@@ -37,7 +37,7 @@ static void vf_lw_set_recreate_cb(struct vf_instance *vf,
void (*recreate)(struct vf_instance *vf))
{
}
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static const struct m_sub_options vf_lw_conf = {0};
#endif
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index f3b193bc4e..50f9f7f26f 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -28,7 +28,7 @@
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int fmt;
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 8525b06dc2..0f20cfc353 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index c439a2466a..2a8b9dfc61 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index dff8b2b3ec..c49ed218b5 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 36fac55cc5..a0d2c7da26 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index 0105cb2c1d..bbb02647d1 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 268e65ae59..c80113f6fd 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -39,7 +39,7 @@
#include "video/csputils.h"
#include "video/out/vo.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
static struct vf_priv_s {
int w, h;
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index 6bd13ada87..b9d97756fe 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -25,12 +25,12 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "vf.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "libavutil/common.h"
#include "video/memcpy_pic.h"
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index bd2ab88fd0..e9f056e113 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/img_format.h"
#include "video/mp_image.h"
@@ -40,7 +40,7 @@
#include "video/sws_utils.h"
#include "video/memcpy_pic.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
struct vf_priv_s {
int opt_top_margin, opt_bottom_margin;
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index 1cab2ada0c..582449ad53 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/img_format.h"
#include "video/mp_image.h"
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index dfd99e8a3c..6c96ae1bda 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -19,7 +19,7 @@
#include <va/va_vpp.h>
#include "config.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "vf.h"
#include "video/vaapi.h"
#include "video/hwdec.h"
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index 7cbfb1633c..46e59bf741 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -26,7 +26,7 @@
#include "config.h"
#include "mpvcore/cpudetect.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "video/img_format.h"
diff --git a/video/image_writer.c b/video/image_writer.c
index d2ef348d87..98a691d51d 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -40,7 +40,7 @@
#include "video/fmt-conversion.h"
#include "video/sws_utils.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
const struct image_writer_opts image_writer_opts_defaults = {
.format = "jpg",
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 3a45367afb..33cf5ebfef 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -22,7 +22,7 @@
#include "aspect.h"
#include "vo.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "vo.h"
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 20674de317..f31ecdb64e 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -42,8 +42,8 @@
#include <assert.h>
#include "talloc.h"
#include "gl_common.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
//! \defgroup glgeneral OpenGL general helper functions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index 49a3a0346c..919ab2e657 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -30,8 +30,8 @@
#include "mpvcore/mp_common.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
#include "gl_video.h"
#include "gl_lcms.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index ee746b0376..ab8a92fd9e 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -32,12 +32,12 @@
#include "config.h"
#include "osdep/timer.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "vo.h"
#include "aspect.h"
#include "input/input.h"
-#include "mpvcore/m_config.h"
+#include "options/m_config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
#include "video/mp_image.h"
diff --git a/video/out/vo.h b/video/out/vo.h
index d9058b96e9..2c9eec4849 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -28,7 +28,7 @@
#include "video/img_format.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#define VO_EVENT_EXPOSE 1
#define VO_EVENT_RESIZE 2
diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c
index 9b415de191..2a154b99f0 100644
--- a/video/out/vo_corevideo.c
+++ b/video/out/vo_corevideo.c
@@ -32,7 +32,7 @@
#include "talloc.h"
#include "video/out/vo.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/csputils.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 06d91e4e18..52627d3d32 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -28,8 +28,8 @@
#include <d3d9.h>
#include <inttypes.h>
#include "config.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_option.h"
+#include "options/options.h"
+#include "options/m_option.h"
#include "talloc.h"
#include "vo.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index fd694e77dd..b08f3018b0 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -27,7 +27,7 @@
#include "config.h"
#include "mpvcore/bstr.h"
#include "osdep/io.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "video/out/vo.h"
@@ -38,7 +38,7 @@
#include "video/image_writer.h"
#include "video/sws_utils.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
struct priv {
struct image_writer_opts *opts;
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index 2da3f06a3c..81a4280def 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include "compat/libav.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "video/fmt-conversion.h"
#include "video/mp_image.h"
#include "video/vfcap.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 714bbf4e6b..d1e0f3d2f0 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -38,7 +38,7 @@
#include "mpvcore/mp_common.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_config.h"
+#include "options/m_config.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c
index 5ae8816900..9e39a6197c 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -34,7 +34,7 @@
#include "config.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "vo.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 91e6bd9daf..574b453a6f 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -34,7 +34,7 @@
#include "input/keycodes.h"
#include "input/input.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 082ad1a05d..1343b54b65 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -38,13 +38,13 @@
#include "video/vdpau.h"
#include "video/hwdec.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "talloc.h"
#include "vo.h"
#include "x11_common.h"
#include "video/csputils.h"
#include "sub/osd.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index 513f63aa10..ead41c51c8 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -53,7 +53,7 @@
#include "video/fmt-conversion.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "osdep/timer.h"
extern int sws_flags;
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index 00d5217219..1fa4323beb 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -43,7 +43,7 @@
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "talloc.h"
#include "mpvcore/mp_msg.h"
#include "vo.h"
@@ -55,7 +55,7 @@
#include "sub/osd.h"
#include "sub/draw_bmp.h"
#include "video/csputils.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
#include "osdep/timer.h"
#define CK_METHOD_NONE 0 // no colorkey drawing
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index f619a2915c..b8fe0309af 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -22,7 +22,7 @@
#include <windows.h>
#include <windowsx.h>
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "input/keycodes.h"
#include "input/input.h"
#include "mpvcore/mp_msg.h"
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index d6be563a33..5a078b775e 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -32,7 +32,7 @@
#include "config.h"
#include "mpvcore/bstr.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "libavutil/common.h"
#include "talloc.h"
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 4187fa21cc..adc5ac1b21 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "mpvcore/bstr.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/mp_msg.h"
#include "input/input.h"
#include "libavutil/common.h"
diff --git a/wscript_build.py b/wscript_build.py
index 66a96d834e..16668f8c36 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -172,16 +172,9 @@ def build(ctx):
( "mpvcore/codecs.c" ),
( "mpvcore/cpudetect.c" ),
( "mpvcore/encode_lavc.c", "encoding" ),
- ( "mpvcore/m_config.c" ),
- ( "mpvcore/m_option.c" ),
- ( "mpvcore/m_property.c" ),
( "mpvcore/mp_common.c" ),
( "mpvcore/mp_msg.c" ),
( "mpvcore/mp_ring.c" ),
- ( "mpvcore/options.c" ),
- ( "mpvcore/parser-cfg.c" ),
- ( "mpvcore/parser-mpcmd.c" ),
- ( "mpvcore/path.c" ),
( "mpvcore/playlist.c" ),
( "mpvcore/playlist_parser.c" ),
( "mpvcore/version.c" ),
@@ -206,6 +199,15 @@ def build(ctx):
( "input/joystick.c", "joystick" ),
( "input/lirc.c", "lirc" ),
+ ## Options
+ ( "options/m_config.c" ),
+ ( "options/m_option.c" ),
+ ( "options/m_property.c" ),
+ ( "options/options.c" ),
+ ( "options/parse_commandline.c" ),
+ ( "options/parse_configfile.c" ),
+ ( "options/path.c" ),
+
## Player
( "player/audio.c" ),
( "player/command.c" ),