diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c
index 518505583..2d5213ef0 100644
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -22,6 +22,7 @@
 #include "clutter/clutter-event-private.h"
 #include "clutter/clutter-private.h"
 #include "clutter/clutter-input-device-private.h"
+#include "clutter/clutter-input-focus.h"
 #include "clutter/clutter-input-method.h"
 #include "clutter/clutter-input-method-private.h"
 #include "clutter/clutter-input-focus-private.h"
diff --git a/clutter/clutter/clutter-input-method.h b/clutter/clutter/clutter-input-method.h
index 55362b6b1..cce21cd06 100644
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <clutter/clutter.h>
-
 #define CLUTTER_TYPE_INPUT_METHOD (clutter_input_method_get_type ())
 
 CLUTTER_EXPORT
diff --git a/src/backends/meta-input-mapper-private.h b/src/backends/meta-input-mapper-private.h
index a48f60425..ddf7eb73c 100644
--- a/src/backends/meta-input-mapper-private.h
+++ b/src/backends/meta-input-mapper-private.h
@@ -21,10 +21,8 @@
 
 #pragma once
 
-#include <clutter/clutter.h>
-
 #include "backends/meta-backend-types.h"
-
+#include "clutter/clutter-input-device.h"
 #include "meta-dbus-input-mapping.h"
 
 #define META_TYPE_INPUT_MAPPER (meta_input_mapper_get_type ())