diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 59f2990a9..b9a62ed7c 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -8,7 +8,6 @@ cogl_deprecated_headers = [
 ]
 
 cogl_headers = [
-  'cogl1-context.h',
   'cogl-bitmap.h',
   'cogl-color.h',
   'cogl-context.h',
@@ -16,99 +15,100 @@ cogl_headers = [
   'cogl-framebuffer.h',
   'cogl-offscreen.h',
   'cogl-onscreen.h',
-  'cogl-pipeline.h',
-  'cogl-pipeline-state.h',
   'cogl-pipeline-layer-state.h',
+  'cogl-pipeline-state.h',
+  'cogl-pipeline.h',
   'cogl-pixel-format.h',
   'cogl-snippet.h',
-  'cogl-texture.h',
-  'cogl-texture-2d.h',
   'cogl-texture-2d-sliced.h',
-  'cogl-types.h',
+  'cogl-texture-2d.h',
+  'cogl-texture.h',
   'cogl-trace.h',
+  'cogl-types.h',
   'cogl.h',
+  'cogl1-context.h',
 ]
 
 cogl_nonintrospected_headers = [
-  'cogl-renderer.h',
-  'cogl-swap-chain.h',
-  'cogl-onscreen-template.h',
-  'cogl-dma-buf-handle.h',
-  'cogl-display.h',
-  'cogl-index-buffer.h',
-  'cogl-attribute-buffer.h',
-  'cogl-indices.h',
-  'cogl-attribute.h',
-  'cogl-primitive.h',
-  'cogl-output.h',
-  'cogl-matrix-stack.h',
-  'cogl-poll.h',
-  'cogl-sub-texture.h',
   'cogl-atlas-texture.h',
-  'cogl-meta-texture.h',
-  'cogl-primitive-texture.h',
-  'cogl-depth-state.h',
+  'cogl-attribute-buffer.h',
+  'cogl-attribute.h',
   'cogl-buffer.h',
-  'cogl-pixel-buffer.h',
-  'cogl-macros.h',
+  'cogl-depth-state.h',
+  'cogl-display.h',
+  'cogl-dma-buf-handle.h',
   'cogl-fence.h',
   'cogl-glib-source.h',
-  'cogl-scanout.h',
   'cogl-graphene.h',
+  'cogl-index-buffer.h',
+  'cogl-indices.h',
+  'cogl-macros.h',
+  'cogl-matrix-stack.h',
+  'cogl-meta-texture.h',
+  'cogl-onscreen-template.h',
+  'cogl-output.h',
+  'cogl-pixel-buffer.h',
+  'cogl-poll.h',
+  'cogl-primitive-texture.h',
+  'cogl-primitive.h',
+  'cogl-renderer.h',
+  'cogl-scanout.h',
+  'cogl-sub-texture.h',
+  'cogl-swap-chain.h',
 ]
 
 cogl_nodist_headers = [
 ]
 
 cogl_noop_driver_sources = [
-  'driver/nop/cogl-driver-nop.c',
-  'driver/nop/cogl-nop-framebuffer.c',
-  'driver/nop/cogl-nop-framebuffer.h',
   'driver/nop/cogl-attribute-nop-private.h',
   'driver/nop/cogl-attribute-nop.c',
   'driver/nop/cogl-clip-stack-nop-private.h',
   'driver/nop/cogl-clip-stack-nop.c',
+  'driver/nop/cogl-driver-nop.c',
+  'driver/nop/cogl-nop-framebuffer.c',
+  'driver/nop/cogl-nop-framebuffer.h',
   'driver/nop/cogl-texture-2d-nop-private.h',
   'driver/nop/cogl-texture-2d-nop.c',
 ]
 
 cogl_gl_prototype_headers = [
-  'gl-prototypes/cogl-gles2-functions.h',
   'gl-prototypes/cogl-core-functions.h',
+  'gl-prototypes/cogl-gles2-functions.h',
+  'gl-prototypes/cogl-glsl-functions.h',
   'gl-prototypes/cogl-in-gles-core-functions.h',
   'gl-prototypes/cogl-in-gles2-core-functions.h',
-  'gl-prototypes/cogl-glsl-functions.h',
 ]
 
 cogl_common_driver_sources = [
-  'driver/gl/cogl-util-gl-private.h',
-  'driver/gl/cogl-util-gl.c',
+  'driver/gl/cogl-attribute-gl-private.h',
+  'driver/gl/cogl-attribute-gl.c',
+  'driver/gl/cogl-bitmap-gl-private.h',
+  'driver/gl/cogl-bitmap-gl.c',
+  'driver/gl/cogl-buffer-gl-private.h',
+  'driver/gl/cogl-buffer-gl.c',
+  'driver/gl/cogl-clip-stack-gl-private.h',
+  'driver/gl/cogl-clip-stack-gl.c',
   'driver/gl/cogl-framebuffer-gl-private.h',
   'driver/gl/cogl-framebuffer-gl.c',
   'driver/gl/cogl-gl-framebuffer-back.c',
   'driver/gl/cogl-gl-framebuffer-back.h',
   'driver/gl/cogl-gl-framebuffer-fbo.c',
   'driver/gl/cogl-gl-framebuffer-fbo.h',
-  'driver/gl/cogl-texture-gl-private.h',
-  'driver/gl/cogl-texture-gl.c',
+  'driver/gl/cogl-pipeline-fragend-glsl-private.h',
+  'driver/gl/cogl-pipeline-fragend-glsl.c',
+  'driver/gl/cogl-pipeline-opengl-private.h',
+  'driver/gl/cogl-pipeline-opengl.c',
+  'driver/gl/cogl-pipeline-progend-glsl-private.h',
+  'driver/gl/cogl-pipeline-progend-glsl.c',
+  'driver/gl/cogl-pipeline-vertend-glsl-private.h',
+  'driver/gl/cogl-pipeline-vertend-glsl.c',
   'driver/gl/cogl-texture-2d-gl-private.h',
   'driver/gl/cogl-texture-2d-gl.c',
-  'driver/gl/cogl-attribute-gl-private.h',
-  'driver/gl/cogl-attribute-gl.c',
-  'driver/gl/cogl-clip-stack-gl-private.h',
-  'driver/gl/cogl-clip-stack-gl.c',
-  'driver/gl/cogl-buffer-gl-private.h',
-  'driver/gl/cogl-buffer-gl.c',
-  'driver/gl/cogl-bitmap-gl-private.h',
-  'driver/gl/cogl-bitmap-gl.c',
-  'driver/gl/cogl-pipeline-opengl.c',
-  'driver/gl/cogl-pipeline-opengl-private.h',
-  'driver/gl/cogl-pipeline-fragend-glsl.c',
-  'driver/gl/cogl-pipeline-fragend-glsl-private.h',
-  'driver/gl/cogl-pipeline-vertend-glsl.c',
-  'driver/gl/cogl-pipeline-vertend-glsl-private.h',
-  'driver/gl/cogl-pipeline-progend-glsl.c',
-  'driver/gl/cogl-pipeline-progend-glsl-private.h',
+  'driver/gl/cogl-texture-gl-private.h',
+  'driver/gl/cogl-texture-gl.c',
+  'driver/gl/cogl-util-gl-private.h',
+  'driver/gl/cogl-util-gl.c',
 ]
 
 gl_driver_sources = [
@@ -142,161 +142,161 @@ endif
 
 cogl_sources = [
   cogl_driver_sources,
-  'winsys/cogl-winsys-private.h',
-  'winsys/cogl-winsys.c',
-  'cogl-private.h',
-  'cogl-i18n-private.h',
-  'cogl-debug.h',
-  'cogl-debug-options.h',
-  'cogl-dma-buf-handle.c',
-  'cogl-context-private.h',
-  'cogl-context.c',
-  'cogl-renderer-private.h',
-  'cogl-renderer.h',
-  'cogl-renderer.c',
-  'cogl-swap-chain-private.h',
-  'cogl-swap-chain.h',
-  'cogl-swap-chain.c',
-  'cogl-onscreen-template-private.h',
-  'cogl-onscreen-template.h',
-  'cogl-onscreen-template.c',
-  'cogl-display-private.h',
-  'cogl-display.h',
-  'cogl-display.c',
-  'cogl-driver.h',
-  'cogl.c',
-  'cogl-pixel-format.c',
-  'cogl-util.h',
-  'cogl-util.c',
-  'cogl-bitmap-private.h',
-  'cogl-bitmap.c',
-  'cogl-bitmap-conversion.c',
-  'cogl-bitmap-packing.h',
-  'cogl-primitives-private.h',
-  'cogl-primitives.c',
-  'cogl-clip-stack.h',
-  'cogl-clip-stack.c',
-  'cogl-feature-private.h',
-  'cogl-feature-private.c',
-  'cogl-color-private.h',
-  'cogl-color.c',
-  'cogl-buffer-private.h',
-  'cogl-buffer.c',
-  'cogl-pixel-buffer-private.h',
-  'cogl-pixel-buffer.c',
-  'cogl-index-buffer-private.h',
-  'cogl-index-buffer.c',
-  'cogl-attribute-buffer-private.h',
-  'cogl-attribute-buffer.c',
-  'cogl-indices-private.h',
-  'cogl-indices.c',
-  'cogl-attribute-private.h',
-  'cogl-attribute.c',
-  'cogl-primitive-private.h',
-  'cogl-primitive.c',
-  'cogl-matrix-stack.c',
-  'cogl-matrix-stack-private.h',
-  'cogl-depth-state.c',
-  'cogl-depth-state-private.h',
-  'cogl-node.c',
-  'cogl-node-private.h',
-  'cogl-pipeline.c',
-  'cogl-pipeline-private.h',
-  'cogl-pipeline-layer.c',
-  'cogl-pipeline-layer-private.h',
-  'cogl-pipeline-state.c',
-  'cogl-pipeline-layer-state-private.h',
-  'cogl-pipeline-layer-state.c',
-  'cogl-pipeline-state-private.h',
-  'cogl-pipeline-debug.c',
-  'cogl-glsl-shader-boilerplate.h',
-  'cogl-pipeline-snippet-private.h',
-  'cogl-pipeline-snippet.c',
-  'cogl-pipeline-cache-private.h',
-  'cogl-pipeline-cache.h',
-  'cogl-pipeline-cache.c',
-  'cogl-pipeline-hash-table.h',
-  'cogl-pipeline-hash-table.c',
-  'cogl-sampler-cache.c',
-  'cogl-sampler-cache-private.h',
-  'cogl-blend-string.c',
-  'cogl-blend-string.h',
-  'cogl-debug.c',
-  'cogl-trace.c',
-  'cogl-sub-texture-private.h',
-  'cogl-texture-private.h',
-  'cogl-texture-2d-private.h',
-  'cogl-texture-2d-sliced-private.h',
-  'cogl-texture-driver.h',
-  'cogl-sub-texture.c',
-  'cogl-texture.c',
-  'cogl-texture-2d.c',
-  'cogl-texture-2d-sliced.c',
-  'cogl-rectangle-map.h',
-  'cogl-rectangle-map.c',
-  'cogl-atlas.h',
-  'cogl-atlas.c',
   'cogl-atlas-texture-private.h',
   'cogl-atlas-texture.c',
-  'cogl-meta-texture.c',
-  'cogl-primitive-texture.c',
-  'cogl-blit.h',
+  'cogl-atlas.c',
+  'cogl-atlas.h',
+  'cogl-attribute-buffer-private.h',
+  'cogl-attribute-buffer.c',
+  'cogl-attribute-private.h',
+  'cogl-attribute.c',
+  'cogl-bitmap-conversion.c',
+  'cogl-bitmap-packing.h',
+  'cogl-bitmap-private.h',
+  'cogl-bitmap.c',
+  'cogl-bitmask.c',
+  'cogl-bitmask.h',
+  'cogl-blend-string.c',
+  'cogl-blend-string.h',
   'cogl-blit.c',
-  'cogl-spans.h',
-  'cogl-spans.c',
-  'cogl-journal-private.h',
-  'cogl-journal.c',
-  'cogl-offscreen-private.h',
-  'cogl-offscreen.c',
+  'cogl-blit.h',
+  'cogl-boxed-value.c',
+  'cogl-boxed-value.h',
+  'cogl-buffer-private.h',
+  'cogl-buffer.c',
+  'cogl-clip-stack.c',
+  'cogl-clip-stack.h',
+  'cogl-closure-list-private.h',
+  'cogl-closure-list.c',
+  'cogl-color-private.h',
+  'cogl-color.c',
+  'cogl-context-private.h',
+  'cogl-context.c',
+  'cogl-debug-options.h',
+  'cogl-debug.c',
+  'cogl-debug.h',
+  'cogl-depth-state-private.h',
+  'cogl-depth-state.c',
+  'cogl-display-private.h',
+  'cogl-display.c',
+  'cogl-display.h',
+  'cogl-dma-buf-handle.c',
+  'cogl-driver.h',
+  'cogl-feature-private.c',
+  'cogl-feature-private.h',
+  'cogl-fence-private.h',
+  'cogl-fence.c',
+  'cogl-flags.h',
   'cogl-frame-info-private.h',
   'cogl-frame-info.c',
   'cogl-framebuffer-driver.c',
   'cogl-framebuffer-driver.h',
   'cogl-framebuffer-private.h',
   'cogl-framebuffer.c',
+  'cogl-glib-source.c',
+  'cogl-glsl-shader-boilerplate.h',
+  'cogl-graphene.c',
+  'cogl-i18n-private.h',
+  'cogl-index-buffer-private.h',
+  'cogl-index-buffer.c',
+  'cogl-indices-private.h',
+  'cogl-indices.c',
+  'cogl-journal-private.h',
+  'cogl-journal.c',
+  'cogl-list.c',
+  'cogl-list.h',
+  'cogl-magazine-private.h',
+  'cogl-magazine.c',
+  'cogl-matrix-stack-private.h',
+  'cogl-matrix-stack.c',
+  'cogl-memory-stack-private.h',
+  'cogl-memory-stack.c',
+  'cogl-meta-texture.c',
+  'cogl-mutter.h',
+  'cogl-node-private.h',
+  'cogl-node.c',
+  'cogl-offscreen-private.h',
+  'cogl-offscreen.c',
   'cogl-onscreen-private.h',
+  'cogl-onscreen-template-private.h',
+  'cogl-onscreen-template.c',
+  'cogl-onscreen-template.h',
   'cogl-onscreen.c',
   'cogl-output-private.h',
   'cogl-output.c',
-  'cogl-profile.h',
-  'cogl-profile.c',
-  'cogl-flags.h',
-  'cogl-bitmask.h',
-  'cogl-bitmask.c',
+  'cogl-pipeline-cache-private.h',
+  'cogl-pipeline-cache.c',
+  'cogl-pipeline-cache.h',
+  'cogl-pipeline-debug.c',
+  'cogl-pipeline-hash-table.c',
+  'cogl-pipeline-hash-table.h',
+  'cogl-pipeline-layer-private.h',
+  'cogl-pipeline-layer-state-private.h',
+  'cogl-pipeline-layer-state.c',
+  'cogl-pipeline-layer.c',
+  'cogl-pipeline-private.h',
+  'cogl-pipeline-snippet-private.h',
+  'cogl-pipeline-snippet.c',
+  'cogl-pipeline-state-private.h',
+  'cogl-pipeline-state.c',
+  'cogl-pipeline.c',
+  'cogl-pixel-buffer-private.h',
+  'cogl-pixel-buffer.c',
+  'cogl-pixel-format.c',
   'cogl-point-in-poly-private.h',
   'cogl-point-in-poly.c',
-  'cogl-list.c',
-  'cogl-list.h',
-  'cogl-boxed-value.h',
-  'cogl-boxed-value.c',
-  'cogl-snippet-private.h',
-  'cogl-snippet.c',
   'cogl-poll-private.h',
   'cogl-poll.c',
-  'gl-prototypes/cogl-all-functions.h',
-  'cogl-memory-stack-private.h',
-  'cogl-memory-stack.c',
-  'cogl-magazine-private.h',
-  'cogl-magazine.c',
-  'cogl-closure-list-private.h',
-  'cogl-closure-list.c',
-  'cogl-fence.c',
-  'cogl-fence-private.h',
+  'cogl-primitive-private.h',
+  'cogl-primitive-texture.c',
+  'cogl-primitive.c',
+  'cogl-primitives-private.h',
+  'cogl-primitives.c',
+  'cogl-private.h',
+  'cogl-profile.c',
+  'cogl-profile.h',
+  'cogl-rectangle-map.c',
+  'cogl-rectangle-map.h',
+  'cogl-renderer-private.h',
+  'cogl-renderer.c',
+  'cogl-renderer.h',
+  'cogl-sampler-cache-private.h',
+  'cogl-sampler-cache.c',
   'cogl-scanout.c',
-  'deprecated/cogl-program.c',
+  'cogl-snippet-private.h',
+  'cogl-snippet.c',
+  'cogl-spans.c',
+  'cogl-spans.h',
+  'cogl-sub-texture-private.h',
+  'cogl-sub-texture.c',
+  'cogl-swap-chain-private.h',
+  'cogl-swap-chain.c',
+  'cogl-swap-chain.h',
+  'cogl-texture-2d-private.h',
+  'cogl-texture-2d-sliced-private.h',
+  'cogl-texture-2d-sliced.c',
+  'cogl-texture-2d.c',
+  'cogl-texture-driver.h',
+  'cogl-texture-private.h',
+  'cogl-texture.c',
+  'cogl-trace.c',
+  'cogl-util.c',
+  'cogl-util.h',
+  'cogl.c',
+  'deprecated/cogl-clutter.c',
   'deprecated/cogl-program-private.h',
+  'deprecated/cogl-program.c',
   'deprecated/cogl-shader-private.h',
   'deprecated/cogl-shader.c',
-  'deprecated/cogl-clutter.c',
-  'cogl-glib-source.c',
-  'cogl-mutter.h',
-  'cogl-graphene.c',
+  'gl-prototypes/cogl-all-functions.h',
+  'winsys/cogl-winsys-private.h',
+  'winsys/cogl-winsys.c',
 ]
 
 if have_x11
   cogl_nonintrospected_headers += [
-    'winsys/cogl-texture-pixmap-x11.h',
     'cogl-xlib.h',
+    'winsys/cogl-texture-pixmap-x11.h',
   ]
   cogl_sources += [
     'cogl-x11-onscreen.c',
@@ -335,9 +335,9 @@ if have_egl
     'cogl-egl-private.h',
     'winsys/cogl-onscreen-egl.c',
     'winsys/cogl-onscreen-egl.h',
-    'winsys/cogl-winsys-egl.c',
     'winsys/cogl-winsys-egl-feature-functions.h',
     'winsys/cogl-winsys-egl-private.h',
+    'winsys/cogl-winsys-egl.c',
   ]
 endif
 
@@ -345,8 +345,8 @@ if have_egl_xlib
   cogl_sources += [
     'winsys/cogl-onscreen-xlib.c',
     'winsys/cogl-onscreen-xlib.h',
-    'winsys/cogl-winsys-egl-x11.c',
     'winsys/cogl-winsys-egl-x11-private.h',
+    'winsys/cogl-winsys-egl-x11.c',
   ]
 endif