diff --git a/clutter/clutter/clutter-blur.c b/clutter/clutter/clutter-blur.c
index 6b5d3adeb..874a84c9e 100644
--- a/clutter/clutter/clutter-blur.c
+++ b/clutter/clutter/clutter-blur.c
@@ -15,6 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "clutter/clutter-blur-private.h"
 
 #include "clutter/clutter-backend.h"
diff --git a/clutter/clutter/clutter-frame.c b/clutter/clutter/clutter-frame.c
index db2ca55bd..7436f9f18 100644
--- a/clutter/clutter/clutter-frame.c
+++ b/clutter/clutter/clutter-frame.c
@@ -15,6 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "clutter/clutter-frame-private.h"
 
 G_DEFINE_BOXED_TYPE (ClutterFrame, clutter_frame,
diff --git a/clutter/clutter/clutter-keyval.c b/clutter/clutter/clutter-keyval.c
index d3bf99843..676b0b830 100644
--- a/clutter/clutter/clutter-keyval.c
+++ b/clutter/clutter/clutter-keyval.c
@@ -22,6 +22,8 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
+#include "config.h"
+
 #include "clutter/clutter-keyval.h"
 #include "clutter/clutter-event.h"
 #include "clutter/clutter-keysyms.h"
@@ -210,4 +212,4 @@ clutter_keyval_name (unsigned int keyval)
     }
 
   return NULL;
-}
\ No newline at end of file
+}
diff --git a/clutter/clutter/clutter-pick-stack.c b/clutter/clutter/clutter-pick-stack.c
index 625f798e2..dcc14b1fe 100644
--- a/clutter/clutter/clutter-pick-stack.c
+++ b/clutter/clutter/clutter-pick-stack.c
@@ -16,6 +16,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "clutter/clutter-pick-stack-private.h"
 #include "clutter/clutter-private.h"
 
diff --git a/cogl/cogl/cogl-graphene.h b/cogl/cogl/cogl-graphene.h
index 5f9ec3d06..c24f8b17c 100644
--- a/cogl/cogl/cogl-graphene.h
+++ b/cogl/cogl/cogl-graphene.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include "config.h"
 #include "cogl/cogl-macros.h"
 #include "cogl/cogl-types.h"
 
diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h
index 8eef5866c..aadbb63eb 100644
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#include "config.h"
-#include "config.h"
-
 #include "cogl/cogl-texture.h"
 #include "cogl/cogl-meta-texture.h"
 #include "cogl/cogl-frame-info-private.h"
diff --git a/cogl/cogl/cogl-pixel-format.h b/cogl/cogl/cogl-pixel-format.h
index 3c90cd718..0f00d66c5 100644
--- a/cogl/cogl/cogl-pixel-format.h
+++ b/cogl/cogl/cogl-pixel-format.h
@@ -37,7 +37,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "config.h"
 #include "cogl/cogl-macros.h"
 
 #include <glib.h>
diff --git a/cogl/cogl/cogl-poll.h b/cogl/cogl/cogl-poll.h
index 3062ec138..1ccb729b2 100644
--- a/cogl/cogl/cogl-poll.h
+++ b/cogl/cogl/cogl-poll.h
@@ -36,7 +36,6 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "config.h"
 #include "cogl/cogl-context.h"
 
 #include <poll.h>
diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
index 998ae22e8..21daede56 100644
--- a/cogl/cogl/cogl-texture.h
+++ b/cogl/cogl/cogl-texture.h
@@ -35,7 +35,6 @@
 #endif
 
 #include "cogl/cogl-macros.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.h b/cogl/cogl/cogl-trace.h
index d0d1efc6f..fe811d9b0 100644
--- a/cogl/cogl/cogl-trace.h
+++ b/cogl/cogl/cogl-trace.h
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include "config.h"
 #include "cogl/cogl-macros.h"
 
 #ifdef HAVE_PROFILER
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index 16fdced48..f1009d41f 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -33,7 +33,6 @@
 #include <glib.h>
 #include <math.h>
 
-#include "config.h"
 #include "cogl/cogl-pixel-format.h"
 #include "cogl/cogl-types.h"
 
diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
index 9c096eb9e..487540352 100644
--- a/cogl/cogl/deprecated/cogl-shader.h
+++ b/cogl/cogl/deprecated/cogl-shader.h
@@ -35,7 +35,6 @@
 #endif
 
 #include "cogl/cogl-types.h"
-#include "config.h"
 #include "cogl/cogl-macros.h"
 #include "cogl/deprecated/cogl-program.h"
 
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index b09b15d93..3299fcbac 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -132,12 +132,6 @@ if have_gles2
   cogl_driver_sources += gles_driver_sources
 endif
 
-if have_gl or have_gles2
-  cogl_nonintrospected_headers += [
-    'cogl-gl-header.h'
-  ]
-endif
-
 cogl_sources = [
   cogl_driver_sources,
   'cogl-atlas-texture-private.h',
@@ -194,6 +188,7 @@ cogl_sources = [
   'cogl-framebuffer-private.h',
   'cogl-framebuffer.c',
   'cogl-glib-source.c',
+  'cogl-gl-header.h',
   'cogl-glsl-shader-boilerplate.h',
   'cogl-graphene.c',
   'cogl-half-float.c',
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index 178fb2270..9b0b168b4 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "config.h"
 #include "cogl/cogl-context.h"
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-framebuffer-private.h"
diff --git a/src/backends/meta-input-settings-dummy.c b/src/backends/meta-input-settings-dummy.c
index 870764e3c..1fde1abfd 100644
--- a/src/backends/meta-input-settings-dummy.c
+++ b/src/backends/meta-input-settings-dummy.c
@@ -19,6 +19,8 @@
  * Author: Marco Trevisan <marco.trevisan@canonical.com>
  */
 
+#include "config.h"
+
 #include "backends/meta-input-settings-dummy.h"
 
 G_DEFINE_TYPE (MetaInputSettingsDummy,
diff --git a/src/backends/native/meta-renderer-view-native.c b/src/backends/native/meta-renderer-view-native.c
index 81f40bda8..a04e2e353 100644
--- a/src/backends/native/meta-renderer-view-native.c
+++ b/src/backends/native/meta-renderer-view-native.c
@@ -20,6 +20,8 @@
  *     Dor Askayo <dor.askayo@gmail.com>
  */
 
+#include "config.h"
+
 #include "backends/native/meta-renderer-view-native.h"
 
 #include "backends/native/meta-frame-native.h"
diff --git a/src/compositor/meta-surface-actor.h b/src/compositor/meta-surface-actor.h
index 8072aae01..722e7d140 100644
--- a/src/compositor/meta-surface-actor.h
+++ b/src/compositor/meta-surface-actor.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "config.h"
-
 #include "backends/meta-backend-types.h"
 #include "meta/meta-shaped-texture.h"
 #include "meta/window.h"
diff --git a/src/meta/meta-enum-types.c.in b/src/meta/meta-enum-types.c.in
index 2c8edceb2..0579f017b 100644
--- a/src/meta/meta-enum-types.c.in
+++ b/src/meta/meta-enum-types.c.in
@@ -1,4 +1,5 @@
 /*** BEGIN file-header ***/
+#include "config.h"
 #include "meta/meta-enum-types.h"
 /*** END file-header ***/
 
diff --git a/src/tests/clutter-test-utils.h b/src/tests/clutter-test-utils.h
index 0d70d54b5..a4bbee236 100644
--- a/src/tests/clutter-test-utils.h
+++ b/src/tests/clutter-test-utils.h
@@ -19,8 +19,6 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #pragma once
 
 #define __CLUTTER_H_INSIDE__
diff --git a/src/tests/hdr-metadata-unit-tests.c b/src/tests/hdr-metadata-unit-tests.c
index 177008dcb..352d1d1c8 100644
--- a/src/tests/hdr-metadata-unit-tests.c
+++ b/src/tests/hdr-metadata-unit-tests.c
@@ -18,6 +18,8 @@
  * Author: Sebastian Wick <sebastian.wick@redhat.com>
  */
 
+#include "config.h"
+
 #include "hdr-metadata-unit-tests.h"
 
 #include "tests/meta-monitor-test-utils.h"