[clutter/wip/cogl-winsys-glx: 3/20] cogl: rename cogl-context.h cogl-context-private.h

[Robert Bragg <rbragg src gnome org>]

commit 6484871c6ea9559fce7d3a1c5e5195e5df3a0805
Author: Robert Bragg <robert linux intel com>
Date:   Thu Nov 4 22:25:52 2010 +0000

    cogl: rename cogl-context.h cogl-context-private.h
    
    Since we plan to add public cogl_context_* API we need to rename the
    current cogl-context.h which contains private member details.

 clutter/cogl/cogl/Makefile.am                      |    2 +-
 clutter/cogl/cogl/cogl-atlas-texture.c             |    2 +-
 clutter/cogl/cogl/cogl-atlas.c                     |    2 +-
 clutter/cogl/cogl/cogl-attribute.c                 |    2 +-
 clutter/cogl/cogl/cogl-blend-string.c              |    2 +-
 clutter/cogl/cogl/cogl-blit.c                      |    2 +-
 clutter/cogl/cogl/cogl-buffer.c                    |    2 +-
 clutter/cogl/cogl/cogl-clip-stack.c                |    2 +-
 clutter/cogl/cogl/cogl-clip-state.c                |    2 +-
 .../{cogl-context.h => cogl-context-private.h}     |    6 +++---
 clutter/cogl/cogl/cogl-context.c                   |    2 +-
 clutter/cogl/cogl/cogl-feature-private.c           |    2 +-
 clutter/cogl/cogl/cogl-framebuffer.c               |    2 +-
 clutter/cogl/cogl/cogl-indices.c                   |    2 +-
 clutter/cogl/cogl/cogl-journal.c                   |    2 +-
 clutter/cogl/cogl/cogl-material-compat.c           |    2 +-
 clutter/cogl/cogl/cogl-matrix-stack.c              |    2 +-
 clutter/cogl/cogl/cogl-path.c                      |    2 +-
 clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c    |    2 +-
 clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c    |    2 +-
 clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c     |    2 +-
 clutter/cogl/cogl/cogl-pipeline-opengl.c           |    2 +-
 clutter/cogl/cogl/cogl-pipeline-progend-glsl.c     |    2 +-
 clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c    |    2 +-
 clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c     |    2 +-
 clutter/cogl/cogl/cogl-pipeline.c                  |    2 +-
 clutter/cogl/cogl/cogl-pixel-array.c               |    2 +-
 clutter/cogl/cogl/cogl-primitives.c                |    2 +-
 clutter/cogl/cogl/cogl-program.c                   |    2 +-
 clutter/cogl/cogl/cogl-shader.c                    |    2 +-
 clutter/cogl/cogl/cogl-sub-texture.c               |    2 +-
 clutter/cogl/cogl/cogl-texture-2d-sliced.c         |    2 +-
 clutter/cogl/cogl/cogl-texture-2d.c                |    2 +-
 clutter/cogl/cogl/cogl-texture-3d.c                |    2 +-
 clutter/cogl/cogl/cogl-texture-rectangle.c         |    2 +-
 clutter/cogl/cogl/cogl-texture.c                   |    2 +-
 clutter/cogl/cogl/cogl-vertex-buffer.c             |    2 +-
 clutter/cogl/cogl/cogl.c                           |    2 +-
 clutter/cogl/cogl/cogl2-path.c                     |    2 +-
 .../cogl/cogl/driver/gl/cogl-context-driver-gl.c   |    2 +-
 clutter/cogl/cogl/driver/gl/cogl-gl.c              |    2 +-
 .../cogl/cogl/driver/gl/cogl-texture-driver-gl.c   |    2 +-
 .../cogl/driver/gles/cogl-context-driver-gles.c    |    2 +-
 clutter/cogl/cogl/driver/gles/cogl-gles.c          |    2 +-
 .../cogl/driver/gles/cogl-texture-driver-gles.c    |    2 +-
 clutter/cogl/cogl/winsys/cogl-context-winsys.c     |    2 +-
 clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c |    2 +-
 clutter/cogl/cogl/winsys/cogl-xlib.c               |    2 +-
 48 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index 62f7299..72b4a03 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -161,7 +161,7 @@ cogl_sources_c = \
 	$(srcdir)/cogl-debug.h 				\
 	$(srcdir)/cogl-debug-options.h			\
 	$(srcdir)/cogl-handle.h 			\
-	$(srcdir)/cogl-context.h			\
+	$(srcdir)/cogl-context-private.h		\
 	$(srcdir)/cogl-context.c			\
 	$(srcdir)/cogl-internal.h			\
 	$(srcdir)/cogl.c				\
diff --git a/clutter/cogl/cogl/cogl-atlas-texture.c b/clutter/cogl/cogl/cogl-atlas-texture.c
index 6ac97c0..c818a4a 100644
--- a/clutter/cogl/cogl/cogl-atlas-texture.c
+++ b/clutter/cogl/cogl/cogl-atlas-texture.c
@@ -36,7 +36,7 @@
 #include "cogl-atlas-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-sub-texture-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-texture-driver.h"
 #include "cogl-rectangle-map.h"
diff --git a/clutter/cogl/cogl/cogl-atlas.c b/clutter/cogl/cogl/cogl-atlas.c
index fd25e15..9a75a60 100644
--- a/clutter/cogl/cogl/cogl-atlas.c
+++ b/clutter/cogl/cogl/cogl-atlas.c
@@ -31,7 +31,7 @@
 #include "cogl.h"
 #include "cogl-atlas.h"
 #include "cogl-rectangle-map.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-driver.h"
diff --git a/clutter/cogl/cogl/cogl-attribute.c b/clutter/cogl/cogl/cogl-attribute.c
index 2e22116..f106eff 100644
--- a/clutter/cogl/cogl/cogl-attribute.c
+++ b/clutter/cogl/cogl/cogl-attribute.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-attribute.h"
diff --git a/clutter/cogl/cogl/cogl-blend-string.c b/clutter/cogl/cogl/cogl-blend-string.c
index cd4443f..921b809 100644
--- a/clutter/cogl/cogl/cogl-blend-string.c
+++ b/clutter/cogl/cogl/cogl-blend-string.c
@@ -35,7 +35,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-debug.h"
 #include "cogl-blend-string.h"
 
diff --git a/clutter/cogl/cogl/cogl-blit.c b/clutter/cogl/cogl/cogl-blit.c
index 255f77c..9442441 100644
--- a/clutter/cogl/cogl/cogl-blit.c
+++ b/clutter/cogl/cogl/cogl-blit.c
@@ -32,7 +32,7 @@
 
 #include "cogl.h"
 #include "cogl-blit.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-texture-2d-private.h"
 
diff --git a/clutter/cogl/cogl/cogl-buffer.c b/clutter/cogl/cogl/cogl-buffer.c
index f61f1af..3caaa94 100644
--- a/clutter/cogl/cogl/cogl-buffer.c
+++ b/clutter/cogl/cogl/cogl-buffer.c
@@ -41,7 +41,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-pixel-array-private.h"
 
diff --git a/clutter/cogl/cogl/cogl-clip-stack.c b/clutter/cogl/cogl/cogl-clip-stack.c
index fc8edca..435c4ed 100644
--- a/clutter/cogl/cogl/cogl-clip-stack.c
+++ b/clutter/cogl/cogl/cogl-clip-stack.c
@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-primitives.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"
diff --git a/clutter/cogl/cogl/cogl-clip-state.c b/clutter/cogl/cogl/cogl-clip-state.c
index 475e4e3..19d7b0e 100644
--- a/clutter/cogl/cogl/cogl-clip-state.c
+++ b/clutter/cogl/cogl/cogl-clip-state.c
@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-clip-state-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"
diff --git a/clutter/cogl/cogl/cogl-context.h b/clutter/cogl/cogl/cogl-context-private.h
similarity index 98%
rename from clutter/cogl/cogl/cogl-context.h
rename to clutter/cogl/cogl/cogl-context-private.h
index eead5dc..c507e7d 100644
--- a/clutter/cogl/cogl/cogl-context.h
+++ b/clutter/cogl/cogl/cogl-context-private.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __COGL_CONTEXT_H
-#define __COGL_CONTEXT_H
+#ifndef __COGL_CONTEXT_PRIVATE_H
+#define __COGL_CONTEXT_PRIVATE_H
 
 #include "cogl-internal.h"
 
@@ -248,4 +248,4 @@ if (ctxvar == NULL) return retval;
 
 #define NO_RETVAL
 
-#endif /* __COGL_CONTEXT_H */
+#endif /* __COGL_CONTEXT_PRIVATE_H */
diff --git a/clutter/cogl/cogl/cogl-context.c b/clutter/cogl/cogl/cogl-context.c
index 115fc5c..c75fb3a 100644
--- a/clutter/cogl/cogl/cogl-context.c
+++ b/clutter/cogl/cogl/cogl-context.c
@@ -29,7 +29,7 @@
 #include "cogl-internal.h"
 #include "cogl-profile.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"
diff --git a/clutter/cogl/cogl/cogl-feature-private.c b/clutter/cogl/cogl/cogl-feature-private.c
index 478c1f7..deff9fc 100644
--- a/clutter/cogl/cogl/cogl-feature-private.c
+++ b/clutter/cogl/cogl/cogl-feature-private.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "cogl.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #include "cogl-feature-private.h"
 
diff --git a/clutter/cogl/cogl/cogl-framebuffer.c b/clutter/cogl/cogl/cogl-framebuffer.c
index d3f1537..28b95ab 100644
--- a/clutter/cogl/cogl/cogl-framebuffer.c
+++ b/clutter/cogl/cogl/cogl-framebuffer.c
@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-object-private.h"
 #include "cogl-util.h"
diff --git a/clutter/cogl/cogl/cogl-indices.c b/clutter/cogl/cogl/cogl-indices.c
index 68c7e45..8e8e776 100644
--- a/clutter/cogl/cogl/cogl-indices.c
+++ b/clutter/cogl/cogl/cogl-indices.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "cogl-object-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-indices.h"
 #include "cogl-indices-private.h"
 #include "cogl-index-array.h"
diff --git a/clutter/cogl/cogl/cogl-journal.c b/clutter/cogl/cogl/cogl-journal.c
index 88fbb98..01db3b8 100644
--- a/clutter/cogl/cogl/cogl-journal.c
+++ b/clutter/cogl/cogl/cogl-journal.c
@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"
diff --git a/clutter/cogl/cogl/cogl-material-compat.c b/clutter/cogl/cogl/cogl-material-compat.c
index 94d07fc..72349fe 100644
--- a/clutter/cogl/cogl/cogl-material-compat.c
+++ b/clutter/cogl/cogl/cogl-material-compat.c
@@ -32,7 +32,7 @@
 #include <cogl-pipeline-private.h>
 #include <cogl-types.h>
 #include <cogl-matrix.h>
-#include <cogl-context.h>
+#include <cogl-context-private.h>
 
 CoglMaterial *
 cogl_material_new (void)
diff --git a/clutter/cogl/cogl/cogl-matrix-stack.c b/clutter/cogl/cogl/cogl-matrix-stack.c
index fd65412..a673de1 100644
--- a/clutter/cogl/cogl/cogl-matrix-stack.c
+++ b/clutter/cogl/cogl/cogl-matrix-stack.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "cogl.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-matrix-stack.h"
 #include "cogl-framebuffer-private.h"
diff --git a/clutter/cogl/cogl/cogl-path.c b/clutter/cogl/cogl/cogl-path.c
index 4e9353e..116bd50 100644
--- a/clutter/cogl/cogl/cogl-path.c
+++ b/clutter/cogl/cogl/cogl-path.c
@@ -29,7 +29,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl2-path.h"
 
 #include <string.h>
diff --git a/clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c b/clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c
index 15dacdf..4e14ba1 100644
--- a/clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c
+++ b/clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c
@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-texture-private.h"
diff --git a/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c b/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
index 5c36b52..5f9fb7f 100644
--- a/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c
@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-texture-private.h"
diff --git a/clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c b/clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c
index 6c273e1..b101ab3 100644
--- a/clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c
@@ -40,7 +40,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-shader-private.h"
 #include "cogl-program-private.h"
diff --git a/clutter/cogl/cogl/cogl-pipeline-opengl.c b/clutter/cogl/cogl/cogl-pipeline-opengl.c
index 8f42a81..1bf9f4d 100644
--- a/clutter/cogl/cogl/cogl-pipeline-opengl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-opengl.c
@@ -34,7 +34,7 @@
 #include "cogl-debug.h"
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-pipeline-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-texture-private.h"
 
 /* This is needed to set the color attribute on GLES2 */
diff --git a/clutter/cogl/cogl/cogl-pipeline-progend-glsl.c b/clutter/cogl/cogl/cogl-pipeline-progend-glsl.c
index f096308..cc0f3dc 100644
--- a/clutter/cogl/cogl/cogl-pipeline-progend-glsl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-progend-glsl.c
@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 #include "cogl-pipeline-fragend-glsl-private.h"
diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
index 57d6191..dc2008a 100644
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 
diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
index fda8681..84a5243 100644
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 #include "cogl-pipeline-vertend-glsl-private.h"
diff --git a/clutter/cogl/cogl/cogl-pipeline.c b/clutter/cogl/cogl/cogl-pipeline.c
index acce536..e011f8d 100644
--- a/clutter/cogl/cogl/cogl-pipeline.c
+++ b/clutter/cogl/cogl/cogl-pipeline.c
@@ -32,7 +32,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object.h"
 
 #include "cogl-pipeline-private.h"
diff --git a/clutter/cogl/cogl/cogl-pixel-array.c b/clutter/cogl/cogl/cogl-pixel-array.c
index a6a4a78..fce42f1 100644
--- a/clutter/cogl/cogl/cogl-pixel-array.c
+++ b/clutter/cogl/cogl/cogl-pixel-array.c
@@ -41,7 +41,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object.h"
 #include "cogl-pixel-array-private.h"
 #include "cogl-pixel-array.h"
diff --git a/clutter/cogl/cogl/cogl-primitives.c b/clutter/cogl/cogl/cogl-primitives.c
index 6719fe6..e5ff820 100644
--- a/clutter/cogl/cogl/cogl-primitives.c
+++ b/clutter/cogl/cogl/cogl-primitives.c
@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"
diff --git a/clutter/cogl/cogl/cogl-program.c b/clutter/cogl/cogl/cogl-program.c
index 9be956f..10d632c 100644
--- a/clutter/cogl/cogl/cogl-program.c
+++ b/clutter/cogl/cogl/cogl-program.c
@@ -28,7 +28,7 @@
 #include "cogl.h"
 
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-shader-private.h"
diff --git a/clutter/cogl/cogl/cogl-shader.c b/clutter/cogl/cogl/cogl-shader.c
index 28ee0a6..cb00836 100644
--- a/clutter/cogl/cogl/cogl-shader.c
+++ b/clutter/cogl/cogl/cogl-shader.c
@@ -29,7 +29,7 @@
 #include "cogl-shader-private.h"
 #include "cogl-shader-boilerplate.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include <glib.h>
diff --git a/clutter/cogl/cogl/cogl-sub-texture.c b/clutter/cogl/cogl/cogl-sub-texture.c
index 04aca44..d00dcd5 100644
--- a/clutter/cogl/cogl/cogl-sub-texture.c
+++ b/clutter/cogl/cogl/cogl-sub-texture.c
@@ -33,7 +33,7 @@
 #include "cogl-util.h"
 #include "cogl-texture-private.h"
 #include "cogl-sub-texture-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-texture-driver.h"
 
diff --git a/clutter/cogl/cogl/cogl-texture-2d-sliced.c b/clutter/cogl/cogl/cogl-texture-2d-sliced.c
index ceda1f0..29152b7 100644
--- a/clutter/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/clutter/cogl/cogl/cogl-texture-2d-sliced.c
@@ -40,7 +40,7 @@
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-2d-sliced-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-spans.h"
 #include "cogl-journal-private.h"
diff --git a/clutter/cogl/cogl/cogl-texture-2d.c b/clutter/cogl/cogl/cogl-texture-2d.c
index e47f5a5..adbcf85 100644
--- a/clutter/cogl/cogl/cogl-texture-2d.c
+++ b/clutter/cogl/cogl/cogl-texture-2d.c
@@ -34,7 +34,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-opengl-private.h"
diff --git a/clutter/cogl/cogl/cogl-texture-3d.c b/clutter/cogl/cogl/cogl-texture-3d.c
index 19ddb8f..6b89887 100644
--- a/clutter/cogl/cogl/cogl-texture-3d.c
+++ b/clutter/cogl/cogl/cogl-texture-3d.c
@@ -32,7 +32,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-3d-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-private.h"
diff --git a/clutter/cogl/cogl/cogl-texture-rectangle.c b/clutter/cogl/cogl/cogl-texture-rectangle.c
index cdf9bdf..37bc93d 100644
--- a/clutter/cogl/cogl/cogl-texture-rectangle.c
+++ b/clutter/cogl/cogl/cogl-texture-rectangle.c
@@ -34,7 +34,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-rectangle-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-opengl-private.h"
diff --git a/clutter/cogl/cogl/cogl-texture.c b/clutter/cogl/cogl/cogl-texture.c
index 3348f48..e1f0c2c 100644
--- a/clutter/cogl/cogl/cogl-texture.c
+++ b/clutter/cogl/cogl/cogl-texture.c
@@ -47,7 +47,7 @@
 #include "cogl-sub-texture-private.h"
 #include "cogl-atlas-texture-private.h"
 #include "cogl-pipeline.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-object-private.h"
 #include "cogl-primitives.h"
diff --git a/clutter/cogl/cogl/cogl-vertex-buffer.c b/clutter/cogl/cogl/cogl-vertex-buffer.c
index f9fac14..514cb7a 100644
--- a/clutter/cogl/cogl/cogl-vertex-buffer.c
+++ b/clutter/cogl/cogl/cogl-vertex-buffer.c
@@ -99,7 +99,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-vertex-buffer-private.h"
 #include "cogl-texture-private.h"
diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
index b79452d..62636d6 100644
--- a/clutter/cogl/cogl/cogl.c
+++ b/clutter/cogl/cogl/cogl.c
@@ -35,7 +35,7 @@
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-winsys.h"
diff --git a/clutter/cogl/cogl/cogl2-path.c b/clutter/cogl/cogl/cogl2-path.c
index 6b79f75..9a9abdb 100644
--- a/clutter/cogl/cogl/cogl2-path.c
+++ b/clutter/cogl/cogl/cogl2-path.c
@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-object.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
diff --git a/clutter/cogl/cogl/driver/gl/cogl-context-driver-gl.c b/clutter/cogl/cogl/driver/gl/cogl-context-driver-gl.c
index 0e67f15..b830306 100644
--- a/clutter/cogl/cogl/driver/gl/cogl-context-driver-gl.c
+++ b/clutter/cogl/cogl/driver/gl/cogl-context-driver-gl.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f, g)
 #define COGL_FEATURE_FUNCTION(ret, name, args) \
diff --git a/clutter/cogl/cogl/driver/gl/cogl-gl.c b/clutter/cogl/cogl/driver/gl/cogl-gl.c
index b0b069f..48088b3 100644
--- a/clutter/cogl/cogl/driver/gl/cogl-gl.c
+++ b/clutter/cogl/cogl/driver/gl/cogl-gl.c
@@ -30,7 +30,7 @@
 #include "cogl.h"
 
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 #ifdef HAVE_CLUTTER_OSX
diff --git a/clutter/cogl/cogl/driver/gl/cogl-texture-driver-gl.c b/clutter/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
index bda0b0c..72fd574 100644
--- a/clutter/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
+++ b/clutter/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
@@ -37,7 +37,7 @@
 #include "cogl-bitmap-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-primitives.h"
 #include "cogl-pipeline-opengl-private.h"
diff --git a/clutter/cogl/cogl/driver/gles/cogl-context-driver-gles.c b/clutter/cogl/cogl/driver/gles/cogl-context-driver-gles.c
index c1ad1aa..fd5c96f 100644
--- a/clutter/cogl/cogl/driver/gles/cogl-context-driver-gles.c
+++ b/clutter/cogl/cogl/driver/gles/cogl-context-driver-gles.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f, g)
 #define COGL_FEATURE_FUNCTION(ret, name, args) \
diff --git a/clutter/cogl/cogl/driver/gles/cogl-gles.c b/clutter/cogl/cogl/driver/gles/cogl-gles.c
index ad3d397..b2eaa80 100644
--- a/clutter/cogl/cogl/driver/gles/cogl-gles.c
+++ b/clutter/cogl/cogl/driver/gles/cogl-gles.c
@@ -29,7 +29,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 gboolean
diff --git a/clutter/cogl/cogl/driver/gles/cogl-texture-driver-gles.c b/clutter/cogl/cogl/driver/gles/cogl-texture-driver-gles.c
index 02b9816..bf67d83 100644
--- a/clutter/cogl/cogl/driver/gles/cogl-texture-driver-gles.c
+++ b/clutter/cogl/cogl/driver/gles/cogl-texture-driver-gles.c
@@ -38,7 +38,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-pipeline.h"
 #include "cogl-pipeline-opengl-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-primitives.h"
 
diff --git a/clutter/cogl/cogl/winsys/cogl-context-winsys.c b/clutter/cogl/cogl/winsys/cogl-context-winsys.c
index 282df15..ad7a96d 100644
--- a/clutter/cogl/cogl/winsys/cogl-context-winsys.c
+++ b/clutter/cogl/cogl/winsys/cogl-context-winsys.c
@@ -29,7 +29,7 @@
 #include <GL/glx.h>
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 /* Define a set of arrays containing the functions required from GL
diff --git a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index 58bef60..fa94e09 100644
--- a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -40,7 +40,7 @@
 #include "cogl-texture-driver.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-rectangle-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-xlib.h"
 #include "cogl-pipeline-opengl-private.h"
diff --git a/clutter/cogl/cogl/winsys/cogl-xlib.c b/clutter/cogl/cogl/winsys/cogl-xlib.c
index de56bab..636b9fb 100644
--- a/clutter/cogl/cogl/winsys/cogl-xlib.c
+++ b/clutter/cogl/cogl/winsys/cogl-xlib.c
@@ -32,7 +32,7 @@
 #include <cogl.h>
 #include <cogl-internal.h>
 #include <cogl-handle.h>
-#include <cogl-context.h>
+#include <cogl-context-private.h>
 #include <cogl-framebuffer-private.h>
 
 #include <X11/Xlib.h>