5 files changed, 11 insertions, 2 deletions
diff --git a/mpvcore/mp_common.h b/mpvcore/mp_common.h
index ecd84e33b6..ab1ccb9451 100644
--- a/mpvcore/mp_common.h
+++ b/mpvcore/mp_common.h
@@ -52,6 +52,13 @@
 #define CONTROL_ERROR -2
 #define CONTROL_NA -3
 
+enum stream_type {
+    STREAM_VIDEO,
+    STREAM_AUDIO,
+    STREAM_SUB,
+    STREAM_TYPE_COUNT,
+};
+
 extern const char *mplayer_version;
 extern const char *mplayer_builddate;
 
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c
index 84b5aa2651..1e56cf3084 100644
--- a/mpvcore/player/main.c
+++ b/mpvcore/player/main.c
@@ -53,6 +53,7 @@
 #include "audio/decode/dec_audio.h"
 #include "audio/out/ao.h"
 #include "audio/mixer.h"
+#include "demux/demux.h"
 #include "stream/stream.h"
 #include "sub/ass_mp.h"
 #include "sub/sub.h"
diff --git a/mpvcore/player/misc.c b/mpvcore/player/misc.c
index 5f15ca7124..e54381d2e2 100644
--- a/mpvcore/player/misc.c
+++ b/mpvcore/player/misc.c
@@ -36,6 +36,7 @@
 #include "mpvcore/input/input.h"
 
 #include "audio/out/ao.h"
+#include "demux/demux.h"
 #include "stream/stream.h"
 #include "video/out/vo.h"
 
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h
index 0be7e1df1f..c1fbf737f3 100644
--- a/mpvcore/player/mp_core.h
+++ b/mpvcore/player/mp_core.h
@@ -21,9 +21,8 @@
 
 #include <stdbool.h>
 
-#include "compat/compiler.h"
+#include "mpvcore/mp_common.h"
 #include "mpvcore/options.h"
-#include "demux/demux.h"
 
 // definitions used internally by the core player code
 
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c
index 6f81deae2e..afb04c837a 100644
--- a/mpvcore/player/osd.c
+++ b/mpvcore/player/osd.c
@@ -35,6 +35,7 @@
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
 
+#include "demux/demux.h"
 #include "sub/sub.h"
 
 #include "mp_core.h"