diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index 26d137bf1..6d36c4ab6 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -1218,7 +1218,7 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
                                    CoglVerticesMode mode,
                                    int first_vertex,
                                    int n_vertices,
-                                   ...) COGL_GNUC_NULL_TERMINATED;
+                                   ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * cogl_framebuffer_draw_attributes: (skip)
@@ -1332,7 +1332,7 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
                                            int first_vertex,
                                            int n_vertices,
                                            CoglIndices *indices,
-                                           ...) COGL_GNUC_NULL_TERMINATED;
+                                           ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * cogl_framebuffer_draw_indexed_attributes: (skip)
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index c8f9e8305..922ba0376 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -64,12 +64,6 @@ G_BEGIN_DECLS
  */
 typedef int CoglBool;
 
-#if __GNUC__ >= 4
-#define COGL_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define COGL_GNUC_NULL_TERMINATED
-#endif
-
 /* Some structures are meant to be opaque but they have public
    definitions because we want the size to be public so they can be
    allocated on the stack. This macro is used to ensure that users