diff --git a/ChangeLog b/ChangeLog
index c4262b84ff..a6e3542ad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-17  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/gstobject.c: (gst_object_ref), (gst_object_unref):
+	* gst/gstobject.h:
+	  s/GstObject */gpointer/ for the arguments of those 2 functions.
+	  Mimicing GObject here.
+
 2005-05-16  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/Makefile.am:
diff --git a/gst/gstobject.c b/gst/gstobject.c
index 363e15f248..7b4bdbf84e 100644
--- a/gst/gstobject.c
+++ b/gst/gstobject.c
@@ -218,14 +218,14 @@ gst_object_constructor (GType type, guint n_construct_properties,
  * Returns: A pointer to the object
  */
 GstObject *
-gst_object_ref (GstObject * object)
+gst_object_ref (gpointer object)
 {
   g_return_val_if_fail (GST_IS_OBJECT (object), NULL);
 
   GST_CAT_LOG_OBJECT (GST_CAT_REFCOUNTING, object, "ref %d->%d",
       G_OBJECT (object)->ref_count, G_OBJECT (object)->ref_count + 1);
 
-  g_object_ref (G_OBJECT (object));
+  g_object_ref (object);
   return object;
 }
 
@@ -237,7 +237,7 @@ gst_object_ref (GstObject * object)
  * zero, destroy the object.
  */
 void
-gst_object_unref (GstObject * object)
+gst_object_unref (gpointer object)
 {
   g_return_if_fail (GST_IS_OBJECT (object));
   g_return_if_fail (G_OBJECT (object)->ref_count > 0);
@@ -245,7 +245,7 @@ gst_object_unref (GstObject * object)
   GST_CAT_LOG_OBJECT (GST_CAT_REFCOUNTING, object, "unref %d->%d",
       G_OBJECT (object)->ref_count, G_OBJECT (object)->ref_count - 1);
 
-  g_object_unref (G_OBJECT (object));
+  g_object_unref (object);
 }
 
 /**
diff --git a/gst/gstobject.h b/gst/gstobject.h
index bbb9dc8181..da5c3dff49 100644
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -139,8 +139,8 @@ void		gst_object_restore_thyself	(GstObject *object, xmlNodePtr self);
 #endif
 
 /* refcounting + life cycle */
-GstObject *	gst_object_ref			(GstObject *object);
-void 		gst_object_unref		(GstObject *object);
+GstObject *	gst_object_ref			(gpointer object);
+void 		gst_object_unref		(gpointer object);
 void 		gst_object_sink			(GstObject *object);
 
 /* replace object pointer */