diff --git a/gst/rtsp-server/rtsp-media.h b/gst/rtsp-server/rtsp-media.h
index d78265d7c8..e4c95f13dd 100644
--- a/gst/rtsp-server/rtsp-media.h
+++ b/gst/rtsp-server/rtsp-media.h
@@ -362,6 +362,8 @@ GstRTSPStream *       gst_rtsp_media_find_stream      (GstRTSPMedia *media, cons
 
 GST_EXPORT
 gboolean              gst_rtsp_media_seek             (GstRTSPMedia *media, GstRTSPTimeRange *range);
+
+GST_EXPORT
 gboolean              gst_rtsp_media_seek_full        (GstRTSPMedia *media,
                                                        GstRTSPTimeRange *range,
                                                        GstSeekFlags flags);
diff --git a/gst/rtsp-server/rtsp-server.h b/gst/rtsp-server/rtsp-server.h
index a928cf59ed..0208d29032 100644
--- a/gst/rtsp-server/rtsp-server.h
+++ b/gst/rtsp-server/rtsp-server.h
@@ -24,6 +24,15 @@
 
 G_BEGIN_DECLS
 
+/* Do *not* use these defines outside of rtsp-server. Use G_DEPRECATED instead. */
+#ifdef GST_DISABLE_DEPRECATED
+#define GST_RTSP_SERVER_DEPRECATED GST_EXPORT
+#define GST_RTSP_SERVER_DEPRECATED_FOR(f) GST_EXPORT
+#else
+#define GST_RTSP_SERVER_DEPRECATED G_DEPRECATED GST_EXPORT
+#define GST_RTSP_SERVER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_EXPORT
+#endif
+
 typedef struct _GstRTSPServer GstRTSPServer;
 typedef struct _GstRTSPServerClass GstRTSPServerClass;
 typedef struct _GstRTSPServerPrivate GstRTSPServerPrivate;
diff --git a/gst/rtsp-server/rtsp-session.c b/gst/rtsp-server/rtsp-session.c
index e8fd68b19c..8e82ce2854 100644
--- a/gst/rtsp-server/rtsp-session.c
+++ b/gst/rtsp-server/rtsp-session.c
@@ -681,10 +681,6 @@ gst_rtsp_session_next_timeout_usec (GstRTSPSession * session, gint64 now)
  * Deprecated: Use gst_rtsp_session_next_timeout_usec() instead.
  */
 #ifndef GST_REMOVE_DEPRECATED
-#ifdef GST_DISABLE_DEPRECATED
-gint gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now);
-#endif
-
 gint
 gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
 {
@@ -756,9 +752,6 @@ gst_rtsp_session_is_expired_usec (GstRTSPSession * session, gint64 now)
  * Deprecated: Use gst_rtsp_session_is_expired_usec() instead.
  */
 #ifndef GST_REMOVE_DEPRECATED
-#ifdef GST_DISABLE_DEPRECATED
-gboolean gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now);
-#endif
 gboolean
 gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
 {
diff --git a/gst/rtsp-server/rtsp-session.h b/gst/rtsp-server/rtsp-session.h
index ed97b76f21..8f7cf4d729 100644
--- a/gst/rtsp-server/rtsp-session.h
+++ b/gst/rtsp-server/rtsp-session.h
@@ -20,6 +20,7 @@
 #include <gst/gst.h>
 
 #include <gst/rtsp/gstrtsptransport.h>
+#include <gst/rtsp-server/rtsp-server.h> /* for GST_RTSP_SERVER_DEPRECATED_FOR */
 
 #ifndef __GST_RTSP_SESSION_H__
 #define __GST_RTSP_SESSION_H__
@@ -115,13 +116,12 @@ gint                   gst_rtsp_session_next_timeout_usec    (GstRTSPSession *se
 
 GST_EXPORT
 gboolean               gst_rtsp_session_is_expired_usec      (GstRTSPSession *session, gint64 now);
-#ifndef GST_DISABLE_DEPRECATED
-GST_EXPORT
+
+GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_session_next_timeout_usec)
 gint                   gst_rtsp_session_next_timeout         (GstRTSPSession *session, GTimeVal *now);
 
-GST_EXPORT
+GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_session_is_expired_usec)
 gboolean               gst_rtsp_session_is_expired           (GstRTSPSession *session, GTimeVal *now);
-#endif
 
 /* handle media in a session */