diff --git a/ChangeLog b/ChangeLog
index ccddcb9b0b..8ab6469de9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-02  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gst_private.h:
+	* gst/gstbuffer.h:
+	* gst/gstevent.h:
+	* gst/gstformat.h:
+	* gst/gstmessage.h:
+	* gst/gstplugin.h:
+	* gst/gstquery.h:
+	* gst/gsttaglist.h:
+	* gst/gstvalue.h:
+	  Move declaration of private _gst_foo_initialize() functions into
+	  our private header file where they should have been all along.
+
 2007-11-02  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* docs/plugins/gstreamer-plugins-sections.txt:
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 3d778f68aa..34b7e75a61 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -47,6 +47,20 @@ gboolean __gst_in_valgrind (void);
 /* Initialize GStreamer private quark storage */
 void _priv_gst_quarks_initialize (void);
 
+/* Other init functions called from gst_init().
+ * FIXME 0.11: rename to _priv_gst_foo_init() so they don't get exported
+ * (can't do this now because these functions used to be in our public
+ * headers, so at least the symbols need to continue to be available unless
+ * we want enterprise edition packagers dancing on our heads) */
+void  _gst_buffer_initialize (void);
+void  _gst_event_initialize (void);
+void  _gst_format_initialize (void);
+void  _gst_message_initialize (void);
+void  _gst_plugin_initialize (void);
+void  _gst_query_initialize (void);
+void  _gst_tag_initialize (void);
+void  _gst_value_initialize (void);
+
 /* Private registry functions */
 gboolean _priv_gst_registry_remove_cache_plugins (GstRegistry *registry);
 void _priv_gst_registry_cleanup (void);
diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index 5f92ff1ce2..7ba0e71207 100644
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -455,9 +455,6 @@ GstBuffer*	gst_buffer_span			(GstBuffer *buf1, guint32 offset, GstBuffer *buf2,
  */
 #define		gst_value_get_buffer(v)		GST_BUFFER_CAST (gst_value_get_mini_object(v))
 
-/* --- protected --- */
-void		_gst_buffer_initialize		(void);
-
 G_END_DECLS
 
 #endif /* __GST_BUFFER_H__ */
diff --git a/gst/gstevent.h b/gst/gstevent.h
index 3232f044fc..acbabace8b 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -312,8 +312,6 @@ struct _GstEventClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-void		_gst_event_initialize		(void);
-
 const gchar*    gst_event_type_get_name         (GstEventType type);
 GQuark          gst_event_type_to_quark		(GstEventType type);
 GstEventTypeFlags
diff --git a/gst/gstformat.h b/gst/gstformat.h
index a9cca6022c..6559cf23a9 100644
--- a/gst/gstformat.h
+++ b/gst/gstformat.h
@@ -88,8 +88,6 @@ struct _GstFormatDefinition
   GQuark     quark;
 };
 
-void		_gst_format_initialize		(void);
-
 const gchar*    gst_format_get_name             (GstFormat format);
 GQuark          gst_format_to_quark             (GstFormat format);
 
diff --git a/gst/gstmessage.h b/gst/gstmessage.h
index fb65d9f5e7..f4e3dd5747 100644
--- a/gst/gstmessage.h
+++ b/gst/gstmessage.h
@@ -215,8 +215,6 @@ struct _GstMessageClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-void		_gst_message_initialize		(void);
-
 GType		gst_message_get_type		(void);
 
 const gchar*	gst_message_type_get_name	(GstMessageType type);
diff --git a/gst/gstplugin.h b/gst/gstplugin.h
index 93bc9b7ab4..d65fccd4b4 100644
--- a/gst/gstplugin.h
+++ b/gst/gstplugin.h
@@ -258,7 +258,6 @@ typedef gboolean        (*GstPluginFilter)              (GstPlugin *plugin,
 
 GType                   gst_plugin_get_type             (void);
 
-void			_gst_plugin_initialize		(void);
 void			_gst_plugin_register_static	(GstPluginDesc *desc);
 
 G_CONST_RETURN gchar*	gst_plugin_get_name		(GstPlugin *plugin);
diff --git a/gst/gstquery.h b/gst/gstquery.h
index 88d552abb8..181d59cd0f 100644
--- a/gst/gstquery.h
+++ b/gst/gstquery.h
@@ -139,8 +139,6 @@ struct _GstQueryClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-void            _gst_query_initialize          (void);
-
 const gchar*    gst_query_type_get_name        (GstQueryType query);
 GQuark          gst_query_type_to_quark        (GstQueryType query);
 
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index c0586fea59..f9162cbaaa 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -173,10 +173,9 @@ typedef void (*GstTagForeachFunc) (const GstTagList * list,
  */
 typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src);
 
-/* initialize tagging system */
-void         _gst_tag_initialize   (void);
 GType        gst_tag_list_get_type (void);
 
+/* tag registration */
 void         gst_tag_register      (const gchar     * name,
                                     GstTagFlag        flag,
                                     GType             type,
diff --git a/gst/gstvalue.h b/gst/gstvalue.h
index e4107b2b4a..09a77c9d95 100644
--- a/gst/gstvalue.h
+++ b/gst/gstvalue.h
@@ -533,9 +533,6 @@ void		gst_value_register_subtract_func (GType		minuend_type,
 /* fixation */
 gboolean	gst_value_is_fixed		(const GValue   *value);
 
-/* private */
-void		_gst_value_initialize		(void);
-
 G_END_DECLS
 
 #endif