diff --git a/cogl/cogl/cogl-color.h b/cogl/cogl/cogl-color.h
index 9dd9470fe..33ffc8963 100644
--- a/cogl/cogl/cogl-color.h
+++ b/cogl/cogl/cogl-color.h
@@ -34,6 +34,13 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-macros.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
 /**
  * CoglColor:
  *
@@ -42,14 +49,14 @@
  * #CoglColor is a simple structure holding the definition of a color such
  * that it can be efficiently used by GL
  */
+struct _CoglColor
+{
+  uint8_t red;
+  uint8_t green;
+  uint8_t blue;
 
-#include "cogl/cogl-types.h"
-#include "cogl/cogl-macros.h"
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
+  uint8_t alpha;
+};
 /**
  * COGL_COLOR_INIT:
  * @r: value for the red channel, between 0 and 255
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index 1952d3ec9..9f090fe27 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -56,10 +56,9 @@ G_BEGIN_DECLS
 #define COGL_PRIVATE(x) private_member_ ## x
 #endif
 
+typedef struct _CoglColor CoglColor;
 typedef struct _CoglFramebuffer CoglFramebuffer;
 
-typedef struct _CoglColor               CoglColor;
-
 /**
  * CoglDmaBufHandle: (free-func cogl_dma_buf_handle_free)
  *
@@ -68,15 +67,6 @@ typedef struct _CoglColor               CoglColor;
  */
 typedef struct _CoglDmaBufHandle CoglDmaBufHandle;
 
-struct _CoglColor
-{
-  uint8_t red;
-  uint8_t green;
-  uint8_t blue;
-
-  uint8_t alpha;
-};
-
 /**
  * COGL_BLEND_STRING_ERROR:
  *