diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h
index 0086e21794..d566986a45 100644
--- a/gdk/gdk-autocleanup.h
+++ b/gdk/gdk-autocleanup.h
@@ -37,7 +37,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkPopupLayout, gdk_popup_layout_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSurface, g_object_unref)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, g_object_unref)
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 5d796d9508..6f24140ece 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -603,6 +603,8 @@ GdkVulkanContext *
                gdk_surface_create_vulkan_context(GdkSurface     *surface,
                                                  GError        **error);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GdkSurface, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_SURFACE_H__ */