diff --git a/gst/gst.c b/gst/gst.c
index 2323d3f64e..8582650903 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -767,7 +767,7 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
   gst_buffer_list_iterator_get_type ();
   _gst_message_initialize ();
   _gst_tag_initialize ();
-  _gst_toc_initialize ();
+  priv_gst_toc_initialize ();
   gst_parse_context_get_type ();
 
   _gst_plugin_initialize ();
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 78937e613e..31f258034b 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -112,16 +112,16 @@ void  _gst_query_initialize (void);
 void  _gst_tag_initialize (void);
 void  _gst_value_initialize (void);
 
-void  _gst_toc_initialize (void);
+void  priv_gst_toc_initialize (void);
 
 /* TOC functions */
 /* These functions are used to parse TOC messages, events and queries */
-GstToc*        _gst_toc_from_structure (const GstStructure *toc);
-GstStructure*  _gst_toc_to_structure (const GstToc *toc);
-gboolean       _gst_toc_structure_get_updated (const GstStructure * toc);
-void           _gst_toc_structure_set_updated (GstStructure * toc, gboolean updated);
-gchar*         _gst_toc_structure_get_extend_uid (const GstStructure * toc);
-void           _gst_toc_structure_set_extend_uid (GstStructure * toc, const gchar * extend_uid);
+GstToc*        priv_gst_toc_from_structure (const GstStructure *toc);
+GstStructure*  priv_gst_toc_to_structure (const GstToc *toc);
+gboolean       priv_gst_toc_structure_get_updated (const GstStructure * toc);
+void           priv_gst_toc_structure_set_updated (GstStructure * toc, gboolean updated);
+gchar*         priv_gst_toc_structure_get_extend_uid (const GstStructure * toc);
+void           priv_gst_toc_structure_set_extend_uid (GstStructure * toc, const gchar * extend_uid);
 
 /* Private registry functions */
 gboolean _priv_gst_registry_remove_cache_plugins (GstRegistry *registry);
diff --git a/gst/gstevent.c b/gst/gstevent.c
index 498ef9574d..c56f669ee2 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -1327,10 +1327,10 @@ gst_event_new_toc (GstToc * toc, gboolean updated)
 
   GST_CAT_INFO (GST_CAT_EVENT, "creating toc event");
 
-  toc_struct = _gst_toc_to_structure (toc);
+  toc_struct = priv_gst_toc_to_structure (toc);
 
   if (G_LIKELY (toc_struct != NULL)) {
-    _gst_toc_structure_set_updated (toc_struct, updated);
+    priv_gst_toc_structure_set_updated (toc_struct, updated);
     return gst_event_new_custom (GST_EVENT_TOC, toc_struct);
   } else
     return NULL;
@@ -1356,10 +1356,10 @@ gst_event_parse_toc (GstEvent * event, GstToc ** toc, gboolean * updated)
   g_return_if_fail (toc != NULL);
 
   structure = gst_event_get_structure (event);
-  *toc = _gst_toc_from_structure (structure);
+  *toc = priv_gst_toc_from_structure (structure);
 
   if (updated != NULL)
-    *updated = _gst_toc_structure_get_updated (structure);
+    *updated = priv_gst_toc_structure_get_updated (structure);
 }
 
 /**
diff --git a/gst/gstmessage.c b/gst/gstmessage.c
index b7fec38495..feabbf070f 100644
--- a/gst/gstmessage.c
+++ b/gst/gstmessage.c
@@ -2178,10 +2178,10 @@ gst_message_new_toc (GstObject * src, GstToc * toc, gboolean updated)
 
   g_return_val_if_fail (toc != NULL, NULL);
 
-  toc_struct = _gst_toc_to_structure (toc);
+  toc_struct = priv_gst_toc_to_structure (toc);
 
   if (G_LIKELY (toc_struct != NULL)) {
-    _gst_toc_structure_set_updated (toc_struct, updated);
+    priv_gst_toc_structure_set_updated (toc_struct, updated);
     return gst_message_new_custom (GST_MESSAGE_TOC, src, toc_struct);
   } else
     return NULL;
@@ -2208,8 +2208,8 @@ gst_message_parse_toc (GstMessage * message, GstToc ** toc, gboolean * updated)
   g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_TOC);
   g_return_if_fail (toc != NULL);
 
-  *toc = _gst_toc_from_structure (message->structure);
+  *toc = priv_gst_toc_from_structure (message->structure);
 
   if (updated != NULL)
-    *updated = _gst_toc_structure_get_updated (message->structure);
+    *updated = priv_gst_toc_structure_get_updated (message->structure);
 }
diff --git a/gst/gstquery.c b/gst/gstquery.c
index 53b4cf9571..84a8809ea9 100644
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
@@ -1538,7 +1538,7 @@ gst_query_set_toc (GstQuery * query, GstToc * toc, const gchar * extend_uid)
   g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_TOC);
   g_return_if_fail (toc != NULL);
 
-  structure = _gst_toc_to_structure (toc);
+  structure = priv_gst_toc_to_structure (toc);
 
   g_return_if_fail (structure != NULL);
 
@@ -1547,7 +1547,7 @@ gst_query_set_toc (GstQuery * query, GstToc * toc, const gchar * extend_uid)
     gst_structure_free (query->structure);
 
   if (extend_uid != NULL)
-    _gst_toc_structure_set_extend_uid (structure, extend_uid);
+    priv_gst_toc_structure_set_extend_uid (structure, extend_uid);
 
   query->structure = structure;
   gst_structure_set_parent_refcount (query->structure,
@@ -1582,8 +1582,8 @@ gst_query_parse_toc (GstQuery * query, GstToc ** toc, gchar ** extend_uid)
   g_return_if_fail (structure != NULL);
 
   if (toc != NULL)
-    *toc = _gst_toc_from_structure (structure);
+    *toc = priv_gst_toc_from_structure (structure);
 
   if (extend_uid != NULL)
-    *extend_uid = _gst_toc_structure_get_extend_uid (structure);
+    *extend_uid = priv_gst_toc_structure_get_extend_uid (structure);
 }
diff --git a/gst/gsttoc.c b/gst/gsttoc.c
index 2553d24549..04197a4844 100644
--- a/gst/gsttoc.c
+++ b/gst/gsttoc.c
@@ -114,7 +114,7 @@ enum
 static GQuark gst_toc_fields[GST_TOC_LAST] = { 0 };
 
 void
-_gst_toc_initialize (void)
+priv_gst_toc_initialize (void)
 {
   static gboolean inited = FALSE;
 
@@ -480,7 +480,7 @@ gst_toc_entry_from_structure (const GstStructure * entry, guint level)
 }
 
 GstToc *
-_gst_toc_from_structure (const GstStructure * toc)
+priv_gst_toc_from_structure (const GstStructure * toc)
 {
   GstToc *ret;
   GstTocEntry *subentry;
@@ -645,7 +645,7 @@ gst_toc_entry_to_structure (const GstTocEntry * entry, guint level)
 }
 
 GstStructure *
-_gst_toc_to_structure (const GstToc * toc)
+priv_gst_toc_to_structure (const GstToc * toc)
 {
   GValue val = { 0 };
   GValue subentries_val = { 0 };
@@ -951,7 +951,7 @@ gst_toc_entry_get_start_stop (const GstTocEntry * entry, gint64 * start,
 }
 
 gboolean
-_gst_toc_structure_get_updated (const GstStructure * toc)
+priv_gst_toc_structure_get_updated (const GstStructure * toc)
 {
   const GValue *val;
 
@@ -967,7 +967,7 @@ _gst_toc_structure_get_updated (const GstStructure * toc)
 }
 
 void
-_gst_toc_structure_set_updated (GstStructure * toc, gboolean updated)
+priv_gst_toc_structure_set_updated (GstStructure * toc, gboolean updated)
 {
   GValue val = { 0 };
 
@@ -980,7 +980,7 @@ _gst_toc_structure_set_updated (GstStructure * toc, gboolean updated)
 }
 
 gchar *
-_gst_toc_structure_get_extend_uid (const GstStructure * toc)
+priv_gst_toc_structure_get_extend_uid (const GstStructure * toc)
 {
   const GValue *val;
 
@@ -996,7 +996,8 @@ _gst_toc_structure_get_extend_uid (const GstStructure * toc)
 }
 
 void
-_gst_toc_structure_set_extend_uid (GstStructure * toc, const gchar * extend_uid)
+priv_gst_toc_structure_set_extend_uid (GstStructure * toc,
+    const gchar * extend_uid)
 {
   GValue val = { 0 };