diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
index dbf80bc52..3aaa97177 100644
--- a/cogl/cogl-atlas-texture.c
+++ b/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>
 
diff --git a/cogl/cogl-atlas.c b/cogl/cogl-atlas.c
index b6749b502..2a4e06e25 100644
--- a/cogl/cogl-atlas.c
+++ b/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"
diff --git a/cogl/cogl-bitmap-fallback.c b/cogl/cogl-bitmap-fallback.c
index 8969c01b5..0ce229a58 100644
--- a/cogl/cogl-bitmap-fallback.c
+++ b/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"
 
diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c
index 5923f7e39..b64af5a20 100644
--- a/cogl/cogl-bitmap-pixbuf.c
+++ b/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"
diff --git a/cogl/cogl-bitmap.c b/cogl/cogl-bitmap.c
index a4d0732c0..20fd8082f 100644
--- a/cogl/cogl-bitmap.c
+++ b/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"
diff --git a/cogl/cogl-blend-string.c b/cogl/cogl-blend-string.c
index d5f48af83..bcdbd15df 100644
--- a/cogl/cogl-blend-string.c
+++ b/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"
diff --git a/cogl/cogl-blit.c b/cogl/cogl-blit.c
index d3a6b9c95..d856aca20 100644
--- a/cogl/cogl-blit.c
+++ b/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"
diff --git a/cogl/cogl-buffer-private.h b/cogl/cogl-buffer-private.h
index 490ba6656..62bcf4595 100644
--- a/cogl/cogl-buffer-private.h
+++ b/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
 
diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c
index cb9b5c7ae..682540176 100644
--- a/cogl/cogl-buffer.c
+++ b/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"
diff --git a/cogl/cogl-clip-stack.c b/cogl/cogl-clip-stack.c
index b493e5d83..358c199c7 100644
--- a/cogl/cogl-clip-stack.c
+++ b/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
diff --git a/cogl/cogl-clip-stack.h b/cogl/cogl-clip-stack.h
index a7b934668..34547ae82 100644
--- a/cogl/cogl-clip-stack.h
+++ b/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
diff --git a/cogl/cogl-clip-state.c b/cogl/cogl-clip-state.c
index 8a1013f8d..649fbf31e 100644
--- a/cogl/cogl-clip-state.c
+++ b/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,
diff --git a/cogl/cogl-clutter.c b/cogl/cogl-clutter.c
index 2268c04ad..63bcc1b96 100644
--- a/cogl/cogl-clutter.c
+++ b/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)
diff --git a/cogl/cogl-color.c b/cogl/cogl-color.c
index 9292d84b9..9a78e53c0 100644
--- a/cogl/cogl-color.c
+++ b/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"
diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index 0c2788609..a6f096555 100644
--- a/cogl/cogl-context.c
+++ b/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"
diff --git a/cogl/cogl-debug.c b/cogl/cogl-debug.c
index 2724e63b6..bdbb1ff51 100644
--- a/cogl/cogl-debug.c
+++ b/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"
 
diff --git a/cogl/cogl-depth-state.c b/cogl/cogl-depth-state.c
index 10eb3548f..fb2fafe1d 100644
--- a/cogl/cogl-depth-state.c
+++ b/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)
diff --git a/cogl/cogl-display.c b/cogl/cogl-display.c
index 5c7f588c3..651277f42 100644
--- a/cogl/cogl-display.c
+++ b/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"
diff --git a/cogl/cogl-enum-types.c.in b/cogl/cogl-enum-types.c.in
index 157180dfe..4ca1d7557 100644
--- a/cogl/cogl-enum-types.c.in
+++ b/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 ***/
diff --git a/cogl/cogl-euler.c b/cogl/cogl-euler.c
index 614e763cc..3ebd264e3 100644
--- a/cogl/cogl-euler.c
+++ b/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>
diff --git a/cogl/cogl-feature-private.c b/cogl/cogl-feature-private.c
index 1708e3ae9..9714e8d90 100644
--- a/cogl/cogl-feature-private.c
+++ b/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"
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index 882972604..8c058d91f 100644
--- a/cogl/cogl-framebuffer.c
+++ b/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"
diff --git a/cogl/cogl-internal.h b/cogl/cogl-internal.h
index 417ec709c..7957786a4 100644
--- a/cogl/cogl-internal.h
+++ b/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
diff --git a/cogl/cogl-journal-private.h b/cogl/cogl-journal-private.h
index d81ff75a0..c561a1078 100644
--- a/cogl/cogl-journal-private.h
+++ b/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"
 
diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c
index 06dc1b963..df9deedd1 100644
--- a/cogl/cogl-journal.c
+++ b/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"
diff --git a/cogl/cogl-material-compat.c b/cogl/cogl-material-compat.c
index efee1051c..8caede983 100644
--- a/cogl/cogl-material-compat.c
+++ b/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>
diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h
index ecd1908b9..f07bb692e 100644
--- a/cogl/cogl-material-compat.h
+++ b/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
diff --git a/cogl/cogl-matrix-stack.c b/cogl/cogl-matrix-stack.c
index c97d3b904..fd1bed06d 100644
--- a/cogl/cogl-matrix-stack.c
+++ b/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;
diff --git a/cogl/cogl-matrix.c b/cogl/cogl-matrix.c
index 58e00a56d..a346a5c03 100644
--- a/cogl/cogl-matrix.c
+++ b/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>
diff --git a/cogl/cogl-onscreen-template.c b/cogl/cogl-onscreen-template.c
index c71841fc2..4969a6eb3 100644
--- a/cogl/cogl-onscreen-template.c
+++ b/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"
diff --git a/cogl/cogl-path.c b/cogl/cogl-path.c
index f6d262a77..62d20f523 100644
--- a/cogl/cogl-path.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-fragend-arbfp.c b/cogl/cogl-pipeline-fragend-arbfp.c
index 31727a539..5031fc315 100644
--- a/cogl/cogl-pipeline-fragend-arbfp.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-fragend-fixed.c b/cogl/cogl-pipeline-fragend-fixed.c
index c47917a66..c8e8e2c6a 100644
--- a/cogl/cogl-pipeline-fragend-fixed.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-fragend-glsl.c b/cogl/cogl-pipeline-fragend-glsl.c
index c0f2ad111..1cc36cb93 100644
--- a/cogl/cogl-pipeline-fragend-glsl.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-opengl-private.h b/cogl/cogl-pipeline-opengl-private.h
index aa8dc1b7d..be7b6d0a5 100644
--- a/cogl/cogl-pipeline-opengl-private.h
+++ b/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"
 
diff --git a/cogl/cogl-pipeline-opengl.c b/cogl/cogl-pipeline-opengl.c
index 46c424185..a00e34cd5 100644
--- a/cogl/cogl-pipeline-opengl.c
+++ b/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
diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h
index 072ab7414..e0c74a281 100644
--- a/cogl/cogl-pipeline-private.h
+++ b/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>
 
diff --git a/cogl/cogl-pipeline-progend-glsl.c b/cogl/cogl-pipeline-progend-glsl.c
index b03c0ec2d..5d65d709a 100644
--- a/cogl/cogl-pipeline-progend-glsl.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h
index 426a632f8..868662941 100644
--- a/cogl/cogl-pipeline-state.h
+++ b/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
diff --git a/cogl/cogl-pipeline-vertend-fixed.c b/cogl/cogl-pipeline-vertend-fixed.c
index 1d60c83e6..37592dd9f 100644
--- a/cogl/cogl-pipeline-vertend-fixed.c
+++ b/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"
diff --git a/cogl/cogl-pipeline-vertend-glsl.c b/cogl/cogl-pipeline-vertend-glsl.c
index 602cf02c4..31cc8e940 100644
--- a/cogl/cogl-pipeline-vertend-glsl.c
+++ b/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"
diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c
index da76a3ef5..4cc67295d 100644
--- a/cogl/cogl-pipeline.c
+++ b/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"
diff --git a/cogl/cogl-pixel-buffer.c b/cogl/cogl-pixel-buffer.c
index bb8abad38..12292ac2e 100644
--- a/cogl/cogl-pixel-buffer.c
+++ b/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"
diff --git a/cogl/cogl-primitives.c b/cogl/cogl-primitives.c
index 5a25cd60c..54479d74c 100644
--- a/cogl/cogl-primitives.c
+++ b/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"
diff --git a/cogl/cogl-program.c b/cogl/cogl-program.c
index d0fb6f084..d7f324b53 100644
--- a/cogl/cogl-program.c
+++ b/cogl/cogl-program.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 
 #include "cogl-util.h"
 #include "cogl-internal.h"
diff --git a/cogl/cogl-quaternion.c b/cogl/cogl-quaternion.c
index a49b8133a..5a6861101 100644
--- a/cogl/cogl-quaternion.c
+++ b/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>
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 694ea5993..2af1f74b4 100644
--- a/cogl/cogl-renderer.c
+++ b/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"
diff --git a/cogl/cogl-shader-boilerplate.h b/cogl/cogl-shader-boilerplate.h
index b46b7b45e..e5a86d876 100644
--- a/cogl/cogl-shader-boilerplate.h
+++ b/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" \
diff --git a/cogl/cogl-shader-private.h b/cogl/cogl-shader-private.h
index ee358167f..486375d17 100644
--- a/cogl/cogl-shader-private.h
+++ b/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;
 
diff --git a/cogl/cogl-shader.c b/cogl/cogl-shader.c
index 72d95416f..9b09b107f 100644
--- a/cogl/cogl-shader.c
+++ b/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"
diff --git a/cogl/cogl-spans.c b/cogl/cogl-spans.c
index c74817607..d1fcff9fd 100644
--- a/cogl/cogl-spans.c
+++ b/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"
diff --git a/cogl/cogl-sub-texture.c b/cogl/cogl-sub-texture.c
index 99ecfcc53..396c3b22a 100644
--- a/cogl/cogl-sub-texture.c
+++ b/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>
diff --git a/cogl/cogl-swap-chain.c b/cogl/cogl-swap-chain.c
index 932614605..a487419f2 100644
--- a/cogl/cogl-swap-chain.c
+++ b/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);
 
diff --git a/cogl/cogl-texture-2d-private.h b/cogl/cogl-texture-2d-private.h
index 701cec0c6..b19c6ea15 100644
--- a/cogl/cogl-texture-2d-private.h
+++ b/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
 {
diff --git a/cogl/cogl-texture-2d-sliced.c b/cogl/cogl-texture-2d-sliced.c
index 2e6eaf0fe..7a01df749 100644
--- a/cogl/cogl-texture-2d-sliced.c
+++ b/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"
diff --git a/cogl/cogl-texture-2d.c b/cogl/cogl-texture-2d.c
index fef456b97..cabae1f86 100644
--- a/cogl/cogl-texture-2d.c
+++ b/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"
diff --git a/cogl/cogl-texture-3d.c b/cogl/cogl-texture-3d.c
index 05ea35ced..f4478fbd3 100644
--- a/cogl/cogl-texture-3d.c
+++ b/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"
diff --git a/cogl/cogl-texture-private.h b/cogl/cogl-texture-private.h
index 2f7d9251d..edbca9c20 100644
--- a/cogl/cogl-texture-private.h
+++ b/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;
 
diff --git a/cogl/cogl-texture-rectangle-private.h b/cogl/cogl-texture-rectangle-private.h
index 21bcf3f34..0e9510629 100644
--- a/cogl/cogl-texture-rectangle-private.h
+++ b/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
 {
diff --git a/cogl/cogl-texture-rectangle.c b/cogl/cogl-texture-rectangle.c
index 88bc9f121..7580fc9fb 100644
--- a/cogl/cogl-texture-rectangle.c
+++ b/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"
diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c
index 1ff8a0f95..c50e732ac 100644
--- a/cogl/cogl-texture.c
+++ b/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>
diff --git a/cogl/cogl-util.h b/cogl/cogl-util.h
index dfaa6a9a2..d657c7654 100644
--- a/cogl/cogl-util.h
+++ b/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
diff --git a/cogl/cogl-vector.c b/cogl/cogl-vector.c
index 4246ddfcb..818d6a527 100644
--- a/cogl/cogl-vector.c
+++ b/cogl/cogl-vector.c
@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include <cogl.h>
 #include <cogl-util.h>
 #include <cogl-vector.h>
 
diff --git a/cogl/cogl-vertex-buffer.c b/cogl/cogl-vertex-buffer.c
index 9aec04761..017937827 100644
--- a/cogl/cogl-vertex-buffer.c
+++ b/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"
diff --git a/cogl/cogl-xlib-private.h b/cogl/cogl-xlib-private.h
index ef4817075..c9dc03dfb 100644
--- a/cogl/cogl-xlib-private.h
+++ b/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;
diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h
index 8c8b75226..c22d2e532 100644
--- a/cogl/cogl-xlib-renderer.h
+++ b/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
 
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index 9e956f745..aeefb3dc2 100644
--- a/cogl/cogl-xlib.h
+++ b/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>
 
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 9432fa55b..378483636 100644
--- a/cogl/cogl.c
+++ b/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
diff --git a/cogl/cogl2-clip-state.c b/cogl/cogl2-clip-state.c
index 698e58cfa..57f18e262 100644
--- a/cogl/cogl2-clip-state.c
+++ b/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"
diff --git a/cogl/cogl2-path.c b/cogl/cogl2-path.c
index e01bbedaf..d9426aea8 100644
--- a/cogl/cogl2-path.c
+++ b/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"
diff --git a/cogl/driver/gl/cogl-gl.c b/cogl/driver/gl/cogl-gl.c
index 08fdecdfb..e5dc15516 100644
--- a/cogl/driver/gl/cogl-gl.c
+++ b/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"
diff --git a/cogl/driver/gl/cogl-texture-driver-gl.c b/cogl/driver/gl/cogl-texture-driver-gl.c
index 144e37efe..6cb004844 100644
--- a/cogl/driver/gl/cogl-texture-driver-gl.c
+++ b/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"
diff --git a/cogl/driver/gles/cogl-gles.c b/cogl/driver/gles/cogl-gles.c
index df90c57f7..9001a0489 100644
--- a/cogl/driver/gles/cogl-gles.c
+++ b/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"
diff --git a/cogl/driver/gles/cogl-texture-driver-gles.c b/cogl/driver/gles/cogl-texture-driver-gles.c
index 66885c733..3c83a4558 100644
--- a/cogl/driver/gles/cogl-texture-driver-gles.c
+++ b/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"
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/winsys/cogl-texture-pixmap-x11.c
index 8cbb6cc9c..f6b87681d 100644
--- a/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/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"
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/winsys/cogl-texture-pixmap-x11.h
index 51385bd14..fac2b560d 100644
--- a/cogl/winsys/cogl-texture-pixmap-x11.h
+++ b/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
 
diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c
index efeccfce6..5d96ac403 100644
--- a/cogl/winsys/cogl-winsys-egl.c
+++ b/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"
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
index 6540ab467..765191ba1 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/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"
diff --git a/cogl/winsys/cogl-winsys-private.h b/cogl/winsys/cogl-winsys-private.h
index 8b864ec6b..0e6c78b72 100644
--- a/cogl/winsys/cogl-winsys-private.h
+++ b/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);
 
diff --git a/cogl/winsys/cogl-winsys.c b/cogl/winsys/cogl-winsys.c
index b5669db14..fccf23311 100644
--- a/cogl/winsys/cogl-winsys.c
+++ b/cogl/winsys/cogl-winsys.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include "cogl.h"
 #include "cogl-context-private.h"
 
 #include <gmodule.h>