rtsp-server: GST_EXPORT -> GST_RTSP_SERVER_API

We need different export decorators for the different libs.
For now no actual change though, just rename before the release,
and add prelude headers to define the new decorator to GST_EXPORT.

26 files changed, 415 insertions, 365 deletions

diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index 95b239f..560b63d 100644
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -18,6 +18,7 @@ public_headers = \
 		rtsp-token.h \
 		rtsp-client.h \
 		rtsp-server.h \
+		rtsp-server-prelude.h \
 		rtsp-onvif-server.h \
 		rtsp-onvif-client.h \
 		rtsp-onvif-media-factory.h \
diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build
index 8e254ef..c2d7b37 100644
--- a/gst/rtsp-server/meson.build
+++ b/gst/rtsp-server/meson.build
@@ -40,6 +40,7 @@ rtsp_server_headers = [
   'rtsp-token.h',
   'rtsp-client.h',
   'rtsp-server.h',
+  'rtsp-server-prelude.h',
 ]
 install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server')
 
diff --git a/gst/rtsp-server/rtsp-address-pool.h b/gst/rtsp-server/rtsp-address-pool.h
index 45467be..997cfd1 100644
--- a/gst/rtsp-server/rtsp-address-pool.h
+++ b/gst/rtsp-server/rtsp-address-pool.h
@@ -17,11 +17,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gst/gst.h>
-
 #ifndef __GST_RTSP_ADDRESS_POOL_H__
 #define __GST_RTSP_ADDRESS_POOL_H__
 
+#include <gst/gst.h>
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 #define GST_TYPE_RTSP_ADDRESS_POOL              (gst_rtsp_address_pool_get_type ())
@@ -82,13 +83,13 @@ struct _GstRTSPAddress {
   gpointer priv;
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_address_get_type        (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddress * gst_rtsp_address_copy (GstRTSPAddress *addr);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void             gst_rtsp_address_free (GstRTSPAddress *addr);
 
 /**
@@ -153,21 +154,21 @@ struct _GstRTSPAddressPoolClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                  gst_rtsp_address_pool_get_type        (void);
 
 /* create a new address pool */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddressPool *   gst_rtsp_address_pool_new             (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_address_pool_clear           (GstRTSPAddressPool * pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_address_pool_dump            (GstRTSPAddressPool * pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean               gst_rtsp_address_pool_add_range       (GstRTSPAddressPool * pool,
                                                               const gchar *min_address,
                                                               const gchar *max_address,
@@ -175,12 +176,12 @@ gboolean               gst_rtsp_address_pool_add_range       (GstRTSPAddressPool
                                                               guint16 max_port,
                                                               guint8 ttl);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddress *       gst_rtsp_address_pool_acquire_address (GstRTSPAddressPool * pool,
                                                               GstRTSPAddressFlags flags,
                                                               gint n_ports);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddressPoolResult  gst_rtsp_address_pool_reserve_address (GstRTSPAddressPool * pool,
                                                               const gchar *ip_address,
                                                               guint port,
@@ -188,7 +189,7 @@ GstRTSPAddressPoolResult  gst_rtsp_address_pool_reserve_address (GstRTSPAddressP
                                                               guint ttl,
                                                               GstRTSPAddress ** address);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean               gst_rtsp_address_pool_has_unicast_addresses (GstRTSPAddressPool * pool);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
diff --git a/gst/rtsp-server/rtsp-auth.h b/gst/rtsp-server/rtsp-auth.h
index fb243ac..3bfe63d 100644
--- a/gst/rtsp-server/rtsp-auth.h
+++ b/gst/rtsp-server/rtsp-auth.h
@@ -26,6 +26,7 @@ typedef struct _GstRTSPAuth GstRTSPAuth;
 typedef struct _GstRTSPAuthClass GstRTSPAuthClass;
 typedef struct _GstRTSPAuthPrivate GstRTSPAuthPrivate;
 
+#include "rtsp-server-prelude.h"
 #include "rtsp-client.h"
 #include "rtsp-token.h"
 
@@ -81,63 +82,63 @@ struct _GstRTSPAuthClass {
   gpointer            _gst_reserved[GST_PADDING - 1];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType               gst_rtsp_auth_get_type          (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAuth *       gst_rtsp_auth_new               (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_set_tls_certificate (GstRTSPAuth *auth, GTlsCertificate *cert);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GTlsCertificate *   gst_rtsp_auth_get_tls_certificate (GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_set_tls_database (GstRTSPAuth *auth, GTlsDatabase *database);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GTlsDatabase *      gst_rtsp_auth_get_tls_database (GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_set_tls_authentication_mode (GstRTSPAuth *auth, GTlsAuthenticationMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GTlsAuthenticationMode gst_rtsp_auth_get_tls_authentication_mode (GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_set_default_token (GstRTSPAuth *auth, GstRTSPToken *token);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPToken *      gst_rtsp_auth_get_default_token (GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_add_basic         (GstRTSPAuth *auth, const gchar * basic,
                                                      GstRTSPToken *token);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_remove_basic      (GstRTSPAuth *auth, const gchar * basic);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_add_digest        (GstRTSPAuth *auth, const gchar *user,
                                                      const gchar *pass, GstRTSPToken *token);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_remove_digest     (GstRTSPAuth *auth, const gchar *user);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_auth_set_supported_methods (GstRTSPAuth *auth, GstRTSPAuthMethod methods);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAuthMethod   gst_rtsp_auth_get_supported_methods (GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean            gst_rtsp_auth_check             (const gchar *check);
 
 
 /* helpers */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *             gst_rtsp_auth_make_basic        (const gchar * user, const gchar * pass);
 
 /* checks */
diff --git a/gst/rtsp-server/rtsp-client.h b/gst/rtsp-server/rtsp-client.h
index edfce11..01846bc 100644
--- a/gst/rtsp-server/rtsp-client.h
+++ b/gst/rtsp-server/rtsp-client.h
@@ -29,6 +29,7 @@ typedef struct _GstRTSPClient GstRTSPClient;
 typedef struct _GstRTSPClientClass GstRTSPClientClass;
 typedef struct _GstRTSPClientPrivate GstRTSPClientPrivate;
 
+#include "rtsp-server-prelude.h"
 #include "rtsp-context.h"
 #include "rtsp-mount-points.h"
 #include "rtsp-sdp.h"
@@ -143,62 +144,62 @@ struct _GstRTSPClientClass {
   gpointer _gst_reserved[GST_PADDING_LARGE-16];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_client_get_type          (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPClient *       gst_rtsp_client_new               (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_set_session_pool  (GstRTSPClient *client,
                                                          GstRTSPSessionPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionPool *  gst_rtsp_client_get_session_pool  (GstRTSPClient *client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_set_mount_points  (GstRTSPClient *client,
                                                          GstRTSPMountPoints *mounts);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMountPoints *  gst_rtsp_client_get_mount_points  (GstRTSPClient *client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_set_auth          (GstRTSPClient *client, GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAuth *         gst_rtsp_client_get_auth          (GstRTSPClient *client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_set_thread_pool   (GstRTSPClient *client, GstRTSPThreadPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPThreadPool *   gst_rtsp_client_get_thread_pool   (GstRTSPClient *client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_client_set_connection    (GstRTSPClient *client, GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPConnection *   gst_rtsp_client_get_connection    (GstRTSPClient *client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_client_attach            (GstRTSPClient *client,
                                                          GMainContext *context);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_close             (GstRTSPClient * client);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_client_set_send_func     (GstRTSPClient *client,
                                                          GstRTSPClientSendFunc func,
                                                          gpointer user_data,
                                                          GDestroyNotify notify);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPResult         gst_rtsp_client_handle_message    (GstRTSPClient *client,
                                                          GstRTSPMessage *message);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPResult         gst_rtsp_client_send_message      (GstRTSPClient * client,
                                                          GstRTSPSession *session,
                                                          GstRTSPMessage *message);
@@ -226,7 +227,7 @@ typedef GstRTSPFilterResult (*GstRTSPClientSessionFilterFunc)  (GstRTSPClient *c
                                                                 GstRTSPSession *sess,
                                                                 gpointer user_data);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GList *                gst_rtsp_client_session_filter    (GstRTSPClient *client,
                                                           GstRTSPClientSessionFilterFunc func,
                                                           gpointer user_data);
diff --git a/gst/rtsp-server/rtsp-context.h b/gst/rtsp-server/rtsp-context.h
index 32d1ac0..dcd2f9b 100644
--- a/gst/rtsp-server/rtsp-context.h
+++ b/gst/rtsp-server/rtsp-context.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 typedef struct _GstRTSPContext GstRTSPContext;
 
+#include "rtsp-server-prelude.h"
 #include "rtsp-server.h"
 #include "rtsp-media.h"
 #include "rtsp-media-factory.h"
@@ -78,16 +79,16 @@ struct _GstRTSPContext {
   gpointer            _gst_reserved[GST_PADDING - 1];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_context_get_type (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPContext *     gst_rtsp_context_get_current   (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                 gst_rtsp_context_push_current  (GstRTSPContext * ctx);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                 gst_rtsp_context_pop_current   (GstRTSPContext * ctx);
 
 
diff --git a/gst/rtsp-server/rtsp-media-factory-uri.h b/gst/rtsp-server/rtsp-media-factory-uri.h
index f3d4a9e..cd0e9d5 100644
--- a/gst/rtsp-server/rtsp-media-factory-uri.h
+++ b/gst/rtsp-server/rtsp-media-factory-uri.h
@@ -65,21 +65,21 @@ struct _GstRTSPMediaFactoryURIClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_media_factory_uri_get_type   (void);
 
 /* creating the factory */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMediaFactoryURI * gst_rtsp_media_factory_uri_new     (void);
 
 /* configuring the factory */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_uri_set_uri  (GstRTSPMediaFactoryURI *factory,
                                                            const gchar *uri);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_media_factory_uri_get_uri  (GstRTSPMediaFactoryURI *factory);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
diff --git a/gst/rtsp-server/rtsp-media-factory.h b/gst/rtsp-server/rtsp-media-factory.h
index c76a240..350dae8 100644
--- a/gst/rtsp-server/rtsp-media-factory.h
+++ b/gst/rtsp-server/rtsp-media-factory.h
@@ -97,148 +97,148 @@ struct _GstRTSPMediaFactoryClass {
   gpointer         _gst_reserved[GST_PADDING_LARGE];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_media_factory_get_type     (void);
 
 /* creating the factory */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMediaFactory * gst_rtsp_media_factory_new          (void);
 
 /* configuring the factory */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_launch       (GstRTSPMediaFactory *factory,
                                                                const gchar *launch);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_media_factory_get_launch       (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_permissions  (GstRTSPMediaFactory *factory,
                                                                GstRTSPPermissions *permissions);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPermissions *  gst_rtsp_media_factory_get_permissions  (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_add_role         (GstRTSPMediaFactory *factory,
                                                                const gchar *role,
                                                                const gchar *fieldname, ...);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_add_role_from_structure (GstRTSPMediaFactory * factory,
                                                                GstStructure *structure);
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_shared       (GstRTSPMediaFactory *factory,
                                                                gboolean shared);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_factory_is_shared        (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_stop_on_disconnect       (GstRTSPMediaFactory *factory,
                                                                            gboolean stop_on_disconnect);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_factory_is_stop_on_disonnect        (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_suspend_mode (GstRTSPMediaFactory *factory,
                                                                GstRTSPSuspendMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSuspendMode    gst_rtsp_media_factory_get_suspend_mode (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_eos_shutdown (GstRTSPMediaFactory *factory,
                                                                gboolean eos_shutdown);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_factory_is_eos_shutdown  (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_profiles     (GstRTSPMediaFactory *factory,
                                                                GstRTSPProfile profiles);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPProfile        gst_rtsp_media_factory_get_profiles     (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_protocols    (GstRTSPMediaFactory *factory,
                                                                GstRTSPLowerTrans protocols);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPLowerTrans     gst_rtsp_media_factory_get_protocols    (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_address_pool (GstRTSPMediaFactory * factory,
                                                                GstRTSPAddressPool * pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddressPool *  gst_rtsp_media_factory_get_address_pool (GstRTSPMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_multicast_iface (GstRTSPMediaFactory *factory, const gchar *multicast_iface);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_media_factory_get_multicast_iface (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_buffer_size  (GstRTSPMediaFactory * factory,
                                                                guint size);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_media_factory_get_buffer_size  (GstRTSPMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_retransmission_time (GstRTSPMediaFactory * factory,
                                                                       GstClockTime time);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTime          gst_rtsp_media_factory_get_retransmission_time (GstRTSPMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_latency      (GstRTSPMediaFactory * factory,
                                                                guint                 latency);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_media_factory_get_latency      (GstRTSPMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_transport_mode (GstRTSPMediaFactory *factory,
                                                                  GstRTSPTransportMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPTransportMode  gst_rtsp_media_factory_get_transport_mode (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_media_gtype  (GstRTSPMediaFactory * factory,
                                                                GType media_gtype);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_media_factory_get_media_gtype  (GstRTSPMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_factory_set_clock        (GstRTSPMediaFactory *factory,
                                                                GstClock * clock);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClock *            gst_rtsp_media_factory_get_clock        (GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                    gst_rtsp_media_factory_set_publish_clock_mode (GstRTSPMediaFactory * factory, GstRTSPPublishClockMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPublishClockMode gst_rtsp_media_factory_get_publish_clock_mode (GstRTSPMediaFactory * factory);
 
 /* creating the media from the factory and a url */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMedia *        gst_rtsp_media_factory_construct        (GstRTSPMediaFactory *factory,
                                                                const GstRTSPUrl *url);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstElement *          gst_rtsp_media_factory_create_element   (GstRTSPMediaFactory *factory,
                                                                const GstRTSPUrl *url);
 
diff --git a/gst/rtsp-server/rtsp-media.h b/gst/rtsp-server/rtsp-media.h
index ae332ff..4d47517 100644
--- a/gst/rtsp-server/rtsp-media.h
+++ b/gst/rtsp-server/rtsp-media.h
@@ -24,6 +24,8 @@
 #ifndef __GST_RTSP_MEDIA_H__
 #define __GST_RTSP_MEDIA_H__
 
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 /* types for the media */
@@ -103,15 +105,15 @@ typedef enum {
 } GstRTSPPublishClockMode;
 
 #define GST_TYPE_RTSP_TRANSPORT_MODE (gst_rtsp_transport_mode_get_type())
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_transport_mode_get_type (void);
 
 #define GST_TYPE_RTSP_SUSPEND_MODE (gst_rtsp_suspend_mode_get_type())
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_suspend_mode_get_type (void);
 
 #define GST_TYPE_RTSP_PUBLISH_CLOCK_MODE (gst_rtsp_publish_clock_mode_get_type())
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_publish_clock_mode_get_type (void);
 
 #include "rtsp-stream.h"
@@ -189,201 +191,201 @@ struct _GstRTSPMediaClass {
   gpointer         _gst_reserved[GST_PADDING_LARGE-1];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_media_get_type         (void);
 
 /* creating the media */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMedia *        gst_rtsp_media_new              (GstElement *element);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstElement *          gst_rtsp_media_get_element      (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_take_pipeline    (GstRTSPMedia *media, GstPipeline *pipeline);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMediaStatus    gst_rtsp_media_get_status       (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_permissions  (GstRTSPMedia *media,
                                                        GstRTSPPermissions *permissions);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPermissions *  gst_rtsp_media_get_permissions  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_shared       (GstRTSPMedia *media, gboolean shared);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_is_shared        (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_stop_on_disconnect (GstRTSPMedia *media, gboolean stop_on_disconnect);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_is_stop_on_disconnect  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_transport_mode  (GstRTSPMedia *media, GstRTSPTransportMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPTransportMode  gst_rtsp_media_get_transport_mode  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_reusable     (GstRTSPMedia *media, gboolean reusable);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_is_reusable      (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_profiles     (GstRTSPMedia *media, GstRTSPProfile profiles);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPProfile        gst_rtsp_media_get_profiles     (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_protocols    (GstRTSPMedia *media, GstRTSPLowerTrans protocols);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPLowerTrans     gst_rtsp_media_get_protocols    (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_eos_shutdown (GstRTSPMedia *media, gboolean eos_shutdown);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_is_eos_shutdown  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_address_pool (GstRTSPMedia *media, GstRTSPAddressPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddressPool *  gst_rtsp_media_get_address_pool (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_multicast_iface (GstRTSPMedia *media, const gchar *multicast_iface);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_media_get_multicast_iface (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_buffer_size  (GstRTSPMedia *media, guint size);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_media_get_buffer_size  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_retransmission_time  (GstRTSPMedia *media, GstClockTime time);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTime          gst_rtsp_media_get_retransmission_time  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_latency      (GstRTSPMedia *media, guint latency);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_media_get_latency      (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_use_time_provider (GstRTSPMedia *media, gboolean time_provider);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_is_time_provider  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstNetTimeProvider *  gst_rtsp_media_get_time_provider (GstRTSPMedia *media,
                                                         const gchar *address, guint16 port);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_clock         (GstRTSPMedia *media, GstClock * clock);
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                    gst_rtsp_media_set_publish_clock_mode (GstRTSPMedia * media, GstRTSPPublishClockMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPublishClockMode gst_rtsp_media_get_publish_clock_mode (GstRTSPMedia * media);
 
 /* prepare the media for playback */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_prepare          (GstRTSPMedia *media, GstRTSPThread *thread);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_unprepare        (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_suspend_mode (GstRTSPMedia *media, GstRTSPSuspendMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSuspendMode    gst_rtsp_media_get_suspend_mode (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_suspend          (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_unsuspend        (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_setup_sdp        (GstRTSPMedia * media, GstSDPMessage * sdp,
                                                        GstSDPInfo * info);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp);
 
 /* creating streams */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_collect_streams  (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStream *       gst_rtsp_media_create_stream    (GstRTSPMedia *media,
                                                        GstElement *payloader,
                                                        GstPad *pad);
 
 /* dealing with the media */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClock *            gst_rtsp_media_get_clock        (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTime          gst_rtsp_media_get_base_time    (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_media_n_streams        (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStream *       gst_rtsp_media_get_stream       (GstRTSPMedia *media, guint idx);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStream *       gst_rtsp_media_find_stream      (GstRTSPMedia *media, const gchar * control);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_seek             (GstRTSPMedia *media, GstRTSPTimeRange *range);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_seek_full        (GstRTSPMedia *media,
                                                        GstRTSPTimeRange *range,
                                                        GstSeekFlags flags);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTimeDiff      gst_rtsp_media_seekable         (GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_media_get_range_string (GstRTSPMedia *media,
                                                        gboolean play,
                                                        GstRTSPRangeUnit unit);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_set_state        (GstRTSPMedia *media, GstState state,
                                                        GPtrArray *transports);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media,
                                                          GstState state);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_media_complete_pipeline (GstRTSPMedia * media, GPtrArray * transports);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
diff --git a/gst/rtsp-server/rtsp-mount-points.h b/gst/rtsp-server/rtsp-mount-points.h
index 9630bee..200620d 100644
--- a/gst/rtsp-server/rtsp-mount-points.h
+++ b/gst/rtsp-server/rtsp-mount-points.h
@@ -68,31 +68,31 @@ struct _GstRTSPMountPointsClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_mount_points_get_type       (void);
 
 /* creating a mount points */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMountPoints *  gst_rtsp_mount_points_new            (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_mount_points_make_path      (GstRTSPMountPoints *mounts,
                                                             const GstRTSPUrl * url);
 /* finding a media factory */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMediaFactory * gst_rtsp_mount_points_match          (GstRTSPMountPoints *mounts,
                                                             const gchar *path,
                                                             gint * matched);
 /* managing media to a mount point */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_mount_points_add_factory    (GstRTSPMountPoints *mounts,
                                                             const gchar *path,
                                                             GstRTSPMediaFactory *factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_mount_points_remove_factory (GstRTSPMountPoints *mounts,
                                                             const gchar *path);
 
diff --git a/gst/rtsp-server/rtsp-onvif-client.h b/gst/rtsp-server/rtsp-onvif-client.h
index 0dc4e98..5514209 100644
--- a/gst/rtsp-server/rtsp-onvif-client.h
+++ b/gst/rtsp-server/rtsp-onvif-client.h
@@ -51,7 +51,7 @@ struct GstRTSPOnvifClient
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_onvif_client_get_type (void);
 
 #endif /* __GST_RTSP_ONVIF_CLIENT_H__ */
diff --git a/gst/rtsp-server/rtsp-onvif-media-factory.h b/gst/rtsp-server/rtsp-onvif-media-factory.h
index 09e9d4b..0827039 100644
--- a/gst/rtsp-server/rtsp-onvif-media-factory.h
+++ b/gst/rtsp-server/rtsp-onvif-media-factory.h
@@ -54,24 +54,24 @@ struct GstRTSPOnvifMediaFactory
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_onvif_media_factory_get_type (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMediaFactory *gst_rtsp_onvif_media_factory_new (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void gst_rtsp_onvif_media_factory_set_backchannel_launch (GstRTSPOnvifMediaFactory *
     factory, const gchar * launch);
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar * gst_rtsp_onvif_media_factory_get_backchannel_launch (GstRTSPOnvifMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean gst_rtsp_onvif_media_factory_has_backchannel_support (GstRTSPOnvifMediaFactory * factory);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void gst_rtsp_onvif_media_factory_set_backchannel_bandwidth (GstRTSPOnvifMediaFactory * factory, guint bandwidth);
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint gst_rtsp_onvif_media_factory_get_backchannel_bandwidth (GstRTSPOnvifMediaFactory * factory);
 
 gboolean gst_rtsp_onvif_media_factory_requires_backchannel (GstRTSPMediaFactory * factory, GstRTSPContext * ctx);
diff --git a/gst/rtsp-server/rtsp-onvif-media.h b/gst/rtsp-server/rtsp-onvif-media.h
index a45c11e..3997c3e 100644
--- a/gst/rtsp-server/rtsp-onvif-media.h
+++ b/gst/rtsp-server/rtsp-onvif-media.h
@@ -53,14 +53,14 @@ struct GstRTSPOnvifMedia
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_onvif_media_get_type (void);
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean gst_rtsp_onvif_media_collect_backchannel (GstRTSPOnvifMedia * media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void gst_rtsp_onvif_media_set_backchannel_bandwidth (GstRTSPOnvifMedia * media, guint bandwidth);
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint gst_rtsp_onvif_media_get_backchannel_bandwidth (GstRTSPOnvifMedia * media);
 
 #endif /* __GST_RTSP_ONVIF_MEDIA_H__ */
diff --git a/gst/rtsp-server/rtsp-onvif-server.h b/gst/rtsp-server/rtsp-onvif-server.h
index 56bd9dc..f9d8e48 100644
--- a/gst/rtsp-server/rtsp-onvif-server.h
+++ b/gst/rtsp-server/rtsp-onvif-server.h
@@ -51,9 +51,9 @@ struct GstRTSPOnvifServer
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_onvif_server_get_type (void);
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPServer *gst_rtsp_onvif_server_new (void);
 
 #define GST_RTSP_ONVIF_BACKCHANNEL_REQUIREMENT "www.onvif.org/ver20/backchannel"
diff --git a/gst/rtsp-server/rtsp-params.h b/gst/rtsp-server/rtsp-params.h
index 4b5c734..f286316 100644
--- a/gst/rtsp-server/rtsp-params.h
+++ b/gst/rtsp-server/rtsp-params.h
@@ -30,10 +30,10 @@
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPResult    gst_rtsp_params_set      (GstRTSPClient * client, GstRTSPContext * ctx);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPResult    gst_rtsp_params_get      (GstRTSPClient * client, GstRTSPContext * ctx);
 
 G_END_DECLS
diff --git a/gst/rtsp-server/rtsp-permissions.h b/gst/rtsp-server/rtsp-permissions.h
index 792e397..fac55e4 100644
--- a/gst/rtsp-server/rtsp-permissions.h
+++ b/gst/rtsp-server/rtsp-permissions.h
@@ -22,11 +22,13 @@
 #ifndef __GST_RTSP_PERMISSIONS_H__
 #define __GST_RTSP_PERMISSIONS_H__
 
+#include "rtsp-server-prelude.h"
+
 typedef struct _GstRTSPPermissions GstRTSPPermissions;
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_permissions_get_type (void);
 
 #define GST_TYPE_RTSP_PERMISSIONS        (gst_rtsp_permissions_get_type ())
@@ -72,42 +74,42 @@ gst_rtsp_permissions_unref (GstRTSPPermissions * permissions)
 }
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPermissions *  gst_rtsp_permissions_new             (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_add_role        (GstRTSPPermissions *permissions,
                                                             const gchar *role,
                                                             const gchar *fieldname, ...);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_add_role_valist (GstRTSPPermissions *permissions,
                                                             const gchar *role,
                                                             const gchar *fieldname,
                                                             va_list var_args);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_add_role_empty  (GstRTSPPermissions * permissions,
                                                             const gchar * role);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_add_role_from_structure (GstRTSPPermissions * permissions,
                                                             GstStructure *structure);
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_add_permission_for_role (GstRTSPPermissions * permissions,
                                                             const gchar * role,
                                                             const gchar * permission,
                                                             gboolean      allowed);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_permissions_remove_role     (GstRTSPPermissions *permissions,
                                                             const gchar *role);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 const GstStructure *  gst_rtsp_permissions_get_role        (GstRTSPPermissions *permissions,
                                                             const gchar *role);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_permissions_is_allowed      (GstRTSPPermissions *permissions,
                                                             const gchar *role, const gchar *permission);
 
diff --git a/gst/rtsp-server/rtsp-sdp.h b/gst/rtsp-server/rtsp-sdp.h
index 8683e32..20d2ac8 100644
--- a/gst/rtsp-server/rtsp-sdp.h
+++ b/gst/rtsp-server/rtsp-sdp.h
@@ -34,13 +34,13 @@ typedef struct {
 
 /* creating SDP */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean            gst_rtsp_sdp_from_media  (GstSDPMessage *sdp, GstSDPInfo *info, GstRTSPMedia * media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean            gst_rtsp_sdp_from_stream (GstSDPMessage * sdp, GstSDPInfo * info, GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean
 gst_rtsp_sdp_make_media (GstSDPMessage * sdp, GstSDPInfo * info, GstRTSPStream * stream, GstCaps * caps, GstRTSPProfile profile);
 
diff --git a/gst/rtsp-server/rtsp-server-prelude.h b/gst/rtsp-server/rtsp-server-prelude.h
new file mode 100644
index 0000000..4f0dca8
--- /dev/null
+++ b/gst/rtsp-server/rtsp-server-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer RtspServer Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * rtspserver-prelude.h: prelude include header for gst-rtspserver library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_RTSP_SERVER_PRELUDE_H__
+#define __GST_RTSP_SERVER_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_RTSP_SERVER_API
+#define GST_RTSP_SERVER_API GST_EXPORT
+#endif
+
+#endif /* __GST_RTSP_SERVER_PRELUDE_H__ */
diff --git a/gst/rtsp-server/rtsp-server.h b/gst/rtsp-server/rtsp-server.h
index 0208d29..7364864 100644
--- a/gst/rtsp-server/rtsp-server.h
+++ b/gst/rtsp-server/rtsp-server.h
@@ -26,17 +26,18 @@ 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
+#define GST_RTSP_SERVER_DEPRECATED GST_RTSP_SERVER_API
+#define GST_RTSP_SERVER_DEPRECATED_FOR(f) GST_RTSP_SERVER_API
 #else
-#define GST_RTSP_SERVER_DEPRECATED G_DEPRECATED GST_EXPORT
-#define GST_RTSP_SERVER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_EXPORT
+#define GST_RTSP_SERVER_DEPRECATED G_DEPRECATED GST_RTSP_SERVER_API
+#define GST_RTSP_SERVER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_RTSP_SERVER_API
 #endif
 
 typedef struct _GstRTSPServer GstRTSPServer;
 typedef struct _GstRTSPServerClass GstRTSPServerClass;
 typedef struct _GstRTSPServerPrivate GstRTSPServerPrivate;
 
+#include "rtsp-server-prelude.h"
 #include "rtsp-session-pool.h"
 #include "rtsp-session.h"
 #include "rtsp-media.h"
@@ -102,77 +103,77 @@ struct _GstRTSPServerClass {
   gpointer         _gst_reserved[GST_PADDING_LARGE];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_server_get_type             (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPServer *       gst_rtsp_server_new                  (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_address          (GstRTSPServer *server, const gchar *address);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_server_get_address          (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_service          (GstRTSPServer *server, const gchar *service);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *               gst_rtsp_server_get_service          (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_backlog          (GstRTSPServer *server, gint backlog);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gint                  gst_rtsp_server_get_backlog          (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 int                   gst_rtsp_server_get_bound_port       (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_session_pool     (GstRTSPServer *server, GstRTSPSessionPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionPool *  gst_rtsp_server_get_session_pool     (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_mount_points     (GstRTSPServer *server, GstRTSPMountPoints *mounts);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMountPoints *  gst_rtsp_server_get_mount_points     (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_auth             (GstRTSPServer *server, GstRTSPAuth *auth);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAuth *         gst_rtsp_server_get_auth             (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_server_set_thread_pool      (GstRTSPServer *server, GstRTSPThreadPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPThreadPool *   gst_rtsp_server_get_thread_pool      (GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_server_transfer_connection  (GstRTSPServer * server, GSocket *socket,
                                                             const gchar * ip, gint port,
                                                             const gchar *initial_buffer);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_server_io_func              (GSocket *socket, GIOCondition condition,
                                                             GstRTSPServer *server);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSocket *             gst_rtsp_server_create_socket        (GstRTSPServer *server,
                                                             GCancellable  *cancellable,
                                                             GError **error);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSource *             gst_rtsp_server_create_source        (GstRTSPServer *server,
                                                             GCancellable * cancellable,
                                                             GError **error);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_server_attach               (GstRTSPServer *server,
                                                             GMainContext *context);
 
@@ -200,7 +201,7 @@ typedef GstRTSPFilterResult (*GstRTSPServerClientFilterFunc)  (GstRTSPServer *se
                                                                GstRTSPClient *client,
                                                                gpointer user_data);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GList *                gst_rtsp_server_client_filter    (GstRTSPServer *server,
                                                          GstRTSPServerClientFilterFunc func,
                                                          gpointer user_data);
diff --git a/gst/rtsp-server/rtsp-session-media.h b/gst/rtsp-server/rtsp-session-media.h
index 2a6fe2a..a209466 100644
--- a/gst/rtsp-server/rtsp-session-media.h
+++ b/gst/rtsp-server/rtsp-session-media.h
@@ -24,6 +24,8 @@
 #ifndef __GST_RTSP_SESSION_MEDIA_H__
 #define __GST_RTSP_SESSION_MEDIA_H__
 
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 #define GST_TYPE_RTSP_SESSION_MEDIA              (gst_rtsp_session_media_get_type ())
@@ -61,55 +63,55 @@ struct _GstRTSPSessionMediaClass
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                    gst_rtsp_session_media_get_type       (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionMedia *    gst_rtsp_session_media_new            (const gchar *path,
                                                                 GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_session_media_matches        (GstRTSPSessionMedia *media,
                                                                 const gchar *path,
                                                                 gint * matched);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPMedia *           gst_rtsp_session_media_get_media      (GstRTSPSessionMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTime             gst_rtsp_session_media_get_base_time  (GstRTSPSessionMedia *media);
 /* control media */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_session_media_set_state      (GstRTSPSessionMedia *media,
                                                                 GstState state);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_session_media_set_rtsp_state (GstRTSPSessionMedia *media,
                                                                 GstRTSPState state);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPState             gst_rtsp_session_media_get_rtsp_state (GstRTSPSessionMedia *media);
 
 /* get stream transport config */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStreamTransport * gst_rtsp_session_media_set_transport  (GstRTSPSessionMedia *media,
                                                                 GstRTSPStream *stream,
                                                                 GstRTSPTransport *tr);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStreamTransport * gst_rtsp_session_media_get_transport  (GstRTSPSessionMedia *media,
                                                                 guint idx);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GPtrArray *              gst_rtsp_session_media_get_transports (GstRTSPSessionMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_session_media_alloc_channels (GstRTSPSessionMedia *media,
                                                                 GstRTSPRange *range);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *                  gst_rtsp_session_media_get_rtpinfo    (GstRTSPSessionMedia * media);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
diff --git a/gst/rtsp-server/rtsp-session-pool.h b/gst/rtsp-server/rtsp-session-pool.h
index 2680004..aeb375c 100644
--- a/gst/rtsp-server/rtsp-session-pool.h
+++ b/gst/rtsp-server/rtsp-session-pool.h
@@ -22,6 +22,8 @@
 #ifndef __GST_RTSP_SESSION_POOL_H__
 #define __GST_RTSP_SESSION_POOL_H__
 
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 typedef struct _GstRTSPSessionPool GstRTSPSessionPool;
@@ -113,49 +115,49 @@ typedef GstRTSPFilterResult (*GstRTSPSessionPoolFilterFunc)  (GstRTSPSessionPool
                                                               gpointer user_data);
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                 gst_rtsp_session_pool_get_type          (void);
 
 /* creating a session pool */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionPool *  gst_rtsp_session_pool_new               (void);
 
 /* counting sessions */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                  gst_rtsp_session_pool_set_max_sessions  (GstRTSPSessionPool *pool, guint max);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_session_pool_get_max_sessions  (GstRTSPSessionPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_session_pool_get_n_sessions    (GstRTSPSessionPool *pool);
 
 /* managing sessions */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSession *      gst_rtsp_session_pool_create            (GstRTSPSessionPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSession *      gst_rtsp_session_pool_find              (GstRTSPSessionPool *pool,
                                                                const gchar *sessionid);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean              gst_rtsp_session_pool_remove            (GstRTSPSessionPool *pool,
                                                                GstRTSPSession *sess);
 
 /* perform session maintenance */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GList *               gst_rtsp_session_pool_filter            (GstRTSPSessionPool *pool,
                                                                GstRTSPSessionPoolFilterFunc func,
                                                                gpointer user_data);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                 gst_rtsp_session_pool_cleanup           (GstRTSPSessionPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSource *             gst_rtsp_session_pool_create_watch      (GstRTSPSessionPool *pool);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
diff --git a/gst/rtsp-server/rtsp-session.h b/gst/rtsp-server/rtsp-session.h
index 229202d..62d653a 100644
--- a/gst/rtsp-server/rtsp-session.h
+++ b/gst/rtsp-server/rtsp-session.h
@@ -80,41 +80,41 @@ struct _GstRTSPSessionClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                  gst_rtsp_session_get_type             (void);
 
 /* create a new session */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSession *       gst_rtsp_session_new                  (const gchar *sessionid);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 const gchar *          gst_rtsp_session_get_sessionid        (GstRTSPSession *session);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *                gst_rtsp_session_get_header           (GstRTSPSession *session);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_session_set_timeout          (GstRTSPSession *session, guint timeout);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint                  gst_rtsp_session_get_timeout          (GstRTSPSession *session);
 
 /* session timeout stuff */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_session_touch                (GstRTSPSession *session);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_session_prevent_expire       (GstRTSPSession *session);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                   gst_rtsp_session_allow_expire         (GstRTSPSession *session);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gint                   gst_rtsp_session_next_timeout_usec    (GstRTSPSession *session, gint64 now);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean               gst_rtsp_session_is_expired_usec      (GstRTSPSession *session, gint64 now);
 
 GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_session_next_timeout_usec)
@@ -125,17 +125,17 @@ gboolean               gst_rtsp_session_is_expired           (GstRTSPSession *se
 
 /* handle media in a session */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionMedia *  gst_rtsp_session_manage_media         (GstRTSPSession *sess,
                                                               const gchar *path,
                                                               GstRTSPMedia *media);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean               gst_rtsp_session_release_media        (GstRTSPSession *sess,
                                                               GstRTSPSessionMedia *media);
 /* get media in a session */
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPSessionMedia *  gst_rtsp_session_get_media            (GstRTSPSession *sess,
                                                               const gchar *path,
                                                               gint * matched);
@@ -164,7 +164,7 @@ typedef GstRTSPFilterResult (*GstRTSPSessionFilterFunc)  (GstRTSPSession *sess,
                                                           GstRTSPSessionMedia *media,
                                                           gpointer user_data);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GList *                gst_rtsp_session_filter           (GstRTSPSession *sess,
                                                           GstRTSPSessionFilterFunc func,
                                                           gpointer user_data);
diff --git a/gst/rtsp-server/rtsp-stream-transport.h b/gst/rtsp-server/rtsp-stream-transport.h
index 11a3395..f608b8a 100644
--- a/gst/rtsp-server/rtsp-stream-transport.h
+++ b/gst/rtsp-server/rtsp-stream-transport.h
@@ -24,6 +24,8 @@
 #ifndef __GST_RTSP_STREAM_TRANSPORT_H__
 #define __GST_RTSP_STREAM_TRANSPORT_H__
 
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 /* types for the media */
@@ -84,73 +86,73 @@ struct _GstRTSPStreamTransportClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType                    gst_rtsp_stream_transport_get_type (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStreamTransport * gst_rtsp_stream_transport_new           (GstRTSPStream *stream,
                                                                   GstRTSPTransport *tr);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStream *          gst_rtsp_stream_transport_get_stream    (GstRTSPStreamTransport *trans);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_set_transport (GstRTSPStreamTransport *trans,
                                                                   GstRTSPTransport * tr);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 const GstRTSPTransport * gst_rtsp_stream_transport_get_transport (GstRTSPStreamTransport *trans);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_set_url       (GstRTSPStreamTransport *trans,
                                                                   const GstRTSPUrl * url);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 const GstRTSPUrl *       gst_rtsp_stream_transport_get_url       (GstRTSPStreamTransport *trans);
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *                  gst_rtsp_stream_transport_get_rtpinfo   (GstRTSPStreamTransport *trans,
                                                                   GstClockTime start_time);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_set_callbacks (GstRTSPStreamTransport *trans,
                                                                   GstRTSPSendFunc send_rtp,
                                                                   GstRTSPSendFunc send_rtcp,
                                                                   gpointer user_data,
                                                                   GDestroyNotify  notify);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_set_keepalive (GstRTSPStreamTransport *trans,
                                                                   GstRTSPKeepAliveFunc keep_alive,
                                                                   gpointer user_data,
                                                                   GDestroyNotify  notify);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_keep_alive    (GstRTSPStreamTransport *trans);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_stream_transport_set_active    (GstRTSPStreamTransport *trans,
                                                                   gboolean active);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                     gst_rtsp_stream_transport_set_timed_out (GstRTSPStreamTransport *trans,
                                                                   gboolean timedout);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_stream_transport_is_timed_out  (GstRTSPStreamTransport *trans);
 
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_stream_transport_send_rtp      (GstRTSPStreamTransport *trans,
                                                                   GstBuffer *buffer);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean                 gst_rtsp_stream_transport_send_rtcp     (GstRTSPStreamTransport *trans,
                                                                   GstBuffer *buffer);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstFlowReturn            gst_rtsp_stream_transport_recv_data     (GstRTSPStreamTransport *trans,
                                                                   guint channel, GstBuffer *buffer);
 
diff --git a/gst/rtsp-server/rtsp-stream.h b/gst/rtsp-server/rtsp-stream.h
index dc248d1..f16c944 100644
--- a/gst/rtsp-server/rtsp-stream.h
+++ b/gst/rtsp-server/rtsp-stream.h
@@ -24,6 +24,8 @@
 #ifndef __GST_RTSP_STREAM_H__
 #define __GST_RTSP_STREAM_H__
 
+#include "rtsp-server-prelude.h"
+
 G_BEGIN_DECLS
 
 /* types for the media stream */
@@ -65,238 +67,238 @@ struct _GstRTSPStreamClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType             gst_rtsp_stream_get_type         (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPStream *   gst_rtsp_stream_new              (guint idx, GstElement *payloader,
                                                     GstPad *pad);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint             gst_rtsp_stream_get_index        (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint             gst_rtsp_stream_get_pt           (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstPad *          gst_rtsp_stream_get_srcpad       (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstPad *          gst_rtsp_stream_get_sinkpad      (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_control      (GstRTSPStream *stream, const gchar *control);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *           gst_rtsp_stream_get_control      (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_has_control      (GstRTSPStream *stream, const gchar *control);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_mtu          (GstRTSPStream *stream, guint mtu);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint             gst_rtsp_stream_get_mtu          (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_dscp_qos     (GstRTSPStream *stream, gint dscp_qos);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gint              gst_rtsp_stream_get_dscp_qos     (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_is_transport_supported  (GstRTSPStream *stream,
                                                            GstRTSPTransport *transport);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_profiles     (GstRTSPStream *stream, GstRTSPProfile profiles);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPProfile    gst_rtsp_stream_get_profiles     (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_protocols    (GstRTSPStream *stream, GstRTSPLowerTrans protocols);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPLowerTrans gst_rtsp_stream_get_protocols    (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_address_pool (GstRTSPStream *stream, GstRTSPAddressPool *pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddressPool *
                   gst_rtsp_stream_get_address_pool (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_multicast_iface (GstRTSPStream *stream, const gchar * multicast_iface);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gchar *           gst_rtsp_stream_get_multicast_iface (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddress *  gst_rtsp_stream_reserve_address  (GstRTSPStream *stream,
                                                     const gchar * address,
                                                     guint port,
                                                     guint n_ports,
                                                     guint ttl);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_join_bin         (GstRTSPStream *stream,
                                                     GstBin *bin, GstElement *rtpbin,
                                                     GstState state);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_leave_bin        (GstRTSPStream *stream,
                                                     GstBin *bin, GstElement *rtpbin);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstBin *          gst_rtsp_stream_get_joined_bin   (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_set_blocked      (GstRTSPStream * stream,
                                                     gboolean blocked);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_is_blocking      (GstRTSPStream * stream);
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_unblock_linked   (GstRTSPStream * stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_client_side (GstRTSPStream *stream, gboolean client_side);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_is_client_side (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_get_server_port  (GstRTSPStream *stream,
                                                     GstRTSPRange *server_port,
                                                     GSocketFamily family);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPAddress *  gst_rtsp_stream_get_multicast_address (GstRTSPStream *stream,
                                                          GSocketFamily family);
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GObject *         gst_rtsp_stream_get_rtpsession   (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstElement *      gst_rtsp_stream_get_srtp_encoder (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_get_ssrc         (GstRTSPStream *stream,
                                                     guint *ssrc);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_get_rtpinfo      (GstRTSPStream *stream,
                                                     guint *rtptime, guint *seq,
                                                     guint *clock_rate,
                                                     GstClockTime *running_time);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstCaps *         gst_rtsp_stream_get_caps         (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstFlowReturn     gst_rtsp_stream_recv_rtp         (GstRTSPStream *stream,
                                                     GstBuffer *buffer);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstFlowReturn     gst_rtsp_stream_recv_rtcp        (GstRTSPStream *stream,
                                                     GstBuffer *buffer);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_add_transport    (GstRTSPStream *stream,
                                                     GstRTSPStreamTransport *trans);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_remove_transport (GstRTSPStream *stream,
                                                     GstRTSPStreamTransport *trans);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSocket *         gst_rtsp_stream_get_rtp_socket   (GstRTSPStream *stream,
                                                     GSocketFamily family);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSocket *         gst_rtsp_stream_get_rtcp_socket  (GstRTSPStream *stream,
                                                     GSocketFamily family);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSocket *         gst_rtsp_stream_get_rtp_multicast_socket (GstRTSPStream *stream,
                                                             GSocketFamily family);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GSocket *         gst_rtsp_stream_get_rtcp_multicast_socket (GstRTSPStream *stream,
                                                              GSocketFamily family);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_update_crypto    (GstRTSPStream * stream,
                                                     guint ssrc, GstCaps * crypto);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_query_position   (GstRTSPStream * stream,
                                                     gint64 * position);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_query_stop       (GstRTSPStream * stream,
                                                     gint64 * stop);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_seekable         (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_seqnum_offset          (GstRTSPStream *stream, guint16 seqnum);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint16           gst_rtsp_stream_get_current_seqnum          (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_retransmission_time     (GstRTSPStream *stream, GstClockTime time);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstClockTime      gst_rtsp_stream_get_retransmission_time     (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint             gst_rtsp_stream_get_retransmission_pt       (GstRTSPStream * stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_retransmission_pt       (GstRTSPStream * stream,
                                                                guint rtx_pt);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_buffer_size  (GstRTSPStream *stream, guint size);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 guint             gst_rtsp_stream_get_buffer_size  (GstRTSPStream *stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_stream_set_pt_map                 (GstRTSPStream * stream, guint pt, GstCaps * caps);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstElement *      gst_rtsp_stream_request_aux_sender         (GstRTSPStream * stream, guint sessid);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_allocate_udp_sockets       (GstRTSPStream * stream, GSocketFamily family,
                                                               GstRTSPTransport *transport, gboolean use_client_settings);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                    gst_rtsp_stream_set_publish_clock_mode (GstRTSPStream * stream, GstRTSPPublishClockMode mode);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPPublishClockMode gst_rtsp_stream_get_publish_clock_mode (GstRTSPStream * stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_stream_complete_stream (GstRTSPStream * stream, const GstRTSPTransport * transport);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean           gst_rtsp_stream_is_complete (GstRTSPStream * stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean           gst_rtsp_stream_is_sender (GstRTSPStream * stream);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean           gst_rtsp_stream_is_receiver (GstRTSPStream * stream);
 
 /**
@@ -323,7 +325,7 @@ typedef GstRTSPFilterResult (*GstRTSPStreamTransportFilterFunc) (GstRTSPStream *
                                                                  GstRTSPStreamTransport *trans,
                                                                  gpointer user_data);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GList *                gst_rtsp_stream_transport_filter  (GstRTSPStream *stream,
                                                           GstRTSPStreamTransportFilterFunc func,
                                                           gpointer user_data);
diff --git a/gst/rtsp-server/rtsp-thread-pool.h b/gst/rtsp-server/rtsp-thread-pool.h
index 87ed73b..01ca3ac 100644
--- a/gst/rtsp-server/rtsp-thread-pool.h
+++ b/gst/rtsp-server/rtsp-thread-pool.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 #define GST_RTSP_THREAD_POOL_CAST(obj)         ((GstRTSPThreadPool*)(obj))
 #define GST_RTSP_THREAD_POOL_CLASS_CAST(klass) ((GstRTSPThreadPoolClass*)(klass))
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_thread_get_type (void);
 
 #define GST_TYPE_RTSP_THREAD        (gst_rtsp_thread_get_type ())
@@ -78,13 +78,13 @@ struct _GstRTSPThread {
   GMainLoop *loop;
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPThread *   gst_rtsp_thread_new      (GstRTSPThreadType type);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean          gst_rtsp_thread_reuse    (GstRTSPThread * thread);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void              gst_rtsp_thread_stop     (GstRTSPThread * thread);
 
 /**
@@ -159,24 +159,24 @@ struct _GstRTSPThreadPoolClass {
   gpointer         _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType               gst_rtsp_thread_pool_get_type        (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPThreadPool * gst_rtsp_thread_pool_new             (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_thread_pool_set_max_threads (GstRTSPThreadPool * pool, gint max_threads);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 gint                gst_rtsp_thread_pool_get_max_threads (GstRTSPThreadPool * pool);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPThread *     gst_rtsp_thread_pool_get_thread      (GstRTSPThreadPool *pool,
                                                           GstRTSPThreadType type,
                                                           GstRTSPContext *ctx);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                gst_rtsp_thread_pool_cleanup         (void);
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstRTSPThread, gst_rtsp_thread_unref)
diff --git a/gst/rtsp-server/rtsp-token.h b/gst/rtsp-server/rtsp-token.h
index 3122ed4..27e18fb 100644
--- a/gst/rtsp-server/rtsp-token.h
+++ b/gst/rtsp-server/rtsp-token.h
@@ -28,7 +28,7 @@ typedef struct _GstRTSPToken GstRTSPToken;
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GType gst_rtsp_token_get_type(void);
 
 #define GST_TYPE_RTSP_TOKEN        (gst_rtsp_token_get_type())
@@ -74,33 +74,33 @@ gst_rtsp_token_unref (GstRTSPToken * token)
 }
 
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPToken *       gst_rtsp_token_new_empty          (void);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPToken *       gst_rtsp_token_new                (const gchar * firstfield, ...);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstRTSPToken *       gst_rtsp_token_new_valist         (const gchar * firstfield, va_list var_args);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 const GstStructure * gst_rtsp_token_get_structure      (GstRTSPToken *token);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 GstStructure *       gst_rtsp_token_writable_structure (GstRTSPToken *token);
 
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                 gst_rtsp_token_set_string         (GstRTSPToken * token,
                                                         const gchar  * field,
                                                         const gchar  * string_value);
-GST_EXPORT
+GST_RTSP_SERVER_API
 const gchar *        gst_rtsp_token_get_string         (GstRTSPToken *token,
                                                         const gchar *field);
-GST_EXPORT
+GST_RTSP_SERVER_API
 void                 gst_rtsp_token_set_bool           (GstRTSPToken * token,
                                                         const gchar  * field,
                                                         gboolean       bool_value);
-GST_EXPORT
+GST_RTSP_SERVER_API
 gboolean             gst_rtsp_token_is_allowed         (GstRTSPToken *token,
                                                         const gchar *field);