diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index eb4fb1b874..77c6cd5a56 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -63,7 +63,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCssProvider, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkDrawingArea, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEditable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntry, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntryBuffer, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntryCompletion, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEventController, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkExpander, g_object_unref)
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index b44bd63a05..a98ce90bcb 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -137,6 +137,8 @@ void                      gtk_entry_buffer_emit_deleted_text      (GtkEntryBuffe
                                                                    guint            position,
                                                                    guint            n_chars);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntryBuffer, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ENTRY_BUFFER_H__ */