diff --git a/clutter/clutter/cally/cally-actor-private.h b/clutter/clutter/cally/cally-actor-private.h
index 55a7d95cb..bd6c85a59 100644
--- a/clutter/clutter/cally/cally-actor-private.h
+++ b/clutter/clutter/cally/cally-actor-private.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "cally-actor.h"
+#include "cally/cally-actor.h"
 
 /*
  * Auxiliary define, in order to get the clutter actor from the AtkObject using
diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c
index 0604ecbe4..034ffd5d6 100644
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -66,17 +66,17 @@
  *
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib.h>
-#include <clutter/clutter.h>
 
+#include "clutter/clutter.h"
 #include "clutter/clutter-actor-private.h"
 
 #include <math.h>
 
-#include "cally-actor.h"
-#include "cally-actor-private.h"
+#include "cally/cally-actor.h"
+#include "cally/cally-actor-private.h"
 
 typedef struct _CallyActorActionInfo CallyActorActionInfo;
 
diff --git a/clutter/clutter/cally/cally-actor.h b/clutter/clutter/cally/cally-actor.h
index 34657fa1f..3ce21be60 100644
--- a/clutter/clutter/cally/cally-actor.h
+++ b/clutter/clutter/cally/cally-actor.h
@@ -29,7 +29,8 @@
 #endif
 
 #include <atk/atk.h>
-#include <clutter/clutter.h>
+
+#include "clutter/clutter.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/cally/cally-clone.c b/clutter/clutter/cally/cally-clone.c
index 033714bf8..9dadb4c27 100644
--- a/clutter/clutter/cally/cally-clone.c
+++ b/clutter/clutter/cally/cally-clone.c
@@ -68,10 +68,10 @@
  * a11y POV should still be managed as a image (with the proper properties,
  * position, size, etc.).
  */
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "cally-clone.h"
-#include "cally-actor-private.h"
+#include "cally/cally-clone.h"
+#include "cally/cally-actor-private.h"
 
 /* AtkObject */
 static void                  cally_clone_real_initialize (AtkObject *obj,
diff --git a/clutter/clutter/cally/cally-clone.h b/clutter/clutter/cally/cally-clone.h
index 3a819d2a5..80c5c8425 100644
--- a/clutter/clutter/cally/cally-clone.h
+++ b/clutter/clutter/cally/cally-clone.h
@@ -24,8 +24,8 @@
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#include <clutter/clutter.h>
-#include <cally/cally-actor.h>
+#include "clutter/clutter.h"
+#include "cally/cally-actor.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/cally/cally-root.c b/clutter/clutter/cally/cally-root.c
index 9b65998e2..5f3a331a9 100644
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@@ -35,13 +35,13 @@
  * [class@Clutter.StageManager]).
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "cally-root.h"
+#include "cally/cally-root.h"
 
-#include "clutter-actor.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-manager.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-stage-manager.h"
 
 
 /* GObject */
diff --git a/clutter/clutter/cally/cally-root.h b/clutter/clutter/cally/cally-root.h
index bbf080683..2bc39f996 100644
--- a/clutter/clutter/cally/cally-root.h
+++ b/clutter/clutter/cally/cally-root.h
@@ -25,7 +25,8 @@
 #endif
 
 #include <atk/atk.h>
-#include <clutter/clutter.h>
+
+#include "clutter/clutter.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c
index b464987de..beeeae34e 100644
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally/cally-stage.c
@@ -33,10 +33,10 @@
  * being a canvas. Anyway, this is required for applications using
  * just clutter, or directly [class@Clutter.Stage]
  */
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "cally-stage.h"
-#include "cally-actor-private.h"
+#include "cally/cally-stage.h"
+#include "cally/cally-actor-private.h"
 
 /* AtkObject.h */
 static void                  cally_stage_real_initialize (AtkObject *obj,
diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h
index e78c9e5a2..935dfb095 100644
--- a/clutter/clutter/cally/cally-stage.h
+++ b/clutter/clutter/cally/cally-stage.h
@@ -24,8 +24,8 @@
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#include <cally/cally-actor.h>
-#include <clutter/clutter.h>
+#include "cally/cally-actor.h"
+#include "clutter/clutter.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c
index e49d655b8..c451046e2 100644
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@@ -37,14 +37,14 @@
  * [class@Clutter.Text], #AtkText and #AtkEditableText
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "cally-text.h"
-#include "cally-actor-private.h"
+#include "cally/cally-text.h"
+#include "cally/cally-actor-private.h"
 
-#include "clutter-color.h"
-#include "clutter-main.h"
-#include "clutter-text.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-text.h"
 
 static void cally_text_finalize   (GObject *obj);
 
diff --git a/clutter/clutter/cally/cally-text.h b/clutter/clutter/cally/cally-text.h
index 11f8ce85c..a566db659 100644
--- a/clutter/clutter/cally/cally-text.h
+++ b/clutter/clutter/cally/cally-text.h
@@ -24,8 +24,8 @@
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#include <clutter/clutter.h>
-#include <cally/cally-actor.h>
+#include "clutter/clutter.h"
+#include "cally/cally-actor.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c
index 1051692c9..29e633424 100644
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -37,15 +37,15 @@
  * available any accessible object.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <clutter/clutter.h>
 
-#include "cally-util.h"
-#include "cally-root.h"
-#include "cally-stage.h"
+#include "cally/cally-util.h"
+#include "cally/cally-root.h"
+#include "cally/cally-stage.h"
+#include "clutter/clutter.h"
 
 #define DEFAULT_PASSWORD_CHAR '*'
 
diff --git a/clutter/clutter/cally/cally-util.h b/clutter/clutter/cally/cally-util.h
index 756d2a64d..17abf20c1 100644
--- a/clutter/clutter/cally/cally-util.h
+++ b/clutter/clutter/cally/cally-util.h
@@ -24,7 +24,7 @@
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
 #include <atk/atk.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index e450180b2..c447a635e 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -29,24 +29,24 @@
  *
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
-#include "cally.h"
+#include "cally/cally.h"
 
-#include "cally-actor.h"
-#include "cally-stage.h"
-#include "cally-text.h"
-#include "cally-clone.h"
+#include "cally/cally-actor.h"
+#include "cally/cally-stage.h"
+#include "cally/cally-text.h"
+#include "cally/cally-clone.h"
 
-#include "cally-factory.h"
-#include "cally-util.h"
+#include "cally/cally-factory.h"
+#include "cally/cally-util.h"
 
-#include "clutter.h"
+#include "clutter/clutter.h"
 
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 /* factories initialization*/
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 0305f1dab..e12c966c9 100644
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -22,13 +22,13 @@
 
 #define __CALLY_H_INSIDE__
 
-#include "cally-actor.h"
-#include "cally-clone.h"
-#include "cally-factory.h"
-#include "cally-main.h"
-#include "cally-root.h"
-#include "cally-stage.h"
-#include "cally-text.h"
-#include "cally-util.h"
+#include "cally/cally-actor.h"
+#include "cally/cally-clone.h"
+#include "cally/cally-factory.h"
+#include "cally/cally-main.h"
+#include "cally/cally-root.h"
+#include "cally/cally-stage.h"
+#include "cally/cally-text.h"
+#include "cally/cally-util.h"
 
 #undef __CALLY_H_INSIDE__
diff --git a/clutter/clutter/clutter-action-private.h b/clutter/clutter/clutter-action-private.h
index 9bf59a4ee..7490bd5a2 100644
--- a/clutter/clutter/clutter-action-private.h
+++ b/clutter/clutter/clutter-action-private.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-action.h>
+#include "clutter/clutter-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-action.c b/clutter/clutter/clutter-action.c
index 5fcfde5ac..762699a32 100644
--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@@ -38,12 +38,12 @@
  * various event-related signals provided by [class@Actor] itself.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-action.h"
-#include "clutter-action-private.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-action.h"
+#include "clutter/clutter-action-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 typedef struct _ClutterActionPrivate ClutterActionPrivate;
 
diff --git a/clutter/clutter/clutter-action.h b/clutter/clutter/clutter-action.h
index c9f19cfa7..5c155292e 100644
--- a/clutter/clutter/clutter-action.h
+++ b/clutter/clutter/clutter-action.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor-meta.h>
+#include "clutter/clutter-actor-meta.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-actor-box-private.h b/clutter/clutter/clutter-actor-box-private.h
index 6611e25cd..5093c3420 100644
--- a/clutter/clutter/clutter-actor-box-private.h
+++ b/clutter/clutter/clutter-actor-box-private.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c
index e2fd87ce3..37115baca 100644
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -1,11 +1,11 @@
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-types.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-actor-box-private.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-actor-box-private.h"
 
 /**
  * clutter_actor_box_new:
diff --git a/clutter/clutter/clutter-actor-meta-private.h b/clutter/clutter/clutter-actor-meta-private.h
index 386b78731..34ea331ad 100644
--- a/clutter/clutter/clutter-actor-meta-private.h
+++ b/clutter/clutter/clutter-actor-meta-private.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <clutter/clutter-actor-meta.h>
+#include "clutter/clutter-actor-meta.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c
index bf207bccc..29d64c5d1 100644
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -38,12 +38,12 @@
  * any kind of modification.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-actor-meta-private.h"
+#include "clutter/clutter-actor-meta-private.h"
 
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterActorMetaPrivate
 {
diff --git a/clutter/clutter/clutter-actor-meta.h b/clutter/clutter/clutter-actor-meta.h
index 865bf8bbf..4841772a0 100644
--- a/clutter/clutter/clutter-actor-meta.h
+++ b/clutter/clutter/clutter-actor-meta.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-actor-private.h b/clutter/clutter/clutter-actor-private.h
index 0c10a41f7..9217c6a49 100644
--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-grab.h>
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-grab.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index e8c93a858..b2d748f7d 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -523,48 +523,48 @@
 
 #include <gobject/gvaluecollector.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
-#include "clutter-actor-private.h"
+#include "clutter/clutter-actor-private.h"
 
-#include "clutter-action.h"
-#include "clutter-action-private.h"
-#include "clutter-actor-meta-private.h"
-#include "clutter-animatable.h"
-#include "clutter-color-state.h"
-#include "clutter-color-static.h"
-#include "clutter-color.h"
-#include "clutter-constraint-private.h"
-#include "clutter-container-private.h"
-#include "clutter-content-private.h"
-#include "clutter-debug.h"
-#include "clutter-easing.h"
-#include "clutter-effect-private.h"
-#include "clutter-enum-types.h"
-#include "clutter-fixed-layout.h"
-#include "clutter-flatten-effect.h"
-#include "clutter-interval.h"
-#include "clutter-main.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-paint-context-private.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-paint-node-private.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-pick-context-private.h"
-#include "clutter-private.h"
-#include "clutter-property-transition.h"
-#include "clutter-scriptable.h"
-#include "clutter-script-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-view-private.h"
-#include "clutter-timeline.h"
-#include "clutter-transition.h"
-#include "clutter-units.h"
+#include "clutter/clutter-action.h"
+#include "clutter/clutter-action-private.h"
+#include "clutter/clutter-actor-meta-private.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-color-state.h"
+#include "clutter/clutter-color-static.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-constraint-private.h"
+#include "clutter/clutter-container-private.h"
+#include "clutter/clutter-content-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-easing.h"
+#include "clutter/clutter-effect-private.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-fixed-layout.h"
+#include "clutter/clutter-flatten-effect.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-paint-context-private.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-paint-node-private.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-pick-context-private.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-property-transition.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-script-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-stage-view-private.h"
+#include "clutter/clutter-timeline.h"
+#include "clutter/clutter-transition.h"
+#include "clutter/clutter-units.h"
 
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
 /* Internal enum used to control mapped state update.  This is a hint
  * which indicates when to do something other than just enforce
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index af9bbb50f..46298c74f 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -34,12 +34,12 @@
 #include <pango/pango.h>
 #include <atk/atk.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-event.h>
-#include <clutter/clutter-paint-context.h>
-#include <clutter/clutter-pick-context.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-event.h"
+#include "clutter/clutter-paint-context.h"
+#include "clutter/clutter-pick-context.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c
index e4269f1f4..9421da710 100644
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@@ -32,16 +32,16 @@
  * [class@Actor] using an alignment factor
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-align-constraint.h"
+#include "clutter/clutter-align-constraint.h"
 
-#include "clutter-actor-meta-private.h"
-#include "clutter-actor-private.h"
-#include "clutter-constraint.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-meta-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-constraint.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-align-constraint.h b/clutter/clutter/clutter-align-constraint.h
index f1af47ac8..f4afb5c17 100644
--- a/clutter/clutter/clutter-align-constraint.h
+++ b/clutter/clutter/clutter-align-constraint.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-constraint.h>
+#include "clutter/clutter-constraint.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c
index 7b232ea87..628b6f1da 100644
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -36,12 +36,12 @@
  * depending on a progress factor, expressed as a floating point value.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-animatable.h"
-#include "clutter-interval.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
 
diff --git a/clutter/clutter/clutter-animatable.h b/clutter/clutter/clutter-animatable.h
index b4c9cdd3d..64c4c5f7f 100644
--- a/clutter/clutter/clutter-animatable.h
+++ b/clutter/clutter/clutter-animatable.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h
index 5ae1062eb..c70f3559a 100644
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include <clutter/clutter-backend.h>
-#include <clutter/clutter-seat.h>
-#include <clutter/clutter-stage-window.h>
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-seat.h"
+#include "clutter/clutter-stage-window.h"
 
 #define CLUTTER_BACKEND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
 #define CLUTTER_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND))
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index f81de71d2..f04621a69 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -37,19 +37,19 @@
  * and settings.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-backend-private.h"
-#include "clutter-debug.h"
-#include "clutter-event-private.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-private.h"
-#include "clutter-stage-manager-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-window.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-manager-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-stage-window.h"
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 #define DEFAULT_FONT_NAME       "Sans 10"
 
diff --git a/clutter/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h
index 779562c40..7a21191e7 100644
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -30,11 +30,11 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
-#include <clutter/clutter-keymap.h>
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-seat.h>
+#include "clutter/clutter-keymap.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-seat.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c
index f75aa0c24..8db29a0d5 100644
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -30,10 +30,10 @@
  * across the whole API.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-private.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-bezier.c b/clutter/clutter/clutter-bezier.c
index 84a10cb67..76cd4f7b6 100644
--- a/clutter/clutter/clutter-bezier.c
+++ b/clutter/clutter/clutter-bezier.c
@@ -21,12 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib.h>
 #include <string.h>
-#include "clutter-bezier.h"
-#include "clutter-debug.h"
+
+#include "clutter/clutter-bezier.h"
+#include "clutter/clutter-debug.h"
 
 /*
  * We have some experimental code here to allow for constant velocity
diff --git a/clutter/clutter/clutter-bezier.h b/clutter/clutter/clutter-bezier.h
index 357b868f3..88a34448d 100644
--- a/clutter/clutter/clutter-bezier.h
+++ b/clutter/clutter/clutter-bezier.h
@@ -24,7 +24,8 @@
 #pragma once
 
 #include <glib.h>
-#include "clutter-types.h"
+
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-bin-layout.c b/clutter/clutter/clutter-bin-layout.c
index f7cfe7553..009c22a56 100644
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -42,21 +42,21 @@
  * shows how to pack actors inside a #ClutterBinLayout.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-animatable.h"
-#include "clutter-bin-layout.h"
-#include "clutter-child-meta.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-layout-meta.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-bin-layout.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_TYPE_BIN_LAYER          (clutter_bin_layer_get_type ())
 #define CLUTTER_BIN_LAYER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIN_LAYER, ClutterBinLayer))
diff --git a/clutter/clutter/clutter-bin-layout.h b/clutter/clutter/clutter-bin-layout.h
index 34bebcbe6..7cc4deacd 100644
--- a/clutter/clutter/clutter-bin-layout.h
+++ b/clutter/clutter/clutter-bin-layout.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c
index 404512c9e..15d9da318 100644
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -81,18 +81,18 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-bind-constraint.h"
+#include "clutter/clutter-bind-constraint.h"
 
-#include "clutter-actor-meta-private.h"
-#include "clutter-actor-private.h"
-#include "clutter-constraint.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-meta-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-constraint.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_BIND_CONSTRAINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BIND_CONSTRAINT, ClutterBindConstraintClass))
 #define CLUTTER_IS_BIND_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BIND_CONSTRAINT))
diff --git a/clutter/clutter/clutter-bind-constraint.h b/clutter/clutter/clutter-bind-constraint.h
index 2f3de8183..8118f9cd8 100644
--- a/clutter/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter/clutter-bind-constraint.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-constraint.h>
+#include "clutter/clutter-constraint.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c
index 0e17d6204..a01b5edde 100644
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -93,13 +93,13 @@
  * key binding handler returned %FALSE.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-binding-pool.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-binding-pool.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_BINDING_POOL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), CLUTTER_TYPE_BINDING_POOL, ClutterBindingPoolClass))
 #define CLUTTER_IS_BINDING_POOL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_BINDING_POOL))
diff --git a/clutter/clutter/clutter-binding-pool.h b/clutter/clutter/clutter-binding-pool.h
index 937569572..a98a41d1b 100644
--- a/clutter/clutter/clutter-binding-pool.h
+++ b/clutter/clutter/clutter-binding-pool.h
@@ -28,7 +28,8 @@
 #endif
 
 #include <glib-object.h>
-#include <clutter/clutter-event.h>
+
+#include "clutter/clutter-event.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c
index 2dfd695cc..4f672d712 100644
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -35,15 +35,15 @@
 #define CLUTTER_IS_BLUR_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
 #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-blur-effect.h"
+#include "clutter/clutter-blur-effect.h"
 
 #include "cogl/cogl.h"
 
-#include "clutter-debug.h"
-#include "clutter-offscreen-effect.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-offscreen-effect.h"
+#include "clutter/clutter-private.h"
 
 #define BLUR_PADDING    2
 
diff --git a/clutter/clutter/clutter-blur-effect.h b/clutter/clutter/clutter-blur-effect.h
index 8748f807c..4ab92f2da 100644
--- a/clutter/clutter/clutter-blur-effect.h
+++ b/clutter/clutter/clutter-blur-effect.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-effect.h>
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-blur-private.h b/clutter/clutter/clutter-blur-private.h
index f9a0c6d3a..111e9f6fc 100644
--- a/clutter/clutter/clutter-blur-private.h
+++ b/clutter/clutter/clutter-blur-private.h
@@ -19,7 +19,7 @@
 
 #include <glib-object.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-blur.c b/clutter/clutter/clutter-blur.c
index 1f0d394dd..806bdca23 100644
--- a/clutter/clutter/clutter-blur.c
+++ b/clutter/clutter/clutter-blur.c
@@ -15,9 +15,9 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-blur-private.h"
+#include "clutter/clutter-blur-private.h"
 
-#include "clutter-backend.h"
+#include "clutter/clutter-backend.h"
 
 /**
  * SECTION:clutter-blur
diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c
index 0e53c8182..3e56787b9 100644
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@@ -46,21 +46,21 @@
  * #ClutterBoxLayout by using clutter_box_layout_set_spacing().
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-box-layout.h"
+#include "clutter/clutter-box-layout.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-layout-meta.h"
-#include "clutter-private.h"
-#include "clutter-types.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-types.h"
 
 struct _ClutterBoxLayoutPrivate
 {
diff --git a/clutter/clutter/clutter-box-layout.h b/clutter/clutter/clutter-box-layout.h
index 67f2d8898..fc9a0d444 100644
--- a/clutter/clutter/clutter-box-layout.h
+++ b/clutter/clutter/clutter-box-layout.h
@@ -31,7 +31,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c
index 400caa49a..a50abc7ae 100644
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -35,18 +35,17 @@
 #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-brightness-contrast-effect.h"
+#include "cogl/cogl.h"
 
-#include <cogl/cogl.h>
-
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-offscreen-effect.h"
-#include "clutter-private.h"
+#include "clutter/clutter-brightness-contrast-effect.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-offscreen-effect.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterBrightnessContrastEffect
 {
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter/clutter-brightness-contrast-effect.h
index e2d3aabb9..75e33be3e 100644
--- a/clutter/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter/clutter-brightness-contrast-effect.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-color.h>
-#include <clutter/clutter-effect.h>
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-cairo.c b/clutter/clutter/clutter-cairo.c
index fa3e7e037..0293b3600 100644
--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@@ -27,10 +27,10 @@
  * Clutter provides some utility functions for using Cairo.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-cairo.h"
-#include "clutter-color.h"
+#include "clutter/clutter-cairo.h"
+#include "clutter/clutter-color.h"
 
 /**
  * clutter_cairo_set_source_color:
diff --git a/clutter/clutter/clutter-cairo.h b/clutter/clutter/clutter-cairo.h
index 3e4a14929..2fecd75a4 100644
--- a/clutter/clutter/clutter-cairo.h
+++ b/clutter/clutter/clutter-cairo.h
@@ -25,7 +25,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
index b1a1e49ae..c1125ec7f 100644
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -39,25 +39,24 @@
  * for an example of how to use #ClutterCanvas..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
-#include <cogl/cogl.h>
 #include <cairo-gobject.h>
 
-#include "clutter-canvas.h"
-
-#include "clutter-actor-private.h"
-#include "clutter-backend.h"
-#include "clutter-cairo.h"
-#include "clutter-color.h"
-#include "clutter-content-private.h"
-#include "clutter-debug.h"
-#include "clutter-marshal.h"
-#include "clutter-paint-node.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-private.h"
-#include "clutter-settings.h"
+#include "cogl/cogl.h"
+#include "clutter/clutter-canvas.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-cairo.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-content-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-paint-node.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-settings.h"
 
 struct _ClutterCanvasPrivate
 {
diff --git a/clutter/clutter/clutter-canvas.h b/clutter/clutter/clutter-canvas.h
index 4352cf67e..c8e5989dd 100644
--- a/clutter/clutter/clutter-canvas.h
+++ b/clutter/clutter/clutter-canvas.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-child-meta.c b/clutter/clutter/clutter-child-meta.c
index 6cad8920f..ad5a73a2e 100644
--- a/clutter/clutter/clutter-child-meta.c
+++ b/clutter/clutter/clutter-child-meta.c
@@ -64,12 +64,12 @@
  * and #ClutterContainerIface.get_child_meta().
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-child-meta.h"
-#include "clutter-container.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-container.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 G_DEFINE_ABSTRACT_TYPE (ClutterChildMeta, clutter_child_meta, G_TYPE_OBJECT);
 
diff --git a/clutter/clutter/clutter-child-meta.h b/clutter/clutter/clutter-child-meta.h
index b2fcb626f..6237a44d4 100644
--- a/clutter/clutter/clutter-child-meta.h
+++ b/clutter/clutter/clutter-child-meta.h
@@ -32,7 +32,8 @@
 #endif
 
 #include <glib-object.h>
-#include <clutter/clutter-types.h>
+
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c
index 72405717a..dc4c062fb 100644
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -87,14 +87,14 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-click-action.h"
+#include "clutter/clutter-click-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterClickActionPrivate
 {
diff --git a/clutter/clutter/clutter-click-action.h b/clutter/clutter/clutter-click-action.h
index e9ab2441d..0ce9b6504 100644
--- a/clutter/clutter/clutter-click-action.h
+++ b/clutter/clutter/clutter-click-action.h
@@ -31,8 +31,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-action.h>
-#include <clutter/clutter-event.h>
+#include "clutter/clutter-action.h"
+#include "clutter/clutter-event.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
index cad186d1b..17f12a9f1 100644
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -36,14 +36,14 @@
  * implementation.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-clone.h"
-#include "clutter-debug.h"
-#include "clutter-main.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-clone.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-private.h"
 
 #include "cogl/cogl.h"
 
diff --git a/clutter/clutter/clutter-clone.h b/clutter/clutter/clutter-clone.h
index 9e36ededa..04aafcc43 100644
--- a/clutter/clutter/clutter-clone.h
+++ b/clutter/clutter/clutter-clone.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor.h>
+#include "clutter/clutter-actor.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-color-state.c b/clutter/clutter/clutter-color-state.c
index 2fd26a241..21a7453d3 100644
--- a/clutter/clutter/clutter-color-state.c
+++ b/clutter/clutter/clutter-color-state.c
@@ -43,13 +43,13 @@
  * actor content is in pq or not, and things like that
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-color-state.h"
+#include "clutter/clutter-color-state.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-color-state.h b/clutter/clutter/clutter-color-state.h
index 9497b2824..43029c415 100644
--- a/clutter/clutter/clutter-color-state.h
+++ b/clutter/clutter/clutter-color-state.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c
index dfc0a9711..8d12fac08 100644
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@@ -21,17 +21,17 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
 #include <pango/pango-attributes.h>
 
-#include "clutter-interval.h"
-#include "clutter-main.h"
-#include "clutter-color.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-debug.h"
 
 /* XXX - keep in sync with the ClutterStaticColor enumeration order */
 static const ClutterColor static_colors[] = {
diff --git a/clutter/clutter/clutter-color.h b/clutter/clutter/clutter-color.h
index 054eecac2..71d4ac28a 100644
--- a/clutter/clutter/clutter-color.h
+++ b/clutter/clutter/clutter-color.h
@@ -29,7 +29,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c
index 26395e323..d552fc6dc 100644
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -35,16 +35,16 @@
 #define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
 #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-colorize-effect.h"
+#include "clutter/clutter-colorize-effect.h"
 
 #include "cogl/cogl.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-offscreen-effect.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-offscreen-effect.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterColorizeEffect
 {
diff --git a/clutter/clutter/clutter-colorize-effect.h b/clutter/clutter/clutter-colorize-effect.h
index ba8b56cdc..de6dbe365 100644
--- a/clutter/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter/clutter-colorize-effect.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-color.h>
-#include <clutter/clutter-effect.h>
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-constraint-private.h b/clutter/clutter/clutter-constraint-private.h
index 1a0774a05..c533e7f61 100644
--- a/clutter/clutter/clutter-constraint-private.h
+++ b/clutter/clutter/clutter-constraint-private.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "clutter-constraint.h"
+#include "clutter/clutter-constraint.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
index f90122475..796103de3 100644
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -125,15 +125,15 @@
  * can be recovered at any point using clutter_actor_meta_get_actor().
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 
-#include "clutter-constraint-private.h"
+#include "clutter/clutter-constraint-private.h"
 
-#include "clutter-actor.h"
-#include "clutter-actor-meta-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-actor-meta-private.h"
+#include "clutter/clutter-private.h"
 
 G_DEFINE_ABSTRACT_TYPE (ClutterConstraint,
                         clutter_constraint,
diff --git a/clutter/clutter/clutter-constraint.h b/clutter/clutter/clutter-constraint.h
index 86f374932..875611400 100644
--- a/clutter/clutter/clutter-constraint.h
+++ b/clutter/clutter/clutter-constraint.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor-meta.h>
+#include "clutter/clutter-actor-meta.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-container-private.h b/clutter/clutter/clutter-container-private.h
index a029a39fe..04a3f86b1 100644
--- a/clutter/clutter/clutter-container-private.h
+++ b/clutter/clutter/clutter-container-private.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <clutter/clutter-container.h>
+#include "clutter/clutter-container.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c
index c93a9d4d9..3df442789 100644
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -26,23 +26,23 @@
  * Author: Emmanuele Bassi <ebassi@openedhand.com>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdarg.h>
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-child-meta.h"
-#include "clutter-container-private.h"
-#include "clutter-debug.h"
-#include "clutter-main.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
-#include "clutter-enum-types.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-container-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-enum-types.h"
 
 #define CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED(container,vfunc) \
         G_STMT_START { \
diff --git a/clutter/clutter/clutter-container.h b/clutter/clutter/clutter-container.h
index 0beac7730..e0ae44d74 100644
--- a/clutter/clutter/clutter-container.h
+++ b/clutter/clutter/clutter-container.h
@@ -30,9 +30,9 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-child-meta.h>
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-content-private.h b/clutter/clutter/clutter-content-private.h
index b6922ed27..2950da9f2 100644
--- a/clutter/clutter/clutter-content-private.h
+++ b/clutter/clutter/clutter-content-private.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <clutter/clutter-content.h>
+#include "clutter/clutter-content.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-content.c b/clutter/clutter/clutter-content.c
index 599a8808a..8531a0ff2 100644
--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -34,14 +34,14 @@
  * to share the resources associated with painting the same content..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-content-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-content-private.h"
 
-#include "clutter-debug.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-content.h b/clutter/clutter/clutter-content.h
index f03c96aa0..1880f1f7b 100644
--- a/clutter/clutter/clutter-content.h
+++ b/clutter/clutter/clutter-content.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-damage-history.c b/clutter/clutter/clutter-damage-history.c
index d5e86f1b7..3edefd4f9 100644
--- a/clutter/clutter/clutter-damage-history.c
+++ b/clutter/clutter/clutter-damage-history.c
@@ -16,9 +16,9 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-damage-history.h"
+#include "clutter/clutter-damage-history.h"
 
 #define DAMAGE_HISTORY_LENGTH 0x10
 
diff --git a/clutter/clutter/clutter-damage-history.h b/clutter/clutter/clutter-damage-history.h
index 33b296254..dd60ec103 100644
--- a/clutter/clutter/clutter-damage-history.h
+++ b/clutter/clutter/clutter-damage-history.h
@@ -21,7 +21,7 @@
 #include <cairo.h>
 #include <glib.h>
 
-#include "clutter-macros.h"
+#include "clutter/clutter-macros.h"
 
 typedef struct _ClutterDamageHistory ClutterDamageHistory;
 
diff --git a/clutter/clutter/clutter-debug.h b/clutter/clutter/clutter-debug.h
index 0db609e05..f41e78346 100644
--- a/clutter/clutter/clutter-debug.h
+++ b/clutter/clutter/clutter-debug.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <glib.h>
-#include "clutter-main.h"
+
+#include "clutter/clutter-main.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c
index c9d03820e..9088a6d59 100644
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -48,18 +48,17 @@
  * deformation algorithm.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-deform-effect.h"
+#include "cogl/cogl.h"
 
-#include <cogl/cogl.h>
-
-#include "clutter-color.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-paint-node.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-private.h"
+#include "clutter/clutter-deform-effect.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-paint-node.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-private.h"
 
 #define DEFAULT_N_TILES         32
 
diff --git a/clutter/clutter/clutter-deform-effect.h b/clutter/clutter/clutter-deform-effect.h
index 7a58e1a72..c4bef4065 100644
--- a/clutter/clutter/clutter-deform-effect.h
+++ b/clutter/clutter/clutter-deform-effect.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-offscreen-effect.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-offscreen-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 788673ef3..d1532c7a6 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -2,7 +2,7 @@
 
 #define __CLUTTER_DEPRECATED_H_INSIDE__
 
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
 
diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c
index e82c6456b..80693ac1f 100644
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -37,18 +37,18 @@
 #define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT))
 #define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-desaturate-effect.h"
+#include "clutter/clutter-desaturate-effect.h"
 
 #include "cogl/cogl.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-offscreen-effect.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-offscreen-effect.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterDesaturateEffect
 {
diff --git a/clutter/clutter/clutter-desaturate-effect.h b/clutter/clutter/clutter-desaturate-effect.h
index 4b940bd2b..3f6af0d80 100644
--- a/clutter/clutter/clutter-desaturate-effect.h
+++ b/clutter/clutter/clutter-desaturate-effect.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-effect.h>
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-easing.c b/clutter/clutter/clutter-easing.c
index 544994d46..4fa7b74b4 100644
--- a/clutter/clutter/clutter-easing.c
+++ b/clutter/clutter/clutter-easing.c
@@ -1,6 +1,6 @@
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-easing.h"
+#include "clutter/clutter-easing.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-easing.h b/clutter/clutter/clutter-easing.h
index 65c6a5d56..ff6464623 100644
--- a/clutter/clutter/clutter-easing.h
+++ b/clutter/clutter/clutter-easing.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-effect-private.h b/clutter/clutter/clutter-effect-private.h
index e117a6d3a..c99d424bd 100644
--- a/clutter/clutter/clutter-effect-private.h
+++ b/clutter/clutter/clutter-effect-private.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <clutter/clutter-effect.h>
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c
index 85882e329..ff20cddb5 100644
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -159,19 +159,19 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-effect.h"
+#include "clutter/clutter-effect.h"
 
-#include "clutter-actor-meta-private.h"
-#include "clutter-debug.h"
-#include "clutter-effect-private.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-paint-node-private.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-private.h"
-#include "clutter-actor-private.h"
+#include "clutter/clutter-actor-meta-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-effect-private.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-paint-node-private.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-actor-private.h"
 
 G_DEFINE_ABSTRACT_TYPE (ClutterEffect,
                         clutter_effect,
diff --git a/clutter/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h
index 8dd11f5f5..b30dd866c 100644
--- a/clutter/clutter/clutter-effect.h
+++ b/clutter/clutter/clutter-effect.h
@@ -28,9 +28,9 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor-meta.h>
-#include <clutter/clutter-paint-context.h>
-#include <clutter/clutter-pick-context.h>
+#include "clutter/clutter-actor-meta.h"
+#include "clutter/clutter-paint-context.h"
+#include "clutter/clutter-pick-context.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-enum-types.c.in b/clutter/clutter/clutter-enum-types.c.in
index 9b6d778c4..9d0a1fcf3 100644
--- a/clutter/clutter/clutter-enum-types.c.in
+++ b/clutter/clutter/clutter-enum-types.c.in
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#include "clutter-build-config.h"
-#include "clutter-enum-types.h"
+#include "clutter/clutter-build-config.h"
+#include "clutter/clutter-enum-types.h"
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
diff --git a/clutter/clutter/clutter-enum-types.h.in b/clutter/clutter/clutter-enum-types.h.in
index 569a764ba..2272a051e 100644
--- a/clutter/clutter/clutter-enum-types.h.in
+++ b/clutter/clutter/clutter-enum-types.h.in
@@ -5,7 +5,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-event-private.h b/clutter/clutter/clutter-event-private.h
index cb89421a3..10eaf3dda 100644
--- a/clutter/clutter/clutter-event-private.h
+++ b/clutter/clutter/clutter-event-private.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <clutter/clutter-event.h>
+#include "clutter/clutter-event.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
index 151a07601..2b98f3b51 100644
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -23,13 +23,13 @@
  *
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-backend-private.h"
-#include "clutter-debug.h"
-#include "clutter-event-private.h"
-#include "clutter-keysyms.h"
-#include "clutter-private.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-keysyms.h"
+#include "clutter/clutter-private.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-event.h b/clutter/clutter/clutter-event.h
index dbb8167e1..76c2413eb 100644
--- a/clutter/clutter/clutter-event.h
+++ b/clutter/clutter/clutter-event.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-input-device.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-input-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c
index 62f42fefd..2b1007f2a 100644
--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -35,17 +35,17 @@
  * run-time.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
-#include "clutter-backend-private.h"
-#include "clutter-feature.h"
-#include "clutter-main.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-feature.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-debug.h"
 
 #include "cogl/cogl.h"
 
diff --git a/clutter/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c
index 404300584..31210c97b 100644
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@@ -33,11 +33,11 @@
  * layout policies as #ClutterGroup.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-debug.h"
-#include "clutter-fixed-layout.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-fixed-layout.h"
+#include "clutter/clutter-private.h"
 
 G_DEFINE_TYPE (ClutterFixedLayout,
                clutter_fixed_layout,
diff --git a/clutter/clutter/clutter-fixed-layout.h b/clutter/clutter/clutter-fixed-layout.h
index 095acfa5a..5bf14de8d 100644
--- a/clutter/clutter/clutter-fixed-layout.h
+++ b/clutter/clutter/clutter-fixed-layout.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c
index e35485da8..2ca81b539 100644
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@@ -27,11 +27,11 @@
    need to do anything on top of the ClutterOffscreenEffect class so
    it only exists because that class is abstract */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-flatten-effect.h"
-#include "clutter-private.h"
-#include "clutter-actor-private.h"
+#include "clutter/clutter-flatten-effect.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-actor-private.h"
 
 G_DEFINE_TYPE (ClutterFlattenEffect,
                _clutter_flatten_effect,
diff --git a/clutter/clutter/clutter-flatten-effect.h b/clutter/clutter/clutter-flatten-effect.h
index c38f60102..8e667dea0 100644
--- a/clutter/clutter/clutter-flatten-effect.h
+++ b/clutter/clutter/clutter-flatten-effect.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <clutter/clutter-offscreen-effect.h>
+#include "clutter/clutter-offscreen-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c
index 361b5d988..ac876572f 100644
--- a/clutter/clutter/clutter-flow-layout.c
+++ b/clutter/clutter/clutter-flow-layout.c
@@ -51,21 +51,21 @@
  * shows how to use the #ClutterFlowLayout.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-actor.h"
-#include "clutter-animatable.h"
-#include "clutter-child-meta.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-flow-layout.h"
-#include "clutter-layout-meta.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-flow-layout.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterFlowLayoutPrivate
 {
diff --git a/clutter/clutter/clutter-flow-layout.h b/clutter/clutter/clutter-flow-layout.h
index 42d2be399..90370513d 100644
--- a/clutter/clutter/clutter-flow-layout.h
+++ b/clutter/clutter/clutter-flow-layout.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c
index 63d349ace..8d5742836 100644
--- a/clutter/clutter/clutter-frame-clock.c
+++ b/clutter/clutter/clutter-frame-clock.c
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include "clutter/clutter-frame-clock.h"
 
diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c
index 2dbcc65dd..b562279f5 100644
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -81,14 +81,14 @@
  * instead.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-gesture-action.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-gesture-action.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-gesture-action.h b/clutter/clutter/clutter-gesture-action.h
index 9dfdfbe8f..c3dbdeb9d 100644
--- a/clutter/clutter/clutter-gesture-action.h
+++ b/clutter/clutter/clutter-gesture-action.h
@@ -29,7 +29,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-action.h>
+#include "clutter/clutter-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-graphene.c b/clutter/clutter/clutter-graphene.c
index 409c189b0..3d245a858 100644
--- a/clutter/clutter/clutter-graphene.c
+++ b/clutter/clutter/clutter-graphene.c
@@ -22,12 +22,12 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-graphene.h"
+#include "clutter/clutter-graphene.h"
 
-#include "clutter-private.h"
-#include "clutter-types.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-types.h"
 
 static gboolean
 graphene_matrix_progress (const GValue *a,
diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
index 848fd46a9..25d6cc244 100644
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -26,19 +26,19 @@
  *   Matthias Clasen
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 #include <math.h>
 
-#include "clutter-grid-layout.h"
+#include "clutter/clutter-grid-layout.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-container.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-layout-meta.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-container.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-private.h"
 
 /**
  * ClutterGridLayout:
diff --git a/clutter/clutter/clutter-grid-layout.h b/clutter/clutter/clutter-grid-layout.h
index 67b017edc..0caf2e89f 100644
--- a/clutter/clutter/clutter-grid-layout.h
+++ b/clutter/clutter/clutter-grid-layout.h
@@ -32,7 +32,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
index ee6a1a597..11220d81a 100644
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -34,17 +34,17 @@
  * for an example of how to use #ClutterImage..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-image.h"
+#include "clutter/clutter-image.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-color.h"
-#include "clutter-content-private.h"
-#include "clutter-debug.h"
-#include "clutter-paint-node.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-content-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-paint-node.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-private.h"
 
 typedef struct
 {
diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h
index 26d27962b..15acf11e0 100644
--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-types.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-input-device-private.h b/clutter/clutter/clutter-input-device-private.h
index 62175b041..220687f08 100644
--- a/clutter/clutter/clutter-input-device-private.h
+++ b/clutter/clutter/clutter-input-device-private.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-input-device.h>
+#include "clutter/clutter-input-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c
index 4883c512e..09df40fc0 100644
--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@@ -21,10 +21,10 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-input-device-tool.h"
-#include "clutter-private.h"
+#include "clutter/clutter-input-device-tool.h"
+#include "clutter/clutter-private.h"
 
 typedef struct _ClutterInputDeviceToolPrivate ClutterInputDeviceToolPrivate;
 
diff --git a/clutter/clutter/clutter-input-device-tool.h b/clutter/clutter/clutter-input-device-tool.h
index d2eb3ec49..05ea04847 100644
--- a/clutter/clutter/clutter-input-device-tool.h
+++ b/clutter/clutter/clutter-input-device-tool.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include "clutter-enum-types.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-enum-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index 221777331..fe0dc911c 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -32,19 +32,19 @@
  * its contents are usually defined by the Clutter backend in use.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-input-device.h"
+#include "clutter/clutter-input-device.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-event-private.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-input-device-private.h"
-#include "clutter-input-device-tool.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-device-tool.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index ab3a64a25..e236564fb 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -27,9 +27,9 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-backend.h>
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-seat.h>
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-seat.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-input-focus.c b/clutter/clutter/clutter-input-focus.c
index 800b54f86..c2353cad8 100644
--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@@ -19,7 +19,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include "clutter/clutter-input-focus.h"
 #include "clutter/clutter-input-focus-private.h"
diff --git a/clutter/clutter/clutter-input-focus.h b/clutter/clutter/clutter-input-focus.h
index a315d9c4c..5a19589ce 100644
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
 
 #define CLUTTER_TYPE_INPUT_FOCUS (clutter_input_focus_get_type ())
 
diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c
index e586a6baf..dccc87eb2 100644
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -19,9 +19,9 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-private.h"
+#include "clutter/clutter-private.h"
 #include "clutter/clutter-input-device-private.h"
 #include "clutter/clutter-input-method.h"
 #include "clutter/clutter-input-method-private.h"
diff --git a/clutter/clutter/clutter-input-only-action.c b/clutter/clutter/clutter-input-only-action.c
index 98bd551e3..51e95ace4 100644
--- a/clutter/clutter/clutter-input-only-action.c
+++ b/clutter/clutter/clutter-input-only-action.c
@@ -19,7 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include "clutter/clutter-input-only-action.h"
 
diff --git a/clutter/clutter/clutter-input-only-actor.c b/clutter/clutter/clutter-input-only-actor.c
index bb1e709c0..aec0feedd 100644
--- a/clutter/clutter/clutter-input-only-actor.c
+++ b/clutter/clutter/clutter-input-only-actor.c
@@ -19,11 +19,11 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-input-only-actor.h"
+#include "clutter/clutter-input-only-actor.h"
 
-#include "clutter-input-only-action.h"
+#include "clutter/clutter-input-only-action.h"
 
 struct _ClutterInputOnlyActor
 {
diff --git a/clutter/clutter/clutter-input-pointer-a11y-private.h b/clutter/clutter/clutter-input-pointer-a11y-private.h
index d8900cde4..3a9ec2b02 100644
--- a/clutter/clutter/clutter-input-pointer-a11y-private.h
+++ b/clutter/clutter/clutter-input-pointer-a11y-private.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <clutter/clutter-types.h>
-#include "clutter-enum-types.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-enum-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-input-pointer-a11y.c b/clutter/clutter/clutter-input-pointer-a11y.c
index a74aa4cc2..fe1933d3b 100644
--- a/clutter/clutter/clutter-input-pointer-a11y.c
+++ b/clutter/clutter/clutter-input-pointer-a11y.c
@@ -23,16 +23,16 @@
  * mousetweaks Copyright (C) 2007-2010 Gerd Kohlberger <gerdko gmail com>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-backend-private.h"
-#include "clutter-enum-types.h"
-#include "clutter-input-device.h"
-#include "clutter-input-device-private.h"
-#include "clutter-input-pointer-a11y-private.h"
-#include "clutter-main.h"
-#include "clutter-private.h"
-#include "clutter-virtual-input-device.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-input-device.h"
+#include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-pointer-a11y-private.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-virtual-input-device.h"
 
 static gboolean
 is_secondary_click_enabled (ClutterInputDevice *device)
diff --git a/clutter/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c
index c72ce9877..a748d6d16 100644
--- a/clutter/clutter/clutter-interval.c
+++ b/clutter/clutter/clutter-interval.c
@@ -42,7 +42,7 @@
  * and value computation.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -51,12 +51,12 @@
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#include "clutter-color.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-units.h"
-#include "clutter-scriptable.h"
-#include "clutter-script-private.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-units.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-script-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-interval.h b/clutter/clutter/clutter-interval.h
index f7f08df48..cdf439f73 100644
--- a/clutter/clutter/clutter-interval.h
+++ b/clutter/clutter/clutter-interval.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c
index 2e4f22a6d..b2dc8c388 100644
--- a/clutter/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter/clutter-keyframe-transition.c
@@ -60,15 +60,15 @@
  * interval..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-keyframe-transition.h"
+#include "clutter/clutter-keyframe-transition.h"
 
-#include "clutter-debug.h"
-#include "clutter-easing.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-timeline.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-easing.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-timeline.h"
 
 #include <math.h>
 #include <gobject/gvaluecollector.h>
diff --git a/clutter/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h
index e3d33d78a..d26a35770 100644
--- a/clutter/clutter/clutter-keyframe-transition.h
+++ b/clutter/clutter/clutter-keyframe-transition.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-property-transition.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-property-transition.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-keymap.c b/clutter/clutter/clutter-keymap.c
index 2c2303a2f..4e4823e6c 100644
--- a/clutter/clutter/clutter-keymap.c
+++ b/clutter/clutter/clutter-keymap.c
@@ -19,10 +19,10 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-keymap-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-keymap-private.h"
+#include "clutter/clutter-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-keymap.h b/clutter/clutter/clutter-keymap.h
index 03a165d14..6644b5c08 100644
--- a/clutter/clutter/clutter-keymap.h
+++ b/clutter/clutter/clutter-keymap.h
@@ -25,7 +25,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-macros.h>
+#include "clutter/clutter-macros.h"
 
 #include <glib-object.h>
 #include <pango/pango.h>
diff --git a/clutter/clutter/clutter-keysyms-table.c b/clutter/clutter/clutter-keysyms-table.c
index 182f6f3fe..98d9df986 100644
--- a/clutter/clutter/clutter-keysyms-table.c
+++ b/clutter/clutter/clutter-keysyms-table.c
@@ -1,8 +1,8 @@
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib.h>
 
-#include "clutter-event.h"
+#include "clutter/clutter-event.h"
 
 /* Code below from GDK, which contains following comment:
  *
diff --git a/clutter/clutter/clutter-keyval.c b/clutter/clutter/clutter-keyval.c
index 12ea0d9d5..6af0ac713 100644
--- a/clutter/clutter/clutter-keyval.c
+++ b/clutter/clutter/clutter-keyval.c
@@ -24,10 +24,10 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#include "clutter-keyval.h"
-#include "clutter-event.h"
-#include "clutter-keysyms.h"
-#include "clutter-keyname-table.h"
+#include "clutter/clutter-keyval.h"
+#include "clutter/clutter-event.h"
+#include "clutter/clutter-keysyms.h"
+#include "clutter/clutter-keyname-table.h"
 
 #define CLUTTER_NUM_KEYS G_N_ELEMENTS (clutter_keys_by_keyval)
 
diff --git a/clutter/clutter/clutter-keyval.h b/clutter/clutter/clutter-keyval.h
index 835b66ee1..069c8dc1c 100644
--- a/clutter/clutter/clutter-keyval.h
+++ b/clutter/clutter/clutter-keyval.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/keyval.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index a3c51d621..972ef189f 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -127,20 +127,20 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-debug.h"
-#include "clutter-layout-manager.h"
-#include "clutter-layout-meta.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
-#include "clutter-timeline.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-layout-manager.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-timeline.h"
 
 #define LAYOUT_MANAGER_WARN_NOT_IMPLEMENTED(m,method)   G_STMT_START {  \
         GObject *_obj = G_OBJECT (m);                                   \
diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h
index ef6bbd494..71762089f 100644
--- a/clutter/clutter/clutter-layout-manager.h
+++ b/clutter/clutter/clutter-layout-manager.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c
index 0f30250a4..894ab85d8 100644
--- a/clutter/clutter/clutter-layout-meta.c
+++ b/clutter/clutter/clutter-layout-meta.c
@@ -34,11 +34,11 @@
  * using a [class@LayoutManager].
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-layout-meta.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 G_DEFINE_ABSTRACT_TYPE (ClutterLayoutMeta,
                         clutter_layout_meta,
diff --git a/clutter/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h
index 6a26076b1..49165c406 100644
--- a/clutter/clutter/clutter-layout-meta.h
+++ b/clutter/clutter/clutter-layout-meta.h
@@ -28,9 +28,9 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-child-meta.h>
-#include <clutter/clutter-layout-manager.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-layout-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 23ca58b7a..854778686 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -47,31 +47,31 @@
  * [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18)
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 #include <hb-glib.h>
 
-#include "clutter-actor-private.h"
-#include "clutter-backend-private.h"
-#include "clutter-debug.h"
-#include "clutter-event-private.h"
-#include "clutter-input-device-private.h"
-#include "clutter-input-pointer-a11y-private.h"
-#include "clutter-graphene.h"
-#include "clutter-main.h"
-#include "clutter-mutter.h"
-#include "clutter-paint-node-private.h"
-#include "clutter-private.h"
-#include "clutter-settings-private.h"
-#include "clutter-stage.h"
-#include "clutter-stage-manager.h"
-#include "clutter-stage-private.h"
-#include "clutter-backend-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-pointer-a11y-private.h"
+#include "clutter/clutter-graphene.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-paint-node-private.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-settings-private.h"
+#include "clutter/clutter-stage.h"
+#include "clutter/clutter-stage-manager.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-backend-private.h"
 
-#include <cogl/cogl.h>
-#include <cogl-pango/cogl-pango.h>
+#include "cogl/cogl.h"
+#include "cogl-pango/cogl-pango.h"
 
 #include "cally/cally.h" /* For accessibility support */
 
diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h
index 9657b1717..5e1e71f43 100644
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-stage.h>
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-stage.h"
 #include <pango/pango.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h
index 23425eb73..458f9bc32 100644
--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@@ -24,19 +24,19 @@
 
 #define __CLUTTER_H_INSIDE__
 
-#include "clutter-backend.h"
-#include "clutter-backend-private.h"
-#include "clutter-damage-history.h"
-#include "clutter-event-private.h"
-#include "clutter-frame-private.h"
-#include "clutter-input-device-private.h"
-#include "clutter-input-pointer-a11y-private.h"
-#include "clutter-macros.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-view.h"
-#include "clutter-stage-view-private.h"
-#include "clutter.h"
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-damage-history.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-frame-private.h"
+#include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-pointer-a11y-private.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-stage-view.h"
+#include "clutter/clutter-stage-view-private.h"
+#include "clutter/clutter.h"
 
 /* An epsilon larger than FLT_EPSILON that is useful when comparing coordinates
  * while ignoring floating point precision loss that might happen during
diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
index e15a3867d..abfe0bb87 100644
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -85,23 +85,23 @@
  * of [vfunc@OffscreenEffect.create_pipeline].
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-offscreen-effect.h"
+#include "clutter/clutter-offscreen-effect.h"
 
 #include <math.h>
 
 #include "cogl/cogl.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-paint-context-private.h"
-#include "clutter-paint-node-private.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-actor-box-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-paint-context-private.h"
+#include "clutter/clutter-paint-node-private.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-actor-box-private.h"
 
 struct _ClutterOffscreenEffectPrivate
 {
diff --git a/clutter/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h
index 0ed0ff42d..c6ce2946a 100644
--- a/clutter/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter/clutter-offscreen-effect.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-effect.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c
index bc0a95b91..bd0cdc83c 100644
--- a/clutter/clutter/clutter-page-turn-effect.c
+++ b/clutter/clutter/clutter-page-turn-effect.c
@@ -33,14 +33,14 @@
  * A simple page turning effect
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-page-turn-effect.h"
+#include "clutter/clutter-page-turn-effect.h"
 
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_PAGE_TURN_EFFECT_CLASS(k)       (G_TYPE_CHECK_CLASS_CAST ((k), CLUTTER_TYPE_PAGE_TURN_EFFECT, ClutterPageTurnEffectClass))
 #define CLUTTER_IS_PAGE_TURN_EFFECT_CLASS(k)    (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_PAGE_TURN_EFFECT))
diff --git a/clutter/clutter/clutter-page-turn-effect.h b/clutter/clutter/clutter-page-turn-effect.h
index 595b3654d..968936548 100644
--- a/clutter/clutter/clutter-page-turn-effect.h
+++ b/clutter/clutter/clutter-page-turn-effect.h
@@ -31,7 +31,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-deform-effect.h>
+#include "clutter/clutter-deform-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-context-private.h b/clutter/clutter/clutter-paint-context-private.h
index 97a195f5e..231e64ad5 100644
--- a/clutter/clutter/clutter-paint-context-private.h
+++ b/clutter/clutter/clutter-paint-context-private.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "clutter-paint-context.h"
+#include "clutter/clutter-paint-context.h"
 
 ClutterPaintContext *
 clutter_paint_context_new_for_view (ClutterStageView     *view,
diff --git a/clutter/clutter/clutter-paint-context.c b/clutter/clutter/clutter-paint-context.c
index 486b3396c..e34944e46 100644
--- a/clutter/clutter/clutter-paint-context.c
+++ b/clutter/clutter/clutter-paint-context.c
@@ -15,10 +15,10 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-paint-context-private.h"
-#include "clutter-frame.h"
+#include "clutter/clutter-paint-context-private.h"
+#include "clutter/clutter-frame.h"
 
 struct _ClutterPaintContext
 {
diff --git a/clutter/clutter/clutter-paint-context.h b/clutter/clutter/clutter-paint-context.h
index c3c684c71..4d6d828d8 100644
--- a/clutter/clutter/clutter-paint-context.h
+++ b/clutter/clutter/clutter-paint-context.h
@@ -23,8 +23,8 @@
 
 #include <glib-object.h>
 
-#include "clutter-macros.h"
-#include "clutter-stage-view.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-stage-view.h"
 
 typedef struct _ClutterPaintContext ClutterPaintContext;
 
diff --git a/clutter/clutter/clutter-paint-node-private.h b/clutter/clutter/clutter-paint-node-private.h
index c6803845c..8d282abc6 100644
--- a/clutter/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter/clutter-paint-node-private.h
@@ -26,9 +26,10 @@
 
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
-#include <clutter/clutter-backend.h>
-#include <clutter/clutter-paint-context.h>
-#include <clutter/clutter-paint-node.h>
+
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-paint-context.h"
+#include "clutter/clutter-paint-node.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c
index 4264a3bbb..37804194c 100644
--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -47,18 +47,17 @@
  * The `ClutterPaintNodeClass` structure contains only private data.
  */
 
-#include "clutter-build-config.h"
-
-#include <pango/pango.h>
-#include <cogl/cogl.h>
-#include <json-glib/json-glib.h>
-
-#include "clutter-paint-node-private.h"
-
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-build-config.h"
 
 #include <gobject/gvaluecollector.h>
+#include <json-glib/json-glib.h>
+#include <pango/pango.h>
+
+#include "cogl/cogl.h"
+#include "clutter/clutter-paint-node-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
+
 
 static inline void      clutter_paint_operation_clear   (ClutterPaintOperation *op);
 
diff --git a/clutter/clutter/clutter-paint-node.h b/clutter/clutter/clutter-paint-node.h
index 5c86be0cc..36f02759d 100644
--- a/clutter/clutter/clutter-paint-node.h
+++ b/clutter/clutter/clutter-paint-node.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-types.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 76d2386e2..5ccc19cd2 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -23,21 +23,21 @@
  */
 
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-paint-node-private.h"
+#include "clutter/clutter-paint-node-private.h"
 
 #include <pango/pango.h>
-#include <cogl/cogl.h>
 
-#include "clutter-actor-private.h"
-#include "clutter-blur-private.h"
-#include "clutter-color.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
-#include "clutter-paint-context-private.h"
+#include "cogl/cogl.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-blur-private.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-paint-context-private.h"
 
-#include "clutter-paint-nodes.h"
+#include "clutter/clutter-paint-nodes.h"
 
 static CoglPipeline *default_color_pipeline   = NULL;
 static CoglPipeline *default_texture_pipeline = NULL;
diff --git a/clutter/clutter/clutter-paint-nodes.h b/clutter/clutter/clutter-paint-nodes.h
index 10af06911..3058c8a7c 100644
--- a/clutter/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter/clutter-paint-nodes.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-types.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-volume-private.h b/clutter/clutter/clutter-paint-volume-private.h
index 56e097b1f..9b19e724a 100644
--- a/clutter/clutter/clutter-paint-volume-private.h
+++ b/clutter/clutter/clutter-paint-volume-private.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-private.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c
index 022ba0951..cf725573a 100644
--- a/clutter/clutter/clutter-paint-volume.c
+++ b/clutter/clutter/clutter-paint-volume.c
@@ -24,18 +24,18 @@
  *      Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 
 #include <glib-object.h>
 #include <math.h>
 
-#include "clutter-actor-private.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-actor-box-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-actor-box-private.h"
 
 G_DEFINE_BOXED_TYPE (ClutterPaintVolume, clutter_paint_volume,
                      clutter_paint_volume_copy,
diff --git a/clutter/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c
index ec89c6cde..f791f7eea 100644
--- a/clutter/clutter/clutter-pan-action.c
+++ b/clutter/clutter/clutter-pan-action.c
@@ -51,15 +51,15 @@
  * when dragging.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-pan-action.h"
+#include "clutter/clutter-pan-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
-#include "clutter-timeline.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-timeline.h"
 #include <math.h>
 
 #define FLOAT_EPSILON   (1e-15)
diff --git a/clutter/clutter/clutter-pan-action.h b/clutter/clutter/clutter-pan-action.h
index 8b47a291f..3202ef4b0 100644
--- a/clutter/clutter/clutter-pan-action.h
+++ b/clutter/clutter/clutter-pan-action.h
@@ -36,7 +36,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-gesture-action.h>
+#include "clutter/clutter-gesture-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c
index def1a5ec3..14136355b 100644
--- a/clutter/clutter/clutter-path-constraint.c
+++ b/clutter/clutter/clutter-path-constraint.c
@@ -34,13 +34,13 @@
  * control how far along the path the [class@Actor] should be..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-path-constraint.h"
+#include "clutter/clutter-path-constraint.h"
 
-#include "clutter-debug.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_PATH_CONSTRAINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_PATH_CONSTRAINT, ClutterPathConstraintClass))
 #define CLUTTER_IS_PATH_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_PATH_CONSTRAINT))
diff --git a/clutter/clutter/clutter-path-constraint.h b/clutter/clutter/clutter-path-constraint.h
index 202ed3f57..193103049 100644
--- a/clutter/clutter/clutter-path-constraint.h
+++ b/clutter/clutter/clutter-path-constraint.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-constraint.h>
-#include <clutter/clutter-path.h>
+#include "clutter/clutter-constraint.h"
+#include "clutter/clutter-path.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c
index 81d6a9a06..140783600 100644
--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@@ -58,17 +58,17 @@
  * [method@Path.add_string] for details.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
 #include <glib-object.h>
 
-#include "clutter-path.h"
-#include "clutter-types.h"
-#include "clutter-bezier.h"
-#include "clutter-private.h"
+#include "clutter/clutter-path.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-bezier.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_PATH_NODE_TYPE_IS_VALID(t) \
   ((((t) & ~CLUTTER_PATH_RELATIVE) >= CLUTTER_PATH_MOVE_TO      \
diff --git a/clutter/clutter/clutter-path.h b/clutter/clutter/clutter-path.h
index 245b10879..7a1f5c164 100644
--- a/clutter/clutter/clutter-path.h
+++ b/clutter/clutter/clutter-path.h
@@ -28,7 +28,8 @@
 #endif
 
 #include <cairo.h>
-#include <clutter/clutter-types.h>
+
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-pick-context-private.h b/clutter/clutter/clutter-pick-context-private.h
index b41493a77..77d032a5c 100644
--- a/clutter/clutter/clutter-pick-context-private.h
+++ b/clutter/clutter/clutter-pick-context-private.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "clutter-pick-context.h"
-#include "clutter-pick-stack-private.h"
+#include "clutter/clutter-pick-context.h"
+#include "clutter/clutter-pick-stack-private.h"
 
 ClutterPickContext *
 clutter_pick_context_new_for_view (ClutterStageView         *view,
diff --git a/clutter/clutter/clutter-pick-context.c b/clutter/clutter/clutter-pick-context.c
index 97cc88cbf..bb3f26038 100644
--- a/clutter/clutter/clutter-pick-context.c
+++ b/clutter/clutter/clutter-pick-context.c
@@ -15,10 +15,10 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-backend.h"
-#include "clutter-pick-context-private.h"
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-pick-context-private.h"
 
 struct _ClutterPickContext
 {
diff --git a/clutter/clutter/clutter-pick-context.h b/clutter/clutter/clutter-pick-context.h
index 2e4efc534..224052638 100644
--- a/clutter/clutter/clutter-pick-context.h
+++ b/clutter/clutter/clutter-pick-context.h
@@ -23,8 +23,8 @@
 
 #include <glib-object.h>
 
-#include "clutter-macros.h"
-#include "clutter-stage-view.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-stage-view.h"
 
 typedef struct _ClutterPickContext ClutterPickContext;
 
diff --git a/clutter/clutter/clutter-pick-stack-private.h b/clutter/clutter/clutter-pick-stack-private.h
index d6a5452ee..ab4631575 100644
--- a/clutter/clutter/clutter-pick-stack-private.h
+++ b/clutter/clutter/clutter-pick-stack-private.h
@@ -19,8 +19,8 @@
 
 #include <glib-object.h>
 
-#include "clutter-macros.h"
-#include "clutter-stage-view.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-stage-view.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-pick-stack.c b/clutter/clutter/clutter-pick-stack.c
index e11d2489c..26ffce2cf 100644
--- a/clutter/clutter/clutter-pick-stack.c
+++ b/clutter/clutter/clutter-pick-stack.c
@@ -16,8 +16,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-pick-stack-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-pick-stack-private.h"
+#include "clutter/clutter-private.h"
 
 typedef struct
 {
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index c658f6de5..58d928990 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -28,15 +28,15 @@
 #include <string.h>
 #include <glib.h>
 
-#include <cogl-pango/cogl-pango.h>
+#include "cogl-pango/cogl-pango.h"
 
-#include "clutter-backend.h"
-#include "clutter-effect.h"
-#include "clutter-event.h"
-#include "clutter-layout-manager.h"
-#include "clutter-settings.h"
-#include "clutter-stage-manager.h"
-#include "clutter-stage.h"
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-effect.h"
+#include "clutter/clutter-event.h"
+#include "clutter/clutter-layout-manager.h"
+#include "clutter/clutter-settings.h"
+#include "clutter/clutter-stage-manager.h"
+#include "clutter/clutter-stage.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-property-transition.c b/clutter/clutter/clutter-property-transition.c
index 0163affdb..4a0a2e0d4 100644
--- a/clutter/clutter/clutter-property-transition.c
+++ b/clutter/clutter/clutter-property-transition.c
@@ -28,15 +28,15 @@
  * can be used to tween a property of a [iface@Animatable] instance.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-property-transition.h"
+#include "clutter/clutter-property-transition.h"
 
-#include "clutter-animatable.h"
-#include "clutter-debug.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-transition.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-transition.h"
 
 struct _ClutterPropertyTransitionPrivate
 {
diff --git a/clutter/clutter/clutter-property-transition.h b/clutter/clutter/clutter-property-transition.h
index fa79162be..a51ba1990 100644
--- a/clutter/clutter/clutter-property-transition.h
+++ b/clutter/clutter/clutter-property-transition.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-transition.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-transition.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-rotate-action.c b/clutter/clutter/clutter-rotate-action.c
index 7c6e4e98a..c44eb96dd 100644
--- a/clutter/clutter/clutter-rotate-action.c
+++ b/clutter/clutter/clutter-rotate-action.c
@@ -31,16 +31,16 @@
  * the logic for recognizing rotate gestures using two touch points.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-rotate-action.h"
+#include "clutter/clutter-rotate-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterRotateActionPrivate
 {
diff --git a/clutter/clutter/clutter-rotate-action.h b/clutter/clutter/clutter-rotate-action.h
index f366932aa..784148796 100644
--- a/clutter/clutter/clutter-rotate-action.h
+++ b/clutter/clutter/clutter-rotate-action.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-gesture-action.h>
+#include "clutter/clutter-gesture-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c
index 8ae38a505..d52c8a493 100644
--- a/clutter/clutter/clutter-script-parser.c
+++ b/clutter/clutter/clutter-script-parser.c
@@ -24,7 +24,7 @@
  *      Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -33,19 +33,19 @@
 #include <gmodule.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-actor.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
 
-#include "clutter-script.h"
-#include "clutter-script-private.h"
-#include "clutter-scriptable.h"
+#include "clutter/clutter-script.h"
+#include "clutter/clutter-script-private.h"
+#include "clutter/clutter-scriptable.h"
 
-#include "clutter-stage-manager.h"
+#include "clutter/clutter-stage-manager.h"
 
-#include "clutter-private.h"
+#include "clutter/clutter-private.h"
 
 static void clutter_script_parser_object_end (JsonParser *parser,
                                               JsonObject *object);
diff --git a/clutter/clutter/clutter-script-private.h b/clutter/clutter/clutter-script-private.h
index 6ccb785e0..dbe9916a3 100644
--- a/clutter/clutter/clutter-script-private.h
+++ b/clutter/clutter/clutter-script-private.h
@@ -28,9 +28,9 @@
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 
-#include "clutter-color.h"
-#include "clutter-types.h"
-#include "clutter-script.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-script.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
index 724f9b3a5..10afc2c1f 100644
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -116,7 +116,7 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -129,18 +129,18 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
-#include "clutter-actor.h"
-#include "clutter-stage.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-stage.h"
 
-#include "clutter-script.h"
-#include "clutter-script-private.h"
-#include "clutter-scriptable.h"
+#include "clutter/clutter-script.h"
+#include "clutter/clutter-script-private.h"
+#include "clutter/clutter-scriptable.h"
 
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-debug.h"
 
-#include "deprecated/clutter-container.h"
+#include "clutter/deprecated/clutter-container.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h
index dae6f21b4..bc0b6366c 100644
--- a/clutter/clutter/clutter-script.h
+++ b/clutter/clutter/clutter-script.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-scriptable.c b/clutter/clutter/clutter-scriptable.c
index cc6a48d19..fe6c7b310 100644
--- a/clutter/clutter/clutter-scriptable.c
+++ b/clutter/clutter/clutter-scriptable.c
@@ -35,18 +35,18 @@
  * [class@GObject.Object] properties, or allow custom properties.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 #include <stdlib.h>
 
 #include <glib.h>
 
-#include "clutter-scriptable.h"
-#include "clutter-script-private.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-script-private.h"
 
-#include "clutter-private.h"
-#include "clutter-debug.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-debug.h"
 
 typedef ClutterScriptableIface  ClutterScriptableInterface;
 
diff --git a/clutter/clutter/clutter-scriptable.h b/clutter/clutter/clutter-scriptable.h
index de7e885ee..2e0ad8b77 100644
--- a/clutter/clutter/clutter-scriptable.h
+++ b/clutter/clutter/clutter-scriptable.h
@@ -30,7 +30,8 @@
 
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
-#include <clutter/clutter-script.h>
+
+#include "clutter/clutter-script.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c
index da2449947..9c974eef3 100644
--- a/clutter/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter/clutter-scroll-actor.c
@@ -40,17 +40,17 @@
  * for an example of how to use #ClutterScrollActor..
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-scroll-actor.h"
+#include "clutter/clutter-scroll-actor.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-animatable.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
-#include "clutter-property-transition.h"
-#include "clutter-transition.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-property-transition.h"
+#include "clutter/clutter-transition.h"
 
 struct _ClutterScrollActorPrivate
 {
diff --git a/clutter/clutter/clutter-scroll-actor.h b/clutter/clutter/clutter-scroll-actor.h
index 6a913b8bd..2b43b5522 100644
--- a/clutter/clutter/clutter-scroll-actor.h
+++ b/clutter/clutter/clutter-scroll-actor.h
@@ -25,8 +25,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-actor.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-actor.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-seat.c b/clutter/clutter/clutter-seat.c
index ac6a9e0a0..6dbcba81c 100644
--- a/clutter/clutter/clutter-seat.c
+++ b/clutter/clutter/clutter-seat.c
@@ -21,17 +21,17 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-input-device-tool.h"
-#include "clutter-input-pointer-a11y-private.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-private.h"
-#include "clutter-seat.h"
-#include "clutter-seat-private.h"
-#include "clutter-settings-private.h"
-#include "clutter-virtual-input-device.h"
+#include "clutter/clutter-input-device-tool.h"
+#include "clutter/clutter-input-pointer-a11y-private.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-seat.h"
+#include "clutter/clutter-seat-private.h"
+#include "clutter/clutter-settings-private.h"
+#include "clutter/clutter-virtual-input-device.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-settings-private.h b/clutter/clutter/clutter-settings-private.h
index e99753068..ae2a8db6f 100644
--- a/clutter/clutter/clutter-settings-private.h
+++ b/clutter/clutter/clutter-settings-private.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <clutter/clutter-backend-private.h>
-#include <clutter/clutter-settings.h>
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c
index 130dd6bb4..8db59c9e0 100644
--- a/clutter/clutter/clutter-settings.c
+++ b/clutter/clutter/clutter-settings.c
@@ -15,9 +15,9 @@
  * for instance the default font name.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-settings.h"
+#include "clutter/clutter-settings.h"
 
 #ifdef HAVE_PANGO_FT2
 /* for pango_fc_font_map_cache_clear() */
@@ -25,10 +25,10 @@
 #include <pango/pangofc-fontmap.h>
 #endif /* HAVE_PANGO_FT2 */
 
-#include "clutter-debug.h"
-#include "clutter-settings-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-settings-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-private.h"
 
 #include <gdesktop-enums.h>
 #include <stdlib.h>
diff --git a/clutter/clutter/clutter-settings.h b/clutter/clutter/clutter-settings.h
index 5606f7bec..2b3a46fb4 100644
--- a/clutter/clutter/clutter-settings.h
+++ b/clutter/clutter/clutter-settings.h
@@ -4,7 +4,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index 1f178a291..32a276dd0 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -110,16 +110,16 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include "cogl/cogl.h"
 
-#include "clutter-shader-effect.h"
+#include "clutter/clutter-shader-effect.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
-#include "clutter-shader-types.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-shader-types.h"
 
 typedef struct _ShaderUniform
 {
diff --git a/clutter/clutter/clutter-shader-effect.h b/clutter/clutter/clutter-shader-effect.h
index 9a8799b6a..1ad7f4d6c 100644
--- a/clutter/clutter/clutter-shader-effect.h
+++ b/clutter/clutter/clutter-shader-effect.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-offscreen-effect.h>
+#include "clutter/clutter-offscreen-effect.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-shader-types.c b/clutter/clutter/clutter-shader-types.c
index c6bd4e303..6a217d094 100644
--- a/clutter/clutter/clutter-shader-types.c
+++ b/clutter/clutter/clutter-shader-types.c
@@ -24,13 +24,13 @@
  *
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#include "clutter-shader-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-shader-types.h"
+#include "clutter/clutter-private.h"
 
 static GTypeInfo shader_float_info = {
   0,
diff --git a/clutter/clutter/clutter-shader-types.h b/clutter/clutter/clutter-shader-types.h
index de03a50fb..cc2070b5b 100644
--- a/clutter/clutter/clutter-shader-types.h
+++ b/clutter/clutter/clutter-shader-types.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c
index cea614590..3c26e8573 100644
--- a/clutter/clutter/clutter-snap-constraint.c
+++ b/clutter/clutter/clutter-snap-constraint.c
@@ -33,17 +33,17 @@
  * An offset can be applied to the constraint, to provide spacing.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-snap-constraint.h"
+#include "clutter/clutter-snap-constraint.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-constraint.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-constraint.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
 
 #define CLUTTER_SNAP_CONSTRAINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_SNAP_CONSTRAINT, ClutterSnapConstraintClass))
 #define CLUTTER_IS_SNAP_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_SNAP_CONSTRAINT))
diff --git a/clutter/clutter/clutter-snap-constraint.h b/clutter/clutter/clutter-snap-constraint.h
index 355d20603..fa22be492 100644
--- a/clutter/clutter/clutter-snap-constraint.h
+++ b/clutter/clutter/clutter-snap-constraint.h
@@ -28,7 +28,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-constraint.h>
+#include "clutter/clutter-constraint.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-stage-manager-private.h b/clutter/clutter/clutter-stage-manager-private.h
index 2441f579e..6c428a920 100644
--- a/clutter/clutter/clutter-stage-manager-private.h
+++ b/clutter/clutter/clutter-stage-manager-private.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <clutter/clutter-stage-manager.h>
+#include "clutter/clutter-stage-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c
index 4f400a91d..138c6071f 100644
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -35,13 +35,13 @@
  * be emitted
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-stage-manager-private.h"
+#include "clutter/clutter-stage-manager-private.h"
 
-#include "clutter-marshal.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-stage-manager.h b/clutter/clutter/clutter-stage-manager.h
index 4614183bf..f0cfd213a 100644
--- a/clutter/clutter/clutter-stage-manager.h
+++ b/clutter/clutter/clutter-stage-manager.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h
index 584fdd3a7..ecc69996f 100644
--- a/clutter/clutter/clutter-stage-private.h
+++ b/clutter/clutter/clutter-stage-private.h
@@ -21,13 +21,13 @@
 
 #pragma once
 
-#include <clutter/clutter-grab.h>
-#include <clutter/clutter-stage-window.h>
-#include <clutter/clutter-stage.h>
-#include <clutter/clutter-input-device.h>
-#include <clutter/clutter-private.h>
+#include "clutter/clutter-grab.h"
+#include "clutter/clutter-stage-window.h"
+#include "clutter/clutter-stage.h"
+#include "clutter/clutter-input-device.h"
+#include "clutter/clutter-private.h"
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index 5b326f2bb..6fab9b87c 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include "clutter/clutter-stage-view.h"
 #include "clutter/clutter-stage-view-private.h"
diff --git a/clutter/clutter/clutter-stage-view.h b/clutter/clutter/clutter-stage-view.h
index 8c3c712ac..3e648e340 100644
--- a/clutter/clutter/clutter-stage-view.h
+++ b/clutter/clutter/clutter-stage-view.h
@@ -23,11 +23,11 @@
 
 #include <cairo.h>
 #include <glib-object.h>
-#include <cogl/cogl.h>
 
-#include "clutter-macros.h"
-#include "clutter-frame-clock.h"
-#include "clutter-types.h"
+#include "cogl/cogl.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-frame-clock.h"
+#include "clutter/clutter-types.h"
 
 #define CLUTTER_TYPE_STAGE_VIEW (clutter_stage_view_get_type ())
 CLUTTER_EXPORT
diff --git a/clutter/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c
index 8f802882f..fc826c475 100644
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -1,11 +1,11 @@
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib-object.h>
 
-#include "clutter-actor.h"
-#include "clutter-frame.h"
-#include "clutter-stage-window.h"
-#include "clutter-private.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-frame.h"
+#include "clutter/clutter-stage-window.h"
+#include "clutter/clutter-private.h"
 
 /**
  * ClutterStageWindow:
diff --git a/clutter/clutter/clutter-stage-window.h b/clutter/clutter/clutter-stage-window.h
index 6e2ce259a..db7315b07 100644
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-types.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-types.h"
 #include "clutter/clutter-stage-view.h"
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 0ab2361b6..382e74c5b 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -35,41 +35,41 @@
  * parent class corresponding function.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 #include <cairo-gobject.h>
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
-#include "clutter-stage.h"
-#include "deprecated/clutter-container.h"
+#include "clutter/clutter-stage.h"
+#include "clutter/deprecated/clutter-container.h"
 
-#include "clutter-action-private.h"
-#include "clutter-actor-private.h"
-#include "clutter-backend-private.h"
-#include "clutter-cairo.h"
-#include "clutter-container.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-event-private.h"
-#include "clutter-frame-clock.h"
-#include "clutter-frame.h"
-#include "clutter-grab.h"
-#include "clutter-input-device-private.h"
-#include "clutter-input-only-actor.h"
-#include "clutter-main.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-paint-context-private.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-pick-context-private.h"
-#include "clutter-private.h"
-#include "clutter-seat-private.h"
-#include "clutter-stage-manager-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-view-private.h"
-#include "clutter-private.h"
+#include "clutter/clutter-action-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-cairo.h"
+#include "clutter/clutter-container.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-event-private.h"
+#include "clutter/clutter-frame-clock.h"
+#include "clutter/clutter-frame.h"
+#include "clutter/clutter-grab.h"
+#include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-only-actor.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-paint-context-private.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-pick-context-private.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-seat-private.h"
+#include "clutter/clutter-stage-manager-private.h"
+#include "clutter/clutter-stage-private.h"
+#include "clutter/clutter-stage-view-private.h"
+#include "clutter/clutter-private.h"
 
 #include "cogl/cogl.h"
 
diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h
index 9ba7efd86..3846c3486 100644
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -27,10 +27,10 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-grab.h>
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-stage-view.h>
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-grab.h"
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-stage-view.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c
index 3050e4b99..0085fac1a 100644
--- a/clutter/clutter/clutter-swipe-action.c
+++ b/clutter/clutter/clutter-swipe-action.c
@@ -35,14 +35,14 @@
  * the logic for recognizing swipe gestures.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-swipe-action.h"
+#include "clutter/clutter-swipe-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 struct _ClutterSwipeActionPrivate
 {
diff --git a/clutter/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h
index 89c284e71..b85df8026 100644
--- a/clutter/clutter/clutter-swipe-action.h
+++ b/clutter/clutter/clutter-swipe-action.h
@@ -32,7 +32,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-gesture-action.h>
+#include "clutter/clutter-gesture-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-tap-action.c b/clutter/clutter/clutter-tap-action.c
index 4bbe97760..05e574c22 100644
--- a/clutter/clutter/clutter-tap-action.c
+++ b/clutter/clutter/clutter-tap-action.c
@@ -51,14 +51,14 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-tap-action.h"
+#include "clutter/clutter-tap-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-tap-action.h b/clutter/clutter/clutter-tap-action.h
index d1e4afd55..702060e99 100644
--- a/clutter/clutter/clutter-tap-action.h
+++ b/clutter/clutter/clutter-tap-action.h
@@ -37,7 +37,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-gesture-action.h>
+#include "clutter/clutter-gesture-action.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c
index 4c0231d96..f3ca58fa5 100644
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@@ -19,11 +19,11 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-text-buffer.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
+#include "clutter/clutter-text-buffer.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
 
 #include <string.h>
 
diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h
index 190833224..98949c740 100644
--- a/clutter/clutter/clutter-text-buffer.h
+++ b/clutter/clutter/clutter-text-buffer.h
@@ -25,7 +25,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
index 4c8c50587..34bceb05b 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -37,30 +37,30 @@
  * [method@Text.set_selectable].
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <string.h>
 #include <math.h>
 
-#include "clutter-text.h"
+#include "clutter/clutter-text.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-animatable.h"
-#include "clutter-backend-private.h"
-#include "clutter-binding-pool.h"
-#include "clutter-color.h"
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-keysyms.h"
-#include "clutter-main.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"    /* includes <cogl-pango/cogl-pango.h> */
-#include "clutter-property-transition.h"
-#include "clutter-text-buffer.h"
-#include "clutter-units.h"
-#include "clutter-paint-volume-private.h"
-#include "clutter-scriptable.h"
-#include "clutter-input-focus.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-binding-pool.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-keysyms.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"    /* includes <cogl-pango/cogl-pango.h> */
+#include "clutter/clutter-property-transition.h"
+#include "clutter/clutter-text-buffer.h"
+#include "clutter/clutter-units.h"
+#include "clutter/clutter-paint-volume-private.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-input-focus.h"
 
 /* cursor width in pixels */
 #define DEFAULT_CURSOR_SIZE     2
diff --git a/clutter/clutter/clutter-text.h b/clutter/clutter/clutter-text.h
index c379e3ea4..b041b02af 100644
--- a/clutter/clutter/clutter-text.h
+++ b/clutter/clutter/clutter-text.h
@@ -28,8 +28,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-text-buffer.h>
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-text-buffer.h"
 #include <pango/pango.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter/clutter-texture-content.c b/clutter/clutter/clutter-texture-content.c
index 79f0c308d..93fe6fdf6 100644
--- a/clutter/clutter/clutter-texture-content.c
+++ b/clutter/clutter/clutter-texture-content.c
@@ -24,13 +24,13 @@
  *   Robert Mader <robert.mader@posteo.de>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-texture-content.h"
+#include "clutter/clutter-texture-content.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-content-private.h"
-#include "clutter-paint-node.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-content-private.h"
+#include "clutter/clutter-paint-node.h"
 
 struct _ClutterTextureContent
 {
diff --git a/clutter/clutter/clutter-texture-content.h b/clutter/clutter/clutter-texture-content.h
index 49108a6ce..a790613dd 100644
--- a/clutter/clutter/clutter-texture-content.h
+++ b/clutter/clutter/clutter-texture-content.h
@@ -30,8 +30,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <cogl/cogl.h>
-#include <clutter/clutter-types.h>
+#include "cogl/cogl.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index c01f2ce0a..7a293250c 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -93,22 +93,22 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-timeline.h"
-#include "deprecated/clutter-timeline.h"
+#include "clutter/clutter-timeline.h"
+#include "clutter/deprecated/clutter-timeline.h"
 
-#include "clutter-actor-private.h"
-#include "clutter-debug.h"
-#include "clutter-easing.h"
-#include "clutter-enum-types.h"
-#include "clutter-frame-clock.h"
-#include "clutter-main.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-private.h"
-#include "clutter-scriptable.h"
-#include "clutter-timeline-private.h"
+#include "clutter/clutter-actor-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-easing.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-frame-clock.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-mutter.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-timeline-private.h"
 
 struct _ClutterTimelinePrivate
 {
diff --git a/clutter/clutter/clutter-timeline.h b/clutter/clutter/clutter-timeline.h
index 1a68b797e..33e863f2f 100644
--- a/clutter/clutter/clutter-timeline.h
+++ b/clutter/clutter/clutter-timeline.h
@@ -27,7 +27,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c
index b3e197315..6ce27a317 100644
--- a/clutter/clutter/clutter-transition-group.c
+++ b/clutter/clutter/clutter-transition-group.c
@@ -35,13 +35,13 @@
  * 5 seconds of the transition will be played.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-transition-group.h"
+#include "clutter/clutter-transition-group.h"
 
-#include "clutter-debug.h"
-#include "clutter-private.h"
-#include "clutter-timeline-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-timeline-private.h"
 
 struct _ClutterTransitionGroupPrivate
 {
diff --git a/clutter/clutter/clutter-transition-group.h b/clutter/clutter/clutter-transition-group.h
index 302003e36..ebe30c1cd 100644
--- a/clutter/clutter/clutter-transition-group.h
+++ b/clutter/clutter/clutter-transition-group.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-transition.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-transition.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c
index f454b9d48..c31dcd0dd 100644
--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@@ -30,15 +30,15 @@
  * computes the interpolation between two values, stored by a [class@Interval].
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
-#include "clutter-transition.h"
+#include "clutter/clutter-transition.h"
 
-#include "clutter-animatable.h"
-#include "clutter-debug.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-timeline.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-timeline.h"
 
 #include <gobject/gvaluecollector.h>
 
diff --git a/clutter/clutter/clutter-transition.h b/clutter/clutter/clutter-transition.h
index dac3ba9bf..0aefc7a70 100644
--- a/clutter/clutter/clutter-transition.h
+++ b/clutter/clutter/clutter-transition.h
@@ -27,8 +27,8 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-timeline.h>
+#include "clutter/clutter-types.h"
+#include "clutter/clutter-timeline.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-types.h b/clutter/clutter/clutter-types.h
index 1459fbbc7..7e6e0f541 100644
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -28,9 +28,10 @@
 #endif
 
 #include <cairo.h>
-#include <cogl/cogl.h>
-#include <clutter/clutter-macros.h>
-#include <clutter/clutter-enums.h>
+
+#include "cogl/cogl.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-enums.h"
 
 #include <graphene-gobject.h>
 
diff --git a/clutter/clutter/clutter-units.c b/clutter/clutter/clutter-units.c
index ccec0c190..36f79b6d5 100644
--- a/clutter/clutter/clutter-units.c
+++ b/clutter/clutter/clutter-units.c
@@ -59,17 +59,17 @@
  * and using [method@GObject.Value.transform].
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <stdlib.h>
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#include "clutter-backend-private.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-units.h"
+#include "clutter/clutter-backend-private.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-units.h"
 
 #define DPI_FALLBACK    (96.0)
 
diff --git a/clutter/clutter/clutter-units.h b/clutter/clutter/clutter-units.h
index 09586f81b..a34f65c02 100644
--- a/clutter/clutter/clutter-units.h
+++ b/clutter/clutter/clutter-units.h
@@ -32,7 +32,7 @@
 
 #include <glib-object.h>
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-util.c b/clutter/clutter/clutter-util.c
index 426d8465b..8b7f194c6 100644
--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@@ -30,15 +30,15 @@
  * Various miscellaneous utilility functions.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <fribidi.h>
 #include <math.h>
 
-#include "clutter-debug.h"
-#include "clutter-main.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-private.h"
 
 /* Help macros to scale from OpenGL <-1,1> coordinates system to
  * window coordinates ranging [0,window-size]
diff --git a/clutter/clutter/clutter-virtual-input-device.c b/clutter/clutter/clutter-virtual-input-device.c
index 605b2ef59..99c9b7b73 100644
--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@@ -21,15 +21,15 @@
  * Author: Jonas Ådahl <jadahl@gmail.com>
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <glib-object.h>
 
-#include "clutter-virtual-input-device.h"
+#include "clutter/clutter-virtual-input-device.h"
 
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
-#include "clutter-seat.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-seat.h"
 
 enum
 {
diff --git a/clutter/clutter/clutter-virtual-input-device.h b/clutter/clutter/clutter-virtual-input-device.h
index 93f5cd01d..2799ade17 100644
--- a/clutter/clutter/clutter-virtual-input-device.h
+++ b/clutter/clutter/clutter-virtual-input-device.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <stdint.h>
 
-#include "clutter-seat.h"
+#include "clutter/clutter-seat.h"
 
 #define CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE (clutter_virtual_input_device_get_type ())
 
diff --git a/clutter/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c
index 944da0a7d..f8bc19fba 100644
--- a/clutter/clutter/clutter-zoom-action.c
+++ b/clutter/clutter/clutter-zoom-action.c
@@ -44,17 +44,17 @@
  * distance between two touch points.
  */
 
-#include "clutter-build-config.h"
+#include "clutter/clutter-build-config.h"
 
 #include <math.h>
 
-#include "clutter-zoom-action.h"
+#include "clutter/clutter-zoom-action.h"
 
-#include "clutter-debug.h"
-#include "clutter-enum-types.h"
-#include "clutter-marshal.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
+#include "clutter/clutter-debug.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-marshal.h"
+#include "clutter/clutter-private.h"
+#include "clutter/clutter-stage-private.h"
 
 typedef struct
 {
diff --git a/clutter/clutter/clutter-zoom-action.h b/clutter/clutter/clutter-zoom-action.h
index 7fbc16f57..b3b81ad42 100644
--- a/clutter/clutter/clutter-zoom-action.h
+++ b/clutter/clutter/clutter-zoom-action.h
@@ -28,9 +28,9 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-event.h>
-#include <clutter/clutter-gesture-action.h>
-#include <clutter/clutter-types.h>
+#include "clutter/clutter-event.h"
+#include "clutter/clutter-gesture-action.h"
+#include "clutter/clutter-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 035f82be6..0d35cee00 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -27,91 +27,91 @@
 
 #define __CLUTTER_H_INSIDE__
 
-#include "clutter-types.h"
+#include "clutter/clutter-types.h"
 
-#include "clutter-action.h"
-#include "clutter-actor.h"
-#include "clutter-actor-meta.h"
-#include "clutter-align-constraint.h"
-#include "clutter-animatable.h"
-#include "clutter-backend.h"
-#include "clutter-bind-constraint.h"
-#include "clutter-binding-pool.h"
-#include "clutter-bin-layout.h"
-#include "clutter-blur-effect.h"
-#include "clutter-box-layout.h"
-#include "clutter-brightness-contrast-effect.h"
-#include "clutter-cairo.h"
-#include "clutter-canvas.h"
-#include "clutter-child-meta.h"
-#include "clutter-click-action.h"
-#include "clutter-clone.h"
-#include "clutter-color.h"
-#include "clutter-color-state.h"
-#include "clutter-color-static.h"
-#include "clutter-colorize-effect.h"
-#include "clutter-constraint.h"
-#include "clutter-container.h"
-#include "clutter-content.h"
-#include "clutter-deform-effect.h"
-#include "clutter-desaturate-effect.h"
-#include "clutter-effect.h"
-#include "clutter-enums.h"
-#include "clutter-enum-types.h"
-#include "clutter-event.h"
-#include "clutter-fixed-layout.h"
-#include "clutter-flow-layout.h"
-#include "clutter-frame-clock.h"
-#include "clutter-frame.h"
-#include "clutter-gesture-action.h"
-#include "clutter-grab.h"
-#include "clutter-grid-layout.h"
-#include "clutter-image.h"
-#include "clutter-input-device.h"
-#include "clutter-input-device-tool.h"
-#include "clutter-input-method.h"
-#include "clutter-input-focus.h"
-#include "clutter-interval.h"
-#include "clutter-keyframe-transition.h"
-#include "clutter-keymap.h"
-#include "clutter-keysyms.h"
-#include "clutter-keyval.h"
-#include "clutter-layout-manager.h"
-#include "clutter-layout-meta.h"
-#include "clutter-macros.h"
-#include "clutter-main.h"
-#include "clutter-offscreen-effect.h"
-#include "clutter-page-turn-effect.h"
-#include "clutter-paint-nodes.h"
-#include "clutter-paint-node.h"
-#include "clutter-pan-action.h"
-#include "clutter-path-constraint.h"
-#include "clutter-path.h"
-#include "clutter-property-transition.h"
-#include "clutter-rotate-action.h"
-#include "clutter-scriptable.h"
-#include "clutter-script.h"
-#include "clutter-scroll-actor.h"
-#include "clutter-settings.h"
-#include "clutter-shader-effect.h"
-#include "clutter-shader-types.h"
-#include "clutter-swipe-action.h"
-#include "clutter-snap-constraint.h"
-#include "clutter-stage.h"
-#include "clutter-stage-manager.h"
-#include "clutter-stage-view.h"
-#include "clutter-tap-action.h"
-#include "clutter-text.h"
-#include "clutter-texture-content.h"
-#include "clutter-timeline.h"
-#include "clutter-transition-group.h"
-#include "clutter-transition.h"
-#include "clutter-units.h"
-#include "clutter-virtual-input-device.h"
-#include "clutter-zoom-action.h"
+#include "clutter/clutter-action.h"
+#include "clutter/clutter-actor.h"
+#include "clutter/clutter-actor-meta.h"
+#include "clutter/clutter-align-constraint.h"
+#include "clutter/clutter-animatable.h"
+#include "clutter/clutter-backend.h"
+#include "clutter/clutter-bind-constraint.h"
+#include "clutter/clutter-binding-pool.h"
+#include "clutter/clutter-bin-layout.h"
+#include "clutter/clutter-blur-effect.h"
+#include "clutter/clutter-box-layout.h"
+#include "clutter/clutter-brightness-contrast-effect.h"
+#include "clutter/clutter-cairo.h"
+#include "clutter/clutter-canvas.h"
+#include "clutter/clutter-child-meta.h"
+#include "clutter/clutter-click-action.h"
+#include "clutter/clutter-clone.h"
+#include "clutter/clutter-color.h"
+#include "clutter/clutter-color-state.h"
+#include "clutter/clutter-color-static.h"
+#include "clutter/clutter-colorize-effect.h"
+#include "clutter/clutter-constraint.h"
+#include "clutter/clutter-container.h"
+#include "clutter/clutter-content.h"
+#include "clutter/clutter-deform-effect.h"
+#include "clutter/clutter-desaturate-effect.h"
+#include "clutter/clutter-effect.h"
+#include "clutter/clutter-enums.h"
+#include "clutter/clutter-enum-types.h"
+#include "clutter/clutter-event.h"
+#include "clutter/clutter-fixed-layout.h"
+#include "clutter/clutter-flow-layout.h"
+#include "clutter/clutter-frame-clock.h"
+#include "clutter/clutter-frame.h"
+#include "clutter/clutter-gesture-action.h"
+#include "clutter/clutter-grab.h"
+#include "clutter/clutter-grid-layout.h"
+#include "clutter/clutter-image.h"
+#include "clutter/clutter-input-device.h"
+#include "clutter/clutter-input-device-tool.h"
+#include "clutter/clutter-input-method.h"
+#include "clutter/clutter-input-focus.h"
+#include "clutter/clutter-interval.h"
+#include "clutter/clutter-keyframe-transition.h"
+#include "clutter/clutter-keymap.h"
+#include "clutter/clutter-keysyms.h"
+#include "clutter/clutter-keyval.h"
+#include "clutter/clutter-layout-manager.h"
+#include "clutter/clutter-layout-meta.h"
+#include "clutter/clutter-macros.h"
+#include "clutter/clutter-main.h"
+#include "clutter/clutter-offscreen-effect.h"
+#include "clutter/clutter-page-turn-effect.h"
+#include "clutter/clutter-paint-nodes.h"
+#include "clutter/clutter-paint-node.h"
+#include "clutter/clutter-pan-action.h"
+#include "clutter/clutter-path-constraint.h"
+#include "clutter/clutter-path.h"
+#include "clutter/clutter-property-transition.h"
+#include "clutter/clutter-rotate-action.h"
+#include "clutter/clutter-scriptable.h"
+#include "clutter/clutter-script.h"
+#include "clutter/clutter-scroll-actor.h"
+#include "clutter/clutter-settings.h"
+#include "clutter/clutter-shader-effect.h"
+#include "clutter/clutter-shader-types.h"
+#include "clutter/clutter-swipe-action.h"
+#include "clutter/clutter-snap-constraint.h"
+#include "clutter/clutter-stage.h"
+#include "clutter/clutter-stage-manager.h"
+#include "clutter/clutter-stage-view.h"
+#include "clutter/clutter-tap-action.h"
+#include "clutter/clutter-text.h"
+#include "clutter/clutter-texture-content.h"
+#include "clutter/clutter-timeline.h"
+#include "clutter/clutter-transition-group.h"
+#include "clutter/clutter-transition.h"
+#include "clutter/clutter-units.h"
+#include "clutter/clutter-virtual-input-device.h"
+#include "clutter/clutter-zoom-action.h"
 
-#include "clutter-deprecated.h"
+#include "clutter/clutter-deprecated.h"
 
-#include "clutter-autocleanups.h"
+#include "clutter/clutter-autocleanups.h"
 
 #undef __CLUTTER_H_INSIDE__
diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h
index c24195a7b..56c92e54c 100644
--- a/clutter/clutter/deprecated/clutter-container.h
+++ b/clutter/clutter/deprecated/clutter-container.h
@@ -29,7 +29,7 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-container.h>
+#include "clutter/clutter-container.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/deprecated/clutter-timeline.h b/clutter/clutter/deprecated/clutter-timeline.h
index 808447064..2a5d0450c 100644
--- a/clutter/clutter/deprecated/clutter-timeline.h
+++ b/clutter/clutter/deprecated/clutter-timeline.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <clutter/clutter-timeline.h>
+#include "clutter/clutter-timeline.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c
index 3f7dcf944..9f694d691 100644
--- a/cogl/cogl-pango/cogl-pango-display-list.c
+++ b/cogl/cogl-pango/cogl-pango-display-list.c
@@ -31,8 +31,8 @@
 #include <glib.h>
 #include <string.h>
 
-#include "cogl-pango-display-list.h"
-#include "cogl-pango-pipeline-cache.h"
+#include "cogl-pango/cogl-pango-display-list.h"
+#include "cogl-pango/cogl-pango-pipeline-cache.h"
 #include "cogl/cogl-context-private.h"
 
 typedef enum
diff --git a/cogl/cogl-pango/cogl-pango-display-list.h b/cogl/cogl-pango/cogl-pango-display-list.h
index 91e4a21c2..c186124a9 100644
--- a/cogl/cogl-pango/cogl-pango-display-list.h
+++ b/cogl/cogl-pango/cogl-pango-display-list.h
@@ -29,7 +29,8 @@
 #pragma once
 
 #include <glib.h>
-#include "cogl-pango-pipeline-cache.h"
+
+#include "cogl-pango/cogl-pango-pipeline-cache.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c
index d979244db..f7b518446 100644
--- a/cogl/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl/cogl-pango/cogl-pango-fontmap.c
@@ -38,9 +38,9 @@
 #include <pango/pangocairo.h>
 #include <pango/pango-renderer.h>
 
-#include "cogl-pango.h"
-#include "cogl-pango-private.h"
-#include "cogl-util.h"
+#include "cogl-pango/cogl-pango.h"
+#include "cogl-pango/cogl-pango-private.h"
+#include "cogl/cogl-util.h"
 #include "cogl/cogl-context-private.h"
 
 static GQuark cogl_pango_font_map_get_priv_key (void) G_GNUC_CONST;
diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c
index 47550491c..3a6a0f24b 100644
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c
@@ -30,8 +30,8 @@
 
 #include <glib.h>
 
-#include "cogl-pango-glyph-cache.h"
-#include "cogl-pango-private.h"
+#include "cogl-pango/cogl-pango-glyph-cache.h"
+#include "cogl-pango/cogl-pango-private.h"
 #include "cogl/cogl-atlas.h"
 #include "cogl/cogl-atlas-texture-private.h"
 
diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
index 566a1b079..eb31e4c01 100644
--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
@@ -34,8 +34,8 @@
 #include "cogl-config.h"
 
 #include <glib.h>
-#include "cogl-pango-pipeline-cache.h"
 
+#include "cogl-pango/cogl-pango-pipeline-cache.h"
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-texture-private.h"
 
diff --git a/cogl/cogl-pango/cogl-pango-private.h b/cogl/cogl-pango/cogl-pango-private.h
index c9ec8a52a..a58417a64 100644
--- a/cogl/cogl-pango/cogl-pango-private.h
+++ b/cogl/cogl-pango/cogl-pango-private.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "cogl-pango.h"
+#include "cogl-pango/cogl-pango.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
index 639992883..2e175d6a4 100644
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -55,9 +55,9 @@
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-texture-private.h"
-#include "cogl-pango-private.h"
-#include "cogl-pango-glyph-cache.h"
-#include "cogl-pango-display-list.h"
+#include "cogl-pango/cogl-pango-private.h"
+#include "cogl-pango/cogl-pango-glyph-cache.h"
+#include "cogl-pango/cogl-pango-display-list.h"
 
 enum
 {
diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h
index b50732a4a..78b8816ac 100644
--- a/cogl/cogl-pango/cogl-pango.h
+++ b/cogl/cogl-pango/cogl-pango.h
@@ -47,7 +47,7 @@
  * or specific internal cogl headers here...
  */
 #ifndef COGL_COMPILATION
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 #else
 #include "cogl/cogl-context.h"
 #include "cogl/cogl-macros.h"
diff --git a/cogl/cogl/cogl-atlas-texture-private.h b/cogl/cogl/cogl-atlas-texture-private.h
index 56b521cc6..141224203 100644
--- a/cogl/cogl/cogl-atlas-texture-private.h
+++ b/cogl/cogl/cogl-atlas-texture-private.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-rectangle-map.h"
-#include "cogl-atlas.h"
-#include "cogl-atlas-texture.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-rectangle-map.h"
+#include "cogl/cogl-atlas.h"
+#include "cogl/cogl-atlas-texture.h"
 
 struct _CoglAtlasTexture
 {
diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c
index b4b1889a2..4ecf2abf8 100644
--- a/cogl/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl/cogl-atlas-texture.c
@@ -33,22 +33,22 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-util.h"
-#include "cogl-texture-private.h"
-#include "cogl-atlas-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-sub-texture-private.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-rectangle-map.h"
-#include "cogl-journal-private.h"
-#include "cogl-atlas.h"
-#include "cogl1-context.h"
-#include "cogl-sub-texture.h"
-#include "cogl-gtype-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-atlas-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-sub-texture-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-rectangle-map.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-atlas.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-sub-texture.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
 
 #include <stdlib.h>
 
diff --git a/cogl/cogl/cogl-atlas-texture.h b/cogl/cogl/cogl-atlas-texture.h
index 082fd6e33..e79665980 100644
--- a/cogl/cogl/cogl-atlas-texture.h
+++ b/cogl/cogl/cogl-atlas-texture.h
@@ -34,7 +34,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-context.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
index 3333f2f94..51eddfc19 100644
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@@ -31,17 +31,17 @@
 
 #include "cogl-config.h"
 
-#include "cogl-atlas.h"
-#include "cogl-rectangle-map.h"
-#include "cogl-context-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-texture-2d-sliced.h"
-#include "cogl-texture-driver.h"
-#include "cogl-debug.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-blit.h"
-#include "cogl-private.h"
+#include "cogl/cogl-atlas.h"
+#include "cogl/cogl-rectangle-map.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-texture-2d-sliced.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-blit.h"
+#include "cogl/cogl-private.h"
 
 #include <stdlib.h>
 
diff --git a/cogl/cogl/cogl-atlas.h b/cogl/cogl/cogl-atlas.h
index f175ec874..7b15453a2 100644
--- a/cogl/cogl/cogl-atlas.h
+++ b/cogl/cogl/cogl-atlas.h
@@ -28,9 +28,9 @@
 
 #pragma once
 
-#include "cogl-rectangle-map.h"
-#include "cogl-object-private.h"
-#include "cogl-texture.h"
+#include "cogl/cogl-rectangle-map.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-texture.h"
 
 typedef void
 (* CoglAtlasUpdatePositionCallback) (void *user_data,
diff --git a/cogl/cogl/cogl-attribute-buffer-private.h b/cogl/cogl/cogl-attribute-buffer-private.h
index 85aead85b..d8e5cb49d 100644
--- a/cogl/cogl/cogl-attribute-buffer-private.h
+++ b/cogl/cogl/cogl-attribute-buffer-private.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include "cogl-buffer-private.h"
+#include "cogl/cogl-buffer-private.h"
 
 struct _CoglAttributeBuffer
 {
diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c
index 072fcfd32..4df92d8dd 100644
--- a/cogl/cogl/cogl-attribute-buffer.c
+++ b/cogl/cogl/cogl-attribute-buffer.c
@@ -33,11 +33,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-object-private.h"
-#include "cogl-attribute-buffer.h"
-#include "cogl-attribute-buffer-private.h"
-#include "cogl-context-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-attribute-buffer.h"
+#include "cogl/cogl-attribute-buffer-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void _cogl_attribute_buffer_free (CoglAttributeBuffer *array);
 
diff --git a/cogl/cogl/cogl-attribute-buffer.h b/cogl/cogl/cogl-attribute-buffer.h
index 1c2222647..00da82ef8 100644
--- a/cogl/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl/cogl-attribute-buffer.h
@@ -42,7 +42,7 @@
  */
 typedef struct _CoglAttributeBuffer CoglAttributeBuffer;
 
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-context.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-attribute-private.h b/cogl/cogl/cogl-attribute-private.h
index 316255511..be74246f4 100644
--- a/cogl/cogl/cogl-attribute-private.h
+++ b/cogl/cogl/cogl-attribute-private.h
@@ -33,11 +33,11 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-attribute.h"
-#include "cogl-framebuffer.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-boxed-value.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-boxed-value.h"
 
 typedef enum
 {
diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
index 3ccd7b9dd..363c6ff19 100644
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -33,19 +33,19 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-attribute.h"
-#include "cogl-attribute-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-indices-private.h"
-#include "cogl-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-indices-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/cogl/cogl/cogl-attribute.h b/cogl/cogl/cogl-attribute.h
index 7580416ef..1966681c7 100644
--- a/cogl/cogl/cogl-attribute.h
+++ b/cogl/cogl/cogl-attribute.h
@@ -42,8 +42,8 @@
  */
 typedef struct _CoglAttribute CoglAttribute;
 
-#include <cogl/cogl-attribute-buffer.h>
-#include <cogl/cogl-indices.h>
+#include "cogl/cogl-attribute-buffer.h"
+#include "cogl/cogl-indices.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c
index 108cb6677..06e12b497 100644
--- a/cogl/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl/cogl-bitmap-conversion.c
@@ -30,10 +30,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-private.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-context-private.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture-private.h"
 
 #include <string.h>
 
@@ -45,7 +45,7 @@
    loop for the conversion will be really simple */
 #define UNPACK_BYTE(b) (b)
 #define PACK_BYTE(b) (b)
-#include "cogl-bitmap-packing.h"
+#include "cogl/cogl-bitmap-packing.h"
 #undef PACK_BYTE
 #undef UNPACK_BYTE
 #undef component_type
@@ -55,7 +55,7 @@
 #define component_size 16
 #define UNPACK_BYTE(b) (((b) * 65535 + 127) / 255)
 #define PACK_BYTE(b) (((b) * 255 + 32767) / 65535)
-#include "cogl-bitmap-packing.h"
+#include "cogl/cogl-bitmap-packing.h"
 #undef PACK_BYTE
 #undef UNPACK_BYTE
 #undef component_type
diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c
index 8a32e6eff..19fd8d179 100644
--- a/cogl/cogl/cogl-bitmap-pixbuf.c
+++ b/cogl/cogl/cogl-bitmap-pixbuf.c
@@ -30,10 +30,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-context-private.h"
-#include "cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-private.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-bitmap-private.h b/cogl/cogl/cogl-bitmap-private.h
index 198642f1f..238a78aa8 100644
--- a/cogl/cogl/cogl-bitmap-private.h
+++ b/cogl/cogl/cogl-bitmap-private.h
@@ -32,9 +32,9 @@
 
 #include <glib.h>
 
-#include "cogl-object-private.h"
-#include "cogl-buffer.h"
-#include "cogl-bitmap.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-buffer.h"
+#include "cogl/cogl-bitmap.h"
 
 struct _CoglBitmap
 {
diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c
index e44b1f955..2b988cba9 100644
--- a/cogl/cogl/cogl-bitmap.c
+++ b/cogl/cogl/cogl-bitmap.c
@@ -30,14 +30,14 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-debug.h"
-#include "cogl-private.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-buffer-private.h"
-#include "cogl-pixel-buffer.h"
-#include "cogl-context-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-buffer-private.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h
index f60c37e91..134ac9916 100644
--- a/cogl/cogl/cogl-bitmap.h
+++ b/cogl/cogl/cogl-bitmap.h
@@ -38,11 +38,11 @@
  * dependencies between some headers */
 typedef struct _CoglBitmap CoglBitmap;
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-buffer.h>
-#include <cogl/cogl-context.h>
-#include <cogl/cogl-pixel-buffer.h>
-#include <cogl/cogl-pixel-format.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-buffer.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-pixel-format.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c
index 0c40ccf07..4b547413e 100644
--- a/cogl/cogl/cogl-bitmask.c
+++ b/cogl/cogl/cogl-bitmask.c
@@ -36,9 +36,9 @@
 #include <glib.h>
 #include <string.h>
 
-#include "cogl-bitmask.h"
-#include "cogl-util.h"
-#include "cogl-flags.h"
+#include "cogl/cogl-bitmask.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-flags.h"
 
 /* This code assumes that we can cast an unsigned long to a pointer
    and back without losing any data */
diff --git a/cogl/cogl/cogl-bitmask.h b/cogl/cogl/cogl-bitmask.h
index aa09bafc9..a73e68e4d 100644
--- a/cogl/cogl/cogl-bitmask.h
+++ b/cogl/cogl/cogl-bitmask.h
@@ -32,7 +32,8 @@
 #pragma once
 
 #include <glib.h>
-#include "cogl-util.h"
+
+#include "cogl/cogl-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
index ba8eb8e96..2ad6f08ea 100644
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@@ -38,9 +38,9 @@
 
 #include <glib.h>
 
-#include "cogl-context-private.h"
-#include "cogl-debug.h"
-#include "cogl-blend-string.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-blend-string.h"
 
 typedef enum _ParserState
 {
diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c
index 57922f736..f1b136cfa 100644
--- a/cogl/cogl/cogl-blit.c
+++ b/cogl/cogl/cogl-blit.c
@@ -34,14 +34,14 @@
 
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-blit.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-private.h"
-#include "cogl1-context.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-blit.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl1-context.h"
 
 static const CoglBlitMode *_cogl_blit_default_mode = NULL;
 
diff --git a/cogl/cogl/cogl-blit.h b/cogl/cogl/cogl-blit.h
index eb4609436..8a0edfd09 100644
--- a/cogl/cogl/cogl-blit.h
+++ b/cogl/cogl/cogl-blit.h
@@ -29,9 +29,10 @@
 #pragma once
 
 #include <glib.h>
-#include "cogl-object-private.h"
-#include "cogl-texture.h"
-#include "cogl-framebuffer.h"
+
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-framebuffer.h"
 
 /* This structures and functions are used when a series of blits needs
    to be performed between two textures. In this case there are
diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c
index ef7099775..5736413a6 100644
--- a/cogl/cogl/cogl-boxed-value.c
+++ b/cogl/cogl/cogl-boxed-value.c
@@ -32,8 +32,8 @@
 
 #include <string.h>
 
-#include "cogl-boxed-value.h"
-#include "cogl-context-private.h"
+#include "cogl/cogl-boxed-value.h"
+#include "cogl/cogl-context-private.h"
 
 gboolean
 _cogl_boxed_value_equal (const CoglBoxedValue *bva,
diff --git a/cogl/cogl/cogl-boxed-value.h b/cogl/cogl/cogl-boxed-value.h
index 2221972b9..297bffde1 100644
--- a/cogl/cogl/cogl-boxed-value.h
+++ b/cogl/cogl/cogl-boxed-value.h
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include "cogl-context.h"
+#include "cogl/cogl-context.h"
 
 typedef enum
 {
diff --git a/cogl/cogl/cogl-buffer-private.h b/cogl/cogl/cogl-buffer-private.h
index c641f2e90..f9ba843c0 100644
--- a/cogl/cogl/cogl-buffer-private.h
+++ b/cogl/cogl/cogl-buffer-private.h
@@ -36,10 +36,10 @@
 
 #include <glib.h>
 
-#include "cogl-object-private.h"
-#include "cogl-buffer.h"
-#include "cogl-context.h"
-#include "cogl-gl-header.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-buffer.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-gl-header.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c
index 592605cce..1e4140bb5 100644
--- a/cogl/cogl/cogl-buffer.c
+++ b/cogl/cogl/cogl-buffer.c
@@ -43,10 +43,10 @@
 #include <string.h>
 #include <glib.h>
 
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-pixel-buffer-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pixel-buffer-private.h"
 
 /* XXX:
  * The CoglObject macros don't support any form of inheritance, so for
diff --git a/cogl/cogl/cogl-buffer.h b/cogl/cogl/cogl-buffer.h
index 02de7e896..aa2c6ac41 100644
--- a/cogl/cogl/cogl-buffer.h
+++ b/cogl/cogl/cogl-buffer.h
@@ -38,7 +38,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
index 74f031bea..a0023c66c 100644
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@@ -35,18 +35,18 @@
 
 #include <glib.h>
 
-#include "cogl-clip-stack.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-util.h"
-#include "cogl-primitives-private.h"
-#include "cogl-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-primitive-private.h"
-#include "cogl1-context.h"
-#include "cogl-offscreen.h"
-#include "cogl-matrix-stack.h"
+#include "cogl/cogl-clip-stack.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-primitives-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-primitive-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/cogl-matrix-stack.h"
 
 static void *
 _cogl_clip_stack_push_entry (CoglClipStack *clip_stack,
diff --git a/cogl/cogl/cogl-clip-stack.h b/cogl/cogl/cogl-clip-stack.h
index b06e13ec1..66b880b71 100644
--- a/cogl/cogl/cogl-clip-stack.h
+++ b/cogl/cogl/cogl-clip-stack.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-primitive.h"
-#include "cogl-framebuffer.h"
-#include "cogl-matrix-stack.h"
+#include "cogl/cogl-primitive.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-matrix-stack.h"
 
 /* The clip stack works like a GSList where only a pointer to the top
    of the stack is stored. The empty clip stack is represented simply
diff --git a/cogl/cogl/cogl-closure-list-private.h b/cogl/cogl/cogl-closure-list-private.h
index 404e202ba..46ef55135 100644
--- a/cogl/cogl/cogl-closure-list-private.h
+++ b/cogl/cogl/cogl-closure-list-private.h
@@ -29,8 +29,8 @@
 
 #pragma once
 
-#include "cogl-object.h"
-#include "cogl-list.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-list.h"
 
 /*
  * This implements a list of callbacks that can be used a bit like
diff --git a/cogl/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c
index 1f4efdc68..e4b68e83a 100644
--- a/cogl/cogl/cogl-closure-list.c
+++ b/cogl/cogl/cogl-closure-list.c
@@ -31,7 +31,7 @@
 
 #include <glib.h>
 
-#include "cogl-closure-list-private.h"
+#include "cogl/cogl-closure-list-private.h"
 
 void
 _cogl_closure_disconnect (CoglClosure *closure)
diff --git a/cogl/cogl/cogl-color-private.h b/cogl/cogl/cogl-color-private.h
index 6063608cb..3dfe862bf 100644
--- a/cogl/cogl/cogl-color-private.h
+++ b/cogl/cogl/cogl-color-private.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include "cogl-color.h"
+#include "cogl/cogl-color.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c
index 16f471c0f..b24de43dc 100644
--- a/cogl/cogl/cogl-color.c
+++ b/cogl/cogl/cogl-color.c
@@ -32,10 +32,10 @@
 
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-color.h"
-#include "cogl-color-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-color.h"
+#include "cogl/cogl-color-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 COGL_GTYPE_DEFINE_BOXED (Color, color, cogl_color_copy, cogl_color_free);
 
diff --git a/cogl/cogl/cogl-color.h b/cogl/cogl/cogl-color.h
index 2fbe963a0..4afdce96e 100644
--- a/cogl/cogl/cogl-color.h
+++ b/cogl/cogl/cogl-color.h
@@ -42,8 +42,8 @@
  * that it can be efficiently used by GL
  */
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-macros.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h
index 473fb92e0..502dda72b 100644
--- a/cogl/cogl/cogl-context-private.h
+++ b/cogl/cogl/cogl-context-private.h
@@ -30,29 +30,29 @@
 
 #pragma once
 
-#include "cogl-context.h"
-#include "cogl-flags.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-flags.h"
 
-#include "cogl-display-private.h"
-#include "cogl-clip-stack.h"
-#include "cogl-matrix-stack.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-buffer-private.h"
-#include "cogl-bitmask.h"
-#include "cogl-atlas.h"
-#include "cogl-driver.h"
-#include "cogl-texture-driver.h"
-#include "cogl-pipeline-cache.h"
-#include "cogl-texture-2d.h"
-#include "cogl-sampler-cache-private.h"
-#include "cogl-gl-header.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-offscreen-private.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-fence-private.h"
-#include "cogl-poll-private.h"
-#include "cogl-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-clip-stack.h"
+#include "cogl/cogl-matrix-stack.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-buffer-private.h"
+#include "cogl/cogl-bitmask.h"
+#include "cogl/cogl-atlas.h"
+#include "cogl/cogl-driver.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-pipeline-cache.h"
+#include "cogl/cogl-texture-2d.h"
+#include "cogl/cogl-sampler-cache-private.h"
+#include "cogl/cogl-gl-header.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-fence-private.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 typedef struct
 {
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index 1f2ebed63..f7d276825 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -30,24 +30,24 @@
 
 #include "cogl-config.h"
 
-#include "cogl-mutter.h"
-#include "cogl-object.h"
-#include "cogl-private.h"
-#include "cogl-profile.h"
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-display-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl1-context.h"
-#include "cogl-gtype-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-mutter.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 #include <gio/gio.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index 287019363..8ad691420 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -42,10 +42,10 @@
 typedef struct _CoglContext CoglContext;
 typedef struct _CoglTimestampQuery CoglTimestampQuery;
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-display.h>
-#include <cogl/cogl-pipeline.h>
-#include <cogl/cogl-primitive.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-display.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-primitive.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c
index 83082bbd2..ef456424d 100644
--- a/cogl/cogl/cogl-debug.c
+++ b/cogl/cogl/cogl-debug.c
@@ -32,10 +32,10 @@
 
 #include <stdlib.h>
 
-#include "cogl-i18n-private.h"
-#include "cogl-private.h"
-#include "cogl-debug.h"
-#include "cogl1-context.h"
+#include "cogl/cogl-i18n-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl1-context.h"
 
 /* XXX: If you add a debug option, please also add an option
  * definition to cogl-debug-options.h. This will enable us - for
@@ -178,7 +178,7 @@ _cogl_parse_debug_string (const char *value,
       g_printerr ("\n\n%28s\n", _("Supported debug values:"));
 #define OPT(MASK_NAME, GROUP, NAME, NAME_FORMATTED, DESCRIPTION) \
       g_printerr ("%28s %s\n", NAME ":", DESCRIPTION);
-#include "cogl-debug-options.h"
+#include "cogl/cogl-debug-options.h"
       g_printerr ("\n%28s\n", _("Special debug values:"));
       OPT (IGNORED, "ignored", "all", "ignored", \
            N_("Enables all non-behavioural debug options"));
diff --git a/cogl/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h
index aaafd7394..80980adf2 100644
--- a/cogl/cogl/cogl-debug.h
+++ b/cogl/cogl/cogl-debug.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-profile.h"
-#include "cogl-flags.h"
-#include "cogl-util.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-flags.h"
+#include "cogl/cogl-util.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c
index a8b141d49..15502e3e0 100644
--- a/cogl/cogl/cogl-depth-state.c
+++ b/cogl/cogl/cogl-depth-state.c
@@ -31,9 +31,9 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-depth-state-private.h"
-#include "cogl-depth-state.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-depth-state-private.h"
+#include "cogl/cogl-depth-state.h"
 
 void
 cogl_depth_state_init (CoglDepthState *state)
diff --git a/cogl/cogl/cogl-display-private.h b/cogl/cogl/cogl-display-private.h
index edbcd4369..2f6127f58 100644
--- a/cogl/cogl/cogl-display-private.h
+++ b/cogl/cogl/cogl-display-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-display.h"
-#include "cogl-renderer.h"
-#include "cogl-onscreen-template.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-display.h"
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-onscreen-template.h"
 
 struct _CoglDisplay
 {
diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index 64e9df809..58e23d2bf 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -33,13 +33,13 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-object.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-object.h"
 
-#include "cogl-display-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-gtype-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 static void _cogl_display_free (CoglDisplay *display);
 
diff --git a/cogl/cogl/cogl-display.h b/cogl/cogl/cogl-display.h
index b2d7b8312..63dbd02f1 100644
--- a/cogl/cogl/cogl-display.h
+++ b/cogl/cogl/cogl-display.h
@@ -36,8 +36,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-renderer.h>
-#include <cogl/cogl-onscreen-template.h>
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-onscreen-template.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-dma-buf-handle.c b/cogl/cogl/cogl-dma-buf-handle.c
index b8d0929d2..fadfb659a 100644
--- a/cogl/cogl/cogl-dma-buf-handle.c
+++ b/cogl/cogl/cogl-dma-buf-handle.c
@@ -31,8 +31,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-dma-buf-handle.h"
-#include "cogl-object.h"
+#include "cogl/cogl-dma-buf-handle.h"
+#include "cogl/cogl-object.h"
 
 #include <errno.h>
 #include <gio/gio.h>
diff --git a/cogl/cogl/cogl-dma-buf-handle.h b/cogl/cogl/cogl-dma-buf-handle.h
index c5ee17779..f963add30 100644
--- a/cogl/cogl/cogl-dma-buf-handle.h
+++ b/cogl/cogl/cogl-dma-buf-handle.h
@@ -35,8 +35,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-framebuffer.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-framebuffer.h"
 
 /**
  * cogl_dma_buf_handle_new: (skip)
diff --git a/cogl/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h
index 02d4ab579..e2ad9e027 100644
--- a/cogl/cogl/cogl-driver.h
+++ b/cogl/cogl/cogl-driver.h
@@ -30,12 +30,12 @@
 
 #pragma once
 
-#include "cogl-context.h"
-#include "cogl-offscreen-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-sampler-cache-private.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-sampler-cache-private.h"
+#include "cogl/cogl-texture-private.h"
 
 typedef struct _CoglDriverVtable CoglDriverVtable;
 
diff --git a/cogl/cogl/cogl-egl-private.h b/cogl/cogl/cogl-egl-private.h
index 72e1de588..fa9a48799 100644
--- a/cogl/cogl/cogl-egl-private.h
+++ b/cogl/cogl/cogl-egl-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-egl-defines.h"
+#include "cogl/cogl-egl-defines.h"
 
 #if defined(GL_OES_EGL_image) && !defined(GLeglImageOES)
 #define GLeglImageOES void *
diff --git a/cogl/cogl/cogl-egl.h b/cogl/cogl/cogl-egl.h
index 99a937697..5d8ab5a96 100644
--- a/cogl/cogl/cogl-egl.h
+++ b/cogl/cogl/cogl-egl.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include <cogl/cogl-egl-defines.h>
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-egl-defines.h"
+#include "cogl/cogl-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c
index 25aad5ea2..e5500b431 100644
--- a/cogl/cogl/cogl-feature-private.c
+++ b/cogl/cogl/cogl-feature-private.c
@@ -32,11 +32,11 @@
 
 #include <string.h>
 
-#include "cogl-context-private.h"
+#include "cogl/cogl-context-private.h"
 
-#include "cogl-feature-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-private.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-private.h"
 
 gboolean
 _cogl_feature_check (CoglRenderer *renderer,
diff --git a/cogl/cogl/cogl-feature-private.h b/cogl/cogl/cogl-feature-private.h
index faa232ac9..4480786c8 100644
--- a/cogl/cogl/cogl-feature-private.h
+++ b/cogl/cogl/cogl-feature-private.h
@@ -32,8 +32,8 @@
 
 #include <glib.h>
 
-#include "cogl-context.h"
-#include "cogl-renderer.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-renderer.h"
 
 #define COGL_CHECK_GL_VERSION(driver_major, driver_minor, \
                               target_major, target_minor) \
diff --git a/cogl/cogl/cogl-fence-private.h b/cogl/cogl/cogl-fence-private.h
index c38e857a9..760e899f4 100644
--- a/cogl/cogl/cogl-fence-private.h
+++ b/cogl/cogl/cogl-fence-private.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-fence.h"
-#include "cogl-list.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-fence.h"
+#include "cogl/cogl-list.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 typedef enum
 {
diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
index a4d1ce730..25161d9b3 100644
--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@@ -29,10 +29,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-fence.h"
-#include "cogl-fence-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-fence.h"
+#include "cogl/cogl-fence-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 #define FENCE_CHECK_TIMEOUT 5000 /* microseconds */
 
diff --git a/cogl/cogl/cogl-fence.h b/cogl/cogl/cogl-fence.h
index 5e17409f2..d2e6f4e7c 100644
--- a/cogl/cogl/cogl-fence.h
+++ b/cogl/cogl/cogl-fence.h
@@ -34,8 +34,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-framebuffer.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-framebuffer.h"
 
 /**
  * SECTION:cogl-fence
diff --git a/cogl/cogl/cogl-flags.h b/cogl/cogl/cogl-flags.h
index cb2764a4a..6e91e4781 100644
--- a/cogl/cogl/cogl-flags.h
+++ b/cogl/cogl/cogl-flags.h
@@ -33,7 +33,7 @@
 
 #include <glib.h>
 
-#include "cogl-util.h"
+#include "cogl/cogl-util.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-frame-info-private.h b/cogl/cogl/cogl-frame-info-private.h
index e6d8ca5a1..a44ddad2e 100644
--- a/cogl/cogl/cogl-frame-info-private.h
+++ b/cogl/cogl/cogl-frame-info-private.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-frame-info.h"
-#include "cogl-object-private.h"
-#include "cogl-context.h"
+#include "cogl/cogl-frame-info.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-context.h"
 
 typedef enum _CoglFrameInfoFlag
 {
diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c
index 373a2d098..81ad0166a 100644
--- a/cogl/cogl/cogl-frame-info.c
+++ b/cogl/cogl/cogl-frame-info.c
@@ -30,9 +30,9 @@
 
 #include "cogl-config.h"
 
-#include "cogl-frame-info-private.h"
-#include "cogl-gtype-private.h"
-#include "cogl-context-private.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/cogl-context-private.h"
 
 static void _cogl_frame_info_free (CoglFrameInfo *info);
 
diff --git a/cogl/cogl/cogl-frame-info.h b/cogl/cogl/cogl-frame-info.h
index 22994f939..84bf4209c 100644
--- a/cogl/cogl/cogl-frame-info.h
+++ b/cogl/cogl/cogl-frame-info.h
@@ -37,8 +37,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-output.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-output.h"
 
 #include <glib-object.h>
 #include <glib.h>
diff --git a/cogl/cogl/cogl-framebuffer-driver.c b/cogl/cogl/cogl-framebuffer-driver.c
index d175ceea7..bfcd49a88 100644
--- a/cogl/cogl/cogl-framebuffer-driver.c
+++ b/cogl/cogl/cogl-framebuffer-driver.c
@@ -27,7 +27,7 @@
 
 #include "cogl-config.h"
 
-#include "cogl-framebuffer-driver.h"
+#include "cogl/cogl-framebuffer-driver.h"
 
 enum
 {
diff --git a/cogl/cogl/cogl-framebuffer-driver.h b/cogl/cogl/cogl-framebuffer-driver.h
index 2bdc249a6..d6c58f67a 100644
--- a/cogl/cogl/cogl-framebuffer-driver.h
+++ b/cogl/cogl/cogl-framebuffer-driver.h
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer.h"
 
 typedef struct _CoglFramebufferBits CoglFramebufferBits;
 
diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h
index 462b4cbe8..0d3b870d3 100644
--- a/cogl/cogl/cogl-framebuffer-private.h
+++ b/cogl/cogl/cogl-framebuffer-private.h
@@ -31,13 +31,13 @@
 
 #pragma once
 
-#include "cogl-framebuffer-driver.h"
-#include "cogl-object-private.h"
-#include "cogl-matrix-stack-private.h"
-#include "cogl-journal-private.h"
-#include "winsys/cogl-winsys-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-clip-stack.h"
+#include "cogl/cogl-framebuffer-driver.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-matrix-stack-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-clip-stack.h"
 
 typedef enum
 {
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index dc61dec08..667d080df 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -33,25 +33,25 @@
 
 #include <string.h>
 
-#include "cogl-debug.h"
-#include "cogl-context-private.h"
-#include "cogl-display-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-object-private.h"
-#include "cogl-util.h"
-#include "cogl-texture-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-template-private.h"
-#include "cogl-clip-stack.h"
-#include "cogl-journal-private.h"
-#include "cogl-pipeline-state-private.h"
-#include "cogl-primitive-private.h"
-#include "cogl-offscreen.h"
-#include "cogl1-context.h"
-#include "cogl-private.h"
-#include "cogl-primitives-private.h"
-#include "cogl-gtype-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-template-private.h"
+#include "cogl/cogl-clip-stack.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-pipeline-state-private.h"
+#include "cogl/cogl-primitive-private.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-primitives-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 enum
 {
diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index d1d758067..72807d642 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -34,10 +34,11 @@
 
 #pragma once
 
-#include <cogl/cogl-pipeline.h>
-#include <cogl/cogl-indices.h>
-#include <cogl/cogl-bitmap.h>
-#include <cogl/cogl-texture.h>
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-indices.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-texture.h"
+
 #include <glib-object.h>
 #include <cairo.h>
 
diff --git a/cogl/cogl/cogl-gl-header.h.in b/cogl/cogl/cogl-gl-header.h.in
index e2d15da62..4866956cd 100644
--- a/cogl/cogl/cogl-gl-header.h.in
+++ b/cogl/cogl/cogl-gl-header.h.in
@@ -34,7 +34,7 @@
 #error "cogl-gl-header.h should only be included when compiling Cogl"
 #endif
 
-#include "cogl-defines.h"
+#include "cogl/cogl-defines.h"
 
 @COGL_GL_HEADER_INCLUDES@
 
diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
index 37c3713c0..edaf6f37e 100644
--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@@ -30,8 +30,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-glib-source.h"
-#include "cogl-poll.h"
+#include "cogl/cogl-glib-source.h"
+#include "cogl/cogl-poll.h"
 
 typedef struct _CoglGLibSource
 {
diff --git a/cogl/cogl/cogl-glib-source.h b/cogl/cogl/cogl-glib-source.h
index 211c13b01..8d374a25d 100644
--- a/cogl/cogl/cogl-glib-source.h
+++ b/cogl/cogl/cogl-glib-source.h
@@ -35,7 +35,8 @@
 #endif
 
 #include <glib.h>
-#include <cogl/cogl-context.h>
+
+#include "cogl/cogl-context.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-graphene.h b/cogl/cogl/cogl-graphene.h
index 19ec9eb36..42627b8ce 100644
--- a/cogl/cogl/cogl-graphene.h
+++ b/cogl/cogl/cogl-graphene.h
@@ -28,9 +28,9 @@
 
 #pragma once
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-macros.h>
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-macros.h"
+#include "cogl/cogl-types.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-gtype-private.h b/cogl/cogl/cogl-gtype-private.h
index 2ec59ee65..78ae9300b 100644
--- a/cogl/cogl/cogl-gtype-private.h
+++ b/cogl/cogl/cogl-gtype-private.h
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "cogl-object-private.h"
+#include "cogl/cogl-object-private.h"
 
 /* Move this to public headers? */
 typedef struct _CoglGtypeObject CoglGtypeObject;
diff --git a/cogl/cogl/cogl-gtype.c b/cogl/cogl/cogl-gtype.c
index 314d8e41f..3ebc8a9b7 100644
--- a/cogl/cogl/cogl-gtype.c
+++ b/cogl/cogl/cogl-gtype.c
@@ -1,4 +1,4 @@
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <gobject/gvaluecollector.h>
 
diff --git a/cogl/cogl/cogl-index-buffer-private.h b/cogl/cogl/cogl-index-buffer-private.h
index 52450473e..dccd8fc51 100644
--- a/cogl/cogl/cogl-index-buffer-private.h
+++ b/cogl/cogl/cogl-index-buffer-private.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include "cogl-buffer-private.h"
+#include "cogl/cogl-buffer-private.h"
 
 struct _CoglIndexBuffer
 {
diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c
index 2050db3c9..af0980ed1 100644
--- a/cogl/cogl/cogl-index-buffer.c
+++ b/cogl/cogl/cogl-index-buffer.c
@@ -33,11 +33,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-object-private.h"
-#include "cogl-indices.h"
-#include "cogl-indices-private.h"
-#include "cogl-context-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-indices.h"
+#include "cogl/cogl-indices-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void _cogl_index_buffer_free (CoglIndexBuffer *indices);
 
diff --git a/cogl/cogl/cogl-index-buffer.h b/cogl/cogl/cogl-index-buffer.h
index 9ccef324c..f8663683b 100644
--- a/cogl/cogl/cogl-index-buffer.h
+++ b/cogl/cogl/cogl-index-buffer.h
@@ -37,7 +37,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-context.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-indices-private.h b/cogl/cogl/cogl-indices-private.h
index 53b2c8c2f..bb802e225 100644
--- a/cogl/cogl/cogl-indices-private.h
+++ b/cogl/cogl/cogl-indices-private.h
@@ -33,9 +33,9 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-index-buffer-private.h"
-#include "cogl-types.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-index-buffer-private.h"
+#include "cogl/cogl-types.h"
 
 struct _CoglIndices
 {
diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c
index 7613c587f..fb00eca01 100644
--- a/cogl/cogl/cogl-indices.c
+++ b/cogl/cogl/cogl-indices.c
@@ -34,13 +34,13 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-object-private.h"
-#include "cogl-context-private.h"
-#include "cogl-indices.h"
-#include "cogl-indices-private.h"
-#include "cogl-index-buffer.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-indices.h"
+#include "cogl/cogl-indices-private.h"
+#include "cogl/cogl-index-buffer.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <stdarg.h>
 
diff --git a/cogl/cogl/cogl-indices.h b/cogl/cogl/cogl-indices.h
index 4153f335c..9c2df103e 100644
--- a/cogl/cogl/cogl-indices.h
+++ b/cogl/cogl/cogl-indices.h
@@ -42,7 +42,7 @@
  */
 typedef struct _CoglIndices CoglIndices;
 
-#include <cogl/cogl-index-buffer.h>
+#include "cogl/cogl-index-buffer.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-journal-private.h b/cogl/cogl/cogl-journal-private.h
index 8484d6b47..a8280f3da 100644
--- a/cogl/cogl/cogl-journal-private.h
+++ b/cogl/cogl/cogl-journal-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-texture.h"
-#include "cogl-object-private.h"
-#include "cogl-clip-stack.h"
-#include "cogl-fence-private.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-clip-stack.h"
+#include "cogl/cogl-fence-private.h"
 
 #define COGL_JOURNAL_VBO_POOL_SIZE 8
 
diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
index becdc0f7f..ab1821eed 100644
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@@ -30,19 +30,19 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-context-private.h"
-#include "cogl-graphene.h"
-#include "cogl-journal-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-profile.h"
-#include "cogl-attribute-private.h"
-#include "cogl-point-in-poly-private.h"
-#include "cogl-private.h"
-#include "cogl1-context.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-graphene.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-point-in-poly-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl1-context.h"
 
 #include <string.h>
 #include <gmodule.h>
diff --git a/cogl/cogl/cogl-list.c b/cogl/cogl/cogl-list.c
index 9e855e5f9..6844f178c 100644
--- a/cogl/cogl/cogl-list.c
+++ b/cogl/cogl/cogl-list.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cogl-list.h"
+#include "cogl/cogl-list.h"
 
 void
 _cogl_list_init (CoglList *list)
diff --git a/cogl/cogl/cogl-magazine-private.h b/cogl/cogl/cogl-magazine-private.h
index bc60af6c6..b5cc95c10 100644
--- a/cogl/cogl/cogl-magazine-private.h
+++ b/cogl/cogl/cogl-magazine-private.h
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include "cogl-memory-stack-private.h"
+#include "cogl/cogl-memory-stack-private.h"
 
 typedef struct _CoglMagazineChunk CoglMagazineChunk;
 
diff --git a/cogl/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c
index be5669d81..f5808d672 100644
--- a/cogl/cogl/cogl-magazine.c
+++ b/cogl/cogl/cogl-magazine.c
@@ -53,8 +53,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-memory-stack-private.h"
-#include "cogl-magazine-private.h"
+#include "cogl/cogl-memory-stack-private.h"
+#include "cogl/cogl-magazine-private.h"
 #include <glib.h>
 
 #define ROUND_UP_8(X) ((X + (8 - 1)) & ~(8 - 1))
diff --git a/cogl/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h
index 3778f60f0..375c78230 100644
--- a/cogl/cogl/cogl-matrix-stack-private.h
+++ b/cogl/cogl/cogl-matrix-stack-private.h
@@ -34,10 +34,10 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-matrix-stack.h"
-#include "cogl-context.h"
-#include "cogl-framebuffer.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-matrix-stack.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-framebuffer.h"
 
 typedef enum _CoglMatrixOp
 {
diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index 47afa43ec..391d8db95 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -33,14 +33,14 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-graphene.h"
-#include "cogl-matrix-stack.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-object-private.h"
-#include "cogl-offscreen.h"
-#include "cogl-magazine-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-graphene.h"
+#include "cogl/cogl-matrix-stack.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/cogl-magazine-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void _cogl_matrix_stack_free (CoglMatrixStack *stack);
 
diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h
index 325462b7a..6d2fc2a12 100644
--- a/cogl/cogl/cogl-matrix-stack.h
+++ b/cogl/cogl/cogl-matrix-stack.h
@@ -38,7 +38,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "cogl-context.h"
+#include "cogl/cogl-context.h"
 
 #include <graphene.h>
 
diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c
index 2ea6e8f88..0e464a00e 100644
--- a/cogl/cogl/cogl-memory-stack.c
+++ b/cogl/cogl/cogl-memory-stack.c
@@ -56,8 +56,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-memory-stack-private.h"
-#include "cogl-list.h"
+#include "cogl/cogl-memory-stack-private.h"
+#include "cogl/cogl-list.h"
 
 #include <stdint.h>
 
diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
index b8b91aa4a..f6fa22d57 100644
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@@ -32,10 +32,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-texture.h"
-#include "cogl-spans.h"
-#include "cogl-meta-texture.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-spans.h"
+#include "cogl/cogl-meta-texture.h"
+#include "cogl/cogl-texture-private.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl-meta-texture.h b/cogl/cogl/cogl-meta-texture.h
index 8d90c3333..51fb141a9 100644
--- a/cogl/cogl/cogl-meta-texture.h
+++ b/cogl/cogl/cogl-meta-texture.h
@@ -34,7 +34,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-pipeline-layer-state.h>
+#include "cogl/cogl-pipeline-layer-state.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h
index 27d75c57e..985295195 100644
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@@ -31,12 +31,12 @@
 #pragma once
 
 #include "cogl-config.h"
-#include "cogl-defines.h"
+#include "cogl/cogl-defines.h"
 
-#include <cogl/cogl-texture.h>
-#include <cogl/cogl-meta-texture.h>
-#include <cogl/cogl-frame-info-private.h>
-#include <cogl/cogl-renderer-private.h>
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-meta-texture.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-renderer-private.h"
 #if defined (COGL_HAS_EGL_SUPPORT)
 #include <cogl/winsys/cogl-onscreen-egl.h>
 #include <cogl/winsys/cogl-winsys-egl-private.h>
diff --git a/cogl/cogl/cogl-node-private.h b/cogl/cogl/cogl-node-private.h
index 0187e9c4a..6793adc72 100644
--- a/cogl/cogl/cogl-node-private.h
+++ b/cogl/cogl/cogl-node-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-list.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-list.h"
 
 typedef struct _CoglNode CoglNode;
 
diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c
index 07b524f94..e1b3354a0 100644
--- a/cogl/cogl/cogl-node.c
+++ b/cogl/cogl/cogl-node.c
@@ -33,8 +33,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-node-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-node-private.h"
 
 void
 _cogl_pipeline_node_init (CoglNode *node)
diff --git a/cogl/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h
index d215b4fde..fbd04b9c6 100644
--- a/cogl/cogl/cogl-object-private.h
+++ b/cogl/cogl/cogl-object-private.h
@@ -33,9 +33,9 @@
 
 #include <glib.h>
 
-#include "cogl-types.h"
-#include "cogl-object.h"
-#include "cogl-debug.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-debug.h"
 
 /* XXX: sadly we didn't fully consider when we copied the cairo API
  * for _set_user_data that the callback doesn't get a pointer to the
diff --git a/cogl/cogl/cogl-object.c b/cogl/cogl/cogl-object.c
index d3713f4cb..516c59118 100644
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@@ -34,10 +34,10 @@
 #include <glib.h>
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-types.h"
-#include "cogl-object-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 COGL_GTYPE_DEFINE_BASE_CLASS (Object, object);
 
diff --git a/cogl/cogl/cogl-object.h b/cogl/cogl/cogl-object.h
index 77f9f5e02..8f1fd1b02 100644
--- a/cogl/cogl/cogl-object.h
+++ b/cogl/cogl/cogl-object.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-types.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-offscreen-private.h b/cogl/cogl/cogl-offscreen-private.h
index 597b8ceba..9e1090d9a 100644
--- a/cogl/cogl/cogl-offscreen-private.h
+++ b/cogl/cogl/cogl-offscreen-private.h
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include "cogl-gl-header.h"
-#include "cogl-offscreen.h"
+#include "cogl/cogl-gl-header.h"
+#include "cogl/cogl-offscreen.h"
 
 /* Flags to pass to _cogl_offscreen_new_with_texture_full */
 typedef enum
diff --git a/cogl/cogl/cogl-offscreen.c b/cogl/cogl/cogl-offscreen.c
index a9b25cc79..728a17ee3 100644
--- a/cogl/cogl/cogl-offscreen.c
+++ b/cogl/cogl/cogl-offscreen.c
@@ -27,10 +27,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-offscreen-private.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/cogl-texture-private.h"
 
 struct _CoglOffscreen
 {
diff --git a/cogl/cogl/cogl-offscreen.h b/cogl/cogl/cogl-offscreen.h
index 8de4f6153..9be635439 100644
--- a/cogl/cogl/cogl-offscreen.h
+++ b/cogl/cogl/cogl-offscreen.h
@@ -34,8 +34,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-texture.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-texture.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-onscreen-private.h b/cogl/cogl/cogl-onscreen-private.h
index e50b5b22e..9dbecfd0c 100644
--- a/cogl/cogl/cogl-onscreen-private.h
+++ b/cogl/cogl/cogl-onscreen-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-onscreen.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-closure-list-private.h"
-#include "cogl-list.h"
+#include "cogl/cogl-onscreen.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-closure-list-private.h"
+#include "cogl/cogl-list.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-onscreen-template-private.h b/cogl/cogl/cogl-onscreen-template-private.h
index 1fdf7e2b2..409cab011 100644
--- a/cogl/cogl/cogl-onscreen-template-private.h
+++ b/cogl/cogl/cogl-onscreen-template-private.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-swap-chain.h"
-#include "cogl-framebuffer-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-swap-chain.h"
+#include "cogl/cogl-framebuffer-private.h"
 
 struct _CoglOnscreenTemplate
 {
diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c
index 59fa1af18..040ab75ed 100644
--- a/cogl/cogl/cogl-onscreen-template.c
+++ b/cogl/cogl/cogl-onscreen-template.c
@@ -31,11 +31,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-object.h"
+#include "cogl/cogl-object.h"
 
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-template-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-template-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <stdlib.h>
 
diff --git a/cogl/cogl/cogl-onscreen-template.h b/cogl/cogl/cogl-onscreen-template.h
index ad7c5f84c..0299d9108 100644
--- a/cogl/cogl/cogl-onscreen-template.h
+++ b/cogl/cogl/cogl-onscreen-template.h
@@ -36,7 +36,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-swap-chain.h>
+#include "cogl/cogl-swap-chain.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
index 842ececf7..73425e498 100644
--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@@ -32,17 +32,17 @@
 
 #include <gio/gio.h>
 
-#include "cogl-util.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-frame-info-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-template-private.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl1-context.h"
-#include "cogl-closure-list-private.h"
-#include "cogl-poll-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-template-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-closure-list-private.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 typedef struct _CoglOnscreenPrivate
 {
diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
index 55736b922..b58270c3c 100644
--- a/cogl/cogl/cogl-onscreen.h
+++ b/cogl/cogl/cogl-onscreen.h
@@ -37,10 +37,10 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-context.h>
-#include <cogl/cogl-framebuffer.h>
-#include <cogl/cogl-frame-info.h>
-#include <cogl/cogl-object.h>
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-frame-info.h"
+#include "cogl/cogl-object.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-output-private.h b/cogl/cogl/cogl-output-private.h
index 8dfbb9cd3..6e992152c 100644
--- a/cogl/cogl/cogl-output-private.h
+++ b/cogl/cogl/cogl-output-private.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "cogl-output.h"
-#include "cogl-object-private.h"
+#include "cogl/cogl-output.h"
+#include "cogl/cogl-object-private.h"
 
 struct _CoglOutput
 {
diff --git a/cogl/cogl/cogl-output.c b/cogl/cogl/cogl-output.c
index 5ad0e4022..9eeefbde2 100644
--- a/cogl/cogl/cogl-output.c
+++ b/cogl/cogl/cogl-output.c
@@ -30,8 +30,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-output-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-output-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-output.h b/cogl/cogl/cogl-output.h
index dbbe63b3e..7ac93727a 100644
--- a/cogl/cogl/cogl-output.h
+++ b/cogl/cogl/cogl-output.h
@@ -37,7 +37,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-types.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c
index 164c44e2c..df82807de 100644
--- a/cogl/cogl/cogl-pipeline-cache.c
+++ b/cogl/cogl/cogl-pipeline-cache.c
@@ -33,11 +33,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-pipeline-cache.h"
-#include "cogl-pipeline-cache-private.h"
-#include "cogl-pipeline-hash-table.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-cache.h"
+#include "cogl/cogl-pipeline-cache-private.h"
+#include "cogl/cogl-pipeline-hash-table.h"
 
 struct _CoglPipelineCache
 {
diff --git a/cogl/cogl/cogl-pipeline-cache.h b/cogl/cogl/cogl-pipeline-cache.h
index b7752e438..55e2874b1 100644
--- a/cogl/cogl/cogl-pipeline-cache.h
+++ b/cogl/cogl/cogl-pipeline-cache.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-pipeline.h"
+#include "cogl/cogl-pipeline.h"
 
 typedef struct _CoglPipelineCache CoglPipelineCache;
 
diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c
index 9f1007b94..6e86ab7d8 100644
--- a/cogl/cogl/cogl-pipeline-debug.c
+++ b/cogl/cogl/cogl-pipeline-debug.c
@@ -33,10 +33,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-pipeline-layer-private.h"
-#include "cogl-node-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-layer-private.h"
+#include "cogl/cogl-node-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c
index 53df22d28..812de18c5 100644
--- a/cogl/cogl/cogl-pipeline-hash-table.c
+++ b/cogl/cogl/cogl-pipeline-hash-table.c
@@ -33,10 +33,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-pipeline-hash-table.h"
-#include "cogl-pipeline-cache.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-hash-table.h"
+#include "cogl/cogl-pipeline-cache.h"
 
 typedef struct
 {
diff --git a/cogl/cogl/cogl-pipeline-hash-table.h b/cogl/cogl/cogl-pipeline-hash-table.h
index a3f2c94f2..3fc1c7e8c 100644
--- a/cogl/cogl/cogl-pipeline-hash-table.h
+++ b/cogl/cogl/cogl-pipeline-hash-table.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-pipeline-cache.h"
+#include "cogl/cogl-pipeline-cache.h"
 
 typedef struct
 {
diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h
index 24dab4ba1..e82233567 100644
--- a/cogl/cogl/cogl-pipeline-layer-private.h
+++ b/cogl/cogl/cogl-pipeline-layer-private.h
@@ -33,13 +33,13 @@
 
 #pragma once
 
-#include "cogl-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-node-private.h"
-#include "cogl-texture.h"
-#include "cogl-pipeline-layer-state.h"
-#include "cogl-pipeline-snippet-private.h"
-#include "cogl-sampler-cache-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-node-private.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-pipeline-layer-state.h"
+#include "cogl/cogl-pipeline-snippet-private.h"
+#include "cogl/cogl-sampler-cache-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-pipeline-layer-state-private.h b/cogl/cogl/cogl-pipeline-layer-state-private.h
index da2c068cb..5dce50453 100644
--- a/cogl/cogl/cogl-pipeline-layer-state-private.h
+++ b/cogl/cogl/cogl-pipeline-layer-state-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-pipeline-layer-state.h"
-#include "cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-layer-state.h"
+#include "cogl/cogl-pipeline-private.h"
 
 CoglPipelineLayer *
 _cogl_pipeline_set_layer_unit (CoglPipeline *required_owner,
diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
index a0478ca10..1c3aa96c3 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@@ -33,18 +33,18 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-blend-string.h"
-#include "cogl-util.h"
-#include "cogl-snippet-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-pipeline-layer-state-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-blend-string.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-snippet-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-pipeline-layer-state-private.h"
 
 #include "string.h"
 #if 0
-#include "cogl-context-private.h"
-#include "cogl-color-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-color-private.h"
 
 #endif
 
diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
index fe83164e8..9ba238423 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl/cogl-pipeline-layer-state.h
@@ -34,9 +34,9 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-pipeline.h>
-#include <cogl/cogl-color.h>
-#include <cogl/cogl-texture.h>
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-color.h"
+#include "cogl/cogl-texture.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c
index 698f7f14a..a84cfd54e 100644
--- a/cogl/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl/cogl-pipeline-layer.c
@@ -33,17 +33,17 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture-private.h"
 
-#include "cogl-pipeline.h"
-#include "cogl-pipeline-layer-private.h"
-#include "cogl-pipeline-layer-state-private.h"
-#include "cogl-pipeline-layer-state.h"
-#include "cogl-node-private.h"
-#include "cogl-context-private.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-pipeline-layer-private.h"
+#include "cogl/cogl-pipeline-layer-state-private.h"
+#include "cogl/cogl-pipeline-layer-state.h"
+#include "cogl/cogl-node-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture-private.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h
index 44ee9ef90..9ebc02b9d 100644
--- a/cogl/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl/cogl-pipeline-private.h
@@ -33,17 +33,17 @@
 
 #pragma once
 
-#include "cogl-node-private.h"
-#include "cogl-pipeline-layer-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-object-private.h"
-#include "cogl-profile.h"
-#include "cogl-list.h"
-#include "cogl-boxed-value.h"
-#include "cogl-pipeline-snippet-private.h"
-#include "cogl-pipeline-state.h"
-#include "cogl-framebuffer.h"
-#include "cogl-bitmask.h"
+#include "cogl/cogl-node-private.h"
+#include "cogl/cogl-pipeline-layer-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-list.h"
+#include "cogl/cogl-boxed-value.h"
+#include "cogl/cogl-pipeline-snippet-private.h"
+#include "cogl/cogl-pipeline-state.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-bitmask.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-pipeline-snippet-private.h b/cogl/cogl/cogl-pipeline-snippet-private.h
index 65bf0b6a3..b7799b7e0 100644
--- a/cogl/cogl/cogl-pipeline-snippet-private.h
+++ b/cogl/cogl/cogl-pipeline-snippet-private.h
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 
-#include "cogl-snippet.h"
+#include "cogl/cogl-snippet.h"
 
 typedef struct
 {
diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c
index ae83bc398..ced15ce94 100644
--- a/cogl/cogl/cogl-pipeline-snippet.c
+++ b/cogl/cogl/cogl-pipeline-snippet.c
@@ -35,10 +35,10 @@
 
 #include <string.h>
 
-#include "cogl-types.h"
-#include "cogl-pipeline-snippet-private.h"
-#include "cogl-snippet-private.h"
-#include "cogl-util.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-pipeline-snippet-private.h"
+#include "cogl/cogl-snippet-private.h"
+#include "cogl/cogl-util.h"
 
 /* Helper functions that are used by both GLSL pipeline backends */
 
diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c
index 5434d7021..2b976c386 100644
--- a/cogl/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl/cogl-pipeline-state.c
@@ -33,13 +33,13 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-color-private.h"
-#include "cogl-blend-string.h"
-#include "cogl-util.h"
-#include "cogl-depth-state-private.h"
-#include "cogl-pipeline-state-private.h"
-#include "cogl-snippet-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-color-private.h"
+#include "cogl/cogl-blend-string.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-depth-state-private.h"
+#include "cogl/cogl-pipeline-state-private.h"
+#include "cogl/cogl-snippet-private.h"
 
 #include "string.h"
 
diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
index 99d665ee4..bfde3fcd1 100644
--- a/cogl/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl/cogl-pipeline-state.h
@@ -34,9 +34,9 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-pipeline.h>
-#include <cogl/cogl-color.h>
-#include <cogl/cogl-depth-state.h>
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-color.h"
+#include "cogl/cogl-depth-state.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
index 90499ce5e..7399405a3 100644
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@@ -33,22 +33,22 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-context-private.h"
-#include "cogl-object.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object.h"
 
-#include "cogl-pipeline-private.h"
-#include "cogl-pipeline-state-private.h"
-#include "cogl-pipeline-layer-state-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-blend-string.h"
-#include "cogl-journal-private.h"
-#include "cogl-color-private.h"
-#include "cogl-util.h"
-#include "cogl-profile.h"
-#include "cogl-depth-state-private.h"
-#include "cogl1-context.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-state-private.h"
+#include "cogl/cogl-pipeline-layer-state-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-blend-string.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-color-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-depth-state-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -62,9 +62,9 @@ const CoglPipelineFragend *_cogl_pipeline_fragend;
 const CoglPipelineVertend *_cogl_pipeline_vertend;
 const CoglPipelineProgend *_cogl_pipeline_progend;
 
-#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
-#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
-#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
 
 COGL_OBJECT_DEFINE (Pipeline, pipeline);
 COGL_GTYPE_DEFINE_CLASS (Pipeline, pipeline);
diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
index 59cff675f..3397bdd51 100644
--- a/cogl/cogl/cogl-pipeline.h
+++ b/cogl/cogl/cogl-pipeline.h
@@ -39,9 +39,9 @@
  */
 typedef struct _CoglPipeline CoglPipeline;
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-context.h>
-#include <cogl/cogl-snippet.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-snippet.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-pixel-buffer-private.h b/cogl/cogl/cogl-pixel-buffer-private.h
index 70951fc23..cdae26e56 100644
--- a/cogl/cogl/cogl-pixel-buffer-private.h
+++ b/cogl/cogl/cogl-pixel-buffer-private.h
@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-buffer-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-buffer-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c
index f7dc0c70c..c17b76dfc 100644
--- a/cogl/cogl/cogl-pixel-buffer.c
+++ b/cogl/cogl/cogl-pixel-buffer.c
@@ -43,13 +43,13 @@
 #include <string.h>
 #include <glib.h>
 
-#include "cogl-private.h"
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-object.h"
-#include "cogl-pixel-buffer-private.h"
-#include "cogl-pixel-buffer.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-pixel-buffer-private.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void
 _cogl_pixel_buffer_free (CoglPixelBuffer *buffer);
diff --git a/cogl/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h
index 966c36e4f..58084ee14 100644
--- a/cogl/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl/cogl-pixel-buffer.h
@@ -42,8 +42,8 @@
  * dependencies between some headers */
 typedef struct _CoglPixelBuffer CoglPixelBuffer;
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-pixel-format.c b/cogl/cogl/cogl-pixel-format.c
index c60d293bf..93665146e 100644
--- a/cogl/cogl/cogl-pixel-format.c
+++ b/cogl/cogl/cogl-pixel-format.c
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "cogl-pixel-format.h"
+#include "cogl/cogl-pixel-format.h"
 
 /* An entry to map CoglPixelFormats to their respective properties */
 typedef struct _CoglPixelFormatInfo
diff --git a/cogl/cogl/cogl-pixel-format.h b/cogl/cogl/cogl-pixel-format.h
index 6170db465..1b7cd0971 100644
--- a/cogl/cogl/cogl-pixel-format.h
+++ b/cogl/cogl/cogl-pixel-format.h
@@ -37,8 +37,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-macros.h"
 
 #include <glib.h>
 #include <glib-object.h>
diff --git a/cogl/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c
index c80fcbaca..fd5e92178 100644
--- a/cogl/cogl/cogl-point-in-poly.c
+++ b/cogl/cogl/cogl-point-in-poly.c
@@ -36,8 +36,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-point-in-poly-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-point-in-poly-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-poll-private.h b/cogl/cogl/cogl-poll-private.h
index c06e6effb..63b386099 100644
--- a/cogl/cogl/cogl-poll-private.h
+++ b/cogl/cogl/cogl-poll-private.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "cogl-poll.h"
-#include "cogl-renderer.h"
-#include "cogl-closure-list-private.h"
+#include "cogl/cogl-poll.h"
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-closure-list-private.h"
 
 void
 _cogl_poll_renderer_remove_fd (CoglRenderer *renderer, int fd);
diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c
index f9818a811..2a424c2da 100644
--- a/cogl/cogl/cogl-poll.c
+++ b/cogl/cogl/cogl-poll.c
@@ -32,10 +32,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-poll.h"
-#include "cogl-poll-private.h"
-#include "cogl-renderer-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-poll.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 struct _CoglPollSource
 {
diff --git a/cogl/cogl/cogl-poll.h b/cogl/cogl/cogl-poll.h
index 609dc14c4..ea17a7330 100644
--- a/cogl/cogl/cogl-poll.h
+++ b/cogl/cogl/cogl-poll.h
@@ -36,8 +36,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-context.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-primitive-private.h b/cogl/cogl/cogl-primitive-private.h
index 458770e7a..73067b86c 100644
--- a/cogl/cogl/cogl-primitive-private.h
+++ b/cogl/cogl/cogl-primitive-private.h
@@ -33,10 +33,10 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-attribute-buffer-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-attribute-buffer-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer.h"
 
 struct _CoglPrimitive
 {
diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c
index f7f0aabd8..7d28d8891 100644
--- a/cogl/cogl/cogl-primitive-texture.c
+++ b/cogl/cogl/cogl-primitive-texture.c
@@ -32,8 +32,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-primitive-texture.h"
-#include "cogl-texture-private.h"
+#include "cogl/cogl-primitive-texture.h"
+#include "cogl/cogl-texture-private.h"
 
 gboolean
 cogl_is_primitive_texture (void *object)
diff --git a/cogl/cogl/cogl-primitive-texture.h b/cogl/cogl/cogl-primitive-texture.h
index 046a955a4..a9fdda6b1 100644
--- a/cogl/cogl/cogl-primitive-texture.h
+++ b/cogl/cogl/cogl-primitive-texture.h
@@ -34,7 +34,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "cogl-types.h"
+#include "cogl/cogl-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c
index 7da4a3fa9..6c801678e 100644
--- a/cogl/cogl/cogl-primitive.c
+++ b/cogl/cogl/cogl-primitive.c
@@ -33,13 +33,13 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-object-private.h"
-#include "cogl-primitive.h"
-#include "cogl-primitive-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-primitive.h"
+#include "cogl/cogl-primitive-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-primitive.h b/cogl/cogl/cogl-primitive.h
index e3b3a1fad..3d02b9392 100644
--- a/cogl/cogl/cogl-primitive.h
+++ b/cogl/cogl/cogl-primitive.h
@@ -42,9 +42,9 @@
  */
 typedef struct _CoglPrimitive CoglPrimitive;
 
-#include <cogl/cogl-types.h> /* for CoglVerticesMode */
-#include <cogl/cogl-attribute.h>
-#include <cogl/cogl-framebuffer.h>
+#include "cogl/cogl-types.h" /* for CoglVerticesMode */
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-framebuffer.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
index 03e1d54c4..bd18be5a9 100644
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -30,18 +30,18 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-context-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-private.h"
-#include "cogl-meta-texture.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl1-context.h"
-#include "cogl-primitives-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-meta-texture.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-primitives-private.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl-private.h b/cogl/cogl/cogl-private.h
index 13ecae4d5..772303959 100644
--- a/cogl/cogl/cogl-private.h
+++ b/cogl/cogl/cogl-private.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
-#include <cogl/cogl-pipeline.h>
-
-#include "cogl-context.h"
-#include "cogl-flags.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-flags.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c
index c7ee7dca1..637e3298c 100644
--- a/cogl/cogl/cogl-profile.c
+++ b/cogl/cogl/cogl-profile.c
@@ -2,9 +2,9 @@
 
 #ifdef COGL_ENABLE_PROFILE
 
-#include "cogl-profile.h"
-#include "cogl-debug.h"
-#include "cogl-i18n-private.h"
+#include "cogl/cogl-profile.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-i18n-private.h"
 
 #include <stdlib.h>
 
@@ -100,7 +100,7 @@ _cogl_uprof_init (void)
                                       GUINT_TO_POINTER (shift)); \
   } G_STMT_END;
 
-#include "cogl-debug-options.h"
+#include "cogl/cogl-debug-options.h"
 #undef OPT
 
   atexit (print_exit_report);
diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c
index 789b2e59c..e3f254372 100644
--- a/cogl/cogl/cogl-rectangle-map.c
+++ b/cogl/cogl/cogl-rectangle-map.c
@@ -35,9 +35,9 @@
 
 #include <glib.h>
 
-#include "cogl-util.h"
-#include "cogl-rectangle-map.h"
-#include "cogl-debug.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-rectangle-map.h"
+#include "cogl/cogl-debug.h"
 
 /* Implements a data structure which keeps track of unused
    sub-rectangles within a larger rectangle using a binary tree
diff --git a/cogl/cogl/cogl-rectangle-map.h b/cogl/cogl/cogl-rectangle-map.h
index 69ef81edd..d1a69a2f5 100644
--- a/cogl/cogl/cogl-rectangle-map.h
+++ b/cogl/cogl/cogl-rectangle-map.h
@@ -29,7 +29,8 @@
 #pragma once
 
 #include <glib.h>
-#include "cogl-types.h"
+
+#include "cogl/cogl-types.h"
 
 typedef struct _CoglRectangleMap      CoglRectangleMap;
 typedef struct _CoglRectangleMapEntry CoglRectangleMapEntry;
diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
index a47da8b57..36e875b32 100644
--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -32,12 +32,12 @@
 
 #include <gmodule.h>
 
-#include "cogl-object-private.h"
-#include "cogl-driver.h"
-#include "cogl-texture-driver.h"
-#include "cogl-context.h"
-#include "cogl-closure-list-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-driver.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-closure-list-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 typedef const CoglWinsysVtable *(*CoglCustomWinsysVtableGetter) (CoglRenderer *renderer);
 
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index 7463e188f..b0dd576ee 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -35,28 +35,28 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-private.h"
-#include "cogl-object.h"
-#include "cogl-context-private.h"
-#include "cogl-mutter.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-mutter.h"
 
-#include "cogl-renderer.h"
-#include "cogl-renderer-private.h"
-#include "cogl-display-private.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-gtype-private.h"
 
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 #ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
-#include "winsys/cogl-winsys-egl-x11-private.h"
+#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
 #endif
 #ifdef COGL_HAS_GLX_SUPPORT
-#include "winsys/cogl-winsys-glx-private.h"
+#include "cogl/winsys/cogl-winsys-glx-private.h"
 #endif
 
 #ifdef COGL_HAS_XLIB
-#include "cogl-xlib-renderer.h"
+#include "cogl/cogl-xlib-renderer.h"
 #endif
 
 #ifdef HAVE_COGL_GL
diff --git a/cogl/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h
index ad8038da6..9a1d95ede 100644
--- a/cogl/cogl/cogl-renderer.h
+++ b/cogl/cogl/cogl-renderer.h
@@ -32,9 +32,9 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-onscreen-template.h>
-#include <cogl/cogl-output.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-onscreen-template.h"
+#include "cogl/cogl-output.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-sampler-cache-private.h b/cogl/cogl/cogl-sampler-cache-private.h
index 24592633f..48dc736dd 100644
--- a/cogl/cogl/cogl-sampler-cache-private.h
+++ b/cogl/cogl/cogl-sampler-cache-private.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "cogl-context.h"
-#include "cogl-gl-header.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-gl-header.h"
 
 /* These aren't defined in the GLES headers */
 #ifndef GL_CLAMP_TO_BORDER
diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c
index 9ec3160b6..4dbffd6c7 100644
--- a/cogl/cogl/cogl-sampler-cache.c
+++ b/cogl/cogl/cogl-sampler-cache.c
@@ -32,8 +32,8 @@
 
 #include "cogl-config.h"
 
-#include "cogl-sampler-cache-private.h"
-#include "cogl-context-private.h"
+#include "cogl/cogl-sampler-cache-private.h"
+#include "cogl/cogl-context-private.h"
 
 struct _CoglSamplerCache
 {
diff --git a/cogl/cogl/cogl-scanout.c b/cogl/cogl/cogl-scanout.c
index 11b6b2bd2..1f15e94a7 100644
--- a/cogl/cogl/cogl-scanout.c
+++ b/cogl/cogl/cogl-scanout.c
@@ -27,7 +27,7 @@
 
 #include "cogl-config.h"
 
-#include "cogl-scanout.h"
+#include "cogl/cogl-scanout.h"
 
 enum
 {
diff --git a/cogl/cogl/cogl-snippet-private.h b/cogl/cogl/cogl-snippet-private.h
index c603b149f..fa6c842c6 100644
--- a/cogl/cogl/cogl-snippet-private.h
+++ b/cogl/cogl/cogl-snippet-private.h
@@ -35,8 +35,8 @@
 
 #include <glib.h>
 
-#include "cogl-snippet.h"
-#include "cogl-object-private.h"
+#include "cogl/cogl-snippet.h"
+#include "cogl/cogl-object-private.h"
 
 /* These values are also used in the enum for CoglSnippetHook. They
    are copied here because we don't really want these names to be part
diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c
index d232a14f9..7b494cd61 100644
--- a/cogl/cogl/cogl-snippet.c
+++ b/cogl/cogl/cogl-snippet.c
@@ -33,10 +33,10 @@
 
 #include "cogl-config.h"
 
-#include "cogl-types.h"
-#include "cogl-snippet-private.h"
-#include "cogl-util.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-snippet-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void
 _cogl_snippet_free (CoglSnippet *snippet);
diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c
index 8f7eaf4e3..358e88416 100644
--- a/cogl/cogl/cogl-spans.c
+++ b/cogl/cogl/cogl-spans.c
@@ -32,8 +32,8 @@
 
 #include "math.h"
 
-#include "cogl-util.h"
-#include "cogl-spans.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-spans.h"
 
 void
 _cogl_span_iter_update (CoglSpanIter *iter)
diff --git a/cogl/cogl/cogl-spans.h b/cogl/cogl/cogl-spans.h
index d8c84b120..dbaacfecf 100644
--- a/cogl/cogl/cogl-spans.h
+++ b/cogl/cogl/cogl-spans.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-pipeline-layer-state.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-layer-state.h"
 
 typedef struct _CoglSpan
 {
diff --git a/cogl/cogl/cogl-sub-texture-private.h b/cogl/cogl/cogl-sub-texture-private.h
index 713ff3aaa..377d4e8b5 100644
--- a/cogl/cogl/cogl-sub-texture-private.h
+++ b/cogl/cogl/cogl-sub-texture-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-texture-private.h"
+#include "cogl/cogl-texture-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c
index 8e5d372f2..35e9d9802 100644
--- a/cogl/cogl/cogl-sub-texture.c
+++ b/cogl/cogl/cogl-sub-texture.c
@@ -33,16 +33,16 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-texture-private.h"
-#include "cogl-sub-texture-private.h"
-#include "cogl-sub-texture.h"
-#include "cogl-context-private.h"
-#include "cogl-object.h"
-#include "cogl-texture-driver.h"
-#include "cogl-texture-2d.h"
-#include "cogl-gtype-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-sub-texture-private.h"
+#include "cogl/cogl-sub-texture.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-texture-2d.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl-swap-chain-private.h b/cogl/cogl/cogl-swap-chain-private.h
index cd8d78d2a..2849e50d8 100644
--- a/cogl/cogl/cogl-swap-chain-private.h
+++ b/cogl/cogl/cogl-swap-chain-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
+#include "cogl/cogl-object-private.h"
 
 struct _CoglSwapChain
 {
diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c
index fdb3c4d6c..50ee936ef 100644
--- a/cogl/cogl/cogl-swap-chain.c
+++ b/cogl/cogl/cogl-swap-chain.c
@@ -31,11 +31,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-object.h"
+#include "cogl/cogl-object.h"
 
-#include "cogl-swap-chain-private.h"
-#include "cogl-swap-chain.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-swap-chain-private.h"
+#include "cogl/cogl-swap-chain.h"
+#include "cogl/cogl-gtype-private.h"
 
 static void _cogl_swap_chain_free (CoglSwapChain *swap_chain);
 
diff --git a/cogl/cogl/cogl-swap-chain.h b/cogl/cogl/cogl-swap-chain.h
index afdc0d8dd..dad43e880 100644
--- a/cogl/cogl/cogl-swap-chain.h
+++ b/cogl/cogl/cogl-swap-chain.h
@@ -32,7 +32,7 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-types.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-texture-2d-private.h b/cogl/cogl/cogl-texture-2d-private.h
index 79abedd60..ee73c636f 100644
--- a/cogl/cogl/cogl-texture-2d-private.h
+++ b/cogl/cogl/cogl-texture-2d-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d.h"
 
 struct _CoglTexture2D
 {
diff --git a/cogl/cogl/cogl-texture-2d-sliced-private.h b/cogl/cogl/cogl-texture-2d-sliced-private.h
index 5428d30c1..0928b9a29 100644
--- a/cogl/cogl/cogl-texture-2d-sliced-private.h
+++ b/cogl/cogl/cogl-texture-2d-sliced-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-bitmap-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-sliced.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-sliced.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
index 7a49a4343..14c6f198c 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@@ -35,22 +35,22 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-private.h"
-#include "cogl-util.h"
-#include "cogl-bitmap.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-texture-2d-sliced-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-spans.h"
-#include "cogl-journal-private.h"
-#include "cogl-primitive-texture.h"
-#include "cogl-gtype-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-texture-2d-sliced-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-spans.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-primitive-texture.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
index 696fec8b0..9c9c5c28d 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.h
+++ b/cogl/cogl/cogl-texture-2d-sliced.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "cogl-context.h"
-#include "cogl-types.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-types.h"
 
 /**
  * SECTION:cogl-texture-2d-sliced
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index ffd0ceaf5..e205da388 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -33,19 +33,19 @@
 
 #include "cogl-config.h"
 
-#include "cogl-private.h"
-#include "cogl-util.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-gtype-private.h"
-#include "driver/gl/cogl-texture-2d-gl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
 #ifdef COGL_HAS_EGL_SUPPORT
-#include "winsys/cogl-winsys-egl-private.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 #endif
 
 #include <string.h>
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index 31beaff08..07cd45069 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -36,11 +36,11 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "cogl-context.h"
-#include "cogl-bitmap.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-bitmap.h"
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#include "cogl-egl-defines.h"
+#include "cogl/cogl-egl-defines.h"
 #endif
 
 G_BEGIN_DECLS
diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h
index d3466c6d5..1354c997d 100644
--- a/cogl/cogl/cogl-texture-private.h
+++ b/cogl/cogl/cogl-texture-private.h
@@ -30,16 +30,16 @@
 
 #pragma once
 
-#include "cogl-bitmap-private.h"
-#include "cogl-object-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-spans.h"
-#include "cogl-meta-texture.h"
-#include "cogl-framebuffer.h"
-#include "cogl-texture-2d.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-spans.h"
+#include "cogl/cogl-meta-texture.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-texture-2d.h"
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#include "cogl-egl-defines.h"
+#include "cogl/cogl-egl-defines.h"
 #endif
 
 typedef struct _CoglTextureVtable     CoglTextureVtable;
diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c
index 33dbacda0..343ec4155 100644
--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@@ -36,28 +36,28 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-bitmap.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-buffer-private.h"
-#include "cogl-pixel-buffer-private.h"
-#include "cogl-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-texture-2d-sliced-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-sub-texture-private.h"
-#include "cogl-atlas-texture-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-object-private.h"
-#include "cogl-offscreen-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl1-context.h"
-#include "cogl-sub-texture.h"
-#include "cogl-primitive-texture.h"
-#include "cogl-gtype-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-buffer-private.h"
+#include "cogl/cogl-pixel-buffer-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-texture-2d-sliced-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-sub-texture-private.h"
+#include "cogl/cogl-atlas-texture-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-sub-texture.h"
+#include "cogl/cogl-primitive-texture.h"
+#include "cogl/cogl-gtype-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
index 003f3fbac..ba61d3f98 100644
--- a/cogl/cogl/cogl-texture.h
+++ b/cogl/cogl/cogl-texture.h
@@ -48,12 +48,12 @@ typedef struct _CoglTexture CoglTexture;
 #define COGL_TEXTURE(X) ((CoglTexture *)X)
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-macros.h>
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-pixel-buffer.h>
-#include <cogl/cogl-pixel-format.h>
-#include <cogl/cogl-bitmap.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-macros.h"
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-pixel-format.h"
+#include "cogl/cogl-bitmap.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index c87ac9cc1..077a1acac 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -38,8 +38,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-macros.h"
 #include <graphene.h>
 
 #include <glib.h>
diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c
index 84a8c5c30..f6d1dbb71 100644
--- a/cogl/cogl/cogl-util.c
+++ b/cogl/cogl/cogl-util.c
@@ -32,8 +32,8 @@
 
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-private.h"
 
 /*
  * cogl_util_next_p2:
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index 1253af3ef..658ca67b3 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -33,9 +33,9 @@
 #include <glib.h>
 #include <math.h>
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-pixel-format.h>
-#include "cogl-types.h"
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-pixel-format.h"
+#include "cogl/cogl-types.h"
 
 #include <stdio.h>
 
diff --git a/cogl/cogl/cogl-x11-onscreen.c b/cogl/cogl/cogl-x11-onscreen.c
index 2a4bf9e3b..019cca1ad 100644
--- a/cogl/cogl/cogl-x11-onscreen.c
+++ b/cogl/cogl/cogl-x11-onscreen.c
@@ -20,7 +20,7 @@
 
 #include "cogl-config.h"
 
-#include "cogl-x11-onscreen.h"
+#include "cogl/cogl-x11-onscreen.h"
 
 G_DEFINE_INTERFACE (CoglX11Onscreen, cogl_x11_onscreen,
                     G_TYPE_OBJECT)
diff --git a/cogl/cogl/cogl-x11-onscreen.h b/cogl/cogl/cogl-x11-onscreen.h
index 906fa6d7b..d5974fa5e 100644
--- a/cogl/cogl/cogl-x11-onscreen.h
+++ b/cogl/cogl/cogl-x11-onscreen.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <X11/Xlib.h>
 
-#include "cogl-macros.h"
+#include "cogl/cogl-macros.h"
 
 #define COGL_TYPE_X11_ONSCREEN (cogl_x11_onscreen_get_type ())
 COGL_EXPORT
diff --git a/cogl/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h
index 187ace8cf..703315ab9 100644
--- a/cogl/cogl/cogl-xlib-renderer-private.h
+++ b/cogl/cogl/cogl-xlib-renderer-private.h
@@ -32,11 +32,11 @@
 
 #include <X11/Xutil.h>
 
-#include "cogl-object-private.h"
-#include "cogl-xlib-private.h"
-#include "cogl-x11-renderer-private.h"
-#include "cogl-context.h"
-#include "cogl-output.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-xlib-private.h"
+#include "cogl/cogl-x11-renderer-private.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-output.h"
 
 typedef struct _CoglXlibRenderer
 {
diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
index 163fb32b5..c4ab91717 100644
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@@ -31,16 +31,16 @@
 
 #include "cogl-config.h"
 
-#include "cogl-xlib-renderer.h"
-#include "cogl-util.h"
-#include "cogl-object.h"
+#include "cogl/cogl-xlib-renderer.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-object.h"
 
-#include "cogl-output-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-xlib-renderer-private.h"
-#include "cogl-x11-renderer-private.h"
-#include "cogl-poll-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-output-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-xlib-renderer-private.h"
+#include "cogl/cogl-x11-renderer-private.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xdamage.h>
diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
index 6c643e519..ac6a0ee1f 100644
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -52,7 +52,7 @@
 
 #endif /* COGL_COMPILATION */
 
-#include <cogl/cogl-renderer.h>
+#include "cogl/cogl-renderer.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/cogl-xlib.h b/cogl/cogl/cogl-xlib.h
index 45b250c07..0e65991e1 100644
--- a/cogl/cogl/cogl-xlib.h
+++ b/cogl/cogl/cogl-xlib.h
@@ -53,9 +53,9 @@
 
 #endif /* COGL_COMPILATION */
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-xlib-renderer.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-xlib-renderer.h"
+#include "cogl/cogl-macros.h"
 
 /* The gobject introspection scanner seems to parse public headers in
  * isolation which means we need to be extra careful about how we
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index 469a64bb4..8038abfab 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -34,24 +34,24 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "cogl-i18n-private.h"
-#include "cogl-debug.h"
-#include "cogl-graphene.h"
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-journal-private.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-private.h"
-#include "cogl1-context.h"
-#include "cogl-offscreen.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-i18n-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-graphene.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-journal-private.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 GCallback
 cogl_get_proc_address (const char* name)
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 2d9e7563d..812a25fc5 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -53,19 +53,19 @@
  * API common to the 1.x and 2.0 api...
  */
 
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-macros.h"
 
-#include <cogl/cogl-object.h>
-#include <cogl/cogl1-context.h>
-#include <cogl/cogl-bitmap.h>
-#include <cogl/cogl-color.h>
-#include <cogl/cogl-dma-buf-handle.h>
-#include <cogl/cogl-matrix-stack.h>
-#include <cogl/cogl-offscreen.h>
-#include <cogl/cogl-pixel-format.h>
-#include <cogl/cogl-texture.h>
-#include <cogl/cogl-types.h>
+#include "cogl/cogl-object.h"
+#include "cogl/cogl1-context.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-color.h"
+#include "cogl/cogl-dma-buf-handle.h"
+#include "cogl/cogl-matrix-stack.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/cogl-pixel-format.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-types.h"
 
 /*
  * 1.x only api...
@@ -84,41 +84,41 @@
 #include <cogl/deprecated/cogl-shader.h>
 
 #ifdef COGL_ENABLE_MUTTER_API
-#include <cogl/cogl-mutter.h>
+#include "cogl/cogl-mutter.h"
 #endif
 
-#include <cogl/cogl-swap-chain.h>
-#include <cogl/cogl-renderer.h>
-#include <cogl/cogl-output.h>
-#include <cogl/cogl-display.h>
-#include <cogl/cogl-context.h>
-#include <cogl/cogl-buffer.h>
-#include <cogl/cogl-pixel-buffer.h>
-#include <cogl/cogl-texture-2d.h>
-#include <cogl/cogl-texture-2d-sliced.h>
-#include <cogl/cogl-sub-texture.h>
-#include <cogl/cogl-atlas-texture.h>
-#include <cogl/cogl-meta-texture.h>
-#include <cogl/cogl-primitive-texture.h>
-#include <cogl/cogl-index-buffer.h>
-#include <cogl/cogl-attribute-buffer.h>
-#include <cogl/cogl-indices.h>
-#include <cogl/cogl-attribute.h>
-#include <cogl/cogl-primitive.h>
-#include <cogl/cogl-depth-state.h>
-#include <cogl/cogl-pipeline.h>
-#include <cogl/cogl-pipeline-state.h>
-#include <cogl/cogl-pipeline-layer-state.h>
-#include <cogl/cogl-snippet.h>
-#include <cogl/cogl-framebuffer.h>
-#include <cogl/cogl-onscreen.h>
-#include <cogl/cogl-frame-info.h>
-#include <cogl/cogl-poll.h>
-#include <cogl/cogl-fence.h>
-#include <cogl/cogl-glib-source.h>
-#include <cogl/cogl-trace.h>
-#include <cogl/cogl-scanout.h>
-#include <cogl/cogl-graphene.h>
+#include "cogl/cogl-swap-chain.h"
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-output.h"
+#include "cogl/cogl-display.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-buffer.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-texture-2d.h"
+#include "cogl/cogl-texture-2d-sliced.h"
+#include "cogl/cogl-sub-texture.h"
+#include "cogl/cogl-atlas-texture.h"
+#include "cogl/cogl-meta-texture.h"
+#include "cogl/cogl-primitive-texture.h"
+#include "cogl/cogl-index-buffer.h"
+#include "cogl/cogl-attribute-buffer.h"
+#include "cogl/cogl-indices.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-primitive.h"
+#include "cogl/cogl-depth-state.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-pipeline-state.h"
+#include "cogl/cogl-pipeline-layer-state.h"
+#include "cogl/cogl-snippet.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-onscreen.h"
+#include "cogl/cogl-frame-info.h"
+#include "cogl/cogl-poll.h"
+#include "cogl/cogl-fence.h"
+#include "cogl/cogl-glib-source.h"
+#include "cogl/cogl-trace.h"
+#include "cogl/cogl-scanout.h"
+#include "cogl/cogl-graphene.h"
 /* XXX: This will definitely go away once all the Clutter winsys
  * code has been migrated down into Cogl! */
 #include <cogl/deprecated/cogl-clutter.h>
diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h
index e7bdcdf2c..182d98e7b 100644
--- a/cogl/cogl/cogl1-context.h
+++ b/cogl/cogl/cogl1-context.h
@@ -36,10 +36,10 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-texture.h>
-#include <cogl/cogl-framebuffer.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-texture.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-macros.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c
index 9bbdf1717..06038149e 100644
--- a/cogl/cogl/deprecated/cogl-clutter.c
+++ b/cogl/cogl/deprecated/cogl-clutter.c
@@ -34,17 +34,17 @@
 #include <glib.h>
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-types.h"
-#include "cogl-private.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-private.h"
 #ifdef COGL_HAS_XLIB
-#include "cogl-xlib-renderer.h"
+#include "cogl/cogl-xlib-renderer.h"
 #endif
-#include "winsys/cogl-winsys-private.h"
-#include "deprecated/cogl-clutter.h"
+#include "cogl/winsys/cogl-winsys-private.h"
+#include "cogl/deprecated/cogl-clutter.h"
 
 gboolean
 cogl_clutter_winsys_has_feature (CoglWinsysFeature feature)
diff --git a/cogl/cogl/deprecated/cogl-program-private.h b/cogl/cogl/deprecated/cogl-program-private.h
index eaa3a5e44..911c33f34 100644
--- a/cogl/cogl/deprecated/cogl-program-private.h
+++ b/cogl/cogl/deprecated/cogl-program-private.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-shader-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/deprecated/cogl-shader-private.h"
 
 typedef struct _CoglProgram CoglProgram;
 
diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
index fe75e8e68..acbc50cc0 100644
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@@ -30,12 +30,12 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
 
-#include "deprecated/cogl-shader-private.h"
-#include "deprecated/cogl-program-private.h"
+#include "cogl/deprecated/cogl-shader-private.h"
+#include "cogl/deprecated/cogl-program-private.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/deprecated/cogl-shader-private.h b/cogl/cogl/deprecated/cogl-shader-private.h
index a9552dac4..74b2ab47e 100644
--- a/cogl/cogl/deprecated/cogl-shader-private.h
+++ b/cogl/cogl/deprecated/cogl-shader-private.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
-#include "cogl-shader.h"
-#include "cogl-gl-header.h"
-#include "cogl-pipeline.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/deprecated/cogl-shader.h"
+#include "cogl/cogl-gl-header.h"
+#include "cogl/cogl-pipeline.h"
 
 typedef struct _CoglShader CoglShader;
 
diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
index fb1b7ae28..0266af6cc 100644
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@@ -30,11 +30,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-glsl-shader-boilerplate.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "deprecated/cogl-shader-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-glsl-shader-boilerplate.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/deprecated/cogl-shader-private.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
index 88d5e730c..7e4e32a82 100644
--- a/cogl/cogl/deprecated/cogl-shader.h
+++ b/cogl/cogl/deprecated/cogl-shader.h
@@ -34,9 +34,9 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include <cogl/cogl-types.h>
-#include <cogl/cogl-defines.h>
-#include <cogl/cogl-macros.h>
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-macros.h"
 
 G_BEGIN_DECLS
 
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl-private.h b/cogl/cogl/driver/gl/cogl-attribute-gl-private.h
index b12e21b99..50fb3a2f8 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl-private.h
@@ -33,10 +33,10 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-framebuffer.h"
-#include "cogl-attribute.h"
-#include "cogl-attribute-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-attribute-private.h"
 
 void
 _cogl_gl_flush_attributes_state (CoglFramebuffer *framebuffer,
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
index d619e286f..7784fd70e 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@@ -36,15 +36,15 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-context-private.h"
-#include "cogl-attribute.h"
-#include "cogl-attribute-private.h"
-#include "driver/gl/cogl-attribute-gl-private.h"
-#include "driver/gl/cogl-buffer-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/driver/gl/cogl-attribute-gl-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 typedef struct _ForeachChangedBitState
 {
diff --git a/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h b/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h
index 90541d062..3b12f167f 100644
--- a/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-bitmap-private.h"
+#include "cogl/cogl-bitmap-private.h"
 
 /* These two are replacements for map and unmap that should used when
  * the pointer is going to be passed to GL for pixel packing or
diff --git a/cogl/cogl/driver/gl/cogl-bitmap-gl.c b/cogl/cogl/driver/gl/cogl-bitmap-gl.c
index 8011d7fc8..2b46338cc 100644
--- a/cogl/cogl/driver/gl/cogl-bitmap-gl.c
+++ b/cogl/cogl/driver/gl/cogl-bitmap-gl.c
@@ -30,16 +30,16 @@
 
 #include "cogl-config.h"
 
-#include "cogl-util.h"
-#include "cogl-debug.h"
-#include "cogl-private.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-buffer-private.h"
-#include "cogl-pixel-buffer.h"
-#include "cogl-context-private.h"
-#include "cogl-gtype-private.h"
-#include "cogl-buffer-gl-private.h"
-#include "cogl-bitmap-gl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-buffer-private.h"
+#include "cogl/cogl-pixel-buffer.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/driver/gl/cogl-bitmap-gl-private.h"
 
 uint8_t *
 _cogl_bitmap_gl_bind (CoglBitmap *bitmap,
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
index e8fd48480..f9c11eda5 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
@@ -33,10 +33,10 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context.h"
-#include "cogl-buffer.h"
-#include "cogl-buffer-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-buffer.h"
+#include "cogl/cogl-buffer-private.h"
 
 void
 _cogl_buffer_gl_create (CoglBuffer *buffer);
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c
index cca19719f..a9f858320 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c
@@ -34,9 +34,9 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "driver/gl/cogl-buffer-gl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 /*
  * GL/GLES compatibility defines for the buffer API:
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h b/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h
index 9cfee7958..c240cb06f 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h
@@ -33,9 +33,9 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-framebuffer.h"
-#include "cogl-clip-stack.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-clip-stack.h"
 
 void
 _cogl_clip_stack_gl_flush (CoglClipStack *stack,
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
index 366cab3a1..ff8f0e1d7 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@@ -34,13 +34,13 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-graphene.h"
-#include "cogl-primitives-private.h"
-#include "cogl-primitive-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-clip-stack-gl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-graphene.h"
+#include "cogl/cogl-primitives-private.h"
+#include "cogl/cogl-primitive-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
 
 static void
 add_stencil_clip_rectangle (CoglFramebuffer *framebuffer,
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
index fd6e9df21..991895246 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
@@ -33,9 +33,9 @@
 
 #pragma once
 
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer-driver.h"
-#include "cogl-gl-header.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer-driver.h"
+#include "cogl/cogl-gl-header.h"
 
 #define COGL_TYPE_GL_FRAMEBUFFER (cogl_gl_framebuffer_get_type ())
 G_DECLARE_DERIVABLE_TYPE (CoglGlFramebuffer, cogl_gl_framebuffer,
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
index fc955262d..f5592e902 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -31,15 +31,15 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-framebuffer.h"
-#include "cogl-offscreen-private.h"
-#include "cogl-texture-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-framebuffer-gl-private.h"
-#include "driver/gl/cogl-bitmap-gl-private.h"
-#include "driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-bitmap-gl-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
index 94154d48e..99af31fb9 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
@@ -27,14 +27,14 @@
 
 #include "cogl-config.h"
 
-#include "driver/gl/cogl-gl-framebuffer-back.h"
+#include "cogl/driver/gl/cogl-gl-framebuffer-back.h"
 
 #include <gio/gio.h>
 
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-offscreen-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 struct _CoglGlFramebufferBack
 {
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h
index 714154c9f..293d3398a 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
 
 #define COGL_TYPE_GL_FRAMEBUFFER_BACK (cogl_gl_framebuffer_back_get_type ())
 G_DECLARE_FINAL_TYPE (CoglGlFramebufferBack, cogl_gl_framebuffer_back,
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
index 3ea133d31..ebd5c5e0f 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
@@ -27,15 +27,15 @@
 
 #include "cogl-config.h"
 
-#include "driver/gl/cogl-gl-framebuffer-fbo.h"
+#include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h"
 
 #include <gio/gio.h>
 
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-offscreen-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-offscreen-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 typedef struct _CoglGlFbo
 {
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h
index b06689a3c..cc1598998 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "driver/gl/cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
 
 #define COGL_TYPE_GL_FRAMEBUFFER_FBO (cogl_gl_framebuffer_fbo_get_type ())
 G_DECLARE_FINAL_TYPE (CoglGlFramebufferFbo, cogl_gl_framebuffer_fbo,
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
index 8733e2a79..cee0268cd 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include "cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-private.h"
 
 extern const CoglPipelineFragend _cogl_pipeline_glsl_fragend;
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
index c386c43b2..b0d35f396 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@@ -36,19 +36,19 @@
 
 #include <string.h>
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-pipeline-layer-private.h"
-#include "cogl-blend-string.h"
-#include "cogl-snippet-private.h"
-#include "cogl-list.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-layer-private.h"
+#include "cogl/cogl-blend-string.h"
+#include "cogl/cogl-snippet-private.h"
+#include "cogl/cogl-list.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-pipeline-cache.h"
-#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-cache.h"
+#include "cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h"
 #include "deprecated/cogl-shader-private.h"
 #include "deprecated/cogl-program-private.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
index 72da810eb..187baf1a4 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-pipeline-private.h"
-#include "cogl-matrix-stack.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-matrix-stack.h"
 
 /*
  * cogl-pipeline.c owns the GPU's texture unit state so we have some
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index 79c98ff53..e987cd23b 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -33,17 +33,17 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-context-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-offscreen.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
 
-#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
index eeea83fd0..e5e113854 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-pipeline-private.h"
-#include "cogl-attribute-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-attribute-private.h"
 
 extern const CoglPipelineProgend _cogl_pipeline_glsl_progend;
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
index 9d94f12ce..74c2df5aa 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@@ -35,22 +35,22 @@
 
 #include <string.h>
 
-#include "cogl-util.h"
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "cogl-offscreen.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/cogl-offscreen.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-pipeline-cache.h"
-#include "cogl-pipeline-state-private.h"
-#include "cogl-attribute-private.h"
-#include "cogl-framebuffer-private.h"
-#include "driver/gl/cogl-pipeline-fragend-glsl-private.h"
-#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
-#include "driver/gl/cogl-pipeline-progend-glsl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-cache.h"
+#include "cogl/cogl-pipeline-state-private.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
 #include "deprecated/cogl-program-private.h"
 
 /* These are used to generalise updating some uniforms that are
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
index 5e4912f39..543a252c1 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include "cogl-pipeline-private.h"
+#include "cogl/cogl-pipeline-private.h"
 
 typedef struct _CoglPipelineVertendShaderState CoglPipelineVertendShaderState;
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
index 527eadeb3..052ba8dd4 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@@ -35,16 +35,16 @@
 
 #include <string.h>
 
-#include "cogl-context-private.h"
-#include "cogl-pipeline-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-pipeline-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "cogl-pipeline-state-private.h"
-#include "cogl-glsl-shader-boilerplate.h"
-#include "driver/gl/cogl-pipeline-vertend-glsl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-pipeline-state-private.h"
+#include "cogl/cogl-glsl-shader-boilerplate.h"
+#include "cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h"
 #include "deprecated/cogl-program-private.h"
 
 const CoglPipelineVertend _cogl_pipeline_glsl_vertend;
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
index 9d08ebdf1..077921f9e 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
@@ -33,9 +33,9 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context-private.h"
-#include "cogl-texture.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture.h"
 
 void
 _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d);
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
index 7a3a1a33a..6ba1092df 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -36,13 +36,13 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-2d-private.h"
-#include "driver/gl/cogl-texture-2d-gl-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 #if defined (COGL_HAS_EGL_SUPPORT)
 
diff --git a/cogl/cogl/driver/gl/cogl-texture-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-gl-private.h
index c69e4ccaf..3c2c3c31d 100644
--- a/cogl/cogl/driver/gl/cogl-texture-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-texture-gl-private.h
@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include "cogl-context.h"
+#include "cogl/cogl-context.h"
 
 void
 _cogl_texture_gl_prep_alignment_for_pixels_upload (CoglContext *ctx,
diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c
index f1367b0db..2644e3cd0 100644
--- a/cogl/cogl/driver/gl/cogl-texture-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-gl.c
@@ -31,11 +31,11 @@
 
 #include <strings.h>
 
-#include "cogl-context-private.h"
-#include "cogl-util.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
 static inline int
 calculate_alignment (int rowstride)
diff --git a/cogl/cogl/driver/gl/cogl-util-gl-private.h b/cogl/cogl/driver/gl/cogl-util-gl-private.h
index 05bb64c61..5e78d2bd3 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-util-gl-private.h
@@ -32,10 +32,10 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context.h"
-#include "cogl-gl-header.h"
-#include "cogl-texture.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-gl-header.h"
+#include "cogl/cogl-texture.h"
 
 /* In OpenGL ES context, GL_CONTEXT_LOST has a _KHR prefix */
 #ifndef GL_CONTEXT_LOST
diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
index ed5ee2525..c22444265 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@@ -32,13 +32,13 @@
 
 #include "cogl-config.h"
 
-#include "cogl-types.h"
-#include "cogl-context-private.h"
-#include "driver/gl/cogl-framebuffer-gl-private.h"
-#include "driver/gl/cogl-gl-framebuffer-fbo.h"
-#include "driver/gl/cogl-gl-framebuffer-back.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h"
+#include "cogl/driver/gl/cogl-gl-framebuffer-back.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
 
 /* This is a relatively new extension */
 #ifndef GL_PURGED_CONTEXT_RESET_NV
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index ec6f1f270..fff4bb09e 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -32,17 +32,17 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-context-private.h"
-#include "cogl-feature-private.h"
-#include "cogl-renderer-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-framebuffer-gl-private.h"
-#include "driver/gl/cogl-texture-2d-gl-private.h"
-#include "driver/gl/cogl-attribute-gl-private.h"
-#include "driver/gl/cogl-clip-stack-gl-private.h"
-#include "driver/gl/cogl-buffer-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
+#include "cogl/driver/gl/cogl-attribute-gl-private.h"
+#include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
 static gboolean
 _cogl_driver_gl_real_context_init (CoglContext *context)
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
index caee72b2c..6990feff3 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -35,18 +35,18 @@
 
 #include "cogl-config.h"
 
-#include "cogl-private.h"
-#include "cogl-util.h"
-#include "cogl-bitmap.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "driver/gl/cogl-bitmap-gl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/driver/gl/cogl-bitmap-gl-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index e328320a4..eda1e7275 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -32,17 +32,17 @@
 
 #include <string.h>
 
-#include "cogl-context-private.h"
-#include "cogl-feature-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-framebuffer-gl-private.h"
-#include "driver/gl/cogl-texture-2d-gl-private.h"
-#include "driver/gl/cogl-attribute-gl-private.h"
-#include "driver/gl/cogl-clip-stack-gl-private.h"
-#include "driver/gl/cogl-buffer-gl-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
+#include "cogl/driver/gl/cogl-attribute-gl-private.h"
+#include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
+#include "cogl/driver/gl/cogl-buffer-gl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 
 #ifndef GL_UNSIGNED_INT_24_8
 #define GL_UNSIGNED_INT_24_8 0x84FA
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
index 025943038..6c92f5880 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -35,18 +35,18 @@
 
 #include "cogl-config.h"
 
-#include "cogl-private.h"
-#include "cogl-util.h"
-#include "cogl-bitmap.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-pipeline.h"
-#include "cogl-context-private.h"
-#include "cogl-object-private.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "driver/gl/cogl-util-gl-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "driver/gl/cogl-bitmap-gl-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-bitmap.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-pipeline.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-util-gl-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/driver/gl/cogl-bitmap-gl-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop-private.h b/cogl/cogl/driver/nop/cogl-attribute-nop-private.h
index 0b1f84b36..50e04f627 100644
--- a/cogl/cogl/driver/nop/cogl-attribute-nop-private.h
+++ b/cogl/cogl/driver/nop/cogl-attribute-nop-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context-private.h"
 
 void
 _cogl_nop_flush_attributes_state (CoglFramebuffer *framebuffer,
diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c
index 40b6d5e7c..6b57b3826 100644
--- a/cogl/cogl/driver/nop/cogl-attribute-nop.c
+++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c
@@ -30,11 +30,11 @@
 
 #include "cogl-config.h"
 
-#include "cogl-types.h"
-#include "cogl-framebuffer.h"
-#include "cogl-attribute.h"
-#include "cogl-attribute-private.h"
-#include "cogl-attribute-nop-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-attribute.h"
+#include "cogl/cogl-attribute-private.h"
+#include "cogl/driver/nop/cogl-attribute-nop-private.h"
 
 void
 _cogl_nop_flush_attributes_state (CoglFramebuffer *framebuffer,
diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h b/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h
index 0bb1c96af..d5fdfd281 100644
--- a/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h
+++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context-private.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context-private.h"
 
 void
 _cogl_clip_stack_nop_flush (CoglClipStack *stack,
diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
index 3469965fb..e81901bcb 100644
--- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
+++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
@@ -30,9 +30,9 @@
 
 #include "cogl-config.h"
 
-#include "cogl-clip-stack.h"
-#include "cogl-clip-stack-nop-private.h"
-#include "cogl-framebuffer-private.h"
+#include "cogl/cogl-clip-stack.h"
+#include "cogl/driver/nop/cogl-clip-stack-nop-private.h"
+#include "cogl/cogl-framebuffer-private.h"
 
 void
 _cogl_clip_stack_nop_flush (CoglClipStack *stack,
diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
index f18e78873..4f2b3d17d 100644
--- a/cogl/cogl/driver/nop/cogl-driver-nop.c
+++ b/cogl/cogl/driver/nop/cogl-driver-nop.c
@@ -32,14 +32,14 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-context-private.h"
-#include "cogl-feature-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-texture-2d-nop-private.h"
-#include "cogl-attribute-nop-private.h"
-#include "cogl-clip-stack-nop-private.h"
-#include "driver/nop/cogl-nop-framebuffer.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/driver/nop/cogl-texture-2d-nop-private.h"
+#include "cogl/driver/nop/cogl-attribute-nop-private.h"
+#include "cogl/driver/nop/cogl-clip-stack-nop-private.h"
+#include "cogl/driver/nop/cogl-nop-framebuffer.h"
 
 static gboolean
 _cogl_driver_update_features (CoglContext *ctx,
diff --git a/cogl/cogl/driver/nop/cogl-nop-framebuffer.c b/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
index 3ab05338e..42f12df96 100644
--- a/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
+++ b/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
@@ -25,9 +25,9 @@
 
 #include "cogl-config.h"
 
-#include "cogl-nop-framebuffer.h"
+#include "cogl/driver/nop/cogl-nop-framebuffer.h"
 
-#include "cogl-framebuffer-private.h"
+#include "cogl/cogl-framebuffer-private.h"
 
 struct _CoglNopFramebuffer
 {
diff --git a/cogl/cogl/driver/nop/cogl-nop-framebuffer.h b/cogl/cogl/driver/nop/cogl-nop-framebuffer.h
index b8d435908..db9f3533e 100644
--- a/cogl/cogl/driver/nop/cogl-nop-framebuffer.h
+++ b/cogl/cogl/driver/nop/cogl-nop-framebuffer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "cogl-framebuffer-driver.h"
+#include "cogl/cogl-framebuffer-driver.h"
 
 #define COGL_TYPE_NOP_FRAMEBUFFER (cogl_nop_framebuffer_get_type ())
 G_DECLARE_FINAL_TYPE (CoglNopFramebuffer, cogl_nop_framebuffer,
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
index 63883ffd2..f1f5ed0ba 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
@@ -33,9 +33,9 @@
 
 #pragma once
 
-#include "cogl-types.h"
-#include "cogl-context-private.h"
-#include "cogl-texture.h"
+#include "cogl/cogl-types.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-texture.h"
 
 void
 _cogl_texture_2d_nop_free (CoglTexture2D *tex_2d);
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
index 4a9989553..f8dae44a1 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
@@ -36,9 +36,9 @@
 
 #include <string.h>
 
-#include "cogl-private.h"
-#include "cogl-texture-2d-nop-private.h"
-#include "cogl-texture-2d-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/driver/nop/cogl-texture-2d-nop-private.h"
+#include "cogl/cogl-texture-2d-private.h"
 
 void
 _cogl_texture_2d_nop_free (CoglTexture2D *tex_2d)
diff --git a/cogl/cogl/gl-prototypes/cogl-all-functions.h b/cogl/cogl/gl-prototypes/cogl-all-functions.h
index f98ea02f6..247157222 100644
--- a/cogl/cogl/gl-prototypes/cogl-all-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-all-functions.h
@@ -58,18 +58,18 @@
  */
 
 /* The functions in this file are part of the core GL,GLES1 and GLES2 apis */
-#include "cogl-core-functions.h"
+#include "cogl/gl-prototypes/cogl-core-functions.h"
 
 /* The functions in this file are core to GLES2 only but
  * may be extensions for GLES1 and GL */
-#include "cogl-in-gles2-core-functions.h"
+#include "cogl/gl-prototypes/cogl-in-gles2-core-functions.h"
 
 /* The functions in this file are core to GLES1 and GLES2 but not core
  * to GL but they may be extensions available for GL */
-#include "cogl-in-gles-core-functions.h"
+#include "cogl/gl-prototypes/cogl-in-gles-core-functions.h"
 
 /* These are GLSL shader APIs core to GL 2.0 and GLES2 */
-#include "cogl-glsl-functions.h"
+#include "cogl/gl-prototypes/cogl-glsl-functions.h"
 
 /* These are the core GL functions which are only available in big
    GL */
diff --git a/cogl/cogl/gl-prototypes/cogl-gles2-functions.h b/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
index aeb57a487..05b230efb 100644
--- a/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
@@ -29,15 +29,15 @@
  */
 
 /* The functions in this file are part of the core GL,GLES1 and GLES2 apis */
-#include "cogl-core-functions.h"
+#include "cogl/cogl-core-functions.h"
 
 /* The functions in this file are core to GLES1 and GLES2 but not core
  * to GL but they may be extensions available for GL */
-#include "cogl-in-gles-core-functions.h"
+#include "cogl/cogl-in-gles-core-functions.h"
 
 /* The functions in this file are core to GLES2 only but
  * may be extensions for GLES1 and GL */
-#include "cogl-in-gles2-core-functions.h"
+#include "cogl/cogl-in-gles2-core-functions.h"
 
 /* These are APIs for using GLSL used by GL and GLES2 */
-#include "cogl-glsl-functions.h"
+#include "cogl/cogl-glsl-functions.h"
diff --git a/cogl/cogl/winsys/cogl-glx-display-private.h b/cogl/cogl/winsys/cogl-glx-display-private.h
index 63be7a312..63ffb6ac3 100644
--- a/cogl/cogl/winsys/cogl-glx-display-private.h
+++ b/cogl/cogl/winsys/cogl-glx-display-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl-object-private.h"
+#include "cogl/cogl-object-private.h"
 
 typedef struct _CoglGLXCachedConfig
 {
diff --git a/cogl/cogl/winsys/cogl-glx-renderer-private.h b/cogl/cogl/winsys/cogl-glx-renderer-private.h
index 94ec39027..d996a4755 100644
--- a/cogl/cogl/winsys/cogl-glx-renderer-private.h
+++ b/cogl/cogl/winsys/cogl-glx-renderer-private.h
@@ -31,8 +31,9 @@
 #pragma once
 
 #include <gmodule.h>
-#include "cogl-object-private.h"
-#include "cogl-xlib-renderer-private.h"
+
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-xlib-renderer-private.h"
 
 typedef struct _CoglGLXRenderer
 {
@@ -94,7 +95,7 @@ typedef struct _CoglGLXRenderer
 
 #define COGL_WINSYS_FEATURE_END()
 
-#include "winsys/cogl-winsys-glx-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-glx-feature-functions.h"
 
 #undef COGL_WINSYS_FEATURE_BEGIN
 #undef COGL_WINSYS_FEATURE_FUNCTION
diff --git a/cogl/cogl/winsys/cogl-glx.h b/cogl/cogl/winsys/cogl-glx.h
index ba7bac7b9..7f6e6523b 100644
--- a/cogl/cogl/winsys/cogl-glx.h
+++ b/cogl/cogl/winsys/cogl-glx.h
@@ -55,7 +55,8 @@
 
 
 #include <GL/glx.h>
-#include <cogl/cogl-types.h>
+
+#include "cogl/cogl-types.h"
 
 /* The gobject introspection scanner seems to parse public headers in
  * isolation which means we need to be extra careful about how we
diff --git a/cogl/cogl/winsys/cogl-onscreen-egl.c b/cogl/cogl/winsys/cogl-onscreen-egl.c
index dc11c1be4..49514ff23 100644
--- a/cogl/cogl/winsys/cogl-onscreen-egl.c
+++ b/cogl/cogl/winsys/cogl-onscreen-egl.c
@@ -25,13 +25,13 @@
 
 #include "cogl-config.h"
 
-#include "winsys/cogl-onscreen-egl.h"
+#include "cogl/winsys/cogl-onscreen-egl.h"
 
-#include "cogl-context-private.h"
-#include "cogl-frame-info-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-trace.h"
-#include "winsys/cogl-winsys-egl-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-trace.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 
 typedef struct _CoglOnscreenEglPrivate
 {
diff --git a/cogl/cogl/winsys/cogl-onscreen-egl.h b/cogl/cogl/winsys/cogl-onscreen-egl.h
index 19d4da255..13662be60 100644
--- a/cogl/cogl/winsys/cogl-onscreen-egl.h
+++ b/cogl/cogl/winsys/cogl-onscreen-egl.h
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include "cogl-onscreen.h"
-#include "winsys/cogl-winsys-egl-private.h"
+#include "cogl/cogl-onscreen.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 
 #define COGL_TYPE_ONSCREEN_EGL (cogl_onscreen_egl_get_type ())
 COGL_EXPORT
diff --git a/cogl/cogl/winsys/cogl-onscreen-glx.c b/cogl/cogl/winsys/cogl-onscreen-glx.c
index f6d14fd50..05dd8ca1e 100644
--- a/cogl/cogl/winsys/cogl-onscreen-glx.c
+++ b/cogl/cogl/winsys/cogl-onscreen-glx.c
@@ -25,19 +25,19 @@
 
 #include "cogl-config.h"
 
-#include "winsys/cogl-onscreen-glx.h"
+#include "cogl/winsys/cogl-onscreen-glx.h"
 
 #include <GL/glx.h>
 #include <sys/time.h>
 
-#include "cogl-context-private.h"
-#include "cogl-frame-info-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-x11-onscreen.h"
-#include "cogl-xlib-renderer-private.h"
-#include "winsys/cogl-glx-display-private.h"
-#include "winsys/cogl-glx-renderer-private.h"
-#include "winsys/cogl-winsys-glx-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-x11-onscreen.h"
+#include "cogl/cogl-xlib-renderer-private.h"
+#include "cogl/winsys/cogl-glx-display-private.h"
+#include "cogl/winsys/cogl-glx-renderer-private.h"
+#include "cogl/winsys/cogl-winsys-glx-private.h"
 
 struct _CoglOnscreenGlx
 {
diff --git a/cogl/cogl/winsys/cogl-onscreen-glx.h b/cogl/cogl/winsys/cogl-onscreen-glx.h
index 1594075ca..266595aac 100644
--- a/cogl/cogl/winsys/cogl-onscreen-glx.h
+++ b/cogl/cogl/winsys/cogl-onscreen-glx.h
@@ -28,7 +28,7 @@
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 
-#include "cogl-onscreen.h"
+#include "cogl/cogl-onscreen.h"
 
 #define COGL_TYPE_ONSCREEN_GLX (cogl_onscreen_glx_get_type ())
 G_DECLARE_FINAL_TYPE (CoglOnscreenGlx, cogl_onscreen_glx,
diff --git a/cogl/cogl/winsys/cogl-onscreen-xlib.c b/cogl/cogl/winsys/cogl-onscreen-xlib.c
index 9030fd07d..51bcaa037 100644
--- a/cogl/cogl/winsys/cogl-onscreen-xlib.c
+++ b/cogl/cogl/winsys/cogl-onscreen-xlib.c
@@ -26,14 +26,14 @@
 
 #include "cogl-config.h"
 
-#include "winsys/cogl-onscreen-xlib.h"
+#include "cogl/winsys/cogl-onscreen-xlib.h"
 
-#include "cogl-context-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-x11-onscreen.h"
-#include "cogl-xlib-renderer-private.h"
-#include "winsys/cogl-onscreen-egl.h"
-#include "winsys/cogl-winsys-egl-x11-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-x11-onscreen.h"
+#include "cogl/cogl-xlib-renderer-private.h"
+#include "cogl/winsys/cogl-onscreen-egl.h"
+#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
 
 struct _CoglOnscreenXlib
 {
diff --git a/cogl/cogl/winsys/cogl-onscreen-xlib.h b/cogl/cogl/winsys/cogl-onscreen-xlib.h
index cc82b8bb3..2a8b942d1 100644
--- a/cogl/cogl/winsys/cogl-onscreen-xlib.h
+++ b/cogl/cogl/winsys/cogl-onscreen-xlib.h
@@ -26,9 +26,9 @@
 
 #pragma once
 
-#include "cogl-onscreen.h"
-#include "winsys/cogl-onscreen-egl.h"
-#include "winsys/cogl-winsys-egl-private.h"
+#include "cogl/cogl-onscreen.h"
+#include "cogl/winsys/cogl-onscreen-egl.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 
 #define COGL_TYPE_ONSCREEN_XLIB (cogl_onscreen_xlib_get_type ())
 G_DECLARE_FINAL_TYPE (CoglOnscreenXlib, cogl_onscreen_xlib,
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
index 894a66b2a..b340620df 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
@@ -40,9 +40,9 @@
 #include <GL/glx.h>
 #endif
 
-#include "cogl-object-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-pixmap-x11.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11.h"
 
 typedef struct _CoglDamageRectangle CoglDamageRectangle;
 
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index 05c6439dd..f6c5c48e1 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -35,26 +35,26 @@
 
 #include "cogl-config.h"
 
-#include "cogl-debug.h"
-#include "cogl-util.h"
-#include "cogl-texture-pixmap-x11.h"
-#include "cogl-texture-pixmap-x11-private.h"
-#include "cogl-bitmap-private.h"
-#include "cogl-texture-private.h"
-#include "cogl-texture-driver.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-texture-2d-sliced.h"
-#include "cogl-context-private.h"
-#include "cogl-display-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-object-private.h"
-#include "cogl-xlib.h"
-#include "cogl-xlib-renderer-private.h"
-#include "cogl-x11-renderer-private.h"
-#include "cogl-private.h"
-#include "cogl-gtype-private.h"
-#include "driver/gl/cogl-texture-gl-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-debug.h"
+#include "cogl/cogl-util.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
+#include "cogl/cogl-bitmap-private.h"
+#include "cogl/cogl-texture-private.h"
+#include "cogl/cogl-texture-driver.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-texture-2d-sliced.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-object-private.h"
+#include "cogl/cogl-xlib.h"
+#include "cogl/cogl-xlib-renderer-private.h"
+#include "cogl/cogl-x11-renderer-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-gtype-private.h"
+#include "cogl/driver/gl/cogl-texture-gl-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
index 8a1fddbdd..f39ed1c47 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
@@ -47,7 +47,7 @@
 
 #endif /* COGL_COMPILATION */
 
-#include <cogl/cogl-context.h>
+#include "cogl/cogl-context.h"
 
 #include <glib-object.h>
 
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index 4ef5c0928..c1136c6d8 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "cogl-defines.h"
-#include "cogl-context.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer-private.h"
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/cogl-defines.h"
+#include "cogl/cogl-context.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 /* XXX: depending on what version of Mesa you have then
  * eglQueryWaylandBuffer may take a wl_buffer or wl_resource argument
@@ -127,7 +127,7 @@ typedef struct _CoglRendererEGL
 
 #define COGL_WINSYS_FEATURE_END()
 
-#include "winsys/cogl-winsys-egl-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-egl-feature-functions.h"
 
 #undef COGL_WINSYS_FEATURE_BEGIN
 #undef COGL_WINSYS_FEATURE_FUNCTION
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h b/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
index 4ca14f15a..70b11360b 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "winsys/cogl-winsys-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
 
 COGL_EXPORT const CoglWinsysVtable *
 _cogl_winsys_egl_xlib_get_vtable (void);
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index bef385a55..af4df1814 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -35,21 +35,21 @@
 
 #include <X11/Xlib.h>
 
-#include "cogl-xlib-renderer-private.h"
-#include "cogl-xlib-renderer.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-display-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-texture-pixmap-x11-private.h"
-#include "cogl-texture-2d-private.h"
-#include "driver/gl/cogl-texture-2d-gl-private.h"
-#include "cogl-texture-2d.h"
-#include "cogl-poll-private.h"
-#include "winsys/cogl-onscreen-egl.h"
-#include "winsys/cogl-onscreen-xlib.h"
-#include "winsys/cogl-winsys-egl-x11-private.h"
-#include "winsys/cogl-winsys-egl-private.h"
+#include "cogl/cogl-xlib-renderer-private.h"
+#include "cogl/cogl-xlib-renderer.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-display-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
+#include "cogl/cogl-texture-2d.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/winsys/cogl-onscreen-egl.h"
+#include "cogl/winsys/cogl-onscreen-xlib.h"
+#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 
 static const CoglWinsysEGLVtable _cogl_winsys_egl_vtable;
 
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index b3ba590ed..28aa0a268 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -32,21 +32,21 @@
 
 #include "cogl-config.h"
 
-#include "cogl-i18n-private.h"
-#include "cogl-util.h"
-#include "cogl-feature-private.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-swap-chain-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-onscreen-template-private.h"
-#include "cogl-egl.h"
-#include "cogl-private.h"
-#include "cogl-trace.h"
-#include "winsys/cogl-winsys-egl-private.h"
-#include "winsys/cogl-winsys-private.h"
-#include "winsys/cogl-onscreen-egl.h"
+#include "cogl/cogl-i18n-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-swap-chain-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-onscreen-template-private.h"
+#include "cogl/cogl-egl.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-trace.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
+#include "cogl/winsys/cogl-winsys-private.h"
+#include "cogl/winsys/cogl-onscreen-egl.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -89,7 +89,7 @@
 #define COGL_WINSYS_FEATURE_END()               \
   { NULL, 0 },                                  \
     };
-#include "winsys/cogl-winsys-egl-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-egl-feature-functions.h"
 
 /* Define an array of features */
 #undef COGL_WINSYS_FEATURE_BEGIN
@@ -106,7 +106,7 @@
 
 static const CoglFeatureData winsys_feature_data[] =
   {
-#include "winsys/cogl-winsys-egl-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-egl-feature-functions.h"
   };
 
 static GCallback
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 2e9e7af68..86e580831 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -32,30 +32,30 @@
 
 #include "cogl-config.h"
 
-#include "cogl-i18n-private.h"
-#include "cogl-util.h"
-#include "cogl-feature-private.h"
-#include "cogl-context-private.h"
-#include "cogl-framebuffer.h"
-#include "cogl-swap-chain-private.h"
-#include "cogl-renderer-private.h"
-#include "cogl-glx-renderer-private.h"
-#include "cogl-onscreen-template-private.h"
-#include "cogl-glx-display-private.h"
-#include "cogl-private.h"
-#include "cogl-texture-2d-private.h"
-#include "cogl-frame-info-private.h"
-#include "cogl-framebuffer-private.h"
-#include "cogl-onscreen-private.h"
-#include "cogl-swap-chain-private.h"
-#include "cogl-xlib-renderer.h"
-#include "cogl-util.h"
-#include "cogl-poll-private.h"
-#include "cogl-glx.h"
-#include "driver/gl/cogl-pipeline-opengl-private.h"
-#include "winsys/cogl-onscreen-glx.h"
-#include "winsys/cogl-winsys-private.h"
-#include "winsys/cogl-winsys-glx-private.h"
+#include "cogl/cogl-i18n-private.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-feature-private.h"
+#include "cogl/cogl-context-private.h"
+#include "cogl/cogl-framebuffer.h"
+#include "cogl/cogl-swap-chain-private.h"
+#include "cogl/cogl-renderer-private.h"
+#include "cogl/cogl-onscreen-template-private.h"
+#include "cogl/cogl-private.h"
+#include "cogl/cogl-texture-2d-private.h"
+#include "cogl/cogl-frame-info-private.h"
+#include "cogl/cogl-framebuffer-private.h"
+#include "cogl/cogl-onscreen-private.h"
+#include "cogl/cogl-swap-chain-private.h"
+#include "cogl/cogl-xlib-renderer.h"
+#include "cogl/cogl-util.h"
+#include "cogl/cogl-poll-private.h"
+#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/winsys/cogl-glx.h"
+#include "cogl/winsys/cogl-glx-renderer-private.h"
+#include "cogl/winsys/cogl-glx-display-private.h"
+#include "cogl/winsys/cogl-onscreen-glx.h"
+#include "cogl/winsys/cogl-winsys-private.h"
+#include "cogl/winsys/cogl-winsys-glx-private.h"
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -115,7 +115,7 @@ typedef struct _CoglTexturePixmapGLX
 #define COGL_WINSYS_FEATURE_END()               \
   { NULL, 0 },                                  \
     };
-#include "winsys/cogl-winsys-glx-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-glx-feature-functions.h"
 
 /* Define an array of features */
 #undef COGL_WINSYS_FEATURE_BEGIN
@@ -135,7 +135,7 @@ typedef struct _CoglTexturePixmapGLX
 
 static const CoglFeatureData winsys_feature_data[] =
   {
-#include "winsys/cogl-winsys-glx-feature-functions.h"
+#include "cogl/winsys/cogl-winsys-glx-feature-functions.h"
   };
 
 static GCallback
diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h
index df467eaaa..d415cf5a6 100644
--- a/cogl/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-private.h
@@ -30,23 +30,23 @@
 
 #pragma once
 
-#include "cogl-renderer.h"
-#include "cogl-scanout.h"
+#include "cogl/cogl-renderer.h"
+#include "cogl/cogl-scanout.h"
 
 #ifdef COGL_HAS_XLIB
-#include "cogl-texture-pixmap-x11-private.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
 #endif
 
 #ifdef COGL_HAS_XLIB
 #include <X11/Xutil.h>
-#include "cogl-texture-pixmap-x11-private.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
 #endif
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#include "cogl-egl-private.h"
+#include "cogl/cogl-egl-private.h"
 #endif
 
-#include "cogl-poll.h"
+#include "cogl/cogl-poll.h"
 
 COGL_EXPORT uint32_t
 _cogl_winsys_error_quark (void);
diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c
index 9eacd81c0..a8aa7b476 100644
--- a/cogl/cogl/winsys/cogl-winsys.c
+++ b/cogl/cogl/winsys/cogl-winsys.c
@@ -30,7 +30,7 @@
 
 #include "cogl-config.h"
 
-#include "cogl-context-private.h"
+#include "cogl/cogl-context-private.h"
 
 #include <gmodule.h>
 
diff --git a/src/backends/meta-input-device.c b/src/backends/meta-input-device.c
index 1c8a91e87..8cbff90c3 100644
--- a/src/backends/meta-input-device.c
+++ b/src/backends/meta-input-device.c
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "backends/meta-backend-private.h"
-#include "meta-input-device-private.h"
+#include "backends/meta-input-device-private.h"
 
 typedef struct _MetaInputDevicePrivate MetaInputDevicePrivate;
 
diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c
index 684ab2d59..967b4435d 100644
--- a/src/backends/meta-input-mapper.c
+++ b/src/backends/meta-input-mapper.c
@@ -21,10 +21,10 @@
 #include "config.h"
 
 #include "backends/meta-input-device-private.h"
-#include "meta-input-mapper-private.h"
-#include "meta-monitor-manager-private.h"
-#include "meta-logical-monitor.h"
-#include "meta-backend-private.h"
+#include "backends/meta-input-mapper-private.h"
+#include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-backend-private.h"
 
 #include "meta-dbus-input-mapping.h"
 
diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
index 9516f9b95..62c7f19eb 100644
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 #include <graphene.h>
 
 #ifdef HAVE_GNOME_DESKTOP
diff --git a/src/backends/meta-stage-view.c b/src/backends/meta-stage-view.c
index 2dae2c78d..fef051f81 100644
--- a/src/backends/meta-stage-view.c
+++ b/src/backends/meta-stage-view.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "meta-stage-view-private.h"
+#include "backends/meta-stage-view-private.h"
 
 typedef struct _MetaStageViewPrivate
 {
diff --git a/src/backends/native/meta-pointer-constraint-native.c b/src/backends/native/meta-pointer-constraint-native.c
index eec237c72..ac3e31187 100644
--- a/src/backends/native/meta-pointer-constraint-native.c
+++ b/src/backends/native/meta-pointer-constraint-native.c
@@ -28,7 +28,7 @@
 #include <wayland-server.h>
 
 #include "core/meta-border.h"
-#include "meta-pointer-constraint-native.h"
+#include "backends/native/meta-pointer-constraint-native.h"
 
 struct _MetaPointerConstraintImplNative
 {
diff --git a/src/compositor/meta-window-drag.c b/src/compositor/meta-window-drag.c
index 455ea50eb..178bcce60 100644
--- a/src/compositor/meta-window-drag.c
+++ b/src/compositor/meta-window-drag.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "meta-window-drag.h"
+#include "compositor/meta-window-drag.h"
 
 #include "compositor/compositor-private.h"
 #include "compositor/edge-resistance.h"
diff --git a/src/wayland/meta-wayland-data-offer-primary.c b/src/wayland/meta-wayland-data-offer-primary.c
index 98f9c69ae..89a5a3c13 100644
--- a/src/wayland/meta-wayland-data-offer-primary.c
+++ b/src/wayland/meta-wayland-data-offer-primary.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include "meta-wayland-data-offer-primary.h"
-
 #include <gio/gunixoutputstream.h>
 #include <glib-unix.h>
 #include <glib.h>
@@ -36,6 +34,7 @@
 #include "core/display-private.h"
 #include "primary-selection-unstable-v1-server-protocol.h"
 #include "wayland/meta-wayland-data-offer.h"
+#include "wayland/meta-wayland-data-offer-primary.h"
 #include "wayland/meta-wayland-private.h"
 
 static MetaDisplay *
diff --git a/src/wayland/meta-wayland-data-offer-primary.h b/src/wayland/meta-wayland-data-offer-primary.h
index 8bbd7c709..c96a6511c 100644
--- a/src/wayland/meta-wayland-data-offer-primary.h
+++ b/src/wayland/meta-wayland-data-offer-primary.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "meta-wayland-data-offer.h"
+#include "wayland/meta-wayland-data-offer.h"
 
 MetaWaylandDataOffer * meta_wayland_data_offer_primary_new (MetaWaylandCompositor *compositor,
                                                             struct wl_resource    *target);
diff --git a/src/wayland/meta-wayland-data-offer.c b/src/wayland/meta-wayland-data-offer.c
index 4ccb7439e..a689da828 100644
--- a/src/wayland/meta-wayland-data-offer.c
+++ b/src/wayland/meta-wayland-data-offer.c
@@ -33,10 +33,9 @@
 
 #include "meta/meta-selection.h"
 #include "wayland/meta-wayland-data-device.h"
+#include "wayland/meta-wayland-data-offer.h"
 #include "wayland/meta-wayland-private.h"
 
-#include "meta-wayland-data-offer.h"
-
 #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \
                      WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \
                      WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
diff --git a/src/wayland/meta-wayland-data-source-primary.h b/src/wayland/meta-wayland-data-source-primary.h
index 249e70b2c..b39822486 100644
--- a/src/wayland/meta-wayland-data-source-primary.h
+++ b/src/wayland/meta-wayland-data-source-primary.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "meta-wayland-data-source.h"
+#include "wayland/meta-wayland-data-source.h"
 
 #define META_TYPE_WAYLAND_DATA_SOURCE_PRIMARY (meta_wayland_data_source_primary_get_type ())
 G_DECLARE_FINAL_TYPE (MetaWaylandDataSourcePrimary,
diff --git a/src/wayland/meta-wayland-filter-manager.c b/src/wayland/meta-wayland-filter-manager.c
index 9f1e3efd5..0e30ce916 100644
--- a/src/wayland/meta-wayland-filter-manager.c
+++ b/src/wayland/meta-wayland-filter-manager.c
@@ -19,9 +19,8 @@
 
 #include "config.h"
 
-#include "meta-wayland-filter-manager.h"
-
-#include "meta-wayland.h"
+#include "wayland/meta-wayland-filter-manager.h"
+#include "wayland/meta-wayland.h"
 
 struct _MetaWaylandFilterManager
 {
diff --git a/src/wayland/meta-wayland-presentation-time.c b/src/wayland/meta-wayland-presentation-time.c
index 5adab977e..3a0b8780d 100644
--- a/src/wayland/meta-wayland-presentation-time.c
+++ b/src/wayland/meta-wayland-presentation-time.c
@@ -22,12 +22,11 @@
 
 #include "config.h"
 
-#include "meta-wayland-presentation-time-private.h"
-
 #include <glib.h>
 
 #include "compositor/meta-surface-actor-wayland.h"
 #include "wayland/meta-wayland-cursor-surface.h"
+#include "wayland/meta-wayland-presentation-time-private.h"
 #include "wayland/meta-wayland-private.h"
 #include "wayland/meta-wayland-surface.h"
 #include "wayland/meta-wayland-outputs.h"
diff --git a/src/wayland/meta-wayland-viewporter.c b/src/wayland/meta-wayland-viewporter.c
index 85b1c77ed..9330e9965 100644
--- a/src/wayland/meta-wayland-viewporter.c
+++ b/src/wayland/meta-wayland-viewporter.c
@@ -22,14 +22,13 @@
 
 #include "config.h"
 
-#include "meta-wayland-viewporter.h"
-
 #include <glib.h>
 
 #include "wayland/meta-wayland-private.h"
 #include "wayland/meta-wayland-subsurface.h"
 #include "wayland/meta-wayland-surface.h"
 #include "wayland/meta-wayland-versions.h"
+#include "wayland/meta-wayland-viewporter.h"
 
 #include "viewporter-server-protocol.h"
 
diff --git a/src/x11/meta-sync-counter.c b/src/x11/meta-sync-counter.c
index 49274f639..36f05868e 100644
--- a/src/x11/meta-sync-counter.c
+++ b/src/x11/meta-sync-counter.c
@@ -19,11 +19,10 @@
 
 #include "config.h"
 
-#include "meta-sync-counter.h"
-
 #include "compositor/compositor-private.h"
 #include "core/window-private.h"
 #include "meta/meta-x11-errors.h"
+#include "x11/meta-sync-counter.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/window-x11-private.h"