diff --git a/gst/rtsp-server/rtsp-media-factory-uri.c b/gst/rtsp-server/rtsp-media-factory-uri.c
index c0932b90c0..bb0d661dc9 100644
--- a/gst/rtsp-server/rtsp-media-factory-uri.c
+++ b/gst/rtsp-server/rtsp-media-factory-uri.c
@@ -60,7 +60,7 @@ free_data (FactoryData * data)
 
 static const gchar *factory_key = "GstRTSPMediaFactoryURI";
 
-GST_DEBUG_CATEGORY (rtsp_media_factory_uri_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_media_factory_uri_debug);
 #define GST_CAT_DEFAULT rtsp_media_factory_uri_debug
 
 static void gst_rtsp_media_factory_uri_get_property (GObject * object,
diff --git a/gst/rtsp-server/rtsp-media-factory.c b/gst/rtsp-server/rtsp-media-factory.c
index 2fe309d320..f4045e886b 100644
--- a/gst/rtsp-server/rtsp-media-factory.c
+++ b/gst/rtsp-server/rtsp-media-factory.c
@@ -32,7 +32,7 @@ enum
   PROP_LAST
 };
 
-GST_DEBUG_CATEGORY (rtsp_media_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_media_debug);
 #define GST_CAT_DEFAULT rtsp_media_debug
 
 static void gst_rtsp_media_factory_get_property (GObject * object, guint propid,
@@ -102,7 +102,8 @@ gst_rtsp_media_factory_class_init (GstRTSPMediaFactoryClass * klass)
   klass->configure = default_configure;
   klass->create_pipeline = default_create_pipeline;
 
-  GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmedia", 0, "GstRTSPMedia");
+  GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmediafactory", 0,
+      "GstRTSPMediaFactory");
 }
 
 static void
diff --git a/gst/rtsp-server/rtsp-media-mapping.c b/gst/rtsp-server/rtsp-media-mapping.c
index d65f41cbb5..5943c3032a 100644
--- a/gst/rtsp-server/rtsp-media-mapping.c
+++ b/gst/rtsp-server/rtsp-media-mapping.c
@@ -21,7 +21,7 @@
 
 G_DEFINE_TYPE (GstRTSPMediaMapping, gst_rtsp_media_mapping, G_TYPE_OBJECT);
 
-GST_DEBUG_CATEGORY_EXTERN (rtsp_media_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_media_debug);
 #define GST_CAT_DEFAULT rtsp_media_debug
 
 static void gst_rtsp_media_mapping_finalize (GObject * obj);
@@ -39,11 +39,16 @@ gst_rtsp_media_mapping_class_init (GstRTSPMediaMappingClass * klass)
   gobject_class->finalize = gst_rtsp_media_mapping_finalize;
 
   klass->find_media = find_media;
+
+  GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmediamapping", 0,
+      "GstRTSPMediaMapping");
 }
 
 static void
 gst_rtsp_media_mapping_init (GstRTSPMediaMapping * mapping)
 {
+  GST_DEBUG_OBJECT (mapping, "created");
+
   mapping->mappings = g_hash_table_new_full (g_str_hash, g_str_equal,
       g_free, g_object_unref);
 }
@@ -53,6 +58,8 @@ gst_rtsp_media_mapping_finalize (GObject * obj)
 {
   GstRTSPMediaMapping *mapping = GST_RTSP_MEDIA_MAPPING (obj);
 
+  GST_DEBUG_OBJECT (mapping, "finalized");
+
   g_hash_table_unref (mapping->mappings);
 
   G_OBJECT_CLASS (gst_rtsp_media_mapping_parent_class)->finalize (obj);
diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index cd1e42ab71..7d6c76c323 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -53,7 +53,7 @@ enum
   SIGNAL_LAST
 };
 
-GST_DEBUG_CATEGORY_EXTERN (rtsp_media_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_media_debug);
 #define GST_CAT_DEFAULT rtsp_media_debug
 
 static GQuark ssrc_stream_map_key;
@@ -134,6 +134,8 @@ gst_rtsp_media_class_init (GstRTSPMediaClass * klass)
   ssrc_stream_map_key = g_quark_from_static_string ("GstRTSPServer.stream");
 
   gst_element_register (NULL, "rtspfunnel", GST_RANK_NONE, RTSP_TYPE_FUNNEL);
+
+  GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmedia", 0, "GstRTSPMedia");
 }
 
 static void
diff --git a/gst/rtsp-server/rtsp-session-pool.c b/gst/rtsp-server/rtsp-session-pool.c
index cbaf71e4b1..36c0211970 100644
--- a/gst/rtsp-server/rtsp-session-pool.c
+++ b/gst/rtsp-server/rtsp-session-pool.c
@@ -30,7 +30,7 @@ enum
   PROP_LAST
 };
 
-GST_DEBUG_CATEGORY (rtsp_session_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_session_debug);
 #define GST_CAT_DEFAULT rtsp_session_debug
 
 static void gst_rtsp_session_pool_get_property (GObject * object, guint propid,
@@ -62,8 +62,8 @@ gst_rtsp_session_pool_class_init (GstRTSPSessionPoolClass * klass)
 
   klass->create_session_id = create_session_id;
 
-  GST_DEBUG_CATEGORY_INIT (rtsp_session_debug, "rtspsession", 0,
-      "GstRTSPSession");
+  GST_DEBUG_CATEGORY_INIT (rtsp_session_debug, "rtspsessionpool", 0,
+      "GstRTSPSessionPool");
 }
 
 static void
diff --git a/gst/rtsp-server/rtsp-session.c b/gst/rtsp-server/rtsp-session.c
index 8d507e5397..ce86d43f27 100644
--- a/gst/rtsp-server/rtsp-session.c
+++ b/gst/rtsp-server/rtsp-session.c
@@ -32,7 +32,7 @@ enum
   PROP_LAST
 };
 
-GST_DEBUG_CATEGORY_EXTERN (rtsp_session_debug);
+GST_DEBUG_CATEGORY_STATIC (rtsp_session_debug);
 #define GST_CAT_DEFAULT rtsp_session_debug
 
 static void gst_rtsp_session_get_property (GObject * object, guint propid,
@@ -63,6 +63,9 @@ gst_rtsp_session_class_init (GstRTSPSessionClass * klass)
       g_param_spec_uint ("timeout", "timeout",
           "the timeout of the session (0 = never)", 0, G_MAXUINT,
           DEFAULT_TIMEOUT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  GST_DEBUG_CATEGORY_INIT (rtsp_session_debug, "rtspsession", 0,
+      "GstRTSPSession");
 }
 
 static void