diff --git a/ChangeLog b/ChangeLog
index ed2986ffe1..4af1b8724e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-31  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/libmms/gstmms.h:
+	  No reason to use gpointers instead of typed pointes here as far as I
+	  can see.
+
+	* ext/mythtv/gstmythtvsrc.c:
+	* ext/neon/gstneonhttpsrc.c:
+	* gst/switch/gstswitch.c:
+	  Don't use gtk-doc magic markers for things that aren't meant to be
+	  parsed by gtk-doc. Makes gtk-doc complain a bit less.
+
 2007-05-30  Wim Taymans  <wim@fluendo.com>
 
 	* configure.ac:
diff --git a/ext/libmms/gstmms.h b/ext/libmms/gstmms.h
index a7c7b3dd3e..70aa770898 100644
--- a/ext/libmms/gstmms.h
+++ b/ext/libmms/gstmms.h
@@ -31,9 +31,9 @@ struct _GstMMS
 {
   GstPushSrc parent;
 
-  gchar *uri_name;
-  gpointer connection;
-  gpointer connection_h;
+  gchar  *uri_name;
+  mms_t  *connection;
+  mmsh_t *connection_h;
 };
 
 struct _GstMMSClass 
diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c
index f2c709c5b3..4e89e4d39e 100644
--- a/ext/mythtv/gstmythtvsrc.c
+++ b/ext/mythtv/gstmythtvsrc.c
@@ -16,7 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-/**
+/*
  * When using the LiveTV content, put the location URI in the following
  * format:
  * 
diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index 4fa06e0a7e..e35d9829c0 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -772,8 +772,7 @@ error:
   }
 }
 
-/**
- * Try to send the HTTP request to the Icecast server, and if possible deals with
+/* Try to send the HTTP request to the Icecast server, and if possible deals with
  * all the probable redirections (HTTP status code == 302)
  */
 static gint
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 1c66a791a2..73639d3270 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -27,8 +27,7 @@
 
 #include <string.h>
 
-/**
- * This element allows runtime switching between many sources. It outputs a
+/* This element allows runtime switching between many sources. It outputs a
  * new segment every time it switches. The input sources are expected to be
  * rate controlled/live or synced to the clock using identity sync=true upstream
  * of this element. If they are not, your cpu usage will hike up.