diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index c9c950de8a..6799843ee0 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -25,8 +25,10 @@ extern "C" {
 #include <windows.h>  // windows.h, but not the other way around.
 #endif
 #include "demux_rtp.h"
+#include "stream/stream.h"
 #include "stheader.h"
 #include "options.h"
+#include "config.h"
 }
 #include "demux_rtp_internal.h"
 
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 7ff4d77a85..3c17a1e42f 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -23,6 +23,7 @@
 
 extern "C" {
 #include "demuxer.h"
+#include "config.h"
 #ifdef CONFIG_FFMPEG
 #include "libavcodec/avcodec.h"
 #endif
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 6f51dc76dc..5585cf73ed 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "stream/stream.h"
 #include "bstr.h"
 #include "mpcommon.h"
 
diff --git a/timeline/tl_edl.c b/timeline/tl_edl.c
index 1a54918bcc..8bd5c18f3e 100644
--- a/timeline/tl_edl.c
+++ b/timeline/tl_edl.c
@@ -29,6 +29,7 @@
 #include "path.h"
 #include "bstr.h"
 #include "mpcommon.h"
+#include "stream/stream.h"
 
 
 struct edl_source {
diff --git a/timeline/tl_matroska.c b/timeline/tl_matroska.c
index 967ee556ae..d378cf3aa4 100644
--- a/timeline/tl_matroska.c
+++ b/timeline/tl_matroska.c
@@ -31,6 +31,8 @@
 #include "path.h"
 #include "bstr.h"
 #include "mpcommon.h"
+#include "stream/stream.h"
+
 
 static char **find_files(const char *original_file, const char *suffix)
 {