diff --git a/research/particle-engine/examples/Makefile.am b/research/particle-engine/examples/Makefile.am
index da33fd136..e3f7fe7e8 100644
--- a/research/particle-engine/examples/Makefile.am
+++ b/research/particle-engine/examples/Makefile.am
@@ -1,16 +1,18 @@
 noinst_PROGRAMS =
 
 AM_CFLAGS = \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/research/particle-engine/pe
 
 LDADD = \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(top_builddir)/research/particle-engine/pe/libpe.la \
 	$(top_builddir)/clib/clib/libclib.la \
 	-lm
diff --git a/research/particle-engine/examples/catherine-wheel.c b/research/particle-engine/examples/catherine-wheel.c
index 4e4e73ea1..543934d9c 100644
--- a/research/particle-engine/examples/catherine-wheel.c
+++ b/research/particle-engine/examples/catherine-wheel.c
@@ -6,7 +6,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #define WIDTH 1024
diff --git a/research/particle-engine/examples/fireworks.c b/research/particle-engine/examples/fireworks.c
index 07508fddb..667cf5558 100644
--- a/research/particle-engine/examples/fireworks.c
+++ b/research/particle-engine/examples/fireworks.c
@@ -2,7 +2,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #define WIDTH 1024
 #define HEIGHT 768
diff --git a/research/particle-engine/examples/fountains.c b/research/particle-engine/examples/fountains.c
index ca782c0dd..944ab58d1 100644
--- a/research/particle-engine/examples/fountains.c
+++ b/research/particle-engine/examples/fountains.c
@@ -2,7 +2,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #define WIDTH 1024
 #define HEIGHT 768
diff --git a/research/particle-engine/examples/snow.c b/research/particle-engine/examples/snow.c
index 6e1248569..706cb884a 100644
--- a/research/particle-engine/examples/snow.c
+++ b/research/particle-engine/examples/snow.c
@@ -10,7 +10,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #define WIDTH 1024
diff --git a/research/particle-engine/pe/Makefile.am b/research/particle-engine/pe/Makefile.am
index bee72e18b..7f0b7782c 100644
--- a/research/particle-engine/pe/Makefile.am
+++ b/research/particle-engine/pe/Makefile.am
@@ -1,13 +1,15 @@
 AM_CFLAGS = \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
-	-I$(top_builddir)/clib/clib
+	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib
 
 LDADD = \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(top_builddir)/clib/clib/libclib.la \
 	-lm
 
diff --git a/research/particle-engine/pe/fuzzy.h b/research/particle-engine/pe/fuzzy.h
index dfac56318..157ec92fb 100644
--- a/research/particle-engine/pe/fuzzy.h
+++ b/research/particle-engine/pe/fuzzy.h
@@ -65,7 +65,7 @@
 #ifndef _FUZZY_H
 #define _FUZZY_H
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 struct fuzzy_float {
diff --git a/research/particle-engine/pe/particle-emitter.c b/research/particle-engine/pe/particle-emitter.c
index a55e2f811..2fcccedb7 100644
--- a/research/particle-engine/pe/particle-emitter.c
+++ b/research/particle-engine/pe/particle-emitter.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-emitter.h"
 #include "particle-engine.h"
diff --git a/research/particle-engine/pe/particle-emitter.h b/research/particle-engine/pe/particle-emitter.h
index 75f18c143..5079373fe 100644
--- a/research/particle-engine/pe/particle-emitter.h
+++ b/research/particle-engine/pe/particle-emitter.h
@@ -25,7 +25,7 @@
 
 #include "fuzzy.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 /* <priv> */
 struct particle_emitter_priv;
diff --git a/research/particle-engine/pe/particle-engine.h b/research/particle-engine/pe/particle-engine.h
index 5270681a9..06d9a2368 100644
--- a/research/particle-engine/pe/particle-engine.h
+++ b/research/particle-engine/pe/particle-engine.h
@@ -23,7 +23,7 @@
 #ifndef _PARTICLE_ENGINE_H_
 #define _PARTICLE_ENGINE_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 /*
  * The particle engine is an opaque data structure
diff --git a/research/particle-engine/pe/particle-swarm.c b/research/particle-engine/pe/particle-swarm.c
index 794c1c81c..099916095 100644
--- a/research/particle-engine/pe/particle-swarm.c
+++ b/research/particle-engine/pe/particle-swarm.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-swarm.h"
 #include "particle-engine.h"
diff --git a/research/particle-engine/pe/particle-system.c b/research/particle-engine/pe/particle-system.c
index 6b79c4a4b..bc3805f42 100644
--- a/research/particle-engine/pe/particle-system.c
+++ b/research/particle-engine/pe/particle-system.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-system.h"
 #include "particle-engine.h"
diff --git a/research/ui-archive/rig-inspector.c b/research/ui-archive/rig-inspector.c
index 576b1888b..f06bcf178 100644
--- a/research/ui-archive/rig-inspector.c
+++ b/research/ui-archive/rig-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rig-inspector.h b/research/ui-archive/rig-inspector.h
index a88f4c7c3..a8e542171 100644
--- a/research/ui-archive/rig-inspector.h
+++ b/research/ui-archive/rig-inspector.h
@@ -29,7 +29,7 @@
 #ifndef _RIG_INSPECTOR_H_
 #define _RIG_INSPECTOR_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/research/ui-archive/rig-prop-inspector.c b/research/ui-archive/rig-prop-inspector.c
index 41eed2d74..49580fe6c 100644
--- a/research/ui-archive/rig-prop-inspector.c
+++ b/research/ui-archive/rig-prop-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rig-selection-tool.h b/research/ui-archive/rig-selection-tool.h
index 24aefff0f..092d5e7aa 100644
--- a/research/ui-archive/rig-selection-tool.h
+++ b/research/ui-archive/rig-selection-tool.h
@@ -31,7 +31,7 @@
 
 #include <stdbool.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/research/ui-archive/rig-split-view.c b/research/ui-archive/rig-split-view.c
index 9c2c5cfbc..d51c20223 100644
--- a/research/ui-archive/rig-split-view.c
+++ b/research/ui-archive/rig-split-view.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rig-split-view.h b/research/ui-archive/rig-split-view.h
index d546c08e2..1668fc61f 100644
--- a/research/ui-archive/rig-split-view.h
+++ b/research/ui-archive/rig-split-view.h
@@ -29,7 +29,7 @@
 #ifndef _RIG_SPLIT_VIEW_H_
 #define _RIG_SPLIT_VIEW_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut.h"
 
diff --git a/research/ui-archive/rut-color-button.c b/research/ui-archive/rut-color-button.c
index 56105a672..64220de97 100644
--- a/research/ui-archive/rut-color-button.c
+++ b/research/ui-archive/rut-color-button.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include "rut-color-button.h"
diff --git a/research/ui-archive/rut-color-picker.c b/research/ui-archive/rut-color-picker.c
index e6c30bc05..b79c537ad 100644
--- a/research/ui-archive/rut-color-picker.c
+++ b/research/ui-archive/rut-color-picker.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include "rut-shell.h"
diff --git a/research/ui-archive/rut-drop-down.c b/research/ui-archive/rut-drop-down.c
index e638c36fb..dc7f1e85b 100644
--- a/research/ui-archive/rut-drop-down.c
+++ b/research/ui-archive/rut-drop-down.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-path/cogl-path.h>
 #include <string.h>
 #include <math.h>
diff --git a/research/ui-archive/rut-drop-down.h b/research/ui-archive/rut-drop-down.h
index 83399f5de..3c7a1b1a9 100644
--- a/research/ui-archive/rut-drop-down.h
+++ b/research/ui-archive/rut-drop-down.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_DROP_DOWN_H_
 #define _RUT_DROP_DOWN_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-types.h"
 #include "rut-object.h"
diff --git a/research/ui-archive/rut-entry.c b/research/ui-archive/rut-entry.c
index 56da531c2..b72c99cb0 100644
--- a/research/ui-archive/rut-entry.c
+++ b/research/ui-archive/rut-entry.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rut-fixed.h b/research/ui-archive/rut-fixed.h
index 3a122de17..2ea28046e 100644
--- a/research/ui-archive/rut-fixed.h
+++ b/research/ui-archive/rut-fixed.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_FIXED_H__
 #define __RUT_FIXED_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 
diff --git a/research/ui-archive/rut-icon.c b/research/ui-archive/rut-icon.c
index 7be6bcc5a..514cf271a 100644
--- a/research/ui-archive/rut-icon.c
+++ b/research/ui-archive/rut-icon.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rut-image.c b/research/ui-archive/rut-image.c
index 3e8feb5c2..b490ec44d 100644
--- a/research/ui-archive/rut-image.c
+++ b/research/ui-archive/rut-image.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rut-nine-slice.c b/research/ui-archive/rut-nine-slice.c
index a3dec8dfc..416a5fe55 100644
--- a/research/ui-archive/rut-nine-slice.c
+++ b/research/ui-archive/rut-nine-slice.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-interfaces.h"
 #include "rut-paintable.h"
diff --git a/research/ui-archive/rut-nine-slice.h b/research/ui-archive/rut-nine-slice.h
index 2c83a119d..2f8d67019 100644
--- a/research/ui-archive/rut-nine-slice.h
+++ b/research/ui-archive/rut-nine-slice.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_NINE_SLICE_H__
 #define __RUT_NINE_SLICE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 #include <rut-mesh.h>
diff --git a/research/ui-archive/rut-number-slider.c b/research/ui-archive/rut-number-slider.c
index 9285788d3..3968487f6 100644
--- a/research/ui-archive/rut-number-slider.c
+++ b/research/ui-archive/rut-number-slider.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/research/ui-archive/rut-rotation-inspector.c b/research/ui-archive/rut-rotation-inspector.c
index 43e54c868..fb32cdebb 100644
--- a/research/ui-archive/rut-rotation-inspector.c
+++ b/research/ui-archive/rut-rotation-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-number-slider.h"
 #include "rut-rotation-inspector.h"
diff --git a/research/ui-archive/rut-rotation-inspector.h b/research/ui-archive/rut-rotation-inspector.h
index 48dcba4b3..7a681cbc4 100644
--- a/research/ui-archive/rut-rotation-inspector.h
+++ b/research/ui-archive/rut-rotation-inspector.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_ROTATION_INSPECTOR_H_
 #define _RUT_ROTATION_INSPECTOR_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 #include "rut-shell.h"
diff --git a/research/ui-archive/rut-scale.c b/research/ui-archive/rut-scale.c
index 7c54c2fc7..4f6eedf22 100644
--- a/research/ui-archive/rut-scale.c
+++ b/research/ui-archive/rut-scale.c
@@ -32,7 +32,7 @@
 #include <math.h>
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-interfaces.h"
 #include "rut-paintable.h"
diff --git a/research/ui-archive/rut-shim.h b/research/ui-archive/rut-shim.h
index 186db3373..9d6ecfa9e 100644
--- a/research/ui-archive/rut-shim.h
+++ b/research/ui-archive/rut-shim.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_SHIM_H__
 #define __RUT_SHIM_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 
diff --git a/research/ui-archive/rut-stack.c b/research/ui-archive/rut-stack.c
index 3f034ccff..fe736337a 100644
--- a/research/ui-archive/rut-stack.c
+++ b/research/ui-archive/rut-stack.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/research/ui-archive/rut-ui-viewport.h b/research/ui-archive/rut-ui-viewport.h
index 30c2e37c7..1ad66040f 100644
--- a/research/ui-archive/rut-ui-viewport.h
+++ b/research/ui-archive/rut-ui-viewport.h
@@ -30,7 +30,7 @@
 #ifndef _RUT_UI_VIEWPORT_H_
 #define _RUT_UI_VIEWPORT_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-type.h"
 
diff --git a/research/ui-archive/rut-vec3-slider.c b/research/ui-archive/rut-vec3-slider.c
index ac0f244fb..0c758a1ea 100644
--- a/research/ui-archive/rut-vec3-slider.c
+++ b/research/ui-archive/rut-vec3-slider.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-number-slider.h"
 #include "rut-vec3-slider.h"
diff --git a/rig/Makefile.am b/rig/Makefile.am
index dceabe312..b187d28fb 100644
--- a/rig/Makefile.am
+++ b/rig/Makefile.am
@@ -8,6 +8,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/xdgmime \
 	-I$(top_srcdir)/rut \
 	-I$(top_builddir)/rut \
@@ -15,7 +17,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/rig/protobuf-c-rpc \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	$(RIG_DEP_CFLAGS) \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-DRIG_BIN_DIR=\"$(bindir)/\" \
 	$(RIG_CLANG_CFLAGS) \
 	-DRIG_LLVM_PREFIX=\"@RIG_LLVM_PREFIX@\" \
@@ -127,10 +129,9 @@ common_ldadd = \
 	$(RIG_EXTRA_LDFLAGS) \
 	librig.la \
 	$(top_builddir)/rut/librut.la \
-	$(top_builddir)/cogl/libcg.la \
-	$(top_builddir)/cogl-path/libcogl-path.la \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(RIG_DEP_LIBS) \
-	$(COGL_DEP_LIBS)
+	$(CG_DEP_LIBS)
 
 if USE_UV
 common_ldadd += $(top_builddir)/xdgmime/libxdgmime.la
diff --git a/rig/components/rig-button-input.c b/rig/components/rig-button-input.c
index 377ba6e47..bae99e9bf 100644
--- a/rig/components/rig-button-input.c
+++ b/rig/components/rig-button-input.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/components/rig-camera.c b/rig/components/rig-camera.c
index 6ca5cffce..b51c3b3db 100644
--- a/rig/components/rig-camera.c
+++ b/rig/components/rig-camera.c
@@ -30,7 +30,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include <rut.h>
diff --git a/rig/components/rig-camera.h b/rig/components/rig-camera.h
index 80b6ca96b..ce41d239d 100644
--- a/rig/components/rig-camera.h
+++ b/rig/components/rig-camera.h
@@ -29,7 +29,7 @@
 #ifndef __RIG_CAMERA_H__
 #define __RIG_CAMERA_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/components/rig-model.h b/rig/components/rig-model.h
index f72a35cd4..94d446d49 100644
--- a/rig/components/rig-model.h
+++ b/rig/components/rig-model.h
@@ -31,7 +31,7 @@
 
 #include <stdint.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/components/rig-nine-slice.c b/rig/components/rig-nine-slice.c
index 18a19c737..f8aa79a7f 100644
--- a/rig/components/rig-nine-slice.c
+++ b/rig/components/rig-nine-slice.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/components/rig-nine-slice.h b/rig/components/rig-nine-slice.h
index da10c3dd9..a123a9597 100644
--- a/rig/components/rig-nine-slice.h
+++ b/rig/components/rig-nine-slice.h
@@ -30,7 +30,7 @@
 #ifndef __RIG_NINE_SLICE_H__
 #define __RIG_NINE_SLICE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-application.c b/rig/rig-application.c
index 4880826f4..91331d3be 100644
--- a/rig/rig-application.c
+++ b/rig/rig-application.c
@@ -36,7 +36,7 @@
 #include "rut-box-layout.h"
 
 #ifdef USE_SDL
-#include <cogl/cogl-sdl.h>
+#include <cglib/cg-sdl.h>
 #include <SDL.h>
 #include <SDL_syswm.h>
 #endif
diff --git a/rig/rig-asset.c b/rig/rig-asset.c
index 6ff27ee0c..b5ec9c579 100644
--- a/rig/rig-asset.c
+++ b/rig/rig-asset.c
@@ -32,7 +32,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #ifdef USE_GSTREAMER
 #include <cogl-gst/cogl-gst.h>
diff --git a/rig/rig-dof-effect.h b/rig/rig-dof-effect.h
index 0918cfc45..320d05172 100644
--- a/rig/rig-dof-effect.h
+++ b/rig/rig-dof-effect.h
@@ -29,7 +29,7 @@
 #ifndef __RIG_DOF_EFFECT_H__
 #define __RIG_DOF_EFFECT_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-downsampler.h b/rig/rig-downsampler.h
index 4d2ec7e88..6813c2509 100644
--- a/rig/rig-downsampler.h
+++ b/rig/rig-downsampler.h
@@ -29,7 +29,7 @@
 #ifndef __RIG_DOWNSAMPLER_H__
 #define __RIG_DOWNSAMPLER_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-entity.h b/rig/rig-entity.h
index 3f42c940a..4e9c4c25e 100644
--- a/rig/rig-entity.h
+++ b/rig/rig-entity.h
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-image-source.c b/rig/rig-image-source.c
index 9d293facc..872459f6a 100644
--- a/rig/rig-image-source.c
+++ b/rig/rig-image-source.c
@@ -28,8 +28,8 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-webgl.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-webgl.h>
 
 #include "rig-image-source.h"
 
diff --git a/rig/rig-node.h b/rig/rig-node.h
index 6620b054d..df9e0a32f 100644
--- a/rig/rig-node.h
+++ b/rig/rig-node.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_NODE_H_
 #define _RUT_NODE_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <rut.h>
 
 typedef struct {
diff --git a/rig/rig-osx.h b/rig/rig-osx.h
index 455efc695..824494aa6 100644
--- a/rig/rig-osx.h
+++ b/rig/rig-osx.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_OSX_H_
 #define _RUT_OSX_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include "rig-types.h"
 
 typedef struct _rig_osx_engine_t rig_osx_engine_t;
diff --git a/rig/rig-rotation-tool.h b/rig/rig-rotation-tool.h
index 0829c0be4..f3d98fc30 100644
--- a/rig/rig-rotation-tool.h
+++ b/rig/rig-rotation-tool.h
@@ -31,7 +31,7 @@
 
 #include <stdbool.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-text-pipeline-cache.c b/rig/rig-text-pipeline-cache.c
index f522d9ab3..3a354f521 100644
--- a/rig/rig-text-pipeline-cache.c
+++ b/rig/rig-text-pipeline-cache.c
@@ -37,7 +37,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rig-text-pipeline-cache.h"
 
diff --git a/rig/rig-text-pipeline-cache.h b/rig/rig-text-pipeline-cache.h
index 8390094ab..00da092e3 100644
--- a/rig/rig-text-pipeline-cache.h
+++ b/rig/rig-text-pipeline-cache.h
@@ -36,7 +36,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 C_BEGIN_DECLS
 
diff --git a/rig/rig-text-renderer.c b/rig/rig-text-renderer.c
index 0a35482f7..0615e69fe 100644
--- a/rig/rig-text-renderer.c
+++ b/rig/rig-text-renderer.c
@@ -39,7 +39,7 @@
 
 #include <hb.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rig/rig-timeline.c b/rig/rig-timeline.c
index 6f39e9abf..ab6ac15d8 100644
--- a/rig/rig-timeline.c
+++ b/rig/rig-timeline.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 
diff --git a/rut/Android.mk b/rut/Android.mk
index a7dec402f..ba6f286ff 100644
--- a/rut/Android.mk
+++ b/rut/Android.mk
@@ -7,7 +7,7 @@ LOCAL_CFLAGS := -DRIG_ENABLE_DEBUG
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.c)
 LOCAL_EXPORT_CFLAGS := -I$(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := clib cogl android_native_app_glue
+LOCAL_STATIC_LIBRARIES := clib cglib android_native_app_glue
 LOCAL_SHARED_LIBRARIES := libuv
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/rut/Makefile.am b/rut/Makefile.am
index 38abd698f..8e89471c5 100644
--- a/rut/Makefile.am
+++ b/rut/Makefile.am
@@ -33,7 +33,7 @@ endif
 
 librut_la_LIBADD = \
     $(RIG_DEP_LIBS) \
-    $(COGL_DEP_LIBS) \
+    $(CG_DEP_LIBS) \
     $(RIG_EXTRA_LDFLAGS)
 librut_la_LDFLAGS = \
     -no-undefined \
@@ -44,7 +44,7 @@ librut_la_LDFLAGS += \
 
 librut_la_CFLAGS = \
     $(RIG_DEP_CFLAGS) \
-    $(COGL_DEP_CFLAGS) \
+    $(CG_DEP_CFLAGS) \
     $(RIG_EXTRA_CFLAGS)
 librut_la_CPPFLAGS = \
     -I$(top_srcdir) \
@@ -52,6 +52,8 @@ librut_la_CPPFLAGS = \
     -I$(top_srcdir)/libuv/include \
     -I$(top_srcdir)/clib/clib \
     -I$(top_builddir)/clib/clib \
+    -I$(top_srcdir)/cglib \
+    -I$(top_builddir)/cglib \
     -I$(top_srcdir)/rut
 
 # rut_headersdir =  $(includedir)/rut
diff --git a/rut/Makefile.emscripten b/rut/Makefile.emscripten
index ece7c510e..5863c9f8f 100644
--- a/rut/Makefile.emscripten
+++ b/rut/Makefile.emscripten
@@ -20,7 +20,7 @@ BC_CFLAGS=$(CFLAGS)
 _OBJ_CFLAGS=$(OBJ_CFLAGS) \
 	    -I$(top_srcdir) \
 	    -I$(top_srcdir)/clib \
-	    -I$(top_srcdir)/cogl \
+	    -I$(top_srcdir)/cglib \
 	    -I$(srcdir)
 _BC_CFLAGS=$(BC_CFLAGS) -I$(top_srcdir) -I$(srcdir)
 
diff --git a/rut/rut-android-shell.c b/rut/rut-android-shell.c
index 47a8aab41..59806eccb 100644
--- a/rut/rut-android-shell.c
+++ b/rut/rut-android-shell.c
@@ -30,7 +30,7 @@
 
 #include <android_native_app_glue.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 
diff --git a/rut/rut-arcball.h b/rut/rut-arcball.h
index 7afa9793d..8142b5ff5 100644
--- a/rut/rut-arcball.h
+++ b/rut/rut-arcball.h
@@ -30,7 +30,7 @@
 #define __RUT_ARCBALL_H__
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 C_BEGIN_DECLS
 
diff --git a/rut/rut-bitmask.h b/rut/rut-bitmask.h
index f50752463..e93d9ab01 100644
--- a/rut/rut-bitmask.h
+++ b/rut/rut-bitmask.h
@@ -56,7 +56,7 @@ C_BEGIN_DECLS
  * of a long (although there is a compile time assert to verify this).
  *
  * If the maximum possible bit number in the set is known at compile
- * time, it may make more sense to use the macros in cogl-flags.h
+ * time, it may make more sense to use the macros in rut-flags.h
  * instead of this type.
  */
 
@@ -82,7 +82,7 @@ typedef struct _rut_bitmask_imaginary_type_t *RutBitmask;
  * _rut_bitmask_init:
  * @bitmask: A pointer to a bitmask
  *
- * Initialises the cogl bitmask. This must be called before any other
+ * Initialises the bitmask. This must be called before any other
  * bitmask functions are called. Initially all of the values are
  * zero
  */
@@ -256,7 +256,7 @@ _rut_bitmask_clear_all(RutBitmask *bitmask)
  * @flags: An array of flags
  *
  * Bitwise or's the bits from @bitmask into the flags array (see
- * cogl-flags) pointed to by @flags.
+ * rut-flags) pointed to by @flags.
  */
 static inline void
 _rut_bitmask_set_flags(const RutBitmask *bitmask,
diff --git a/rut/rut-camera.h b/rut/rut-camera.h
index 64bc0721a..3b8379b88 100644
--- a/rut/rut-camera.h
+++ b/rut/rut-camera.h
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 #include "rut-interfaces.h"
diff --git a/rut/rut-color.c b/rut/rut-color.c
index a94ebbca8..e56416145 100644
--- a/rut/rut-color.c
+++ b/rut/rut-color.c
@@ -33,7 +33,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "color-table.h"
 #include "rut-util.h"
diff --git a/rut/rut-color.h b/rut/rut-color.h
index b2d9150d8..d2e7eda4b 100644
--- a/rut/rut-color.h
+++ b/rut/rut-color.h
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 
diff --git a/rut/rut-emscripten-shell.c b/rut/rut-emscripten-shell.c
index 83f5db8e1..82662da3d 100644
--- a/rut/rut-emscripten-shell.c
+++ b/rut/rut-emscripten-shell.c
@@ -31,7 +31,7 @@
 #include <emscripten.h>
 #include <html5.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl/cogl-webgl.h>
 
 #include "rut-shell.h"
diff --git a/rut/rut-gaussian-blurrer.h b/rut/rut-gaussian-blurrer.h
index e5fa1fa94..72d55aaad 100644
--- a/rut/rut-gaussian-blurrer.h
+++ b/rut/rut-gaussian-blurrer.h
@@ -29,7 +29,7 @@
 #ifndef __RUT_GAUSSIAN_BLURRER_H__
 #define __RUT_GAUSSIAN_BLURRER_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 
diff --git a/rut/rut-geometry.c b/rut/rut-geometry.c
index b577fee4f..c929f637b 100644
--- a/rut/rut-geometry.c
+++ b/rut/rut-geometry.c
@@ -32,7 +32,7 @@
 #include <clib.h>
 #include <math.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 #include "rut-geometry.h"
diff --git a/rut/rut-gradient.c b/rut/rut-gradient.c
index 74f064492..63a79ba48 100644
--- a/rut/rut-gradient.c
+++ b/rut/rut-gradient.c
@@ -33,7 +33,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-gradient.h"
 
diff --git a/rut/rut-gradient.h b/rut/rut-gradient.h
index d0500046e..b4a9e1d1f 100644
--- a/rut/rut-gradient.h
+++ b/rut/rut-gradient.h
@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 #include "rut-shell.h"
diff --git a/rut/rut-graphable.c b/rut/rut-graphable.c
index f99d6aecd..fe61c78fe 100644
--- a/rut/rut-graphable.c
+++ b/rut/rut-graphable.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-graphable.h"
 #include "rut-interfaces.h"
diff --git a/rut/rut-input-region.c b/rut/rut-input-region.c
index 3e6a20bee..50a68a9f9 100644
--- a/rut/rut-input-region.c
+++ b/rut/rut-input-region.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-input-region.h"
 #include "rut-util.h"
diff --git a/rut/rut-input-region.h b/rut/rut-input-region.h
index b5ff2bf10..94afe4c61 100644
--- a/rut/rut-input-region.h
+++ b/rut/rut-input-region.h
@@ -31,7 +31,7 @@
 
 #include <stdbool.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-types.h"
 #include "rut-shell.h"
diff --git a/rut/rut-inputable.h b/rut/rut-inputable.h
index 6c950b20f..c3df48337 100644
--- a/rut/rut-inputable.h
+++ b/rut/rut-inputable.h
@@ -29,7 +29,7 @@
 #ifndef __RUT_INPUTABLE_H__
 #define __RUT_INPUTABLE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 
diff --git a/rut/rut-matrix-stack.c b/rut/rut-matrix-stack.c
index ab0b1db8e..f7ca1981f 100644
--- a/rut/rut-matrix-stack.c
+++ b/rut/rut-matrix-stack.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 #include "rut-object.h"
diff --git a/rut/rut-matrix-stack.h b/rut/rut-matrix-stack.h
index d3e8edeb1..7fb1fc61f 100644
--- a/rut/rut-matrix-stack.h
+++ b/rut/rut-matrix-stack.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_MATRIX_STACK_H_
 #define _RUT_MATRIX_STACK_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-shell.h"
 
diff --git a/rut/rut-mesh-ply.c b/rut/rut-mesh-ply.c
index 3612c9b87..6273f1b53 100644
--- a/rut/rut-mesh-ply.c
+++ b/rut/rut-mesh-ply.c
@@ -29,7 +29,7 @@
 #include <config.h>
 
 #include <string.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rply.h"
 
diff --git a/rut/rut-mesh-ply.h b/rut/rut-mesh-ply.h
index 69c097a6e..05f5b4ed9 100644
--- a/rut/rut-mesh-ply.h
+++ b/rut/rut-mesh-ply.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_MESH_PLY_
 #define _RUT_MESH_PLY_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <clib.h>
 
diff --git a/rut/rut-mesh.h b/rut/rut-mesh.h
index 7b7d9a28f..28040890b 100644
--- a/rut/rut-mesh.h
+++ b/rut/rut-mesh.h
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 typedef struct _rut_buffer_t rut_buffer_t;
 typedef struct _rut_attribute_t rut_attribute_t;
diff --git a/rut/rut-pickable.h b/rut/rut-pickable.h
index 94ea08b60..722e053ff 100644
--- a/rut/rut-pickable.h
+++ b/rut/rut-pickable.h
@@ -29,7 +29,7 @@
 #ifndef __RUT_PICKABLE_H__
 #define __RUT_PICKABLE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 
diff --git a/rut/rut-planes.c b/rut/rut-planes.c
index 2da5e5ff4..7c26c5ccc 100644
--- a/rut/rut-planes.c
+++ b/rut/rut-planes.c
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 #include <string.h>
 
diff --git a/rut/rut-poll.c b/rut/rut-poll.c
index 831d085be..2f6ce25a2 100644
--- a/rut/rut-poll.c
+++ b/rut/rut-poll.c
@@ -42,9 +42,9 @@
 #include <glib.h>
 #endif
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #ifdef USE_SDL
-#include <cogl/cogl-sdl.h>
+#include <cglib/cg-sdl.h>
 #include "rut-sdl-shell.h"
 #endif
 
diff --git a/rut/rut-property.h b/rut/rut-property.h
index eb4de1a0c..058b718b1 100644
--- a/rut/rut-property.h
+++ b/rut/rut-property.h
@@ -34,7 +34,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-memory-stack.h"
 #include "rut-object.h"
diff --git a/rut/rut-rectangle.c b/rut/rut-rectangle.c
index 2f54d7af2..1cc6fa118 100644
--- a/rut/rut-rectangle.c
+++ b/rut/rut-rectangle.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-interfaces.h"
 #include "rut-paintable.h"
diff --git a/rut/rut-rectangle.h b/rut/rut-rectangle.h
index b4b97b66b..35ad1152b 100644
--- a/rut/rut-rectangle.h
+++ b/rut/rut-rectangle.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_RECTANGLE_H__
 #define __RUT_RECTANGLE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 
diff --git a/rut/rut-sdl-shell.c b/rut/rut-sdl-shell.c
index ff8519967..c0f5e19ec 100644
--- a/rut/rut-sdl-shell.c
+++ b/rut/rut-sdl-shell.c
@@ -28,8 +28,8 @@
 
 #include "config.h"
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-sdl.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-sdl.h>
 
 #include <SDL.h>
 #include <SDL_syswm.h>
diff --git a/rut/rut-settings.c b/rut/rut-settings.c
index 02faab513..d238e3152 100644
--- a/rut/rut-settings.c
+++ b/rut/rut-settings.c
@@ -31,9 +31,9 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #ifdef USE_SDL
-#include <cogl/cogl-sdl.h>
+#include <cglib/cg-sdl.h>
 #endif
 
 #include "rut-bitmask.h"
diff --git a/rut/rut-shell.c b/rut/rut-shell.c
index 5c1577e5e..01fa0229e 100644
--- a/rut/rut-shell.c
+++ b/rut/rut-shell.c
@@ -54,9 +54,9 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #ifdef USE_SDL
-#include <cogl/cogl-sdl.h>
+#include <cglib/cg-sdl.h>
 #endif
 #ifdef __EMSCRIPTEN__
 #include <emscripten.h>
diff --git a/rut/rut-shell.h b/rut/rut-shell.h
index 2a3ab34d5..802d3da47 100644
--- a/rut/rut-shell.h
+++ b/rut/rut-shell.h
@@ -49,7 +49,7 @@
 #include <uv.h>
 #endif
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #ifdef USE_PANGO
 #include <cogl-pango/cogl-pango.h>
 #endif
diff --git a/rut/rut-texture-cache.c b/rut/rut-texture-cache.c
index f38f5a12d..5da9682a2 100644
--- a/rut/rut-texture-cache.c
+++ b/rut/rut-texture-cache.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <clib.h>
 
diff --git a/rut/rut-transform-private.h b/rut/rut-transform-private.h
index 56a232bb1..66e125e67 100644
--- a/rut/rut-transform-private.h
+++ b/rut/rut-transform-private.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_TRANSFORM_PRIVATE_H_
 #define _RUT_TRANSFORM_PRIVATE_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 #include "rut-interfaces.h"
diff --git a/rut/rut-transform.h b/rut/rut-transform.h
index a9f7f1d8c..e6531cc4f 100644
--- a/rut/rut-transform.h
+++ b/rut/rut-transform.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_TRANSFORM_H__
 #define __RUT_TRANSFORM_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 
diff --git a/rut/rut-util.c b/rut/rut-util.c
index f019eca17..9826ebcfe 100644
--- a/rut/rut-util.c
+++ b/rut/rut-util.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-mesh.h"
 #include "rut-util.h"
diff --git a/rut/rut-util.h b/rut/rut-util.h
index b95a94816..0c36fe69e 100644
--- a/rut/rut-util.h
+++ b/rut/rut-util.h
@@ -31,7 +31,7 @@
 
 #include <stdbool.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-mesh.h"
 
diff --git a/rut/rut-volume.c b/rut/rut-volume.c
index 7e2fee827..4f51e8c8a 100644
--- a/rut/rut-volume.c
+++ b/rut/rut-volume.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <math.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-volume-private.h"
 #include "rut-util.h"
diff --git a/rut/rut-volume.h b/rut/rut-volume.h
index fe7a678fd..8b8b522ac 100644
--- a/rut/rut-volume.h
+++ b/rut/rut-volume.h
@@ -32,7 +32,7 @@
 #include "rut-planes.h"
 #include "rut-types.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 C_BEGIN_DECLS
diff --git a/rut/rut-x11-shell.c b/rut/rut-x11-shell.c
index 6e1b42419..6b3331d26 100644
--- a/rut/rut-x11-shell.c
+++ b/rut/rut-x11-shell.c
@@ -42,8 +42,8 @@
 #include <xkbcommon/xkbcommon-x11.h>
 #include <xkbcommon/xkbcommon-compose.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-xlib.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-xlib.h>
 
 #include "rut-shell.h"
 #include "rut-x11-shell.h"
diff --git a/rut/rut.h b/rut/rut.h
index 7482fe45e..af0b5d31b 100644
--- a/rut/rut.h
+++ b/rut/rut.h
@@ -30,7 +30,7 @@
 #define _RUT_H_
 
 #ifndef RIG_SIMULATOR_ONLY
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #endif
 
 #include <clib.h>
diff --git a/test-fixtures/Makefile.am b/test-fixtures/Makefile.am
index 8a49612a5..0715afc87 100644
--- a/test-fixtures/Makefile.am
+++ b/test-fixtures/Makefile.am
@@ -5,7 +5,7 @@ libtest_fixtures_la_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/libuv/include \
-	-I$(top_builddir)/cogl \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
 	-Wall \
diff --git a/test-fixtures/test-cg-fixtures.c b/test-fixtures/test-cg-fixtures.c
index 655018850..26487c03b 100644
--- a/test-fixtures/test-cg-fixtures.c
+++ b/test-fixtures/test-cg-fixtures.c
@@ -2,10 +2,10 @@
 
 #include <stdlib.h>
 
-#include <cogl/cogl-defines.h>
+#include <cglib/cg-defines.h>
 
 #ifdef CG_HAS_SDL_SUPPORT
-#include <cogl/cogl-sdl.h>
+#include <cglib/cg-sdl.h>
 #include <SDL.h>
 #endif
 
diff --git a/test-fixtures/test-cg-fixtures.h b/test-fixtures/test-cg-fixtures.h
index d63c56eb2..9f9796a05 100644
--- a/test-fixtures/test-cg-fixtures.h
+++ b/test-fixtures/test-cg-fixtures.h
@@ -8,16 +8,16 @@
  * for testing private apis...
  */
 #ifdef CG_COMPILATION
-#include <cogl/cogl-device.h>
-#include <cogl/cogl-onscreen.h>
-#include <cogl/cogl-offscreen.h>
-#include <cogl/cogl-texture-2d.h>
-#include <cogl/cogl-primitive-texture.h>
-#include <cogl/cogl-texture-2d-sliced.h>
-#include <cogl/cogl-meta-texture.h>
-#include <cogl/cogl-atlas-texture.h>
+#include <cglib/cg-device.h>
+#include <cglib/cg-onscreen.h>
+#include <cglib/cg-offscreen.h>
+#include <cglib/cg-texture-2d.h>
+#include <cglib/cg-primitive-texture.h>
+#include <cglib/cg-texture-2d-sliced.h>
+#include <cglib/cg-meta-texture.h>
+#include <cglib/cg-atlas-texture.h>
 #else
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #endif
 
 #include <clib.h>
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index b90ef9be2..e956ec226 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -129,8 +129,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clib/clib \
-	-I$(top_builddir)/clib/clib	\
-	-I$(top_builddir)/cogl \
+	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/test-fixtures
 
 AM_CPPFLAGS += \
@@ -141,10 +143,10 @@ test_conformance_LDADD = \
 	$(RIG_EXTRA_LDFLAGS) \
 	$(RIG_DEP_LIBS) \
 	$(CG_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(LIBM)
 if USE_CGLIB_PATH
-test_conformance_LDADD += $(top_builddir)/cogl-path/libcogl-path.la
+test_conformance_LDADD += $(top_builddir)/cglib-path/libcglib-path.la
 endif
 test_conformance_LDADD += $(top_builddir)/clib/clib/libclib.la
 test_conformance_LDFLAGS = -export-dynamic
diff --git a/tests/conform/test-alpha-test.c b/tests/conform/test-alpha-test.c
index 56f2a994d..f89e64c88 100644
--- a/tests/conform/test-alpha-test.c
+++ b/tests/conform/test-alpha-test.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-alpha-textures.c b/tests/conform/test-alpha-textures.c
index 969965bbc..885897a6b 100644
--- a/tests/conform/test-alpha-textures.c
+++ b/tests/conform/test-alpha-textures.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-atlas-migration.c b/tests/conform/test-atlas-migration.c
index 364f45f94..28e357d65 100644
--- a/tests/conform/test-atlas-migration.c
+++ b/tests/conform/test-atlas-migration.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c
index ed4253e16..3d9f05d4d 100644
--- a/tests/conform/test-backface-culling.c
+++ b/tests/conform/test-backface-culling.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-blend-strings.c b/tests/conform/test-blend-strings.c
index d438026c1..922d1bae2 100644
--- a/tests/conform/test-blend-strings.c
+++ b/tests/conform/test-blend-strings.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-blend.c b/tests/conform/test-blend.c
index d392648af..3a20b0991 100644
--- a/tests/conform/test-blend.c
+++ b/tests/conform/test-blend.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-color-hsl.c b/tests/conform/test-color-hsl.c
index 31d4542c7..674d03501 100644
--- a/tests/conform/test-color-hsl.c
+++ b/tests/conform/test-color-hsl.c
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-color-mask.c b/tests/conform/test-color-mask.c
index 8f9d62201..b09f9ec2a 100644
--- a/tests/conform/test-color-mask.c
+++ b/tests/conform/test-color-mask.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index 8d547ac96..e303d8f4b 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <clib.h>
 #include <locale.h>
diff --git a/tests/conform/test-copy-replace-texture.c b/tests/conform/test-copy-replace-texture.c
index 2ca84cd9e..ee08e22fe 100644
--- a/tests/conform/test-copy-replace-texture.c
+++ b/tests/conform/test-copy-replace-texture.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-custom-attributes.c b/tests/conform/test-custom-attributes.c
index be07111c7..19b49c704 100644
--- a/tests/conform/test-custom-attributes.c
+++ b/tests/conform/test-custom-attributes.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-depth-test.c b/tests/conform/test-depth-test.c
index 5b6d2f72d..b1b1749b6 100644
--- a/tests/conform/test-depth-test.c
+++ b/tests/conform/test-depth-test.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-euler-quaternion.c b/tests/conform/test-euler-quaternion.c
index 8e9857997..645c29352 100644
--- a/tests/conform/test-euler-quaternion.c
+++ b/tests/conform/test-euler-quaternion.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/tests/conform/test-fence.c b/tests/conform/test-fence.c
index dd63fa8ea..eb273a345 100644
--- a/tests/conform/test-fence.c
+++ b/tests/conform/test-fence.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-framebuffer-get-bits.c b/tests/conform/test-framebuffer-get-bits.c
index bf62d2b39..243d7c19e 100644
--- a/tests/conform/test-framebuffer-get-bits.c
+++ b/tests/conform/test-framebuffer-get-bits.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-gles2-context.c b/tests/conform/test-gles2-context.c
index 72e863ae1..a169b2461 100644
--- a/tests/conform/test-gles2-context.c
+++ b/tests/conform/test-gles2-context.c
@@ -1,8 +1,8 @@
 #include <config.h>
 
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-gles2.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-gles2.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-just-vertex-shader.c b/tests/conform/test-just-vertex-shader.c
index fc8041bfc..04b0fa697 100644
--- a/tests/conform/test-just-vertex-shader.c
+++ b/tests/conform/test-just-vertex-shader.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-layer-remove.c b/tests/conform/test-layer-remove.c
index 3b26a7af0..d532df77e 100644
--- a/tests/conform/test-layer-remove.c
+++ b/tests/conform/test-layer-remove.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-map-buffer-range.c b/tests/conform/test-map-buffer-range.c
index 774bc6e72..42a35dc88 100644
--- a/tests/conform/test-map-buffer-range.c
+++ b/tests/conform/test-map-buffer-range.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-no-gl-header.c b/tests/conform/test-no-gl-header.c
index 1b30c2b04..26755444d 100644
--- a/tests/conform/test-no-gl-header.c
+++ b/tests/conform/test-no-gl-header.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #undef CG_COMPILATION
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 /* If you just include cogl/cogl.h, you shouldn't end up including any
    GL headers */
diff --git a/tests/conform/test-npot-texture.c b/tests/conform/test-npot-texture.c
index abee20bae..e0c4669a3 100644
--- a/tests/conform/test-npot-texture.c
+++ b/tests/conform/test-npot-texture.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-offscreen.c b/tests/conform/test-offscreen.c
index f95aa5c4b..bb15e1982 100644
--- a/tests/conform/test-offscreen.c
+++ b/tests/conform/test-offscreen.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-path-clip.c b/tests/conform/test-path-clip.c
index 7945af967..3f3121eac 100644
--- a/tests/conform/test-path-clip.c
+++ b/tests/conform/test-path-clip.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-path/cogl-path.h>
 
 #include <string.h>
diff --git a/tests/conform/test-path.c b/tests/conform/test-path.c
index 557b096de..d9a833269 100644
--- a/tests/conform/test-path.c
+++ b/tests/conform/test-path.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-path/cogl-path.h>
 
 #include <string.h>
diff --git a/tests/conform/test-pipeline-cache-unrefs-texture.c b/tests/conform/test-pipeline-cache-unrefs-texture.c
index 81b678585..220417263 100644
--- a/tests/conform/test-pipeline-cache-unrefs-texture.c
+++ b/tests/conform/test-pipeline-cache-unrefs-texture.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-pipeline-shader-state.c b/tests/conform/test-pipeline-shader-state.c
index 0177cf95e..c7f559712 100644
--- a/tests/conform/test-pipeline-shader-state.c
+++ b/tests/conform/test-pipeline-shader-state.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-pipeline-uniforms.c b/tests/conform/test-pipeline-uniforms.c
index 132368749..f2888df0f 100644
--- a/tests/conform/test-pipeline-uniforms.c
+++ b/tests/conform/test-pipeline-uniforms.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-pixel-buffer.c b/tests/conform/test-pixel-buffer.c
index 5ee8f6ee4..069071262 100644
--- a/tests/conform/test-pixel-buffer.c
+++ b/tests/conform/test-pixel-buffer.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-point-size-attribute.c b/tests/conform/test-point-size-attribute.c
index 78071802c..52dae6c01 100644
--- a/tests/conform/test-point-size-attribute.c
+++ b/tests/conform/test-point-size-attribute.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-point-size.c b/tests/conform/test-point-size.c
index 77e291e7e..c81fc208e 100644
--- a/tests/conform/test-point-size.c
+++ b/tests/conform/test-point-size.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-point-sprite.c b/tests/conform/test-point-sprite.c
index e9811fbd0..adf41a75c 100644
--- a/tests/conform/test-point-sprite.c
+++ b/tests/conform/test-point-sprite.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-premult.c b/tests/conform/test-premult.c
index 0864865fe..ba347b8cb 100644
--- a/tests/conform/test-premult.c
+++ b/tests/conform/test-premult.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-primitive-and-journal.c b/tests/conform/test-primitive-and-journal.c
index 364601bb8..6a55432ea 100644
--- a/tests/conform/test-primitive-and-journal.c
+++ b/tests/conform/test-primitive-and-journal.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-primitive.c b/tests/conform/test-primitive.c
index 4ed7d0837..5f77d2c35 100644
--- a/tests/conform/test-primitive.c
+++ b/tests/conform/test-primitive.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/tests/conform/test-read-texture-formats.c b/tests/conform/test-read-texture-formats.c
index 13c641884..2834c4571 100644
--- a/tests/conform/test-read-texture-formats.c
+++ b/tests/conform/test-read-texture-formats.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <stdarg.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-snippets.c b/tests/conform/test-snippets.c
index bc4e32632..fa3711c17 100644
--- a/tests/conform/test-snippets.c
+++ b/tests/conform/test-snippets.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-sparse-pipeline.c b/tests/conform/test-sparse-pipeline.c
index 8f5e6ea1e..b38645e81 100644
--- a/tests/conform/test-sparse-pipeline.c
+++ b/tests/conform/test-sparse-pipeline.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-sub-texture.c b/tests/conform/test-sub-texture.c
index 9fddde522..4bb0cb832 100644
--- a/tests/conform/test-sub-texture.c
+++ b/tests/conform/test-sub-texture.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-texture-3d.c b/tests/conform/test-texture-3d.c
index fa34e9046..a68954c9e 100644
--- a/tests/conform/test-texture-3d.c
+++ b/tests/conform/test-texture-3d.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-texture-get-set-data.c b/tests/conform/test-texture-get-set-data.c
index c8305ca04..44aefb521 100644
--- a/tests/conform/test-texture-get-set-data.c
+++ b/tests/conform/test-texture-get-set-data.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-texture-mipmap-get-set.c b/tests/conform/test-texture-mipmap-get-set.c
index bf80382b0..0ead17967 100644
--- a/tests/conform/test-texture-mipmap-get-set.c
+++ b/tests/conform/test-texture-mipmap-get-set.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-texture-no-allocate.c b/tests/conform/test-texture-no-allocate.c
index 280503c05..0ce230e4a 100644
--- a/tests/conform/test-texture-no-allocate.c
+++ b/tests/conform/test-texture-no-allocate.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "test-cg-fixtures.h"
 
diff --git a/tests/conform/test-texture-rg.c b/tests/conform/test-texture-rg.c
index 8b3a4c034..d38063014 100644
--- a/tests/conform/test-texture-rg.c
+++ b/tests/conform/test-texture-rg.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <string.h>
 
diff --git a/tests/conform/test-version.c b/tests/conform/test-version.c
index 55c26944d..3d6032abb 100644
--- a/tests/conform/test-version.c
+++ b/tests/conform/test-version.c
@@ -1,17 +1,10 @@
 #include "config.h"
 
-#include <cogl/cogl.h>
+#include <clib.h>
 
-#include "test-cg-fixtures.h"
+#include <cglib/cglib.h>
 
-/* So we can use _C_STATIC_ASSERT we include the internal
- * cogl-util.h header. Since internal headers explicitly guard against
- * applications including them directly instead of including
- * <cogl/cogl.h> we define __CG_H_INSIDE__ here to subvert those
- * guards in this case... */
-#define __CG_H_INSIDE__
-#include <cogl/cogl-util.h>
-#undef __CG_H_INSIDE__
+#include "test-cg-fixtures.h"
 
 _C_STATIC_ASSERT (CG_VERSION_ENCODE (CG_VERSION_MAJOR,
                                           CG_VERSION_MINOR,
diff --git a/tests/conform/test-wrap-modes.c b/tests/conform/test-wrap-modes.c
index f7abe0d7c..699d5493b 100644
--- a/tests/conform/test-wrap-modes.c
+++ b/tests/conform/test-wrap-modes.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/conform/test-write-texture-formats.c b/tests/conform/test-write-texture-formats.c
index 657d4b0fc..e4d0e5c38 100644
--- a/tests/conform/test-write-texture-formats.c
+++ b/tests/conform/test-write-texture-formats.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <stdarg.h>
 
 #include "test-cg-fixtures.h"
diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am
index d27d1741e..822e9a547 100644
--- a/tests/micro-perf/Makefile.am
+++ b/tests/micro-perf/Makefile.am
@@ -6,7 +6,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clib/clib \
-	-I$(top_builddir)/clib/clib
+	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib
 
 test_conformance_CPPFLAGS = \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
@@ -25,7 +27,7 @@ AM_CFLAGS = $(CG_DEP_CFLAGS) $(RIG_EXTRA_CFLAGS)
 common_ldadd = \
 	$(CG_DEP_LIBS) \
 	$(top_builddir)/clib/clib/libclib.la \
-	$(top_builddir)/cogl/libcg.la \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(LIBM)
 
 test_journal_SOURCES = test-journal.c
diff --git a/tests/micro-perf/test-instancing.c b/tests/micro-perf/test-instancing.c
index 875b4bc6b..c3b44e826 100644
--- a/tests/micro-perf/test-instancing.c
+++ b/tests/micro-perf/test-instancing.c
@@ -1,13 +1,13 @@
 #include <config.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include <clib.h>
 #include <uv.h>
 
-#include "cogl/cogl-profile.h"
+#include <cglib/cg-profile.h>
 
 #define FRAMEBUFFER_WIDTH 800
 #define FRAMEBUFFER_HEIGHT 500
diff --git a/tests/micro-perf/test-journal.c b/tests/micro-perf/test-journal.c
index d02ea5362..7bc00b3ee 100644
--- a/tests/micro-perf/test-journal.c
+++ b/tests/micro-perf/test-journal.c
@@ -1,12 +1,12 @@
 #include <config.h>
 
 #include <glib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include <clib.h>
 
-#include "cogl/cogl-profile.h"
+#include <cglib/cg-profile.h>
 
 #define FRAMEBUFFER_WIDTH 800
 #define FRAMEBUFFER_HEIGHT 500
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 3aed76253..939449ffd 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -23,8 +23,8 @@ stamp-test-unit: Makefile test-unit$(EXEEXT)
 	source $(top_builddir)/clib/clib/libclib.la ; \
 	  $(NM) $(top_builddir)/clib/clib/.libs/"$$dlname"| \
 	  grep '[DR] _\?test_state_'|sed 's/.\+ [DR] _\?//' >> unit-tests; \
-	source $(top_builddir)/cogl/libcg.la ; \
-	  $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
+	source $(top_builddir)/cglib/cglib/libcglib.la ; \
+	  $(NM) $(top_builddir)/cglib/cglib/.libs/"$$dlname"| \
 	  grep '[DR] _\?test_state_'|sed 's/.\+ [DR] _\?//' >> unit-tests
 	@chmod +x $(top_srcdir)/tests/test-launcher.sh
 	@( echo "/stamp-test-unit" ; \
@@ -56,7 +56,7 @@ clean-wrappers:
 # a phony rule that will generate symlink scripts for running individual tests
 BUILT_SOURCES = wrappers
 
-# The include of the $(buildir)/cogl directory here is to make it so
+# The include of the $(buildir)/cglib directory here is to make it so
 # that tests that directly include Cogl source code for whitebox
 # testing (such as test-bitmask) will still compile
 AM_CPPFLAGS = \
@@ -65,17 +65,16 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/test-fixtures \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
-	-I$(top_builddir)/cogl
+	-I$(top_builddir)/cglib
 
 AM_CPPFLAGS += \
-	-DCOGL_DISABLE_DEPRECATED \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \
-	-DCOGL_COMPILATION
+	-DCG_COMPILATION
 
-test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
+test_unit_CFLAGS = -g3 -O0 $(CG_DEP_CFLAGS) $(CG_EXTRA_CFLAGS)
 test_unit_LDADD = \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(LIBM)
 test_unit_LDADD += $(top_builddir)/clib/clib/libclib.la
 test_unit_LDFLAGS = -export-dynamic
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b2d1feeed..2beed33a7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,11 +3,15 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/rut \
-	-I$(top_builddir)/rut
-	-DG_DISABLE_SINGLE_INCLUDES \
-	-DCG_DISABLE_DEPRECATED
+	-I$(top_builddir)/rut \
+	-I$(top_srcdir)/clib/clib \
+	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib
 
 AM_CFLAGS = \
+	$(CG_DEP_CFLAGS) \
+	$(CG_EXTRA_CFLAGS) \
 	$(RIG_DEP_CFLAGS) \
 	$(RIG_EXTRA_CFLAGS) \
 	-DRIG_EXAMPLES_DATA=\""$(abs_top_srcdir)/examples/"\" \
@@ -15,9 +19,9 @@ AM_CFLAGS = \
 
 common_ldadd = \
 	$(RIG_DEP_LIBS) \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
-	$(top_builddir)/clib/src/libclib.la
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
+	$(top_builddir)/clib/clib/libclib.la
 
 bin_SCRIPTS=rig-package-html5
 
diff --git a/tools/bump-map-gen.c b/tools/bump-map-gen.c
index 7f6ec44c0..775accecb 100644
--- a/tools/bump-map-gen.c
+++ b/tools/bump-map-gen.c
@@ -55,11 +55,14 @@
  *
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
+#include <clib.h>
 #include <glib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 static gboolean bump_map_mode = FALSE;
@@ -300,17 +303,17 @@ main(int argc, char **argv)
     g_option_context_add_main_entries(context, options, NULL);
 
     if (!g_option_context_parse(context, &argc, &argv, &error)) {
-        g_printerr("option parsing failed: %s\n", error->message);
+        c_printerr("option parsing failed: %s\n", error->message);
         exit(EXIT_FAILURE);
     }
 
     if (remaining_args == NULL || remaining_args[1] != NULL) {
-        g_printerr("A single input file must be specified\n");
+        c_printerr("A single input file must be specified\n");
         exit(EXIT_FAILURE);
     }
 
     if (!output) {
-        g_printerr("An output file must be specified\n");
+        c_printerr("An output file must be specified\n");
         exit(EXIT_FAILURE);
     }
 
diff --git a/toys/Makefile.am b/toys/Makefile.am
index 0cf9ec76d..c4a1811f0 100644
--- a/toys/Makefile.am
+++ b/toys/Makefile.am
@@ -10,6 +10,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/LibOVR/Src \
 	$(RIG_DEP_CFLAGS)
 
@@ -35,8 +37,7 @@ common_ldadd = \
 	$(RIG_EXTRA_LDFLAGS) \
 	$(top_builddir)/rig/librig.la \
 	$(top_builddir)/rut/librut.la \
-	$(top_builddir)/cogl/libcg.la \
-	$(top_builddir)/cogl-path/libcogl-path.la \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(RIG_DEP_LIBS) \
 	$(CG_DEP_LIBS) \
 	$(top_builddir)/clib/clib/libclib.la \
diff --git a/toys/android/hello-glib/jni/main.c b/toys/android/hello-glib/jni/main.c
index 65f2bd50c..104e35cbe 100644
--- a/toys/android/hello-glib/jni/main.c
+++ b/toys/android/hello-glib/jni/main.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <glib-android/glib-android.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 typedef struct {
     struct android_app *app;
diff --git a/toys/android/hello-sdl/jni/src/cogl-sdl2-hello.c b/toys/android/hello-sdl/jni/src/cogl-sdl2-hello.c
index 5d1431d8d..8f1b55919 100644
--- a/toys/android/hello-sdl/jni/src/cogl-sdl2-hello.c
+++ b/toys/android/hello-sdl/jni/src/cogl-sdl2-hello.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl/cogl-sdl.h>
 #include <stdio.h>
 #include <SDL.h>
diff --git a/toys/cogl-basic-video-player.c b/toys/cogl-basic-video-player.c
index 01c052302..115946587 100644
--- a/toys/cogl-basic-video-player.c
+++ b/toys/cogl-basic-video-player.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-gst/cogl-gst.h>
 
 typedef struct _Data {
diff --git a/toys/cogl-crate.c b/toys/cogl-crate.c
index cf2b65dbd..180c7d1d0 100644
--- a/toys/cogl-crate.c
+++ b/toys/cogl-crate.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-pango/cogl-pango.h>
 
 /* The state for this example... */
diff --git a/toys/cogl-emscripten-hello.c b/toys/cogl-emscripten-hello.c
index 5b274ce05..da8bfc63e 100644
--- a/toys/cogl-emscripten-hello.c
+++ b/toys/cogl-emscripten-hello.c
@@ -5,7 +5,7 @@
 #include <emscripten.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "emscripten-example-js.h"
 
diff --git a/toys/cogl-gles2-context.c b/toys/cogl-gles2-context.c
index 1493c720d..542ee4e85 100644
--- a/toys/cogl-gles2-context.c
+++ b/toys/cogl-gles2-context.c
@@ -4,8 +4,8 @@
 
 #include <uv.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-gles2.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-gles2.h>
 
 #include <clib.h>
 
diff --git a/toys/cogl-gles2-gears.c b/toys/cogl-gles2-gears.c
index c584d13d9..9f2538f59 100644
--- a/toys/cogl-gles2-gears.c
+++ b/toys/cogl-gles2-gears.c
@@ -50,8 +50,8 @@
 
 #include <GLES2/gl2.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-gles2.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-gles2.h>
 
 #include <clib.h>
 
diff --git a/toys/cogl-hello.c b/toys/cogl-hello.c
index d40815a13..3a7132cb6 100644
--- a/toys/cogl-hello.c
+++ b/toys/cogl-hello.c
@@ -5,7 +5,7 @@
 
 #include <uv.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 struct data {
diff --git a/toys/cogl-info.c b/toys/cogl-info.c
index 268acc78d..bd18d4bf1 100644
--- a/toys/cogl-info.c
+++ b/toys/cogl-info.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <stdio.h>
 
 struct {
diff --git a/toys/cogl-msaa.c b/toys/cogl-msaa.c
index f28e68d18..0e500cd69 100644
--- a/toys/cogl-msaa.c
+++ b/toys/cogl-msaa.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <glib.h>
 #include <stdio.h>
 
diff --git a/toys/cogl-point-sprites.c b/toys/cogl-point-sprites.c
index aa1e87cc3..4bf6891b9 100644
--- a/toys/cogl-point-sprites.c
+++ b/toys/cogl-point-sprites.c
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 #define N_FIREWORKS 32
diff --git a/toys/cogl-sdl2-hello.c b/toys/cogl-sdl2-hello.c
index 85f9f8a7b..9ffa8aed4 100644
--- a/toys/cogl-sdl2-hello.c
+++ b/toys/cogl-sdl2-hello.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl/cogl-sdl.h>
 #include <stdio.h>
 #include <SDL.h>
diff --git a/toys/cogl-x11-foreign.c b/toys/cogl-x11-foreign.c
index 0c2c2cce9..d1e78c85c 100644
--- a/toys/cogl-x11-foreign.c
+++ b/toys/cogl-x11-foreign.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-xlib.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-xlib.h>
 #include <glib.h>
 #include <stdio.h>
 
diff --git a/toys/cogl-x11-tfp.c b/toys/cogl-x11-tfp.c
index d65193063..f38a82c98 100644
--- a/toys/cogl-x11-tfp.c
+++ b/toys/cogl-x11-tfp.c
@@ -1,8 +1,8 @@
 #include <config.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-xlib.h>
-#include <cogl/winsys/cogl-texture-pixmap-x11.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-xlib.h>
+#include <cglib/winsys/cg-texture-pixmap-x11.h>
 #include <clib.h>
 #include <stdio.h>
 
diff --git a/toys/cogland.c b/toys/cogland.c
index 6d06270df..3c51fe02c 100644
--- a/toys/cogland.c
+++ b/toys/cogland.c
@@ -7,8 +7,8 @@
 #include <string.h>
 #include <getopt.h>
 
-#include <cogl/cogl.h>
-#include <cogl/cogl-wayland-server.h>
+#include <cglib/cglib.h>
+#include <cglib/cg-wayland-server.h>
 
 #include <clib.h>
 
diff --git a/toys/libovr-test.c b/toys/libovr-test.c
index 298107ce9..4c89e021f 100644
--- a/toys/libovr-test.c
+++ b/toys/libovr-test.c
@@ -5,7 +5,7 @@
 
 #include <uv.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 #include "OVR_CAPI.h"
diff --git a/toys/shell-hello.c b/toys/shell-hello.c
index 16d301935..8dc1c020e 100644
--- a/toys/shell-hello.c
+++ b/toys/shell-hello.c
@@ -2,7 +2,7 @@
 
 #include <clib.h>
 #include <rut.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 struct data {
     rut_shell_t *shell;