diff --git a/clutter/.gitignore b/clutter/.gitignore
index 77be91036..f4cd56cef 100644
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@@ -18,9 +18,6 @@ stamp-enum-types
 stamp-marshal
 tags
 /ChangeLog*
-clutter-build-config.h
-clutter-build-config.h.in
-clutter-config.h
 clutter-enum-types.[ch]
 clutter-marshal.[ch]
 gcov-report.txt
diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c
index 6b809fb36..6b37ae90e 100644
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -66,7 +66,7 @@
  *
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/clutter/clutter/cally/cally-clone.c b/clutter/clutter/cally/cally-clone.c
index 16acf6fcb..382b99cb7 100644
--- a/clutter/clutter/cally/cally-clone.c
+++ b/clutter/clutter/cally/cally-clone.c
@@ -66,7 +66,7 @@
  * a11y POV should still be managed as a image (with the proper properties,
  * position, size, etc.).
  */
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cally/cally-clone.h"
 #include "cally/cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-root.c b/clutter/clutter/cally/cally-root.c
index 93cacc914..7048a4b2f 100644
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@@ -33,7 +33,7 @@
  * [class@Clutter.StageManager]).
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cally/cally-root.h"
 
diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c
index 3600b60fb..1f623ed46 100644
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally/cally-stage.c
@@ -31,7 +31,7 @@
  * being a canvas. Anyway, this is required for applications using
  * just clutter, or directly [class@Clutter.Stage]
  */
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cally/cally-stage.h"
 #include "cally/cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c
index b34ddc592..57775f111 100644
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@@ -35,7 +35,7 @@
  * [class@Clutter.Text], #AtkText and #AtkEditableText
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cally/cally-text.h"
 #include "cally/cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c
index 3228015e2..f2a6c0f25 100644
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -35,7 +35,7 @@
  * available any accessible object.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -128,7 +128,7 @@ cally_util_get_toolkit_name (void)
 static const gchar *
 cally_util_get_toolkit_version (void)
 {
-  return MUTTER_VERSION;
+  return VERSION;
 }
 
 static guint
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index b51e621f7..bc9875c71 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
diff --git a/clutter/clutter/clutter-action.c b/clutter/clutter/clutter-action.c
index 762699a32..9b0b7a8fb 100644
--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@@ -38,7 +38,7 @@
  * various event-related signals provided by [class@Actor] itself.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-action.h"
 #include "clutter/clutter-action-private.h"
diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c
index 37115baca..33dcd041c 100644
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -1,4 +1,4 @@
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c
index 29d64c5d1..357c0f951 100644
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -38,7 +38,7 @@
  * any kind of modification.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-actor-meta-private.h"
 
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index fab0d4fd3..d4b9fca81 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -479,7 +479,7 @@
  * ```
  */
 
-#include "clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
@@ -3566,7 +3566,7 @@ clutter_actor_paint (ClutterActor        *self,
   if (!clutter_actor_is_mapped (self))
     return;
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   COGL_TRACE_SCOPED_ANCHOR (ClutterActorPaint);
 
   if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))
@@ -8734,7 +8734,7 @@ clutter_actor_allocate (ClutterActor          *self,
       !clutter_actor_has_mapped_clones (self))
     return;
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   COGL_TRACE_SCOPED_ANCHOR (ClutterActorAllocate);
 
   if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))
diff --git a/clutter/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c
index 9421da710..7c5158c4c 100644
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@@ -32,7 +32,7 @@
  * [class@Actor] using an alignment factor
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-align-constraint.h"
 
diff --git a/clutter/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c
index 628b6f1da..1359c4b19 100644
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -36,7 +36,7 @@
  * depending on a progress factor, expressed as a floating point value.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-animatable.h"
 #include "clutter/clutter-interval.h"
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index 2c6da4210..5df1178ef 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -37,7 +37,7 @@
  * and settings.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-backend-private.h"
 #include "clutter/clutter-debug.h"
@@ -222,7 +222,7 @@ clutter_backend_real_create_context (ClutterBackend  *backend,
 
   drivers_list = g_getenv ("CLUTTER_DRIVER");
   if (drivers_list == NULL)
-    drivers_list = CLUTTER_DRIVERS;
+    drivers_list = "*";
 
   known_drivers = g_strsplit (drivers_list, ",", 0);
 
diff --git a/clutter/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c
index 8db29a0d5..e66147886 100644
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -30,7 +30,7 @@
  * across the whole API.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-types.h"
 #include "clutter/clutter-private.h"
diff --git a/clutter/clutter/clutter-bezier.c b/clutter/clutter/clutter-bezier.c
index 7914de9f1..d6d2a1543 100644
--- a/clutter/clutter/clutter-bezier.c
+++ b/clutter/clutter/clutter-bezier.c
@@ -21,7 +21,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/clutter/clutter/clutter-bin-layout.c b/clutter/clutter/clutter-bin-layout.c
index bf34f63a1..5ea81649b 100644
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -42,7 +42,7 @@
  * shows how to pack actors inside a #ClutterBinLayout.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c
index 15d9da318..9805a67dd 100644
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -81,7 +81,7 @@
  * ```
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c
index 2a1e529e8..60dc0d498 100644
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -93,7 +93,7 @@
  * key binding handler returned %FALSE.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-binding-pool.h"
 #include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c
index 7d5031b38..b08521bd6 100644
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -35,7 +35,7 @@
 #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/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-blur-effect.h"
 
diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c
index 34b3fbc54..5d1611f6f 100644
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@@ -46,7 +46,7 @@
  * #ClutterBoxLayout by using clutter_box_layout_set_spacing().
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c
index fed67cf69..069e2304d 100644
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -35,7 +35,7 @@
 #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/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-build-config.h.meson b/clutter/clutter/clutter-build-config.h.meson
deleted file mode 100644
index a859f78f9..000000000
--- a/clutter/clutter/clutter-build-config.h.meson
+++ /dev/null
@@ -1,11 +0,0 @@
-/* The prefix for our gettext translation domains. */
-#mesondefine GETTEXT_PACKAGE
-
-/* Mutter version */
-#mesondefine MUTTER_VERSION
-
-/* List of Cogl drivers */
-#mesondefine CLUTTER_DRIVERS
-
-/* Supports PangoFt2 */
-#mesondefine HAVE_PANGO_FT2
diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
index 1026e104e..f455470bf 100644
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -39,7 +39,7 @@
  * for an example of how to use #ClutterCanvas..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 #include <cairo-gobject.h>
diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c
index 10060634f..56023f37a 100644
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -87,7 +87,7 @@
  * ```
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-click-action.h"
 
diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
index 17f12a9f1..9624c2e53 100644
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -36,7 +36,7 @@
  * implementation.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-actor-private.h"
 #include "clutter/clutter-clone.h"
diff --git a/clutter/clutter/clutter-color-state.c b/clutter/clutter/clutter-color-state.c
index 21a7453d3..3146044a6 100644
--- a/clutter/clutter/clutter-color-state.c
+++ b/clutter/clutter/clutter-color-state.c
@@ -43,7 +43,7 @@
  * actor content is in pq or not, and things like that
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-color-state.h"
 
diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c
index 8d12fac08..25cd8ce95 100644
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@@ -21,7 +21,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c
index 7171bd0bf..33a1a643d 100644
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -35,7 +35,7 @@
 #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/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-colorize-effect.h"
 
diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
index 796103de3..f402c5e1f 100644
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -125,7 +125,7 @@
  * can be recovered at any point using clutter_actor_meta_get_actor().
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/clutter/clutter/clutter-content.c b/clutter/clutter/clutter-content.c
index 8531a0ff2..57a970cd4 100644
--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -34,7 +34,7 @@
  * to share the resources associated with painting the same content..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-actor-private.h"
 #include "clutter/clutter-content-private.h"
diff --git a/clutter/clutter/clutter-damage-history.c b/clutter/clutter/clutter-damage-history.c
index 32c14a17f..f2c8b2387 100644
--- a/clutter/clutter/clutter-damage-history.c
+++ b/clutter/clutter/clutter-damage-history.c
@@ -16,7 +16,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-damage-history.h"
 
diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c
index f8251f7d2..76286d3a2 100644
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -48,7 +48,7 @@
  * deformation algorithm.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 
diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c
index a0b582e1b..242299260 100644
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -37,7 +37,7 @@
 #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/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-easing.c b/clutter/clutter/clutter-easing.c
index 4fa7b74b4..635c7f411 100644
--- a/clutter/clutter/clutter-easing.c
+++ b/clutter/clutter/clutter-easing.c
@@ -1,4 +1,4 @@
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-easing.h"
 
diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c
index 76e690755..6c13c5e10 100644
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -159,7 +159,7 @@
  * ```
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-effect.h"
 
diff --git a/clutter/clutter/clutter-enum-types.c.in b/clutter/clutter/clutter-enum-types.c.in
index 9d0a1fcf3..d940283e0 100644
--- a/clutter/clutter/clutter-enum-types.c.in
+++ b/clutter/clutter/clutter-enum-types.c.in
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 #include "clutter/clutter-enum-types.h"
 /*** END file-header ***/
 
diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
index 51af8cb8c..286c6fb3b 100644
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-backend-private.h"
 #include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c
index 2b1007f2a..8eff2f512 100644
--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -35,7 +35,7 @@
  * run-time.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/clutter/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c
index a4c8f2272..2fed3d514 100644
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@@ -33,7 +33,7 @@
  * layout policies as #ClutterGroup.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-debug.h"
 #include "clutter/clutter-fixed-layout.h"
diff --git a/clutter/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c
index 2ca81b539..552bdd584 100644
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@@ -27,7 +27,7 @@
    need to do anything on top of the ClutterOffscreenEffect class so
    it only exists because that class is abstract */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-flatten-effect.h"
 #include "clutter/clutter-private.h"
diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c
index 989018fb8..bdfa01081 100644
--- a/clutter/clutter/clutter-flow-layout.c
+++ b/clutter/clutter/clutter-flow-layout.c
@@ -51,7 +51,7 @@
  * shows how to use the #ClutterFlowLayout.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c
index ab493e0b0..a4dc1eedc 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/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-frame-clock.h"
 
@@ -284,7 +284,7 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
         }
     }
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   if (G_UNLIKELY (cogl_is_tracing_enabled ()))
     {
       int64_t current_time_us;
@@ -710,7 +710,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
   ClutterFrameResult result;
   int64_t ideal_dispatch_time_us, lateness_us;
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   int64_t this_dispatch_ready_time_us;
   int64_t this_dispatch_time_us;
 
@@ -804,7 +804,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
       break;
     }
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   if (this_dispatch_ready_time_us != -1 &&
       G_UNLIKELY (cogl_is_tracing_enabled ()))
     {
diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c
index 89b9b2cf3..0fa0a4576 100644
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -81,7 +81,7 @@
  * instead.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 
 #include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-graphene.c b/clutter/clutter/clutter-graphene.c
index 3d245a858..d77be0eee 100644
--- a/clutter/clutter/clutter-graphene.c
+++ b/clutter/clutter/clutter-graphene.c
@@ -22,7 +22,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-graphene.h"
 
diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
index 404fa807c..a3a4048dd 100644
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -26,7 +26,7 @@
  *   Matthias Clasen
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
index c0cb09e03..aa9a25d4a 100644
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -34,7 +34,7 @@
  * for an example of how to use #ClutterImage..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-image.h"
 
diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c
index 09df40fc0..a020aeb87 100644
--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@@ -21,7 +21,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-input-device-tool.h"
 #include "clutter/clutter-private.h"
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index fe0dc911c..e9750cc66 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -32,7 +32,7 @@
  * its contents are usually defined by the Clutter backend in use.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-input-device.h"
 
diff --git a/clutter/clutter/clutter-input-focus.c b/clutter/clutter/clutter-input-focus.c
index 61dc48849..973882737 100644
--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@@ -17,7 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-input-focus.h"
 #include "clutter/clutter-input-focus-private.h"
diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c
index ec78ebe99..51c454c25 100644
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -17,7 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-event-private.h"
 #include "clutter/clutter-private.h"
diff --git a/clutter/clutter/clutter-input-only-action.c b/clutter/clutter/clutter-input-only-action.c
index 51e95ace4..e722704f4 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/clutter-build-config.h"
+#include "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 aec0feedd..7165dcc91 100644
--- a/clutter/clutter/clutter-input-only-actor.c
+++ b/clutter/clutter/clutter-input-only-actor.c
@@ -19,7 +19,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-input-only-actor.h"
 
diff --git a/clutter/clutter/clutter-input-pointer-a11y.c b/clutter/clutter/clutter-input-pointer-a11y.c
index 29f7fceee..143496352 100644
--- a/clutter/clutter/clutter-input-pointer-a11y.c
+++ b/clutter/clutter/clutter-input-pointer-a11y.c
@@ -21,7 +21,7 @@
  * mousetweaks Copyright (C) 2007-2010 Gerd Kohlberger <gerdko gmail com>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-backend-private.h"
 #include "clutter/clutter-enum-types.h"
diff --git a/clutter/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c
index 920d6277e..e448c6402 100644
--- a/clutter/clutter/clutter-interval.c
+++ b/clutter/clutter/clutter-interval.c
@@ -42,7 +42,7 @@
  * and value computation.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/clutter/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c
index b2dc8c388..369c7c7c5 100644
--- a/clutter/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter/clutter-keyframe-transition.c
@@ -60,7 +60,7 @@
  * interval..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-keyframe-transition.h"
 
diff --git a/clutter/clutter/clutter-keymap.c b/clutter/clutter/clutter-keymap.c
index 0cd442396..6c7b74274 100644
--- a/clutter/clutter/clutter-keymap.c
+++ b/clutter/clutter/clutter-keymap.c
@@ -17,7 +17,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-keymap-private.h"
 #include "clutter/clutter-private.h"
diff --git a/clutter/clutter/clutter-keysyms-table.c b/clutter/clutter/clutter-keysyms-table.c
index 98d9df986..50007f45f 100644
--- a/clutter/clutter/clutter-keysyms-table.c
+++ b/clutter/clutter/clutter-keysyms-table.c
@@ -1,4 +1,4 @@
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index f3618ddeb..46d00fa3f 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -88,7 +88,7 @@
  * the #ClutterActor child of the #ClutterActor.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
diff --git a/clutter/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c
index d8bb7b1ee..7fc2d6f2c 100644
--- a/clutter/clutter/clutter-layout-meta.c
+++ b/clutter/clutter/clutter-layout-meta.c
@@ -35,7 +35,7 @@
  * [class@Actor] using a [class@LayoutManager].
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-layout-meta.h"
 #include "clutter/clutter-debug.h"
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 26ed84f06..492a0c1f4 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -47,7 +47,7 @@
  * [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18)
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
index 6a5efa914..d479b7808 100644
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -85,7 +85,7 @@
  * of [vfunc@OffscreenEffect.create_pipeline].
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-offscreen-effect.h"
 
diff --git a/clutter/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c
index bd0cdc83c..62686e06e 100644
--- a/clutter/clutter/clutter-page-turn-effect.c
+++ b/clutter/clutter/clutter-page-turn-effect.c
@@ -33,7 +33,7 @@
  * A simple page turning effect
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-paint-context.c b/clutter/clutter/clutter-paint-context.c
index 3bae493a6..9a1a644c2 100644
--- a/clutter/clutter/clutter-paint-context.c
+++ b/clutter/clutter/clutter-paint-context.c
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-paint-context-private.h"
 #include "clutter/clutter-frame.h"
diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c
index 354f82f07..e3700641a 100644
--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -47,7 +47,7 @@
  * The `ClutterPaintNodeClass` structure contains only private data.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <gobject/gvaluecollector.h>
 #include <pango/pango.h>
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 3430f4a46..40ce4fb7c 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -23,7 +23,7 @@
  */
 
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-paint-node-private.h"
 
diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c
index a667ffd2d..035a39939 100644
--- a/clutter/clutter/clutter-paint-volume.c
+++ b/clutter/clutter/clutter-paint-volume.c
@@ -24,7 +24,7 @@
  *      Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/clutter/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c
index f791f7eea..850d4b0e7 100644
--- a/clutter/clutter/clutter-pan-action.c
+++ b/clutter/clutter/clutter-pan-action.c
@@ -51,7 +51,7 @@
  * when dragging.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-pan-action.h"
 
diff --git a/clutter/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c
index b39d4d8bb..064018997 100644
--- a/clutter/clutter/clutter-path-constraint.c
+++ b/clutter/clutter/clutter-path-constraint.c
@@ -34,7 +34,7 @@
  * control how far along the path the [class@Actor] should be..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-path-constraint.h"
 
diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c
index 140783600..2c0571376 100644
--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@@ -58,7 +58,7 @@
  * [method@Path.add_string] for details.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdarg.h>
diff --git a/clutter/clutter/clutter-pick-context.c b/clutter/clutter/clutter-pick-context.c
index bb3f26038..aa4f2e249 100644
--- a/clutter/clutter/clutter-pick-context.c
+++ b/clutter/clutter/clutter-pick-context.c
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-backend.h"
 #include "clutter/clutter-pick-context-private.h"
diff --git a/clutter/clutter/clutter-property-transition.c b/clutter/clutter/clutter-property-transition.c
index 4a0a2e0d4..4fa0b0e10 100644
--- a/clutter/clutter/clutter-property-transition.c
+++ b/clutter/clutter/clutter-property-transition.c
@@ -28,7 +28,7 @@
  * can be used to tween a property of a [iface@Animatable] instance.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-property-transition.h"
 
diff --git a/clutter/clutter/clutter-rotate-action.c b/clutter/clutter/clutter-rotate-action.c
index c44eb96dd..87cda42d4 100644
--- a/clutter/clutter/clutter-rotate-action.c
+++ b/clutter/clutter/clutter-rotate-action.c
@@ -31,7 +31,7 @@
  * the logic for recognizing rotate gestures using two touch points.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c
index 9c974eef3..2a7b588b1 100644
--- a/clutter/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter/clutter-scroll-actor.c
@@ -40,7 +40,7 @@
  * for an example of how to use #ClutterScrollActor..
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-scroll-actor.h"
 
diff --git a/clutter/clutter/clutter-seat.c b/clutter/clutter/clutter-seat.c
index b890e989d..0e4a4d4c7 100644
--- a/clutter/clutter/clutter-seat.c
+++ b/clutter/clutter/clutter-seat.c
@@ -21,7 +21,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-input-device-tool.h"
 #include "clutter/clutter-input-pointer-a11y-private.h"
diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c
index 8db59c9e0..80e8a3c76 100644
--- a/clutter/clutter/clutter-settings.c
+++ b/clutter/clutter/clutter-settings.c
@@ -15,7 +15,7 @@
  * for instance the default font name.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-settings.h"
 
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index 1740d0d6b..19b25e565 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -110,7 +110,7 @@
  * ```
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 
diff --git a/clutter/clutter/clutter-shader-types.c b/clutter/clutter/clutter-shader-types.c
index 6a217d094..25dae6f58 100644
--- a/clutter/clutter/clutter-shader-types.c
+++ b/clutter/clutter/clutter-shader-types.c
@@ -24,7 +24,7 @@
  *
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
diff --git a/clutter/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c
index 3c26e8573..f78e56efe 100644
--- a/clutter/clutter/clutter-snap-constraint.c
+++ b/clutter/clutter/clutter-snap-constraint.c
@@ -33,7 +33,7 @@
  * An offset can be applied to the constraint, to provide spacing.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c
index 138c6071f..03eff37cb 100644
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -35,7 +35,7 @@
  * be emitted
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-stage-manager-private.h"
 
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index 45ab7876d..bd803652c 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/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-stage-view.h"
 #include "clutter/clutter-stage-view-private.h"
diff --git a/clutter/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c
index 791a04235..95a36ab24 100644
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -1,4 +1,4 @@
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib-object.h>
 
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index a2104059a..0a63247a9 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -35,7 +35,7 @@
  * parent class corresponding function.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c
index 1d39dc646..2d864a582 100644
--- a/clutter/clutter/clutter-swipe-action.c
+++ b/clutter/clutter/clutter-swipe-action.c
@@ -35,7 +35,7 @@
  * the logic for recognizing swipe gestures.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-swipe-action.h"
 
diff --git a/clutter/clutter/clutter-tap-action.c b/clutter/clutter/clutter-tap-action.c
index 05e574c22..581d254c9 100644
--- a/clutter/clutter/clutter-tap-action.c
+++ b/clutter/clutter/clutter-tap-action.c
@@ -51,7 +51,7 @@
  * ```
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-tap-action.h"
 
diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c
index 2b55dc5b1..4bf3fc8e2 100644
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@@ -17,7 +17,7 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-text-buffer.h"
 #include "clutter/clutter-marshal.h"
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
index e65a3d5cb..c8be06ccc 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -37,7 +37,7 @@
  * [method@Text.set_selectable].
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/clutter/clutter/clutter-texture-content.c b/clutter/clutter/clutter-texture-content.c
index 78e2f6073..1ce8e5df1 100644
--- a/clutter/clutter/clutter-texture-content.c
+++ b/clutter/clutter/clutter-texture-content.c
@@ -24,7 +24,7 @@
  *   Robert Mader <robert.mader@posteo.de>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-texture-content.h"
 
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index 7ddbe9df7..6633d7568 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -74,7 +74,7 @@
  * [class@Transition].
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-timeline.h"
 
diff --git a/clutter/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c
index 6ce27a317..a36db8411 100644
--- a/clutter/clutter/clutter-transition-group.c
+++ b/clutter/clutter/clutter-transition-group.c
@@ -35,7 +35,7 @@
  * 5 seconds of the transition will be played.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-transition-group.h"
 
diff --git a/clutter/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c
index c31dcd0dd..d0312bcbb 100644
--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@@ -30,7 +30,7 @@
  * computes the interpolation between two values, stored by a [class@Interval].
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include "clutter/clutter-transition.h"
 
diff --git a/clutter/clutter/clutter-util.c b/clutter/clutter/clutter-util.c
index 50f98f60b..17d20990c 100644
--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@@ -30,7 +30,7 @@
  * Various miscellaneous utilility functions.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <fribidi.h>
 #include <math.h>
diff --git a/clutter/clutter/clutter-virtual-input-device.c b/clutter/clutter/clutter-virtual-input-device.c
index 99c9b7b73..7e2bf36ee 100644
--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@@ -21,7 +21,7 @@
  * Author: Jonas Ådahl <jadahl@gmail.com>
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <glib-object.h>
 
diff --git a/clutter/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c
index fe479c3e2..b2f3410f8 100644
--- a/clutter/clutter/clutter-zoom-action.c
+++ b/clutter/clutter/clutter-zoom-action.c
@@ -44,7 +44,7 @@
  * distance between two touch points.
  */
 
-#include "clutter/clutter-build-config.h"
+#include "config.h"
 
 #include <math.h>
 
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index befdfb410..e98db1100 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -244,21 +244,6 @@ cally_private_headers = [
 
 clutter_built_sources = []
 clutter_built_headers = []
-clutter_built_private_headers = []
-
-cdata = configuration_data()
-cdata.set_quoted('MUTTER_VERSION', meson.project_version())
-cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-cdata.set('CLUTTER_DRIVERS', '"*"')
-cdata.set('HAVE_PANGO_FT2', have_pango_ft2)
-
-clutter_build_config_h = configure_file(
-  input: 'clutter-build-config.h.meson',
-  output: 'clutter-build-config.h',
-  configuration: cdata,
-  install: false,
-)
-clutter_built_private_headers += clutter_build_config_h
 
 clutter_enum_types = gnome.mkenums('clutter-enum-types',
   sources: clutter_headers,
@@ -297,7 +282,7 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
   version: '0.0.0',
   soversion: 0,
   c_args: clutter_c_args,
-  include_directories: clutter_includes,
+  include_directories: [clutter_includes, top_includepath],
   dependencies: [clutter_deps],
   gnu_symbol_visibility: 'hidden',
   link_with: [
diff --git a/cogl/cogl-config.h.meson b/cogl/cogl-config.h.meson
deleted file mode 100644
index 56946b299..000000000
--- a/cogl/cogl-config.h.meson
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Have GL for rendering */
-#mesondefine HAVE_COGL_GL
-
-/* Have GLES 2.0 for rendering */
-#mesondefine HAVE_COGL_GLES2
-
-/* Enable unit tests */
-#mesondefine ENABLE_UNIT_TESTS
-
-#define COGL_CONFIG_H_INCLUDED 1
diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c
index 69b50139c..26354124d 100644
--- a/cogl/cogl-pango/cogl-pango-display-list.c
+++ b/cogl/cogl-pango/cogl-pango-display-list.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c
index 086c9b7f5..861fbbb55 100644
--- a/cogl/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl/cogl-pango/cogl-pango-fontmap.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 /* This is needed to get the Pango headers to export stuff needed to
    subclass */
diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c
index 820d28c30..13ffa6b30 100644
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
index b4e4edbe8..81237f4c2 100644
--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
index a86105d1d..7abefbc6a 100644
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -33,7 +33,7 @@
  *   Matthew Allum  <mallum@openedhand.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #ifndef PANGO_ENABLE_BACKEND
 #define PANGO_ENABLE_BACKEND 1
diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index d5f622f40..04cb1e9f1 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -25,7 +25,7 @@ libmutter_cogl_pango = shared_library('mutter-cogl-pango-' + libmutter_api_versi
   version: '0.0.0',
   soversion: 0,
   c_args: cogl_c_args,
-  include_directories: [cogl_includepath],
+  include_directories: [cogl_includepath, top_includepath],
   gnu_symbol_visibility: 'hidden',
   dependencies: [cogl_pango_deps],
   install_rpath: pkglibdir,
diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c
index 4e30624cb..6d380e320 100644
--- a/cogl/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl/cogl-atlas-texture.c
@@ -31,7 +31,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
index bc565d770..cb8c8a51a 100644
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@@ -29,7 +29,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-atlas.h"
 #include "cogl/cogl-rectangle-map.h"
diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c
index e7427af57..8abfd2b0e 100644
--- a/cogl/cogl/cogl-attribute-buffer.c
+++ b/cogl/cogl/cogl-attribute-buffer.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-attribute-buffer.h"
 #include "cogl/cogl-attribute-buffer-private.h"
diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
index 68ad20a53..b86d2b8d8 100644
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c
index fe9a71fb8..230aec693 100644
--- a/cogl/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl/cogl-bitmap-conversion.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-private.h"
 #include "cogl/cogl-bitmap-private.h"
diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c
index c4dc9df09..7c8d27468 100644
--- a/cogl/cogl/cogl-bitmap.c
+++ b/cogl/cogl/cogl-bitmap.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-debug.h"
diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c
index 4b547413e..17a6ed829 100644
--- a/cogl/cogl/cogl-bitmask.c
+++ b/cogl/cogl/cogl-bitmask.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
index 2ad6f08ea..50af35090 100644
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c
index 037d720a8..735f82a32 100644
--- a/cogl/cogl/cogl-blit.c
+++ b/cogl/cogl/cogl-blit.c
@@ -30,7 +30,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c
index c255cd807..6e13eee17 100644
--- a/cogl/cogl/cogl-boxed-value.c
+++ b/cogl/cogl/cogl-boxed-value.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c
index a5384946d..03b80fe0c 100644
--- a/cogl/cogl/cogl-buffer.c
+++ b/cogl/cogl/cogl-buffer.c
@@ -37,7 +37,7 @@
  * Pixel Buffers API.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
index 6d6ab67e4..019ec74d7 100644
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c
index f452849e6..d146d0ec9 100644
--- a/cogl/cogl/cogl-closure-list.c
+++ b/cogl/cogl/cogl-closure-list.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c
index 361a8f90d..3e7bc024e 100644
--- a/cogl/cogl/cogl-color.c
+++ b/cogl/cogl/cogl-color.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index fad7b0f67..be13933ec 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-mutter.h"
 #include "cogl/cogl-private.h"
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index d36d596e5..bb4ab2a1f 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -42,7 +42,6 @@
 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"
diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c
index ef456424d..2cf0eeb3b 100644
--- a/cogl/cogl/cogl-debug.c
+++ b/cogl/cogl/cogl-debug.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/cogl/cogl/cogl-defines.h.meson b/cogl/cogl/cogl-defines.h.meson
index 0e80f1282..9ae8204b0 100644
--- a/cogl/cogl/cogl-defines.h.meson
+++ b/cogl/cogl/cogl-defines.h.meson
@@ -27,21 +27,4 @@
  *
  */
 
-#include <poll.h>
 
-#define COGL_SYSDEF_POLLIN POLLIN
-#define COGL_SYSDEF_POLLPRI POLLPRI
-#define COGL_SYSDEF_POLLOUT POLLOUT
-#define COGL_SYSDEF_POLLERR POLLERR
-#define COGL_SYSDEF_POLLHUP POLLHUP
-#define COGL_SYSDEF_POLLNVAL POLLNVAL
-
-#mesondefine COGL_HAS_GL
-#mesondefine CLUTTER_COGL_HAS_GL
-#mesondefine COGL_HAS_GLX_SUPPORT
-#mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
-#mesondefine COGL_HAS_EGL_SUPPORT
-#mesondefine COGL_HAS_X11
-#mesondefine COGL_HAS_XLIB
-
-#mesondefine COGL_HAS_TRACING
diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c
index 15502e3e0..3a81422f3 100644
--- a/cogl/cogl/cogl-depth-state.c
+++ b/cogl/cogl/cogl-depth-state.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-depth-state-private.h"
diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index ffacf6155..08158e503 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-dma-buf-handle.c b/cogl/cogl/cogl-dma-buf-handle.c
index 3158b907d..d0387fea8 100644
--- a/cogl/cogl/cogl-dma-buf-handle.c
+++ b/cogl/cogl/cogl-dma-buf-handle.c
@@ -29,7 +29,7 @@
  *   Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-dma-buf-handle.h"
 
diff --git a/cogl/cogl/cogl-egl-defines.h.in b/cogl/cogl/cogl-egl-defines.h.in
index abdc1b9da..0318a7774 100644
--- a/cogl/cogl/cogl-egl-defines.h.in
+++ b/cogl/cogl/cogl-egl-defines.h.in
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 
 @COGL_EGL_INCLUDES@
 
-#endif /* COGL_HAS_EGL_SUPPORT */
+#endif /* HAVE_EGL */
diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c
index e5500b431..cdb4646af 100644
--- a/cogl/cogl/cogl-feature-private.c
+++ b/cogl/cogl/cogl-feature-private.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
index 25161d9b3..8b44b0a7a 100644
--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-fence.h"
diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c
index aada9b717..aca208407 100644
--- a/cogl/cogl/cogl-frame-info.c
+++ b/cogl/cogl/cogl-frame-info.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-frame-info-private.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-framebuffer-driver.c b/cogl/cogl/cogl-framebuffer-driver.c
index bfcd49a88..a1f595f1c 100644
--- a/cogl/cogl/cogl-framebuffer-driver.c
+++ b/cogl/cogl/cogl-framebuffer-driver.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-framebuffer-driver.h"
 
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 8853d17a9..fe9086a98 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
@@ -2159,7 +2159,7 @@ get_line_count (CoglVerticesMode mode, int n_vertices)
     }
     /* In the journal we are a bit sneaky and actually use GL_QUADS
      * which isn't actually a valid CoglVerticesMode! */
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
   else if (mode == GL_QUADS && (n_vertices % 4) == 0)
     {
       return n_vertices;
@@ -2247,7 +2247,7 @@ get_wire_line_indices (CoglContext *ctx,
     }
     /* In the journal we are a bit sneaky and actually use GL_QUADS
      * which isn't actually a valid CoglVerticesMode! */
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
   else if (mode == GL_QUADS && (n_vertices_in % 4) == 0)
     {
       for (i = 0; i < n_vertices_in; i += 4)
diff --git a/cogl/cogl/cogl-gl-header.h.in b/cogl/cogl/cogl-gl-header.h.in
index 4866956cd..f6214f230 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/cogl-defines.h"
+#include "config.h"
 
 @COGL_GL_HEADER_INCLUDES@
 
diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
index edaf6f37e..d04fb7a56 100644
--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-glib-source.h"
 #include "cogl/cogl-poll.h"
diff --git a/cogl/cogl/cogl-graphene.h b/cogl/cogl/cogl-graphene.h
index 42627b8ce..c16f95113 100644
--- a/cogl/cogl/cogl-graphene.h
+++ b/cogl/cogl/cogl-graphene.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-macros.h"
 #include "cogl/cogl-types.h"
 
diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c
index f50b8aa0d..6b3618baf 100644
--- a/cogl/cogl/cogl-index-buffer.c
+++ b/cogl/cogl/cogl-index-buffer.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-indices.h"
 #include "cogl/cogl-indices-private.h"
diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c
index f50b440a0..55a27b481 100644
--- a/cogl/cogl/cogl-indices.c
+++ b/cogl/cogl/cogl-indices.c
@@ -32,7 +32,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
index 59deec86d..def32953b 100644
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-list.c b/cogl/cogl/cogl-list.c
index 6844f178c..91f86b5cf 100644
--- a/cogl/cogl/cogl-list.c
+++ b/cogl/cogl/cogl-list.c
@@ -23,7 +23,7 @@
 
 /* This list implementation is based on the Wayland source code */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c
index f5808d672..c15583384 100644
--- a/cogl/cogl/cogl-magazine.c
+++ b/cogl/cogl/cogl-magazine.c
@@ -51,7 +51,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-memory-stack-private.h"
 #include "cogl/cogl-magazine-private.h"
diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index 7b5afb964..5504d465e 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-graphene.h"
diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c
index 18bd4add6..a7e29710b 100644
--- a/cogl/cogl/cogl-memory-stack.c
+++ b/cogl/cogl/cogl-memory-stack.c
@@ -54,7 +54,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-memory-stack-private.h"
 #include "cogl/cogl-list.h"
diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
index 1e9494528..8da0cdb68 100644
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@@ -30,7 +30,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-texture.h"
 #include "cogl/cogl-spans.h"
diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h
index 985295195..8eef5866c 100644
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@@ -30,27 +30,25 @@
 
 #pragma once
 
-#include "cogl-config.h"
-#include "cogl/cogl-defines.h"
+#include "config.h"
+#include "config.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>
+#ifdef HAVE_EGL
+#include "cogl/winsys/cogl-onscreen-egl.h"
+#include "cogl/winsys/cogl-winsys-egl-private.h"
 #endif
-#if defined (COGL_HAS_GLX_SUPPORT)
-#include <cogl/winsys/cogl-onscreen-glx.h>
+#ifdef HAVE_GLX
+#include "cogl/winsys/cogl-onscreen-glx.h"
 #endif
-#if defined (COGL_HAS_XLIB)
-#include <cogl/winsys/cogl-onscreen-xlib.h>
+#ifdef HAVE_X11
+#include "cogl/winsys/cogl-onscreen-xlib.h"
+#include "cogl/cogl-x11-onscreen.h"
 #endif
-#ifdef COGL_HAS_X11
-#include <cogl/cogl-x11-onscreen.h>
-#endif
-#include <cogl/winsys/cogl-winsys-private.h>
+#include "cogl/winsys/cogl-winsys-private.h"
 
 COGL_EXPORT
 void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c
index 164685dcc..e20397891 100644
--- a/cogl/cogl/cogl-node.c
+++ b/cogl/cogl/cogl-node.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-node-private.h"
diff --git a/cogl/cogl/cogl-offscreen.c b/cogl/cogl/cogl-offscreen.c
index e6877b8c8..3b0898596 100644
--- a/cogl/cogl/cogl-offscreen.c
+++ b/cogl/cogl/cogl-offscreen.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-framebuffer-private.h"
diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c
index 50914f32c..e5d5faa27 100644
--- a/cogl/cogl/cogl-onscreen-template.c
+++ b/cogl/cogl/cogl-onscreen-template.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-framebuffer-private.h"
 #include "cogl/cogl-onscreen-template-private.h"
diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
index 4a03f485b..f6b075c80 100644
--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <gio/gio.h>
 
diff --git a/cogl/cogl/cogl-output.c b/cogl/cogl/cogl-output.c
index e9410f96d..a161c999d 100644
--- a/cogl/cogl/cogl-output.c
+++ b/cogl/cogl/cogl-output.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-output-private.h"
 
diff --git a/cogl/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c
index 8cc64df4c..c591f6d4b 100644
--- a/cogl/cogl/cogl-pipeline-cache.c
+++ b/cogl/cogl/cogl-pipeline-cache.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-private.h"
diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c
index 2641ebd38..82c5873ce 100644
--- a/cogl/cogl/cogl-pipeline-debug.c
+++ b/cogl/cogl/cogl-pipeline-debug.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-debug.h"
diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c
index 86dc1352e..6ef29606d 100644
--- a/cogl/cogl/cogl-pipeline-hash-table.c
+++ b/cogl/cogl/cogl-pipeline-hash-table.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
index 33b62ec25..e30961bf3 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c
index 5ae59e258..c9894db6a 100644
--- a/cogl/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl/cogl-pipeline-layer.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h
index 77d49fb74..5d8f6b049 100644
--- a/cogl/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl/cogl-pipeline-private.h
@@ -47,11 +47,11 @@
 
 #include <glib.h>
 
-#if !(defined(HAVE_COGL_GL) || defined(HAVE_COGL_GLES2))
+#if !(defined(HAVE_GL) || defined(HAVE_GLES2))
 
 #error No drivers defined
 
-#endif /* defined(HAVE_COGL_GL) || defined(HAVE_COGL_GLES2) */
+#endif /* defined(HAVE_GL) || defined(HAVE_GLES2) */
 
 /* XXX: should I rename these as
  * COGL_PIPELINE_STATE_INDEX_XYZ... ?
diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c
index c4d2fcb9b..141b8eeb5 100644
--- a/cogl/cogl/cogl-pipeline-snippet.c
+++ b/cogl/cogl/cogl-pipeline-snippet.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c
index 4bfc90eda..0549d2f2e 100644
--- a/cogl/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl/cogl-pipeline-state.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-color-private.h"
diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
index 563b3eab4..5e724d04f 100644
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c
index 9d77244bd..7ececbd1b 100644
--- a/cogl/cogl/cogl-pixel-buffer.c
+++ b/cogl/cogl/cogl-pixel-buffer.c
@@ -37,7 +37,7 @@
  * Pixel Buffers API.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/cogl/cogl/cogl-pixel-format.c b/cogl/cogl/cogl-pixel-format.c
index cc0154c6b..a22fa6bae 100644
--- a/cogl/cogl/cogl-pixel-format.c
+++ b/cogl/cogl/cogl-pixel-format.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl-pixel-format.h b/cogl/cogl/cogl-pixel-format.h
index 9baf7981b..d5519c005 100644
--- a/cogl/cogl/cogl-pixel-format.h
+++ b/cogl/cogl/cogl-pixel-format.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-macros.h"
 
 #include <glib.h>
diff --git a/cogl/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c
index fd5e92178..25ffc2e42 100644
--- a/cogl/cogl/cogl-point-in-poly.c
+++ b/cogl/cogl/cogl-point-in-poly.c
@@ -34,7 +34,7 @@
  * http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-point-in-poly-private.h"
diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c
index 76715f5b9..6b160e6d1 100644
--- a/cogl/cogl/cogl-poll.c
+++ b/cogl/cogl/cogl-poll.c
@@ -30,7 +30,7 @@
  *  Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-poll.h"
 #include "cogl/cogl-poll-private.h"
diff --git a/cogl/cogl/cogl-poll.h b/cogl/cogl/cogl-poll.h
index ea17a7330..19f701e97 100644
--- a/cogl/cogl/cogl-poll.h
+++ b/cogl/cogl/cogl-poll.h
@@ -36,9 +36,18 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-context.h"
 
+#include <poll.h>
+
+#define COGL_SYSDEF_POLLIN POLLIN
+#define COGL_SYSDEF_POLLPRI POLLPRI
+#define COGL_SYSDEF_POLLOUT POLLOUT
+#define COGL_SYSDEF_POLLERR POLLERR
+#define COGL_SYSDEF_POLLHUP POLLHUP
+#define COGL_SYSDEF_POLLNVAL POLLNVAL
+
 G_BEGIN_DECLS
 
 /**
diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c
index c501d4f81..e703a6958 100644
--- a/cogl/cogl/cogl-primitive-texture.c
+++ b/cogl/cogl/cogl-primitive-texture.c
@@ -30,7 +30,7 @@
  *  Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-primitive-texture.h"
 #include "cogl/cogl-texture-private.h"
diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c
index 38f3a54e2..d31eeebd8 100644
--- a/cogl/cogl/cogl-primitive.c
+++ b/cogl/cogl/cogl-primitive.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-primitive.h"
diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
index dda12e75a..7f0cf3021 100644
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c
index 637e3298c..4d7af2c61 100644
--- a/cogl/cogl/cogl-profile.c
+++ b/cogl/cogl/cogl-profile.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #ifdef COGL_ENABLE_PROFILE
 
diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c
index e3f254372..ac0a587df 100644
--- a/cogl/cogl/cogl-rectangle-map.c
+++ b/cogl/cogl/cogl-rectangle-map.c
@@ -31,7 +31,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
index 0ef422556..996445816 100644
--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -61,7 +61,7 @@ struct _CoglRenderer
 
   GList *outputs;
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
   Display *foreign_xdpy;
   gboolean xlib_enable_event_retrieval;
   gboolean xlib_want_reset_on_video_memory_purge;
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index f17147cb8..6c5fa4db1 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <gio/gio.h>
 #include <stdlib.h>
@@ -46,22 +46,22 @@
 
 #include "cogl/winsys/cogl-winsys-private.h"
 
-#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
+#ifdef HAVE_EGL_PLATFORM_XLIB
 #include "cogl/winsys/cogl-winsys-egl-x11-private.h"
 #endif
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
 #include "cogl/winsys/cogl-winsys-glx-private.h"
 #endif
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 #include "cogl/cogl-xlib-renderer.h"
 #endif
 
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
 extern const CoglTextureDriver _cogl_texture_driver_gl;
 extern const CoglDriverVtable _cogl_driver_gl;
 #endif
-#ifdef HAVE_COGL_GLES2
+#ifdef HAVE_GLES2
 extern const CoglTextureDriver _cogl_texture_driver_gles;
 extern const CoglDriverVtable _cogl_driver_gles;
 #endif
@@ -85,7 +85,7 @@ typedef struct _CoglDriverDescription
 
 static CoglDriverDescription _cogl_drivers[] =
 {
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
   {
     COGL_DRIVER_GL3,
     "gl3",
@@ -96,7 +96,7 @@ static CoglDriverDescription _cogl_drivers[] =
     COGL_GL_LIBNAME,
   },
 #endif
-#ifdef HAVE_COGL_GLES2
+#ifdef HAVE_GLES2
   {
     COGL_DRIVER_GLES2,
     "gles2",
@@ -119,10 +119,10 @@ static CoglDriverDescription _cogl_drivers[] =
 
 static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 {
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
   _cogl_winsys_glx_get_vtable,
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
+#ifdef HAVE_EGL_PLATFORM_XLIB
   _cogl_winsys_egl_xlib_get_vtable,
 #endif
 };
@@ -203,14 +203,14 @@ cogl_renderer_new (void)
 
   _cogl_list_init (&renderer->idle_closures);
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
   renderer->xlib_enable_event_retrieval = TRUE;
 #endif
 
   return renderer;
 }
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 void
 cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
                                         Display *xdisplay)
@@ -244,7 +244,7 @@ cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
 
   renderer->xlib_want_reset_on_video_memory_purge = enable;
 }
-#endif /* COGL_HAS_XLIB */
+#endif /* HAVE_X11 */
 
 gboolean
 cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c
index 4dbffd6c7..9ce249e7f 100644
--- a/cogl/cogl/cogl-sampler-cache.c
+++ b/cogl/cogl/cogl-sampler-cache.c
@@ -30,7 +30,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-sampler-cache-private.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/cogl-scanout.c b/cogl/cogl/cogl-scanout.c
index 1f15e94a7..8999108c0 100644
--- a/cogl/cogl/cogl-scanout.c
+++ b/cogl/cogl/cogl-scanout.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-scanout.h"
 
diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c
index 47ddfc79d..8e14d5dc5 100644
--- a/cogl/cogl/cogl-snippet.c
+++ b/cogl/cogl/cogl-snippet.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-types.h"
 #include "cogl/cogl-snippet-private.h"
diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c
index 358e88416..4604d1c83 100644
--- a/cogl/cogl/cogl-spans.c
+++ b/cogl/cogl/cogl-spans.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "math.h"
 
diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c
index 667e41052..f02c8f8d3 100644
--- a/cogl/cogl/cogl-sub-texture.c
+++ b/cogl/cogl/cogl-sub-texture.c
@@ -31,7 +31,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-texture-private.h"
diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c
index a2fa15526..0919c642d 100644
--- a/cogl/cogl/cogl-swap-chain.c
+++ b/cogl/cogl/cogl-swap-chain.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-swap-chain-private.h"
 #include "cogl/cogl-swap-chain.h"
diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
index 63b559ff7..13411c42d 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@@ -33,7 +33,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-private.h"
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index a7e46e111..b58e9da39 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -31,7 +31,7 @@
  *  Neil Roberts   <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-private.h"
 #include "cogl/cogl-util.h"
@@ -42,7 +42,7 @@
 #include "cogl/cogl-journal-private.h"
 #include "cogl/cogl-framebuffer-private.h"
 #include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 #include "cogl/winsys/cogl-winsys-egl-private.h"
 #endif
 
@@ -450,7 +450,7 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
   return tex_2d;
 }
 
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
 /* NB: The reason we require the width, height and format to be passed
  * even though they may seem redundant is because GLES 1/2 don't
  * provide a way to query these properties. */
@@ -493,7 +493,7 @@ cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
 
   return tex;
 }
-#endif /* defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base) */
+#endif /* defined (HAVE_EGL) && defined (EGL_KHR_image_base) */
 
 void
 _cogl_texture_2d_externally_modified (CoglTexture *texture)
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index 1ef693567..30bb8a556 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -39,7 +39,7 @@
 #include "cogl/cogl-context.h"
 #include "cogl/cogl-bitmap.h"
 
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 #include "cogl/cogl-egl-defines.h"
 #endif
 
@@ -203,7 +203,7 @@ cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap);
 /**
  * cogl_egl_texture_2d_new_from_image: (skip)
  */
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
 /* NB: The reason we require the width, height and format to be passed
  * even though they may seem redundant is because GLES 1/2 don't
  * provide a way to query these properties. */
diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h
index 4e8e56da3..8c8a89225 100644
--- a/cogl/cogl/cogl-texture-private.h
+++ b/cogl/cogl/cogl-texture-private.h
@@ -37,7 +37,7 @@
 #include "cogl/cogl-framebuffer.h"
 #include "cogl/cogl-texture-2d.h"
 
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 #include "cogl/cogl-egl-defines.h"
 #endif
 
@@ -86,7 +86,7 @@ typedef struct _CoglTextureLoader
       int height; /* for 3d textures */
       int depth; /* for 3d textures */
     } bitmap;
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
     struct {
       EGLImageKHR image;
       int width;
@@ -95,7 +95,7 @@ typedef struct _CoglTextureLoader
       CoglEglImageFlags flags;
     } egl_image;
 #endif
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
     struct {
       int width;
       int height;
diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c
index 1596ae77b..8d3da97ab 100644
--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@@ -34,7 +34,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-bitmap.h"
diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
index 61552c9c2..2d409d041 100644
--- a/cogl/cogl/cogl-texture.h
+++ b/cogl/cogl/cogl-texture.h
@@ -35,7 +35,7 @@
 #endif
 
 #include "cogl/cogl-macros.h"
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-pixel-buffer.h"
 #include "cogl/cogl-pixel-format.h"
 #include "cogl/cogl-bitmap.h"
diff --git a/cogl/cogl/cogl-trace.c b/cogl/cogl/cogl-trace.c
index e2b350517..f0dbe98c6 100644
--- a/cogl/cogl/cogl-trace.c
+++ b/cogl/cogl/cogl-trace.c
@@ -25,11 +25,11 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-trace.h"
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
 
 #include <sysprof-capture.h>
 #include <sysprof-capture-writer.h>
@@ -387,4 +387,4 @@ cogl_set_tracing_disabled_on_thread (void *data)
   fprintf (stderr, "Tracing not enabled");
 }
 
-#endif /* COGL_HAS_TRACING */
+#endif /* HAVE_PROFILER */
diff --git a/cogl/cogl/cogl-trace.h b/cogl/cogl/cogl-trace.h
index 5d598bb02..49d6121c2 100644
--- a/cogl/cogl/cogl-trace.h
+++ b/cogl/cogl/cogl-trace.h
@@ -32,10 +32,10 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-macros.h"
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
 
 typedef struct _CoglTraceContext CoglTraceContext;
 
@@ -137,7 +137,7 @@ cogl_is_tracing_enabled (void)
       ScopedCoglTrace##Name = &CoglTrace##Name; \
     }
 
-#else /* COGL_HAS_TRACING */
+#else /* HAVE_PROFILER */
 
 #include <stdio.h>
 
@@ -169,4 +169,4 @@ void cogl_set_tracing_enabled_on_thread (void       *data,
 COGL_EXPORT
 void cogl_set_tracing_disabled_on_thread (void *data);
 
-#endif /* COGL_HAS_TRACING */
+#endif /* HAVE_PROFILER */
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index 776e08fc3..533f18464 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -38,7 +38,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "cogl/cogl-defines.h"
 #include "cogl/cogl-macros.h"
 #include <graphene.h>
 
diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c
index f6d1dbb71..797e7d36a 100644
--- a/cogl/cogl/cogl-util.c
+++ b/cogl/cogl/cogl-util.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index 658ca67b3..9b9b8e42f 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -33,17 +33,12 @@
 #include <glib.h>
 #include <math.h>
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-pixel-format.h"
 #include "cogl/cogl-types.h"
 
 #include <stdio.h>
 
-/* Double check that config.h has been included */
-#ifndef COGL_CONFIG_H_INCLUDED
-#error "cogl-config.h must be included before including cogl-util.h"
-#endif
-
 int
 _cogl_util_next_p2 (int a);
 
diff --git a/cogl/cogl/cogl-x11-onscreen.c b/cogl/cogl/cogl-x11-onscreen.c
index 4113d1e5e..d3550614d 100644
--- a/cogl/cogl/cogl-x11-onscreen.c
+++ b/cogl/cogl/cogl-x11-onscreen.c
@@ -16,7 +16,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-x11-onscreen.h"
 
diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
index 204004c3f..e2950d9b2 100644
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-xlib-renderer.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index 8038abfab..8a9b4c5fe 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 11d18d57d..55010b628 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -53,7 +53,6 @@
  * API common to the 1.x and 2.0 api...
  */
 
-#include "cogl/cogl-defines.h"
 #include "cogl/cogl-macros.h"
 
 #include "cogl/cogl1-context.h"
diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c
index 06038149e..f1fc685b1 100644
--- a/cogl/cogl/deprecated/cogl-clutter.c
+++ b/cogl/cogl/deprecated/cogl-clutter.c
@@ -29,7 +29,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <string.h>
@@ -40,7 +40,7 @@
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-framebuffer-private.h"
 #include "cogl/cogl-onscreen-private.h"
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 #include "cogl/cogl-xlib-renderer.h"
 #endif
 #include "cogl/winsys/cogl-winsys-private.h"
diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
index a67c8902a..9d257fd79 100644
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-context-private.h"
diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
index 55de081a4..85d4d8ae5 100644
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-glsl-shader-boilerplate.h"
diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
index e0d2783f8..d880886cd 100644
--- a/cogl/cogl/deprecated/cogl-shader.h
+++ b/cogl/cogl/deprecated/cogl-shader.h
@@ -35,7 +35,7 @@
 #endif
 
 #include "cogl/cogl-types.h"
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-macros.h"
 #include "cogl/deprecated/cogl-program.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
index dce33bbdc..53fed2a08 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@@ -32,7 +32,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/driver/gl/cogl-bitmap-gl.c b/cogl/cogl/driver/gl/cogl-bitmap-gl.c
index 4005fac93..9019b4612 100644
--- a/cogl/cogl/driver/gl/cogl-bitmap-gl.c
+++ b/cogl/cogl/driver/gl/cogl-bitmap-gl.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-util.h"
 #include "cogl/cogl-debug.h"
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c
index a9aa0911b..fd62a7bb1 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c
@@ -32,7 +32,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/driver/gl/cogl-buffer-gl-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
index 5c4df709b..a1fe2595b 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-graphene.h"
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
index c195c5e6d..6ea71831d 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-framebuffer-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
index 99af31fb9..a5bcd53bd 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/driver/gl/cogl-gl-framebuffer-back.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
index ebd5c5e0f..6880e4aff 100644
--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h"
 
@@ -374,7 +374,7 @@ try_creating_fbo (CoglContext                 *ctx,
     return FALSE;
 
   if (tex_gl_target != GL_TEXTURE_2D
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
       && tex_gl_target != GL_TEXTURE_RECTANGLE_ARB
 #endif
       )
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
index 3a4c6f90a..0a16f46d3 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@@ -32,7 +32,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index 0cf3acb21..a07c6a50b 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -31,7 +31,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-pipeline-private.h"
@@ -424,7 +424,7 @@ get_max_activateable_texture_units (void)
       int n_values = 0;
       int i;
 
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
       if (ctx->driver != COGL_DRIVER_GLES2)
         {
           /* GL_MAX_TEXTURE_COORDS defines the number of texture coordinates
@@ -435,9 +435,9 @@ get_max_activateable_texture_units (void)
           GE (ctx, glGetIntegerv (GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS,
                                   values + n_values++));
         }
-#endif /* HAVE_COGL_GL */
+#endif /* HAVE_GL */
 
-#ifdef HAVE_COGL_GLES2
+#ifdef HAVE_GLES2
       if (ctx->driver == COGL_DRIVER_GLES2)
         {
           GE (ctx, glGetIntegerv (GL_MAX_VERTEX_ATTRIBS, values + n_values));
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
index 03bcf4956..59159d171 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
index 6f833f236..b250e46f2 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
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 0297707ff..881bcf08e 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
@@ -53,14 +53,14 @@ gboolean
 _cogl_texture_2d_gl_allocate (CoglTexture *tex,
                               GError **error);
 
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
 gboolean
 cogl_texture_2d_gl_bind_egl_image (CoglTexture2D *tex_2d,
                                    EGLImageKHR    image,
                                    GError       **error);
 #endif
 
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
 CoglTexture2D *
 _cogl_egl_texture_2d_gl_new_from_image (CoglContext *ctx,
                                         int width,
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
index 6212f408c..e2bb41c78 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -32,7 +32,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
@@ -44,7 +44,7 @@
 #include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
 
 /* We need this define from GLES2, but can't include the header
    as its type definitions may conflict with the GL ones
@@ -57,7 +57,7 @@
 #define GL_SAMPLER_EXTERNAL_OES           0x8D66
 #endif /* GL_OES_EGL_image_external */
 
-#endif /* defined (COGL_HAS_EGL_SUPPORT) */
+#endif /* defined (HAVE_EGL) */
 
 void
 _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d)
@@ -65,7 +65,7 @@ _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d)
   if (tex_2d->gl_texture)
     _cogl_delete_gl_texture (tex_2d->gl_texture);
 
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
   g_clear_pointer (&tex_2d->egl_image_external.user_data,
                    tex_2d->egl_image_external.destroy);
 #endif
@@ -260,7 +260,7 @@ allocate_from_bitmap (CoglTexture2D *tex_2d,
   return TRUE;
 }
 
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
 static gboolean
 allocate_from_egl_image (CoglTexture2D *tex_2d,
                          CoglTextureLoader *loader,
@@ -294,7 +294,7 @@ allocate_from_egl_image (CoglTexture2D *tex_2d,
 }
 #endif
 
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
 static gboolean
 allocate_custom_egl_image_external (CoglTexture2D *tex_2d,
                                     CoglTextureLoader *loader,
@@ -413,7 +413,7 @@ cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
 
   return COGL_TEXTURE (tex_2d);
 }
-#endif /* defined (COGL_HAS_EGL_SUPPORT) */
+#endif /* defined (HAVE_EGL) */
 
 gboolean
 _cogl_texture_2d_gl_allocate (CoglTexture *tex,
@@ -431,13 +431,13 @@ _cogl_texture_2d_gl_allocate (CoglTexture *tex,
     case COGL_TEXTURE_SOURCE_TYPE_BITMAP:
       return allocate_from_bitmap (tex_2d, loader, error);
     case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE:
-#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
+#if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
       return allocate_from_egl_image (tex_2d, loader, error);
 #else
       g_return_val_if_reached (FALSE);
 #endif
     case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL:
-#if defined (COGL_HAS_EGL_SUPPORT)
+#if defined (HAVE_EGL)
       return allocate_custom_egl_image_external (tex_2d, loader, error);
 #else
       g_return_val_if_reached (FALSE);
diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c
index ee5c3c5c8..c90835df4 100644
--- a/cogl/cogl/driver/gl/cogl-texture-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-gl.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <strings.h>
 
diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
index c22444265..c086e2c1a 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@@ -30,7 +30,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-types.h"
 #include "cogl/cogl-context-private.h"
@@ -68,7 +68,7 @@ static const struct {
   { GL_INVALID_ENUM,      "Invalid enumeration value" },
   { GL_INVALID_VALUE,     "Invalid value" },
   { GL_INVALID_OPERATION, "Invalid operation" },
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
   { GL_STACK_OVERFLOW,    "Stack overflow" },
   { GL_STACK_UNDERFLOW,   "Stack underflow" },
 #endif
@@ -331,7 +331,7 @@ _cogl_context_get_gl_extensions (CoglContext *context)
 
   /* In GL 3, querying GL_EXTENSIONS is deprecated so we have to build
    * the array using glGetStringi instead */
-#ifdef HAVE_COGL_GL
+#ifdef HAVE_GL
   if (context->driver == COGL_DRIVER_GL3)
     {
       int num_extensions, i;
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index 03da01299..7d2f8f4bc 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
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 5babacb93..35169c79d 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -33,7 +33,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-private.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index 123adb8dc..3f05ce730 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
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 57231f15c..9017adc9c 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -33,7 +33,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-private.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c
index 6b57b3826..6275d2a95 100644
--- a/cogl/cogl/driver/nop/cogl-attribute-nop.c
+++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-types.h"
 #include "cogl/cogl-framebuffer.h"
diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
index e81901bcb..de5fcc53d 100644
--- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
+++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-clip-stack.h"
 #include "cogl/driver/nop/cogl-clip-stack-nop-private.h"
diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
index c71c82fa2..ae35a371f 100644
--- a/cogl/cogl/driver/nop/cogl-driver-nop.c
+++ b/cogl/cogl/driver/nop/cogl-driver-nop.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/driver/nop/cogl-nop-framebuffer.c b/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
index 42f12df96..9706fa148 100644
--- a/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
+++ b/cogl/cogl/driver/nop/cogl-nop-framebuffer.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/driver/nop/cogl-nop-framebuffer.h"
 
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
index 3739179bd..cb0f2bd05 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
@@ -32,7 +32,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <string.h>
 
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index e5c2602f7..2c47b569c 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -1,24 +1,6 @@
 cogl_cogl_includesubdir = cogl_includesubdir / 'cogl'
 cogl_cogl_includedir = cogl_includedir / 'cogl'
 
-cdata = configuration_data()
-cdata.set('COGL_HAS_GL', have_gl)
-cdata.set('CLUTTER_COGL_HAS_GL', have_gl)
-cdata.set('COGL_HAS_GLX_SUPPORT', have_glx)
-cdata.set('COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT', have_egl_xlib)
-cdata.set('COGL_HAS_EGL_SUPPORT', have_egl)
-cdata.set('COGL_HAS_X11', have_x11)
-cdata.set('COGL_HAS_XLIB', have_x11_client)
-cdata.set('COGL_HAS_TRACING', have_profiler)
-
-cogl_defines_h = configure_file(
-  input: 'cogl-defines.h.meson',
-  output: 'cogl-defines.h',
-  configuration: cdata,
-  install_dir: cogl_cogl_includedir,
-  install: true,
-)
-
 if have_gl
   cogl_gl_header_includes = ['GL/gl.h']
 elif have_gles2
@@ -192,7 +174,6 @@ endif
 
 cogl_sources = [
   cogl_driver_sources,
-
   'winsys/cogl-winsys-private.h',
   'winsys/cogl-winsys.c',
   'cogl-private.h',
@@ -344,7 +325,7 @@ cogl_sources = [
   'cogl-graphene.c',
 ]
 
-if have_x11_client
+if have_x11
   cogl_nonintrospected_headers += [
     'winsys/cogl-texture-pixmap-x11.h',
     'cogl-xlib.h',
@@ -419,7 +400,7 @@ libmutter_cogl = shared_library(libmutter_cogl_name,
   version: '0.0.0',
   soversion: 0,
   c_args: cogl_c_args,
-  include_directories: cogl_includepath,
+  include_directories: [cogl_includepath, top_includepath],
   dependencies: cogl_deps,
   gnu_symbol_visibility: 'hidden',
   install_rpath: pkglibdir,
diff --git a/cogl/cogl/winsys/cogl-onscreen-egl.c b/cogl/cogl/winsys/cogl-onscreen-egl.c
index 49514ff23..46f326d39 100644
--- a/cogl/cogl/winsys/cogl-onscreen-egl.c
+++ b/cogl/cogl/winsys/cogl-onscreen-egl.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/winsys/cogl-onscreen-egl.h"
 
diff --git a/cogl/cogl/winsys/cogl-onscreen-glx.c b/cogl/cogl/winsys/cogl-onscreen-glx.c
index 8f2ae3266..ce8944074 100644
--- a/cogl/cogl/winsys/cogl-onscreen-glx.c
+++ b/cogl/cogl/winsys/cogl-onscreen-glx.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/winsys/cogl-onscreen-glx.h"
 
diff --git a/cogl/cogl/winsys/cogl-onscreen-xlib.c b/cogl/cogl/winsys/cogl-onscreen-xlib.c
index a0f21ca6a..96d1bf3e0 100644
--- a/cogl/cogl/winsys/cogl-onscreen-xlib.c
+++ b/cogl/cogl/winsys/cogl-onscreen-xlib.c
@@ -24,7 +24,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/winsys/cogl-onscreen-xlib.h"
 
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
index cb83af7ea..7633c8c31 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
@@ -36,7 +36,7 @@
 
 #include <sys/shm.h>
 
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
 #include <GL/glx.h>
 #endif
 
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index b1e71075a..87598b829 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -33,7 +33,7 @@
  *  Robert Bragg   <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-debug.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index c1136c6d8..ae7cbf2e1 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "cogl/cogl-defines.h"
+#include "config.h"
 #include "cogl/cogl-context.h"
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-framebuffer-private.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index be12ff39e..5472ba9d9 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -31,7 +31,7 @@
  *   Neil Roberts <neil@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include <X11/Xlib.h>
 
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index 28aa0a268..5986fd1c9 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -30,7 +30,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-i18n-private.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 7a8f0e0d0..2e9b489b1 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -30,7 +30,7 @@
  *   Robert Bragg <robert@linux.intel.com>
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-i18n-private.h"
 #include "cogl/cogl-util.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h
index d414cada0..502ac4cb2 100644
--- a/cogl/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-private.h
@@ -33,16 +33,12 @@
 #include "cogl/cogl-renderer.h"
 #include "cogl/cogl-scanout.h"
 
-#ifdef COGL_HAS_XLIB
-#include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
-#endif
-
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 #include <X11/Xutil.h>
 #include "cogl/winsys/cogl-texture-pixmap-x11-private.h"
 #endif
 
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 #include "cogl/cogl-egl-private.h"
 #endif
 
@@ -114,7 +110,7 @@ typedef struct _CoglWinsysVtable
 
   /* Optional functions */
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
   gboolean
   (*texture_pixmap_x11_create) (CoglTexturePixmapX11 *tex_pixmap);
   void
diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c
index a8aa7b476..687dbd0d6 100644
--- a/cogl/cogl/winsys/cogl-winsys.c
+++ b/cogl/cogl/winsys/cogl-winsys.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-context-private.h"
 
diff --git a/cogl/meson.build b/cogl/meson.build
index ac3aa0839..29e0efb4b 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -4,16 +4,6 @@ cogl_srcdir = meson.current_source_dir()
 
 cogl_includepath = [mtk_includepath, include_directories('.', 'cogl')]
 
-cdata = configuration_data()
-cdata.set('HAVE_COGL_GL', have_gl)
-cdata.set('HAVE_COGL_GLES2', have_gles2)
-cdata.set('ENABLE_UNIT_TESTS', have_cogl_tests)
-
-cogl_config_h = configure_file(
-  input: 'cogl-config.h.meson',
-  output: 'cogl-config.h',
-  configuration: cdata)
-
 cogl_pkg_deps = [
   glib_dep,
   gio_dep,
diff --git a/config.h.meson b/config.h.meson
index d319aa344..5948c935b 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -28,6 +28,17 @@
 /* Defined if EGLDevice support is enabled */
 #mesondefine HAVE_EGL_DEVICE
 
+/* Have GLX for rendering */
+#mesondefine HAVE_GLX
+
+#mesondefine HAVE_EGL_PLATFORM_XLIB
+
+/* Have GL for rendering */
+#mesondefine HAVE_GL
+
+/* Have GLES 2.0 for rendering */
+#mesondefine HAVE_GLES2
+
 /* Defined if EGLStream support is enabled */
 #mesondefine HAVE_WAYLAND_EGLSTREAM
 
@@ -115,3 +126,6 @@
 
 /* Whether the Xwayland has -enable-ei-portal option */
 #mesondefine HAVE_XWAYLAND_ENABLE_EI_PORTAL
+
+/* Supports PangoFt2 */
+#mesondefine HAVE_PANGO_FT2
diff --git a/meson.build b/meson.build
index ef45dd176..2aa46a0d6 100644
--- a/meson.build
+++ b/meson.build
@@ -523,6 +523,10 @@ cdata.set_quoted('PACKAGE_NAME', meson.project_name())
 cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
 
 cdata.set('HAVE_EGL', have_egl)
+cdata.set('HAVE_GLX', have_glx)
+cdata.set('HAVE_EGL_PLATFORM_XLIB', have_egl_xlib)
+cdata.set('HAVE_GL', have_gl)
+cdata.set('HAVE_GLES2', have_gles2)
 cdata.set('HAVE_WAYLAND', have_wayland)
 cdata.set('HAVE_XWAYLAND', have_xwayland)
 cdata.set('HAVE_X11', have_x11)
@@ -541,6 +545,7 @@ cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)
 cdata.set('HAVE_INTROSPECTION', have_introspection)
 cdata.set('HAVE_PROFILER', have_profiler)
 cdata.set('HAVE_LIBDISPLAY_INFO', have_libdisplay_info)
+cdata.set('HAVE_PANGO_FT2', have_pango_ft2)
 
 if have_x11_client
   xkb_base = xkeyboard_config_dep.get_variable('xkb_base')
diff --git a/src/backends/x11/meta-renderer-x11.c b/src/backends/x11/meta-renderer-x11.c
index 134918109..3d714efc2 100644
--- a/src/backends/x11/meta-renderer-x11.c
+++ b/src/backends/x11/meta-renderer-x11.c
@@ -37,10 +37,10 @@
 #include "meta/meta-backend.h"
 #include "meta/util.h"
 
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
 #include "cogl/winsys/cogl-winsys-egl-x11-private.h"
 #endif
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
 #include "cogl/winsys/cogl-winsys-glx-private.h"
 #endif
 
@@ -49,7 +49,7 @@ G_DEFINE_TYPE (MetaRendererX11, meta_renderer_x11, META_TYPE_RENDERER)
 static const CoglWinsysVtable *
 get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
 {
-#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
+#ifdef HAVE_EGL_PLATFORM_XLIB
   if (meta_is_wayland_compositor ())
     return _cogl_winsys_egl_xlib_get_vtable ();
 #endif
@@ -57,13 +57,13 @@ get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
   switch (renderer->driver)
     {
     case COGL_DRIVER_GLES2:
-#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
+#ifdef HAVE_EGL_PLATFORM_XLIB
       return _cogl_winsys_egl_xlib_get_vtable ();
 #else
       break;
 #endif
     case COGL_DRIVER_GL3:
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
       return _cogl_winsys_glx_get_vtable ();
 #else
       break;
diff --git a/src/backends/x11/meta-stage-x11.c b/src/backends/x11/meta-stage-x11.c
index ae7a7fe0d..32e616ad2 100644
--- a/src/backends/x11/meta-stage-x11.c
+++ b/src/backends/x11/meta-stage-x11.c
@@ -277,7 +277,7 @@ create_onscreen (CoglContext *cogl_context,
   switch (cogl_renderer_get_winsys_id (cogl_renderer))
     {
     case COGL_WINSYS_ID_GLX:
-#ifdef COGL_HAS_GLX_SUPPORT
+#ifdef HAVE_GLX
       return COGL_ONSCREEN (cogl_onscreen_glx_new (cogl_context,
                                                    width, height));
 #else
@@ -285,7 +285,7 @@ create_onscreen (CoglContext *cogl_context,
       break;
 #endif
     case COGL_WINSYS_ID_EGL_XLIB:
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef HAVE_EGL
       return COGL_ONSCREEN (cogl_onscreen_xlib_new (cogl_context,
                                                     width, height));
 #else
diff --git a/src/compositor/meta-later.c b/src/compositor/meta-later.c
index 75597561b..e3b0dcb04 100644
--- a/src/compositor/meta-later.c
+++ b/src/compositor/meta-later.c
@@ -89,7 +89,7 @@ meta_later_destroy (MetaLater *later)
   meta_later_unref (later);
 }
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
 static const char *
 later_type_to_string (MetaLaterType when)
 {
diff --git a/src/tests/clutter/micro-bench/test-cogl-perf.c b/src/tests/clutter/micro-bench/test-cogl-perf.c
index fac68e599..aa8cfb851 100644
--- a/src/tests/clutter/micro-bench/test-cogl-perf.c
+++ b/src/tests/clutter/micro-bench/test-cogl-perf.c
@@ -1,4 +1,3 @@
-#include <clutter-build-config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/src/tests/cogl/conform/test-texture-pixmap-x11.c b/src/tests/cogl/conform/test-texture-pixmap-x11.c
index cd874e7a6..9ecc3f8a2 100644
--- a/src/tests/cogl/conform/test-texture-pixmap-x11.c
+++ b/src/tests/cogl/conform/test-texture-pixmap-x11.c
@@ -4,7 +4,7 @@
 
 static const ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
 
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 
 #include <clutter/x11/clutter-x11.h>
 #include <cogl/cogl-texture-pixmap-x11.h>
@@ -198,13 +198,13 @@ queue_redraw (void *stage)
   return TRUE;
 }
 
-#endif /* COGL_HAS_XLIB */
+#endif /* HAVE_X11 */
 
 void
 test_texture_pixmap_x11 (TestUtilsGTestFixture *fixture,
                               void *data)
 {
-#ifdef COGL_HAS_XLIB
+#ifdef HAVE_X11
 
   TestState state;
   unsigned int idle_handler;
@@ -238,11 +238,11 @@ test_texture_pixmap_x11 (TestUtilsGTestFixture *fixture,
   if (cogl_test_verbose ())
     g_print ("OK\n");
 
-#else /* COGL_HAS_XLIB */
+#else /* HAVE_X11 */
 
   if (cogl_test_verbose ())
    g_print ("Skipping\n");
 
-#endif /* COGL_HAS_XLIB */
+#endif /* HAVE_X11 */
 }
 
diff --git a/src/tests/cogl/unit/test-bitmask.c b/src/tests/cogl/unit/test-bitmask.c
index 368d2deb4..252d87323 100644
--- a/src/tests/cogl/unit/test-bitmask.c
+++ b/src/tests/cogl/unit/test-bitmask.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl-bitmask.h"
 #include "tests/cogl-test-utils.h"
diff --git a/src/tests/cogl/unit/test-pipeline-cache.c b/src/tests/cogl/unit/test-pipeline-cache.c
index 7d8c54cad..62fd5c4e3 100644
--- a/src/tests/cogl/unit/test-pipeline-cache.c
+++ b/src/tests/cogl/unit/test-pipeline-cache.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 #include "cogl/cogl-pipeline-cache-private.h"
diff --git a/src/tests/cogl/unit/test-pipeline-glsl.c b/src/tests/cogl/unit/test-pipeline-glsl.c
index ee2fcb7e2..e510a69e6 100644
--- a/src/tests/cogl/unit/test-pipeline-glsl.c
+++ b/src/tests/cogl/unit/test-pipeline-glsl.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 #include "tests/cogl-test-utils.h"
diff --git a/src/tests/cogl/unit/test-pipeline-state-known-failure.c b/src/tests/cogl/unit/test-pipeline-state-known-failure.c
index 7a20e0cff..a0f543419 100644
--- a/src/tests/cogl/unit/test-pipeline-state-known-failure.c
+++ b/src/tests/cogl/unit/test-pipeline-state-known-failure.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 #include "cogl/cogl-pipeline-state.h"
diff --git a/src/tests/cogl/unit/test-pipeline-state.c b/src/tests/cogl/unit/test-pipeline-state.c
index 50b421f94..c35959c5f 100644
--- a/src/tests/cogl/unit/test-pipeline-state.c
+++ b/src/tests/cogl/unit/test-pipeline-state.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 #include "cogl/cogl-pipeline-state.h"
diff --git a/src/tests/cogl/unit/test-pipeline-vertend-glsl.c b/src/tests/cogl/unit/test-pipeline-vertend-glsl.c
index 9a64a0db7..fac2aff96 100644
--- a/src/tests/cogl/unit/test-pipeline-vertend-glsl.c
+++ b/src/tests/cogl/unit/test-pipeline-vertend-glsl.c
@@ -1,4 +1,4 @@
-#include "cogl-config.h"
+#include "config.h"
 
 #include "cogl/cogl.h"
 #include "cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h"
diff --git a/src/x11/events.c b/src/x11/events.c
index f3ff945e6..722e5ba64 100644
--- a/src/x11/events.c
+++ b/src/x11/events.c
@@ -519,7 +519,7 @@ get_extension_event_name (MetaX11Display *x11_display,
   return NULL;
 }
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
 static const char *
 get_event_name (MetaX11Display *x11_display,
                 XEvent         *event)
diff --git a/src/x11/meta-sync-counter.c b/src/x11/meta-sync-counter.c
index 36f05868e..b7fc4245a 100644
--- a/src/x11/meta-sync-counter.c
+++ b/src/x11/meta-sync-counter.c
@@ -316,7 +316,7 @@ meta_sync_counter_update (MetaSyncCounter *sync_counter,
                                          no_delay_frame);
     }
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   if (G_UNLIKELY (cogl_is_tracing_enabled ()))
     {
       g_autofree char *description = NULL;
@@ -384,7 +384,7 @@ do_send_frame_drawn (MetaSyncCounter *sync_counter,
   XFlush (xdisplay);
   meta_x11_error_trap_pop (display->x11_display);
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   if (G_UNLIKELY (cogl_is_tracing_enabled ()))
     {
       g_autofree char *description = NULL;
@@ -445,7 +445,7 @@ do_send_frame_timings (MetaSyncCounter *sync_counter,
   XFlush (xdisplay);
   meta_x11_error_trap_pop (display->x11_display);
 
-#ifdef COGL_HAS_TRACING
+#ifdef HAVE_PROFILER
   if (G_UNLIKELY (cogl_is_tracing_enabled ()))
     {
       g_autofree char *description = NULL;