Remove all internal includes of cogl.h

The cogl.h header is meant to be the public header for including the 1.x
api used by Clutter so we should stop using that as a convenient way to
include all likely prototypes and typedefs. Actually we already do a
good job of listing the specific headers we depend on in each of the .c
files we have so mostly this patch just strip out the redundant
includes for cogl.h with a few fixups where that broke the build.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

cogl/cogl-atlas-texture.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
@@ -44,6 +43,7 @@
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-atlas.h"
 #include "cogl1-context.h"
+#include "cogl-sub-texture.h"
 
 #include <stdlib.h>
 

cogl/cogl-atlas.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-atlas.h"
 #include "cogl-rectangle-map.h"
 #include "cogl-context-private.h"

cogl/cogl-bitmap-fallback.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-bitmap-private.h"
 

cogl/cogl-bitmap-pixbuf.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-internal.h"
 #include "cogl-bitmap-private.h"

cogl/cogl-bitmap.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-debug.h"
 #include "cogl-private.h"

cogl/cogl-blend-string.c

@@ -33,7 +33,6 @@
 
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-debug.h"

cogl/cogl-blit.c

@@ -30,7 +30,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-blit.h"
 #include "cogl-context-private.h"

cogl/cogl-buffer-private.h

@@ -30,9 +30,9 @@
 
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-object-private.h"
 #include "cogl-buffer.h"
+#include "cogl-context.h"
 
 G_BEGIN_DECLS
 

cogl/cogl-buffer.c

@@ -38,7 +38,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
 #include "cogl-context-private.h"

cogl/cogl-clip-stack.c

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-primitives.h"
 #include "cogl-context-private.h"
@@ -46,6 +45,7 @@
 #include "cogl-attribute-private.h"
 #include "cogl-primitive-private.h"
 #include "cogl1-context.h"
+#include "cogl-offscreen.h"
 
 #ifndef GL_CLIP_PLANE0
 #define GL_CLIP_PLANE0 0x3000

cogl/cogl-clip-stack.h

@@ -26,7 +26,7 @@
 
 #include "cogl2-path.h"
 #include "cogl-matrix.h"
-#include "cogl.h"
+#include "cogl-primitive.h"
 
 /* The clip stack works like a GSList where only a pointer to the top
    of the stack is stored. The empty clip stack is represented simply

cogl/cogl-clip-state.c

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-clip-state-private.h"
 #include "cogl-context-private.h"
@@ -40,6 +39,12 @@
 #include "cogl-util.h"
 #include "cogl-matrix-private.h"
 
+#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
+#include <cogl/cogl2-clip-state.h>
+#else
+#include <cogl/cogl-clip-state.h>
+#endif
+
 void
 cogl_clip_push_window_rectangle (int x_offset,
                                  int y_offset,

cogl/cogl-clutter.c

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-types.h"
 #include "cogl-private.h"
@@ -42,6 +41,7 @@
 #ifdef COGL_HAS_XLIB_SUPPORT
 #include "cogl-clutter-xlib.h"
 #endif
+#include "cogl-clutter.h"
 
 gboolean
 cogl_clutter_check_extension (const char *name, const char *ext)

cogl/cogl-color.c

@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-color.h"
 #include "cogl-fixed.h"

cogl/cogl-context.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-object.h"
 #include "cogl-internal.h"
 #include "cogl-private.h"

cogl/cogl-debug.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-debug.h"
 

cogl/cogl-depth-state.c

@@ -27,9 +27,9 @@
 #include "config.h"
 #endif
 
-#include <cogl/cogl.h>
 #include "cogl-util.h"
 #include "cogl-depth-state-private.h"
+#include "cogl-depth-state.h"
 
 void
 cogl_depth_state_init (CoglDepthState *state)

cogl/cogl-display.c

@@ -30,7 +30,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-object.h"
 #include "cogl-internal.h"

cogl/cogl-enum-types.c.in

@@ -1,6 +1,5 @@
 /*** BEGIN file-header ***/
 #include "cogl-enum-types.h"
-#include "cogl.h"
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/

cogl/cogl-euler.c

@@ -28,9 +28,9 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-euler.h>
+#include <cogl-matrix.h>
 
 #include <math.h>
 #include <string.h>

cogl/cogl-feature-private.c

@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-context-private.h"
 
 #include "cogl-feature-private.h"

cogl/cogl-framebuffer.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/cogl-internal.h

@@ -24,8 +24,6 @@
 #ifndef __COGL_INTERNAL_H
 #define __COGL_INTERNAL_H
 
-#include "cogl.h"
-#include "cogl-matrix-stack.h"
 #include "cogl-bitmask.h"
 
 #ifdef COGL_HAS_XLIB_SUPPORT

cogl/cogl-journal-private.h

@@ -24,7 +24,6 @@
 #ifndef __COGL_JOURNAL_PRIVATE_H
 #define __COGL_JOURNAL_PRIVATE_H
 
-#include "cogl.h"
 #include "cogl-handle.h"
 #include "cogl-clip-stack.h"
 

cogl/cogl-journal.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/cogl-material-compat.c

@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-material-compat.h>
 #include <cogl-pipeline.h>
 #include <cogl-pipeline-private.h>

cogl/cogl-material-compat.h

@@ -28,12 +28,12 @@
 #ifndef __COGL_MATERIAL_H__
 #define __COGL_MATERIAL_H__
 
-G_BEGIN_DECLS
-
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-matrix.h>
 #include <cogl/cogl-depth-state.h>
 
+G_BEGIN_DECLS
+
 /**
  * SECTION:cogl-material
  * @short_description: Fuctions for creating and manipulating materials

cogl/cogl-matrix-stack.c

@@ -29,12 +29,12 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-matrix-stack.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-object-private.h"
+#include "cogl-offscreen.h"
 
 typedef struct {
   CoglMatrix matrix;

cogl/cogl-matrix.c

@@ -65,7 +65,6 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-debug.h>
 #include <cogl-quaternion.h>

cogl/cogl-onscreen-template.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-object.h"
 
 #include "cogl-framebuffer-private.h"

cogl/cogl-path.c

@@ -27,7 +27,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/cogl-pipeline-fragend-arbfp.c

@@ -37,7 +37,6 @@
 
 #ifdef COGL_PIPELINE_FRAGEND_ARBFP
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline-fragend-fixed.c

@@ -36,7 +36,6 @@
 
 #ifdef COGL_PIPELINE_FRAGEND_FIXED
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline-fragend-glsl.c

@@ -41,7 +41,6 @@
 
 #ifdef COGL_PIPELINE_FRAGEND_GLSL
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline-opengl-private.h

@@ -28,8 +28,6 @@
 #ifndef __COGL_PIPELINE_OPENGL_PRIVATE_H
 #define __COGL_PIPELINE_OPENGL_PRIVATE_H
 
-#include "cogl.h"
-
 #include "cogl-pipeline-private.h"
 #include "cogl-matrix-stack.h"
 

cogl/cogl-pipeline-opengl.c

@@ -29,14 +29,13 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
-
 #include "cogl-debug.h"
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-context-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-framebuffer-private.h"
+#include "cogl-offscreen.h"
 
 /* This is needed to set the color attribute on GLES2 */
 #ifdef HAVE_COGL_GLES2

cogl/cogl-pipeline-private.h

@@ -38,6 +38,7 @@
 #include "cogl-internal.h"
 #include "cogl-boxed-value.h"
 #include "cogl-pipeline-snippet-private.h"
+#include "cogl-pipeline-state.h"
 
 #include <glib.h>
 

cogl/cogl-pipeline-progend-glsl.c

@@ -35,10 +35,10 @@
 #include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
+#include "cogl-offscreen.h"
 
 #ifdef COGL_PIPELINE_PROGEND_GLSL
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline-state.h

@@ -30,6 +30,7 @@
 
 #include <cogl/cogl-pipeline.h>
 #include <cogl/cogl-color.h>
+#include <cogl/cogl-depth-state.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

cogl/cogl-pipeline-vertend-fixed.c

@@ -36,7 +36,6 @@
 
 #ifdef COGL_PIPELINE_VERTEND_FIXED
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline-vertend-glsl.c

@@ -37,7 +37,6 @@
 
 #ifdef COGL_PIPELINE_VERTEND_GLSL
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-pipeline.c

@@ -29,7 +29,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/cogl-pixel-buffer.c

@@ -38,7 +38,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-context-private.h"

cogl/cogl-primitives.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/cogl-program.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 
 #include "cogl-util.h"
 #include "cogl-internal.h"

cogl/cogl-quaternion.c

@@ -38,7 +38,6 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-quaternion.h>
 #include <cogl-quaternion-private.h>

cogl/cogl-renderer.c

@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-internal.h"
 #include "cogl-private.h"

cogl/cogl-shader-boilerplate.h

@@ -27,7 +27,6 @@
 #ifndef __COGL_SHADER_BOILERPLATE_H
 #define __COGL_SHADER_BOILERPLATE_H
 
-#include "cogl.h"
 
 #define _COGL_COMMON_SHADER_BOILERPLATE_GL \
   "#define COGL_VERSION 100\n" \

cogl/cogl-shader-private.h

@@ -25,6 +25,7 @@
 #define __COGL_SHADER_H
 
 #include "cogl-handle.h"
+#include "cogl-shader.h"
 
 typedef struct _CoglShader CoglShader;
 

cogl/cogl-shader.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-shader-private.h"
 #include "cogl-shader-boilerplate.h"
 #include "cogl-internal.h"

cogl/cogl-spans.c

@@ -27,7 +27,6 @@
 
 #include "math.h"
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-internal.h"
 #include "cogl-spans.h"

cogl/cogl-sub-texture.c

@@ -28,15 +28,16 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
 #include "cogl-texture-private.h"
 #include "cogl-sub-texture-private.h"
+#include "cogl-sub-texture.h"
 #include "cogl-context-private.h"
 #include "cogl-object.h"
 #include "cogl-texture-driver.h"
 #include "cogl-texture-rectangle-private.h"
+#include "cogl-texture-2d.h"
 
 #include <string.h>
 #include <math.h>

cogl/cogl-swap-chain.c

@@ -28,10 +28,10 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-object.h"
 
 #include "cogl-swap-chain-private.h"
+#include "cogl-swap-chain.h"
 
 static void _cogl_swap_chain_free (CoglSwapChain *swap_chain);
 

cogl/cogl-texture-2d-private.h

@@ -27,6 +27,7 @@
 #include "cogl-handle.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-texture-private.h"
+#include "cogl-texture-2d.h"
 
 struct _CoglTexture2D
 {

cogl/cogl-texture-2d-sliced.c

@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-private.h"
 #include "cogl-util.h"

cogl/cogl-texture-2d.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-texture-private.h"

cogl/cogl-texture-3d.c

@@ -26,11 +26,11 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-texture-private.h"
 #include "cogl-texture-3d-private.h"
+#include "cogl-texture-3d.h"
 #include "cogl-texture-driver.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"

cogl/cogl-texture-private.h

@@ -28,6 +28,7 @@
 #include "cogl-handle.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-spans.h"
+#include "cogl-meta-texture.h"
 
 typedef struct _CoglTextureVtable     CoglTextureVtable;
 

cogl/cogl-texture-rectangle-private.h

@@ -26,6 +26,7 @@
 
 #include "cogl-pipeline-private.h"
 #include "cogl-texture-private.h"
+#include "cogl-texture-rectangle.h"
 
 struct _CoglTextureRectangle
 {

cogl/cogl-texture-rectangle.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-texture-private.h"

cogl/cogl-texture.c

@@ -31,7 +31,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
 #include "cogl-bitmap.h"
@@ -53,6 +52,7 @@
 #include "cogl-primitives.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl1-context.h"
+#include "cogl-sub-texture.h"
 
 #include <string.h>
 #include <stdlib.h>

cogl/cogl-util.h

@@ -26,7 +26,8 @@
 
 #include <glib.h>
 #include <math.h>
-#include "cogl-defines.h"
+
+#include <cogl/cogl-defines.h>
 #include "cogl-types.h"
 
 #ifndef COGL_HAS_GLIB_SUPPORT

cogl/cogl-vector.c

@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-vector.h>
 

cogl/cogl-vertex-buffer.c

@@ -96,7 +96,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
 #include "cogl-context-private.h"

cogl/cogl-xlib-private.h

@@ -24,8 +24,6 @@
 #ifndef __COGL_XLIB_PRIVATE_H
 #define __COGL_XLIB_PRIVATE_H
 
-#include "cogl/cogl.h"
-
 #include <X11/Xlib.h>
 
 typedef struct _CoglXlibTrapState CoglXlibTrapState;

cogl/cogl-xlib-renderer.h

@@ -28,9 +28,11 @@
 #ifndef __COGL_XLIB_RENDERER_H__
 #define __COGL_XLIB_RENDERER_H__
 
-#include <cogl/cogl.h>
-
 #include <X11/Xlib.h>
+#include <glib.h>
+
+#define __COGL_H_INSIDE__
+#include <cogl/cogl-renderer.h>
 
 G_BEGIN_DECLS
 

cogl/cogl-xlib.h

@@ -24,11 +24,12 @@
 #ifndef __COGL_XLIB_H__
 #define __COGL_XLIB_H__
 
+#include <glib.h>
+
 #include <X11/Xlib.h>
 
 #define __COGL_XLIB_H_INSIDE__
 
-#include <cogl/cogl.h>
 #include <cogl/cogl-clutter-xlib.h>
 #include <cogl/cogl-xlib-renderer.h>
 

cogl/cogl.c

@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
-
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
@@ -51,6 +49,7 @@
 #include "cogl-config-private.h"
 #include "cogl-private.h"
 #include "cogl1-context.h"
+#include "cogl-offscreen.h"
 
 #ifndef GL_PACK_INVERT_MESA
 #define GL_PACK_INVERT_MESA 0x8758

cogl/cogl2-clip-state.c

@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-clip-state-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"

cogl/cogl2-path.c

@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-util.h"
 #include "cogl-object.h"
 #include "cogl-internal.h"

cogl/driver/gl/cogl-gl.c

@@ -27,8 +27,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
-
 #include "cogl-private.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"

cogl/driver/gl/cogl-texture-driver-gl.c

@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-bitmap.h"

cogl/driver/gles/cogl-gles.c

@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context-private.h"
 #include "cogl-feature-private.h"

cogl/driver/gles/cogl-texture-driver-gles.c

@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-private.h"
 #include "cogl-util.h"
 #include "cogl-bitmap.h"

cogl/winsys/cogl-texture-pixmap-x11.c

@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"

cogl/winsys/cogl-texture-pixmap-x11.h

@@ -26,7 +26,7 @@
 
 #define __COGL_H_INSIDE__
 
-#include <cogl/cogl.h>
+#include <cogl/cogl-types.h>
 
 #ifdef COGL_ENABLE_EXPERIMENTAL_API
 

cogl/winsys/cogl-winsys-egl.c

@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
-
 #include "cogl-util.h"
 #include "cogl-winsys-egl-private.h"
 #include "cogl-winsys-private.h"

cogl/winsys/cogl-winsys-glx.c

@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
-
 #include "cogl-util.h"
 #include "cogl-winsys-private.h"
 #include "cogl-feature-private.h"

cogl/winsys/cogl-winsys-private.h

@@ -36,6 +36,8 @@
 #include "cogl-texture-pixmap-x11-private.h"
 #endif
 
+#include "cogl-poll.h"
+
 GQuark
 _cogl_winsys_error_quark (void);
 

cogl/winsys/cogl-winsys.c

@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-context-private.h"
 
 #include <gmodule.h>