[gtk/header-cleanup: 3/7] gtk: Dissolve gtk-autocleanup.h




commit f141da6b555dcbe6fe16bd2e4b10cf0b2f105bc8
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 23 21:54:15 2022 -0400

    gtk: Dissolve gtk-autocleanup.h
    
    Move the autocleanup declarations into their
    respective headers.

 gtk/gtk-autocleanups.h         | 171 -----------------------------------------
 gtk/gtk.h                      |   2 -
 gtk/gtkactionable.h            |   2 +
 gtk/gtkactionbar.h             |   1 +
 gtk/gtkadjustment.h            |   2 +
 gtk/gtkappchooser.h            |   2 +
 gtk/gtkappchooserbutton.h      |   2 +
 gtk/gtkappchooserdialog.h      |   2 +
 gtk/gtkappchooserwidget.h      |   2 +
 gtk/gtkapplicationwindow.h     |   2 +
 gtk/gtkaspectframe.h           |   2 +
 gtk/gtkassistant.h             |   2 +
 gtk/gtkbox.h                   |   1 +
 gtk/gtkbuildable.h             |   2 +
 gtk/gtkbuilder.h               |   2 +
 gtk/gtkbutton.h                |   2 +
 gtk/gtkcalendar.h              |   2 +
 gtk/gtkcellarea.h              |   2 +
 gtk/gtkcellareabox.h           |   2 +
 gtk/gtkcellareacontext.h       |   2 +
 gtk/gtkcelleditable.h          |   1 +
 gtk/gtkcelllayout.h            |   2 +
 gtk/gtkcellrenderer.h          |   2 +
 gtk/gtkcellrendereraccel.h     |   1 +
 gtk/gtkcellrenderercombo.h     |   2 +
 gtk/gtkcellrendererpixbuf.h    |   1 +
 gtk/gtkcellrendererprogress.h  |   2 +
 gtk/gtkcellrendererspin.h      |   2 +
 gtk/gtkcellrendererspinner.h   |   2 +
 gtk/gtkcellrenderertext.h      |   1 +
 gtk/gtkcellrenderertoggle.h    |   1 +
 gtk/gtkcellview.h              |   2 +
 gtk/gtkcheckbutton.h           |   2 +
 gtk/gtkcolorbutton.h           |   2 +
 gtk/gtkcolorchooser.h          |   2 +
 gtk/gtkcolorchooserdialog.h    |   2 +
 gtk/gtkcolorchooserwidget.h    |   2 +
 gtk/gtkcombobox.h              |   1 +
 gtk/gtkcomboboxtext.h          |   2 +
 gtk/gtkcssprovider.h           |   2 +
 gtk/gtkdrawingarea.h           |   2 +
 gtk/gtkeditable.h              |   1 +
 gtk/gtkentry.h                 |   2 +
 gtk/gtkentrycompletion.h       |   2 +
 gtk/gtkeventcontroller.h       |   2 +
 gtk/gtkexpander.h              |   1 +
 gtk/gtkfilechooserdialog.h     |   2 +
 gtk/gtkfilechooserwidget.h     |   2 +
 gtk/gtkfilefilter.h            |   2 +
 gtk/gtkfixed.h                 |   2 +
 gtk/gtkflowbox.h               |   3 +
 gtk/gtkfontbutton.h            |   2 +
 gtk/gtkfontchooser.h           |   2 +
 gtk/gtkfontchooserdialog.h     |   2 +
 gtk/gtkfontchooserwidget.h     |   2 +
 gtk/gtkframe.h                 |   1 +
 gtk/gtkgesture.h               |   2 +
 gtk/gtkgestureclick.h          |   2 +
 gtk/gtkgesturedrag.h           |   2 +
 gtk/gtkgesturelongpress.h      |   2 +-
 gtk/gtkgesturepan.h            |   1 +
 gtk/gtkgesturerotate.h         |   2 +
 gtk/gtkgesturesingle.h         |   2 +
 gtk/gtkgestureswipe.h          |   2 +
 gtk/gtkgesturezoom.h           |   2 +
 gtk/gtkglarea.h                |   2 +
 gtk/gtkgrid.h                  |   2 +
 gtk/gtkgridview.h              |   1 +
 gtk/gtkheaderbar.h             |   2 +
 gtk/gtkicontheme.h             |   3 +
 gtk/gtkiconview.h              |   1 +
 gtk/gtkimage.h                 |   2 +
 gtk/gtkimcontext.h             |   2 +
 gtk/gtkimcontextsimple.h       |   1 +
 gtk/gtkimmulticontext.h        |   4 +-
 gtk/gtkinfobar.h               |   2 +
 gtk/gtklevelbar.h              |   2 +
 gtk/gtklinkbutton.h            |   1 +
 gtk/gtklistitem.h              |   1 +
 gtk/gtklistitemfactory.h       |   1 +
 gtk/gtkliststore.h             |   1 +
 gtk/gtklockbutton.h            |   1 +
 gtk/gtkmenubutton.h            |   2 +
 gtk/gtkmessagedialog.h         |   2 +
 gtk/gtkmountoperation.h        |   2 +
 gtk/gtknotebook.h              |   2 +
 gtk/gtkorientable.h            |   2 +
 gtk/gtkoverlay.h               |   2 +
 gtk/gtkpagesetup.h             |   2 +
 gtk/gtkpaned.h                 |   1 +
 gtk/gtkpapersize.h             |   2 +
 gtk/gtkpopover.h               |   1 +
 gtk/gtkpopovermenu.h           |   2 +
 gtk/gtkpopovermenubar.h        |   3 +
 gtk/gtkprintcontext.h          |   2 +
 gtk/gtkprintoperation.h        |   2 +
 gtk/gtkprintoperationpreview.h |   2 +
 gtk/gtkprintsettings.h         |   1 +
 gtk/gtkprogressbar.h           |   2 +
 gtk/gtkrange.h                 |   1 +
 gtk/gtkrecentmanager.h         |   3 +
 gtk/gtkrevealer.h              |   2 +
 gtk/gtkscale.h                 |   2 +
 gtk/gtkscalebutton.h           |   2 +
 gtk/gtkscrollable.h            |   2 +
 gtk/gtkscrollbar.h             |   2 +
 gtk/gtkscrolledwindow.h        |   2 +
 gtk/gtksearchbar.h             |   1 +
 gtk/gtksearchentry.h           |   2 +
 gtk/gtkseparator.h             |   1 +
 gtk/gtksettings.h              |   2 +
 gtk/gtksizegroup.h             |   2 +
 gtk/gtkspinbutton.h            |   1 +
 gtk/gtkspinner.h               |   2 +
 gtk/gtkstack.h                 |   2 +
 gtk/gtkstacksidebar.h          |   2 +
 gtk/gtkstackswitcher.h         |   2 +
 gtk/gtkstatusbar.h             |   2 +
 gtk/gtkstylecontext.h          |   2 +
 gtk/gtkstyleprovider.h         |   2 +
 gtk/gtkswitch.h                |   2 +
 gtk/gtktextbuffer.h            |   1 +
 gtk/gtktextchild.h             |   2 +
 gtk/gtktextiter.h              |   2 +
 gtk/gtktextmark.h              |   2 +
 gtk/gtktexttag.h               |   2 +
 gtk/gtktexttagtable.h          |   2 +
 gtk/gtktextview.h              |   2 +
 gtk/gtktogglebutton.h          |   1 +
 gtk/gtktooltip.h               |   2 +
 gtk/gtktreednd.h               |   3 +
 gtk/gtktreemodel.h             |   5 ++
 gtk/gtktreemodelfilter.h       |   2 +
 gtk/gtktreemodelsort.h         |   1 +
 gtk/gtktreeselection.h         |   1 +
 gtk/gtktreesortable.h          |   2 +
 gtk/gtktreestore.h             |   1 +
 gtk/gtktreeview.h              |   2 +
 gtk/gtktreeviewcolumn.h        |   1 +
 gtk/gtkviewport.h              |   2 +
 gtk/gtkvolumebutton.h          |   2 +
 gtk/meson.build                |   1 -
 142 files changed, 253 insertions(+), 176 deletions(-)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index bac384a2e0..f995ba4689 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -287,8 +287,6 @@
 #include <gtk/gtkwindowgroup.h>
 #include <gtk/gtkwindowhandle.h>
 
-#include <gtk/gtk-autocleanups.h>
-
 #undef __GTK_H_INSIDE__
 
 #endif /* __GTK_H__ */
diff --git a/gtk/gtkactionable.h b/gtk/gtkactionable.h
index 9116546647..cf54fc7efb 100644
--- a/gtk/gtkactionable.h
+++ b/gtk/gtkactionable.h
@@ -75,6 +75,8 @@ GDK_AVAILABLE_IN_ALL
 void                    gtk_actionable_set_detailed_action_name         (GtkActionable *actionable,
                                                                          const char    
*detailed_action_name);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionable, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ACTIONABLE_H__ */
diff --git a/gtk/gtkactionbar.h b/gtk/gtkactionbar.h
index 0f651e1877..d1ea969439 100644
--- a/gtk/gtkactionbar.h
+++ b/gtk/gtkactionbar.h
@@ -61,6 +61,7 @@ void        gtk_action_bar_set_revealed       (GtkActionBar *action_bar,
 GDK_AVAILABLE_IN_ALL
 gboolean    gtk_action_bar_get_revealed       (GtkActionBar *action_bar);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionBar, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 7f5ce89a34..133d160e28 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -121,6 +121,8 @@ void       gtk_adjustment_configure             (GtkAdjustment   *adjustment,
 GDK_AVAILABLE_IN_ALL
 double     gtk_adjustment_get_minimum_increment (GtkAdjustment   *adjustment);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAdjustment, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ADJUSTMENT_H__ */
diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h
index 21d2cbbca1..6777297b2a 100644
--- a/gtk/gtkappchooser.h
+++ b/gtk/gtkappchooser.h
@@ -48,6 +48,8 @@ char *    gtk_app_chooser_get_content_type (GtkAppChooser *self);
 GDK_AVAILABLE_IN_ALL
 void       gtk_app_chooser_refresh          (GtkAppChooser *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooser, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_H__ */
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index 1f8b33d11e..493c5e34d1 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -77,6 +77,8 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_app_chooser_button_set_modal             (GtkAppChooserButton *self,
                                                        gboolean             modal);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_BUTTON_H__ */
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index 422610bcc5..9f3f8c589e 100644
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -60,6 +60,8 @@ void          gtk_app_chooser_dialog_set_heading          (GtkAppChooserDialog *
 GDK_AVAILABLE_IN_ALL
 const char * gtk_app_chooser_dialog_get_heading          (GtkAppChooserDialog *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserDialog, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_DIALOG_H__ */
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index 066da1bb04..6167e05739 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -82,6 +82,8 @@ void          gtk_app_chooser_widget_set_default_text     (GtkAppChooserWidget *
 GDK_AVAILABLE_IN_ALL
 const char * gtk_app_chooser_widget_get_default_text     (GtkAppChooserWidget *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserWidget, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_WIDGET_H__ */
diff --git a/gtk/gtkapplicationwindow.h b/gtk/gtkapplicationwindow.h
index 294e2f9d5b..9e083881a0 100644
--- a/gtk/gtkapplicationwindow.h
+++ b/gtk/gtkapplicationwindow.h
@@ -82,6 +82,8 @@ GDK_AVAILABLE_IN_ALL
 GtkShortcutsWindow *
             gtk_application_window_get_help_overlay (GtkApplicationWindow *window);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkApplicationWindow, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_APPLICATION_WINDOW_H__ */
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index a2919d1ca2..27e4e28148 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -79,6 +79,8 @@ void       gtk_aspect_frame_set_child  (GtkAspectFrame *self,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_aspect_frame_get_child  (GtkAspectFrame *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAspectFrame, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ASPECT_FRAME_H__ */
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index fa1ccfb4b7..18abf61330 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -180,6 +180,8 @@ GtkWidget *           gtk_assistant_page_get_child (GtkAssistantPage *page);
 GDK_AVAILABLE_IN_ALL
 GListModel *          gtk_assistant_get_pages (GtkAssistant *assistant);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAssistant, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ASSISTANT_H__ */
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 3d74fb73ce..067ae1a2b7 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -107,6 +107,7 @@ void        gtk_box_reorder_child_after (GtkBox         *box,
                                          GtkWidget      *child,
                                          GtkWidget      *sibling);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBox, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 0c005d71eb..f2498aea12 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -260,6 +260,8 @@ void          gtk_buildable_parse_context_get_position      (GtkBuildableParseCo
                                                              int                      *line_number,
                                                              int                      *char_number);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBuildable, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_BUILDABLE_H__ */
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 2e02114116..b97d7fd8ba 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -203,6 +203,8 @@ gboolean  gtk_builder_extend_with_template  (GtkBuilder    *builder,
                                              gssize         length,
                                              GError       **error);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBuilder, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_BUILDER_H__ */
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index f7e992fd62..b6d0ce5cbd 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -113,6 +113,8 @@ void                  gtk_button_set_child          (GtkButton      *button,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_button_get_child          (GtkButton      *button);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 7ab0f13acd..90ef3757ed 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -86,6 +86,8 @@ GDK_AVAILABLE_IN_ALL
 gboolean   gtk_calendar_get_day_is_marked      (GtkCalendar    *calendar,
                                                 guint           day);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCalendar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CALENDAR_H__ */
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index 1ec3bc429e..85ddaf0616 100644
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -518,6 +518,8 @@ void                 _gtk_cell_area_set_cell_data_func_with_proxy  (GtkCellArea
                                                                    GDestroyNotify         destroy,
                                                                    gpointer               proxy);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellArea, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_AREA_H__ */
diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 2c1ab869f6..a74c016afa 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -63,6 +63,8 @@ void         gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
 gboolean    _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
                                               int              group_idx);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellAreaBox, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_AREA_BOX_H__ */
diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h
index db852cc23e..953a1837db 100644
--- a/gtk/gtkcellareacontext.h
+++ b/gtk/gtkcellareacontext.h
@@ -134,6 +134,8 @@ void         gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *co
                                                           int                 minimum_height,
                                                           int                 natural_height);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellAreaContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_AREA_CONTEXT_H__ */
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 3d0e2fcbf7..be60227448 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -70,6 +70,7 @@ void  gtk_cell_editable_editing_done  (GtkCellEditable *cell_editable);
 GDK_AVAILABLE_IN_ALL
 void  gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellEditable, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 47bc01dae3..7ef60f6c49 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -163,6 +163,8 @@ void     _gtk_cell_layout_buildable_add_child        (GtkBuildable       *builda
                                                       GObject            *child,
                                                       const char         *type);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellLayout, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_LAYOUT_H__ */
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index a0a5129c47..1d6034775a 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -306,6 +306,8 @@ GtkStateFlags   gtk_cell_renderer_get_state       (GtkCellRenderer      *cell,
                                                    GtkWidget            *widget,
                                                    GtkCellRendererState  cell_state);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRenderer, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_H__ */
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 06bcbef7fe..bacf559992 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -51,6 +51,7 @@ GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererAccel, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 62cf603497..5f7eb6fba9 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -38,6 +38,8 @@ GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererCombo, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_COMBO_H__ */
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 1089cd749b..6dd04d4d85 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -39,6 +39,7 @@ GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererPixbuf, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index 6bfbd4b172..b1a9c04e3e 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -45,6 +45,8 @@ GType          gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererProgress, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_CELL_RENDERER_PROGRESS_H__ */
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index 5710d37883..5f94cc4b47 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -37,6 +37,8 @@ GType            gtk_cell_renderer_spin_get_type (void);
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_spin_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererSpin, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_CELL_RENDERER_SPIN_H__ */
diff --git a/gtk/gtkcellrendererspinner.h b/gtk/gtkcellrendererspinner.h
index d5361381b0..68b701bb3b 100644
--- a/gtk/gtkcellrendererspinner.h
+++ b/gtk/gtkcellrendererspinner.h
@@ -40,6 +40,8 @@ GType            gtk_cell_renderer_spinner_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_spinner_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererSpinner, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_SPINNER_H__ */
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index c709bb9f6c..e02a31ee74 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -66,6 +66,7 @@ GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
                                                                    int                  number_of_rows);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererText, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index 83575b352c..7cc80afa2e 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -58,6 +58,7 @@ GDK_AVAILABLE_IN_ALL
 void            gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
                                                           gboolean               setting);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellRendererToggle, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 1cb1adf8d7..77c131c46e 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -70,6 +70,8 @@ GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_fit_model           (GtkCellView     *cell_view,
                                                          gboolean         fit_model);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellView, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_VIEW_H__ */
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 91c8b8e998..d4aefc1582 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -101,6 +101,8 @@ GDK_AVAILABLE_IN_4_8
 void            gtk_check_button_set_child          (GtkCheckButton *button,
                                                      GtkWidget *child);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCheckButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CHECK_BUTTON_H__ */
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index dfc0fea348..a8ac6cbfe6 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -64,6 +64,8 @@ GDK_AVAILABLE_IN_ALL
 void         gtk_color_button_set_modal        (GtkColorButton *button,
                                                 gboolean        modal);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorButton, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_COLOR_BUTTON_H__ */
diff --git a/gtk/gtkcolorchooser.h b/gtk/gtkcolorchooser.h
index ac95a1a70b..7a97865b8d 100644
--- a/gtk/gtkcolorchooser.h
+++ b/gtk/gtkcolorchooser.h
@@ -83,6 +83,8 @@ void     gtk_color_chooser_add_palette    (GtkColorChooser *chooser,
                                            int              n_colors,
                                            GdkRGBA         *colors);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooser, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_COLOR_CHOOSER_H__ */
diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h
index b971b95819..c5212d912d 100644
--- a/gtk/gtkcolorchooserdialog.h
+++ b/gtk/gtkcolorchooserdialog.h
@@ -39,6 +39,8 @@ GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_color_chooser_dialog_new      (const char *title,
                                                GtkWindow   *parent);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooserDialog, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_COLOR_CHOOSER_DIALOG_H__ */
diff --git a/gtk/gtkcolorchooserwidget.h b/gtk/gtkcolorchooserwidget.h
index 9c677cfbc8..6634f0eb9c 100644
--- a/gtk/gtkcolorchooserwidget.h
+++ b/gtk/gtkcolorchooserwidget.h
@@ -38,6 +38,8 @@ GType       gtk_color_chooser_widget_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_color_chooser_widget_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkColorChooserWidget, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_COLOR_CHOOSER_WIDGET_H__ */
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index fde7e89653..3740801fa9 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -154,6 +154,7 @@ void          gtk_combo_box_set_child            (GtkComboBox *combo_box,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *   gtk_combo_box_get_child            (GtkComboBox *combo_box);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkComboBox, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index 33c4b18cc3..d90cc9d19b 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -71,6 +71,8 @@ void          gtk_combo_box_text_prepend         (GtkComboBoxText     *combo_box
                                                   const char          *id,
                                                   const char          *text);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkComboBoxText, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_COMBO_BOX_TEXT_H__ */
diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index 921185bbb6..39c67eb72b 100644
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -66,6 +66,8 @@ void             gtk_css_provider_load_named     (GtkCssProvider  *provider,
                                                   const char      *name,
                                                   const char      *variant);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCssProvider, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_CSS_PROVIDER_H__ */
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 3f0ee3eab0..2cc32e6d62 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -106,6 +106,8 @@ void            gtk_drawing_area_set_draw_func          (GtkDrawingArea
                                                          gpointer                user_data,
                                                          GDestroyNotify          destroy);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkDrawingArea, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_DRAWING_AREA_H__ */
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 7646ba1584..c7ca5caf04 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -195,6 +195,7 @@ gboolean     gtk_editable_delegate_get_property (GObject      *object,
                                                  GValue       *value,
                                                  GParamSpec   *pspec);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEditable, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index c55538f57a..e330e99ac6 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -291,6 +291,8 @@ void           gtk_entry_set_extra_menu                      (GtkEntry
 GDK_AVAILABLE_IN_ALL
 GMenuModel *   gtk_entry_get_extra_menu                      (GtkEntry             *entry);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntry, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ENTRY_H__ */
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 90347b25ac..f050c2e570 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -130,6 +130,8 @@ void                gtk_entry_completion_set_text_column        (GtkEntryComplet
 GDK_AVAILABLE_IN_ALL
 int                 gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEntryCompletion, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ENTRY_COMPLETION_H__ */
diff --git a/gtk/gtkeventcontroller.h b/gtk/gtkeventcontroller.h
index 084e7a4f42..7bf8bdbebd 100644
--- a/gtk/gtkeventcontroller.h
+++ b/gtk/gtkeventcontroller.h
@@ -81,6 +81,8 @@ GdkDevice *         gtk_event_controller_get_current_event_device (GtkEventContr
 GDK_AVAILABLE_IN_ALL
 GdkModifierType     gtk_event_controller_get_current_event_state (GtkEventController *controller);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkEventController, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_EVENT_CONTROLLER_H__ */
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 8ddf416e54..1bbcf23791 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -85,6 +85,7 @@ void                  gtk_expander_set_child           (GtkExpander *expander,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_expander_get_child           (GtkExpander *expander);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkExpander, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 2f47143374..6271857cb9 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -43,6 +43,8 @@ GtkWidget *gtk_file_chooser_dialog_new              (const char           *title
                                                     const char           *first_button_text,
                                                     ...) G_GNUC_NULL_TERMINATED;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFileChooserDialog, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 6927cdc4a8..f4094c7dcb 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -39,6 +39,8 @@ GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFileChooserWidget, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index e14d70d823..b59922a17f 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -68,6 +68,8 @@ GVariant      * gtk_file_filter_to_gvariant        (GtkFileFilter *filter);
 GDK_AVAILABLE_IN_ALL
 GtkFileFilter * gtk_file_filter_new_from_gvariant  (GVariant      *variant);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFileFilter, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FILE_FILTER_H__ */
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index e1173fdf13..433bd01121 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -91,6 +91,8 @@ GDK_AVAILABLE_IN_ALL
 GskTransform *  gtk_fixed_get_child_transform   (GtkFixed     *fixed,
                                                  GtkWidget    *widget);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFixed, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FIXED_H__ */
diff --git a/gtk/gtkflowbox.h b/gtk/gtkflowbox.h
index a8f3da2eda..38b6351ee4 100644
--- a/gtk/gtkflowbox.h
+++ b/gtk/gtkflowbox.h
@@ -224,6 +224,9 @@ void                  gtk_flow_box_set_sort_func                (GtkFlowBox
 GDK_AVAILABLE_IN_ALL
 void                  gtk_flow_box_invalidate_sort              (GtkFlowBox         *box);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFlowBox, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFlowBoxChild, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 3079981dee..58fc881f5b 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -69,6 +69,8 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontButton, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index 2ce7897d03..95aa518b3f 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -161,6 +161,8 @@ GDK_AVAILABLE_IN_ALL
 void             gtk_font_chooser_set_language             (GtkFontChooser   *fontchooser,
                                                             const char       *language);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontChooser, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FONT_CHOOSER_H__ */
diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h
index e63a3135a3..b14ee81c2d 100644
--- a/gtk/gtkfontchooserdialog.h
+++ b/gtk/gtkfontchooserdialog.h
@@ -38,6 +38,8 @@ GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_font_chooser_dialog_new              (const char           *title,
                                                      GtkWindow            *parent);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontChooserDialog, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FONT_CHOOSER_DIALOG_H__ */
diff --git a/gtk/gtkfontchooserwidget.h b/gtk/gtkfontchooserwidget.h
index 149c685ad9..d3f668049b 100644
--- a/gtk/gtkfontchooserwidget.h
+++ b/gtk/gtkfontchooserwidget.h
@@ -38,6 +38,8 @@ GType        gtk_font_chooser_widget_get_type                 (void) G_GNUC_CONS
 GDK_AVAILABLE_IN_ALL
 GtkWidget*   gtk_font_chooser_widget_new                      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontChooserWidget, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_FONT_CHOOSER_WIDGET_H__ */
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 0e76858c8e..a79581baf6 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -99,6 +99,7 @@ void       gtk_frame_set_child        (GtkFrame      *frame,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_frame_get_child        (GtkFrame      *frame);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFrame, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h
index 9f7f454e6e..fc9eb8e799 100644
--- a/gtk/gtkgesture.h
+++ b/gtk/gtkgesture.h
@@ -102,6 +102,8 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gtk_gesture_is_grouped_with      (GtkGesture       *gesture,
                                               GtkGesture       *other);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGesture, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_H__ */
diff --git a/gtk/gtkgestureclick.h b/gtk/gtkgestureclick.h
index 7d42b44863..71365e2ad2 100644
--- a/gtk/gtkgestureclick.h
+++ b/gtk/gtkgestureclick.h
@@ -44,6 +44,8 @@ GType        gtk_gesture_click_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkGesture * gtk_gesture_click_new      (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureClick, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_CLICK_H__ */
diff --git a/gtk/gtkgesturedrag.h b/gtk/gtkgesturedrag.h
index fca25d1802..7499276d80 100644
--- a/gtk/gtkgesturedrag.h
+++ b/gtk/gtkgesturedrag.h
@@ -53,6 +53,8 @@ gboolean     gtk_gesture_drag_get_offset        (GtkGestureDrag *gesture,
                                                  double         *x,
                                                  double         *y);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureDrag, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_DRAG_H__ */
diff --git a/gtk/gtkgesturelongpress.h b/gtk/gtkgesturelongpress.h
index da983355cd..0de91548af 100644
--- a/gtk/gtkgesturelongpress.h
+++ b/gtk/gtkgesturelongpress.h
@@ -51,7 +51,7 @@ void         gtk_gesture_long_press_set_delay_factor (GtkGestureLongPress *gestu
 GDK_AVAILABLE_IN_ALL
 double       gtk_gesture_long_press_get_delay_factor (GtkGestureLongPress *gesture);
 
-
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureLongPress, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkgesturepan.h b/gtk/gtkgesturepan.h
index 496f4db57b..9e364c2a69 100644
--- a/gtk/gtkgesturepan.h
+++ b/gtk/gtkgesturepan.h
@@ -51,6 +51,7 @@ GDK_AVAILABLE_IN_ALL
 void              gtk_gesture_pan_set_orientation (GtkGesturePan  *gesture,
                                                    GtkOrientation  orientation);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGesturePan, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkgesturerotate.h b/gtk/gtkgesturerotate.h
index 248eb07893..1cdb8edad4 100644
--- a/gtk/gtkgesturerotate.h
+++ b/gtk/gtkgesturerotate.h
@@ -48,6 +48,8 @@ GtkGesture * gtk_gesture_rotate_new             (void);
 GDK_AVAILABLE_IN_ALL
 double       gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureRotate, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_ROTATE_H__ */
diff --git a/gtk/gtkgesturesingle.h b/gtk/gtkgesturesingle.h
index 09dc9b6bb8..4cd338de26 100644
--- a/gtk/gtkgesturesingle.h
+++ b/gtk/gtkgesturesingle.h
@@ -70,6 +70,8 @@ GDK_AVAILABLE_IN_ALL
 GdkEventSequence * gtk_gesture_single_get_current_sequence
                                               (GtkGestureSingle *gesture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureSingle, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_SINGLE_H__ */
diff --git a/gtk/gtkgestureswipe.h b/gtk/gtkgestureswipe.h
index a85df6c3fc..db110eafc8 100644
--- a/gtk/gtkgestureswipe.h
+++ b/gtk/gtkgestureswipe.h
@@ -50,6 +50,8 @@ gboolean        gtk_gesture_swipe_get_velocity  (GtkGestureSwipe *gesture,
                                                  double          *velocity_x,
                                                  double          *velocity_y);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureSwipe, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_SWIPE_H__ */
diff --git a/gtk/gtkgesturezoom.h b/gtk/gtkgesturezoom.h
index 8c01affe6d..a57cb7b1fc 100644
--- a/gtk/gtkgesturezoom.h
+++ b/gtk/gtkgesturezoom.h
@@ -48,6 +48,8 @@ GtkGesture * gtk_gesture_zoom_new             (void);
 GDK_AVAILABLE_IN_ALL
 double       gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGestureZoom, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_ZOOM_H__ */
diff --git a/gtk/gtkglarea.h b/gtk/gtkglarea.h
index 70589ef56c..97ef463f0b 100644
--- a/gtk/gtkglarea.h
+++ b/gtk/gtkglarea.h
@@ -122,6 +122,8 @@ void            gtk_gl_area_set_error                   (GtkGLArea    *area,
 GDK_AVAILABLE_IN_ALL
 GError *        gtk_gl_area_get_error                   (GtkGLArea    *area);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGLArea, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GL_AREA_H__ */
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index c482a3b898..35081d830b 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -142,6 +142,8 @@ void       gtk_grid_query_child            (GtkGrid         *grid,
                                             int             *width,
                                             int             *height);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGrid, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_GRID_H__ */
diff --git a/gtk/gtkgridview.h b/gtk/gtkgridview.h
index 80b0e72bbd..18056ecef3 100644
--- a/gtk/gtkgridview.h
+++ b/gtk/gtkgridview.h
@@ -79,6 +79,7 @@ void            gtk_grid_view_set_single_click_activate         (GtkGridView
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_grid_view_get_single_click_activate         (GtkGridView            *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkGridView, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkheaderbar.h b/gtk/gtkheaderbar.h
index a5c85dc48d..cf60231173 100644
--- a/gtk/gtkheaderbar.h
+++ b/gtk/gtkheaderbar.h
@@ -67,6 +67,8 @@ void         gtk_header_bar_set_decoration_layout (GtkHeaderBar *bar,
 GDK_AVAILABLE_IN_ALL
 const char *gtk_header_bar_get_decoration_layout (GtkHeaderBar *bar);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkHeaderBar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_HEADER_BAR_H__ */
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index bc591c12a5..1b6c725df3 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -154,6 +154,9 @@ const char *         gtk_icon_paintable_get_icon_name     (GtkIconPaintable  *se
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_icon_paintable_is_symbolic       (GtkIconPaintable  *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconPaintable, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconTheme, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ICON_THEME_H__ */
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 087670df20..b16153d809 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -282,6 +282,7 @@ void     gtk_icon_view_set_tooltip_column                     (GtkIconView
 GDK_AVAILABLE_IN_ALL
 int      gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconView, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 21852258e8..b810c67166 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -126,6 +126,8 @@ int        gtk_image_get_pixel_size (GtkImage             *image);
 GDK_AVAILABLE_IN_ALL
 GtkIconSize gtk_image_get_icon_size (GtkImage             *image);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkImage, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_IMAGE_H__ */
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index d4268d7e12..4fd25cf2ab 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -168,6 +168,8 @@ gboolean gtk_im_context_delete_surrounding  (GtkIMContext       *context,
                                             int                 offset,
                                             int                 n_chars);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIMContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_IM_CONTEXT_H__ */
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index c2629a8fdd..59a5f69def 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -72,6 +72,7 @@ GDK_AVAILABLE_IN_ALL
 void          gtk_im_context_simple_add_compose_file (GtkIMContextSimple *context_simple,
                                                       const char         *compose_file);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIMContextSimple, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 53e72d5aeb..73eaafdddc 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -68,7 +68,9 @@ const char  * gtk_im_multicontext_get_context_id   (GtkIMMulticontext *context);
 GDK_AVAILABLE_IN_ALL
 void          gtk_im_multicontext_set_context_id   (GtkIMMulticontext *context,
                                                     const char        *context_id);
- 
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIMMulticontext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_IM_MULTICONTEXT_H__ */
diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index a9e9a1d0f1..11c8529b41 100644
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -105,6 +105,8 @@ void           gtk_info_bar_set_revealed           (GtkInfoBar     *info_bar,
 GDK_AVAILABLE_IN_ALL
 gboolean       gtk_info_bar_get_revealed           (GtkInfoBar     *info_bar);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkInfoBar, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_INFO_BAR_H__  */
diff --git a/gtk/gtklevelbar.h b/gtk/gtklevelbar.h
index 52c9857698..40accd124f 100644
--- a/gtk/gtklevelbar.h
+++ b/gtk/gtklevelbar.h
@@ -110,6 +110,8 @@ gboolean   gtk_level_bar_get_offset_value   (GtkLevelBar *self,
                                              const char *name,
                                              double      *value);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLevelBar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_LEVEL_BAR_H__ */
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 90390ff7eb..8f6818374a 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -59,6 +59,7 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_link_button_set_visited       (GtkLinkButton *link_button,
                                                          gboolean       visited);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButton, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 3eb58677b5..0db22641fd 100644
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -64,6 +64,7 @@ void            gtk_list_item_set_child                         (GtkListItem
 GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_list_item_get_child                         (GtkListItem            *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListItem, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtklistitemfactory.h b/gtk/gtklistitemfactory.h
index 629beb66fb..c058ad6398 100644
--- a/gtk/gtklistitemfactory.h
+++ b/gtk/gtklistitemfactory.h
@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 GDK_AVAILABLE_IN_ALL
 GType        gtk_list_item_factory_get_type       (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListItemFactory, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 7320d572ba..a83871e87b 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -146,6 +146,7 @@ void          gtk_list_store_move_before      (GtkListStore *store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListStore, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtklockbutton.h b/gtk/gtklockbutton.h
index 3c1e0cd8cf..5d24b06f38 100644
--- a/gtk/gtklockbutton.h
+++ b/gtk/gtklockbutton.h
@@ -40,6 +40,7 @@ GDK_AVAILABLE_IN_ALL
 void         gtk_lock_button_set_permission (GtkLockButton *button,
                                              GPermission   *permission);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLockButton, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index 723adb34da..412f43ca3b 100644
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -127,6 +127,8 @@ void          gtk_menu_button_set_child   (GtkMenuButton *menu_button,
 GDK_AVAILABLE_IN_4_6
 GtkWidget *   gtk_menu_button_get_child   (GtkMenuButton *menu_button);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_MENU_BUTTON_H__ */
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index ac4198bea3..a1de879493 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -111,6 +111,8 @@ void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMessageDialog, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_MESSAGE_DIALOG_H__ */
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index 7eb7bd4675..21e6effd6c 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -84,6 +84,8 @@ void             gtk_mount_operation_set_display(GtkMountOperation *op,
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *     gtk_mount_operation_get_display(GtkMountOperation *op);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMountOperation, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_MOUNT_OPERATION_H__ */
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 73139d6580..437b7b9746 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -243,6 +243,8 @@ GtkWidget *gtk_notebook_page_get_child (GtkNotebookPage *page);
 GDK_AVAILABLE_IN_ALL
 GListModel *gtk_notebook_get_pages (GtkNotebook *notebook);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkNotebook, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_NOTEBOOK_H__ */
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index cda1357c06..551d1ad05f 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -53,6 +53,8 @@ void           gtk_orientable_set_orientation (GtkOrientable  *orientable,
 GDK_AVAILABLE_IN_ALL
 GtkOrientation gtk_orientable_get_orientation (GtkOrientable  *orientable);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkOrientable, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_ORIENTABLE_H__ */
diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h
index 23216f24f7..fa02fe4f95 100644
--- a/gtk/gtkoverlay.h
+++ b/gtk/gtkoverlay.h
@@ -67,6 +67,8 @@ void       gtk_overlay_set_clip_overlay    (GtkOverlay *overlay,
                                             GtkWidget  *widget,
                                             gboolean    clip_overlay);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkOverlay, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_OVERLAY_H__ */
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 461861e8c9..30d07518c6 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -132,6 +132,8 @@ GVariant          *gtk_page_setup_to_gvariant       (GtkPageSetup        *setup)
 GDK_AVAILABLE_IN_ALL
 GtkPageSetup      *gtk_page_setup_new_from_gvariant (GVariant            *variant);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPageSetup, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_PAGE_SETUP_H__ */
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index af8919a2cc..6b1b91bcde 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -90,6 +90,7 @@ void        gtk_paned_set_wide_handle (GtkPaned    *paned,
 GDK_AVAILABLE_IN_ALL
 gboolean    gtk_paned_get_wide_handle (GtkPaned    *paned);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaned, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 20e4239e8e..29bcc52db9 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -169,6 +169,8 @@ GtkPaperSize *gtk_paper_size_new_from_gvariant (GVariant     *variant);
 GDK_AVAILABLE_IN_ALL
 GVariant     *gtk_paper_size_to_gvariant       (GtkPaperSize *paper_size);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free)
+
 G_END_DECLS
 
 #endif /* __GTK_PAPER_SIZE_H__ */
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index 1ecb8e57c3..fbfa154135 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -124,6 +124,7 @@ void gtk_popover_set_default_widget (GtkPopover *popover,
 GDK_AVAILABLE_IN_ALL
 void gtk_popover_present (GtkPopover *popover);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPopover, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkpopovermenu.h b/gtk/gtkpopovermenu.h
index 2973102be1..badbb0e685 100644
--- a/gtk/gtkpopovermenu.h
+++ b/gtk/gtkpopovermenu.h
@@ -70,6 +70,8 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gtk_popover_menu_remove_child (GtkPopoverMenu *popover,
                                            GtkWidget      *child);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPopoverMenu, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_POPOVER_MENU_H__ */
diff --git a/gtk/gtkpopovermenubar.h b/gtk/gtkpopovermenubar.h
index 08126f9d63..5cc5b332cc 100644
--- a/gtk/gtkpopovermenubar.h
+++ b/gtk/gtkpopovermenubar.h
@@ -55,6 +55,9 @@ gboolean     gtk_popover_menu_bar_add_child      (GtkPopoverMenuBar *bar,
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_popover_menu_bar_remove_child   (GtkPopoverMenuBar *bar,
                                                   GtkWidget         *child);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPopoverMenuBar, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 3c4ede2bbf..cd300deace 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -76,6 +76,8 @@ void         gtk_print_context_set_cairo_context     (GtkPrintContext *context,
                                                      double           dpi_x,
                                                      double           dpi_y);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_PRINT_CONTEXT_H__ */
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 360c0859b6..c10bb85a91 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -331,6 +331,8 @@ void                    gtk_print_run_page_setup_dialog_async      (GtkWindow
                                                                     GtkPageSetupDoneFunc  done_cb,
                                                                     gpointer              data);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintOperation, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_PRINT_OPERATION_H__ */
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index 387b629a17..85a4b6e0ab 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -78,6 +78,8 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
                                                  int                       page_nr);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintOperationPreview, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_PRINT_OPERATION_PREVIEW_H__ */
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index d990a5700a..3471af40f6 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -348,6 +348,7 @@ GVariant             *gtk_print_settings_to_gvariant           (GtkPrintSettings
 GDK_AVAILABLE_IN_ALL
 GtkPrintSettings     *gtk_print_settings_new_from_gvariant     (GVariant           *variant);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintSettings, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 75dc092d07..7ec83e73e3 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -83,6 +83,8 @@ void               gtk_progress_bar_set_show_text (GtkProgressBar     *pbar,
 GDK_AVAILABLE_IN_ALL
 gboolean           gtk_progress_bar_get_show_text (GtkProgressBar     *pbar);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkProgressBar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_PROGRESS_BAR_H__ */
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 8d83a13f46..71c44b33b1 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -147,6 +147,7 @@ void               gtk_range_set_round_digits              (GtkRange      *range
 GDK_AVAILABLE_IN_ALL
 int                 gtk_range_get_round_digits              (GtkRange      *range);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRange, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 2779c75c92..b1107239a8 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -251,6 +251,9 @@ gboolean              gtk_recent_info_match                (GtkRecentInfo  *info
 /* private */
 void _gtk_recent_manager_sync (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRecentManager, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRecentInfo, gtk_recent_info_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_RECENT_MANAGER_H__ */
diff --git a/gtk/gtkrevealer.h b/gtk/gtkrevealer.h
index be2cc652b0..fece00446c 100644
--- a/gtk/gtkrevealer.h
+++ b/gtk/gtkrevealer.h
@@ -74,6 +74,8 @@ void                       gtk_revealer_set_child               (GtkRevealer
 GDK_AVAILABLE_IN_ALL
 GtkWidget *                gtk_revealer_get_child               (GtkRevealer               *revealer);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkRevealer, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_REVEALER_H__ */
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index d7d11f8d01..7b9b6a00ff 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -131,6 +131,8 @@ void              gtk_scale_set_format_value_func (GtkScale                *scal
                                                    gpointer                 user_data,
                                                    GDestroyNotify           destroy_notify);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScale, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SCALE_H__ */
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 67a479baac..717e9f6f2f 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -97,6 +97,8 @@ GtkWidget *      gtk_scale_button_get_minus_button (GtkScaleButton  *button);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_scale_button_get_popup        (GtkScaleButton  *button);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScaleButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SCALE_BUTTON_H__ */
diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index 2d619296aa..ae04e4c9a9 100644
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -73,6 +73,8 @@ GDK_AVAILABLE_IN_ALL
 gboolean             gtk_scrollable_get_border             (GtkScrollable       *scrollable,
                                                             GtkBorder           *border);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScrollable, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SCROLLABLE_H__ */
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 886cc85fe3..d4cdfbdf79 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -54,6 +54,8 @@ void           gtk_scrollbar_set_adjustment (GtkScrollbar  *self,
 GDK_AVAILABLE_IN_ALL
 GtkAdjustment *gtk_scrollbar_get_adjustment (GtkScrollbar  *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScrollbar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SCROLLBAR_H__ */
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index fa3255f470..6e5517027c 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -182,6 +182,8 @@ void           gtk_scrolled_window_set_child        (GtkScrolledWindow *scrolled
 GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_scrolled_window_get_child        (GtkScrolledWindow *scrolled_window);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkScrolledWindow, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtksearchbar.h b/gtk/gtksearchbar.h
index 9c81f5a55a..683922726a 100644
--- a/gtk/gtksearchbar.h
+++ b/gtk/gtksearchbar.h
@@ -77,6 +77,7 @@ void        gtk_search_bar_set_child          (GtkSearchBar *bar,
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_search_bar_get_child          (GtkSearchBar *bar);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSearchBar, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtksearchentry.h b/gtk/gtksearchentry.h
index 81128bb22c..8a7ecaf038 100644
--- a/gtk/gtksearchentry.h
+++ b/gtk/gtksearchentry.h
@@ -60,6 +60,8 @@ void gtk_search_entry_set_search_delay (GtkSearchEntry *entry,
 GDK_AVAILABLE_IN_4_8
 guint gtk_search_entry_get_search_delay (GtkSearchEntry *entry);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSearchEntry, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SEARCH_ENTRY_H__ */
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index cdc91ecf6c..8b41481085 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -46,6 +46,7 @@ GType       gtk_separator_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_separator_new      (GtkOrientation orientation);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSeparator, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index cef63ea31e..3e983dbb50 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -45,6 +45,8 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_settings_reset_property       (GtkSettings            *settings,
                                             const char             *name);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSettings, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SETTINGS_H__ */
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 1db899b23e..9986ddadfd 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -57,6 +57,8 @@ void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
 GDK_AVAILABLE_IN_ALL
 GSList *         gtk_size_group_get_widgets   (GtkSizeGroup     *size_group);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSizeGroup, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SIZE_GROUP_H__ */
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index d5f9287888..f97f17c5c2 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -196,6 +196,7 @@ double          gtk_spin_button_get_climb_rate     (GtkSpinButton  *spin_button)
 GDK_AVAILABLE_IN_ALL
 void            gtk_spin_button_update             (GtkSpinButton  *spin_button);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSpinButton, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 5da918d49e..43410d1c0c 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -52,6 +52,8 @@ void       gtk_spinner_set_spinning (GtkSpinner *spinner,
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_spinner_get_spinning (GtkSpinner *spinner);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSpinner, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SPINNER_H__ */
diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h
index cf506b49fb..a1785ac551 100644
--- a/gtk/gtkstack.h
+++ b/gtk/gtkstack.h
@@ -179,6 +179,8 @@ gboolean               gtk_stack_get_interpolate_size    (GtkStack *stack);
 GDK_AVAILABLE_IN_ALL
 GtkSelectionModel *    gtk_stack_get_pages               (GtkStack *stack);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStack, g_object_unref)
+
 G_END_DECLS
 
 #endif
diff --git a/gtk/gtkstacksidebar.h b/gtk/gtkstacksidebar.h
index b49269532c..66ef681660 100644
--- a/gtk/gtkstacksidebar.h
+++ b/gtk/gtkstacksidebar.h
@@ -46,6 +46,8 @@ void        gtk_stack_sidebar_set_stack (GtkStackSidebar *self,
 GDK_AVAILABLE_IN_ALL
 GtkStack *  gtk_stack_sidebar_get_stack (GtkStackSidebar *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStackSidebar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_STACK_SIDEBAR_H__ */
diff --git a/gtk/gtkstackswitcher.h b/gtk/gtkstackswitcher.h
index bb8e5277d8..5c22dfcca0 100644
--- a/gtk/gtkstackswitcher.h
+++ b/gtk/gtkstackswitcher.h
@@ -45,6 +45,8 @@ void         gtk_stack_switcher_set_stack         (GtkStackSwitcher *switcher,
 GDK_AVAILABLE_IN_ALL
 GtkStack *   gtk_stack_switcher_get_stack         (GtkStackSwitcher *switcher);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStackSwitcher, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_STACK_SWITCHER_H__ */
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 13c4695e80..39b710b227 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -62,6 +62,8 @@ GDK_AVAILABLE_IN_ALL
 void       gtk_statusbar_remove_all            (GtkStatusbar *statusbar,
                                         guint         context_id);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStatusbar, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_STATUSBAR_H__ */
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index ae3a474f05..21462ef501 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -141,6 +141,8 @@ GDK_AVAILABLE_IN_ALL
 char * gtk_style_context_to_string (GtkStyleContext           *context,
                                     GtkStyleContextPrintFlags  flags);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStyleContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_STYLE_CONTEXT_H__ */
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 9a8913f078..3d696606a8 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -88,6 +88,8 @@ typedef struct _GtkStyleProvider GtkStyleProvider; /* dummy typedef */
 GDK_AVAILABLE_IN_ALL
 GType gtk_style_provider_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkStyleProvider, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROVIDER_H__ */
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index ba92df0c71..74b018926e 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -59,6 +59,8 @@ void            gtk_switch_set_state   (GtkSwitch *self,
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_switch_get_state   (GtkSwitch *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSwitch, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_SWITCH_H__ */
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 83ea8f47cf..e7f10bd344 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -461,6 +461,7 @@ void            gtk_text_buffer_begin_user_action         (GtkTextBuffer *buffer
 GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_end_user_action           (GtkTextBuffer *buffer);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextBuffer, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 5fab753feb..01e3288011 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -88,6 +88,8 @@ GtkWidget **gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor,
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextChildAnchor, g_object_unref)
+
 G_END_DECLS
 
 #endif
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 3a3107e49a..ebfe351b94 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -414,6 +414,8 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_order           (GtkTextIter *first,
                                         GtkTextIter *second);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextIter, gtk_text_iter_free)
+
 G_END_DECLS
 
 #endif
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 1f8a5b088b..d22ce7ba48 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -104,6 +104,8 @@ GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextMark, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GTK_TEXT_MARK_H__ */
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 942671a0aa..f536d00e28 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -104,6 +104,8 @@ GDK_AVAILABLE_IN_ALL
 void         gtk_text_tag_changed      (GtkTextTag        *tag,
                                         gboolean           size_changed);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextTag, g_object_unref)
+
 G_END_DECLS
 
 #endif
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 8f325bab1e..1b9957344b 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -68,6 +68,8 @@ void             gtk_text_tag_table_foreach  (GtkTextTagTable        *table,
 GDK_AVAILABLE_IN_ALL
 int              gtk_text_tag_table_get_size (GtkTextTagTable        *table);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextTagTable, g_object_unref)
+
 G_END_DECLS
 
 #endif
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 325077a871..afe6474857 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -432,6 +432,8 @@ PangoContext    *gtk_text_view_get_rtl_context        (GtkTextView      *text_vi
 GDK_AVAILABLE_IN_ALL
 PangoContext    *gtk_text_view_get_ltr_context        (GtkTextView      *text_view);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextView, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_TEXT_VIEW_H__ */
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 44219bb106..c0d6dd3421 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -83,6 +83,7 @@ GDK_AVAILABLE_IN_ALL
 void       gtk_toggle_button_set_group         (GtkToggleButton *toggle_button,
                                                 GtkToggleButton *group);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkToggleButton, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index f0587a9885..d3dd9dcfab 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -58,6 +58,8 @@ GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_tip_area            (GtkTooltip         *tooltip,
                                           const GdkRectangle *rect);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTooltip, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_TOOLTIP_H__ */
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index df4dacf188..28a28dc6b9 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -160,6 +160,9 @@ gboolean gtk_tree_get_row_drag_data            (const GValue      *value,
                                                GtkTreeModel     **tree_model,
                                                GtkTreePath      **path);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeDragDest, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeDragSource, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_DND_H__ */
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index db862be0e9..1ee15ca59c 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -403,6 +403,11 @@ void gtk_tree_model_rows_reordered_with_length (GtkTreeModel *tree_model,
                                                int          *new_order,
                                                int           length);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeModel, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeIter, gtk_tree_iter_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreePath, gtk_tree_path_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeRowReference, gtk_tree_row_reference_free)
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_MODEL_H__ */
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index f29509289a..bad3e08cb5 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -149,6 +149,8 @@ void          gtk_tree_model_filter_refilter                   (GtkTreeModelFilt
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_clear_cache                (GtkTreeModelFilter           *filter);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeModelFilter, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_MODEL_FILTER_H__ */
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 568372efb3..8cde66ea97 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -85,6 +85,7 @@ GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
                                                               GtkTreeIter      *iter);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeModelSort, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index ca82a24164..8eb5565231 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -137,6 +137,7 @@ void             gtk_tree_selection_unselect_range      (GtkTreeSelection
                                                          GtkTreePath                 *start_path,
                                                         GtkTreePath                 *end_path);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeSelection, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 9f2b0ffa3a..0cd770f8c5 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -157,6 +157,8 @@ void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortab
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeSortable, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_SORTABLE_H__ */
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 676491f3a6..59709344ee 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -161,6 +161,7 @@ void          gtk_tree_store_move_after       (GtkTreeStore *tree_store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeStore, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 878b4b0b44..806f3594e1 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -540,6 +540,8 @@ void          gtk_tree_view_set_tooltip_column (GtkTreeView       *tree_view,
 GDK_AVAILABLE_IN_ALL
 int           gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeView, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index ae13503a0a..9f7002496a 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -246,6 +246,7 @@ GtkWidget              *gtk_tree_view_column_get_tree_view       (GtkTreeViewCol
 GDK_AVAILABLE_IN_ALL
 GtkWidget              *gtk_tree_view_column_get_button          (GtkTreeViewColumn       *tree_column);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeViewColumn, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 5c34c6b887..088fa7b51c 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -62,6 +62,8 @@ void           gtk_viewport_set_child           (GtkViewport *viewport,
 GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_viewport_get_child           (GtkViewport *viewport);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkViewport, g_object_unref)
+
 G_END_DECLS
 
 
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 57f28378b9..7b5cbe550d 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -52,6 +52,8 @@ GType         gtk_volume_button_get_type      (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_volume_button_new           (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GTK_VOLUME_BUTTON_H__ */
diff --git a/gtk/meson.build b/gtk/meson.build
index 225b0b8cac..9982cc1678 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -700,7 +700,6 @@ gtk_public_headers = files([
   'gtkwindowcontrols.h',
   'gtkwindowgroup.h',
   'gtkwindowhandle.h',
-  'gtk-autocleanups.h',
   'gtk.h',
 ])
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]