diff --git a/ChangeLog b/ChangeLog
index a59e33abea..d96183a4d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-27  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gstindexfactory.c: (gst_index_factory_get_type):
+	* gst/gstplugin.c: (gst_plugin_init):
+	* gst/gstpluginfeature.c: (gst_plugin_feature_init):
+	* gst/gstquery.c: (gst_query_get_type):
+	* gst/gstregistry.c: (gst_registry_init):
+	* gst/gsturi.c: (gst_uri_handler_base_init):
+	  Remove empty instance_init() functions to save relocs and lessen the
+	  noise. Remove some of the function prototypes that are doubled by
+	  G_DEFINE_TYPE.
+	  
 2007-06-27  Wim Taymans  <wim@fluendo.com>
 
 	Patch by: Étienne Noreau-Hébert <etienne at deepunder dot org>
diff --git a/gst/gstindexfactory.c b/gst/gstindexfactory.c
index c5b2312147..ced0cbe2f1 100644
--- a/gst/gstindexfactory.c
+++ b/gst/gstindexfactory.c
@@ -38,7 +38,6 @@
 #include "gstregistry.h"
 
 static void gst_index_factory_class_init (GstIndexFactoryClass * klass);
-static void gst_index_factory_init (GstIndexFactory * factory);
 static void gst_index_factory_finalize (GObject * object);
 
 static GstPluginFeatureClass *factory_parent_class = NULL;
@@ -60,7 +59,7 @@ gst_index_factory_get_type (void)
       NULL,
       sizeof (GstIndexFactory),
       0,
-      (GInstanceInitFunc) gst_index_factory_init,
+      NULL,
       NULL
     };
 
@@ -86,11 +85,6 @@ gst_index_factory_class_init (GstIndexFactoryClass * klass)
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_index_factory_finalize);
 }
 
-static void
-gst_index_factory_init (GstIndexFactory * factory)
-{
-}
-
 static void
 gst_index_factory_finalize (GObject * object)
 {
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 048494b590..d238df6e2b 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -108,8 +108,8 @@ static const gchar *valid_licenses[] = {
 
 static GstPlugin *gst_plugin_register_func (GstPlugin * plugin,
     GstPluginDesc * desc);
-static void
-gst_plugin_desc_copy (GstPluginDesc * dest, const GstPluginDesc * src);
+static void gst_plugin_desc_copy (GstPluginDesc * dest,
+    const GstPluginDesc * src);
 static void gst_plugin_desc_free (GstPluginDesc * desc);
 
 
@@ -118,7 +118,7 @@ G_DEFINE_TYPE (GstPlugin, gst_plugin, GST_TYPE_OBJECT);
 static void
 gst_plugin_init (GstPlugin * plugin)
 {
-
+  /* do nothing, needed because of G_DEFINE_TYPE */
 }
 
 static void
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 72eee90e72..4430874936 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -39,8 +39,6 @@
 
 #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
 
-static void gst_plugin_feature_class_init (GstPluginFeatureClass * klass);
-static void gst_plugin_feature_init (GstPluginFeature * feature);
 static void gst_plugin_feature_finalize (GObject * object);
 
 /* static guint gst_plugin_feature_signals[LAST_SIGNAL] = { 0 }; */
@@ -60,7 +58,7 @@ gst_plugin_feature_class_init (GstPluginFeatureClass * klass)
 static void
 gst_plugin_feature_init (GstPluginFeature * feature)
 {
-
+  /* do nothing, needed because of G_DEFINE_TYPE */
 }
 
 static void
diff --git a/gst/gstquery.c b/gst/gstquery.c
index 406d7e4160..3ebe70b569 100644
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
@@ -69,7 +69,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_query_debug);
 #define GST_CAT_DEFAULT gst_query_debug
 
-static void gst_query_init (GTypeInstance * instance, gpointer g_class);
 static void gst_query_class_init (gpointer g_class, gpointer class_data);
 static void gst_query_finalize (GstQuery * query);
 static GstQuery *_gst_query_copy (GstQuery * query);
@@ -174,7 +173,7 @@ gst_query_get_type (void)
       NULL,
       sizeof (GstQuery),
       0,
-      gst_query_init,
+      NULL,
       NULL
     };
 
@@ -207,12 +206,6 @@ gst_query_finalize (GstQuery * query)
   }
 }
 
-static void
-gst_query_init (GTypeInstance * instance, gpointer g_class)
-{
-
-}
-
 static GstQuery *
 _gst_query_copy (GstQuery * query)
 {
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 287e0c5e57..944e2f936a 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -122,8 +122,6 @@ enum
   LAST_SIGNAL
 };
 
-static void gst_registry_class_init (GstRegistryClass * klass);
-static void gst_registry_init (GstRegistry * registry);
 static void gst_registry_finalize (GObject * object);
 
 static guint gst_registry_signals[LAST_SIGNAL] = { 0 };
@@ -177,6 +175,7 @@ gst_registry_class_init (GstRegistryClass * klass)
 static void
 gst_registry_init (GstRegistry * registry)
 {
+  /* do nothing, needed because of G_DEFINE_TYPE */
 }
 
 static void
diff --git a/gst/gsturi.c b/gst/gsturi.c
index 8e5e2c30d5..ec8f2e50e9 100644
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -85,7 +85,7 @@ gst_uri_handler_base_init (gpointer g_class)
 {
   static gboolean initialized = FALSE;
 
-  if (!initialized) {
+  if (G_UNLIKELY (!initialized)) {
 
     /**
      * GstURIHandler::new-uri: