diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 389539d8d..4864d91bd 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -82,12 +82,15 @@
 #include "clutter/clutter-main.h"
 #include "clutter/clutter-offscreen-effect.h"
 #include "clutter/clutter-page-turn-effect.h"
+#include "clutter/clutter-paint-context.h"
 #include "clutter/clutter-paint-nodes.h"
 #include "clutter/clutter-paint-node.h"
 #include "clutter/clutter-pan-action.h"
+#include "clutter/clutter-pick-context.h"
 #include "clutter/clutter-pipeline-cache.h"
 #include "clutter/clutter-property-transition.h"
 #include "clutter/clutter-rotate-action.h"
+#include "clutter/clutter-seat.h"
 #include "clutter/clutter-settings.h"
 #include "clutter/clutter-shader-effect.h"
 #include "clutter/clutter-shader-types.h"
@@ -96,6 +99,7 @@
 #include "clutter/clutter-stage.h"
 #include "clutter/clutter-stage-view.h"
 #include "clutter/clutter-tap-action.h"
+#include "clutter/clutter-text-buffer.h"
 #include "clutter/clutter-text.h"
 #include "clutter/clutter-texture-content.h"
 #include "clutter/clutter-timeline.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index a5d2f8905..8f2d802ac 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -47,13 +47,11 @@ clutter_headers = [
   'clutter-keyframe-transition.h',
   'clutter-keymap.h',
   'clutter-keysyms.h',
-  'clutter-keyval.c',
   'clutter-keyval.h',
   'clutter-layout-manager.h',
   'clutter-layout-meta.h',
   'clutter-macros.h',
   'clutter-main.h',
-  'clutter-mutter.h',
   'clutter-offscreen-effect.h',
   'clutter-page-turn-effect.h',
   'clutter-paint-context.h',
@@ -143,6 +141,7 @@ clutter_sources = [
   'clutter-keyframe-transition.c',
   'clutter-keymap.c',
   'clutter-keysyms-table.c',
+  'clutter-keyval.c',
   'clutter-layout-manager.c',
   'clutter-layout-meta.c',
   'clutter-main.c',
@@ -209,6 +208,7 @@ clutter_private_headers = [
   'clutter-input-only-action.h',
   'clutter-input-only-actor.h',
   'clutter-keymap-private.h',
+  'clutter-mutter.h',
   'clutter-paint-context-private.h',
   'clutter-paint-node-private.h',
   'clutter-paint-volume-private.h',