diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c
index 19bd5e0d4..a540efca8 100644
--- a/gio/gdbusactiongroup.c
+++ b/gio/gdbusactiongroup.c
@@ -65,8 +65,6 @@ struct _GDBusActionGroup
   gboolean         strict;
 };
 
-typedef GObjectClass GDBusActionGroupClass;
-
 typedef struct
 {
   gchar        *name;
diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h
index f35f1c514..b4a17de1f 100644
--- a/gio/gdbusactiongroup.h
+++ b/gio/gdbusactiongroup.h
@@ -31,20 +31,9 @@
 
 G_BEGIN_DECLS
 
-#define G_TYPE_DBUS_ACTION_GROUP                            (g_dbus_action_group_get_type ())
-#define G_DBUS_ACTION_GROUP(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroup))
-#define G_DBUS_ACTION_GROUP_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-#define G_IS_DBUS_ACTION_GROUP(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_IS_DBUS_ACTION_GROUP_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-
+#define G_TYPE_DBUS_ACTION_GROUP (g_dbus_action_group_get_type ())
 GIO_AVAILABLE_IN_ALL
-GType                   g_dbus_action_group_get_type                  (void);
+G_DECLARE_FINAL_TYPE (GDBusActionGroup, g_dbus_action_group, G, DBUS_ACTION_GROUP, GObject)
 
 GIO_AVAILABLE_IN_2_32
 GDBusActionGroup *      g_dbus_action_group_get                       (GDBusConnection        *connection,
diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h
index 4c57b4ec0..49c94f68d 100644
--- a/gio/gio-autocleanups.h
+++ b/gio/gio-autocleanups.h
@@ -46,7 +46,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GCredentials, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDatagramBased, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDataInputStream, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDataOutputStream, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDBusActionGroup, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDBusAuthObserver, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDBusConnection, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GDBusInterface, g_object_unref)