diff --git a/cogl/cogl/cogl-closure-list-private.h b/cogl/cogl/cogl-closure-list-private.h
index 46ef55135..82c6039fa 100644
--- a/cogl/cogl/cogl-closure-list-private.h
+++ b/cogl/cogl/cogl-closure-list-private.h
@@ -54,7 +54,7 @@ typedef struct _CoglClosure
 
   void *function;
   void *user_data;
-  CoglUserDataDestroyCallback destroy_cb;
+  GDestroyNotify destroy_cb;
 } CoglClosure;
 
 /*
@@ -74,7 +74,7 @@ CoglClosure *
 _cogl_closure_list_add (CoglList *list,
                         void *function,
                         void *user_data,
-                        CoglUserDataDestroyCallback destroy_cb);
+                        GDestroyNotify destroy_cb);
 
 /*
  * _cogl_closure_list_invoke:
diff --git a/cogl/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c
index e4b68e83a..f452849e6 100644
--- a/cogl/cogl/cogl-closure-list.c
+++ b/cogl/cogl/cogl-closure-list.c
@@ -57,7 +57,7 @@ CoglClosure *
 _cogl_closure_list_add (CoglList *list,
                         void *function,
                         void *user_data,
-                        CoglUserDataDestroyCallback destroy_cb)
+                        GDestroyNotify destroy_cb)
 {
   CoglClosure *closure = g_new0 (CoglClosure, 1);
 
diff --git a/cogl/cogl/cogl-object.h b/cogl/cogl/cogl-object.h
index 47f805347..c856b8514 100644
--- a/cogl/cogl/cogl-object.h
+++ b/cogl/cogl/cogl-object.h
@@ -89,18 +89,6 @@ cogl_object_unref (void *object);
  */
 #define cogl_clear_object(object_ptr) g_clear_pointer ((object_ptr), cogl_object_unref)
 
-/**
- * CoglUserDataDestroyCallback:
- * @user_data: The data whose association with a #CoglObject has been
- *             destroyed.
- *
- * When associating private data with a #CoglObject a callback can be
- * given which will be called either if the object is destroyed or if
- * cogl_object_set_user_data() is called with NULL user_data for the
- * same key.
- */
-typedef GDestroyNotify CoglUserDataDestroyCallback;
-
 /**
  * CoglDebugObjectTypeInfo:
  * @name: A human readable name for the type.
diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
index a0baab8a8..d4429ded6 100644
--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@@ -514,7 +514,7 @@ CoglFrameClosure *
 cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen,
                                   CoglFrameCallback callback,
                                   void *user_data,
-                                  CoglUserDataDestroyCallback destroy)
+                                  GDestroyNotify destroy)
 {
   CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen);
 
@@ -564,7 +564,7 @@ CoglOnscreenDirtyClosure *
 cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen,
                                   CoglOnscreenDirtyCallback callback,
                                   void *user_data,
-                                  CoglUserDataDestroyCallback destroy)
+                                  GDestroyNotify destroy)
 {
   CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen);
 
diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
index 7a5a2b083..5b1f8ded8 100644
--- a/cogl/cogl/cogl-onscreen.h
+++ b/cogl/cogl/cogl-onscreen.h
@@ -444,7 +444,7 @@ COGL_EXPORT CoglFrameClosure *
 cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen,
                                   CoglFrameCallback callback,
                                   void *user_data,
-                                  CoglUserDataDestroyCallback destroy);
+                                  GDestroyNotify destroy);
 
 /**
  * cogl_onscreen_remove_frame_callback:
@@ -549,7 +549,7 @@ COGL_EXPORT CoglOnscreenDirtyClosure *
 cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen,
                                   CoglOnscreenDirtyCallback callback,
                                   void *user_data,
-                                  CoglUserDataDestroyCallback destroy);
+                                  GDestroyNotify destroy);
 
 /**
  * cogl_onscreen_remove_dirty_callback:
diff --git a/cogl/cogl/cogl-poll-private.h b/cogl/cogl/cogl-poll-private.h
index 855d24685..9690ff5c5 100644
--- a/cogl/cogl/cogl-poll-private.h
+++ b/cogl/cogl/cogl-poll-private.h
@@ -62,4 +62,4 @@ COGL_EXPORT CoglClosure *
 _cogl_poll_renderer_add_idle (CoglRenderer *renderer,
                               CoglIdleCallback idle_cb,
                               void *user_data,
-                              CoglUserDataDestroyCallback destroy_cb);
+                              GDestroyNotify destroy_cb);
diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c
index e57d9c659..76715f5b9 100644
--- a/cogl/cogl/cogl-poll.c
+++ b/cogl/cogl/cogl-poll.c
@@ -219,7 +219,7 @@ CoglClosure *
 _cogl_poll_renderer_add_idle (CoglRenderer *renderer,
                               CoglIdleCallback idle_cb,
                               void *user_data,
-                              CoglUserDataDestroyCallback destroy_cb)
+                              GDestroyNotify destroy_cb)
 {
   return _cogl_closure_list_add (&renderer->idle_closures,
                                 idle_cb,