Mass rename CLUTTER_COMPILATION to COGL_COMPILATION

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

(cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)

65 files changed, 68 insertions, 68 deletions

diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 3b32e1ed..950213b0 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -5,12 +5,12 @@
 	<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>

     <CoglApiVersion>1.0</CoglApiVersion>

     <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>

-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>

+    <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>

     <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>

     <DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>

     <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>

     <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>

-    <TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>

+    <TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>

     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>

     <DoDefinesSDL>

 if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H

diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 4a77ec3e..c7095b4a 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -36,7 +36,7 @@
 	/>

 	<UserMacro

 		Name="LibBuildDefines"

-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)"

+		Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"

 	/>

 	<UserMacro

 		Name="ReleaseLibBuildDefines"

@@ -56,7 +56,7 @@
 	/>

 	<UserMacro

 		Name="TestProgDef"

-		Value="CLUTTER_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"

+		Value="COGL_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"

 	/>

 	<UserMacro

 		Name="DoDefinesSDL"

diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index b49562f1..8a59a2cf 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -37,7 +37,7 @@ libcogl_pango_la_LDFLAGS = \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
 
 INCLUDES = \
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DG_LOG_DOMAIN=\"CoglPango\"	\
 	-I$(top_srcdir)/cogl		\
 	-I$(top_builddir)/cogl		\
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 95f8482c..739647cb 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = \
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Cogl\" 	\
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
 	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
 	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
diff --git a/cogl/cogl-attribute-buffer.h b/cogl/cogl-attribute-buffer.h
index 717be0cd..bb690636 100644
--- a/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl-attribute-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-attribute.h b/cogl/cogl-attribute.h
index 70117077..60ffaba2 100644
--- a/cogl/cogl-attribute.h
+++ b/cogl/cogl-attribute.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-bitmap.h b/cogl/cogl-bitmap.h
index 79003065..5f5674a5 100644
--- a/cogl/cogl-bitmap.h
+++ b/cogl/cogl-bitmap.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-buffer.h b/cogl/cogl-buffer.h
index 4f073b10..5ad24b96 100644
--- a/cogl/cogl-buffer.h
+++ b/cogl/cogl-buffer.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clip-state.h b/cogl/cogl-clip-state.h
index b51943f4..70cb63bf 100644
--- a/cogl/cogl-clip-state.h
+++ b/cogl/cogl-clip-state.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clutter-xlib.h b/cogl/cogl-clutter-xlib.h
index 766ceba5..6c08f580 100644
--- a/cogl/cogl-clutter-xlib.h
+++ b/cogl/cogl-clutter-xlib.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl-xlib.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clutter.h b/cogl/cogl-clutter.h
index bd8e3c46..26738887 100644
--- a/cogl/cogl-clutter.h
+++ b/cogl/cogl-clutter.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-color.h b/cogl/cogl-color.h
index fe2dce11..5bd7936b 100644
--- a/cogl/cogl-color.h
+++ b/cogl/cogl-color.h
@@ -31,7 +31,7 @@
  * Since: 1.0
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
index 757b1a87..616cd77c 100644
--- a/cogl/cogl-context.h
+++ b/cogl/cogl-context.h
@@ -24,7 +24,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.in b/cogl/cogl-defines.h.in
index a9c0b5c7..7c1c5aeb 100644
--- a/cogl/cogl-defines.h.in
+++ b/cogl/cogl-defines.h.in
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.win32.in b/cogl/cogl-defines.h.win32.in
index b6e6d046..da9cc5f9 100644
--- a/cogl/cogl-defines.h.win32.in
+++ b/cogl/cogl-defines.h.win32.in
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.win32_SDL.in b/cogl/cogl-defines.h.win32_SDL.in
index 0cc9f9d0..dc9ea5d9 100644
--- a/cogl/cogl-defines.h.win32_SDL.in
+++ b/cogl/cogl-defines.h.win32_SDL.in
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-depth-state.h b/cogl/cogl-depth-state.h
index 71535bb7..072c6b0d 100644
--- a/cogl/cogl-depth-state.h
+++ b/cogl/cogl-depth-state.h
@@ -24,7 +24,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
index 7e5e4275..463b99cb 100644
--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h
@@ -24,7 +24,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-euler.h b/cogl/cogl-euler.h
index e3012023..a4c988d2 100644
--- a/cogl/cogl-euler.h
+++ b/cogl/cogl-euler.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-fixed.h b/cogl/cogl-fixed.h
index 0d71823b..a1d6317f 100644
--- a/cogl/cogl-fixed.h
+++ b/cogl/cogl-fixed.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-gl-header.h.in b/cogl/cogl-gl-header.h.in
index 30bc8376..647d82b3 100644
--- a/cogl/cogl-gl-header.h.in
+++ b/cogl/cogl-gl-header.h.in
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(CLUTTER_COMPILATION)
+#if !defined(COGL_COMPILATION)
 #error "cogl-gl-header.h should only be included when compiling Cogl"
 #endif
 
diff --git a/cogl/cogl-gl-header.h.win32 b/cogl/cogl-gl-header.h.win32
index 710d1fab..6f97147a 100644
--- a/cogl/cogl-gl-header.h.win32
+++ b/cogl/cogl-gl-header.h.win32
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(CLUTTER_COMPILATION)
+#if !defined(COGL_COMPILATION)
 #error "cogl-gl-header.h should only be included when compiling Cogl"
 #endif
 
diff --git a/cogl/cogl-gles2.h b/cogl/cogl-gles2.h
index 56ff64d1..34467b2e 100644
--- a/cogl/cogl-gles2.h
+++ b/cogl/cogl-gles2.h
@@ -43,7 +43,7 @@
  * conflicts we only expose the minimal set of GLES 2.0 types and enums
  * publicly.
  */
-#ifdef CLUTTER_COMPILATION
+#ifdef COGL_COMPILATION
 #include "cogl-gl-header.h"
 #else
 #include <cogl/cogl-gles2-types.h>
diff --git a/cogl/cogl-glib-source.h b/cogl/cogl-glib-source.h
index 6bd5dd46..1ce7d7e7 100644
--- a/cogl/cogl-glib-source.h
+++ b/cogl/cogl-glib-source.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl-index-buffer.h
index 11481f2d..663e066a 100644
--- a/cogl/cogl-index-buffer.h
+++ b/cogl/cogl-index-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-indices.h b/cogl/cogl-indices.h
index 62eca03b..c13e425c 100644
--- a/cogl/cogl-indices.h
+++ b/cogl/cogl-indices.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-kms-display.h b/cogl/cogl-kms-display.h
index 012f871d..85ecc72e 100644
--- a/cogl/cogl-kms-display.h
+++ b/cogl/cogl-kms-display.h
@@ -22,7 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-kms-renderer.h b/cogl/cogl-kms-renderer.h
index 68d126eb..539fa788 100644
--- a/cogl/cogl-kms-renderer.h
+++ b/cogl/cogl-kms-renderer.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-magazine-private.h b/cogl/cogl-magazine-private.h
index 07900ec4..16e5a61e 100644
--- a/cogl/cogl-magazine-private.h
+++ b/cogl/cogl-magazine-private.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h
index 7b012fdf..964fa4a6 100644
--- a/cogl/cogl-material-compat.h
+++ b/cogl/cogl-material-compat.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-memory-stack-private.h b/cogl/cogl-memory-stack-private.h
index 858807ab..d6d5a9ce 100644
--- a/cogl/cogl-memory-stack-private.h
+++ b/cogl/cogl-memory-stack-private.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-meta-texture.h b/cogl/cogl-meta-texture.h
index dca9f5e6..b896cd0e 100644
--- a/cogl/cogl-meta-texture.h
+++ b/cogl/cogl-meta-texture.h
@@ -22,7 +22,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-offscreen.h b/cogl/cogl-offscreen.h
index afb920b9..e3ca11bb 100644
--- a/cogl/cogl-offscreen.h
+++ b/cogl/cogl-offscreen.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-onscreen-template.h b/cogl/cogl-onscreen-template.h
index 948eaa15..7589b5f1 100644
--- a/cogl/cogl-onscreen-template.h
+++ b/cogl/cogl-onscreen-template.h
@@ -24,7 +24,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 339bdf30..a3f1d73a 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-path-functions.h b/cogl/cogl-path-functions.h
index a443745c..cb125084 100644
--- a/cogl/cogl-path-functions.h
+++ b/cogl/cogl-path-functions.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-path.h b/cogl/cogl-path.h
index c3d0d450..b29fdeef 100644
--- a/cogl/cogl-path.h
+++ b/cogl/cogl-path.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl-pipeline-layer-state.h
index b808fa37..39a47578 100644
--- a/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl-pipeline-layer-state.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h
index cfaec22d..01720464 100644
--- a/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl-pipeline-state.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline.h b/cogl/cogl-pipeline.h
index aa55f240..67b777a0 100644
--- a/cogl/cogl-pipeline.h
+++ b/cogl/cogl-pipeline.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl-pixel-buffer.h
index 14e6f0f4..f02e38ab 100644
--- a/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl-pixel-buffer.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-poll.h b/cogl/cogl-poll.h
index a7647594..2a319bd4 100644
--- a/cogl/cogl-poll.h
+++ b/cogl/cogl-poll.h
@@ -24,7 +24,7 @@
  *  Neil Roberts <neil@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-primitive-texture.h b/cogl/cogl-primitive-texture.h
index db8cff48..39c3c416 100644
--- a/cogl/cogl-primitive-texture.h
+++ b/cogl/cogl-primitive-texture.h
@@ -22,7 +22,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h
index 2a33e02f..e6495b46 100644
--- a/cogl/cogl-primitive.h
+++ b/cogl/cogl-primitive.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-quaternion.h b/cogl/cogl-quaternion.h
index 7683633b..65016038 100644
--- a/cogl/cogl-quaternion.h
+++ b/cogl/cogl-quaternion.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 98fb05c9..c8bac6eb 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h
index e0f4f4c9..732beaf1 100644
--- a/cogl/cogl-sdl.h
+++ b/cogl/cogl-sdl.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-shader.h b/cogl/cogl-shader.h
index 00c1acd7..ae9a2d0c 100644
--- a/cogl/cogl-shader.h
+++ b/cogl/cogl-shader.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-snippet.h b/cogl/cogl-snippet.h
index 21911172..f20cc981 100644
--- a/cogl/cogl-snippet.h
+++ b/cogl/cogl-snippet.h
@@ -25,7 +25,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-sub-texture.h b/cogl/cogl-sub-texture.h
index 05f924c6..8c27a95f 100644
--- a/cogl/cogl-sub-texture.h
+++ b/cogl/cogl-sub-texture.h
@@ -24,7 +24,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-swap-chain.h b/cogl/cogl-swap-chain.h
index df383f54..fafdaced 100644
--- a/cogl/cogl-swap-chain.h
+++ b/cogl/cogl-swap-chain.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl-texture-2d.h
index 191b4e93..33671940 100644
--- a/cogl/cogl-texture-2d.h
+++ b/cogl/cogl-texture-2d.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture-3d.h b/cogl/cogl-texture-3d.h
index fe9f42fb..019be51a 100644
--- a/cogl/cogl-texture-3d.h
+++ b/cogl/cogl-texture-3d.h
@@ -24,7 +24,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h
index d2d42524..cd65b561 100644
--- a/cogl/cogl-texture.h
+++ b/cogl/cogl-texture.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
index 120fff90..933cac02 100644
--- a/cogl/cogl-types.h
+++ b/cogl/cogl-types.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
@@ -77,7 +77,7 @@ typedef int CoglBool;
    definitions because we want the size to be public so they can be
    allocated on the stack. This macro is used to ensure that users
    don't accidentally access private members */
-#ifdef CLUTTER_COMPILATION
+#ifdef COGL_COMPILATION
 #define COGL_PRIVATE(x) x
 #else
 #define COGL_PRIVATE(x) private_member_ ## x
diff --git a/cogl/cogl-vector.h b/cogl/cogl-vector.h
index eaeba565..3156b150 100644
--- a/cogl/cogl-vector.h
+++ b/cogl/cogl-vector.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h
index 5b95fb36..b47188b2 100644
--- a/cogl/cogl-vertex-buffer.h
+++ b/cogl/cogl-vertex-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-wayland-renderer.h b/cogl/cogl-wayland-renderer.h
index 68fa7743..f5a760f7 100644
--- a/cogl/cogl-wayland-renderer.h
+++ b/cogl/cogl-wayland-renderer.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-win32-renderer.h b/cogl/cogl-win32-renderer.h
index 3b265936..2bf06a19 100644
--- a/cogl/cogl-win32-renderer.h
+++ b/cogl/cogl-win32-renderer.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h
index a6361705..8a8337ed 100644
--- a/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl-xlib-renderer.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl-xlib.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl1-context.h b/cogl/cogl1-context.h
index 401b0553..49744ac4 100644
--- a/cogl/cogl1-context.h
+++ b/cogl/cogl1-context.h
@@ -24,7 +24,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl2-compatibility.h b/cogl/cogl2-compatibility.h
index 3c9f979a..4707787a 100644
--- a/cogl/cogl2-compatibility.h
+++ b/cogl/cogl2-compatibility.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl2-path.h b/cogl/cogl2-path.h
index 88d88ebc..196e4c38 100644
--- a/cogl/cogl2-path.h
+++ b/cogl/cogl2-path.h
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index b305a352..83fd55c5 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -116,7 +116,7 @@ test_conformance_CPPFLAGS = \
 	-DCOGL_ENABLE_EXPERIMENTAL_API \
 	-DCOGL_DISABLE_DEPRECATED \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \
-	-DCLUTTER_COMPILATION
+	-DCOGL_COMPILATION
 
 test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
 test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la
diff --git a/tests/conform/test-no-gl-header.c b/tests/conform/test-no-gl-header.c
index ab0b931c..0628576c 100644
--- a/tests/conform/test-no-gl-header.c
+++ b/tests/conform/test-no-gl-header.c
@@ -1,4 +1,4 @@
-#undef CLUTTER_COMPILATION
+#undef COGL_COMPILATION
 #include <cogl/cogl.h>
 
 #include "test-utils.h"