summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:41:30 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-06 22:52:31 +0200
commit406241005e3d897b30a5b168a16ad61f0996c43c (patch)
tree7884ce5d2d4f5aaa253ffd82e567d13bdd2860af /mpvcore
parentbc27f946c27e33933a3a696cade78a04902c8dce (diff)
downloadmpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.bz2
mpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.xz
core: move contents to mpvcore (2/2)
Followup commit. Fixes all the files references.
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/asxparser.c2
-rw-r--r--mpvcore/av_common.c2
-rw-r--r--mpvcore/av_log.c2
-rw-r--r--mpvcore/bstr.c2
-rw-r--r--mpvcore/charset_conv.c2
-rw-r--r--mpvcore/charset_conv.h2
-rw-r--r--mpvcore/codecs.c6
-rw-r--r--mpvcore/command.c8
-rw-r--r--mpvcore/cpudetect.c4
-rw-r--r--mpvcore/encode_lavc.c4
-rw-r--r--mpvcore/input/input.c16
-rw-r--r--mpvcore/input/input.h4
-rw-r--r--mpvcore/input/joystick.c2
-rw-r--r--mpvcore/input/lirc.c2
-rw-r--r--mpvcore/m_config.c4
-rw-r--r--mpvcore/m_config.h2
-rw-r--r--mpvcore/m_option.c8
-rw-r--r--mpvcore/m_option.h2
-rw-r--r--mpvcore/m_property.c6
-rw-r--r--mpvcore/mp_common.c4
-rw-r--r--mpvcore/mp_common.h2
-rw-r--r--mpvcore/mp_core.h2
-rw-r--r--mpvcore/mp_msg.c4
-rw-r--r--mpvcore/mp_msg.h2
-rw-r--r--mpvcore/mp_ring.c4
-rw-r--r--mpvcore/mplayer.c42
-rw-r--r--mpvcore/options.c6
-rw-r--r--mpvcore/options.h2
-rw-r--r--mpvcore/parser-cfg.c4
-rw-r--r--mpvcore/parser-mpcmd.c4
-rw-r--r--mpvcore/path.c4
-rw-r--r--mpvcore/path.h2
-rw-r--r--mpvcore/playlist.c4
-rw-r--r--mpvcore/playlist.h2
-rw-r--r--mpvcore/playlist_parser.c4
-rw-r--r--mpvcore/resolve_quvi.c4
-rw-r--r--mpvcore/resolve_quvi9.c6
-rw-r--r--mpvcore/screenshot.c14
-rw-r--r--mpvcore/timeline/tl_cue.c10
-rw-r--r--mpvcore/timeline/tl_edl.c10
-rw-r--r--mpvcore/timeline/tl_matroska.c10
41 files changed, 113 insertions, 113 deletions
diff --git a/mpvcore/asxparser.c b/mpvcore/asxparser.c
index ec15313547..804e796f85 100644
--- a/mpvcore/asxparser.c
+++ b/mpvcore/asxparser.c
@@ -28,7 +28,7 @@
#include "playlist_parser.h"
#include "stream/stream.h"
#include "asxparser.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
typedef struct ASX_Parser_t ASX_Parser_t;
diff --git a/mpvcore/av_common.c b/mpvcore/av_common.c
index a4dc525aa9..ebf871c544 100644
--- a/mpvcore/av_common.c
+++ b/mpvcore/av_common.c
@@ -20,7 +20,7 @@
#include <libavutil/common.h>
#include <libavcodec/avcodec.h>
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
#include "demux/demux_packet.h"
#include "av_common.h"
#include "codecs.h"
diff --git a/mpvcore/av_log.c b/mpvcore/av_log.c
index 1331a1fb26..64e4155415 100644
--- a/mpvcore/av_log.c
+++ b/mpvcore/av_log.c
@@ -25,7 +25,7 @@
#include "av_log.h"
#include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include <libavutil/avutil.h>
#include <libavutil/log.h>
diff --git a/mpvcore/bstr.c b/mpvcore/bstr.c
index 16da0993ea..adcc6575f3 100644
--- a/mpvcore/bstr.c
+++ b/mpvcore/bstr.c
@@ -25,7 +25,7 @@
#include "talloc.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
int bstrcmp(struct bstr str1, struct bstr str2)
{
diff --git a/mpvcore/charset_conv.c b/mpvcore/charset_conv.c
index 680c8f83f9..dc6f16d20d 100644
--- a/mpvcore/charset_conv.c
+++ b/mpvcore/charset_conv.c
@@ -25,7 +25,7 @@
#include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#ifdef CONFIG_ENCA
#include <enca.h>
diff --git a/mpvcore/charset_conv.h b/mpvcore/charset_conv.h
index 00a2658da3..ad10f010a0 100644
--- a/mpvcore/charset_conv.h
+++ b/mpvcore/charset_conv.h
@@ -2,7 +2,7 @@
#define MP_CHARSET_CONV_H
#include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
enum {
MP_ICONV_VERBOSE = 1, // print errors instead of failing silently
diff --git a/mpvcore/codecs.c b/mpvcore/codecs.c
index 943860a70b..23f5402fc6 100644
--- a/mpvcore/codecs.c
+++ b/mpvcore/codecs.c
@@ -16,9 +16,9 @@
*/
#include <assert.h>
-#include "core/mp_talloc.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_talloc.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
#include "codecs.h"
void mp_add_decoder(struct mp_decoder_list *list, const char *family,
diff --git a/mpvcore/command.c b/mpvcore/command.c
index b7718e41b7..bc128953ce 100644
--- a/mpvcore/command.c
+++ b/mpvcore/command.c
@@ -39,7 +39,7 @@
#include "playlist_parser.h"
#include "sub/sub.h"
#include "sub/dec_sub.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "m_property.h"
#include "m_config.h"
#include "video/filter/vf.h"
@@ -50,11 +50,11 @@
#include "playlist.h"
#include "audio/mixer.h"
#include "audio/out/ao.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
#include "audio/filter/af.h"
#include "video/decode/dec_video.h"
#include "audio/decode/dec_audio.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
#include "stream/pvr.h"
@@ -66,7 +66,7 @@
#endif
#include "screenshot.h"
-#include "core/mp_core.h"
+#include "mpvcore/mp_core.h"
static void change_video_filters(MPContext *mpctx, const char *cmd,
const char *arg);
diff --git a/mpvcore/cpudetect.c b/mpvcore/cpudetect.c
index 62cb03008d..d670de0f98 100644
--- a/mpvcore/cpudetect.c
+++ b/mpvcore/cpudetect.c
@@ -24,8 +24,8 @@
#include "compat/libav.h"
#include "config.h"
-#include "core/cpudetect.h"
-#include "core/mp_msg.h"
+#include "mpvcore/cpudetect.h"
+#include "mpvcore/mp_msg.h"
CpuCaps gCpuCaps;
diff --git a/mpvcore/encode_lavc.c b/mpvcore/encode_lavc.c
index 75e57a2443..ce8d9a8e59 100644
--- a/mpvcore/encode_lavc.c
+++ b/mpvcore/encode_lavc.c
@@ -22,9 +22,9 @@
#include "encode_lavc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "video/vfcap.h"
-#include "core/options.h"
+#include "mpvcore/options.h"
#include "osdep/timer.h"
#include "video/out/vo.h"
#include "talloc.h"
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c
index ae1358a76d..935ed62f8e 100644
--- a/mpvcore/input/input.c
+++ b/mpvcore/input/input.c
@@ -40,15 +40,15 @@
#include "input.h"
#include "keycodes.h"
#include "osdep/timer.h"
-#include "core/mp_msg.h"
-#include "core/m_config.h"
-#include "core/m_option.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/path.h"
#include "talloc.h"
-#include "core/options.h"
-#include "core/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/bstr.h"
#include "stream/stream.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
#include "joystick.h"
@@ -592,7 +592,7 @@ const m_option_t mp_input_opts[] = {
static int default_cmd_func(int fd, char *buf, int l);
static const char builtin_input_conf[] =
-#include "core/input/input_conf.h"
+#include "mpvcore/input/input_conf.h"
;
static bool test_rect(struct mp_rect *rc, int x, int y)
diff --git a/mpvcore/input/input.h b/mpvcore/input/input.h
index 92e2a32c4f..2c8441c7c0 100644
--- a/mpvcore/input/input.h
+++ b/mpvcore/input/input.h
@@ -20,8 +20,8 @@
#define MPLAYER_INPUT_H
#include <stdbool.h>
-#include "core/bstr.h"
-#include "core/m_option.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/m_option.h"
// All command IDs
enum mp_command_type {
diff --git a/mpvcore/input/joystick.c b/mpvcore/input/joystick.c
index e8330ffaeb..2ab38f6311 100644
--- a/mpvcore/input/joystick.c
+++ b/mpvcore/input/joystick.c
@@ -30,7 +30,7 @@
#include <fcntl.h>
#include <errno.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "keycodes.h"
#ifndef JOY_AXIS_DELTA
diff --git a/mpvcore/input/lirc.c b/mpvcore/input/lirc.c
index 699168d239..059d548f95 100644
--- a/mpvcore/input/lirc.c
+++ b/mpvcore/input/lirc.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
#include "input.h"
#include "lirc.h"
diff --git a/mpvcore/m_config.c b/mpvcore/m_config.c
index f362b43836..c94b568435 100644
--- a/mpvcore/m_config.c
+++ b/mpvcore/m_config.c
@@ -31,8 +31,8 @@
#include "talloc.h"
#include "m_config.h"
-#include "core/m_option.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_msg.h"
// Profiles allow to predefine some sets of options that can then
// be applied later on with the internal -profile option.
diff --git a/mpvcore/m_config.h b/mpvcore/m_config.h
index c2f88dfe65..996d73f26e 100644
--- a/mpvcore/m_config.h
+++ b/mpvcore/m_config.h
@@ -22,7 +22,7 @@
#include <stddef.h>
#include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
// m_config provides an API to manipulate the config variables in MPlayer.
// It makes use of the Options API to provide a context stack that
diff --git a/mpvcore/m_option.c b/mpvcore/m_option.c
index 41916befeb..1e195bcece 100644
--- a/mpvcore/m_option.c
+++ b/mpvcore/m_option.c
@@ -36,10 +36,10 @@
#include <libavutil/avstring.h>
#include "talloc.h"
-#include "core/mp_common.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
char *m_option_strerror(int code)
{
diff --git a/mpvcore/m_option.h b/mpvcore/m_option.h
index 89f3caa652..d8ea643dcf 100644
--- a/mpvcore/m_option.h
+++ b/mpvcore/m_option.h
@@ -24,7 +24,7 @@
#include <stdbool.h>
#include "config.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
#include "audio/chmap.h"
// m_option allows to parse, print and copy data of various types.
diff --git a/mpvcore/m_property.c b/mpvcore/m_property.c
index f334b6fe1f..6517d8abe9 100644
--- a/mpvcore/m_property.c
+++ b/mpvcore/m_property.c
@@ -30,10 +30,10 @@
#include <libavutil/common.h>
#include "talloc.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
#include "m_property.h"
-#include "core/mp_msg.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
const struct m_option_type m_option_type_dummy = {
.name = "Unknown",
diff --git a/mpvcore/mp_common.c b/mpvcore/mp_common.c
index 03e3e988fd..3ea6e66531 100644
--- a/mpvcore/mp_common.c
+++ b/mpvcore/mp_common.c
@@ -19,8 +19,8 @@
#include <libavutil/common.h>
#include "talloc.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
char *mp_format_time(double time, bool fractions)
{
diff --git a/mpvcore/mp_common.h b/mpvcore/mp_common.h
index 71e24604ec..9a719ae8ab 100644
--- a/mpvcore/mp_common.h
+++ b/mpvcore/mp_common.h
@@ -24,7 +24,7 @@
#include <stdint.h>
#include "compat/compiler.h"
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
// both int64_t and double should be able to represent this exactly
#define MP_NOPTS_VALUE (-1LL<<63)
diff --git a/mpvcore/mp_core.h b/mpvcore/mp_core.h
index 126c646a0b..0ce37b8aa5 100644
--- a/mpvcore/mp_core.h
+++ b/mpvcore/mp_core.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
-#include "core/options.h"
+#include "mpvcore/options.h"
#include "audio/mixer.h"
#include "demux/demux.h"
diff --git a/mpvcore/mp_msg.c b/mpvcore/mp_msg.c
index ff611451c2..3f073bf919 100644
--- a/mpvcore/mp_msg.c
+++ b/mpvcore/mp_msg.c
@@ -26,7 +26,7 @@
#include "talloc.h"
#include "config.h"
-#include "core/mpv_global.h"
+#include "mpvcore/mpv_global.h"
#include "osdep/getch2.h"
#include "osdep/io.h"
@@ -39,7 +39,7 @@
#include <signal.h>
#endif
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
bool mp_msg_stdout_in_use = 0;
diff --git a/mpvcore/mp_msg.h b/mpvcore/mp_msg.h
index 4685668f01..aa3d57a802 100644
--- a/mpvcore/mp_msg.h
+++ b/mpvcore/mp_msg.h
@@ -135,7 +135,7 @@ int mp_msg_test(int mod, int lev);
bool mp_msg_test_log(struct mp_log *log, int lev);
#include "config.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
char *mp_gtext(const char *string);
diff --git a/mpvcore/mp_ring.c b/mpvcore/mp_ring.c
index bd94870710..aa62c305be 100644
--- a/mpvcore/mp_ring.c
+++ b/mpvcore/mp_ring.c
@@ -21,8 +21,8 @@
#include <libavutil/common.h>
#include <assert.h>
#include "talloc.h"
-#include "core/mp_memory_barrier.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_memory_barrier.h"
+#include "mpvcore/mp_ring.h"
struct mp_ring {
uint8_t *buffer;
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index d3872442ee..cac24363f9 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -63,26 +63,26 @@
#include <errno.h>
-#include "core/mpv_global.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mpv_global.h"
+#include "mpvcore/mp_msg.h"
#include "av_log.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
-#include "core/resolve.h"
-#include "core/m_property.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/resolve.h"
+#include "mpvcore/m_property.h"
#include "sub/find_subfiles.h"
#include "sub/dec_sub.h"
#include "sub/sd.h"
-#include "core/mp_osd.h"
+#include "mpvcore/mp_osd.h"
#include "video/out/vo.h"
-#include "core/screenshot.h"
+#include "mpvcore/screenshot.h"
#include "sub/sub.h"
-#include "core/cpudetect.h"
+#include "mpvcore/cpudetect.h"
#ifdef CONFIG_X11
#include "video/out/x11_common.h"
@@ -94,13 +94,13 @@
#include "audio/out/ao.h"
-#include "core/codecs.h"
+#include "mpvcore/codecs.h"
#include "osdep/getch2.h"
#include "osdep/timer.h"
-#include "core/input/input.h"
-#include "core/encode.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/encode.h"
#include "osdep/priority.h"
@@ -113,20 +113,20 @@
//**************************************************************************//
// Playtree
//**************************************************************************//
-#include "core/playlist.h"
-#include "core/playlist_parser.h"
+#include "mpvcore/playlist.h"
+#include "mpvcore/playlist_parser.h"
//**************************************************************************//
// Config
//**************************************************************************//
-#include "core/parser-cfg.h"
-#include "core/parser-mpcmd.h"
+#include "mpvcore/parser-cfg.h"
+#include "mpvcore/parser-mpcmd.h"
//**************************************************************************//
// Config file
//**************************************************************************//
-#include "core/path.h"
+#include "mpvcore/path.h"
//**************************************************************************//
//**************************************************************************//
@@ -146,8 +146,8 @@
#include "audio/mixer.h"
-#include "core/mp_core.h"
-#include "core/options.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/options.h"
const char mp_help_text[] = _(
"Usage: mpv [options] [url|path/]filename\n"
@@ -192,8 +192,8 @@ static const char av_desync_help_text[] = _(
// ---
-#include "core/mp_common.h"
-#include "core/command.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/command.h"
static void reset_subtitles(struct MPContext *mpctx);
static void reinit_subs(struct MPContext *mpctx);
diff --git a/mpvcore/options.c b/mpvcore/options.c
index dcab2dc564..b66556d8bd 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -27,10 +27,10 @@
#include <sys/types.h>
#include <limits.h>
-#include "core/options.h"
+#include "mpvcore/options.h"
#include "config.h"
-#include "core/m_config.h"
-#include "core/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/m_option.h"
#include "stream/tv.h"
#include "stream/stream_radio.h"
#include "video/csputils.h"
diff --git a/mpvcore/options.h b/mpvcore/options.h
index c83ab7a73a..ff2b5954ff 100644
--- a/mpvcore/options.h
+++ b/mpvcore/options.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
typedef struct mp_vo_opts {
struct m_obj_settings *video_driver_list;
diff --git a/mpvcore/parser-cfg.c b/mpvcore/parser-cfg.c
index a69f4545d2..763b1b1493 100644
--- a/mpvcore/parser-cfg.c
+++ b/mpvcore/parser-cfg.c
@@ -28,8 +28,8 @@
#include "osdep/io.h"
#include "parser-cfg.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
#include "m_config.h"
/// Maximal include depth.
diff --git a/mpvcore/parser-mpcmd.c b/mpvcore/parser-mpcmd.c
index d716fc4d28..9b9d175cf7 100644
--- a/mpvcore/parser-mpcmd.c
+++ b/mpvcore/parser-mpcmd.c
@@ -25,8 +25,8 @@
#include <assert.h>
#include <stdbool.h>
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
#include "m_config.h"
#include "playlist.h"
#include "playlist_parser.h"
diff --git a/mpvcore/path.c b/mpvcore/path.c
index 50350be18c..5d9b7841a4 100644
--- a/mpvcore/path.c
+++ b/mpvcore/path.c
@@ -33,8 +33,8 @@
#include <unistd.h>
#include <errno.h>
#include "config.h"
-#include "core/mp_msg.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/path.h"
#include "talloc.h"
#include "osdep/io.h"
diff --git a/mpvcore/path.h b/mpvcore/path.h
index a38ad503ea..9728dc7399 100644
--- a/mpvcore/path.h
+++ b/mpvcore/path.h
@@ -22,7 +22,7 @@
#define MPLAYER_PATH_H
#include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
// Search for the input filename in several paths. These include user and global
diff --git a/mpvcore/playlist.c b/mpvcore/playlist.c
index b016cebca6..77e114b1a5 100644
--- a/mpvcore/playlist.c
+++ b/mpvcore/playlist.c
@@ -18,9 +18,9 @@
#include <assert.h>
#include "config.h"
#include "playlist.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
#include "talloc.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
struct playlist_entry *playlist_entry_new(const char *filename)
{
diff --git a/mpvcore/playlist.h b/mpvcore/playlist.h
index f01d4b8ddd..fcf04929ac 100644
--- a/mpvcore/playlist.h
+++ b/mpvcore/playlist.h
@@ -19,7 +19,7 @@
#define MPLAYER_PLAYLIST_H
#include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
struct playlist_param {
bstr name, value;
diff --git a/mpvcore/playlist_parser.c b/mpvcore/playlist_parser.c
index 59d5123be6..4573e133ae 100644
--- a/mpvcore/playlist_parser.c
+++ b/mpvcore/playlist_parser.c
@@ -36,8 +36,8 @@
#include "playlist_parser.h"
#include "stream/stream.h"
#include "demux/demux.h"
-#include "core/mp_msg.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/path.h"
#define BUF_STEP 1024
diff --git a/mpvcore/resolve_quvi.c b/mpvcore/resolve_quvi.c
index 5870335811..9e98f2a992 100644
--- a/mpvcore/resolve_quvi.c
+++ b/mpvcore/resolve_quvi.c
@@ -19,8 +19,8 @@
#include <quvi/quvi.h>
#include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
#include "resolve.h"
struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
diff --git a/mpvcore/resolve_quvi9.c b/mpvcore/resolve_quvi9.c
index f6e6e8b94f..3fd2b3bd0f 100644
--- a/mpvcore/resolve_quvi9.c
+++ b/mpvcore/resolve_quvi9.c
@@ -21,9 +21,9 @@
#include <quvi.h>
#include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
-#include "core/playlist.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/playlist.h"
#include "resolve.h"
static bool mp_quvi_ok(quvi_t q)
diff --git a/mpvcore/screenshot.c b/mpvcore/screenshot.c
index ea2fe7a3c9..b7697e913b 100644
--- a/mpvcore/screenshot.c
+++ b/mpvcore/screenshot.c
@@ -25,13 +25,13 @@
#include "osdep/io.h"
#include "talloc.h"
-#include "core/screenshot.h"
-#include "core/mp_core.h"
-#include "core/command.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
-#include "core/mp_osd.h"
-#include "core/path.h"
+#include "mpvcore/screenshot.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/command.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_osd.h"
+#include "mpvcore/path.h"
#include "video/mp_image.h"
#include "video/decode/dec_video.h"
#include "video/filter/vf.h"
diff --git a/mpvcore/timeline/tl_cue.c b/mpvcore/timeline/tl_cue.c
index 3c4a997982..f7e13ec681 100644
--- a/mpvcore/timeline/tl_cue.c
+++ b/mpvcore/timeline/tl_cue.c
@@ -24,12 +24,12 @@
#include "talloc.h"
-#include "core/mp_core.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
-#include "core/path.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/path.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
#include "stream/stream.h"
// used by demuxer_cue.c
diff --git a/mpvcore/timeline/tl_edl.c b/mpvcore/timeline/tl_edl.c
index 4afb346dae..4b8cf7ed17 100644
--- a/mpvcore/timeline/tl_edl.c
+++ b/mpvcore/timeline/tl_edl.c
@@ -23,12 +23,12 @@
#include "talloc.h"
-#include "core/mp_core.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/mp_msg.h"
#include "demux/demux.h"
-#include "core/path.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/path.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
#include "stream/stream.h"
diff --git a/mpvcore/timeline/tl_matroska.c b/mpvcore/timeline/tl_matroska.c
index cc6e62d429..17ad192d37 100644
--- a/mpvcore/timeline/tl_matroska.c
+++ b/