diff --git thunarx/thunarx-file-info.h thunarx/thunarx-file-info.h
index 4f1f9116..b320ae9b 100644
--- thunarx/thunarx-file-info.h
+++ thunarx/thunarx-file-info.h
@@ -65,6 +65,7 @@ typedef struct _ThunarxFileInfo      ThunarxFileInfo;
 #define THUNARX_FILE_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_FILE_INFO, ThunarxFileInfo))
 #define THUNARX_IS_FILE_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_FILE_INFO))
 #define THUNARX_FILE_INFO_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_FILE_INFO, ThunarxFileInfoIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxFileInfo, g_object_unref)
 
 /**
  * ThunarxFileInfoIface:
diff --git thunarx/thunarx-menu-provider.h thunarx/thunarx-menu-provider.h
index 550e5a28..28cdfad0 100644
--- thunarx/thunarx-menu-provider.h
+++ thunarx/thunarx-menu-provider.h
@@ -38,6 +38,7 @@ typedef struct _ThunarxMenuProvider      ThunarxMenuProvider;
 #define THUNARX_MENU_PROVIDER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_MENU_PROVIDER, ThunarxMenuProvider))
 #define THUNARX_IS_MENU_PROVIDER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_MENU_PROVIDER))
 #define THUNARX_MENU_PROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_MENU_PROVIDER, ThunarxMenuProviderIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxMenuProvider, g_object_unref)
 
 /**
  * ThunarxMenuProviderIface:
diff --git thunarx/thunarx-menu.h thunarx/thunarx-menu.h
index 6869f5e1..c37d2ea6 100644
--- thunarx/thunarx-menu.h
+++ thunarx/thunarx-menu.h
@@ -47,6 +47,7 @@ typedef struct _ThunarxMenuItem        ThunarxMenuItem;
 #define THUNARX_IS_MENU(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_MENU))
 #define THUNARX_IS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), THUNARX_TYPE_MENU))
 #define THUNARX_MENU_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), THUNARX_TYPE_MENU))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxMenu, g_object_unref)
 
 /* ThunarxMenuItem defines */
 #define THUNARX_TYPE_MENU_ITEM            (thunarx_menu_item_get_type ())
@@ -55,7 +56,7 @@ typedef struct _ThunarxMenuItem        ThunarxMenuItem;
 #define THUNARX_IS_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_MENU_ITEM))
 #define THUNARX_IS_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), THUNARX_TYPE_MENU_ITEM))
 #define THUNARX_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), THUNARX_TYPE_MENU_ITEM))
-
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxMenuItem, g_object_unref)
 
 
 /* ThunarxMenu structs */
diff --git thunarx/thunarx-preferences-provider.h thunarx/thunarx-preferences-provider.h
index 50c2b5a8..56f7784a 100644
--- thunarx/thunarx-preferences-provider.h
+++ thunarx/thunarx-preferences-provider.h
@@ -36,6 +36,7 @@ typedef struct _ThunarxPreferencesProvider      ThunarxPreferencesProvider;
 #define THUNARX_PREFERENCES_PROVIDER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_PREFERENCES_PROVIDER, ThunarxPreferencesProvider))
 #define THUNARX_IS_PREFERENCES_PROVIDER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PREFERENCES_PROVIDER))
 #define THUNARX_PREFERENCES_PROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_PREFERENCES_PROVIDER, ThunarxPreferencesProviderIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxPreferencesProvider, g_object_unref)
 
 /**
  * ThunarxPreferencesProviderIface:
diff --git thunarx/thunarx-property-page-provider.h thunarx/thunarx-property-page-provider.h
index 53a13312..b16e4029 100644
--- thunarx/thunarx-property-page-provider.h
+++ thunarx/thunarx-property-page-provider.h
@@ -36,6 +36,7 @@ typedef struct _ThunarxPropertyPageProvider      ThunarxPropertyPageProvider;
 #define THUNARX_PROPERTY_PAGE_PROVIDER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_PROPERTY_PAGE_PROVIDER, ThunarxPropertyPageProvider))
 #define THUNARX_IS_PROPERTY_PAGE_PROVIDER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PROPERTY_PAGE_PROVIDER))
 #define THUNARX_PROPERTY_PAGE_PROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_PROPERTY_PAGE_PROVIDER, ThunarxPropertyPageProviderIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxPropertyPageProvider, g_object_unref)
 
 /**
  * ThunarxPropertyPageProviderIface:
diff --git thunarx/thunarx-property-page.h thunarx/thunarx-property-page.h
index 0fb3d815..99660b54 100644
--- thunarx/thunarx-property-page.h
+++ thunarx/thunarx-property-page.h
@@ -39,6 +39,7 @@ typedef struct _ThunarxPropertyPage        ThunarxPropertyPage;
 #define THUNARX_IS_PROPERTY_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PROPERTY_PAGE))
 #define THUNARX_IS_PROPERTY_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNARX_TYPE_PROPERTY_PAGE))
 #define THUNARX_PROPERTY_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNARX_TYPE_PROPERTY_PAGE))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxPropertyPage, g_object_unref)
 
 struct _ThunarxPropertyPageClass
 {
diff --git thunarx/thunarx-provider-factory.h thunarx/thunarx-provider-factory.h
index 0d046833..3b931522 100644
--- thunarx/thunarx-provider-factory.h
+++ thunarx/thunarx-provider-factory.h
@@ -38,6 +38,7 @@ typedef struct _ThunarxProviderFactory      ThunarxProviderFactory;
 #define THUNARX_IS_PROVIDER_FACTORY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PROVIDER_FACTORY))
 #define THUNARX_IS_PROVIDER_FACTORY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNARX_TYPE_PROVIDER_FACTORY))
 #define THUNARX_PROVIDER_FACTORY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNARX_TYPE_PROVIDER_FACTORY, ThunarxProviderFactoryClass))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxProviderFactory, g_object_unref)
 
 GType                   thunarx_provider_factory_get_type       (void) G_GNUC_CONST;
 
diff --git thunarx/thunarx-provider-module.h thunarx/thunarx-provider-module.h
index ca8c84ca..e179575a 100644
--- thunarx/thunarx-provider-module.h
+++ thunarx/thunarx-provider-module.h
@@ -36,6 +36,7 @@ typedef struct _ThunarxProviderModule      ThunarxProviderModule;
 #define THUNARX_IS_PROVIDER_MODULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PROVIDER_MODULE))
 #define THUNARX_IS_PROVIDER_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNARX_TYPE_PROVIDER_MODULE))
 #define THUNARX_PROVIDER_MODULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNARX_TYPE_PROVIDER_MODULE, ThunarxProviderModuleClass))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxProviderModule, g_object_unref)
 
 GType                  thunarx_provider_module_get_type   (void) G_GNUC_CONST;
 
diff --git thunarx/thunarx-provider-plugin.h thunarx/thunarx-provider-plugin.h
index 02c06269..22818a97 100644
--- thunarx/thunarx-provider-plugin.h
+++ thunarx/thunarx-provider-plugin.h
@@ -34,6 +34,7 @@ typedef struct _ThunarxProviderPlugin      ThunarxProviderPlugin;
 #define THUNARX_PROVIDER_PLUGIN(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_PROVIDER_PLUGIN, ThunarxProviderPlugin))
 #define THUNARX_IS_PROVIDER_PLUGIN(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_PROVIDER_PLUGIN))
 #define THUNARX_PROVIDER_PLUGIN_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_PROVIDER_PLUGIN, ThunarxProviderPluginIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxProviderPlugin, g_object_unref)
 
 /**
  * ThunarxProviderPluginIface:
diff --git thunarx/thunarx-renamer-provider.h thunarx/thunarx-renamer-provider.h
index 48687be7..4433d3d0 100644
--- thunarx/thunarx-renamer-provider.h
+++ thunarx/thunarx-renamer-provider.h
@@ -36,6 +36,7 @@ typedef struct _ThunarxRenamerProvider      ThunarxRenamerProvider;
 #define THUNARX_RENAMER_PROVIDER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNARX_TYPE_RENAMER_PROVIDER, ThunarxRenamerProvider))
 #define THUNARX_IS_RENAMER_PROVIDER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_RENAMER_PROVIDER))
 #define THUNARX_RENAMER_PROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), THUNARX_TYPE_RENAMER_PROVIDER, ThunarxRenamerProviderIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxRenamerProvider, g_object_unref)
 
 /**
  * ThunarxRenamerProviderIface:
diff --git thunarx/thunarx-renamer.h thunarx/thunarx-renamer.h
index 2a52d40f..9d4c55ec 100644
--- thunarx/thunarx-renamer.h
+++ thunarx/thunarx-renamer.h
@@ -41,6 +41,7 @@ typedef struct _ThunarxRenamer        ThunarxRenamer;
 #define THUNARX_IS_RENAMER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNARX_TYPE_RENAMER))
 #define THUNARX_IS_RENAMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNARX_TYPE_RENAMER))
 #define THUNARX_RENAMER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNARX_TYPE_RENAMER, ThunarxRenamerClass))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(ThunarxRenamer, g_object_unref)
 
 /**
  * ThunarxRenamerClass: