diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c
index 628bc4457b..06f5aeba7d 100644
--- a/gst/rtsp-server/rtsp-auth.c
+++ b/gst/rtsp-server/rtsp-auth.c
@@ -211,10 +211,9 @@ default_setup (GstRTSPAuth * auth, GstRTSPClientState * state)
 /**
  * gst_rtsp_auth_setup:
  * @auth: a #GstRTSPAuth
- * @client: the client
- * @state: TODO
+ * @state: the client state
  *
- * Add authentication tokens to @response.
+ * Add authentication tokens to @response in @state.
  *
  * Returns: FALSE if something is wrong.
  */
diff --git a/gst/rtsp-server/rtsp-media-factory.h b/gst/rtsp-server/rtsp-media-factory.h
index ca26d26320..035cbe2cb0 100644
--- a/gst/rtsp-server/rtsp-media-factory.h
+++ b/gst/rtsp-server/rtsp-media-factory.h
@@ -45,7 +45,6 @@ typedef struct _GstRTSPMediaFactoryPrivate GstRTSPMediaFactoryPrivate;
 
 /**
  * GstRTSPMediaFactory:
- * @parent: the parent GObject
  *
  * The definition and logic for constructing the pipeline for a media. The media
  * can contain multiple streams like audio and video.
diff --git a/gst/rtsp-server/rtsp-media.h b/gst/rtsp-server/rtsp-media.h
index ebb7b673e1..d001549f9d 100644
--- a/gst/rtsp-server/rtsp-media.h
+++ b/gst/rtsp-server/rtsp-media.h
@@ -82,12 +82,12 @@ struct _GstRTSPMedia {
 
 /**
  * GstRTSPMediaClass:
- * @context: the main context for dispatching messages
- * @loop: the mainloop for message.
- * @thread: the thread dispatching messages.
  * @handle_message: handle a message
  * @unprepare: the default implementation sets the pipeline's state
  *             to GST_STATE_NULL and removes all elements.
+ * @convert_range: convert a range to the given unit
+ * @query_position: query the current posision in the pipeline
+ * @query_stop: query when playback will stop
  *
  * The RTSP media class
  */
diff --git a/gst/rtsp-server/rtsp-mount-points.h b/gst/rtsp-server/rtsp-mount-points.h
index b57c041f58..3f9b5b7b2f 100644
--- a/gst/rtsp-server/rtsp-mount-points.h
+++ b/gst/rtsp-server/rtsp-mount-points.h
@@ -41,23 +41,18 @@ typedef struct _GstRTSPMountPointsPrivate GstRTSPMountPointsPrivate;
 
 /**
  * GstRTSPMountPoints:
- * @parent: parent GObject
- * @mounts: the mountpoints to mediafactory mapping
  *
  * Creates a #GstRTSPMediaFactory object for a given url.
  */
 struct _GstRTSPMountPoints {
   GObject       parent;
 
+  /*< private >*/
   GstRTSPMountPointsPrivate *priv;
 };
 
 /**
  * GstRTSPMountPointsClass:
- * @parent_class: parent GObject class
- * @find_factory: Create or return a previously cached #GstRTSPMediaFactory object
- *        for the given url. the default implementation will use the factory
- *        added with gst_rtsp_mount_points_add_factory().
  *
  * The class for the media mounts object.
  */
diff --git a/gst/rtsp-server/rtsp-session-pool.h b/gst/rtsp-server/rtsp-session-pool.h
index ff077ebb7e..51325621b4 100644
--- a/gst/rtsp-server/rtsp-session-pool.h
+++ b/gst/rtsp-server/rtsp-session-pool.h
@@ -42,9 +42,6 @@ typedef struct _GstRTSPSessionPoolPrivate GstRTSPSessionPoolPrivate;
 
 /**
  * GstRTSPSessionPool:
- * @max_sessions: the maximum number of sessions.
- * @lock: locking the session hashtable
- * @sessions: hashtable of sessions indexed by the session id.
  *
  * An object that keeps track of the active sessions. This object is usually
  * attached to a #GstRTSPServer object to manage the sessions in that server.
diff --git a/gst/rtsp-server/rtsp-stream.h b/gst/rtsp-server/rtsp-stream.h
index 8e5cbc520c..240fc480d4 100644
--- a/gst/rtsp-server/rtsp-stream.h
+++ b/gst/rtsp-server/rtsp-stream.h
@@ -46,13 +46,13 @@ typedef struct _GstRTSPStreamPrivate GstRTSPStreamPrivate;
 
 /**
  * GstRTSPStream:
- * @parent: the parent instance
  *
  * The definition of a media stream.
  */
 struct _GstRTSPStream {
   GObject       parent;
 
+  /*< private >*/
   GstRTSPStreamPrivate *priv;
 };