diff --git a/ChangeLog b/ChangeLog
index b8663a78ec..c605a79fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-21  Andy Wingo  <wingo@pobox.com>
 
+	* gst/gsttagsetter.h: 
+	* gst/gsttaglist.h: 
+	* gst/gststructure.h: 
+	* gst/gstcaps.h: 
+	* gst/gstutils.h: Sprinkle NULL_TERMINATED to taste.
+
 	* gst/gsterror.c (_gst_core_errors_init):
 	* gst/gsterror.h (GST_CORE_ERROR_MISSING_PLUGIN): New error
 	category.
diff --git a/gst/gstcaps.h b/gst/gstcaps.h
index c06536fe2d..61cac61838 100644
--- a/gst/gstcaps.h
+++ b/gst/gstcaps.h
@@ -198,7 +198,7 @@ GstStructure *           gst_caps_get_structure                         (const G
 GstCaps *		 gst_caps_copy_nth                              (const GstCaps * caps, guint nth);
 void			 gst_caps_truncate                              (GstCaps * caps);
 void                     gst_caps_set_simple                            (GstCaps       *caps,
-									 char          *field, ...);
+									 char          *field, ...) G_GNUC_NULL_TERMINATED;
 void                     gst_caps_set_simple_valist                     (GstCaps       *caps,
 									 char          *field,
 									 va_list        varargs);
diff --git a/gst/gststructure.h b/gst/gststructure.h
index fbba358aaf..9acc07e880 100644
--- a/gst/gststructure.h
+++ b/gst/gststructure.h
@@ -114,7 +114,7 @@ void                    gst_structure_set_value            (GstStructure
 							    const GValue            *value);
 void                    gst_structure_set                  (GstStructure            *structure,
 							    const gchar             *fieldname,
-							    ...);
+							    ...) G_GNUC_NULL_TERMINATED;
 void                    gst_structure_set_valist           (GstStructure            *structure,
 							    const gchar             *fieldname,
 							    va_list varargs);
@@ -126,7 +126,7 @@ void                    gst_structure_remove_field         (GstStructure
 							    const gchar             *fieldname);
 void                    gst_structure_remove_fields        (GstStructure            *structure,
 							     const gchar            *fieldname,
-							    ...);
+							    ...) G_GNUC_NULL_TERMINATED;
 void                    gst_structure_remove_fields_valist (GstStructure             *structure,
 							    const gchar             *fieldname,
 							    va_list                  varargs);
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index 282b3d1bb6..9bf3586986 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -113,11 +113,11 @@ guint		gst_tag_list_get_tag_size	(const GstTagList *	list,
 void		gst_tag_list_add		(GstTagList *		list,
 						 GstTagMergeMode	mode,
 						 const gchar *		tag,
-						 ...);
+						 ...) G_GNUC_NULL_TERMINATED;
 void		gst_tag_list_add_values		(GstTagList *		list,
 						 GstTagMergeMode	mode,
 						 const gchar *		tag,
-						 ...);
+						 ...) G_GNUC_NULL_TERMINATED;
 void		gst_tag_list_add_valist		(GstTagList *		list,
 						 GstTagMergeMode	mode,
 						 const gchar *		tag,
diff --git a/gst/gsttagsetter.h b/gst/gsttagsetter.h
index 01e73b5c9f..fca04bb50c 100644
--- a/gst/gsttagsetter.h
+++ b/gst/gsttagsetter.h
@@ -54,12 +54,12 @@ void		gst_tag_setter_merge		(GstTagSetter *		setter,
 void		gst_tag_setter_add		(GstTagSetter *		setter,
 						 GstTagMergeMode	mode,
 						 const gchar *		tag,
-					         ...);
+					         ...) G_GNUC_NULL_TERMINATED;
 
 void		gst_tag_setter_add_values	(GstTagSetter *		setter,
 						 GstTagMergeMode	mode,
 						 const gchar *		tag,
-					         ...);
+					         ...) G_GNUC_NULL_TERMINATED;
 
 void            gst_tag_setter_add_valist     	(GstTagSetter *		setter,
 						 GstTagMergeMode	mode,
diff --git a/gst/gstutils.h b/gst/gstutils.h
index e0bf667e6a..f74853bd38 100644
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -490,13 +490,13 @@ G_CONST_RETURN gchar*   gst_element_state_get_name      (GstState state);
 
 gboolean		gst_element_link                (GstElement *src, GstElement *dest);
 gboolean		gst_element_link_many           (GstElement *element_1,
-		                                         GstElement *element_2, ...);
+		                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
 gboolean		gst_element_link_filtered	(GstElement * src,
                                                          GstElement * dest,
                                                          GstCaps *filter);
 void                    gst_element_unlink              (GstElement *src, GstElement *dest);
 void                    gst_element_unlink_many         (GstElement *element_1,
-		                                         GstElement *element_2, ...);
+		                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
 
 gboolean		gst_element_link_pads           (GstElement *src, const gchar *srcpadname,
 		                                         GstElement *dest, const gchar *destpadname);
@@ -520,7 +520,7 @@ gboolean                gst_element_query_convert       (GstElement *element, Gs
 
 /* element class functions */
 void			gst_element_class_install_std_props (GstElementClass * klass,
-							 const gchar * first_name, ...);
+							 const gchar * first_name, ...) G_GNUC_NULL_TERMINATED;
 
 /* pad functions */
 gboolean                gst_pad_can_link                (GstPad *srcpad, GstPad *sinkpad);
@@ -541,8 +541,8 @@ gboolean                gst_pad_query_convert           (GstPad *pad, GstFormat
 		                                         GstFormat *dest_format, gint64 *dest_val);
 
 /* bin functions */
-void			gst_bin_add_many                (GstBin *bin, GstElement *element_1, ...);
-void			gst_bin_remove_many             (GstBin *bin, GstElement *element_1, ...);
+void			gst_bin_add_many                (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
+void			gst_bin_remove_many             (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
 
 /* buffer functions */
 GstBuffer *		gst_buffer_merge		(GstBuffer * buf1, GstBuffer * buf2);