diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-private.h b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-private.h
index 63faaf43a3..e485e98708 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-private.h
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-private.h
@@ -218,10 +218,7 @@ typedef struct
   GstClockTimeDiff runningtime_buffering;
 } TrackQueueItem;
 
-GstAdaptiveDemux2Stream *find_stream_for_track_locked (GstAdaptiveDemux *
-    demux, GstAdaptiveDemuxTrack * track);
-
-GstMiniObject * track_dequeue_data_locked (GstAdaptiveDemux * demux, GstAdaptiveDemuxTrack * track, gboolean check_sticky_events);
+GstMiniObject * gst_adaptive_demux_track_dequeue_data_locked (GstAdaptiveDemux * demux, GstAdaptiveDemuxTrack * track, gboolean check_sticky_events);
 void gst_adaptive_demux_track_flush (GstAdaptiveDemuxTrack * track);
 void gst_adaptive_demux_track_drain_to (GstAdaptiveDemuxTrack * track, GstClockTime drain_running_time);
 void gst_adaptive_demux_track_update_next_position (GstAdaptiveDemuxTrack * track);
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-track.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-track.c
index 62e3ada921..b29e66d73a 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-track.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-track.c
@@ -118,7 +118,7 @@ static inline GstClockTimeDiff my_segment_to_running_time (GstSegment * segment,
 /* Dequeue or generate a buffer/event from the track queue and update the buffering levels
  * TRACKS_LOCK hold */
 GstMiniObject *
-track_dequeue_data_locked (GstAdaptiveDemux * demux,
+gst_adaptive_demux_track_dequeue_data_locked (GstAdaptiveDemux * demux,
     GstAdaptiveDemuxTrack * track, gboolean check_sticky_events)
 {
   GstMiniObject *res = NULL;
@@ -371,7 +371,8 @@ gst_adaptive_demux_track_drain_to (GstAdaptiveDemuxTrack * track,
      * will be collected by the dequeue function, gaps will be started.
      * If it's a buffer, mark the track as discont to get the flag set
      * on the next output buffer */
-    next_mo = track_dequeue_data_locked (demux, track, FALSE);
+    next_mo =
+        gst_adaptive_demux_track_dequeue_data_locked (demux, track, FALSE);
     if (GST_IS_BUFFER (next_mo)) {
       track->output_discont = TRUE;
     }
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
index aa041a4eaf..2bd6eb4bd4 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
@@ -1890,7 +1890,7 @@ demux_post_buffering_locked (GstAdaptiveDemux * demux)
 }
 
 /* MANIFEST_LOCK and TRACKS_LOCK hold */
-GstAdaptiveDemux2Stream *
+static GstAdaptiveDemux2Stream *
 find_stream_for_track_locked (GstAdaptiveDemux * demux,
     GstAdaptiveDemuxTrack * track)
 {
@@ -3484,7 +3484,8 @@ restart:
         || ((track->next_position != GST_CLOCK_STIME_NONE)
             && track->next_position <= global_output_position)
         || ((track->next_position == GST_CLOCK_STIME_NONE) && track->eos)) {
-      GstMiniObject *mo = track_dequeue_data_locked (demux, track, TRUE);
+      GstMiniObject *mo =
+          gst_adaptive_demux_track_dequeue_data_locked (demux, track, TRUE);
 
       if (!mo) {
         GST_DEBUG_OBJECT (demux,