diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index e750664b4..7b5afb964 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -37,14 +37,12 @@
 #include "cogl/cogl-graphene.h"
 #include "cogl/cogl-matrix-stack.h"
 #include "cogl/cogl-framebuffer-private.h"
-#include "cogl/cogl-object-private.h"
 #include "cogl/cogl-offscreen.h"
 #include "cogl/cogl-magazine-private.h"
-#include "cogl/cogl-gtype-private.h"
 
-COGL_GTYPE_DEFINE_BOXED (MatrixEntry, matrix_entry,
-                         cogl_matrix_entry_ref,
-                         cogl_matrix_entry_unref);
+G_DEFINE_BOXED_TYPE (CoglMatrixEntry, cogl_matrix_entry,
+                     cogl_matrix_entry_ref,
+                     cogl_matrix_entry_unref);
 
 static CoglMagazine *cogl_matrix_stack_magazine;
 
diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h
index 5ecb2e26d..5b56611e0 100644
--- a/cogl/cogl/cogl-matrix-stack.h
+++ b/cogl/cogl/cogl-matrix-stack.h
@@ -179,12 +179,12 @@ G_DECLARE_FINAL_TYPE (CoglMatrixStack,
 typedef struct _CoglMatrixEntry CoglMatrixEntry;
 
 /**
- * cogl_matrix_entry_get_gtype:
+ * cogl_matrix_entry_get_type:
  *
  * Returns: a #GType that can be used with the GLib type system.
  */
 COGL_EXPORT
-GType cogl_matrix_entry_get_gtype (void);
+GType cogl_matrix_entry_get_type (void);
 
 
 /**
@@ -598,9 +598,6 @@ cogl_debug_matrix_entry_print (CoglMatrixEntry *entry);
  * Takes a reference on the given @entry to ensure the @entry stays
  * alive and remains valid. When you are finished with the @entry then
  * you should call cogl_matrix_entry_unref().
- *
- * It is an error to pass an @entry pointer to cogl_object_ref() and
- * cogl_object_unref()
  */
 COGL_EXPORT CoglMatrixEntry *
 cogl_matrix_entry_ref (CoglMatrixEntry *entry);