diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 986695f1e6..561485ec51 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -21,7 +21,6 @@
 
 #ifndef __GI_SCANNER__
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelMap, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccessible, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionBar, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionable, g_object_unref)
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index c13797a1ef..de5d4a1fa5 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -102,6 +102,9 @@ GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkAccelMap *gtk_accel_map_get      (void);
 
+#ifndef __GI_SCANNER__
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelMap, g_object_unref)
+#endif
 
 G_END_DECLS