diff --git a/clutter/clutter/clutter-autocleanups.h b/clutter/clutter/clutter-autocleanups.h
deleted file mode 100644
index 73ba9e1e3..000000000
--- a/clutter/clutter/clutter-autocleanups.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright 2015  Emmanuele Bassi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-#pragma once
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __GI_SCANNER__
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInputDevice, g_object_unref)
-
-#endif /* __GI_SCANNER__ */
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index e236564fb..eb7a3f7e1 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -61,6 +61,8 @@ struct _ClutterInputDeviceClass
 #define CLUTTER_IS_INPUT_DEVICE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_INPUT_DEVICE))
 #define CLUTTER_INPUT_DEVICE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_INPUT_DEVICE, ClutterInputDeviceClass))
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInputDevice, g_object_unref)
+
 typedef struct _ClutterInputDeviceClass ClutterInputDeviceClass;
 
 CLUTTER_EXPORT
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index b7451f6cd..8df82413c 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -102,6 +102,4 @@
 #include "clutter/clutter-virtual-input-device.h"
 #include "clutter/clutter-zoom-action.h"
 
-#include "clutter/clutter-autocleanups.h"
-
 #undef __CLUTTER_H_INSIDE__
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 732d9c4fc..104af00f5 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -8,7 +8,6 @@ clutter_headers = [
   'clutter-actor.h',
   'clutter-align-constraint.h',
   'clutter-animatable.h',
-  'clutter-autocleanups.h',
   'clutter-backend.h',
   'clutter-bind-constraint.h',
   'clutter-binding-pool.h',