diff --git a/cogl/cogl-attribute-buffer.h b/cogl/cogl-attribute-buffer.h
index aa180efec..492ba2100 100644
--- a/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl-attribute-buffer.h
@@ -48,6 +48,8 @@ G_BEGIN_DECLS
  * FIXME
  */
 
+#define COGL_ATTRIBUTE_BUFFER(buffer) ((CoglAttributeBuffer *)(buffer))
+
 /**
  * cogl_attribute_buffer_new:
  * @context: A #CoglContext
diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl-index-buffer.h
index e57bcd110..2e64ab35b 100644
--- a/cogl/cogl-index-buffer.h
+++ b/cogl/cogl-index-buffer.h
@@ -43,6 +43,8 @@ G_BEGIN_DECLS
  * FIXME
  */
 
+#define COGL_INDEX_BUFFER(buffer) ((CoglIndexBuffer*) buffer)
+
 typedef struct _CoglIndexBuffer	      CoglIndexBuffer;
 
 /**
diff --git a/cogl/cogl-pixel-buffer-private.h b/cogl/cogl-pixel-buffer-private.h
index 80ceee07e..5db2a27d2 100644
--- a/cogl/cogl-pixel-buffer-private.h
+++ b/cogl/cogl-pixel-buffer-private.h
@@ -35,8 +35,6 @@
 
 G_BEGIN_DECLS
 
-#define COGL_PIXEL_BUFFER(array)     ((CoglPixelBuffer *)(array))
-
 struct _CoglPixelBuffer
 {
   CoglBuffer            _parent;
diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl-pixel-buffer.h
index 3a2076117..49bd603ad 100644
--- a/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl-pixel-buffer.h
@@ -44,6 +44,8 @@ G_BEGIN_DECLS
  * any of the symbols dissapear at a later date.
  */
 
+#define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer))
+
 #define cogl_pixel_buffer_new cogl_pixel_buffer_new_EXP
 #define cogl_pixel_buffer_new_with_size cogl_pixel_buffer_new_with_size_EXP
 #define cogl_is_pixel_buffer cogl_is_pixel_buffer_EXP