[gtk+] Add annotations to gtk headers



commit 20c8c8b91cf2719249a729492ec84b7282dc03fb
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Mar 20 18:17:32 2013 -0400

    Add annotations to gtk headers
    
    Add annotations to all exported functions in GTK+ headers.

 gtk/deprecated/gtkcolorsel.h        |    2 +
 gtk/deprecated/gtkcolorseldialog.h  |    1 +
 gtk/deprecated/gtkfontsel.h         |    3 +-
 gtk/deprecated/gtkgradient.h        |    1 +
 gtk/deprecated/gtkhandlebox.h       |    1 +
 gtk/deprecated/gtkhbbox.h           |    1 +
 gtk/deprecated/gtkhbox.h            |    1 +
 gtk/deprecated/gtkhpaned.h          |    1 +
 gtk/deprecated/gtkhscale.h          |    1 +
 gtk/deprecated/gtkhscrollbar.h      |    1 +
 gtk/deprecated/gtkhseparator.h      |    1 +
 gtk/deprecated/gtkhsv.h             |    1 +
 gtk/deprecated/gtkrc.h              |    1 +
 gtk/deprecated/gtkstyle.h           |    1 +
 gtk/deprecated/gtksymboliccolor.h   |    1 +
 gtk/deprecated/gtktable.h           |    1 +
 gtk/deprecated/gtktearoffmenuitem.h |    1 +
 gtk/deprecated/gtkvbbox.h           |    1 +
 gtk/deprecated/gtkvbox.h            |    1 +
 gtk/deprecated/gtkvpaned.h          |    1 +
 gtk/deprecated/gtkvscale.h          |    1 +
 gtk/deprecated/gtkvscrollbar.h      |    1 +
 gtk/deprecated/gtkvseparator.h      |    1 +
 gtk/gtkaboutdialog.h                |   33 ++++++
 gtk/gtkaccelgroup.h                 |   22 ++++
 gtk/gtkaccellabel.h                 |    7 ++
 gtk/gtkaccelmap.h                   |   15 +++
 gtk/gtkaccessible.h                 |    3 +
 gtk/gtkaction.h                     |   44 ++++++++-
 gtk/gtkactiongroup.h                |   21 ++++
 gtk/gtkactivatable.h                |    7 ++
 gtk/gtkadjustment.h                 |   18 ++++
 gtk/gtkalignment.h                  |    5 +
 gtk/gtkappchooser.h                 |    5 +
 gtk/gtkappchooserbutton.h           |    9 ++
 gtk/gtkappchooserdialog.h           |    6 +
 gtk/gtkappchooserwidget.h           |   14 +++
 gtk/gtkapplication.h                |    5 +
 gtk/gtkarrow.h                      |    3 +
 gtk/gtkaspectframe.h                |    3 +
 gtk/gtkassistant.h                  |   22 ++++
 gtk/gtkbbox.h                       |    6 +
 gtk/gtkbin.h                        |    2 +
 gtk/gtkbindings.h                   |   11 ++
 gtk/gtkborder.h                     |    5 +
 gtk/gtkbox.h                        |   11 ++
 gtk/gtkbuildable.h                  |   11 ++
 gtk/gtkbuilder.h                    |   17 +++
 gtk/gtkbutton.h                     |   23 ++++
 gtk/gtkcalendar.h                   |   16 +++
 gtk/gtkcellarea.h                   |   47 +++++++++
 gtk/gtkcellareabox.h                |    6 +
 gtk/gtkcellareacontext.h            |   11 ++
 gtk/gtkcelleditable.h               |    4 +
 gtk/gtkcelllayout.h                 |   11 ++
 gtk/gtkcellrenderer.h               |   25 +++++
 gtk/gtkcellrendereraccel.h          |    2 +
 gtk/gtkcellrenderercombo.h          |    2 +
 gtk/gtkcellrendererpixbuf.h         |    2 +
 gtk/gtkcellrendererprogress.h       |    2 +
 gtk/gtkcellrendererspin.h           |    2 +
 gtk/gtkcellrendererspinner.h        |    2 +
 gtk/gtkcellrenderertext.h           |    3 +
 gtk/gtkcellrenderertoggle.h         |    8 ++
 gtk/gtkcellview.h                   |   15 +++
 gtk/gtkcheckbutton.h                |    4 +
 gtk/gtkcheckmenuitem.h              |   11 ++
 gtk/gtkclipboard.h                  |   29 ++++++
 gtk/gtkcolorbutton.h                |    5 +
 gtk/gtkcolorutils.h                 |    3 +
 gtk/gtkcombobox.h                   |   42 ++++++++
 gtk/gtkcomboboxtext.h               |   12 ++
 gtk/gtkcontainer.h                  |   36 +++++++
 gtk/gtkcssprovider.h                |    8 ++
 gtk/gtkcustompaperunixdialog.h      |    1 +
 gtk/gtkdebug.h                      |    3 +
 gtk/gtkdialog.h                     |   17 +++
 gtk/gtkdnd.h                        |   34 ++++++
 gtk/gtkdrawingarea.h                |    2 +
 gtk/gtkeditable.h                   |   14 +++
 gtk/gtkentry.h                      |   62 ++++++++++++
 gtk/gtkentrybuffer.h                |   13 +++
 gtk/gtkentrycompletion.h            |   28 +++++
 gtk/gtkeventbox.h                   |    6 +
 gtk/gtkexpander.h                   |   17 +++
 gtk/gtkfilechooser.h                |   60 +++++++++++
 gtk/gtkfilechooserbutton.h          |    9 ++
 gtk/gtkfilechooserdialog.h          |    2 +
 gtk/gtkfilechooserwidget.h          |    2 +
 gtk/gtkfilefilter.h                 |   11 ++
 gtk/gtkfixed.h                      |    4 +
 gtk/gtkfontbutton.h                 |   15 +++
 gtk/gtkframe.h                      |   10 ++
 gtk/gtkgrid.h                       |   12 ++
 gtk/gtkiconfactory.h                |   43 ++++++++
 gtk/gtkicontheme.h                  |   34 ++++++
 gtk/gtkiconview.h                   |   62 ++++++++++++
 gtk/gtkimage.h                      |   28 +++++
 gtk/gtkimagemenuitem.h              |   12 ++
 gtk/gtkimcontext.h                  |   12 ++
 gtk/gtkimcontextsimple.h            |    3 +
 gtk/gtkimmulticontext.h             |    5 +
 gtk/gtkinfobar.h                    |   13 +++
 gtk/gtkinvisible.h                  |    5 +
 gtk/gtklabel.h                      |   45 ++++++++
 gtk/gtklayout.h                     |    7 ++
 gtk/gtklinkbutton.h                 |    7 ++
 gtk/gtkliststore.h                  |   23 ++++
 gtk/gtkmain.h                       |   35 +++++++
 gtk/gtkmenu.h                       |   27 +++++
 gtk/gtkmenubar.h                    |    6 +
 gtk/gtkmenuitem.h                   |   19 ++++
 gtk/gtkmenushell.h                  |   14 +++
 gtk/gtkmenutoolbutton.h             |    7 ++
 gtk/gtkmessagedialog.h              |    9 ++
 gtk/gtkmisc.h                       |    6 +-
 gtk/gtkmountoperation.h             |    7 ++
 gtk/gtknotebook.h                   |   45 ++++++++
 gtk/gtknumerableicon.h              |   13 +++
 gtk/gtkoffscreenwindow.h            |    4 +
 gtk/gtkorientable.h                 |    3 +
 gtk/gtkpagesetup.h                  |   26 +++++
 gtk/gtkpagesetupunixdialog.h        |    6 +
 gtk/gtkpaned.h                      |   11 ++
 gtk/gtkpapersize.h                  |   23 ++++
 gtk/gtkpathbar.h                    |    1 +
 gtk/gtkplacessidebar.h              |   14 +++
 gtk/gtkplug.h                       |    8 ++
 gtk/gtkprint-win32.h                |    5 +
 gtk/gtkprintbackend.h               |   26 +++++
 gtk/gtkprintcontext.h               |   12 ++
 gtk/gtkprinter-private.h            |    1 +
 gtk/gtkprinter.h                    |   25 +++++
 gtk/gtkprinteroption.h              |   11 ++
 gtk/gtkprinteroptionset.h           |   10 ++
 gtk/gtkprinteroptionwidget.h        |    6 +
 gtk/gtkprintjob.h                   |   31 ++++++
 gtk/gtkprintoperation.h             |   34 ++++++
 gtk/gtkprintoperationpreview.h      |    4 +
 gtk/gtkprintsettings.h              |   75 ++++++++++++++
 gtk/gtkprintunixdialog.h            |   19 ++++
 gtk/gtkprintutils.h                 |    2 +-
 gtk/gtkprogressbar.h                |   15 +++
 gtk/gtkradioaction.h                |    7 ++
 gtk/gtkradiobutton.h                |   10 ++
 gtk/gtkradiomenuitem.h              |    9 ++
 gtk/gtkradiotoolbutton.h            |    7 ++
 gtk/gtkrange.h                      |   29 ++++++
 gtk/gtkrecentaction.h               |    5 +
 gtk/gtkrecentchooser.h              |   33 ++++++
 gtk/gtkrecentchooserdialog.h        |    3 +
 gtk/gtkrecentchoosermenu.h          |    5 +
 gtk/gtkrecentchooserwidget.h        |    3 +
 gtk/gtkrecentfilter.h               |   14 +++
 gtk/gtkrecentmanager.h              |   38 +++++++
 gtk/gtkrevealer.h                   |    9 ++
 gtk/gtkscale.h                      |   13 +++
 gtk/gtkscalebutton.h                |   10 ++
 gtk/gtkscrollable.h                 |   10 ++
 gtk/gtkscrollbar.h                  |    2 +
 gtk/gtkscrolledwindow.h             |   19 ++++
 gtk/gtkselection.h                  |   52 ++++++++++
 gtk/gtkseparator.h                  |    2 +
 gtk/gtkseparatormenuitem.h          |    2 +
 gtk/gtkseparatortoolitem.h          |    4 +
 gtk/gtksettings.h                   |   14 +++
 gtk/gtkshow.h                       |    1 +
 gtk/gtksizegroup.h                  |    9 ++
 gtk/gtksizerequest.h                |    1 +
 gtk/gtksocket.h                     |    5 +
 gtk/gtkspinbutton.h                 |   25 +++++
 gtk/gtkspinner.h                    |    4 +
 gtk/gtkstack.h                      |   15 +++
 gtk/gtkstackswitcher.h              |    4 +
 gtk/gtkstatusbar.h                  |    8 ++
 gtk/gtkstatusicon.h                 |   35 +++++++
 gtk/gtkstock.h                      |    7 ++
 gtk/gtkstylecontext.h               |   59 +++++++++++
 gtk/gtkstyleproperties.h            |   11 ++
 gtk/gtkstyleprovider.h              |    2 +
 gtk/gtkswitch.h                     |    4 +
 gtk/gtktestutils.h                  |   16 +++
 gtk/gtktextattributes.h             |    6 +
 gtk/gtktextbuffer.h                 |   62 ++++++++++++
 gtk/gtktextbufferrichtext.h         |   12 ++
 gtk/gtktextchild.h                  |    4 +
 gtk/gtktextdisplay.h                |    1 +
 gtk/gtktextiter.h                   |   91 +++++++++++++++++
 gtk/gtktextlayout.h                 |   48 +++++++++
 gtk/gtktextmark.h                   |    8 ++
 gtk/gtktextsegment.h                |    1 +
 gtk/gtktexttag.h                    |    5 +
 gtk/gtktexttagtable.h               |    7 ++
 gtk/gtktexttypes.h                  |    2 +
 gtk/gtktextview.h                   |   61 +++++++++++
 gtk/gtkthemingengine.h              |   21 ++++
 gtk/gtktoggleaction.h               |    7 ++
 gtk/gtktogglebutton.h               |   11 ++
 gtk/gtktoggletoolbutton.h           |    5 +
 gtk/gtktoolbar.h                    |   17 +++
 gtk/gtktoolbutton.h                 |   15 +++
 gtk/gtktoolitem.h                   |   30 ++++++
 gtk/gtktoolitemgroup.h              |   18 ++++
 gtk/gtktoolpalette.h                |   21 ++++
 gtk/gtktoolshell.h                  |   10 ++
 gtk/gtktooltip.h                    |   10 ++
 gtk/gtktrayicon.h                   |    1 +
 gtk/gtktreednd.h                    |    9 ++
 gtk/gtktreemodel.h                  |   62 ++++++++++++
 gtk/gtktreemodelfilter.h            |   12 ++
 gtk/gtktreemodelsort.h              |   10 ++
 gtk/gtktreeselection.h              |   21 ++++
 gtk/gtktreesortable.h               |    7 ++
 gtk/gtktreestore.h                  |   24 +++++
 gtk/gtktreeview.h                   |   94 +++++++++++++++++
 gtk/gtktreeviewcolumn.h             |   53 ++++++++++
 gtk/gtkuimanager.h                  |   17 +++
 gtk/gtkviewport.h                   |    6 +
 gtk/gtkvolumebutton.h               |    2 +
 gtk/gtkwidget.h                     |  189 +++++++++++++++++++++++++++++++++++
 gtk/gtkwidgetpath.h                 |   30 ++++++
 gtk/gtkwindow.h                     |  112 +++++++++++++++++++++
 222 files changed, 3467 insertions(+), 4 deletions(-)
---
diff --git a/gtk/deprecated/gtkcolorsel.h b/gtk/deprecated/gtkcolorsel.h
index 37212eb..f7715d2 100644
--- a/gtk/deprecated/gtkcolorsel.h
+++ b/gtk/deprecated/gtkcolorsel.h
@@ -86,6 +86,7 @@ struct _GtkColorSelectionClass
 
 /* ColorSelection */
 
+GDK_DEPRECATED_IN_3_4
 GType      gtk_color_selection_get_type                (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new)
 GtkWidget *gtk_color_selection_new                     (void);
@@ -136,6 +137,7 @@ GDK_DEPRECATED_IN_3_4
 gchar*   gtk_color_selection_palette_to_string   (const GdkColor    *colors,
                                                   gint               n_colors);
 
+GDK_DEPRECATED_IN_3_4
 GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook 
(GtkColorSelectionChangePaletteWithScreenFunc func);
 
 GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
diff --git a/gtk/deprecated/gtkcolorseldialog.h b/gtk/deprecated/gtkcolorseldialog.h
index 3722466..6bfbc97 100644
--- a/gtk/deprecated/gtkcolorseldialog.h
+++ b/gtk/deprecated/gtkcolorseldialog.h
@@ -68,6 +68,7 @@ struct _GtkColorSelectionDialogClass
 
 
 /* ColorSelectionDialog */
+GDK_DEPRECATED_IN_3_4
 GType      gtk_color_selection_dialog_get_type            (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_dialog_new)
 GtkWidget* gtk_color_selection_dialog_new                 (const gchar *title);
diff --git a/gtk/deprecated/gtkfontsel.h b/gtk/deprecated/gtkfontsel.h
index 1e72600..50ff06c 100644
--- a/gtk/deprecated/gtkfontsel.h
+++ b/gtk/deprecated/gtkfontsel.h
@@ -103,6 +103,7 @@ struct _GtkFontSelectionDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_DEPRECATED_IN_3_2
 GType        gtk_font_selection_get_type          (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
 GtkWidget *  gtk_font_selection_new               (void);
@@ -136,7 +137,7 @@ GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
 void         gtk_font_selection_set_preview_text  (GtkFontSelection *fontsel,
                                                    const gchar      *text);
 
-
+GDK_DEPRECATED_IN_3_2
 GType      gtk_font_selection_dialog_get_type          (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
 GtkWidget *gtk_font_selection_dialog_new               (const gchar            *title);
diff --git a/gtk/deprecated/gtkgradient.h b/gtk/deprecated/gtkgradient.h
index fe6dc8c..6eccb3b 100644
--- a/gtk/deprecated/gtkgradient.h
+++ b/gtk/deprecated/gtkgradient.h
@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_GRADIENT (gtk_gradient_get_type ())
 
+GDK_DEPRECATED_IN_3_8
 GType         gtk_gradient_get_type       (void) G_GNUC_CONST;
 
 GDK_DEPRECATED_IN_3_8
diff --git a/gtk/deprecated/gtkhandlebox.h b/gtk/deprecated/gtkhandlebox.h
index 9c618a8..3a63594 100644
--- a/gtk/deprecated/gtkhandlebox.h
+++ b/gtk/deprecated/gtkhandlebox.h
@@ -74,6 +74,7 @@ struct _GtkHandleBoxClass
 };
 
 
+GDK_DEPRECATED_IN_3_4
 GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4
 GtkWidget*    gtk_handle_box_new                  (void);
diff --git a/gtk/deprecated/gtkhbbox.h b/gtk/deprecated/gtkhbbox.h
index a53d54a..168ce15 100644
--- a/gtk/deprecated/gtkhbbox.h
+++ b/gtk/deprecated/gtkhbbox.h
@@ -56,6 +56,7 @@ struct _GtkHButtonBoxClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_hbutton_box_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
 GtkWidget* gtk_hbutton_box_new      (void);
diff --git a/gtk/deprecated/gtkhbox.h b/gtk/deprecated/gtkhbox.h
index 13e4d8a..45c746d 100644
--- a/gtk/deprecated/gtkhbox.h
+++ b/gtk/deprecated/gtkhbox.h
@@ -57,6 +57,7 @@ struct _GtkHBoxClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType       gtk_hbox_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
 GtkWidget * gtk_hbox_new      (gboolean homogeneous,
diff --git a/gtk/deprecated/gtkhpaned.h b/gtk/deprecated/gtkhpaned.h
index da0bb62..44c1d40 100644
--- a/gtk/deprecated/gtkhpaned.h
+++ b/gtk/deprecated/gtkhpaned.h
@@ -55,6 +55,7 @@ struct _GtkHPanedClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType       gtk_hpaned_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
 GtkWidget * gtk_hpaned_new      (void);
diff --git a/gtk/deprecated/gtkhscale.h b/gtk/deprecated/gtkhscale.h
index c9b9a0f..dee655d 100644
--- a/gtk/deprecated/gtkhscale.h
+++ b/gtk/deprecated/gtkhscale.h
@@ -55,6 +55,7 @@ struct _GtkHScaleClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_hscale_get_type       (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
 GtkWidget* gtk_hscale_new            (GtkAdjustment *adjustment);
diff --git a/gtk/deprecated/gtkhscrollbar.h b/gtk/deprecated/gtkhscrollbar.h
index aa7253b..b529a9b 100644
--- a/gtk/deprecated/gtkhscrollbar.h
+++ b/gtk/deprecated/gtkhscrollbar.h
@@ -55,6 +55,7 @@ struct _GtkHScrollbarClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
 GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
diff --git a/gtk/deprecated/gtkhseparator.h b/gtk/deprecated/gtkhseparator.h
index e58fb4e..d1dfcd6 100644
--- a/gtk/deprecated/gtkhseparator.h
+++ b/gtk/deprecated/gtkhseparator.h
@@ -55,6 +55,7 @@ struct _GtkHSeparatorClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
 GtkWidget* gtk_hseparator_new      (void);
diff --git a/gtk/deprecated/gtkhsv.h b/gtk/deprecated/gtkhsv.h
index b25f20b..ad99f42 100644
--- a/gtk/deprecated/gtkhsv.h
+++ b/gtk/deprecated/gtkhsv.h
@@ -77,6 +77,7 @@ struct _GtkHSVClass
 };
 
 
+GDK_DEPRECATED_IN_3_4
 GType      gtk_hsv_get_type     (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4
 GtkWidget* gtk_hsv_new          (void);
diff --git a/gtk/deprecated/gtkrc.h b/gtk/deprecated/gtkrc.h
index da913f4..4fc1505 100644
--- a/gtk/deprecated/gtkrc.h
+++ b/gtk/deprecated/gtkrc.h
@@ -175,6 +175,7 @@ void      gtk_rc_parse_string           (const gchar *rc_string);
 GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
 gboolean  gtk_rc_reparse_all            (void);
 
+GDK_DEPRECATED_IN_3_0
 GType       gtk_rc_style_get_type   (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
 GtkRcStyle* gtk_rc_style_new        (void);
diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index 4126a80..ccfe4a2 100644
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -366,6 +366,7 @@ struct _GtkStyleClass
   void (*_gtk_reserved11) (void);
 };
 
+GDK_DEPRECATED_IN_3_0
 GType     gtk_style_get_type                 (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
 GtkStyle* gtk_style_new                      (void);
diff --git a/gtk/deprecated/gtksymboliccolor.h b/gtk/deprecated/gtksymboliccolor.h
index c109ca9..860704f 100644
--- a/gtk/deprecated/gtksymboliccolor.h
+++ b/gtk/deprecated/gtksymboliccolor.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_SYMBOLIC_COLOR (gtk_symbolic_color_get_type ())
 
+GDK_DEPRECATED_IN_3_8
 GType              gtk_symbolic_color_get_type    (void) G_GNUC_CONST;
 
 GDK_DEPRECATED_IN_3_8
diff --git a/gtk/deprecated/gtktable.h b/gtk/deprecated/gtktable.h
index 021b215..5a35c9f 100644
--- a/gtk/deprecated/gtktable.h
+++ b/gtk/deprecated/gtktable.h
@@ -96,6 +96,7 @@ struct _GtkTableRowCol
 };
 
 
+GDK_DEPRECATED_IN_3_4
 GType     gtk_table_get_type         (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
 GtkWidget* gtk_table_new             (guint            rows,
diff --git a/gtk/deprecated/gtktearoffmenuitem.h b/gtk/deprecated/gtktearoffmenuitem.h
index 224f088..fafa473 100644
--- a/gtk/deprecated/gtktearoffmenuitem.h
+++ b/gtk/deprecated/gtktearoffmenuitem.h
@@ -65,6 +65,7 @@ struct _GtkTearoffMenuItemClass
 };
 
 
+GDK_DEPRECATED_IN_3_4
 GType     gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_4
 GtkWidget* gtk_tearoff_menu_item_new         (void);
diff --git a/gtk/deprecated/gtkvbbox.h b/gtk/deprecated/gtkvbbox.h
index 93e461f..96e034e 100644
--- a/gtk/deprecated/gtkvbbox.h
+++ b/gtk/deprecated/gtkvbbox.h
@@ -55,6 +55,7 @@ struct _GtkVButtonBoxClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_vbutton_box_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
 GtkWidget *gtk_vbutton_box_new      (void);
diff --git a/gtk/deprecated/gtkvbox.h b/gtk/deprecated/gtkvbox.h
index ae3759b..e5d1727 100644
--- a/gtk/deprecated/gtkvbox.h
+++ b/gtk/deprecated/gtkvbox.h
@@ -55,6 +55,7 @@ struct _GtkVBoxClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType       gtk_vbox_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
 GtkWidget * gtk_vbox_new      (gboolean homogeneous,
diff --git a/gtk/deprecated/gtkvpaned.h b/gtk/deprecated/gtkvpaned.h
index eb9f7d5..9437f72 100644
--- a/gtk/deprecated/gtkvpaned.h
+++ b/gtk/deprecated/gtkvpaned.h
@@ -55,6 +55,7 @@ struct _GtkVPanedClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType       gtk_vpaned_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
 GtkWidget * gtk_vpaned_new      (void);
diff --git a/gtk/deprecated/gtkvscale.h b/gtk/deprecated/gtkvscale.h
index cff8db8..1804868 100644
--- a/gtk/deprecated/gtkvscale.h
+++ b/gtk/deprecated/gtkvscale.h
@@ -61,6 +61,7 @@ struct _GtkVScaleClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_vscale_get_type       (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
 GtkWidget* gtk_vscale_new            (GtkAdjustment *adjustment);
diff --git a/gtk/deprecated/gtkvscrollbar.h b/gtk/deprecated/gtkvscrollbar.h
index 4c485d2..56b6f3f 100644
--- a/gtk/deprecated/gtkvscrollbar.h
+++ b/gtk/deprecated/gtkvscrollbar.h
@@ -61,6 +61,7 @@ struct _GtkVScrollbarClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
 GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
diff --git a/gtk/deprecated/gtkvseparator.h b/gtk/deprecated/gtkvseparator.h
index d96b028..3b18145 100644
--- a/gtk/deprecated/gtkvseparator.h
+++ b/gtk/deprecated/gtkvseparator.h
@@ -61,6 +61,7 @@ struct _GtkVSeparatorClass
 };
 
 
+GDK_DEPRECATED_IN_3_2
 GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
 GtkWidget* gtk_vseparator_new      (void);
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index fd96ae2..61cf6b6 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -105,56 +105,89 @@ struct _GtkAboutDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                  gtk_about_dialog_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget             *gtk_about_dialog_new                    (void);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_show_about_dialog                   (GtkWindow       *parent,
                                                                 const gchar     *first_property_name,
                                                                 ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_program_name       (GtkAboutDialog  *about,
                                                                 const gchar     *name);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_version            (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_version            (GtkAboutDialog  *about,
                                                                 const gchar     *version);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_copyright          (GtkAboutDialog  *about,
                                                                 const gchar     *copyright);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_comments           (GtkAboutDialog  *about,
                                                                 const gchar     *comments);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_license            (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
                                                                 const gchar     *license);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_license_type       (GtkAboutDialog  *about,
                                                                 GtkLicense       license_type);
+GDK_AVAILABLE_IN_ALL
 GtkLicense             gtk_about_dialog_get_license_type       (GtkAboutDialog  *about);
 
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
                                                                 gboolean         wrap_license);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_website            (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
                                                                 const gchar     *website);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
                                                                 const gchar     *website_label);
+GDK_AVAILABLE_IN_ALL
 const gchar* const *   gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
                                                                 const gchar    **authors);
+GDK_AVAILABLE_IN_ALL
 const gchar* const *   gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
                                                                 const gchar    **documenters);
+GDK_AVAILABLE_IN_ALL
 const gchar* const *   gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
                                                                 const gchar    **artists);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
                                                                 const gchar     *translator_credits);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
                                                                 GdkPixbuf       *logo);
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
                                                                 const gchar     *icon_name);
 GDK_AVAILABLE_IN_3_4
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index fe8b1f7..e31de4f 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -113,26 +113,37 @@ struct _GtkAccelKey
 
 
 /* -- Accelerator Groups --- */
+GDK_AVAILABLE_IN_ALL
 GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAccelGroup* gtk_accel_group_new               (void);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_accel_group_get_is_locked      (GtkAccelGroup  *accel_group);
+GDK_AVAILABLE_IN_ALL
 GdkModifierType 
                gtk_accel_group_get_modifier_mask  (GtkAccelGroup  *accel_group);
+GDK_AVAILABLE_IN_ALL
 void          gtk_accel_group_lock               (GtkAccelGroup  *accel_group);
+GDK_AVAILABLE_IN_ALL
 void          gtk_accel_group_unlock             (GtkAccelGroup  *accel_group);
+GDK_AVAILABLE_IN_ALL
 void          gtk_accel_group_connect            (GtkAccelGroup  *accel_group,
                                                   guint           accel_key,
                                                   GdkModifierType accel_mods,
                                                   GtkAccelFlags   accel_flags,
                                                   GClosure       *closure);
+GDK_AVAILABLE_IN_ALL
 void           gtk_accel_group_connect_by_path    (GtkAccelGroup  *accel_group,
                                                   const gchar    *accel_path,
                                                   GClosure       *closure);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_accel_group_disconnect        (GtkAccelGroup  *accel_group,
                                                   GClosure       *closure);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_accel_group_disconnect_key    (GtkAccelGroup  *accel_group,
                                                   guint           accel_key,
                                                   GdkModifierType accel_mods);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_accel_group_activate           (GtkAccelGroup   *accel_group,
                                                    GQuark         accel_quark,
                                                    GObject       *acceleratable,
@@ -145,19 +156,25 @@ void              _gtk_accel_group_attach         (GtkAccelGroup  *accel_group,
                                                 GObject        *object);
 void           _gtk_accel_group_detach         (GtkAccelGroup  *accel_group,
                                                 GObject        *object);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_accel_groups_activate              (GObject        *object,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods);
+GDK_AVAILABLE_IN_ALL
 GSList*                gtk_accel_groups_from_object    (GObject        *object);
+GDK_AVAILABLE_IN_ALL
 GtkAccelKey*   gtk_accel_group_find            (GtkAccelGroup        *accel_group,
                                                 GtkAccelGroupFindFunc find_func,
                                                 gpointer              data);
+GDK_AVAILABLE_IN_ALL
 GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure    *closure);
 
 
 /* --- Accelerators--- */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_accelerator_valid               (guint            keyval,
                                               GdkModifierType  modifiers) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 void    gtk_accelerator_parse                (const gchar     *accelerator,
                                               guint           *accelerator_key,
                                               GdkModifierType *accelerator_mods);
@@ -166,6 +183,7 @@ void gtk_accelerator_parse_with_keycode       (const gchar     *accelerator,
                                                guint           *accelerator_key,
                                                guint          **accelerator_codes,
                                                GdkModifierType *accelerator_mods);
+GDK_AVAILABLE_IN_ALL
 gchar*  gtk_accelerator_name                 (guint            accelerator_key,
                                               GdkModifierType  accelerator_mods);
 GDK_AVAILABLE_IN_3_4
@@ -173,6 +191,7 @@ gchar*       gtk_accelerator_name_with_keycode    (GdkDisplay      *display,
                                                guint            accelerator_key,
                                                guint            keycode,
                                                GdkModifierType  accelerator_mods);
+GDK_AVAILABLE_IN_ALL
 gchar*   gtk_accelerator_get_label            (guint           accelerator_key,
                                                GdkModifierType accelerator_mods);
 GDK_AVAILABLE_IN_3_4
@@ -180,12 +199,15 @@ gchar*   gtk_accelerator_get_label_with_keycode (GdkDisplay      *display,
                                                  guint            accelerator_key,
                                                  guint            keycode,
                                                  GdkModifierType  accelerator_mods);
+GDK_AVAILABLE_IN_ALL
 void    gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
+GDK_AVAILABLE_IN_ALL
 GdkModifierType
         gtk_accelerator_get_default_mod_mask (void);
 
 
 /* --- internal --- */
+GDK_AVAILABLE_IN_ALL
 GtkAccelGroupEntry*    gtk_accel_group_query   (GtkAccelGroup  *accel_group,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods,
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index f7b6084..2a56980 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -81,14 +81,21 @@ struct _GtkAccelLabelClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_accel_label_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_accel_label_new              (const gchar   *string);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_accel_label_get_accel_widget  (GtkAccelLabel *accel_label);
+GDK_AVAILABLE_IN_ALL
 guint     gtk_accel_label_get_accel_width   (GtkAccelLabel *accel_label);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_label_set_accel_widget  (GtkAccelLabel *accel_label,
                                              GtkWidget     *accel_widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
                                              GClosure      *accel_closure);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_accel_label_refetch           (GtkAccelLabel *accel_label);
 GDK_AVAILABLE_IN_3_6
 void       gtk_accel_label_set_accel         (GtkAccelLabel   *accel_label,
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 8612f18..c13797a 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -58,33 +58,48 @@ typedef void (*GtkAccelMapForeach)          (gpointer        data,
 
 /* --- public API --- */
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_add_entry      (const gchar            *accel_path,
                                         guint                   accel_key,
                                         GdkModifierType         accel_mods);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_accel_map_lookup_entry  (const gchar            *accel_path,
                                         GtkAccelKey            *key);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_accel_map_change_entry  (const gchar            *accel_path,
                                         guint                   accel_key,
                                         GdkModifierType         accel_mods,
                                         gboolean                replace);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_load           (const gchar            *file_name);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_save           (const gchar            *file_name);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_foreach        (gpointer                data,
                                         GtkAccelMapForeach      foreach_func);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_load_fd        (gint                    fd);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_load_scanner   (GScanner               *scanner);
+GDK_AVAILABLE_IN_ALL
 void      gtk_accel_map_save_fd        (gint                    fd);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_accel_map_lock_path      (const gchar            *accel_path);
+GDK_AVAILABLE_IN_ALL
 void       gtk_accel_map_unlock_path    (const gchar            *accel_path);
 
 /* --- filter functions --- */
+GDK_AVAILABLE_IN_ALL
 void   gtk_accel_map_add_filter         (const gchar           *filter_pattern);
+GDK_AVAILABLE_IN_ALL
 void   gtk_accel_map_foreach_unfiltered (gpointer               data,
                                          GtkAccelMapForeach     foreach_func);
 
 /* --- notification --- */
+GDK_AVAILABLE_IN_ALL
 GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAccelMap *gtk_accel_map_get      (void);
 
 
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 3f17108..9c2229b 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -59,10 +59,13 @@ struct _GtkAccessibleClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_accessible_get_type                 (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_accessible_set_widget               (GtkAccessible *accessible,
                                                     GtkWidget     *widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_accessible_get_widget               (GtkAccessible *accessible);
 
 GDK_DEPRECATED_IN_3_4_FOR(gtk_accessible_set_widget)
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 1cac38f..ad31985 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -83,35 +83,55 @@ struct _GtkActionClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_action_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAction   *gtk_action_new                    (const gchar *name,
                                                const gchar *label,
                                                const gchar *tooltip,
                                                const gchar *stock_id);
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_action_get_name               (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_action_is_sensitive           (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_action_get_sensitive          (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_set_sensitive          (GtkAction     *action,
                                                gboolean       sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_action_is_visible             (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_action_get_visible            (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_set_visible            (GtkAction     *action,
                                                gboolean       visible);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_activate               (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_action_create_icon            (GtkAction     *action,
                                                GtkIconSize    icon_size);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_action_create_menu_item       (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_action_create_tool_item       (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 GSList *     gtk_action_get_proxies            (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_connect_accelerator    (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_disconnect_accelerator (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_action_get_accel_path         (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_block_activate         (GtkAction     *action);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_unblock_activate       (GtkAction     *action);
 
-
 void         _gtk_action_add_to_proxy_list     (GtkAction     *action,
                                                GtkWidget     *proxy);
 void         _gtk_action_remove_from_proxy_list(GtkAction     *action,
@@ -121,43 +141,65 @@ void         _gtk_action_remove_from_proxy_list(GtkAction     *action,
 void         _gtk_action_emit_activate         (GtkAction     *action);
 
 /* protected ... for use by action groups */
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_set_accel_path         (GtkAction     *action,
                                                const gchar   *accel_path);
+GDK_AVAILABLE_IN_ALL
 void         gtk_action_set_accel_group        (GtkAction     *action,
                                                GtkAccelGroup *accel_group);
 void         _gtk_action_sync_menu_visible     (GtkAction     *action,
                                                GtkWidget     *proxy,
                                                gboolean       empty);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_label              (GtkAction   *action,
                                                          const gchar *label);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_action_get_label              (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_short_label        (GtkAction   *action,
                                                          const gchar *short_label);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_action_get_short_label        (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_tooltip            (GtkAction   *action,
                                                          const gchar *tooltip);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_action_get_tooltip            (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_stock_id           (GtkAction   *action,
                                                          const gchar *stock_id);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_action_get_stock_id           (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_gicon              (GtkAction   *action,
                                                          GIcon       *icon);
+GDK_AVAILABLE_IN_ALL
 GIcon                *gtk_action_get_gicon              (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_icon_name          (GtkAction   *action,
                                                          const gchar *icon_name);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_action_get_icon_name          (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_visible_horizontal (GtkAction   *action,
                                                          gboolean     visible_horizontal);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_action_get_visible_horizontal (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_visible_vertical   (GtkAction   *action,
                                                          gboolean     visible_vertical);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_action_get_visible_vertical   (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_is_important       (GtkAction   *action,
                                                          gboolean     is_important);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_action_get_is_important       (GtkAction   *action);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_action_set_always_show_image  (GtkAction   *action,
                                                          gboolean     always_show);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_action_get_always_show_image  (GtkAction   *action);
 
 
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 94a3782..5fcf5f4 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -156,13 +156,20 @@ struct _GtkRadioActionEntry
   gint   value; 
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
+GDK_AVAILABLE_IN_ALL
 const gchar    *gtk_action_group_get_name                (GtkActionGroup             *action_group);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
                                                          gboolean                    sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
                                                          gboolean                    visible);
 GDK_AVAILABLE_IN_3_6
@@ -171,40 +178,51 @@ GDK_AVAILABLE_IN_3_6
 void            gtk_action_group_set_accel_group         (GtkActionGroup             *action_group,
                                                           GtkAccelGroup              *accel_group);
 
+GDK_AVAILABLE_IN_ALL
 GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
                                                          const gchar                *action_name);
+GDK_AVAILABLE_IN_ALL
 GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_action              (GtkActionGroup             *action_group,
                                                          GtkAction                  *action);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_action_with_accel   (GtkActionGroup             *action_group,
                                                          GtkAction                  *action,
                                                          const gchar                *accelerator);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_remove_action           (GtkActionGroup             *action_group,
                                                          GtkAction                  *action);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_actions             (GtkActionGroup             *action_group,
                                                          const GtkActionEntry       *entries,
                                                          guint                       n_entries,
                                                          gpointer                    user_data);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_toggle_actions      (GtkActionGroup             *action_group,
                                                          const GtkToggleActionEntry *entries,
                                                          guint                       n_entries,
                                                          gpointer                    user_data);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_radio_actions       (GtkActionGroup             *action_group,
                                                          const GtkRadioActionEntry  *entries,
                                                          guint                       n_entries,
                                                          gint                        value,
                                                          GCallback                   on_change,
                                                          gpointer                    user_data);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_actions_full        (GtkActionGroup             *action_group,
                                                          const GtkActionEntry       *entries,
                                                          guint                       n_entries,
                                                          gpointer                    user_data,
                                                          GDestroyNotify              destroy);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_group,
                                                          const GtkToggleActionEntry *entries,
                                                          guint                       n_entries,
                                                          gpointer                    user_data,
                                                          GDestroyNotify              destroy);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_add_radio_actions_full  (GtkActionGroup             *action_group,
                                                          const GtkRadioActionEntry  *entries,
                                                          guint                       n_entries,
@@ -212,12 +230,15 @@ void            gtk_action_group_add_radio_actions_full  (GtkActionGroup
                                                          GCallback                   on_change,
                                                          gpointer                    user_data,
                                                          GDestroyNotify              destroy);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_set_translate_func      (GtkActionGroup             *action_group,
                                                          GtkTranslateFunc            func,
                                                          gpointer                    data,
                                                          GDestroyNotify              notify);
+GDK_AVAILABLE_IN_ALL
 void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
                                                          const gchar                *domain);
+GDK_AVAILABLE_IN_ALL
 const gchar *   gtk_action_group_translate_string        (GtkActionGroup             *action_group,
                                                          const gchar                *string);
 
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 4ff90f8..fc3a775 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -63,20 +63,27 @@ struct _GtkActivatableIface
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_activatable_get_type                   (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_activatable_sync_action_properties     (GtkActivatable *activatable,
                                                       GtkAction      *action);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_activatable_set_related_action         (GtkActivatable *activatable,
                                                       GtkAction      *action);
+GDK_AVAILABLE_IN_ALL
 GtkAction *gtk_activatable_get_related_action         (GtkActivatable *activatable);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_activatable_set_use_action_appearance  (GtkActivatable *activatable,
                                                       gboolean        use_appearance);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_activatable_get_use_action_appearance  (GtkActivatable *activatable);
 
 /* For use in activatable implementations */
+GDK_AVAILABLE_IN_ALL
 void       gtk_activatable_do_set_related_action      (GtkActivatable *activatable,
                                                       GtkAction      *action);
 
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index ebb6c4c..6ca8b12 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -73,7 +73,9 @@ struct _GtkAdjustmentClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_adjustment_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment*   gtk_adjustment_new             (gdouble          value,
                                                  gdouble          lower,
                                                  gdouble          upper,
@@ -81,31 +83,47 @@ GtkAdjustment*   gtk_adjustment_new             (gdouble          value,
                                                  gdouble          page_increment,
                                                  gdouble          page_size);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_changed               (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_value_changed         (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_clamp_page            (GtkAdjustment   *adjustment,
                                                  gdouble          lower,
                                                  gdouble          upper);
 
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_value             (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_value             (GtkAdjustment   *adjustment,
                                                  gdouble          value);
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_lower             (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_lower             (GtkAdjustment   *adjustment,
                                                  gdouble          lower);
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_upper             (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_upper             (GtkAdjustment   *adjustment,
                                                  gdouble          upper);
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_step_increment    (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_step_increment    (GtkAdjustment   *adjustment,
                                                  gdouble          step_increment);
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_page_increment    (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_page_increment    (GtkAdjustment   *adjustment,
                                                  gdouble          page_increment);
+GDK_AVAILABLE_IN_ALL
 gdouble    gtk_adjustment_get_page_size         (GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_set_page_size         (GtkAdjustment   *adjustment,
                                                  gdouble          page_size);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_adjustment_configure             (GtkAdjustment   *adjustment,
                                                  gdouble          value,
                                                  gdouble          lower,
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 50a5dc4..e4cf345 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -67,23 +67,28 @@ struct _GtkAlignmentClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_alignment_new        (gfloat             xalign,
                                     gfloat             yalign,
                                     gfloat             xscale,
                                     gfloat             yscale);
+GDK_AVAILABLE_IN_ALL
 void       gtk_alignment_set        (GtkAlignment      *alignment,
                                     gfloat             xalign,
                                     gfloat             yalign,
                                     gfloat             xscale,
                                     gfloat             yscale);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_alignment_set_padding (GtkAlignment      *alignment,
                                      guint              padding_top,
                                      guint              padding_bottom,
                                      guint              padding_left,
                                      guint              padding_right);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_alignment_get_padding (GtkAlignment      *alignment,
                                      guint             *padding_top,
                                      guint             *padding_bottom,
diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h
index 33d18aa..7a52255 100644
--- a/gtk/gtkappchooser.h
+++ b/gtk/gtkappchooser.h
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -37,10 +38,14 @@ G_BEGIN_DECLS
 
 typedef struct _GtkAppChooser GtkAppChooser;
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_app_chooser_get_type         (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GAppInfo * gtk_app_chooser_get_app_info     (GtkAppChooser *self);
+GDK_AVAILABLE_IN_ALL
 gchar *    gtk_app_chooser_get_content_type (GtkAppChooser *self);
+GDK_AVAILABLE_IN_ALL
 void       gtk_app_chooser_refresh          (GtkAppChooser *self);
 
 G_END_DECLS
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index 9d66be8..1e9f775 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -59,23 +59,32 @@ struct _GtkAppChooserButtonClass {
   gpointer padding[16];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_app_chooser_button_get_type           (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_app_chooser_button_new                (const gchar         *content_type);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_app_chooser_button_append_separator   (GtkAppChooserButton *self);
+GDK_AVAILABLE_IN_ALL
 void        gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self,
                                                        const gchar         *name,
                                                        const gchar         *label,
                                                        GIcon               *icon);
+GDK_AVAILABLE_IN_ALL
 void     gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self,
                                                         const gchar         *name);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_app_chooser_button_set_show_dialog_item  (GtkAppChooserButton *self,
                                                        gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_app_chooser_button_get_show_dialog_item  (GtkAppChooserButton *self);
+GDK_AVAILABLE_IN_ALL
 void     gtk_app_chooser_button_set_heading           (GtkAppChooserButton *self,
                                                        const gchar         *heading);
+GDK_AVAILABLE_IN_ALL
 const gchar *
          gtk_app_chooser_button_get_heading           (GtkAppChooserButton *self);
 GDK_AVAILABLE_IN_3_2
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index c1dcda3..d222298 100644
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -59,18 +59,24 @@ struct _GtkAppChooserDialogClass {
   gpointer padding[16];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_app_chooser_dialog_get_type             (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *   gtk_app_chooser_dialog_new                  (GtkWindow           *parent,
                                                            GtkDialogFlags       flags,
                                                            GFile               *file);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *   gtk_app_chooser_dialog_new_for_content_type (GtkWindow           *parent,
                                                            GtkDialogFlags       flags,
                                                            const gchar         *content_type);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *   gtk_app_chooser_dialog_get_widget           (GtkAppChooserDialog *self);
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_dialog_set_heading          (GtkAppChooserDialog *self,
                                                            const gchar         *heading);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_app_chooser_dialog_get_heading          (GtkAppChooserDialog *self);
 
 G_END_DECLS
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index 9434207..2706712 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -70,32 +70,46 @@ struct _GtkAppChooserWidgetClass {
   gpointer padding[16];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_app_chooser_widget_get_type             (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *   gtk_app_chooser_widget_new                  (const gchar         *content_type);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_show_default     (GtkAppChooserWidget *self,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_app_chooser_widget_get_show_default     (GtkAppChooserWidget *self);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_show_fallback    (GtkAppChooserWidget *self,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_app_chooser_widget_get_show_fallback    (GtkAppChooserWidget *self);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_show_other       (GtkAppChooserWidget *self,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_app_chooser_widget_get_show_other       (GtkAppChooserWidget *self);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_show_all         (GtkAppChooserWidget *self,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_app_chooser_widget_get_show_all         (GtkAppChooserWidget *self);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_app_chooser_widget_set_default_text     (GtkAppChooserWidget *self,
                                                            const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_app_chooser_widget_get_default_text     (GtkAppChooserWidget *self);
 
 G_END_DECLS
diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index 7a6f8c2..28eed3e 100644
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -61,16 +61,21 @@ struct _GtkApplicationClass
   gpointer padding[12];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_application_get_type      (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkApplication * gtk_application_new           (const gchar       *application_id,
                                                 GApplicationFlags  flags);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_application_add_window    (GtkApplication    *application,
                                                 GtkWindow         *window);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_application_remove_window (GtkApplication    *application,
                                                 GtkWindow         *window);
+GDK_AVAILABLE_IN_ALL
 GList *          gtk_application_get_windows   (GtkApplication    *application);
 
 GDK_AVAILABLE_IN_3_4
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 0ab1bf8..27387f8 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -67,9 +67,12 @@ struct _GtkArrowClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
                                 GtkShadowType  shadow_type);
+GDK_AVAILABLE_IN_ALL
 void       gtk_arrow_set        (GtkArrow      *arrow,
                                 GtkArrowType   arrow_type,
                                 GtkShadowType  shadow_type);
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index c79f211..3a54623 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -66,12 +66,15 @@ struct _GtkAspectFrameClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
                                        gfloat           xalign,
                                        gfloat           yalign,
                                        gfloat           ratio,
                                        gboolean         obey_child);
+GDK_AVAILABLE_IN_ALL
 void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
                                        gfloat           xalign,
                                        gfloat           yalign,
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 8ac451b..ef94067 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -120,38 +120,54 @@ struct _GtkAssistantClass
  */
 typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_assistant_new                   (void);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_next_page             (GtkAssistant         *assistant);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_previous_page         (GtkAssistant         *assistant);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
                                                            gint                  page_num);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
                                                            gint                  page_num);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            gint                  position);
 GDK_AVAILABLE_IN_3_2
 void                  gtk_assistant_remove_page           (GtkAssistant         *assistant,
                                                            gint                  page_num);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
                                                            GtkAssistantPageFunc  page_func,
                                                            gpointer              data,
                                                            GDestroyNotify        destroy);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            GtkAssistantPageType  type);
+GDK_AVAILABLE_IN_ALL
 GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            const gchar          *title);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
@@ -170,17 +186,23 @@ GDK_DEPRECATED_IN_3_2
 GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            gboolean              complete);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,
                                                            GtkWidget            *child);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,
                                                            GtkWidget            *child);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_update_buttons_state  (GtkAssistant *assistant);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_commit                (GtkAssistant *assistant);
 
 G_END_DECLS
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 812f516..36cc394 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -66,13 +66,19 @@ struct _GtkButtonBoxClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_button_box_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget       * gtk_button_box_new                 (GtkOrientation     orientation);
+GDK_AVAILABLE_IN_ALL
 GtkButtonBoxStyle gtk_button_box_get_layout          (GtkButtonBox      *widget);
+GDK_AVAILABLE_IN_ALL
 void              gtk_button_box_set_layout          (GtkButtonBox      *widget,
                                                       GtkButtonBoxStyle  layout_style);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_button_box_get_child_secondary (GtkButtonBox      *widget,
                                                       GtkWidget         *child);
+GDK_AVAILABLE_IN_ALL
 void              gtk_button_box_set_child_secondary (GtkButtonBox      *widget,
                                                       GtkWidget         *child,
                                                       gboolean           is_secondary);
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 1ec0fa3..6f8949a 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -67,8 +67,10 @@ struct _GtkBinClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_bin_get_type  (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_bin_get_child (GtkBin *bin);
 
 void       _gtk_bin_set_child (GtkBin    *bin,
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index fb911f7..7fcffdb 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -141,39 +141,50 @@ struct _GtkBindingSignal
   GtkBindingArg    *args;
 };
 
+GDK_AVAILABLE_IN_ALL
 GtkBindingSet *gtk_binding_set_new           (const gchar         *set_name);
+GDK_AVAILABLE_IN_ALL
 GtkBindingSet *gtk_binding_set_by_class      (gpointer             object_class);
+GDK_AVAILABLE_IN_ALL
 GtkBindingSet *gtk_binding_set_find          (const gchar         *set_name);
 
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_bindings_activate         (GObject             *object,
                                               guint                keyval,
                                               GdkModifierType      modifiers);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_bindings_activate_event   (GObject             *object,
                                               GdkEventKey         *event);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_binding_set_activate      (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers,
                                               GObject             *object);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_binding_entry_skip        (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers);
+GDK_AVAILABLE_IN_ALL
 void           gtk_binding_entry_add_signal  (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers,
                                               const gchar         *signal_name,
                                               guint                n_args,
                                               ...);
+GDK_AVAILABLE_IN_ALL
 void           gtk_binding_entry_add_signall (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers,
                                               const gchar         *signal_name,
                                               GSList              *binding_args);
 
+GDK_AVAILABLE_IN_ALL
 GTokenType     gtk_binding_entry_add_signal_from_string
                                              (GtkBindingSet       *binding_set,
                                               const gchar         *signal_desc);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_binding_entry_remove      (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers);
diff --git a/gtk/gtkborder.h b/gtk/gtkborder.h
index 8b700ef..b22ded7 100644
--- a/gtk/gtkborder.h
+++ b/gtk/gtkborder.h
@@ -30,6 +30,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -55,9 +56,13 @@ struct _GtkBorder
   gint16 bottom;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_border_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkBorder *gtk_border_new      (void) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 GtkBorder *gtk_border_copy     (const GtkBorder *border_);
+GDK_AVAILABLE_IN_ALL
 void       gtk_border_free     (GtkBorder       *border_);
 
 
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index e93c97f..9a79fbc 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -68,26 +68,34 @@ struct _GtkBoxClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
                                          gint            spacing);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_pack_start          (GtkBox         *box,
                                          GtkWidget      *child,
                                          gboolean        expand,
                                          gboolean        fill,
                                          guint           padding);
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_pack_end            (GtkBox         *box,
                                          GtkWidget      *child,
                                          gboolean        expand,
                                          gboolean        fill,
                                          guint           padding);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_homogeneous     (GtkBox         *box,
                                          gboolean        homogeneous);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_box_get_homogeneous     (GtkBox         *box);
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_spacing         (GtkBox         *box,
                                          gint            spacing);
+GDK_AVAILABLE_IN_ALL
 gint        gtk_box_get_spacing         (GtkBox         *box);
 GDK_AVAILABLE_IN_3_10
 void        gtk_box_set_baseline_position (GtkBox             *box,
@@ -95,16 +103,19 @@ void        gtk_box_set_baseline_position (GtkBox             *box,
 GDK_AVAILABLE_IN_3_10
 GtkBaselinePosition gtk_box_get_baseline_position (GtkBox         *box);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_reorder_child       (GtkBox         *box,
                                          GtkWidget      *child,
                                          gint            position);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_query_child_packing (GtkBox         *box,
                                          GtkWidget      *child,
                                          gboolean       *expand,
                                          gboolean       *fill,
                                          guint          *padding,
                                          GtkPackType    *pack_type);
+GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_child_packing   (GtkBox         *box,
                                          GtkWidget      *child,
                                          gboolean        expand,
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index f9809a1..e2d8488 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -130,40 +130,51 @@ struct _GtkBuildableIface
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_buildable_get_type               (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_set_name               (GtkBuildable        *buildable,
                                                const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_buildable_get_name           (GtkBuildable        *buildable);
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_add_child              (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                GObject             *child,
                                                const gchar         *type);
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_set_buildable_property (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                const gchar         *name,
                                                const GValue        *value);
+GDK_AVAILABLE_IN_ALL
 GObject * gtk_buildable_construct_child        (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 gboolean  gtk_buildable_custom_tag_start       (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                GObject             *child,
                                                const gchar         *tagname,
                                                GMarkupParser       *parser,
                                                gpointer            *data);
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_custom_tag_end         (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                GObject             *child,
                                                const gchar         *tagname,
                                                gpointer            *data);
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_custom_finished        (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                GObject             *child,
                                                const gchar         *tagname,
                                                gpointer             data);
+GDK_AVAILABLE_IN_ALL
 void      gtk_buildable_parser_finished        (GtkBuildable        *buildable,
                                                GtkBuilder          *builder);
+GDK_AVAILABLE_IN_ALL
 GObject * gtk_buildable_get_internal_child     (GtkBuildable        *buildable,
                                                GtkBuilder          *builder,
                                                const gchar         *childname);
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 7f5cb15..7e260d1 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -80,6 +80,7 @@ typedef enum
   GTK_BUILDER_ERROR_TEMPLATE_MISMATCH
 } GtkBuilderError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark gtk_builder_error_quark (void);
 
 struct _GtkBuilder
@@ -107,19 +108,25 @@ struct _GtkBuilderClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_builder_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkBuilder*  gtk_builder_new                     (void);
 
+GDK_AVAILABLE_IN_ALL
 guint        gtk_builder_add_from_file           (GtkBuilder    *builder,
                                                   const gchar   *filename,
                                                   GError       **error);
+GDK_AVAILABLE_IN_ALL
 guint        gtk_builder_add_from_resource       (GtkBuilder    *builder,
                                                   const gchar   *resource_path,
                                                   GError       **error);
+GDK_AVAILABLE_IN_ALL
 guint        gtk_builder_add_from_string         (GtkBuilder    *builder,
                                                   const gchar   *buffer,
                                                   gsize          length,
                                                   GError       **error);
+GDK_AVAILABLE_IN_ALL
 guint        gtk_builder_add_objects_from_file   (GtkBuilder    *builder,
                                                   const gchar   *filename,
                                                   gchar        **object_ids,
@@ -129,34 +136,44 @@ guint        gtk_builder_add_objects_from_resource(GtkBuilder    *builder,
                                                   const gchar   *resource_path,
                                                   gchar        **object_ids,
                                                   GError       **error);
+GDK_AVAILABLE_IN_ALL
 guint        gtk_builder_add_objects_from_string (GtkBuilder    *builder,
                                                   const gchar   *buffer,
                                                   gsize          length,
                                                   gchar        **object_ids,
                                                   GError       **error);
+GDK_AVAILABLE_IN_ALL
 GObject*     gtk_builder_get_object              (GtkBuilder    *builder,
                                                   const gchar   *name);
+GDK_AVAILABLE_IN_ALL
 GSList*      gtk_builder_get_objects             (GtkBuilder    *builder);
 GDK_AVAILABLE_IN_3_8
 void         gtk_builder_expose_object           (GtkBuilder    *builder,
                                                   const gchar   *name,
                                                   GObject       *object);
+GDK_AVAILABLE_IN_ALL
 void         gtk_builder_connect_signals         (GtkBuilder    *builder,
                                                  gpointer       user_data);
+GDK_AVAILABLE_IN_ALL
 void         gtk_builder_connect_signals_full    (GtkBuilder    *builder,
                                                   GtkBuilderConnectFunc func,
                                                  gpointer       user_data);
+GDK_AVAILABLE_IN_ALL
 void         gtk_builder_set_translation_domain  (GtkBuilder           *builder,
                                                   const gchar          *domain);
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_builder_get_translation_domain  (GtkBuilder           *builder);
+GDK_AVAILABLE_IN_ALL
 GType        gtk_builder_get_type_from_name      (GtkBuilder           *builder,
                                                   const char           *type_name);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_value_from_string       (GtkBuilder    *builder,
                                                  GParamSpec    *pspec,
                                                   const gchar          *string,
                                                   GValue               *value,
                                                  GError       **error);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_value_from_string_type  (GtkBuilder    *builder,
                                                  GType          type,
                                                   const gchar          *string,
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index d46f181..075db73 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -74,11 +74,17 @@ struct _GtkButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_button_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_button_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 void           gtk_button_clicked           (GtkButton      *button);
 GDK_DEPRECATED
 void           gtk_button_pressed           (GtkButton      *button);
@@ -89,32 +95,48 @@ void           gtk_button_enter             (GtkButton      *button);
 GDK_DEPRECATED
 void           gtk_button_leave             (GtkButton      *button);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_relief         (GtkButton      *button,
                                                     GtkReliefStyle  newstyle);
+GDK_AVAILABLE_IN_ALL
 GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_label          (GtkButton      *button,
                                                     const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_button_get_label          (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_use_underline  (GtkButton      *button,
                                                     gboolean        use_underline);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_button_get_use_underline  (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_use_stock      (GtkButton      *button,
                                                     gboolean        use_stock);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_button_get_use_stock      (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_focus_on_click (GtkButton      *button,
                                                     gboolean        focus_on_click);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_button_get_focus_on_click (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_alignment      (GtkButton      *button,
                                                     gfloat          xalign,
                                                     gfloat          yalign);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_get_alignment      (GtkButton      *button,
                                                     gfloat         *xalign,
                                                     gfloat         *yalign);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_image          (GtkButton      *button,
                                                     GtkWidget      *image);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*            gtk_button_get_image          (GtkButton      *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_button_set_image_position (GtkButton      *button,
                                                     GtkPositionType position);
+GDK_AVAILABLE_IN_ALL
 GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
 GDK_AVAILABLE_IN_3_6
 void                  gtk_button_set_always_show_image (GtkButton   *button,
@@ -122,6 +144,7 @@ void                  gtk_button_set_always_show_image (GtkButton   *button,
 GDK_AVAILABLE_IN_3_6
 gboolean              gtk_button_get_always_show_image (GtkButton   *button);
 
+GDK_AVAILABLE_IN_ALL
 GdkWindow*            gtk_button_get_event_window   (GtkButton      *button);
 
 
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 7745c62..23c50f7 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -123,44 +123,60 @@ struct _GtkCalendarClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_calendar_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_calendar_new            (void);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_select_month   (GtkCalendar *calendar,
                                         guint        month,
                                         guint        year);
+GDK_AVAILABLE_IN_ALL
 void      gtk_calendar_select_day      (GtkCalendar *calendar,
                                         guint        day);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_mark_day       (GtkCalendar *calendar,
                                         guint        day);
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_unmark_day     (GtkCalendar *calendar,
                                         guint        day);
+GDK_AVAILABLE_IN_ALL
 void      gtk_calendar_clear_marks     (GtkCalendar *calendar);
 
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_calendar_set_display_options (GtkCalendar              *calendar,
                                             GtkCalendarDisplayOptions flags);
+GDK_AVAILABLE_IN_ALL
 GtkCalendarDisplayOptions
            gtk_calendar_get_display_options (GtkCalendar             *calendar);
+GDK_AVAILABLE_IN_ALL
 void      gtk_calendar_get_date        (GtkCalendar *calendar, 
                                         guint       *year,
                                         guint       *month,
                                         guint       *day);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_set_detail_func (GtkCalendar           *calendar,
                                          GtkCalendarDetailFunc  func,
                                          gpointer               data,
                                          GDestroyNotify         destroy);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_set_detail_width_chars (GtkCalendar    *calendar,
                                                 gint            chars);
+GDK_AVAILABLE_IN_ALL
 void       gtk_calendar_set_detail_height_rows (GtkCalendar    *calendar,
                                                 gint            rows);
 
+GDK_AVAILABLE_IN_ALL
 gint       gtk_calendar_get_detail_width_chars (GtkCalendar    *calendar);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_calendar_get_detail_height_rows (GtkCalendar    *calendar);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_calendar_get_day_is_marked      (GtkCalendar    *calendar,
                                                 guint           day);
 
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index 0f45837..e000a0c 100644
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -276,18 +276,24 @@ struct _GtkCellAreaClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_cell_area_get_type                       (void) G_GNUC_CONST;
 
 /* Basic methods */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_add                            (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_remove                         (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_has_renderer                   (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_foreach                        (GtkCellArea          *area,
                                                                     GtkCellCallback       callback,
                                                                     gpointer              callback_data);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_foreach_alloc                  (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
@@ -295,12 +301,14 @@ void                  gtk_cell_area_foreach_alloc                  (GtkCellArea
                                                                     const GdkRectangle   *background_area,
                                                                     GtkCellAllocCallback  callback,
                                                                     gpointer              callback_data);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_cell_area_event                          (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
                                                                     GdkEvent             *event,
                                                                     const GdkRectangle   *cell_area,
                                                                     GtkCellRendererState  flags);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_render                         (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
@@ -310,12 +318,14 @@ void                  gtk_cell_area_render                         (GtkCellArea
                                                                     GtkCellRendererState  flags,
                                                                     gboolean              paint_focus);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_cell_allocation            (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
                                                                     GtkCellRenderer      *renderer,
                                                                     const GdkRectangle   *cell_area,
                                                                     GdkRectangle         *allocation);
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer      *gtk_cell_area_get_cell_at_position           (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
@@ -325,137 +335,174 @@ GtkCellRenderer      *gtk_cell_area_get_cell_at_position           (GtkCellArea
                                                                     GdkRectangle         *alloc_area);
 
 /* Geometry */
+GDK_AVAILABLE_IN_ALL
 GtkCellAreaContext   *gtk_cell_area_create_context                 (GtkCellArea        *area);
+GDK_AVAILABLE_IN_ALL
 GtkCellAreaContext   *gtk_cell_area_copy_context                   (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context);
+GDK_AVAILABLE_IN_ALL
 GtkSizeRequestMode    gtk_cell_area_get_request_mode               (GtkCellArea        *area);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_width            (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
                                                                     gint               *minimum_width,
                                                                     gint               *natural_width);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_height_for_width (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
                                                                     gint                width,
                                                                     gint               *minimum_height,
                                                                     gint               *natural_height);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_height           (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
                                                                     gint               *minimum_height,
                                                                     gint               *natural_height);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_width_for_height (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
                                                                     gint                height,
                                                                     gint               *minimum_width,
                                                                     gint               *natural_width);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
 
 
 /* Attributes */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_apply_attributes               (GtkCellArea        *area,
                                                                     GtkTreeModel       *tree_model,
                                                                     GtkTreeIter        *iter,
                                                                     gboolean            is_expander,
                                                                     gboolean            is_expanded);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_attribute_connect              (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *attribute,
                                                                     gint                column);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_attribute_disconnect           (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *attribute);
 
 /* Cell Properties */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_class_install_cell_property    (GtkCellAreaClass   *aclass,
                                                                     guint               property_id,
                                                                     GParamSpec         *pspec);
+GDK_AVAILABLE_IN_ALL
 GParamSpec*           gtk_cell_area_class_find_cell_property       (GtkCellAreaClass   *aclass,
                                                                     const gchar        *property_name);
+GDK_AVAILABLE_IN_ALL
 GParamSpec**          gtk_cell_area_class_list_cell_properties     (GtkCellAreaClass   *aclass,
                                                                     guint                   *n_properties);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_add_with_properties            (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar     *first_prop_name,
                                                                     ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_set                       (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *first_prop_name,
                                                                     ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_get                       (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *first_prop_name,
                                                                     ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_set_valist                (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *first_property_name,
                                                                     va_list             var_args);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_get_valist                (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *first_property_name,
                                                                     va_list             var_args);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_set_property              (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *property_name,
                                                                     const GValue       *value);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_cell_get_property              (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *property_name,
                                                                     GValue             *value);
 
 /* Focus */
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_is_activatable                 (GtkCellArea         *area);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_activate                       (GtkCellArea         *area,
                                                                     GtkCellAreaContext  *context,
                                                                     GtkWidget           *widget,
                                                                     const GdkRectangle  *cell_area,
                                                                     GtkCellRendererState flags,
                                                                     gboolean             edit_only);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_focus                          (GtkCellArea         *area,
                                                                     GtkDirectionType     direction);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_set_focus_cell                 (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer      *gtk_cell_area_get_focus_cell                 (GtkCellArea          *area);
 
 
 /* Focus siblings */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_add_focus_sibling              (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer,
                                                                     GtkCellRenderer      *sibling);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_remove_focus_sibling           (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer,
                                                                     GtkCellRenderer      *sibling);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_is_focus_sibling               (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer,
                                                                     GtkCellRenderer      *sibling);
+GDK_AVAILABLE_IN_ALL
 const GList *         gtk_cell_area_get_focus_siblings             (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer      *gtk_cell_area_get_focus_from_sibling         (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
 
 /* Cell Activation/Editing */
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer      *gtk_cell_area_get_edited_cell                (GtkCellArea          *area);
+GDK_AVAILABLE_IN_ALL
 GtkCellEditable      *gtk_cell_area_get_edit_widget                (GtkCellArea          *area);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_cell_area_activate_cell                  (GtkCellArea          *area,
                                                                     GtkWidget            *widget,
                                                                     GtkCellRenderer      *renderer,
                                                                     GdkEvent             *event,
                                                                     const GdkRectangle   *cell_area,
                                                                     GtkCellRendererState  flags);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_stop_editing                   (GtkCellArea          *area,
                                                                     gboolean              canceled);
 
 /* Functions for area implementations */
 
 /* Distinguish the inner cell area from the whole requested area including margins */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_inner_cell_area                (GtkCellArea        *area,
                                                                     GtkWidget          *widget,
                                                                     const GdkRectangle *cell_area,
                                                                     GdkRectangle       *inner_area);
 
 /* Request the size of a cell while respecting the cell margins (requests are margin inclusive) */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_request_renderer               (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     GtkOrientation      orientation,
diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 854faa0..7339b9f 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -61,20 +61,26 @@ struct _GtkCellAreaBoxClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_cell_area_box_get_type    (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkCellArea *gtk_cell_area_box_new         (void);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_box_pack_start  (GtkCellAreaBox  *box,
                                             GtkCellRenderer *renderer,
                                             gboolean         expand,
                                             gboolean         align,
                                             gboolean         fixed);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_box_pack_end    (GtkCellAreaBox  *box,
                                             GtkCellRenderer *renderer,
                                             gboolean         expand,
                                             gboolean         align,
                                             gboolean         fixed);
+GDK_AVAILABLE_IN_ALL
 gint         gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
                                             gint             spacing);
 
diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h
index c42aba7..cf35a62 100644
--- a/gtk/gtkcellareacontext.h
+++ b/gtk/gtkcellareacontext.h
@@ -90,32 +90,41 @@ struct _GtkCellAreaContextClass
   void (*_gtk_reserved6) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_cell_area_context_get_type              (void) G_GNUC_CONST;
 
 /* Main apis */
+GDK_AVAILABLE_IN_ALL
 GtkCellArea *gtk_cell_area_context_get_area                        (GtkCellAreaContext *context);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_allocate                        (GtkCellAreaContext *context,
                                                                     gint                width,
                                                                     gint                height);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_reset                           (GtkCellAreaContext *context);
 
 /* Apis for GtkCellArea clients to consult cached values
  * for a series of GtkTreeModel rows
  */
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_width            (GtkCellAreaContext *context,
                                                                    gint               *minimum_width,
                                                                    gint               *natural_width);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_height           (GtkCellAreaContext *context,
                                                                    gint               *minimum_height,
                                                                    gint               *natural_height);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *context,
                                                                    gint                width,
                                                                    gint               *minimum_height,
                                                                    gint               *natural_height);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *context,
                                                                    gint                height,
                                                                    gint               *minimum_width,
                                                                    gint               *natural_width);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_allocation                 (GtkCellAreaContext *context,
                                                                    gint               *width,
                                                                    gint               *height);
@@ -123,9 +132,11 @@ void         gtk_cell_area_context_get_allocation                 (GtkCellAreaCo
 /* Apis for GtkCellArea implementations to update cached values
  * for multiple GtkTreeModel rows
  */
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_push_preferred_width  (GtkCellAreaContext *context,
                                                           gint                minimum_width,
                                                           gint                natural_width);
+GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *context,
                                                           gint                minimum_height,
                                                           gint                natural_height);
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index ae97d9a..7478932 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -49,11 +49,15 @@ struct _GtkCellEditableIface
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_cell_editable_get_type      (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_editable_start_editing (GtkCellEditable *cell_editable,
                                       GdkEvent        *event);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_editable_editing_done  (GtkCellEditable *cell_editable);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable);
 
 
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 8870c67..8f3ee49 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -86,32 +86,43 @@ struct _GtkCellLayoutIface
   GtkCellArea *(* get_area)   (GtkCellLayout         *cell_layout);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_cell_layout_get_type           (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           gboolean               expand);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_pack_end           (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           gboolean               expand);
+GDK_AVAILABLE_IN_ALL
 GList *gtk_cell_layout_get_cells         (GtkCellLayout         *cell_layout);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_clear              (GtkCellLayout         *cell_layout);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_set_attributes     (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           const gchar           *attribute,
                                           gint                   column);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           GtkCellLayoutDataFunc  func,
                                           gpointer               func_data,
                                           GDestroyNotify         destroy);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell);
+GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_reorder            (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           gint                   position);
+GDK_AVAILABLE_IN_ALL
 GtkCellArea *gtk_cell_layout_get_area    (GtkCellLayout         *cell_layout);
 
 gboolean _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 8948e64..59d8525 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -161,31 +161,39 @@ struct _GtkCellRendererClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType              gtk_cell_renderer_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkSizeRequestMode gtk_cell_renderer_get_request_mode               (GtkCellRenderer    *cell);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_width            (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
                                                                      gint               *minimum_size,
                                                                      gint               *natural_size);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_height_for_width (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
                                                                      gint                width,
                                                                      gint               *minimum_height,
                                                                      gint               *natural_height);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_height           (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
                                                                      gint               *minimum_size,
                                                                      gint               *natural_size);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
                                                                      gint                height,
                                                                      gint               *minimum_width,
                                                                      gint               *natural_width);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_size             (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
                                                                      GtkRequisition     *minimum_size,
                                                                      GtkRequisition     *natural_size);
+GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_aligned_area               (GtkCellRenderer    *cell,
                                                                     GtkWidget          *widget,
                                                                     GtkCellRendererState flags,
@@ -200,12 +208,14 @@ void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
                                                    gint                 *y_offset,
                                                    gint                 *width,
                                                    gint                 *height);
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
                                                    cairo_t              *cr,
                                                   GtkWidget            *widget,
                                                   const GdkRectangle   *background_area,
                                                   const GdkRectangle   *cell_area,
                                                   GtkCellRendererState  flags);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_cell_renderer_activate       (GtkCellRenderer      *cell,
                                                   GdkEvent             *event,
                                                   GtkWidget            *widget,
@@ -213,6 +223,7 @@ gboolean         gtk_cell_renderer_activate       (GtkCellRenderer      *cell,
                                                   const GdkRectangle   *background_area,
                                                   const GdkRectangle   *cell_area,
                                                   GtkCellRendererState  flags);
+GDK_AVAILABLE_IN_ALL
 GtkCellEditable *gtk_cell_renderer_start_editing  (GtkCellRenderer      *cell,
                                                   GdkEvent             *event,
                                                   GtkWidget            *widget,
@@ -221,38 +232,50 @@ GtkCellEditable *gtk_cell_renderer_start_editing  (GtkCellRenderer      *cell,
                                                   const GdkRectangle   *cell_area,
                                                   GtkCellRendererState  flags);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_fixed_size (GtkCellRenderer      *cell,
                                                   gint                  width,
                                                   gint                  height);
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_get_fixed_size (GtkCellRenderer      *cell,
                                                   gint                 *width,
                                                   gint                 *height);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_alignment  (GtkCellRenderer      *cell,
                                                    gfloat                xalign,
                                                    gfloat                yalign);
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_get_alignment  (GtkCellRenderer      *cell,
                                                    gfloat               *xalign,
                                                    gfloat               *yalign);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_padding    (GtkCellRenderer      *cell,
                                                    gint                  xpad,
                                                    gint                  ypad);
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_get_padding    (GtkCellRenderer      *cell,
                                                    gint                 *xpad,
                                                    gint                 *ypad);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_visible    (GtkCellRenderer      *cell,
                                                    gboolean              visible);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_cell_renderer_get_visible    (GtkCellRenderer      *cell);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_sensitive  (GtkCellRenderer      *cell,
                                                    gboolean              sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_cell_renderer_get_sensitive  (GtkCellRenderer      *cell);
 
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_cell_renderer_is_activatable (GtkCellRenderer      *cell);
 
 /* For use by cell renderer implementations only */
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_stop_editing   (GtkCellRenderer      *cell,
                                                    gboolean              canceled);
 
@@ -265,10 +288,12 @@ void            _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
                                                    gint                 *x_offset,
                                                    gint                 *y_offset);
 
+GDK_AVAILABLE_IN_ALL
 GtkStateFlags   gtk_cell_renderer_get_state       (GtkCellRenderer      *cell,
                                                    GtkWidget            *widget,
                                                    GtkCellRendererState  cell_state);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_cell_renderer_class_set_accessible_type 
                                                   (GtkCellRendererClass *renderer_class,
                                                    GType                 type);
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 80391d7..4e4cd8d 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -74,7 +74,9 @@ struct _GtkCellRendererAccelClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
 
 
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 52e87eb..fbf9586 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -57,7 +57,9 @@ struct _GtkCellRendererComboClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 0a7a4f6..83fadce 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -58,7 +58,9 @@ struct _GtkCellRendererPixbufClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
 
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index ab728bf..287b611 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -64,7 +64,9 @@ struct _GtkCellRendererProgressClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index dc949b8..1ea3300 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -56,7 +56,9 @@ struct _GtkCellRendererSpinClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_spin_get_type (void);
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_spin_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrendererspinner.h b/gtk/gtkcellrendererspinner.h
index 3d2d01f..927da2d 100644
--- a/gtk/gtkcellrendererspinner.h
+++ b/gtk/gtkcellrendererspinner.h
@@ -59,7 +59,9 @@ struct _GtkCellRendererSpinnerClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_spinner_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_spinner_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 571e90d..54b5741 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -63,9 +63,12 @@ struct _GtkCellRendererTextClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_text_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_text_new      (void);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
                                                                    gint                 number_of_rows);
 
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index 9f036e4..5d022fa 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -61,18 +61,26 @@ struct _GtkCellRendererToggleClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_toggle_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkCellRenderer *gtk_cell_renderer_toggle_new            (void);
 
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_cell_renderer_toggle_get_radio      (GtkCellRendererToggle *toggle);
+GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_toggle_set_radio      (GtkCellRendererToggle *toggle,
                                                           gboolean               radio);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_cell_renderer_toggle_get_active      (GtkCellRendererToggle *toggle);
+GDK_AVAILABLE_IN_ALL
 void            gtk_cell_renderer_toggle_set_active      (GtkCellRendererToggle *toggle,
                                                           gboolean               setting);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_cell_renderer_toggle_get_activatable (GtkCellRendererToggle *toggle);
+GDK_AVAILABLE_IN_ALL
 void            gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
                                                           gboolean               setting);
 
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 82e956e..071ca73 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -60,25 +60,40 @@ struct _GtkCellViewClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_cell_view_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget        *gtk_cell_view_new                     (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget        *gtk_cell_view_new_with_context        (GtkCellArea        *area,
                                                          GtkCellAreaContext *context);
+GDK_AVAILABLE_IN_ALL
 GtkWidget        *gtk_cell_view_new_with_text           (const gchar     *text);
+GDK_AVAILABLE_IN_ALL
 GtkWidget        *gtk_cell_view_new_with_markup         (const gchar     *markup);
+GDK_AVAILABLE_IN_ALL
 GtkWidget        *gtk_cell_view_new_with_pixbuf         (GdkPixbuf       *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_model               (GtkCellView     *cell_view,
                                                          GtkTreeModel    *model);
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel     *gtk_cell_view_get_model               (GtkCellView     *cell_view);
+GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_displayed_row       (GtkCellView     *cell_view,
                                                          GtkTreePath     *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath      *gtk_cell_view_get_displayed_row       (GtkCellView     *cell_view);
+GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_background_rgba     (GtkCellView     *cell_view,
                                                          const GdkRGBA   *rgba);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_cell_view_get_draw_sensitive      (GtkCellView     *cell_view);
+GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_draw_sensitive      (GtkCellView     *cell_view,
                                                          gboolean         draw_sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_cell_view_get_fit_model           (GtkCellView     *cell_view);
+GDK_AVAILABLE_IN_ALL
 void              gtk_cell_view_set_fit_model           (GtkCellView     *cell_view,
                                                          gboolean         fit_model);
 
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index c9b5880..66cc5ff 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -66,9 +66,13 @@ struct _GtkCheckButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_check_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_button_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_button_new_with_label    (const gchar *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label);
 
 void _gtk_check_button_get_props (GtkCheckButton *check_button,
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index c793bcd..2e67f7d 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -71,20 +71,31 @@ struct _GtkCheckMenuItemClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_check_menu_item_get_type          (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_menu_item_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_menu_item_new_with_label    (const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_check_menu_item_new_with_mnemonic (const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 void       gtk_check_menu_item_set_active        (GtkCheckMenuItem *check_menu_item,
                                                  gboolean          is_active);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_check_menu_item_get_active        (GtkCheckMenuItem *check_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_check_menu_item_toggled           (GtkCheckMenuItem *check_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_check_menu_item_set_inconsistent  (GtkCheckMenuItem *check_menu_item,
                                                  gboolean          setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
                                                  gboolean          draw_as_radio);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item);
 
 
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index b04eea4..9fa8837 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -147,84 +147,113 @@ typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
 typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
                                               gpointer          user_data_or_owner);
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
                                             GdkAtom       selection);
 #ifndef GDK_MULTIHEAD_SAFE
+GDK_AVAILABLE_IN_ALL
 GtkClipboard *gtk_clipboard_get             (GdkAtom       selection);
 #endif
 
+GDK_AVAILABLE_IN_ALL
 GdkDisplay   *gtk_clipboard_get_display     (GtkClipboard *clipboard);
 
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_set_with_data  (GtkClipboard          *clipboard,
                                       const GtkTargetEntry  *targets,
                                       guint                  n_targets,
                                       GtkClipboardGetFunc    get_func,
                                       GtkClipboardClearFunc  clear_func,
                                       gpointer               user_data);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_set_with_owner (GtkClipboard          *clipboard,
                                       const GtkTargetEntry  *targets,
                                       guint                  n_targets,
                                       GtkClipboardGetFunc    get_func,
                                       GtkClipboardClearFunc  clear_func,
                                       GObject               *owner);
+GDK_AVAILABLE_IN_ALL
 GObject *gtk_clipboard_get_owner      (GtkClipboard          *clipboard);
+GDK_AVAILABLE_IN_ALL
 void     gtk_clipboard_clear          (GtkClipboard          *clipboard);
+GDK_AVAILABLE_IN_ALL
 void     gtk_clipboard_set_text       (GtkClipboard          *clipboard,
                                       const gchar           *text,
                                       gint                   len);
+GDK_AVAILABLE_IN_ALL
 void     gtk_clipboard_set_image      (GtkClipboard          *clipboard,
                                       GdkPixbuf             *pixbuf);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_contents  (GtkClipboard                     *clipboard,
                                       GdkAtom                           target,
                                       GtkClipboardReceivedFunc          callback,
                                       gpointer                          user_data);
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_text      (GtkClipboard                     *clipboard,
                                       GtkClipboardTextReceivedFunc      callback,
                                       gpointer                          user_data);
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_rich_text (GtkClipboard                     *clipboard,
                                       GtkTextBuffer                    *buffer,
                                       GtkClipboardRichTextReceivedFunc  callback,
                                       gpointer                          user_data);
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_image     (GtkClipboard                     *clipboard,
                                       GtkClipboardImageReceivedFunc     callback,
                                       gpointer                          user_data);
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_uris      (GtkClipboard                     *clipboard,
                                       GtkClipboardURIReceivedFunc       callback,
                                       gpointer                          user_data);
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_request_targets   (GtkClipboard                     *clipboard,
                                       GtkClipboardTargetsReceivedFunc   callback,
                                       gpointer                          user_data);
 
+GDK_AVAILABLE_IN_ALL
 GtkSelectionData *gtk_clipboard_wait_for_contents  (GtkClipboard  *clipboard,
                                                     GdkAtom        target);
+GDK_AVAILABLE_IN_ALL
 gchar *           gtk_clipboard_wait_for_text      (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 guint8 *          gtk_clipboard_wait_for_rich_text (GtkClipboard  *clipboard,
                                                     GtkTextBuffer *buffer,
                                                     GdkAtom       *format,
                                                     gsize         *length);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *       gtk_clipboard_wait_for_image     (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 gchar **          gtk_clipboard_wait_for_uris      (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_clipboard_wait_for_targets   (GtkClipboard  *clipboard,
                                                     GdkAtom      **targets,
                                                     gint          *n_targets);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_wait_is_text_available      (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_wait_is_rich_text_available (GtkClipboard  *clipboard,
                                                     GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_wait_is_image_available     (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_wait_is_uris_available      (GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_clipboard_wait_is_target_available    (GtkClipboard  *clipboard,
                                                     GdkAtom        target);
 
 
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_set_can_store (GtkClipboard         *clipboard,
                                  const GtkTargetEntry *targets,
                                  gint                  n_targets);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_store         (GtkClipboard   *clipboard);
 
 /* private */
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 6fc7f46..85c627a 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -71,11 +71,16 @@ struct _GtkColorButtonClass {
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_color_button_get_type      (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_color_button_new           (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *  gtk_color_button_new_with_rgba (const GdkRGBA  *rgba);
+GDK_AVAILABLE_IN_ALL
 void         gtk_color_button_set_title     (GtkColorButton *button,
                                              const gchar    *title);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_color_button_get_title     (GtkColorButton *button);
 
 GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_new_with_rgba)
diff --git a/gtk/gtkcolorutils.h b/gtk/gtkcolorutils.h
index 8cb8c21..4d1f188 100644
--- a/gtk/gtkcolorutils.h
+++ b/gtk/gtkcolorutils.h
@@ -35,11 +35,14 @@
 #endif
 
 #include <glib.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
+GDK_AVAILABLE_IN_ALL
 void gtk_hsv_to_rgb (gdouble  h, gdouble  s, gdouble  v,
                      gdouble *r, gdouble *g, gdouble *b);
+GDK_AVAILABLE_IN_ALL
 void gtk_rgb_to_hsv (gdouble  r, gdouble  g, gdouble  b,
                      gdouble *h, gdouble *s, gdouble *v);
 
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 03d25ff..cf05b83 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -64,81 +64,123 @@ struct _GtkComboBoxClass
 
 
 /* construction */
+GDK_AVAILABLE_IN_ALL
 GType         gtk_combo_box_get_type                 (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new                      (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new_with_area            (GtkCellArea  *area);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new_with_area_and_entry  (GtkCellArea  *area);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new_with_entry           (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new_with_model           (GtkTreeModel *model);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model);
 
 /* grids */
+GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
                                                     gint         width);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_row_span_column    (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
                                                     gint         row_span);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_column_span_column (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
                                                     gint         column_span);
 
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
                                                     gboolean     add_tearoffs);
 
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_combo_box_get_title              (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_title              (GtkComboBox *combo_box,
                                                     const gchar *title);
 
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_focus_on_click     (GtkComboBox *combo,
                                                     gboolean     focus_on_click);
 
 /* get/set active item */
+GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
                                               gint             index_);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
                                               GtkTreeIter     *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_active_iter  (GtkComboBox     *combo_box,
                                               GtkTreeIter     *iter);
 
 /* getters and setters */
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
                                               GtkTreeModel    *model);
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox                *combo_box);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
                                                                   GtkTreeViewRowSeparatorFunc func,
                                                                   gpointer                    data,
                                                                   GDestroyNotify              destroy);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_combo_box_set_button_sensitivity (GtkComboBox        *combo_box,
                                                          GtkSensitivityType  sensitivity);
+GDK_AVAILABLE_IN_ALL
 GtkSensitivityType gtk_combo_box_get_button_sensitivity (GtkComboBox        *combo_box);
 
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_combo_box_get_has_entry          (GtkComboBox        *combo_box);
+GDK_AVAILABLE_IN_ALL
 void               gtk_combo_box_set_entry_text_column  (GtkComboBox        *combo_box,
                                                          gint                text_column);
+GDK_AVAILABLE_IN_ALL
 gint               gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_combo_box_set_popup_fixed_width  (GtkComboBox      *combo_box,
                                                          gboolean          fixed);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_combo_box_get_popup_fixed_width  (GtkComboBox      *combo_box);
 
 /* programmatic control */
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_popup_for_device (GtkComboBox     *combo_box,
                                               GdkDevice       *device);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
+GDK_AVAILABLE_IN_ALL
 AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
 
+GDK_AVAILABLE_IN_ALL
 gint          gtk_combo_box_get_id_column        (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_id_column        (GtkComboBox *combo_box,
                                                   gint         id_column);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_combo_box_get_active_id        (GtkComboBox *combo_box);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_combo_box_set_active_id        (GtkComboBox *combo_box,
                                                   const gchar *active_id);
 
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index c31c9c2..91d0c37 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -57,28 +57,40 @@ struct _GtkComboBoxTextClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_combo_box_text_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*    gtk_combo_box_text_new             (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*    gtk_combo_box_text_new_with_entry  (void);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_append_text     (GtkComboBoxText     *combo_box,
                                                   const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_insert_text     (GtkComboBoxText     *combo_box,
                                                   gint                 position,
                                                   const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_prepend_text    (GtkComboBoxText     *combo_box,
                                                   const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_remove          (GtkComboBoxText     *combo_box,
                                                   gint                 position);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_remove_all      (GtkComboBoxText     *combo_box);
+GDK_AVAILABLE_IN_ALL
 gchar        *gtk_combo_box_text_get_active_text (GtkComboBoxText     *combo_box);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_insert          (GtkComboBoxText     *combo_box,
                                                   gint                 position,
                                                   const gchar         *id,
                                                   const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_append          (GtkComboBoxText     *combo_box,
                                                   const gchar         *id,
                                                   const gchar         *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_prepend         (GtkComboBoxText     *combo_box,
                                                   const gchar         *id,
                                                   const gchar         *text);
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 3bcd2b1..f66fd82 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -105,34 +105,48 @@ struct _GtkContainerClass
 
 /* Application-level methods */
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_container_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_set_border_width  (GtkContainer     *container,
                                          guint             border_width);
+GDK_AVAILABLE_IN_ALL
 guint   gtk_container_get_border_width   (GtkContainer     *container);
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_add               (GtkContainer     *container,
                                          GtkWidget        *widget);
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_remove            (GtkContainer     *container,
                                          GtkWidget        *widget);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_set_resize_mode    (GtkContainer     *container,
                                          GtkResizeMode     resize_mode);
+GDK_AVAILABLE_IN_ALL
 GtkResizeMode gtk_container_get_resize_mode (GtkContainer     *container);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_check_resize       (GtkContainer     *container);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_container_foreach      (GtkContainer       *container,
                                     GtkCallback         callback,
                                     gpointer            callback_data);
+GDK_AVAILABLE_IN_ALL
 GList*   gtk_container_get_children     (GtkContainer       *container);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_container_propagate_draw   (GtkContainer   *container,
                                         GtkWidget      *child,
                                         cairo_t        *cr);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_container_set_focus_chain  (GtkContainer   *container,
                                          GList          *focusable_widgets);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_container_get_focus_chain  (GtkContainer   *container,
                                         GList         **focusable_widgets);
+GDK_AVAILABLE_IN_ALL
 void     gtk_container_unset_focus_chain (GtkContainer  *container);
 
 #define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && \
@@ -140,55 +154,74 @@ void     gtk_container_unset_focus_chain (GtkContainer  *container);
 
 /* Widget-level methods */
 
+GDK_AVAILABLE_IN_ALL
 void   gtk_container_set_reallocate_redraws (GtkContainer    *container,
                                             gboolean         needs_redraws);
+GDK_AVAILABLE_IN_ALL
 void   gtk_container_set_focus_child      (GtkContainer     *container,
                                            GtkWidget        *child);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *
        gtk_container_get_focus_child      (GtkContainer     *container);
+GDK_AVAILABLE_IN_ALL
 void   gtk_container_set_focus_vadjustment (GtkContainer     *container,
                                            GtkAdjustment    *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment *gtk_container_get_focus_vadjustment (GtkContainer *container);
+GDK_AVAILABLE_IN_ALL
 void   gtk_container_set_focus_hadjustment (GtkContainer     *container,
                                            GtkAdjustment    *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment *gtk_container_get_focus_hadjustment (GtkContainer *container);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_resize_children      (GtkContainer     *container);
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_container_child_type          (GtkContainer     *container);
 
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_class_install_child_property (GtkContainerClass *cclass,
                                                         guint              property_id,
                                                         GParamSpec        *pspec);
+GDK_AVAILABLE_IN_ALL
 GParamSpec*  gtk_container_class_find_child_property   (GObjectClass      *cclass,
                                                         const gchar       *property_name);
+GDK_AVAILABLE_IN_ALL
 GParamSpec** gtk_container_class_list_child_properties (GObjectClass      *cclass,
                                                         guint             *n_properties);
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_add_with_properties         (GtkContainer      *container,
                                                         GtkWidget         *widget,
                                                         const gchar       *first_prop_name,
                                                         ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_child_set                   (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_prop_name,
                                                         ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_child_get                   (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_prop_name,
                                                         ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_child_set_valist            (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_property_name,
                                                         va_list            var_args);
+GDK_AVAILABLE_IN_ALL
 void         gtk_container_child_get_valist            (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *first_property_name,
                                                         va_list            var_args);
+GDK_AVAILABLE_IN_ALL
 void        gtk_container_child_set_property           (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *property_name,
                                                         const GValue      *value);
+GDK_AVAILABLE_IN_ALL
 void        gtk_container_child_get_property           (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *property_name,
@@ -213,12 +246,15 @@ void gtk_container_child_notify (GtkContainer *container,
     G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
 
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_forall                (GtkContainer *container,
                                              GtkCallback   callback,
                                              gpointer      callback_data);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);
 
diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index db0222b..fdcd76c 100644
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -42,6 +42,7 @@ typedef enum
   GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE
 } GtkCssProviderError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark gtk_css_provider_error_quark (void);
 
 typedef struct _GtkCssProvider GtkCssProvider;
@@ -68,26 +69,33 @@ struct _GtkCssProviderClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_css_provider_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkCssProvider * gtk_css_provider_new (void);
 
 GDK_AVAILABLE_IN_3_2
 char *           gtk_css_provider_to_string      (GtkCssProvider  *provider);
 
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
                                                   const gchar     *data,
                                                   gssize           length,
                                                   GError         **error);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
                                                   GFile           *file,
                                                   GError         **error);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
                                                   const gchar     *path,
                                                   GError         **error);
 
+GDK_AVAILABLE_IN_ALL
 GtkCssProvider * gtk_css_provider_get_default (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkCssProvider * gtk_css_provider_get_named (const gchar *name,
                                              const gchar *variant);
 
diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h
index 9fcaff8..063df8e 100644
--- a/gtk/gtkcustompaperunixdialog.h
+++ b/gtk/gtkcustompaperunixdialog.h
@@ -52,6 +52,7 @@ struct _GtkCustomPaperUnixDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_custom_paper_unix_dialog_get_type           (void) G_GNUC_CONST;
 GtkWidget *       _gtk_custom_paper_unix_dialog_new                (GtkWindow   *parent,
                                                                   const gchar *title);
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index f9e01e5..d4ee6f0 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -30,6 +30,7 @@
 #endif
 
 #include <glib.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -63,7 +64,9 @@ typedef enum {
 
 #endif /* G_ENABLE_DEBUG */
 
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_debug_flags (void);
+GDK_AVAILABLE_IN_ALL
 void  gtk_set_debug_flags  (guint flags);
 
 G_END_DECLS
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 1d941c7..641b450 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -129,51 +129,68 @@ struct _GtkDialogClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_dialog_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_new      (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_new_with_buttons (const gchar     *title,
                                         GtkWindow       *parent,
                                         GtkDialogFlags   flags,
                                         const gchar     *first_button_text,
                                         ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_dialog_add_action_widget (GtkDialog   *dialog,
                                          GtkWidget   *child,
                                          gint         response_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_add_button        (GtkDialog   *dialog,
                                          const gchar *button_text,
                                          gint         response_id);
+GDK_AVAILABLE_IN_ALL
 void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
                                          const gchar *first_button_text,
                                          ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void gtk_dialog_set_response_sensitive (GtkDialog *dialog,
                                         gint       response_id,
                                         gboolean   setting);
+GDK_AVAILABLE_IN_ALL
 void gtk_dialog_set_default_response   (GtkDialog *dialog,
                                         gint       response_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_get_widget_for_response (GtkDialog *dialog,
                                                gint       response_id);
+GDK_AVAILABLE_IN_ALL
 gint gtk_dialog_get_response_for_widget (GtkDialog *dialog,
                                          GtkWidget *widget);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_alternative_dialog_button_order (GdkScreen *screen);
+GDK_AVAILABLE_IN_ALL
 void     gtk_dialog_set_alternative_button_order (GtkDialog *dialog,
                                                   gint       first_response_id,
                                                   ...);
+GDK_AVAILABLE_IN_ALL
 void     gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
                                                              gint       n_params,
                                                              gint      *new_order);
 
 /* Emit response signal */
+GDK_AVAILABLE_IN_ALL
 void gtk_dialog_response           (GtkDialog *dialog,
                                     gint       response_id);
 
 /* Returns response_id */
+GDK_AVAILABLE_IN_ALL
 gint gtk_dialog_run                (GtkDialog *dialog);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_dialog_get_action_area  (GtkDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_dialog_get_content_area (GtkDialog *dialog);
 
 G_END_DECLS
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 3a2b4c2..408320b 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -89,68 +89,94 @@ typedef enum {
 
 /* Destination side */
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_get_data (GtkWidget      *widget,
                        GdkDragContext *context,
                        GdkAtom         target,
                        guint32         time_);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_finish   (GdkDragContext *context,
                        gboolean        success,
                        gboolean        del,
                        guint32         time_);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_highlight   (GtkWidget  *widget);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_unhighlight (GtkWidget  *widget);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_dest_set   (GtkWidget            *widget,
                          GtkDestDefaults       flags,
                          const GtkTargetEntry *targets,
                          gint                  n_targets,
                          GdkDragAction         actions);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_dest_set_proxy (GtkWidget      *widget,
                              GdkWindow      *proxy_window,
                              GdkDragProtocol protocol,
                              gboolean        use_coordinates);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_dest_unset (GtkWidget          *widget);
 
+GDK_AVAILABLE_IN_ALL
 GdkAtom        gtk_drag_dest_find_target     (GtkWidget      *widget,
                                               GdkDragContext *context,
                                               GtkTargetList  *target_list);
+GDK_AVAILABLE_IN_ALL
 GtkTargetList* gtk_drag_dest_get_target_list (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_dest_set_target_list (GtkWidget      *widget,
                                               GtkTargetList  *target_list);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_dest_add_text_targets  (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_dest_add_image_targets (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_dest_add_uri_targets   (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_dest_set_track_motion  (GtkWidget *widget,
                                                gboolean   track_motion);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_drag_dest_get_track_motion  (GtkWidget *widget);
 
 /* Source side */
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_set  (GtkWidget            *widget,
                           GdkModifierType       start_button_mask,
                           const GtkTargetEntry *targets,
                           gint                  n_targets,
                           GdkDragAction         actions);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_unset (GtkWidget        *widget);
 
+GDK_AVAILABLE_IN_ALL
 GtkTargetList* gtk_drag_source_get_target_list (GtkWidget     *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_source_set_target_list (GtkWidget     *widget,
                                                 GtkTargetList *target_list);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_source_add_text_targets  (GtkWidget     *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_source_add_image_targets (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 void           gtk_drag_source_add_uri_targets   (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_set_icon_pixbuf  (GtkWidget       *widget,
                                       GdkPixbuf       *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_set_icon_stock   (GtkWidget       *widget,
                                       const gchar     *stock_id);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_set_icon_name    (GtkWidget       *widget,
                                       const gchar     *icon_name);
 GDK_AVAILABLE_IN_3_2
@@ -161,6 +187,7 @@ void gtk_drag_source_set_icon_gicon   (GtkWidget       *widget,
  * as a GtkTargetList
  */
 
+GDK_AVAILABLE_IN_ALL
 GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
                                GtkTargetList     *targets,
                                GdkDragAction      actions,
@@ -169,20 +196,25 @@ GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
 
 /* Set the image being dragged around
  */
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_widget (GdkDragContext *context,
                               GtkWidget      *widget,
                               gint            hot_x,
                               gint            hot_y);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_pixbuf (GdkDragContext *context,
                               GdkPixbuf      *pixbuf,
                               gint            hot_x,
                               gint            hot_y);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_stock  (GdkDragContext *context,
                               const gchar    *stock_id,
                               gint            hot_x,
                               gint            hot_y);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_surface(GdkDragContext *context,
                               cairo_surface_t *surface);
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_name   (GdkDragContext *context,
                               const gchar    *icon_name,
                               gint            hot_x,
@@ -193,8 +225,10 @@ void gtk_drag_set_icon_gicon  (GdkDragContext *context,
                               gint            hot_x,
                               gint            hot_y);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_drag_set_icon_default (GdkDragContext    *context);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_drag_check_threshold (GtkWidget *widget,
                                   gint       start_x,
                                   gint       start_y,
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index b617fda..60cda59 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -66,7 +66,9 @@ struct _GtkDrawingAreaClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_drawing_area_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_drawing_area_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 0e2441c..88d1489 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -80,32 +80,46 @@ struct _GtkEditableInterface
   gint (* get_position)             (GtkEditable    *editable);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType    gtk_editable_get_type             (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_select_region        (GtkEditable *editable,
                                            gint         start_pos,
                                            gint         end_pos);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
                                            gint        *start_pos,
                                            gint        *end_pos);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_insert_text          (GtkEditable *editable,
                                            const gchar *new_text,
                                            gint         new_text_length,
                                            gint        *position);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_delete_text          (GtkEditable *editable,
                                            gint         start_pos,
                                            gint         end_pos);
+GDK_AVAILABLE_IN_ALL
 gchar*   gtk_editable_get_chars            (GtkEditable *editable,
                                            gint         start_pos,
                                            gint         end_pos);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_cut_clipboard        (GtkEditable *editable);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_copy_clipboard       (GtkEditable *editable);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_paste_clipboard      (GtkEditable *editable);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_delete_selection     (GtkEditable *editable);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_set_position         (GtkEditable *editable,
                                            gint         position);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_editable_get_position         (GtkEditable *editable);
+GDK_AVAILABLE_IN_ALL
 void     gtk_editable_set_editable         (GtkEditable *editable,
                                            gboolean     is_editable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_editable_get_editable         (GtkEditable *editable);
 
 G_END_DECLS
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index db80b9e..3bbc5af 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -127,28 +127,41 @@ struct _GtkEntryClass
   void (*_gtk_reserved7)      (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_entry_get_type                  (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_entry_new                       (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_entry_new_with_buffer            (GtkEntryBuffer *buffer);
 
+GDK_AVAILABLE_IN_ALL
 GtkEntryBuffer* gtk_entry_get_buffer            (GtkEntry       *entry);
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_buffer                 (GtkEntry       *entry,
                                                  GtkEntryBuffer *buffer);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_get_text_area              (GtkEntry       *entry,
                                                  GdkRectangle   *text_area);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_visibility            (GtkEntry      *entry,
                                                 gboolean       visible);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_entry_get_visibility             (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_invisible_char         (GtkEntry      *entry,
                                                  gunichar       ch);
+GDK_AVAILABLE_IN_ALL
 gunichar   gtk_entry_get_invisible_char         (GtkEntry      *entry);
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_unset_invisible_char       (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_has_frame              (GtkEntry      *entry,
                                                  gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
 
 GDK_DEPRECATED_IN_3_4
@@ -157,64 +170,90 @@ void             gtk_entry_set_inner_border     (GtkEntry        *entry,
 GDK_DEPRECATED_IN_3_4
 const GtkBorder* gtk_entry_get_inner_border     (GtkEntry        *entry);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_overwrite_mode         (GtkEntry      *entry,
                                                  gboolean       overwrite);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_entry_get_overwrite_mode         (GtkEntry      *entry);
 
 /* text is truncated if needed */
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_max_length            (GtkEntry      *entry,
                                                 gint           max);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_entry_get_max_length             (GtkEntry      *entry);
+GDK_AVAILABLE_IN_ALL
 guint16    gtk_entry_get_text_length            (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_activates_default      (GtkEntry      *entry,
                                                  gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_entry_get_activates_default      (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_width_chars            (GtkEntry      *entry,
                                                  gint           n_chars);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_entry_get_width_chars            (GtkEntry      *entry);
 
 /* Somewhat more convenient than the GtkEditable generic functions
  */
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_text                   (GtkEntry      *entry,
                                                  const gchar   *text);
 /* returns a reference to the text */
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_entry_get_text        (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
                                                  gint          *x,
                                                  gint          *y);
+GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_alignment              (GtkEntry      *entry,
                                                  gfloat         xalign);
+GDK_AVAILABLE_IN_ALL
 gfloat     gtk_entry_get_alignment              (GtkEntry      *entry);
 
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_set_completion (GtkEntry           *entry,
                                               GtkEntryCompletion *completion);
+GDK_AVAILABLE_IN_ALL
 GtkEntryCompletion *gtk_entry_get_completion (GtkEntry           *entry);
 
+GDK_AVAILABLE_IN_ALL
 gint       gtk_entry_layout_index_to_text_index (GtkEntry      *entry,
                                                  gint           layout_index);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_entry_text_index_to_layout_index (GtkEntry      *entry,
                                                  gint           text_index);
 
 /* For scrolling cursor appropriately
  */
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_cursor_hadjustment (GtkEntry      *entry,
                                                  GtkAdjustment *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment* gtk_entry_get_cursor_hadjustment (GtkEntry      *entry);
 
 /* Progress API
  */
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_progress_fraction   (GtkEntry     *entry,
                                                   gdouble       fraction);
+GDK_AVAILABLE_IN_ALL
 gdouble        gtk_entry_get_progress_fraction   (GtkEntry     *entry);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_progress_pulse_step (GtkEntry     *entry,
                                                   gdouble       fraction);
+GDK_AVAILABLE_IN_ALL
 gdouble        gtk_entry_get_progress_pulse_step (GtkEntry     *entry);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_progress_pulse          (GtkEntry     *entry);
 GDK_AVAILABLE_IN_3_2
 const gchar*   gtk_entry_get_placeholder_text    (GtkEntry             *entry);
@@ -223,62 +262,85 @@ void           gtk_entry_set_placeholder_text    (GtkEntry             *entry,
                                                   const gchar          *text);
 /* Setting and managing icons
  */
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_icon_from_pixbuf            (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          GdkPixbuf            *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_icon_from_stock             (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          const gchar          *stock_id);
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_icon_from_icon_name         (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          const gchar          *icon_name);
+GDK_AVAILABLE_IN_ALL
 void           gtk_entry_set_icon_from_gicon             (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          GIcon                *icon);
+GDK_AVAILABLE_IN_ALL
 GtkImageType gtk_entry_get_icon_storage_type             (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf*   gtk_entry_get_icon_pixbuf                   (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_entry_get_icon_stock                    (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_entry_get_icon_name                     (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 GIcon*       gtk_entry_get_icon_gicon                    (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_activatable              (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          gboolean              activatable);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_entry_get_icon_activatable              (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_sensitive                (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          gboolean              sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_entry_get_icon_sensitive                (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 gint         gtk_entry_get_icon_at_pos                   (GtkEntry             *entry,
                                                          gint                  x,
                                                          gint                  y);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_tooltip_text             (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          const gchar          *tooltip);
+GDK_AVAILABLE_IN_ALL
 gchar *      gtk_entry_get_icon_tooltip_text             (GtkEntry             *entry,
                                                           GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_tooltip_markup           (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          const gchar          *tooltip);
+GDK_AVAILABLE_IN_ALL
 gchar *      gtk_entry_get_icon_tooltip_markup           (GtkEntry             *entry,
                                                           GtkEntryIconPosition  icon_pos);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_drag_source              (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
                                                          GtkTargetList        *target_list,
                                                          GdkDragAction         actions);
+GDK_AVAILABLE_IN_ALL
 gint         gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);
+GDK_AVAILABLE_IN_ALL
 void         gtk_entry_get_icon_area                     (GtkEntry             *entry,
                                                           GtkEntryIconPosition  icon_pos,
                                                           GdkRectangle         *icon_area);
 
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_entry_im_context_filter_keypress         (GtkEntry             *entry,
                                                           GdkEventKey          *event);
+GDK_AVAILABLE_IN_ALL
 void        gtk_entry_reset_im_context                   (GtkEntry             *entry);
 
 GDK_AVAILABLE_IN_3_6
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 8cf5a60..b2773db 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -23,6 +23,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -90,40 +91,52 @@ struct _GtkEntryBufferClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                     gtk_entry_buffer_get_type               (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkEntryBuffer*           gtk_entry_buffer_new                    (const gchar     *initial_chars,
                                                                    gint             n_initial_chars);
 
+GDK_AVAILABLE_IN_ALL
 gsize                     gtk_entry_buffer_get_bytes              (GtkEntryBuffer  *buffer);
 
+GDK_AVAILABLE_IN_ALL
 guint                     gtk_entry_buffer_get_length             (GtkEntryBuffer  *buffer);
 
+GDK_AVAILABLE_IN_ALL
 const gchar*              gtk_entry_buffer_get_text               (GtkEntryBuffer  *buffer);
 
+GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_set_text               (GtkEntryBuffer  *buffer,
                                                                    const gchar     *chars,
                                                                    gint             n_chars);
 
+GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_set_max_length         (GtkEntryBuffer  *buffer,
                                                                    gint             max_length);
 
+GDK_AVAILABLE_IN_ALL
 gint                      gtk_entry_buffer_get_max_length         (GtkEntryBuffer  *buffer);
 
+GDK_AVAILABLE_IN_ALL
 guint                     gtk_entry_buffer_insert_text            (GtkEntryBuffer  *buffer,
                                                                    guint            position,
                                                                    const gchar     *chars,
                                                                    gint             n_chars);
 
+GDK_AVAILABLE_IN_ALL
 guint                     gtk_entry_buffer_delete_text            (GtkEntryBuffer  *buffer,
                                                                    guint            position,
                                                                    gint             n_chars);
 
+GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_emit_inserted_text     (GtkEntryBuffer  *buffer,
                                                                    guint            position,
                                                                    const gchar     *chars,
                                                                    guint            n_chars);
 
+GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_emit_deleted_text      (GtkEntryBuffer  *buffer,
                                                                    guint            position,
                                                                    guint            n_chars);
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index b0f19c8..a3fe584 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -22,6 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcellarea.h>
@@ -95,58 +96,85 @@ struct _GtkEntryCompletionClass
 };
 
 /* core */
+GDK_AVAILABLE_IN_ALL
 GType               gtk_entry_completion_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkEntryCompletion *gtk_entry_completion_new                    (void);
+GDK_AVAILABLE_IN_ALL
 GtkEntryCompletion *gtk_entry_completion_new_with_area          (GtkCellArea                 *area);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget          *gtk_entry_completion_get_entry              (GtkEntryCompletion          *completion);
 
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_model              (GtkEntryCompletion          *completion,
                                                                  GtkTreeModel                *model);
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel       *gtk_entry_completion_get_model              (GtkEntryCompletion          *completion);
 
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_match_func         (GtkEntryCompletion          *completion,
                                                                  GtkEntryCompletionMatchFunc  func,
                                                                  gpointer                     func_data,
                                                                  GDestroyNotify               func_notify);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion          *completion,
                                                                  gint                         length);
+GDK_AVAILABLE_IN_ALL
 gint                gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion          *completion);
 GDK_AVAILABLE_IN_3_4
 gchar *             gtk_entry_completion_compute_prefix         (GtkEntryCompletion          *completion,
                                                                  const char                  *key);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_complete               (GtkEntryCompletion          *completion);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_insert_prefix          (GtkEntryCompletion          *completion);
 
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_insert_action_text     (GtkEntryCompletion          *completion,
                                                                  gint                         index_,
                                                                  const gchar                 *text);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_insert_action_markup   (GtkEntryCompletion          *completion,
                                                                  gint                         index_,
                                                                  const gchar                 *markup);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_delete_action          (GtkEntryCompletion          *completion,
                                                                  gint                         index_);
 
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_inline_completion  (GtkEntryCompletion          *completion,
                                                                  gboolean                     
inline_completion);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_entry_completion_get_inline_completion  (GtkEntryCompletion          *completion);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_inline_selection  (GtkEntryCompletion          *completion,
                                                                  gboolean                     
inline_selection);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_entry_completion_get_inline_selection  (GtkEntryCompletion          *completion);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_popup_completion   (GtkEntryCompletion          *completion,
                                                                  gboolean                     
popup_completion);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_entry_completion_get_popup_completion   (GtkEntryCompletion          *completion);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_popup_set_width    (GtkEntryCompletion          *completion,
                                                                  gboolean                     
popup_set_width);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_entry_completion_get_popup_set_width    (GtkEntryCompletion          *completion);
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_popup_single_match (GtkEntryCompletion          *completion,
                                                                  gboolean                     
popup_single_match);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_entry_completion_get_popup_single_match (GtkEntryCompletion          *completion);
 
+GDK_AVAILABLE_IN_ALL
 const gchar         *gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion);
 /* convenience */
+GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_text_column        (GtkEntryCompletion          *completion,
                                                                  gint                         column);
+GDK_AVAILABLE_IN_ALL
 gint                gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
 
 G_END_DECLS
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 36c2a16..3548da0 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -65,12 +65,18 @@ struct _GtkEventBoxClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_event_box_get_type           (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_event_box_new                (void);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_event_box_get_visible_window (GtkEventBox *event_box);
+GDK_AVAILABLE_IN_ALL
 void       gtk_event_box_set_visible_window (GtkEventBox *event_box,
                                              gboolean     visible_window);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_event_box_get_above_child    (GtkEventBox *event_box);
+GDK_AVAILABLE_IN_ALL
 void       gtk_event_box_set_above_child    (GtkEventBox *event_box,
                                              gboolean     above_child);
 
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 2f9c7b1..a70f844 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -64,37 +64,54 @@ struct _GtkExpanderClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_expander_get_type            (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_expander_new                 (const gchar *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_expander_new_with_mnemonic   (const gchar *label);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_expanded        (GtkExpander *expander,
                                                         gboolean     expanded);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_expander_get_expanded        (GtkExpander *expander);
 
 /* Spacing between the expander/label and the child */
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_spacing         (GtkExpander *expander,
                                                         gint         spacing);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_expander_get_spacing         (GtkExpander *expander);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_label           (GtkExpander *expander,
                                                         const gchar *label);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_expander_get_label           (GtkExpander *expander);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_use_underline   (GtkExpander *expander,
                                                         gboolean     use_underline);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_expander_get_use_underline   (GtkExpander *expander);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_use_markup      (GtkExpander *expander,
                                                         gboolean    use_markup);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_expander_get_use_markup      (GtkExpander *expander);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_label_widget    (GtkExpander *expander,
                                                        GtkWidget   *label_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_expander_get_label_widget    (GtkExpander *expander);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_expander_set_label_fill      (GtkExpander *expander,
                                                        gboolean     label_fill);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_expander_get_label_fill      (GtkExpander *expander);
 GDK_AVAILABLE_IN_3_2
 void                  gtk_expander_set_resize_toplevel (GtkExpander *expander,
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 6ff9f08..0705737 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -83,6 +83,7 @@ typedef enum
   GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
 } GtkFileChooserConfirmation;
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
 
 /* GError enumeration for GtkFileChooser */
@@ -111,135 +112,194 @@ typedef enum {
   GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME
 } GtkFileChooserError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark gtk_file_chooser_error_quark (void);
 
 /* Configuration
  */
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_action          (GtkFileChooser       *chooser,
                                                           GtkFileChooserAction  action);
+GDK_AVAILABLE_IN_ALL
 GtkFileChooserAction gtk_file_chooser_get_action          (GtkFileChooser       *chooser);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_local_only      (GtkFileChooser       *chooser,
                                                           gboolean              local_only);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_file_chooser_get_local_only      (GtkFileChooser       *chooser);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_select_multiple (GtkFileChooser       *chooser,
                                                           gboolean              select_multiple);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_file_chooser_get_select_multiple (GtkFileChooser       *chooser);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_show_hidden     (GtkFileChooser       *chooser,
                                                           gboolean              show_hidden);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_file_chooser_get_show_hidden     (GtkFileChooser       *chooser);
 
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_do_overwrite_confirmation (GtkFileChooser *chooser,
                                                                     gboolean        
do_overwrite_confirmation);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_file_chooser_get_do_overwrite_confirmation (GtkFileChooser *chooser);
 
+GDK_AVAILABLE_IN_ALL
 void                 gtk_file_chooser_set_create_folders  (GtkFileChooser       *chooser,
                                                          gboolean               create_folders);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_file_chooser_get_create_folders (GtkFileChooser *chooser);
 
 /* Suggested name for the Save-type actions
  */
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_set_current_name   (GtkFileChooser *chooser,
                                              const gchar    *name);
 
 /* Filename manipulation
  */
+GDK_AVAILABLE_IN_ALL
 gchar *  gtk_file_chooser_get_filename       (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_filename       (GtkFileChooser *chooser,
                                              const char     *filename);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_select_filename    (GtkFileChooser *chooser,
                                              const char     *filename);
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_unselect_filename  (GtkFileChooser *chooser,
                                              const char     *filename);
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_select_all         (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_unselect_all       (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 GSList * gtk_file_chooser_get_filenames      (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
                                              const gchar    *filename);
+GDK_AVAILABLE_IN_ALL
 gchar *  gtk_file_chooser_get_current_folder (GtkFileChooser *chooser);
 
 
 /* URI manipulation
  */
+GDK_AVAILABLE_IN_ALL
 gchar *  gtk_file_chooser_get_uri                (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_uri                (GtkFileChooser *chooser,
                                                  const char     *uri);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_select_uri             (GtkFileChooser *chooser,
                                                  const char     *uri);
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_unselect_uri           (GtkFileChooser *chooser,
                                                  const char     *uri);
+GDK_AVAILABLE_IN_ALL
 GSList * gtk_file_chooser_get_uris               (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_current_folder_uri (GtkFileChooser *chooser,
                                                  const gchar    *uri);
+GDK_AVAILABLE_IN_ALL
 gchar *  gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser);
 
 /* GFile manipulation */
+GDK_AVAILABLE_IN_ALL
 GFile *  gtk_file_chooser_get_file                (GtkFileChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_file                (GtkFileChooser  *chooser,
                                                    GFile           *file,
                                                    GError         **error);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_select_file             (GtkFileChooser  *chooser,
                                                    GFile           *file,
                                                    GError         **error);
+GDK_AVAILABLE_IN_ALL
 void     gtk_file_chooser_unselect_file           (GtkFileChooser  *chooser,
                                                    GFile           *file);
+GDK_AVAILABLE_IN_ALL
 GSList * gtk_file_chooser_get_files               (GtkFileChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_set_current_folder_file (GtkFileChooser  *chooser,
                                                    GFile           *file,
                                                    GError         **error);
+GDK_AVAILABLE_IN_ALL
 GFile *  gtk_file_chooser_get_current_folder_file (GtkFileChooser  *chooser);
 
 /* Preview widget
  */
+GDK_AVAILABLE_IN_ALL
 void       gtk_file_chooser_set_preview_widget        (GtkFileChooser *chooser,
                                                       GtkWidget      *preview_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_file_chooser_get_preview_widget        (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 void       gtk_file_chooser_set_preview_widget_active (GtkFileChooser *chooser,
                                                       gboolean        active);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_file_chooser_get_preview_widget_active (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 void       gtk_file_chooser_set_use_preview_label     (GtkFileChooser *chooser,
                                                       gboolean        use_label);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_file_chooser_get_use_preview_label     (GtkFileChooser *chooser);
 
+GDK_AVAILABLE_IN_ALL
 char  *gtk_file_chooser_get_preview_filename (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 char  *gtk_file_chooser_get_preview_uri      (GtkFileChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 GFile *gtk_file_chooser_get_preview_file     (GtkFileChooser *chooser);
 
 /* Extra widget
  */
+GDK_AVAILABLE_IN_ALL
 void       gtk_file_chooser_set_extra_widget (GtkFileChooser *chooser,
                                              GtkWidget      *extra_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_file_chooser_get_extra_widget (GtkFileChooser *chooser);
 
 /* List of user selectable filters
  */
+GDK_AVAILABLE_IN_ALL
 void    gtk_file_chooser_add_filter    (GtkFileChooser *chooser,
                                        GtkFileFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 void    gtk_file_chooser_remove_filter (GtkFileChooser *chooser,
                                        GtkFileFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 GSList *gtk_file_chooser_list_filters  (GtkFileChooser *chooser);
 
 /* Current filter
  */
+GDK_AVAILABLE_IN_ALL
 void           gtk_file_chooser_set_filter (GtkFileChooser *chooser,
                                           GtkFileFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 GtkFileFilter *gtk_file_chooser_get_filter (GtkFileChooser *chooser);
 
 /* Per-application shortcut folders */
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_add_shortcut_folder    (GtkFileChooser *chooser,
                                                  const char     *folder,
                                                  GError        **error);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
                                                  const char     *folder,
                                                  GError        **error);
+GDK_AVAILABLE_IN_ALL
 GSList *gtk_file_chooser_list_shortcut_folders   (GtkFileChooser *chooser);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_add_shortcut_folder_uri    (GtkFileChooser *chooser,
                                                      const char     *uri,
                                                      GError        **error);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_file_chooser_remove_shortcut_folder_uri (GtkFileChooser *chooser,
                                                      const char     *uri,
                                                      GError        **error);
+GDK_AVAILABLE_IN_ALL
 GSList *gtk_file_chooser_list_shortcut_folder_uris   (GtkFileChooser *chooser);
 
 G_END_DECLS
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index 2caadf3..f8e1606 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -62,17 +62,26 @@ struct _GtkFileChooserButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
                                                                GtkFileChooserAction  action);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
                                                                const gchar          *title);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_file_chooser_button_set_width_chars  (GtkFileChooserButton *button,
                                                                gint                  n_chars);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_file_chooser_button_set_focus_on_click (GtkFileChooserButton *button,
                                                                   gboolean              focus_on_click);
 
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 6ce77e8..8e3612e 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -57,7 +57,9 @@ struct _GtkFileChooserDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
                                                     GtkWindow            *parent,
                                                     GtkFileChooserAction  action,
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 00b55cb..5d9d898 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -57,7 +57,9 @@ struct _GtkFileChooserWidgetClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
 
 G_END_DECLS
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index ab952de..3179064 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -24,6 +24,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -89,25 +90,35 @@ struct _GtkFileFilterInfo
   const gchar *mime_type;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_file_filter_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkFileFilter *       gtk_file_filter_new      (void);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,
                                                const gchar   *name);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_file_filter_get_name (GtkFileFilter *filter);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
                                         const gchar        *mime_type);
+GDK_AVAILABLE_IN_ALL
 void gtk_file_filter_add_pattern        (GtkFileFilter      *filter,
                                         const gchar        *pattern);
+GDK_AVAILABLE_IN_ALL
 void gtk_file_filter_add_pixbuf_formats (GtkFileFilter      *filter);
+GDK_AVAILABLE_IN_ALL
 void gtk_file_filter_add_custom         (GtkFileFilter      *filter,
                                         GtkFileFilterFlags  needed,
                                         GtkFileFilterFunc   func,
                                         gpointer            data,
                                         GDestroyNotify      notify);
 
+GDK_AVAILABLE_IN_ALL
 GtkFileFilterFlags gtk_file_filter_get_needed (GtkFileFilter           *filter);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_file_filter_filter     (GtkFileFilter           *filter,
                                               const GtkFileFilterInfo *filter_info);
 
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index c7746bd..7e2a07e 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -74,12 +74,16 @@ struct _GtkFixedChild
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_fixed_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_fixed_new               (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_fixed_put               (GtkFixed       *fixed,
                                         GtkWidget      *widget,
                                         gint            x,
                                         gint            y);
+GDK_AVAILABLE_IN_ALL
 void       gtk_fixed_move              (GtkFixed       *fixed,
                                         GtkWidget      *widget,
                                         gint            x,
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index e511281..2a7dae6 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -70,26 +70,41 @@ struct _GtkFontButtonClass {
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_font_button_new            (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_font_button_get_title      (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_title      (GtkFontButton *font_button,
                                                       const gchar   *title);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_use_font   (GtkFontButton *font_button,
                                                       gboolean       use_font);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_font_button_get_font_name  (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
                                                       const gchar   *fontname);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_show_style (GtkFontButton *font_button,
                                                       gboolean       show_style);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_font_button_get_show_size  (GtkFontButton *font_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_font_button_set_show_size  (GtkFontButton *font_button,
                                                       gboolean       show_size);
 
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index ffc90c9..e8ac219 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -69,24 +69,34 @@ struct _GtkFrameClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_frame_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_frame_new              (const gchar   *label);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_frame_set_label (GtkFrame    *frame,
                                    const gchar *label);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_frame_get_label (GtkFrame    *frame);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
                                       GtkWidget     *label_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_frame_get_label_widget (GtkFrame      *frame);
+GDK_AVAILABLE_IN_ALL
 void       gtk_frame_set_label_align  (GtkFrame      *frame,
                                       gfloat         xalign,
                                       gfloat         yalign);
+GDK_AVAILABLE_IN_ALL
 void       gtk_frame_get_label_align  (GtkFrame      *frame,
                                       gfloat        *xalign,
                                       gfloat        *yalign);
+GDK_AVAILABLE_IN_ALL
 void       gtk_frame_set_shadow_type  (GtkFrame      *frame,
                                       GtkShadowType  type);
+GDK_AVAILABLE_IN_ALL
 GtkShadowType gtk_frame_get_shadow_type (GtkFrame    *frame);
 
 
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 9ba21e5..4266eda 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -63,14 +63,18 @@ struct _GtkGridClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_grid_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_grid_new                    (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_attach                 (GtkGrid         *grid,
                                             GtkWidget       *child,
                                             gint             left,
                                             gint             top,
                                             gint             width,
                                             gint             height);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_attach_next_to         (GtkGrid         *grid,
                                             GtkWidget       *child,
                                             GtkWidget       *sibling,
@@ -97,17 +101,25 @@ GDK_AVAILABLE_IN_3_2
 void       gtk_grid_insert_next_to         (GtkGrid         *grid,
                                             GtkWidget       *sibling,
                                             GtkPositionType  side);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_row_homogeneous    (GtkGrid         *grid,
                                             gboolean         homogeneous);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_grid_get_row_homogeneous    (GtkGrid         *grid);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_row_spacing        (GtkGrid         *grid,
                                             guint            spacing);
+GDK_AVAILABLE_IN_ALL
 guint      gtk_grid_get_row_spacing        (GtkGrid         *grid);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_column_homogeneous (GtkGrid         *grid,
                                             gboolean         homogeneous);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_grid_get_column_homogeneous (GtkGrid         *grid);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_column_spacing     (GtkGrid         *grid,
                                             guint            spacing);
+GDK_AVAILABLE_IN_ALL
 guint      gtk_grid_get_column_spacing     (GtkGrid         *grid);
 GDK_AVAILABLE_IN_3_10
 void       gtk_grid_set_row_baseline_position (GtkGrid      *grid,
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index fabf928..8aeebdd 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -68,18 +68,25 @@ struct _GtkIconFactoryClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkIconFactory* gtk_icon_factory_new      (void);
+GDK_AVAILABLE_IN_ALL
 void            gtk_icon_factory_add      (GtkIconFactory *factory,
                                            const gchar    *stock_id,
                                            GtkIconSet     *icon_set);
+GDK_AVAILABLE_IN_ALL
 GtkIconSet*     gtk_icon_factory_lookup   (GtkIconFactory *factory,
                                            const gchar    *stock_id);
 
 /* Manage the default icon factory stack */
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_icon_factory_add_default     (GtkIconFactory  *factory);
+GDK_AVAILABLE_IN_ALL
 void        gtk_icon_factory_remove_default  (GtkIconFactory  *factory);
+GDK_AVAILABLE_IN_ALL
 GtkIconSet* gtk_icon_factory_lookup_default  (const gchar     *stock_id);
 
 /* Get preferred real size from registered semantic size.  Note that
@@ -94,31 +101,43 @@ GtkIconSet* gtk_icon_factory_lookup_default  (const gchar     *stock_id);
  */
 
 #ifndef GDK_MULTIHEAD_SAFE
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_icon_size_lookup              (GtkIconSize  size,
                                            gint        *width,
                                            gint        *height);
 #endif /* GDK_MULTIHEAD_SAFE */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings,
                                            GtkIconSize  size,
                                            gint        *width,
                                            gint        *height);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSize           gtk_icon_size_register       (const gchar *name,
                                                     gint         width,
                                                     gint         height);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_icon_size_register_alias (const gchar *alias,
                                                     GtkIconSize  target);
+GDK_AVAILABLE_IN_ALL
 GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
+GDK_AVAILABLE_IN_ALL
 const gchar*          gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkIconSet* gtk_icon_set_new             (void);
+GDK_AVAILABLE_IN_ALL
 GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSet* gtk_icon_set_ref             (GtkIconSet      *icon_set);
+GDK_AVAILABLE_IN_ALL
 void        gtk_icon_set_unref           (GtkIconSet      *icon_set);
+GDK_AVAILABLE_IN_ALL
 GtkIconSet* gtk_icon_set_copy            (GtkIconSet      *icon_set);
 
 GDK_DEPRECATED_IN_3_0_FOR(gtk_icon_set_render_icon_pixbuf)
@@ -130,46 +149,70 @@ GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
                                           GtkWidget       *widget,
                                           const gchar     *detail);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
                                           const GtkIconSource *source);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
                                           GtkIconSize        **sizes,
                                           gint                *n_sizes);
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkIconSource* gtk_icon_source_new                      (void);
+GDK_AVAILABLE_IN_ALL
 GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_source_free                     (GtkIconSource       *source);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_source_set_filename             (GtkIconSource       *source,
                                                          const gchar         *filename);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_source_set_icon_name            (GtkIconSource       *source,
                                                          const gchar         *icon_name);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
                                                          GdkPixbuf           *pixbuf);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *    gtk_icon_source_get_filename             (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 const gchar *    gtk_icon_source_get_icon_name            (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf*       gtk_icon_source_get_pixbuf               (const GtkIconSource *source);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_state_wildcarded     (GtkIconSource       *source,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_size_wildcarded      (GtkIconSource       *source,
                                                            gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_source_get_size_wildcarded      (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_source_get_state_wildcarded     (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_source_get_direction_wildcarded (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_direction            (GtkIconSource       *source,
                                                            GtkTextDirection     direction);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_state                (GtkIconSource       *source,
                                                            GtkStateType         state);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_source_set_size                 (GtkIconSource       *source,
                                                            GtkIconSize          size);
+GDK_AVAILABLE_IN_ALL
 GtkTextDirection gtk_icon_source_get_direction            (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 GtkStateType     gtk_icon_source_get_state                (const GtkIconSource *source);
+GDK_AVAILABLE_IN_ALL
 GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *source);
 
 
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 50988d7..443457d 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -133,76 +133,104 @@ typedef enum {
   GTK_ICON_THEME_FAILED
 } GtkIconThemeError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark gtk_icon_theme_error_quark (void);
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_icon_theme_get_type              (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkIconTheme *gtk_icon_theme_new                   (void);
+GDK_AVAILABLE_IN_ALL
 GtkIconTheme *gtk_icon_theme_get_default           (void);
+GDK_AVAILABLE_IN_ALL
 GtkIconTheme *gtk_icon_theme_get_for_screen        (GdkScreen                   *screen);
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_set_screen            (GtkIconTheme                *icon_theme,
                                                    GdkScreen                   *screen);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_set_search_path       (GtkIconTheme                *icon_theme,
                                                    const gchar                 *path[],
                                                    gint                         n_elements);
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_get_search_path       (GtkIconTheme                *icon_theme,
                                                    gchar                      **path[],
                                                    gint                        *n_elements);
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_append_search_path    (GtkIconTheme                *icon_theme,
                                                    const gchar                 *path);
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_prepend_search_path   (GtkIconTheme                *icon_theme,
                                                    const gchar                 *path);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_set_custom_theme      (GtkIconTheme                *icon_theme,
                                                    const gchar                 *theme_name);
 
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_icon_theme_has_icon              (GtkIconTheme                *icon_theme,
                                                    const gchar                 *icon_name);
+GDK_AVAILABLE_IN_ALL
 gint         *gtk_icon_theme_get_icon_sizes        (GtkIconTheme                *icon_theme,
                                                    const gchar                 *icon_name);
+GDK_AVAILABLE_IN_ALL
 GtkIconInfo * gtk_icon_theme_lookup_icon           (GtkIconTheme                *icon_theme,
                                                    const gchar                 *icon_name,
                                                    gint                         size,
                                                    GtkIconLookupFlags           flags);
+GDK_AVAILABLE_IN_ALL
 GtkIconInfo * gtk_icon_theme_choose_icon           (GtkIconTheme                *icon_theme,
                                                    const gchar                 *icon_names[],
                                                    gint                         size,
                                                    GtkIconLookupFlags           flags);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *   gtk_icon_theme_load_icon             (GtkIconTheme                *icon_theme,
                                                    const gchar                 *icon_name,
                                                    gint                         size,
                                                    GtkIconLookupFlags           flags,
                                                    GError                     **error);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconInfo * gtk_icon_theme_lookup_by_gicon       (GtkIconTheme                *icon_theme,
                                                     GIcon                       *icon,
                                                     gint                         size,
                                                     GtkIconLookupFlags           flags);
 
+GDK_AVAILABLE_IN_ALL
 GList *       gtk_icon_theme_list_icons            (GtkIconTheme                *icon_theme,
                                                    const gchar                 *context);
+GDK_AVAILABLE_IN_ALL
 GList *       gtk_icon_theme_list_contexts         (GtkIconTheme                *icon_theme);
+GDK_AVAILABLE_IN_ALL
 char *        gtk_icon_theme_get_example_icon_name (GtkIconTheme                *icon_theme);
 
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_icon_theme_rescan_if_needed      (GtkIconTheme                *icon_theme);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_icon_theme_add_builtin_icon      (const gchar *icon_name,
                                                    gint         size,
                                                    GdkPixbuf   *pixbuf);
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_icon_info_get_type           (void) G_GNUC_CONST;
 GDK_DEPRECATED_IN_3_8_FOR(g_object_ref)
 GtkIconInfo *         gtk_icon_info_copy               (GtkIconInfo  *icon_info);
 GDK_DEPRECATED_IN_3_8_FOR(g_object_unref)
 void                  gtk_icon_info_free               (GtkIconInfo  *icon_info);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconInfo *         gtk_icon_info_new_for_pixbuf     (GtkIconTheme  *icon_theme,
                                                         GdkPixbuf     *pixbuf);
 
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_icon_info_get_base_size      (GtkIconInfo   *icon_info);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_icon_info_get_builtin_pixbuf (GtkIconInfo   *icon_info);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_icon_info_load_icon          (GtkIconInfo   *icon_info,
                                                        GError       **error);
 GDK_AVAILABLE_IN_3_8
@@ -214,6 +242,7 @@ GDK_AVAILABLE_IN_3_8
 GdkPixbuf *           gtk_icon_info_load_icon_finish  (GtkIconInfo          *icon_info,
                                                       GAsyncResult         *res,
                                                       GError              **error);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_icon_info_load_symbolic      (GtkIconInfo   *icon_info,
                                                         const GdkRGBA *fg,
                                                         const GdkRGBA *success_color,
@@ -235,6 +264,7 @@ GdkPixbuf *           gtk_icon_info_load_symbolic_finish (GtkIconInfo   *icon_in
                                                          GAsyncResult         *res,
                                                          gboolean      *was_symbolic,
                                                          GError       **error);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
                                                                GtkStyleContext  *context,
                                                                gboolean         *was_symbolic,
@@ -256,14 +286,18 @@ GdkPixbuf *           gtk_icon_info_load_symbolic_for_style  (GtkIconInfo   *ico
                                                               GtkStateType   state,
                                                               gboolean      *was_symbolic,
                                                               GError       **error);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_icon_info_set_raw_coordinates (GtkIconInfo  *icon_info,
                                                         gboolean      raw_coordinates);
 
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo    *icon_info,
                                                       GdkRectangle   *rectangle);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_icon_info_get_attach_points (GtkIconInfo    *icon_info,
                                                       GdkPoint      **points,
                                                       gint           *n_points);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
 
 /* Non-public methods */
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 2adcc64..4a2468c 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -109,57 +109,88 @@ struct _GtkIconViewClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_icon_view_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_icon_view_new_with_area     (GtkCellArea    *area);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_icon_view_new_with_model    (GtkTreeModel   *model);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_model         (GtkIconView    *icon_view,
                                                GtkTreeModel   *model);
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel * gtk_icon_view_get_model         (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_text_column   (GtkIconView    *icon_view,
                                                gint            column);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_text_column   (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_markup_column (GtkIconView    *icon_view,
                                                gint            column);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_markup_column (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_pixbuf_column (GtkIconView    *icon_view,
                                                gint            column);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_pixbuf_column (GtkIconView    *icon_view);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_orientation (GtkIconView    *icon_view,
                                                    GtkOrientation  orientation);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation gtk_icon_view_get_item_orientation (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_columns       (GtkIconView    *icon_view,
                                                gint            columns);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_columns       (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_width    (GtkIconView    *icon_view,
                                                gint            item_width);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_item_width    (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_spacing       (GtkIconView    *icon_view, 
                                                gint            spacing);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_spacing       (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_row_spacing   (GtkIconView    *icon_view, 
                                                gint            row_spacing);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_row_spacing   (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_column_spacing (GtkIconView    *icon_view, 
                                                gint            column_spacing);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_column_spacing (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_margin        (GtkIconView    *icon_view, 
                                                gint            margin);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_margin        (GtkIconView    *icon_view);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_padding  (GtkIconView    *icon_view, 
                                                gint            item_padding);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_icon_view_get_item_padding  (GtkIconView    *icon_view);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *  gtk_icon_view_get_path_at_pos   (GtkIconView     *icon_view,
                                                gint             x,
                                                gint             y);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_icon_view_get_item_at_pos   (GtkIconView     *icon_view,
                                                gint              x,
                                                gint              y,
                                                GtkTreePath     **path,
                                                GtkCellRenderer **cell);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_icon_view_get_visible_range (GtkIconView      *icon_view,
                                                GtkTreePath     **start_path,
                                                GtkTreePath     **end_path);
@@ -169,34 +200,49 @@ void           gtk_icon_view_set_activate_on_single_click (GtkIconView  *icon_vi
 GDK_AVAILABLE_IN_3_8
 gboolean       gtk_icon_view_get_activate_on_single_click (GtkIconView  *icon_view);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_selected_foreach   (GtkIconView            *icon_view,
                                                 GtkIconViewForeachFunc  func,
                                                 gpointer                data);
+GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_selection_mode (GtkIconView            *icon_view,
                                                 GtkSelectionMode        mode);
+GDK_AVAILABLE_IN_ALL
 GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView            *icon_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_select_path        (GtkIconView            *icon_view,
                                                   GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_unselect_path      (GtkIconView            *icon_view,
                                                   GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_view_path_is_selected   (GtkIconView            *icon_view,
                                                   GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_icon_view_get_item_row       (GtkIconView            *icon_view,
                                                    GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_icon_view_get_item_column    (GtkIconView            *icon_view,
                                                    GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 GList           *gtk_icon_view_get_selected_items (GtkIconView            *icon_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_select_all         (GtkIconView            *icon_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_unselect_all       (GtkIconView            *icon_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_item_activated     (GtkIconView            *icon_view,
                                                   GtkTreePath            *path);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_set_cursor         (GtkIconView            *icon_view,
                                                   GtkTreePath            *path,
                                                   GtkCellRenderer        *cell,
                                                   gboolean                start_editing);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_view_get_cursor         (GtkIconView            *icon_view,
                                                   GtkTreePath           **path,
                                                   GtkCellRenderer       **cell);
+GDK_AVAILABLE_IN_ALL
 void             gtk_icon_view_scroll_to_path     (GtkIconView            *icon_view,
                                                    GtkTreePath            *path,
                                                   gboolean                use_align,
@@ -204,37 +250,48 @@ void             gtk_icon_view_scroll_to_path     (GtkIconView            *icon_
                                                    gfloat                  col_align);
 
 /* Drag-and-Drop support */
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_enable_model_drag_source (GtkIconView              *icon_view,
                                                               GdkModifierType           start_button_mask,
                                                               const GtkTargetEntry     *targets,
                                                               gint                      n_targets,
                                                               GdkDragAction             actions);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_enable_model_drag_dest   (GtkIconView              *icon_view,
                                                               const GtkTargetEntry     *targets,
                                                               gint                      n_targets,
                                                               GdkDragAction             actions);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_unset_model_drag_source  (GtkIconView              *icon_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_unset_model_drag_dest    (GtkIconView              *icon_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_set_reorderable          (GtkIconView              *icon_view,
                                                               gboolean                  reorderable);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_icon_view_get_reorderable          (GtkIconView              *icon_view);
 
 
 /* These are useful to implement your own custom stuff. */
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_set_drag_dest_item       (GtkIconView              *icon_view,
                                                               GtkTreePath              *path,
                                                               GtkIconViewDropPosition   pos);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_icon_view_get_drag_dest_item       (GtkIconView              *icon_view,
                                                               GtkTreePath             **path,
                                                               GtkIconViewDropPosition  *pos);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_icon_view_get_dest_item_at_pos     (GtkIconView              *icon_view,
                                                               gint                      drag_x,
                                                               gint                      drag_y,
                                                               GtkTreePath             **path,
                                                               GtkIconViewDropPosition  *pos);
+GDK_AVAILABLE_IN_ALL
 cairo_surface_t       *gtk_icon_view_create_drag_icon         (GtkIconView              *icon_view,
                                                               GtkTreePath              *path);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon_view,
                                                                gint         wx,
                                                                gint         wy,
@@ -247,13 +304,16 @@ gboolean gtk_icon_view_get_cell_rect                          (GtkIconView     *
                                                               GdkRectangle    *rect);
 
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_icon_view_set_tooltip_item                        (GtkIconView     *icon_view,
                                                                GtkTooltip      *tooltip,
                                                                GtkTreePath     *path);
+GDK_AVAILABLE_IN_ALL
 void    gtk_icon_view_set_tooltip_cell                        (GtkIconView     *icon_view,
                                                                GtkTooltip      *tooltip,
                                                                GtkTreePath     *path,
                                                                GtkCellRenderer *cell);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_icon_view_get_tooltip_context                    (GtkIconView       *icon_view,
                                                                gint              *x,
                                                                gint              *y,
@@ -261,8 +321,10 @@ gboolean gtk_icon_view_get_tooltip_context                    (GtkIconView
                                                                GtkTreeModel     **model,
                                                                GtkTreePath      **path,
                                                                GtkTreeIter       *iter);
+GDK_AVAILABLE_IN_ALL
 void     gtk_icon_view_set_tooltip_column                     (GtkIconView       *icon_view,
                                                                gint               column);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
 
 
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 023f20c..43a7650 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -105,62 +105,90 @@ struct _GtkImageClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_image_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new                (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_file      (const gchar     *filename);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_resource  (const gchar     *resource_path);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_pixbuf    (GdkPixbuf       *pixbuf);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_stock     (const gchar     *stock_id,
                                          GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_icon_set  (GtkIconSet      *icon_set,
                                          GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_icon_name (const gchar     *icon_name,
                                         GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_new_from_gicon     (GIcon           *icon,
                                         GtkIconSize      size);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_image_clear              (GtkImage        *image);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_file      (GtkImage        *image,
                                    const gchar     *filename);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_resource  (GtkImage        *image,
                                    const gchar     *resource_path);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_pixbuf    (GtkImage        *image,
                                    GdkPixbuf       *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_stock     (GtkImage        *image,
                                    const gchar     *stock_id,
                                    GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_icon_set  (GtkImage        *image,
                                    GtkIconSet      *icon_set,
                                    GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_animation (GtkImage           *image,
                                    GdkPixbufAnimation *animation);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_icon_name (GtkImage        *image,
                                   const gchar     *icon_name,
                                   GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_from_gicon     (GtkImage        *image,
                                   GIcon           *icon,
                                   GtkIconSize      size);
+GDK_AVAILABLE_IN_ALL
 void gtk_image_set_pixel_size     (GtkImage        *image,
                                   gint             pixel_size);
 
+GDK_AVAILABLE_IN_ALL
 GtkImageType gtk_image_get_storage_type (GtkImage   *image);
 
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf* gtk_image_get_pixbuf   (GtkImage         *image);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_get_stock    (GtkImage         *image,
                                    gchar           **stock_id,
                                    GtkIconSize      *size);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSet      **icon_set,
                                    GtkIconSize      *size);
+GDK_AVAILABLE_IN_ALL
 GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_get_icon_name (GtkImage     *image,
                                    const gchar **icon_name,
                                    GtkIconSize  *size);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_get_gicon     (GtkImage              *image,
                                    GIcon                **gicon,
                                    GtkIconSize           *size);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_image_get_pixel_size (GtkImage             *image);
 
 G_END_DECLS
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 1c53695..bba6651 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -67,21 +67,33 @@ struct _GtkImageMenuItemClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_image_menu_item_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_menu_item_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_menu_item_new_with_label    (const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_menu_item_new_with_mnemonic (const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_menu_item_new_from_stock    (const gchar      *stock_id,
                                                   GtkAccelGroup    *accel_group);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_menu_item_set_always_show_image (GtkImageMenuItem *image_menu_item,
                                                       gboolean          always_show);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_image_menu_item_get_always_show_image (GtkImageMenuItem *image_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_menu_item_set_image         (GtkImageMenuItem *image_menu_item,
                                                   GtkWidget        *image);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_image_menu_item_get_image         (GtkImageMenuItem *image_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_menu_item_set_use_stock     (GtkImageMenuItem *image_menu_item,
                                                  gboolean          use_stock);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_image_menu_item_get_use_stock     (GtkImageMenuItem *image_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_image_menu_item_set_accel_group   (GtkImageMenuItem *image_menu_item, 
                                                  GtkAccelGroup    *accel_group);
 
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index 55fe53f..d1acc63 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -93,30 +93,42 @@ struct _GtkIMContextClass
   void (*_gtk_reserved6) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_set_client_window   (GtkIMContext       *context,
                                             GdkWindow          *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_get_preedit_string  (GtkIMContext       *context,
                                             gchar             **str,
                                             PangoAttrList     **attrs,
                                             gint               *cursor_pos);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_filter_keypress     (GtkIMContext       *context,
                                             GdkEventKey        *event);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_focus_in            (GtkIMContext       *context);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_focus_out           (GtkIMContext       *context);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_reset               (GtkIMContext       *context);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_set_cursor_location (GtkIMContext       *context,
                                             const GdkRectangle *area);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_set_use_preedit     (GtkIMContext       *context,
                                             gboolean            use_preedit);
+GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_set_surrounding     (GtkIMContext       *context,
                                             const gchar        *text,
                                             gint                len,
                                             gint                cursor_index);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_get_surrounding     (GtkIMContext       *context,
                                             gchar             **text,
                                             gint               *cursor_index);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_delete_surrounding  (GtkIMContext       *context,
                                             gint                offset,
                                             gint                n_chars);
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index ddb4679..8c09576 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -59,9 +59,12 @@ struct _GtkIMContextSimpleClass
   GtkIMContextClass parent_class;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_im_context_simple_get_type  (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkIMContext *gtk_im_context_simple_new       (void);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
                                               guint16            *data,
                                               gint                max_seq_len,
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 1979bf6..6ab022e 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -58,13 +58,18 @@ struct _GtkIMMulticontextClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkIMContext *gtk_im_multicontext_new      (void);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
                                                    GtkMenuShell      *menushell);
+GDK_AVAILABLE_IN_ALL
 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);
  
diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index a7e351a..49c9d08 100644
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -80,35 +80,48 @@ struct _GtkInfoBarClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_info_bar_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_new                    (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_new_with_buttons       (const gchar    *first_button_text,
                                                     ...);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_get_action_area        (GtkInfoBar     *info_bar);
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_get_content_area       (GtkInfoBar     *info_bar);
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_add_action_widget      (GtkInfoBar     *info_bar,
                                                     GtkWidget      *child,
                                                     gint            response_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_add_button             (GtkInfoBar     *info_bar,
                                                     const gchar    *button_text,
                                                     gint            response_id);
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_add_buttons            (GtkInfoBar     *info_bar,
                                                     const gchar    *first_button_text,
                                                     ...);
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_response_sensitive (GtkInfoBar     *info_bar,
                                                     gint            response_id,
                                                     gboolean        setting);
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_default_response   (GtkInfoBar     *info_bar,
                                                     gint            response_id);
 
 /* Emit response signal */
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_response               (GtkInfoBar     *info_bar,
                                                     gint            response_id);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_message_type       (GtkInfoBar     *info_bar,
                                                     GtkMessageType  message_type);
+GDK_AVAILABLE_IN_ALL
 GtkMessageType gtk_info_bar_get_message_type       (GtkInfoBar     *info_bar);
 
 G_END_DECLS
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 9806da7..8aa0520 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -64,12 +64,17 @@ struct _GtkInvisibleClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_invisible_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_invisible_new            (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_invisible_new_for_screen (GdkScreen    *screen);
+GDK_AVAILABLE_IN_ALL
 void      gtk_invisible_set_screen     (GtkInvisible *invisible,
                                         GdkScreen    *screen);
+GDK_AVAILABLE_IN_ALL
 GdkScreen* gtk_invisible_get_screen    (GtkInvisible *invisible);
 
 G_END_DECLS
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 3d3c27d..1e5cfe9 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -87,80 +87,125 @@ struct _GtkLabelClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_label_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*            gtk_label_new               (const gchar   *str);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_text          (GtkLabel      *label,
                                                   const gchar   *str);
+GDK_AVAILABLE_IN_ALL
 const gchar*          gtk_label_get_text          (GtkLabel      *label);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_attributes    (GtkLabel      *label,
                                                   PangoAttrList *attrs);
+GDK_AVAILABLE_IN_ALL
 PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_label         (GtkLabel      *label,
                                                   const gchar   *str);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_label_get_label         (GtkLabel      *label);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_markup        (GtkLabel      *label,
                                                   const gchar   *str);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_use_markup    (GtkLabel      *label,
                                                   gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_label_get_use_markup    (GtkLabel      *label);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_label_set_use_underline (GtkLabel      *label,
                                                   gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_label_get_use_underline (GtkLabel      *label);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_markup_with_mnemonic       (GtkLabel         *label,
                                                   const gchar      *str);
+GDK_AVAILABLE_IN_ALL
 guint    gtk_label_get_mnemonic_keyval            (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_mnemonic_widget            (GtkLabel         *label,
                                                   GtkWidget        *widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_label_get_mnemonic_widget          (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_text_with_mnemonic         (GtkLabel         *label,
                                                   const gchar      *str);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_justify                    (GtkLabel         *label,
                                                   GtkJustification  jtype);
+GDK_AVAILABLE_IN_ALL
 GtkJustification gtk_label_get_justify            (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_ellipsize                 (GtkLabel         *label,
                                                   PangoEllipsizeMode mode);
+GDK_AVAILABLE_IN_ALL
 PangoEllipsizeMode gtk_label_get_ellipsize        (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_width_chars               (GtkLabel         *label,
                                                   gint              n_chars);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_label_get_width_chars                (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_max_width_chars           (GtkLabel         *label,
                                                   gint              n_chars);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_label_get_max_width_chars           (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_pattern                    (GtkLabel         *label,
                                                   const gchar      *pattern);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_line_wrap                  (GtkLabel         *label,
                                                   gboolean          wrap);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_label_get_line_wrap                  (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_line_wrap_mode             (GtkLabel         *label,
                                                   PangoWrapMode     wrap_mode);
+GDK_AVAILABLE_IN_ALL
 PangoWrapMode gtk_label_get_line_wrap_mode        (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_selectable                 (GtkLabel         *label,
                                                   gboolean          setting);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_label_get_selectable                 (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_angle                      (GtkLabel         *label,
                                                   gdouble           angle);
+GDK_AVAILABLE_IN_ALL
 gdouble  gtk_label_get_angle                      (GtkLabel         *label);
+GDK_AVAILABLE_IN_ALL
 void     gtk_label_select_region                  (GtkLabel         *label,
                                                   gint              start_offset,
                                                   gint              end_offset);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_label_get_selection_bounds           (GtkLabel         *label,
                                                    gint             *start,
                                                    gint             *end);
 
+GDK_AVAILABLE_IN_ALL
 PangoLayout *gtk_label_get_layout         (GtkLabel *label);
+GDK_AVAILABLE_IN_ALL
 void         gtk_label_get_layout_offsets (GtkLabel *label,
                                            gint     *x,
                                            gint     *y);
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_label_set_single_line_mode  (GtkLabel *label,
                                               gboolean single_line_mode);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_label_get_current_uri (GtkLabel *label);
+GDK_AVAILABLE_IN_ALL
 void         gtk_label_set_track_visited_links  (GtkLabel *label,
                                                  gboolean  track_links);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
 
 
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 04dcb51..921084d 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -70,23 +70,30 @@ struct _GtkLayoutClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_layout_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
                                           GtkAdjustment *vadjustment);
+GDK_AVAILABLE_IN_ALL
 GdkWindow*     gtk_layout_get_bin_window  (GtkLayout     *layout);
+GDK_AVAILABLE_IN_ALL
 void           gtk_layout_put             (GtkLayout     *layout,
                                           GtkWidget     *child_widget,
                                           gint           x,
                                           gint           y);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_layout_move            (GtkLayout     *layout,
                                           GtkWidget     *child_widget,
                                           gint           x,
                                           gint           y);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_layout_set_size        (GtkLayout     *layout,
                                           guint          width,
                                           guint          height);
+GDK_AVAILABLE_IN_ALL
 void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 71e8707..bf7710d 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -80,17 +80,24 @@ struct _GtkLinkButtonClass
   void (*_gtk_padding4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_link_button_get_type          (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_link_button_new               (const gchar   *uri);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
                                                         const gchar   *label);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_link_button_get_uri           (GtkLinkButton *link_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
                                                         const gchar   *uri);
 
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_link_button_get_visited       (GtkLinkButton *link_button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_link_button_set_visited       (GtkLinkButton *link_button,
                                                          gboolean       visited);
 
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 1e61d5a..1f4e3d3 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -22,6 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
@@ -60,68 +61,90 @@ struct _GtkListStoreClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkListStore *gtk_list_store_new              (gint          n_columns,
                                               ...);
+GDK_AVAILABLE_IN_ALL
 GtkListStore *gtk_list_store_newv             (gint          n_columns,
                                               GType        *types);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_column_types (GtkListStore *list_store,
                                               gint          n_columns,
                                               GType        *types);
 
 /* NOTE: use gtk_tree_model_get to get values from a GtkListStore */
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_value        (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               gint          column,
                                               GValue       *value);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set              (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               ...);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               gint         *columns,
                                               GValue       *values,
                                               gint          n_values);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_valist       (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               va_list       var_args);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_list_store_remove           (GtkListStore *list_store,
                                               GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert           (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               gint          position);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_before    (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *sibling);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_after     (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *sibling);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
                                                  GtkTreeIter  *iter,
                                                  gint          position,
                                                  ...);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
                                                  GtkTreeIter  *iter,
                                                  gint          position,
                                                  gint         *columns,
                                                  GValue       *values,
                                                  gint          n_values);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_prepend          (GtkListStore *list_store,
                                               GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_append           (GtkListStore *list_store,
                                               GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_clear            (GtkListStore *list_store);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_list_store_iter_is_valid    (GtkListStore *list_store,
                                                GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_reorder          (GtkListStore *store,
                                                gint         *new_order);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_swap             (GtkListStore *store,
                                                GtkTreeIter  *a,
                                                GtkTreeIter  *b);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_move_after       (GtkListStore *store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
+GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_move_before      (GtkListStore *store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 549989a..75f3fbc 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -67,10 +67,15 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget   *grab_widget,
 
 /* GTK+ version
  */
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_major_version (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_minor_version (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_micro_version (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_binary_age    (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 guint gtk_get_interface_age (void) G_GNUC_CONST;
 
 #define gtk_major_version gtk_get_major_version ()
@@ -79,6 +84,7 @@ guint gtk_get_interface_age (void) G_GNUC_CONST;
 #define gtk_binary_age gtk_get_binary_age ()
 #define gtk_interface_age gtk_get_interface_age ()
 
+GDK_AVAILABLE_IN_ALL
 const gchar* gtk_check_version (guint   required_major,
                                 guint   required_minor,
                                 guint   required_micro);
@@ -87,15 +93,19 @@ const gchar* gtk_check_version (guint   required_major,
 /* Initialization, exit, mainloop and miscellaneous routines
  */
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_parse_args           (int    *argc,
                                    char ***argv);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_init                 (int    *argc,
                                    char ***argv);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_init_with_args       (gint                 *argc,
                                    gchar              ***argv,
                                    const gchar          *parameter_string,
@@ -103,6 +113,7 @@ gboolean gtk_init_with_args       (gint                 *argc,
                                    const gchar          *translation_domain,
                                    GError              **error);
 
+GDK_AVAILABLE_IN_ALL
 GOptionGroup *gtk_get_option_group (gboolean open_default_display);
 
 #ifdef G_OS_WIN32
@@ -110,11 +121,13 @@ GOptionGroup *gtk_get_option_group (gboolean open_default_display);
 /* Variants that are used to check for correct struct packing
  * when building GTK+-using code.
  */
+GDK_AVAILABLE_IN_ALL
 void     gtk_init_abi_check       (int    *argc,
                                    char ***argv,
                                    int     num_checks,
                                    size_t  sizeof_GtkWindow,
                                    size_t  sizeof_GtkBox);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_init_check_abi_check (int    *argc,
                                    char ***argv,
                                    int     num_checks,
@@ -126,27 +139,43 @@ gboolean gtk_init_check_abi_check (int    *argc,
 
 #endif
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_disable_setlocale    (void);
+GDK_AVAILABLE_IN_ALL
 PangoLanguage *gtk_get_default_language (void);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_events_pending       (void);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_main_do_event       (GdkEvent           *event);
+GDK_AVAILABLE_IN_ALL
 void       gtk_main                (void);
+GDK_AVAILABLE_IN_ALL
 guint      gtk_main_level          (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_main_quit           (void);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_main_iteration      (void);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_main_iteration_do   (gboolean            blocking);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_true                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_false               (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_grab_add            (GtkWidget          *widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_grab_get_current    (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_grab_remove         (GtkWidget          *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_device_grab_add     (GtkWidget          *widget,
                                     GdkDevice          *device,
                                     gboolean            block_others);
+GDK_AVAILABLE_IN_ALL
 void       gtk_device_grab_remove  (GtkWidget          *widget,
                                     GdkDevice          *device);
 
@@ -156,13 +185,19 @@ guint      gtk_key_snooper_install (GtkKeySnoopFunc snooper,
 GDK_DEPRECATED_IN_3_4
 void       gtk_key_snooper_remove  (guint           snooper_handler_id);
 
+GDK_AVAILABLE_IN_ALL
 GdkEvent * gtk_get_current_event        (void);
+GDK_AVAILABLE_IN_ALL
 guint32    gtk_get_current_event_time   (void);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_get_current_event_state  (GdkModifierType *state);
+GDK_AVAILABLE_IN_ALL
 GdkDevice *gtk_get_current_event_device (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_get_event_widget         (GdkEvent        *event);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_propagate_event          (GtkWidget       *widget,
                                          GdkEvent        *event);
 
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index d6843eb..339717f 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -113,12 +113,15 @@ struct _GtkMenuClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_menu_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_new                          (void);
 GDK_AVAILABLE_IN_3_4
 GtkWidget* gtk_menu_new_from_model        (GMenuModel *model);
 
 /* Display the menu onscreen */
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_popup                 (GtkMenu             *menu,
                                           GtkWidget           *parent_menu_shell,
                                           GtkWidget           *parent_menu_item,
@@ -126,6 +129,7 @@ void           gtk_menu_popup                 (GtkMenu             *menu,
                                           gpointer             data,
                                           guint                button,
                                           guint32              activate_time);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_popup_for_device      (GtkMenu             *menu,
                                            GdkDevice           *device,
                                            GtkWidget           *parent_menu_shell,
@@ -139,60 +143,78 @@ void       gtk_menu_popup_for_device      (GtkMenu             *menu,
 /* Position the menu according to its position function. Called
  * from gtkmenuitem.c when a menu-item changes its allocation
  */
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_reposition            (GtkMenu             *menu);
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_popdown               (GtkMenu             *menu);
 
 /* Keep track of the last menu item selected. (For the purposes
  * of the option menu
  */
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_get_active           (GtkMenu             *menu);
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_set_active            (GtkMenu             *menu,
                                           guint                index);
 
 /* set/get the accelerator group that holds global accelerators (should
  * be added to the corresponding toplevel with gtk_window_add_accel_group().
  */
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_set_accel_group   (GtkMenu             *menu,
                                           GtkAccelGroup       *accel_group);
+GDK_AVAILABLE_IN_ALL
 GtkAccelGroup* gtk_menu_get_accel_group          (GtkMenu             *menu);
+GDK_AVAILABLE_IN_ALL
 void           gtk_menu_set_accel_path    (GtkMenu             *menu,
                                           const gchar         *accel_path);
+GDK_AVAILABLE_IN_ALL
 const gchar*   gtk_menu_get_accel_path    (GtkMenu             *menu);
 
 /* A reference count is kept for a widget when it is attached to
  * a particular widget. This is typically a menu item; it may also
  * be a widget with a popup menu - for instance, the Notebook widget.
  */
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_attach_to_widget      (GtkMenu             *menu,
                                           GtkWidget           *attach_widget,
                                           GtkMenuDetachFunc    detacher);
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_detach                (GtkMenu             *menu);
 
 /* This should be dumped in favor of data set when the menu is popped
  * up - that is currently in the ItemFactory code, but should be
  * in the Menu code.
  */
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_get_attach_widget    (GtkMenu             *menu);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_set_tearoff_state     (GtkMenu             *menu,
                                           gboolean             torn_off);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
 
 /* This sets the window manager title for the window that
  * appears when a menu is torn off
  */
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_set_title          (GtkMenu             *menu,
                                            const gchar         *title);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_menu_get_title          (GtkMenu             *menu);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,
                                            gint                position);
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_menu_set_screen            (GtkMenu             *menu,
                                           GdkScreen           *screen);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_attach                (GtkMenu             *menu,
                                            GtkWidget           *child,
                                            guint                left_attach,
@@ -200,13 +222,18 @@ void       gtk_menu_attach                (GtkMenu             *menu,
                                            guint                top_attach,
                                            guint                bottom_attach);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_set_monitor           (GtkMenu             *menu,
                                            gint                 monitor_num);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_menu_get_monitor           (GtkMenu             *menu);
+GDK_AVAILABLE_IN_ALL
 GList*     gtk_menu_get_for_attach_widget (GtkWidget           *widget); 
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_set_reserve_toggle_size (GtkMenu  *menu,
                                           gboolean   reserve_toggle_size);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_menu_get_reserve_toggle_size (GtkMenu  *menu);
 
 
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 5dc792f..fc0e38b 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -67,15 +67,21 @@ struct _GtkMenuBarClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_bar_new             (void);
 GDK_AVAILABLE_IN_3_4
 GtkWidget* gtk_menu_bar_new_from_model  (GMenuModel *model);
 
+GDK_AVAILABLE_IN_ALL
 GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar       *menubar);
+GDK_AVAILABLE_IN_ALL
 void             gtk_menu_bar_set_pack_direction (GtkMenuBar       *menubar,
                                                  GtkPackDirection  pack_dir);
+GDK_AVAILABLE_IN_ALL
 GtkPackDirection gtk_menu_bar_get_child_pack_direction (GtkMenuBar       *menubar);
+GDK_AVAILABLE_IN_ALL
 void             gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
                                                        GtkPackDirection  child_pack_dir);
 
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 9d546d6..24c8783 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -87,19 +87,30 @@ struct _GtkMenuItemClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_menu_item_get_type             (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_item_new                  (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_item_new_with_label       (const gchar         *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_item_new_with_mnemonic    (const gchar         *label);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
                                                GtkWidget           *submenu);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_activate             (GtkMenuItem         *menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
                                                gint                *requisition);
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
                                                gint                 allocation);
 GDK_DEPRECATED_IN_3_2
@@ -107,20 +118,28 @@ void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
                                                gboolean             right_justified);
 GDK_DEPRECATED_IN_3_2
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_item_set_accel_path    (GtkMenuItem         *menu_item,
                                                const gchar         *accel_path);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_menu_item_get_accel_path    (GtkMenuItem    *menu_item);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_item_set_label         (GtkMenuItem         *menu_item,
                                                const gchar         *label);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_menu_item_get_label         (GtkMenuItem         *menu_item);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_set_use_underline    (GtkMenuItem         *menu_item,
                                                gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_menu_item_get_use_underline    (GtkMenuItem         *menu_item);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_menu_item_set_reserve_indicator (GtkMenuItem        *menu_item,
                                                 gboolean            reserve);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_menu_item_get_reserve_indicator (GtkMenuItem        *menu_item);
 
 G_END_DECLS
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index c3bd879..af424b0 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -86,30 +86,44 @@ struct _GtkMenuShellClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType    gtk_menu_shell_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_append         (GtkMenuShell *menu_shell,
                                         GtkWidget    *child);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_prepend        (GtkMenuShell *menu_shell,
                                         GtkWidget    *child);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_insert         (GtkMenuShell *menu_shell,
                                         GtkWidget    *child,
                                         gint          position);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_deactivate     (GtkMenuShell *menu_shell);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_select_item    (GtkMenuShell *menu_shell,
                                         GtkWidget    *menu_item);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_deselect       (GtkMenuShell *menu_shell);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_activate_item  (GtkMenuShell *menu_shell,
                                         GtkWidget    *menu_item,
                                         gboolean      force_deactivate);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_select_first   (GtkMenuShell *menu_shell,
                                         gboolean      search_sensitive);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_cancel         (GtkMenuShell *menu_shell);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_menu_shell_get_take_focus (GtkMenuShell *menu_shell);
+GDK_AVAILABLE_IN_ALL
 void     gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
                                         gboolean      take_focus);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_menu_shell_get_selected_item (GtkMenuShell *menu_shell);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_menu_shell_get_parent_shell  (GtkMenuShell *menu_shell);
 
 GDK_AVAILABLE_IN_3_6
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 50ee12e..01f2994 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -61,16 +61,23 @@ struct _GtkMenuToolButtonClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
                                                    const gchar *label);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_tool_button_set_menu       (GtkMenuToolButton *button,
                                                    GtkWidget         *menu);
+GDK_AVAILABLE_IN_ALL
 GtkWidget    *gtk_menu_tool_button_get_menu       (GtkMenuToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_tool_button_set_arrow_tooltip_text   (GtkMenuToolButton *button,
                                                             const gchar       *text);
+GDK_AVAILABLE_IN_ALL
 void          gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
                                                             const gchar       *markup);
 
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 5d84caa..b78ce6f 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -93,8 +93,10 @@ typedef enum
   GTK_BUTTONS_OK_CANCEL
 } GtkButtonsType;
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         GtkDialogFlags  flags,
                                         GtkMessageType  type,
@@ -102,6 +104,7 @@ GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         const gchar    *message_format,
                                         ...) G_GNUC_PRINTF (5, 6);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_message_dialog_new_with_markup   (GtkWindow      *parent,
                                                  GtkDialogFlags  flags,
                                                  GtkMessageType  type,
@@ -109,22 +112,28 @@ GtkWidget* gtk_message_dialog_new_with_markup   (GtkWindow      *parent,
                                                  const gchar    *message_format,
                                                  ...) G_GNUC_PRINTF (5, 6);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
                                            GtkWidget        *image);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_message_dialog_get_image   (GtkMessageDialog *dialog);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_message_dialog_set_markup  (GtkMessageDialog *message_dialog,
                                            const gchar      *str);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
                                                      const gchar      *message_format,
                                                      ...) G_GNUC_PRINTF (2, 3);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
                                                        const gchar      *message_format,
                                                        ...) G_GNUC_PRINTF (2, 3);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog);
 
 G_END_DECLS
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index a652a01..b070c50 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -66,17 +66,21 @@ struct _GtkMiscClass
   void (*_gtk_reserved4) (void);
 };
 
-
+GDK_AVAILABLE_IN_ALL
 GType   gtk_misc_get_type      (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 void   gtk_misc_set_alignment (GtkMisc *misc,
                                gfloat   xalign,
                                gfloat   yalign);
+GDK_AVAILABLE_IN_ALL
 void    gtk_misc_get_alignment (GtkMisc *misc,
                                gfloat  *xalign,
                                gfloat  *yalign);
+GDK_AVAILABLE_IN_ALL
 void   gtk_misc_set_padding   (GtkMisc *misc,
                                gint     xpad,
                                gint     ypad);
+GDK_AVAILABLE_IN_ALL
 void    gtk_misc_get_padding   (GtkMisc *misc,
                                gint    *xpad,
                                gint    *ypad);
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index cff736e..7648300 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -66,14 +66,21 @@ struct _GtkMountOperationClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_mount_operation_get_type   (void);
+GDK_AVAILABLE_IN_ALL
 GMountOperation *gtk_mount_operation_new        (GtkWindow         *parent);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_mount_operation_is_showing (GtkMountOperation *op);
+GDK_AVAILABLE_IN_ALL
 void             gtk_mount_operation_set_parent (GtkMountOperation *op,
                                                  GtkWindow         *parent);
+GDK_AVAILABLE_IN_ALL
 GtkWindow *      gtk_mount_operation_get_parent (GtkMountOperation *op);
+GDK_AVAILABLE_IN_ALL
 void             gtk_mount_operation_set_screen (GtkMountOperation *op,
                                                  GdkScreen         *screen);
+GDK_AVAILABLE_IN_ALL
 GdkScreen       *gtk_mount_operation_get_screen (GtkMountOperation *op);
 
 G_END_DECLS
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index a0fea56..dd32066 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -122,31 +122,40 @@ struct _GtkNotebookClass
  *           Creation, insertion, deletion                 *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_notebook_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_notebook_new        (void);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_append_page       (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_append_page_menu  (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_prepend_page      (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_insert_page       (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     gint         position);
+GDK_AVAILABLE_IN_ALL
 gint gtk_notebook_insert_page_menu  (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label,
                                     gint         position);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_remove_page       (GtkNotebook *notebook,
                                     gint         page_num);
 
@@ -154,8 +163,10 @@ void gtk_notebook_remove_page       (GtkNotebook *notebook,
  *           Tabs drag and drop                            *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_notebook_set_group_name (GtkNotebook *notebook,
                                           const gchar *group_name);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_notebook_get_group_name (GtkNotebook *notebook);
 
 
@@ -164,83 +175,117 @@ const gchar *gtk_notebook_get_group_name (GtkNotebook *notebook);
  *            query, set current NotebookPage              *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 gint       gtk_notebook_get_current_page (GtkNotebook *notebook);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_notebook_get_nth_page     (GtkNotebook *notebook,
                                          gint         page_num);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_notebook_get_n_pages      (GtkNotebook *notebook);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_notebook_page_num         (GtkNotebook *notebook,
                                          GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_set_current_page (GtkNotebook *notebook,
                                          gint         page_num);
+GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_next_page        (GtkNotebook *notebook);
+GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_prev_page        (GtkNotebook *notebook);
 
 /***********************************************************
  *            set Notebook, NotebookTab style              *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_notebook_set_show_border      (GtkNotebook     *notebook,
                                            gboolean         show_border);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_show_border      (GtkNotebook     *notebook);
+GDK_AVAILABLE_IN_ALL
 void     gtk_notebook_set_show_tabs        (GtkNotebook     *notebook,
                                            gboolean         show_tabs);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_show_tabs        (GtkNotebook     *notebook);
+GDK_AVAILABLE_IN_ALL
 void     gtk_notebook_set_tab_pos          (GtkNotebook     *notebook,
                                            GtkPositionType  pos);
+GDK_AVAILABLE_IN_ALL
 GtkPositionType gtk_notebook_get_tab_pos   (GtkNotebook     *notebook);
+GDK_AVAILABLE_IN_ALL
 void     gtk_notebook_set_scrollable       (GtkNotebook     *notebook,
                                            gboolean         scrollable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_scrollable       (GtkNotebook     *notebook);
+GDK_AVAILABLE_IN_ALL
 guint16  gtk_notebook_get_tab_hborder      (GtkNotebook     *notebook);
+GDK_AVAILABLE_IN_ALL
 guint16  gtk_notebook_get_tab_vborder      (GtkNotebook     *notebook);
 
 /***********************************************************
  *               enable/disable PopupMenu                  *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_popup_enable  (GtkNotebook *notebook);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_popup_disable (GtkNotebook *notebook);
 
 /***********************************************************
  *             query/set NotebookPage Properties           *
  ***********************************************************/
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_notebook_get_tab_label    (GtkNotebook *notebook,
                                           GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           GtkWidget   *tab_label);
+GDK_AVAILABLE_IN_ALL
 void          gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
                                                GtkWidget   *child,
                                                const gchar *tab_text);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
                                                GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
                                           GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           GtkWidget   *menu_label);
+GDK_AVAILABLE_IN_ALL
 void          gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
                                                 GtkWidget   *child,
                                                 const gchar *menu_text);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
                                                        GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gint         position);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_tab_reorderable (GtkNotebook *notebook,
                                           GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_set_tab_reorderable     (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gboolean     reorderable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_tab_detachable  (GtkNotebook *notebook,
                                           GtkWidget   *child);
+GDK_AVAILABLE_IN_ALL
 void gtk_notebook_set_tab_detachable      (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gboolean     detachable);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_notebook_get_action_widget (GtkNotebook *notebook,
                                            GtkPackType  pack_type);
+GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_set_action_widget (GtkNotebook *notebook,
                                            GtkWidget   *widget,
                                            GtkPackType  pack_type);
diff --git a/gtk/gtknumerableicon.h b/gtk/gtknumerableicon.h
index 7f4d77a..b05f4b4 100644
--- a/gtk/gtknumerableicon.h
+++ b/gtk/gtknumerableicon.h
@@ -56,30 +56,43 @@ struct _GtkNumerableIconClass {
   gpointer padding[16];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_numerable_icon_get_type                 (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GIcon *           gtk_numerable_icon_new                      (GIcon            *base_icon);
+GDK_AVAILABLE_IN_ALL
 GIcon *           gtk_numerable_icon_new_with_style_context   (GIcon            *base_icon,
                                                                GtkStyleContext  *context);
 
+GDK_AVAILABLE_IN_ALL
 GtkStyleContext * gtk_numerable_icon_get_style_context        (GtkNumerableIcon *self);
+GDK_AVAILABLE_IN_ALL
 void              gtk_numerable_icon_set_style_context        (GtkNumerableIcon *self,
                                                                GtkStyleContext  *style);
 
+GDK_AVAILABLE_IN_ALL
 gint              gtk_numerable_icon_get_count                (GtkNumerableIcon *self);
+GDK_AVAILABLE_IN_ALL
 void              gtk_numerable_icon_set_count                (GtkNumerableIcon *self,
                                                                gint count);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *     gtk_numerable_icon_get_label                (GtkNumerableIcon *self);
+GDK_AVAILABLE_IN_ALL
 void              gtk_numerable_icon_set_label                (GtkNumerableIcon *self,
                                                                const gchar      *label);
 
+GDK_AVAILABLE_IN_ALL
 void              gtk_numerable_icon_set_background_gicon     (GtkNumerableIcon *self,
                                                                GIcon            *icon);
+GDK_AVAILABLE_IN_ALL
 GIcon *           gtk_numerable_icon_get_background_gicon     (GtkNumerableIcon *self);
 
+GDK_AVAILABLE_IN_ALL
 void              gtk_numerable_icon_set_background_icon_name (GtkNumerableIcon *self,
                                                                const gchar      *icon_name);
+GDK_AVAILABLE_IN_ALL
 const gchar *     gtk_numerable_icon_get_background_icon_name (GtkNumerableIcon *self);
 
 G_END_DECLS
diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h
index d4592a0..1fc4782 100644
--- a/gtk/gtkoffscreenwindow.h
+++ b/gtk/gtkoffscreenwindow.h
@@ -53,10 +53,14 @@ struct _GtkOffscreenWindowClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_offscreen_window_get_type    (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget       *gtk_offscreen_window_new         (void);
+GDK_AVAILABLE_IN_ALL
 cairo_surface_t *gtk_offscreen_window_get_surface (GtkOffscreenWindow *offscreen);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf       *gtk_offscreen_window_get_pixbuf  (GtkOffscreenWindow *offscreen);
 
 G_END_DECLS
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index 2708a45..4044e30 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -47,10 +47,13 @@ struct _GtkOrientableIface
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_orientable_get_type        (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_orientable_set_orientation (GtkOrientable  *orientable,
                                                GtkOrientation  orientation);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation gtk_orientable_get_orientation (GtkOrientable  *orientable);
 
 G_END_DECLS
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 86a414e..559ae43 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -35,68 +35,94 @@ typedef struct _GtkPageSetup GtkPageSetup;
 #define GTK_PAGE_SETUP(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP, GtkPageSetup))
 #define GTK_IS_PAGE_SETUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP))
 
+GDK_AVAILABLE_IN_ALL
 GType              gtk_page_setup_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *     gtk_page_setup_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *     gtk_page_setup_copy              (GtkPageSetup       *other);
+GDK_AVAILABLE_IN_ALL
 GtkPageOrientation gtk_page_setup_get_orientation   (GtkPageSetup       *setup);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_orientation   (GtkPageSetup       *setup,
                                                     GtkPageOrientation  orientation);
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *     gtk_page_setup_get_paper_size    (GtkPageSetup       *setup);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_paper_size    (GtkPageSetup       *setup,
                                                     GtkPaperSize       *size);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_top_margin    (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_top_margin    (GtkPageSetup       *setup,
                                                     gdouble             margin,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_bottom_margin (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_bottom_margin (GtkPageSetup       *setup,
                                                     gdouble             margin,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_left_margin   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_left_margin   (GtkPageSetup       *setup,
                                                     gdouble             margin,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_right_margin  (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void               gtk_page_setup_set_right_margin  (GtkPageSetup       *setup,
                                                     gdouble             margin,
                                                     GtkUnit             unit);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup    *setup,
                                                        GtkPaperSize    *size);
 
 /* These take orientation, but not margins into consideration */
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_paper_width   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_paper_height  (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 
 
 /* These take orientation, and margins into consideration */
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_page_width    (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_page_setup_get_page_height   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 
 /* Saving and restoring page setup */
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup     *gtk_page_setup_new_from_file     (const gchar         *file_name,
                                                     GError              **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_page_setup_load_file         (GtkPageSetup        *setup,
                                                     const char          *file_name,
                                                     GError             **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_page_setup_to_file           (GtkPageSetup        *setup,
                                                     const char          *file_name,
                                                     GError             **error);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup     *gtk_page_setup_new_from_key_file (GKeyFile            *key_file,
                                                     const gchar         *group_name,
                                                     GError             **error);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_page_setup_load_key_file     (GtkPageSetup        *setup,
                                                     GKeyFile            *key_file,
                                                     const gchar         *group_name,
                                                     GError             **error);
+GDK_AVAILABLE_IN_ALL
 void              gtk_page_setup_to_key_file       (GtkPageSetup        *setup,
                                                     GKeyFile            *key_file,
                                                     const gchar         *group_name);
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 7f8ceaf..8b0748e 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -56,14 +56,20 @@ struct _GtkPageSetupUnixDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_page_setup_unix_dialog_get_type           (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *       gtk_page_setup_unix_dialog_new                (const gchar            *title,
                                                                 GtkWindow              *parent);
+GDK_AVAILABLE_IN_ALL
 void              gtk_page_setup_unix_dialog_set_page_setup     (GtkPageSetupUnixDialog *dialog,
                                                                 GtkPageSetup           *page_setup);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *    gtk_page_setup_unix_dialog_get_page_setup     (GtkPageSetupUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 void              gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog,
                                                                 GtkPrintSettings       *print_settings);
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog);
 
 G_END_DECLS
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 55ec32c..e219488 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -75,28 +75,39 @@ struct _GtkPanedClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_paned_get_type     (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_paned_new          (GtkOrientation orientation);
+GDK_AVAILABLE_IN_ALL
 void        gtk_paned_add1         (GtkPaned       *paned,
                                     GtkWidget      *child);
+GDK_AVAILABLE_IN_ALL
 void        gtk_paned_add2         (GtkPaned       *paned,
                                     GtkWidget      *child);
+GDK_AVAILABLE_IN_ALL
 void        gtk_paned_pack1        (GtkPaned       *paned,
                                     GtkWidget      *child,
                                     gboolean        resize,
                                     gboolean        shrink);
+GDK_AVAILABLE_IN_ALL
 void        gtk_paned_pack2        (GtkPaned       *paned,
                                     GtkWidget      *child,
                                     gboolean        resize,
                                     gboolean        shrink);
 
+GDK_AVAILABLE_IN_ALL
 gint        gtk_paned_get_position (GtkPaned       *paned);
+GDK_AVAILABLE_IN_ALL
 void        gtk_paned_set_position (GtkPaned       *paned,
                                     gint            position);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_paned_get_child1   (GtkPaned       *paned);
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_paned_get_child2   (GtkPaned       *paned);
 
+GDK_AVAILABLE_IN_ALL
 GdkWindow * gtk_paned_get_handle_window (GtkPaned  *paned);
 
 
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index f7cf20d..0aca1c1 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -24,6 +24,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
 
@@ -83,54 +84,76 @@ typedef struct _GtkPaperSize GtkPaperSize;
  */
 #define GTK_PAPER_NAME_LEGAL "na_legal"
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_paper_size_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *gtk_paper_size_new          (const gchar  *name);
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar  *ppd_name,
                                           const gchar  *ppd_display_name,
                                           gdouble       width,
                                           gdouble       height);
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *gtk_paper_size_new_custom   (const gchar  *name,
                                           const gchar  *display_name,
                                           gdouble       width,
                                           gdouble       height,
                                           GtkUnit       unit);
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *gtk_paper_size_copy         (GtkPaperSize *other);
+GDK_AVAILABLE_IN_ALL
 void          gtk_paper_size_free         (GtkPaperSize *size);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
                                           GtkPaperSize *size2);
 
+GDK_AVAILABLE_IN_ALL
 GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
+GDK_AVAILABLE_IN_ALL
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
+GDK_AVAILABLE_IN_ALL
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_paper_size_is_custom        (GtkPaperSize *size);
 
 /* Only for custom sizes: */
+GDK_AVAILABLE_IN_ALL
 void    gtk_paper_size_set_size                  (GtkPaperSize *size, 
                                                   gdouble       width, 
                                                   gdouble       height, 
                                                   GtkUnit       unit);
 
+GDK_AVAILABLE_IN_ALL
 gdouble gtk_paper_size_get_default_top_margin    (GtkPaperSize *size,
                                                  GtkUnit       unit);
+GDK_AVAILABLE_IN_ALL
 gdouble gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size,
                                                  GtkUnit       unit);
+GDK_AVAILABLE_IN_ALL
 gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
                                                  GtkUnit       unit);
+GDK_AVAILABLE_IN_ALL
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
                                                  GtkUnit       unit);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_paper_size_get_default (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
                                                const gchar *group_name,
                                                GError     **error);
+GDK_AVAILABLE_IN_ALL
 void     gtk_paper_size_to_key_file            (GtkPaperSize *size,
                                                GKeyFile     *key_file,
                                                const gchar  *group_name);
diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
index bcaad75..7fdd7b3 100644
--- a/gtk/gtkpathbar.h
+++ b/gtk/gtkpathbar.h
@@ -52,6 +52,7 @@ struct _GtkPathBarClass
                         gboolean     child_is_hidden);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType    gtk_path_bar_get_type (void) G_GNUC_CONST;
 void     _gtk_path_bar_set_file_system (GtkPathBar         *path_bar,
                                        GtkFileSystem      *file_system);
diff --git a/gtk/gtkplacessidebar.h b/gtk/gtkplacessidebar.h
index f4d251d..6b0f43f 100644
--- a/gtk/gtkplacessidebar.h
+++ b/gtk/gtkplacessidebar.h
@@ -77,31 +77,45 @@ typedef enum {
   GTK_PLACES_OPEN_NEW_WINDOW = 1 << 2
 } GtkPlacesOpenFlags;
 
+GDK_AVAILABLE_IN_3_10
 GType              gtk_places_sidebar_get_type                   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_10
 GtkWidget *        gtk_places_sidebar_new                        (void);
 
+GDK_AVAILABLE_IN_3_10
 GtkPlacesOpenFlags gtk_places_sidebar_get_open_flags             (GtkPlacesSidebar   *sidebar);
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_set_open_flags             (GtkPlacesSidebar   *sidebar,
                                                                   GtkPlacesOpenFlags  flags);
 
+GDK_AVAILABLE_IN_3_10
 GFile *            gtk_places_sidebar_get_location               (GtkPlacesSidebar   *sidebar);
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_set_location               (GtkPlacesSidebar   *sidebar,
                                                                   GFile              *location);
 
+GDK_AVAILABLE_IN_3_10
 gboolean           gtk_places_sidebar_get_show_desktop           (GtkPlacesSidebar   *sidebar);
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_set_show_desktop           (GtkPlacesSidebar   *sidebar,
                                                                   gboolean            show_desktop);
 
+GDK_AVAILABLE_IN_3_10
 gboolean           gtk_places_sidebar_get_show_connect_to_server (GtkPlacesSidebar   *sidebar);
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_set_show_connect_to_server (GtkPlacesSidebar   *sidebar,
                                                                   gboolean            
show_connect_to_server);
 
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_add_shortcut               (GtkPlacesSidebar   *sidebar,
                                                                   GFile              *location);
+GDK_AVAILABLE_IN_3_10
 void               gtk_places_sidebar_remove_shortcut            (GtkPlacesSidebar   *sidebar,
                                                                   GFile              *location);
+GDK_AVAILABLE_IN_3_10
 GSList *           gtk_places_sidebar_list_shortcuts             (GtkPlacesSidebar   *sidebar);
 
+GDK_AVAILABLE_IN_3_10
 GFile *            gtk_places_sidebar_get_nth_bookmark           (GtkPlacesSidebar   *sidebar,
                                                                   gint                n);
 
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index bd6a393..45ef7ca 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -73,21 +73,29 @@ struct _GtkPlugClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_plug_get_type              (void) G_GNUC_CONST;
 
 #ifndef GDK_MULTIHEAD_SAFE
+GDK_AVAILABLE_IN_ALL
 void       gtk_plug_construct             (GtkPlug    *plug,
                                            Window      socket_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_plug_new                   (Window      socket_id);
 #endif
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_plug_construct_for_display (GtkPlug    *plug,
                                            GdkDisplay *display,
                                            Window      socket_id);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_plug_new_for_display       (GdkDisplay *display,
                                            Window      socket_id);
+GDK_AVAILABLE_IN_ALL
 Window     gtk_plug_get_id                (GtkPlug    *plug);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_plug_get_embedded          (GtkPlug    *plug);
+GDK_AVAILABLE_IN_ALL
 GdkWindow *gtk_plug_get_socket_window     (GtkPlug    *plug);
 
 G_END_DECLS
diff --git a/gtk/gtkprint-win32.h b/gtk/gtkprint-win32.h
index 4bcb8ff..64f4d3e 100644
--- a/gtk/gtkprint-win32.h
+++ b/gtk/gtkprint-win32.h
@@ -48,10 +48,15 @@ typedef struct {
   int flags;
 } GtkPrintWin32Devnames;
 
+GDK_AVAILABLE_IN_ALL
 void gtk_print_win32_devnames_free (GtkPrintWin32Devnames *devnames);
+GDK_AVAILABLE_IN_ALL
 GtkPrintWin32Devnames *gtk_print_win32_devnames_from_win32 (HGLOBAL global);
+GDK_AVAILABLE_IN_ALL
 GtkPrintWin32Devnames *gtk_print_win32_devnames_from_printer_name (const char *printer);
+GDK_AVAILABLE_IN_ALL
 HGLOBAL gtk_print_win32_devnames_to_win32 (const GtkPrintWin32Devnames *devnames);
+GDK_AVAILABLE_IN_ALL
 HGLOBAL gtk_print_win32_devnames_to_win32_from_printer_name (const char *printer);
 
 G_END_DECLS
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index 5ae80ef..74bd291 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -44,6 +44,7 @@ typedef enum
   GTK_PRINT_BACKEND_ERROR_GENERIC
 } GtkPrintBackendError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark     gtk_print_backend_error_quark      (void);
 
 #define GTK_TYPE_PRINT_BACKEND                  (gtk_print_backend_get_type ())
@@ -137,59 +138,84 @@ struct _GtkPrintBackendClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_print_backend_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GList      *gtk_print_backend_get_printer_list     (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_print_backend_printer_list_is_done (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
 GtkPrinter *gtk_print_backend_find_printer         (GtkPrintBackend         *print_backend,
                                                    const gchar             *printer_name);
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_print_stream         (GtkPrintBackend         *print_backend,
                                                    GtkPrintJob             *job,
                                                    GIOChannel              *data_io,
                                                    GtkPrintJobCompleteFunc  callback,
                                                    gpointer                 user_data,
                                                    GDestroyNotify           dnotify);
+GDK_AVAILABLE_IN_ALL
 GList *     gtk_print_backend_load_modules         (void);
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_destroy              (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_set_password         (GtkPrintBackend         *backend, 
                                                     gchar                  **auth_info_required,
                                                     gchar                  **auth_info);
 
 /* Backend-only functions for GtkPrintBackend */
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_add_printer          (GtkPrintBackend         *print_backend,
                                                    GtkPrinter              *printer);
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_remove_printer       (GtkPrintBackend         *print_backend,
                                                    GtkPrinter              *printer);
+GDK_AVAILABLE_IN_ALL
 void        gtk_print_backend_set_list_done        (GtkPrintBackend         *backend);
 
 
 /* Backend-only functions for GtkPrinter */
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_is_new                (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_accepts_pdf       (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_accepts_ps        (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_is_new            (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_is_active         (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_is_paused         (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_is_accepting_jobs (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_has_details       (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_is_default        (GtkPrinter      *printer,
                                               gboolean         val);
+GDK_AVAILABLE_IN_ALL
 void        gtk_printer_set_icon_name         (GtkPrinter      *printer,
                                               const gchar     *icon);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_job_count         (GtkPrinter      *printer,
                                               gint             count);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_location          (GtkPrinter      *printer,
                                               const gchar     *location);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_description       (GtkPrinter      *printer,
                                               const gchar     *description);
+GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_state_message     (GtkPrinter      *printer,
                                               const gchar     *message);
 
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index aecd8a9..c78be90 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -36,17 +36,25 @@ typedef struct _GtkPrintContext GtkPrintContext;
 #define GTK_PRINT_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_CONTEXT, 
GtkPrintContext))
 #define GTK_IS_PRINT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_CONTEXT))
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_print_context_get_type (void) G_GNUC_CONST;
 
 
 /* Rendering */
+GDK_AVAILABLE_IN_ALL
 cairo_t      *gtk_print_context_get_cairo_context    (GtkPrintContext *context);
 
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *gtk_print_context_get_page_setup       (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 gdouble       gtk_print_context_get_width            (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 gdouble       gtk_print_context_get_height           (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 gdouble       gtk_print_context_get_dpi_x            (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 gdouble       gtk_print_context_get_dpi_y            (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_print_context_get_hard_margins     (GtkPrintContext *context,
                                                      gdouble         *top,
                                                      gdouble         *bottom,
@@ -54,11 +62,15 @@ gboolean      gtk_print_context_get_hard_margins     (GtkPrintContext *context,
                                                      gdouble         *right);
 
 /* Fonts */
+GDK_AVAILABLE_IN_ALL
 PangoFontMap *gtk_print_context_get_pango_fontmap    (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 PangoContext *gtk_print_context_create_pango_context (GtkPrintContext *context);
+GDK_AVAILABLE_IN_ALL
 PangoLayout  *gtk_print_context_create_pango_layout  (GtkPrintContext *context);
 
 /* Needed for preview implementations */
+GDK_AVAILABLE_IN_ALL
 void         gtk_print_context_set_cairo_context     (GtkPrintContext *context,
                                                      cairo_t         *cr,
                                                      double           dpi_x,
diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index edc116e..51ec1a8 100644
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -46,6 +46,7 @@ cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter
 GHashTable *         _gtk_printer_get_custom_widgets        (GtkPrinter          *printer);
 
 /* GtkPrintJob private methods: */
+GDK_AVAILABLE_IN_ALL
 void gtk_print_job_set_status (GtkPrintJob   *job,
                               GtkPrintStatus status);
 
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 2115fd1..a5dd810 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -68,6 +68,7 @@ typedef enum
   GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT = 1 << 9
 } GtkPrintCapabilities;
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
 
 #define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
@@ -110,31 +111,54 @@ struct _GtkPrinterClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                    gtk_printer_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkPrinter              *gtk_printer_new                   (const gchar     *name,
                                                            GtkPrintBackend *backend,
                                                            gboolean         virtual_);
+GDK_AVAILABLE_IN_ALL
 GtkPrintBackend         *gtk_printer_get_backend           (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_name              (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_state_message     (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_description       (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_location          (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_icon_name         (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gint                     gtk_printer_get_job_count         (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_active             (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_paused             (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_accepting_jobs     (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_virtual            (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_default            (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_accepts_pdf           (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_accepts_ps            (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 GList                   *gtk_printer_list_papers           (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup            *gtk_printer_get_default_page_size (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
 gint                     gtk_printer_compare               (GtkPrinter *a,
                                                            GtkPrinter *b);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_has_details           (GtkPrinter       *printer);
+GDK_AVAILABLE_IN_ALL
 void                     gtk_printer_request_details       (GtkPrinter       *printer);
+GDK_AVAILABLE_IN_ALL
 GtkPrintCapabilities     gtk_printer_get_capabilities      (GtkPrinter       *printer);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_get_hard_margins      (GtkPrinter       *printer,
                                                             gdouble          *top,
                                                             gdouble          *bottom,
@@ -157,6 +181,7 @@ gboolean                 gtk_printer_get_hard_margins      (GtkPrinter       *pr
 typedef gboolean (*GtkPrinterFunc) (GtkPrinter *printer,
                                    gpointer    data);
 
+GDK_AVAILABLE_IN_ALL
 void                     gtk_enumerate_printers        (GtkPrinterFunc   func,
                                                        gpointer         data,
                                                        GDestroyNotify   destroy,
diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h
index 840ed93..4ffaff2 100644
--- a/gtk/gtkprinteroption.h
+++ b/gtk/gtkprinteroption.h
@@ -88,28 +88,39 @@ struct _GtkPrinterOptionClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkPrinterOption *gtk_printer_option_new                    (const char           *name,
                                                             const char           *display_text,
                                                             GtkPrinterOptionType  type);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_set                    (GtkPrinterOption     *option,
                                                             const char           *value);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_set_has_conflict       (GtkPrinterOption     *option,
                                                             gboolean              has_conflict);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_clear_has_conflict     (GtkPrinterOption     *option);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_set_boolean            (GtkPrinterOption     *option,
                                                             gboolean              value);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_allocate_choices       (GtkPrinterOption     *option,
                                                             int                   num);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_choices_from_array     (GtkPrinterOption     *option,
                                                             int                   num_choices,
                                                             char                 *choices[],
                                                             char                 *choices_display[]);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_printer_option_has_choice             (GtkPrinterOption     *option,
                                                            const char           *choice);
+GDK_AVAILABLE_IN_ALL
 void              gtk_printer_option_set_activates_default (GtkPrinterOption     *option,
                                                            gboolean              activates);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_printer_option_get_activates_default (GtkPrinterOption     *option);
 
 
diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionset.h
index 6ea3594..a99eb82 100644
--- a/gtk/gtkprinteroptionset.h
+++ b/gtk/gtkprinteroptionset.h
@@ -28,6 +28,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 #include "gtkprinteroption.h"
 
 G_BEGIN_DECLS
@@ -66,20 +67,29 @@ typedef void (*GtkPrinterOptionSetFunc) (GtkPrinterOption  *option,
                                         gpointer           user_data);
 
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_printer_option_set_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkPrinterOptionSet *gtk_printer_option_set_new              (void);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_printer_option_set_add              (GtkPrinterOptionSet     *set,
                                                              GtkPrinterOption        *option);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_printer_option_set_remove           (GtkPrinterOptionSet     *set,
                                                              GtkPrinterOption        *option);
+GDK_AVAILABLE_IN_ALL
 GtkPrinterOption *   gtk_printer_option_set_lookup           (GtkPrinterOptionSet     *set,
                                                              const char              *name);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_printer_option_set_foreach          (GtkPrinterOptionSet     *set,
                                                              GtkPrinterOptionSetFunc  func,
                                                              gpointer                 user_data);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_printer_option_set_clear_conflicts  (GtkPrinterOptionSet     *set);
+GDK_AVAILABLE_IN_ALL
 GList *              gtk_printer_option_set_get_groups       (GtkPrinterOptionSet     *set);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_printer_option_set_foreach_in_group (GtkPrinterOptionSet     *set,
                                                              const char              *group,
                                                              GtkPrinterOptionSetFunc  func,
diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidget.h
index b688cf6..30f77f4 100644
--- a/gtk/gtkprinteroptionwidget.h
+++ b/gtk/gtkprinteroptionwidget.h
@@ -54,13 +54,19 @@ struct _GtkPrinterOptionWidgetClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget   *gtk_printer_option_widget_new                (GtkPrinterOption       *source);
+GDK_AVAILABLE_IN_ALL
 void         gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
                                                           GtkPrinterOption       *source);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
+GDK_AVAILABLE_IN_ALL
 GtkWidget   *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_printer_option_widget_get_value          (GtkPrinterOptionWidget *setting);
 
 G_END_DECLS
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 0c19802..09cddd9 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -76,58 +76,89 @@ struct _GtkPrintJobClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkPrintJob             *gtk_print_job_new                    (const gchar              *title,
                                                               GtkPrinter               *printer,
                                                               GtkPrintSettings         *settings,
                                                               GtkPageSetup             *page_setup);
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings        *gtk_print_job_get_settings           (GtkPrintJob              *job);
+GDK_AVAILABLE_IN_ALL
 GtkPrinter              *gtk_print_job_get_printer            (GtkPrintJob              *job);
+GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_print_job_get_title              (GtkPrintJob              *job);
+GDK_AVAILABLE_IN_ALL
 GtkPrintStatus           gtk_print_job_get_status             (GtkPrintJob              *job);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_print_job_set_source_file        (GtkPrintJob              *job,
                                                               const gchar              *filename,
                                                               GError                  **error);
+GDK_AVAILABLE_IN_ALL
 cairo_surface_t         *gtk_print_job_get_surface            (GtkPrintJob              *job,
                                                               GError                  **error);
+GDK_AVAILABLE_IN_ALL
 void                     gtk_print_job_set_track_print_status (GtkPrintJob              *job,
                                                               gboolean                  track_status);
+GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_print_job_get_track_print_status (GtkPrintJob              *job);
+GDK_AVAILABLE_IN_ALL
 void                     gtk_print_job_send                   (GtkPrintJob              *job,
                                                               GtkPrintJobCompleteFunc   callback,
                                                               gpointer                  user_data,
                                                               GDestroyNotify            dnotify);
 
+GDK_AVAILABLE_IN_ALL
 GtkPrintPages     gtk_print_job_get_pages       (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_pages       (GtkPrintJob       *job,
                                                  GtkPrintPages      pages);
+GDK_AVAILABLE_IN_ALL
 GtkPageRange *    gtk_print_job_get_page_ranges (GtkPrintJob       *job,
                                                  gint              *n_ranges);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_page_ranges (GtkPrintJob       *job,
                                                  GtkPageRange      *ranges,
                                                  gint               n_ranges);
+GDK_AVAILABLE_IN_ALL
 GtkPageSet        gtk_print_job_get_page_set    (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_page_set    (GtkPrintJob       *job,
                                                  GtkPageSet         page_set);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_print_job_get_num_copies  (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_num_copies  (GtkPrintJob       *job,
                                                  gint               num_copies);
+GDK_AVAILABLE_IN_ALL
 gdouble           gtk_print_job_get_scale       (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_scale       (GtkPrintJob       *job,
                                                  gdouble            scale);
+GDK_AVAILABLE_IN_ALL
 guint             gtk_print_job_get_n_up        (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_n_up        (GtkPrintJob       *job,
                                                  guint              n_up);
+GDK_AVAILABLE_IN_ALL
 GtkNumberUpLayout gtk_print_job_get_n_up_layout (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_n_up_layout (GtkPrintJob       *job,
                                                  GtkNumberUpLayout  layout);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_job_get_rotate      (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_rotate      (GtkPrintJob       *job,
                                                  gboolean           rotate);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_job_get_collate     (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_collate     (GtkPrintJob       *job,
                                                  gboolean           collate);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_job_get_reverse     (GtkPrintJob       *job);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_reverse     (GtkPrintJob       *job,
                                                  gboolean           reverse);
 
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 49a31ce..5269f89 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -197,59 +197,92 @@ typedef enum
   GTK_PRINT_ERROR_INVALID_FILE
 } GtkPrintError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark gtk_print_error_quark (void);
 
+GDK_AVAILABLE_IN_ALL
 GType                   gtk_print_operation_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkPrintOperation *     gtk_print_operation_new                    (void);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_default_page_setup (GtkPrintOperation  *op,
                                                                     GtkPageSetup       *default_page_setup);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *          gtk_print_operation_get_default_page_setup (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_print_settings     (GtkPrintOperation  *op,
                                                                     GtkPrintSettings   *print_settings);
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *      gtk_print_operation_get_print_settings     (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_job_name           (GtkPrintOperation  *op,
                                                                     const gchar        *job_name);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_n_pages            (GtkPrintOperation  *op,
                                                                     gint                n_pages);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_current_page       (GtkPrintOperation  *op,
                                                                     gint                current_page);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_use_full_page      (GtkPrintOperation  *op,
                                                                     gboolean            full_page);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_unit               (GtkPrintOperation  *op,
                                                                     GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_export_filename    (GtkPrintOperation  *op,
                                                                     const gchar        *filename);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_track_print_status (GtkPrintOperation  *op,
                                                                     gboolean            track_status);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_show_progress      (GtkPrintOperation  *op,
                                                                     gboolean            show_progress);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_allow_async        (GtkPrintOperation  *op,
                                                                     gboolean            allow_async);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_custom_tab_label   (GtkPrintOperation  *op,
                                                                     const gchar        *label);
+GDK_AVAILABLE_IN_ALL
 GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOperation  *op,
                                                                     GtkPrintOperationAction action,
                                                                     GtkWindow          *parent,
                                                                     GError            **error);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
                                                                     GError            **error);
+GDK_AVAILABLE_IN_ALL
 GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 const gchar *           gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_draw_page_finish       (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_defer_drawing      (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_support_selection  (GtkPrintOperation  *op,
                                                                     gboolean            support_selection);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_print_operation_get_support_selection  (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_has_selection      (GtkPrintOperation  *op,
                                                                     gboolean            has_selection);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_print_operation_get_has_selection      (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_embed_page_setup   (GtkPrintOperation  *op,
                                                                     gboolean            embed);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_print_operation_get_embed_page_setup   (GtkPrintOperation  *op);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_print_operation_get_n_pages_to_print   (GtkPrintOperation  *op);
 
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow          *parent,
                                                                     GtkPageSetup       *page_setup,
                                                                     GtkPrintSettings   *settings);
@@ -269,6 +302,7 @@ GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow
 typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup,
                                         gpointer      data);
 
+GDK_AVAILABLE_IN_ALL
 void                    gtk_print_run_page_setup_dialog_async      (GtkWindow            *parent,
                                                                     GtkPageSetup         *page_setup,
                                                                     GtkPrintSettings     *settings,
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index e92376b..29345c7 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -66,11 +66,15 @@ struct _GtkPrintOperationPreviewIface
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
                                                  gint                      page_nr);
+GDK_AVAILABLE_IN_ALL
 void     gtk_print_operation_preview_end_preview (GtkPrintOperationPreview *preview);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
                                                  gint                      page_nr);
 
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 294dabd..05d6f2d 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -44,66 +44,90 @@ struct _GtkPageRange
   gint end;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_print_settings_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *gtk_print_settings_new                     (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *gtk_print_settings_copy                    (GtkPrintSettings     *other);
 
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *gtk_print_settings_new_from_file           (const gchar          *file_name,
                                                              GError              **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_settings_load_file               (GtkPrintSettings     *settings,
                                                              const gchar          *file_name,
                                                              GError              **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_settings_to_file                 (GtkPrintSettings     *settings,
                                                              const gchar          *file_name,
                                                              GError              **error);
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *gtk_print_settings_new_from_key_file       (GKeyFile             *key_file,
                                                              const gchar          *group_name,
                                                              GError              **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_settings_load_key_file           (GtkPrintSettings     *settings,
                                                              GKeyFile             *key_file,
                                                              const gchar          *group_name,
                                                              GError              **error);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_to_key_file             (GtkPrintSettings     *settings,
                                                              GKeyFile             *key_file,
                                                              const gchar          *group_name);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 const gchar *     gtk_print_settings_get                     (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              const gchar          *value);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_unset                   (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_foreach                 (GtkPrintSettings     *settings,
                                                              GtkPrintSettingsFunc  func,
                                                              gpointer              user_data);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_print_settings_get_bool                (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set_bool                (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gboolean              value);
+GDK_AVAILABLE_IN_ALL
 gdouble           gtk_print_settings_get_double              (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 gdouble           gtk_print_settings_get_double_with_default (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gdouble               def);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set_double              (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gdouble               value);
+GDK_AVAILABLE_IN_ALL
 gdouble           gtk_print_settings_get_length              (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              GtkUnit               unit);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set_length              (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gdouble               value,
                                                              GtkUnit               unit);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_print_settings_get_int                 (GtkPrintSettings     *settings,
                                                              const gchar          *key);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_print_settings_get_int_with_default    (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gint                  def);
+GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set_int                 (GtkPrintSettings     *settings,
                                                              const gchar          *key,
                                                              gint                  value);
@@ -159,87 +183,138 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 
 /* Helpers: */
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_printer           (GtkPrintSettings   *settings,
                                                                const gchar        *printer);
+GDK_AVAILABLE_IN_ALL
 GtkPageOrientation    gtk_print_settings_get_orientation       (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_orientation       (GtkPrintSettings   *settings,
                                                                GtkPageOrientation  orientation);
+GDK_AVAILABLE_IN_ALL
 GtkPaperSize *        gtk_print_settings_get_paper_size        (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_paper_size        (GtkPrintSettings   *settings,
                                                                GtkPaperSize       *paper_size);
+GDK_AVAILABLE_IN_ALL
 gdouble               gtk_print_settings_get_paper_width       (GtkPrintSettings   *settings,
                                                                GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_paper_width       (GtkPrintSettings   *settings,
                                                                gdouble             width,
                                                                GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gdouble               gtk_print_settings_get_paper_height      (GtkPrintSettings   *settings,
                                                                GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_paper_height      (GtkPrintSettings   *settings,
                                                                gdouble             height,
                                                                GtkUnit             unit);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_print_settings_get_use_color         (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_use_color         (GtkPrintSettings   *settings,
                                                                gboolean            use_color);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_print_settings_get_collate           (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_collate           (GtkPrintSettings   *settings,
                                                                gboolean            collate);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_print_settings_get_reverse           (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_reverse           (GtkPrintSettings   *settings,
                                                                gboolean            reverse);
+GDK_AVAILABLE_IN_ALL
 GtkPrintDuplex        gtk_print_settings_get_duplex            (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_duplex            (GtkPrintSettings   *settings,
                                                                GtkPrintDuplex      duplex);
+GDK_AVAILABLE_IN_ALL
 GtkPrintQuality       gtk_print_settings_get_quality           (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_quality           (GtkPrintSettings   *settings,
                                                                GtkPrintQuality     quality);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_print_settings_get_n_copies          (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_n_copies          (GtkPrintSettings   *settings,
                                                                gint                num_copies);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_print_settings_get_number_up         (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_number_up         (GtkPrintSettings   *settings,
                                                                gint                number_up);
+GDK_AVAILABLE_IN_ALL
 GtkNumberUpLayout     gtk_print_settings_get_number_up_layout  (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_number_up_layout  (GtkPrintSettings   *settings,
                                                                GtkNumberUpLayout   number_up_layout);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_print_settings_get_resolution        (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_resolution        (GtkPrintSettings   *settings,
                                                                gint                resolution);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_print_settings_get_resolution_x      (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_print_settings_get_resolution_y      (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_resolution_xy     (GtkPrintSettings   *settings,
                                                                gint                resolution_x,
                                                                gint                resolution_y);
+GDK_AVAILABLE_IN_ALL
 gdouble               gtk_print_settings_get_printer_lpi       (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_printer_lpi       (GtkPrintSettings   *settings,
                                                                gdouble             lpi);
+GDK_AVAILABLE_IN_ALL
 gdouble               gtk_print_settings_get_scale             (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_scale             (GtkPrintSettings   *settings,
                                                                gdouble             scale);
+GDK_AVAILABLE_IN_ALL
 GtkPrintPages         gtk_print_settings_get_print_pages       (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_print_pages       (GtkPrintSettings   *settings,
                                                                GtkPrintPages       pages);
+GDK_AVAILABLE_IN_ALL
 GtkPageRange *        gtk_print_settings_get_page_ranges       (GtkPrintSettings   *settings,
                                                                gint               *num_ranges);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings   *settings,
                                                                GtkPageRange       *page_ranges,
                                                                gint                num_ranges);
+GDK_AVAILABLE_IN_ALL
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_page_set          (GtkPrintSettings   *settings,
                                                                GtkPageSet          page_set);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_default_source    (GtkPrintSettings   *settings,
                                                                const gchar        *default_source);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_media_type        (GtkPrintSettings   *settings,
                                                                const gchar        *media_type);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_dither            (GtkPrintSettings   *settings,
                                                                const gchar        *dither);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_finishings        (GtkPrintSettings   *settings,
                                                                const gchar        *finishings);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_output_bin        (GtkPrintSettings   *settings,
                                                                const gchar        *output_bin);
 
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index 89e06ab..4fd6705 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -59,35 +59,54 @@ struct _GtkPrintUnixDialogClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                gtk_print_unix_dialog_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *          gtk_print_unix_dialog_new                     (const gchar *title,
                                                                     GtkWindow   *parent);
 
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_page_setup          (GtkPrintUnixDialog *dialog,
                                                                    GtkPageSetup       *page_setup);
+GDK_AVAILABLE_IN_ALL
 GtkPageSetup *       gtk_print_unix_dialog_get_page_setup          (GtkPrintUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_current_page        (GtkPrintUnixDialog *dialog,
                                                                    gint                current_page);
+GDK_AVAILABLE_IN_ALL
 gint                 gtk_print_unix_dialog_get_current_page        (GtkPrintUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_settings            (GtkPrintUnixDialog *dialog,
                                                                    GtkPrintSettings   *settings);
+GDK_AVAILABLE_IN_ALL
 GtkPrintSettings *   gtk_print_unix_dialog_get_settings            (GtkPrintUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 GtkPrinter *         gtk_print_unix_dialog_get_selected_printer    (GtkPrintUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_add_custom_tab          (GtkPrintUnixDialog *dialog,
                                                                    GtkWidget          *child,
                                                                    GtkWidget          *tab_label);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_manual_capabilities (GtkPrintUnixDialog *dialog,
                                                                    GtkPrintCapabilities capabilities);
+GDK_AVAILABLE_IN_ALL
 GtkPrintCapabilities gtk_print_unix_dialog_get_manual_capabilities (GtkPrintUnixDialog  *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_support_selection   (GtkPrintUnixDialog  *dialog,
                                                                    gboolean             support_selection);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_print_unix_dialog_get_support_selection   (GtkPrintUnixDialog  *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_has_selection       (GtkPrintUnixDialog  *dialog,
                                                                    gboolean             has_selection);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_print_unix_dialog_get_has_selection       (GtkPrintUnixDialog  *dialog);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_embed_page_setup    (GtkPrintUnixDialog *dialog,
                                                                    gboolean            embed);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_print_unix_dialog_get_embed_page_setup    (GtkPrintUnixDialog *dialog);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_print_unix_dialog_get_page_setup_set      (GtkPrintUnixDialog *dialog);
 
 G_END_DECLS
diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutils.h
index 84aecab..47678b3 100644
--- a/gtk/gtkprintutils.h
+++ b/gtk/gtkprintutils.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_PRINT_UTILS_H__
 #define __GTK_PRINT_UTILS_H__
 
-
+#include <gdk/gdk.h>
 #include "gtkenums.h"
 
 
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 9ae044b..70c936d 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -65,31 +65,46 @@ struct _GtkProgressBarClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_progress_bar_get_type             (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_progress_bar_new                  (void);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_progress_bar_pulse                (GtkProgressBar *pbar);
+GDK_AVAILABLE_IN_ALL
 void       gtk_progress_bar_set_text             (GtkProgressBar *pbar,
                                                   const gchar    *text);
+GDK_AVAILABLE_IN_ALL
 void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
                                                   gdouble         fraction);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
                                                   gdouble         fraction);
+GDK_AVAILABLE_IN_ALL
 void       gtk_progress_bar_set_inverted         (GtkProgressBar *pbar,
                                                   gboolean        inverted);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *      gtk_progress_bar_get_text       (GtkProgressBar *pbar);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_progress_bar_get_inverted    (GtkProgressBar *pbar);
+GDK_AVAILABLE_IN_ALL
 void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
                                                    PangoEllipsizeMode  mode);
+GDK_AVAILABLE_IN_ALL
 PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar     *pbar);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_progress_bar_set_show_text (GtkProgressBar     *pbar,
                                                    gboolean            show_text);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_progress_bar_get_show_text (GtkProgressBar     *pbar);
 
 G_END_DECLS
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index fccdef7..95351de 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -69,18 +69,25 @@ struct _GtkRadioActionClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_radio_action_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
                                                     const gchar           *label,
                                                     const gchar           *tooltip,
                                                     const gchar           *stock_id,
                                                     gint                   value);
+GDK_AVAILABLE_IN_ALL
 GSList         *gtk_radio_action_get_group         (GtkRadioAction        *action);
+GDK_AVAILABLE_IN_ALL
 void            gtk_radio_action_set_group         (GtkRadioAction        *action,
                                                     GSList                *group);
+GDK_AVAILABLE_IN_ALL
 void            gtk_radio_action_join_group        (GtkRadioAction        *action,
                                                     GtkRadioAction        *group_source);
+GDK_AVAILABLE_IN_ALL
 gint            gtk_radio_action_get_current_value (GtkRadioAction        *action);
+GDK_AVAILABLE_IN_ALL
 void            gtk_radio_action_set_current_value (GtkRadioAction        *action,
                                                     gint                   current_value);
 
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index b4121a6..8683596 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -70,21 +70,31 @@ struct _GtkRadioButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_radio_button_get_type         (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new                           (GSList         *group);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new_from_widget               (GtkRadioButton *radio_group_member);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new_with_label                (GSList         *group,
                                                            const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new_with_label_from_widget    (GtkRadioButton *radio_group_member,
                                                            const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new_with_mnemonic             (GSList         *group,
                                                            const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member,
                                                            const gchar    *label);
+GDK_AVAILABLE_IN_ALL
 GSList*    gtk_radio_button_get_group                     (GtkRadioButton *radio_button);
+GDK_AVAILABLE_IN_ALL
 void       gtk_radio_button_set_group                     (GtkRadioButton *radio_button,
                                                            GSList         *group);
+GDK_AVAILABLE_IN_ALL
 void            gtk_radio_button_join_group        (GtkRadioButton        *radio_button,
                                                     GtkRadioButton        *group_source);
 G_END_DECLS
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index c365c99..fc29be8 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -70,19 +70,28 @@ struct _GtkRadioMenuItemClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_radio_menu_item_get_type                 (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_menu_item_new                           (GSList           *group);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_menu_item_new_with_label                (GSList           *group,
                                                              const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_menu_item_new_with_mnemonic             (GSList           *group,
                                                              const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_radio_menu_item_new_from_widget               (GtkRadioMenuItem *group);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
                                                              const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_radio_menu_item_new_with_label_from_widget    (GtkRadioMenuItem *group,
                                                              const gchar      *label);
+GDK_AVAILABLE_IN_ALL
 GSList*    gtk_radio_menu_item_get_group                     (GtkRadioMenuItem *radio_menu_item);
+GDK_AVAILABLE_IN_ALL
 void       gtk_radio_menu_item_set_group                     (GtkRadioMenuItem *radio_menu_item,
                                                              GSList           *group);
 
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 95593fc..c6e9ce7 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -55,15 +55,22 @@ struct _GtkRadioToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_radio_tool_button_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new                        (GSList             *group);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new_from_stock             (GSList             *group,
                                                               const gchar        *stock_id);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new_from_widget            (GtkRadioToolButton *group);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new_with_stock_from_widget (GtkRadioToolButton *group,
                                                               const gchar        *stock_id);
+GDK_AVAILABLE_IN_ALL
 GSList *     gtk_radio_tool_button_get_group                  (GtkRadioToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void         gtk_radio_tool_button_set_group                  (GtkRadioToolButton *button,
                                                               GSList             *group);
 
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 8495cdb..94c809c 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -86,62 +86,91 @@ struct _GtkRangeClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType              gtk_range_get_type                      (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_adjustment                (GtkRange      *range,
                                                             GtkAdjustment *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment*     gtk_range_get_adjustment                (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_inverted                  (GtkRange      *range,
                                                             gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_range_get_inverted                  (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_flippable                 (GtkRange      *range,
                                                             gboolean       flippable);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_range_get_flippable                 (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_slider_size_fixed         (GtkRange      *range,
                                                             gboolean       size_fixed);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_range_get_slider_size_fixed         (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_min_slider_size           (GtkRange      *range,
                                                             gint           min_size);
+GDK_AVAILABLE_IN_ALL
 gint               gtk_range_get_min_slider_size           (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_get_range_rect                (GtkRange      *range,
                                                             GdkRectangle  *range_rect);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_get_slider_range              (GtkRange      *range,
                                                             gint          *slider_start,
                                                             gint          *slider_end);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_lower_stepper_sensitivity (GtkRange      *range,
                                                             GtkSensitivityType sensitivity);
+GDK_AVAILABLE_IN_ALL
 GtkSensitivityType gtk_range_get_lower_stepper_sensitivity (GtkRange      *range);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_upper_stepper_sensitivity (GtkRange      *range,
                                                             GtkSensitivityType sensitivity);
+GDK_AVAILABLE_IN_ALL
 GtkSensitivityType gtk_range_get_upper_stepper_sensitivity (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_increments                (GtkRange      *range,
                                                             gdouble        step,
                                                             gdouble        page);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_range                     (GtkRange      *range,
                                                             gdouble        min,
                                                             gdouble        max);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_value                     (GtkRange      *range,
                                                             gdouble        value);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_range_get_value                     (GtkRange      *range);
 
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_show_fill_level           (GtkRange      *range,
                                                             gboolean       show_fill_level);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_range_get_show_fill_level           (GtkRange      *range);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_restrict_to_fill_level    (GtkRange      *range,
                                                             gboolean       restrict_to_fill_level);
+GDK_AVAILABLE_IN_ALL
 gboolean           gtk_range_get_restrict_to_fill_level    (GtkRange      *range);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_fill_level                (GtkRange      *range,
                                                             gdouble        fill_level);
+GDK_AVAILABLE_IN_ALL
 gdouble            gtk_range_get_fill_level                (GtkRange      *range);
+GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_round_digits              (GtkRange      *range,
                                                             gint           round_digits);
+GDK_AVAILABLE_IN_ALL
 gint                gtk_range_get_round_digits              (GtkRange      *range);
 
 /* internal API */
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index a0654df..27826e6 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -59,17 +59,22 @@ struct _GtkRecentActionClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_recent_action_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAction *gtk_recent_action_new              (const gchar      *name,
                                                const gchar      *label,
                                                const gchar      *tooltip,
                                                const gchar      *stock_id);
+GDK_AVAILABLE_IN_ALL
 GtkAction *gtk_recent_action_new_for_manager  (const gchar      *name,
                                                const gchar      *label,
                                                const gchar      *tooltip,
                                                const gchar      *stock_id,
                                                GtkRecentManager *manager);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_recent_action_get_show_numbers (GtkRecentAction  *action);
+GDK_AVAILABLE_IN_ALL
 void       gtk_recent_action_set_show_numbers (GtkRecentAction  *action,
                                                gboolean          show_numbers);
 
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 66626ca..ec14f36 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -92,6 +92,7 @@ typedef enum
   GTK_RECENT_CHOOSER_ERROR_INVALID_URI
 } GtkRecentChooserError;
 
+GDK_AVAILABLE_IN_ALL
 GQuark  gtk_recent_chooser_error_quark (void);
 
 
@@ -132,35 +133,53 @@ struct _GtkRecentChooserIface
   void             (* selection_changed)  (GtkRecentChooser  *chooser);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType   gtk_recent_chooser_get_type    (void) G_GNUC_CONST;
 
 /*
  * Configuration
  */
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_show_private    (GtkRecentChooser  *chooser,
                                                          gboolean           show_private);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_show_private    (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_show_not_found  (GtkRecentChooser  *chooser,
                                                          gboolean           show_not_found);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_show_not_found  (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_select_multiple (GtkRecentChooser  *chooser,
                                                          gboolean           select_multiple);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_select_multiple (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_limit           (GtkRecentChooser  *chooser,
                                                          gint               limit);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_recent_chooser_get_limit           (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_local_only      (GtkRecentChooser  *chooser,
                                                          gboolean           local_only);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_local_only      (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_show_tips       (GtkRecentChooser  *chooser,
                                                          gboolean           show_tips);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_show_tips       (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_show_icons      (GtkRecentChooser  *chooser,
                                                          gboolean           show_icons);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_chooser_get_show_icons      (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_sort_type       (GtkRecentChooser  *chooser,
                                                          GtkRecentSortType  sort_type);
+GDK_AVAILABLE_IN_ALL
 GtkRecentSortType gtk_recent_chooser_get_sort_type       (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void              gtk_recent_chooser_set_sort_func       (GtkRecentChooser  *chooser,
                                                          GtkRecentSortFunc  sort_func,
                                                          gpointer           sort_data,
@@ -169,32 +188,46 @@ void              gtk_recent_chooser_set_sort_func       (GtkRecentChooser  *cho
 /*
  * Items handling
  */
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_recent_chooser_set_current_uri  (GtkRecentChooser  *chooser,
                                                    const gchar       *uri,
                                                    GError           **error);
+GDK_AVAILABLE_IN_ALL
 gchar *        gtk_recent_chooser_get_current_uri  (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 GtkRecentInfo *gtk_recent_chooser_get_current_item (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_recent_chooser_select_uri       (GtkRecentChooser  *chooser,
                                                    const gchar       *uri,
                                                    GError           **error);
+GDK_AVAILABLE_IN_ALL
 void           gtk_recent_chooser_unselect_uri     (GtkRecentChooser  *chooser,
                                                    const gchar       *uri);
+GDK_AVAILABLE_IN_ALL
 void           gtk_recent_chooser_select_all       (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 void           gtk_recent_chooser_unselect_all     (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 GList *        gtk_recent_chooser_get_items        (GtkRecentChooser  *chooser);
+GDK_AVAILABLE_IN_ALL
 gchar **       gtk_recent_chooser_get_uris         (GtkRecentChooser  *chooser,
                                                    gsize             *length);
 
 /*
  * Filters
  */
+GDK_AVAILABLE_IN_ALL
 void            gtk_recent_chooser_add_filter    (GtkRecentChooser *chooser,
                                                   GtkRecentFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 void            gtk_recent_chooser_remove_filter (GtkRecentChooser *chooser,
                                                   GtkRecentFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 GSList *        gtk_recent_chooser_list_filters  (GtkRecentChooser *chooser);
+GDK_AVAILABLE_IN_ALL
 void            gtk_recent_chooser_set_filter    (GtkRecentChooser *chooser,
                                                   GtkRecentFilter  *filter);
+GDK_AVAILABLE_IN_ALL
 GtkRecentFilter *gtk_recent_chooser_get_filter    (GtkRecentChooser *chooser);
 
 
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index ff557db..8511944 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -61,12 +61,15 @@ struct _GtkRecentChooserDialogClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_recent_chooser_dialog_get_type        (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_dialog_new             (const gchar      *title,
                                                      GtkWindow        *parent,
                                                      const gchar      *first_button_text,
                                                      ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_dialog_new_for_manager (const gchar      *title,
                                                      GtkWindow        *parent,
                                                      GtkRecentManager *manager,
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index 0ce04f1..1ae9ad4 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -58,12 +58,17 @@ struct _GtkRecentChooserMenuClass
   void (* gtk_recent4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_recent_chooser_menu_get_type         (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_menu_new              (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_menu_new_for_manager  (GtkRecentManager     *manager);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_recent_chooser_menu_get_show_numbers (GtkRecentChooserMenu *menu);
+GDK_AVAILABLE_IN_ALL
 void       gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu,
                                                     gboolean              show_numbers);
 
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index 460dd6c..b4331be 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -59,8 +59,11 @@ struct _GtkRecentChooserWidgetClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_recent_chooser_widget_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_widget_new             (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager);
 
 G_END_DECLS
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 3501ca8..f97eb57 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -24,6 +24,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -92,31 +93,44 @@ struct _GtkRecentFilterInfo
   gint age;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkRecentFilter *     gtk_recent_filter_new      (void);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
                                                  const gchar     *name);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_recent_filter_get_name (GtkRecentFilter *filter);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_mime_type      (GtkRecentFilter      *filter,
                                           const gchar          *mime_type);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_pattern        (GtkRecentFilter      *filter,
                                           const gchar          *pattern);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_pixbuf_formats (GtkRecentFilter      *filter);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_application    (GtkRecentFilter      *filter,
                                           const gchar          *application);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_group          (GtkRecentFilter      *filter,
                                           const gchar          *group);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_age            (GtkRecentFilter      *filter,
                                           gint                  days);
+GDK_AVAILABLE_IN_ALL
 void gtk_recent_filter_add_custom         (GtkRecentFilter      *filter,
                                           GtkRecentFilterFlags  needed,
                                           GtkRecentFilterFunc   func,
                                           gpointer              data,
                                           GDestroyNotify        data_destroy);
 
+GDK_AVAILABLE_IN_ALL
 GtkRecentFilterFlags gtk_recent_filter_get_needed (GtkRecentFilter           *filter);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_recent_filter_filter     (GtkRecentFilter           *filter,
                                                   const GtkRecentFilterInfo *filter_info);
 
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index a1d7500..662e8d3 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -155,74 +155,112 @@ typedef enum
  * Since: 2.10
  */
 #define GTK_RECENT_MANAGER_ERROR       (gtk_recent_manager_error_quark ())
+GDK_AVAILABLE_IN_ALL
 GQuark         gtk_recent_manager_error_quark (void);
 
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_recent_manager_get_type       (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkRecentManager *gtk_recent_manager_new            (void);
+GDK_AVAILABLE_IN_ALL
 GtkRecentManager *gtk_recent_manager_get_default    (void);
 
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_manager_add_item       (GtkRecentManager     *manager,
                                                     const gchar          *uri);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_manager_add_full       (GtkRecentManager     *manager,
                                                     const gchar          *uri,
                                                     const GtkRecentData  *recent_data);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_manager_remove_item    (GtkRecentManager     *manager,
                                                     const gchar          *uri,
                                                     GError              **error);
+GDK_AVAILABLE_IN_ALL
 GtkRecentInfo *   gtk_recent_manager_lookup_item    (GtkRecentManager     *manager,
                                                     const gchar          *uri,
                                                     GError              **error);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_manager_has_item       (GtkRecentManager     *manager,
                                                     const gchar          *uri);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_recent_manager_move_item      (GtkRecentManager     *manager,
                                                     const gchar          *uri,
                                                     const gchar          *new_uri,
                                                     GError              **error);
+GDK_AVAILABLE_IN_ALL
 GList *           gtk_recent_manager_get_items      (GtkRecentManager     *manager);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_recent_manager_purge_items    (GtkRecentManager     *manager,
                                                     GError              **error);
 
 
+GDK_AVAILABLE_IN_ALL
 GType                gtk_recent_info_get_type             (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_recent_info_get_uri              (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_recent_info_get_description      (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 time_t                gtk_recent_info_get_added            (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 time_t                gtk_recent_info_get_modified         (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 time_t                gtk_recent_info_get_visited          (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_get_private_hint     (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_get_application_info (GtkRecentInfo  *info,
                                                            const gchar    *app_name,
                                                            const gchar   **app_exec,
                                                            guint          *count,
                                                            time_t         *time_);
+GDK_AVAILABLE_IN_ALL
 GAppInfo *            gtk_recent_info_create_app_info      (GtkRecentInfo  *info,
                                                             const gchar    *app_name,
                                                             GError        **error);
+GDK_AVAILABLE_IN_ALL
 gchar **              gtk_recent_info_get_applications     (GtkRecentInfo  *info,
                                                            gsize          *length) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 gchar *               gtk_recent_info_last_application     (GtkRecentInfo  *info) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_has_application      (GtkRecentInfo  *info,
                                                            const gchar    *app_name);
+GDK_AVAILABLE_IN_ALL
 gchar **              gtk_recent_info_get_groups           (GtkRecentInfo  *info,
                                                            gsize          *length) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_has_group            (GtkRecentInfo  *info,
                                                            const gchar    *group_name);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *           gtk_recent_info_get_icon             (GtkRecentInfo  *info,
                                                            gint            size);
+GDK_AVAILABLE_IN_ALL
 GIcon *               gtk_recent_info_get_gicon            (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gchar *               gtk_recent_info_get_short_name       (GtkRecentInfo  *info) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 gchar *               gtk_recent_info_get_uri_display      (GtkRecentInfo  *info) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_recent_info_get_age              (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_is_local             (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_exists               (GtkRecentInfo  *info);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_match                (GtkRecentInfo  *info_a,
                                                            GtkRecentInfo  *info_b);
 
diff --git a/gtk/gtkrevealer.h b/gtk/gtkrevealer.h
index 30db0a6..ce0f997 100644
--- a/gtk/gtkrevealer.h
+++ b/gtk/gtkrevealer.h
@@ -56,17 +56,26 @@ struct _GtkRevealerClass {
   GtkBinClass parent_class;
 };
 
+GDK_AVAILABLE_IN_3_10
 GType                      gtk_revealer_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_10
 GtkWidget*                 gtk_revealer_new                     (void);
+GDK_AVAILABLE_IN_3_10
 gboolean                   gtk_revealer_get_reveal_child        (GtkRevealer               *revealer);
+GDK_AVAILABLE_IN_3_10
 void                       gtk_revealer_set_reveal_child        (GtkRevealer               *revealer,
                                                                  gboolean                   reveal_child);
+GDK_AVAILABLE_IN_3_10
 gboolean                   gtk_revealer_get_child_revealed      (GtkRevealer               *revealer);
+GDK_AVAILABLE_IN_3_10
 guint                      gtk_revealer_get_transition_duration (GtkRevealer               *revealer);
+GDK_AVAILABLE_IN_3_10
 void                       gtk_revealer_set_transition_duration (GtkRevealer               *revealer,
                                                                  guint                      duration);
+GDK_AVAILABLE_IN_3_10
 void                       gtk_revealer_set_transition_type     (GtkRevealer               *revealer,
                                                                  GtkRevealerTransitionType  transition);
+GDK_AVAILABLE_IN_3_10
 GtkRevealerTransitionType  gtk_revealer_get_transition_type     (GtkRevealer               *revealer);
 
 
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index a54b38e..6fe2695 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -75,37 +75,50 @@ struct _GtkScaleClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_scale_get_type           (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget       * gtk_scale_new                (GtkOrientation   orientation,
                                                 GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkWidget       * gtk_scale_new_with_range     (GtkOrientation   orientation,
                                                 gdouble          min,
                                                 gdouble          max,
                                                 gdouble          step);
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_set_digits         (GtkScale        *scale,
                                                 gint             digits);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_scale_get_digits         (GtkScale        *scale);
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_set_draw_value     (GtkScale        *scale,
                                                 gboolean         draw_value);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_scale_get_draw_value     (GtkScale        *scale);
 GDK_AVAILABLE_IN_3_4
 void              gtk_scale_set_has_origin     (GtkScale        *scale,
                                                 gboolean         has_origin);
 GDK_AVAILABLE_IN_3_4
 gboolean          gtk_scale_get_has_origin     (GtkScale        *scale);
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_set_value_pos      (GtkScale        *scale,
                                                 GtkPositionType  pos);
+GDK_AVAILABLE_IN_ALL
 GtkPositionType   gtk_scale_get_value_pos      (GtkScale        *scale);
 
+GDK_AVAILABLE_IN_ALL
 PangoLayout     * gtk_scale_get_layout         (GtkScale        *scale);
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_get_layout_offsets (GtkScale        *scale,
                                                 gint            *x,
                                                 gint            *y);
 
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_add_mark           (GtkScale        *scale,
                                                 gdouble          value,
                                                 GtkPositionType  position,
                                                 const gchar     *markup);
+GDK_AVAILABLE_IN_ALL
 void              gtk_scale_clear_marks        (GtkScale        *scale);
 
 
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 7aff9ac..2432ae0 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -76,22 +76,32 @@ struct _GtkScaleButtonClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_scale_button_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_scale_button_new              (GtkIconSize      size,
                                                     gdouble          min,
                                                     gdouble          max,
                                                     gdouble          step,
                                                     const gchar    **icons);
+GDK_AVAILABLE_IN_ALL
 void             gtk_scale_button_set_icons        (GtkScaleButton  *button,
                                                     const gchar    **icons);
+GDK_AVAILABLE_IN_ALL
 gdouble          gtk_scale_button_get_value        (GtkScaleButton  *button);
+GDK_AVAILABLE_IN_ALL
 void             gtk_scale_button_set_value        (GtkScaleButton  *button,
                                                     gdouble          value);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment *  gtk_scale_button_get_adjustment   (GtkScaleButton  *button);
+GDK_AVAILABLE_IN_ALL
 void             gtk_scale_button_set_adjustment   (GtkScaleButton  *button,
                                                     GtkAdjustment   *adjustment);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_scale_button_get_plus_button  (GtkScaleButton  *button);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_scale_button_get_minus_button (GtkScaleButton  *button);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_scale_button_get_popup        (GtkScaleButton  *button);
 
 G_END_DECLS
diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index a6e292f..112301f 100644
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -22,6 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
 
@@ -41,17 +42,26 @@ struct _GtkScrollableInterface
 };
 
 /* Public API */
+GDK_AVAILABLE_IN_ALL
 GType                gtk_scrollable_get_type               (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment       *gtk_scrollable_get_hadjustment        (GtkScrollable       *scrollable);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_scrollable_set_hadjustment        (GtkScrollable       *scrollable,
                                                            GtkAdjustment       *hadjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment       *gtk_scrollable_get_vadjustment        (GtkScrollable       *scrollable);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_scrollable_set_vadjustment        (GtkScrollable       *scrollable,
                                                            GtkAdjustment       *vadjustment);
+GDK_AVAILABLE_IN_ALL
 GtkScrollablePolicy  gtk_scrollable_get_hscroll_policy     (GtkScrollable       *scrollable);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_scrollable_set_hscroll_policy     (GtkScrollable       *scrollable,
                                                            GtkScrollablePolicy  policy);
+GDK_AVAILABLE_IN_ALL
 GtkScrollablePolicy  gtk_scrollable_get_vscroll_policy     (GtkScrollable       *scrollable);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_scrollable_set_vscroll_policy     (GtkScrollable       *scrollable,
                                                            GtkScrollablePolicy  policy);
 
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 0050939..46a0b2f 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -63,7 +63,9 @@ struct _GtkScrollbarClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_scrollbar_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_scrollbar_new      (GtkOrientation  orientation,
                                     GtkAdjustment  *adjustment);
 
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 52c291c..be62c8d 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -81,39 +81,58 @@ struct _GtkScrolledWindowClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_scrolled_window_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_scrolled_window_new               (GtkAdjustment     *hadjustment,
                                                      GtkAdjustment     *vadjustment);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_hadjustment   (GtkScrolledWindow *scrolled_window,
                                                      GtkAdjustment     *hadjustment);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_vadjustment   (GtkScrolledWindow *scrolled_window,
                                                      GtkAdjustment     *vadjustment);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment* gtk_scrolled_window_get_hadjustment   (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment* gtk_scrolled_window_get_vadjustment   (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_scrolled_window_get_hscrollbar    (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_scrolled_window_get_vscrollbar    (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_policy        (GtkScrolledWindow *scrolled_window,
                                                      GtkPolicyType      hscrollbar_policy,
                                                      GtkPolicyType      vscrollbar_policy);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_get_policy        (GtkScrolledWindow *scrolled_window,
                                                      GtkPolicyType     *hscrollbar_policy,
                                                      GtkPolicyType     *vscrollbar_policy);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_placement     (GtkScrolledWindow *scrolled_window,
                                                      GtkCornerType      window_placement);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_unset_placement   (GtkScrolledWindow *scrolled_window);
 
+GDK_AVAILABLE_IN_ALL
 GtkCornerType  gtk_scrolled_window_get_placement     (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_shadow_type   (GtkScrolledWindow *scrolled_window,
                                                      GtkShadowType      type);
+GDK_AVAILABLE_IN_ALL
 GtkShadowType  gtk_scrolled_window_get_shadow_type   (GtkScrolledWindow *scrolled_window);
 GDK_DEPRECATED_IN_3_8_FOR(gtk_container_add)
 void          gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
                                                      GtkWidget         *child);
 
+GDK_AVAILABLE_IN_ALL
 gint           gtk_scrolled_window_get_min_content_width  (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_width  (GtkScrolledWindow *scrolled_window,
                                                            gint               width);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
+GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
                                                            gint               height);
 GDK_AVAILABLE_IN_3_4
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index c77315f..2bc5fe0 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -69,122 +69,174 @@ struct _GtkTargetEntry
   guint  info;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_target_list_get_type  (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTargetList *gtk_target_list_new       (const GtkTargetEntry *targets,
                                           guint                 ntargets);
+GDK_AVAILABLE_IN_ALL
 GtkTargetList *gtk_target_list_ref       (GtkTargetList  *list);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_unref     (GtkTargetList  *list);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add       (GtkTargetList  *list,
                                           GdkAtom         target,
                                           guint           flags,
                                           guint           info);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add_text_targets      (GtkTargetList  *list,
                                                       guint           info);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add_rich_text_targets (GtkTargetList  *list,
                                                       guint           info,
                                                       gboolean        deserializable,
                                                       GtkTextBuffer  *buffer);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add_image_targets     (GtkTargetList  *list,
                                                       guint           info,
                                                       gboolean        writable);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add_uri_targets       (GtkTargetList  *list,
                                                       guint           info);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_add_table (GtkTargetList        *list,
                                           const GtkTargetEntry *targets,
                                           guint                 ntargets);
+GDK_AVAILABLE_IN_ALL
 void           gtk_target_list_remove    (GtkTargetList  *list,
                                           GdkAtom         target);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_target_list_find      (GtkTargetList  *list,
                                           GdkAtom         target,
                                           guint          *info);
 
+GDK_AVAILABLE_IN_ALL
 GtkTargetEntry * gtk_target_table_new_from_list (GtkTargetList  *list,
                                                  gint           *n_targets);
+GDK_AVAILABLE_IN_ALL
 void             gtk_target_table_free          (GtkTargetEntry *targets,
                                                  gint            n_targets);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_owner_set             (GtkWidget  *widget,
                                               GdkAtom     selection,
                                               guint32     time_);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_owner_set_for_display (GdkDisplay *display,
                                               GtkWidget  *widget,
                                               GdkAtom     selection,
                                               guint32     time_);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_selection_add_target    (GtkWidget            *widget,
                                       GdkAtom               selection,
                                       GdkAtom               target,
                                       guint                 info);
+GDK_AVAILABLE_IN_ALL
 void     gtk_selection_add_targets   (GtkWidget            *widget,
                                       GdkAtom               selection,
                                       const GtkTargetEntry *targets,
                                       guint                 ntargets);
+GDK_AVAILABLE_IN_ALL
 void     gtk_selection_clear_targets (GtkWidget            *widget,
                                       GdkAtom               selection);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_convert       (GtkWidget            *widget,
                                       GdkAtom               selection,
                                       GdkAtom               target,
                                       guint32               time_);
+GDK_AVAILABLE_IN_ALL
 void     gtk_selection_remove_all    (GtkWidget             *widget);
 
+GDK_AVAILABLE_IN_ALL
 GdkAtom       gtk_selection_data_get_selection (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 GdkAtom       gtk_selection_data_get_target    (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 GdkAtom       gtk_selection_data_get_data_type (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_selection_data_get_format    (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 const guchar *gtk_selection_data_get_data      (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_selection_data_get_length    (const GtkSelectionData *selection_data);
+GDK_AVAILABLE_IN_ALL
 const guchar *gtk_selection_data_get_data_with_length
                                                (const GtkSelectionData *selection_data,
                                                 gint                   *length);
 
+GDK_AVAILABLE_IN_ALL
 GdkDisplay   *gtk_selection_data_get_display   (const GtkSelectionData *selection_data);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_selection_data_set      (GtkSelectionData     *selection_data,
                                       GdkAtom               type,
                                       gint                  format,
                                       const guchar         *data,
                                       gint                  length);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_set_text (GtkSelectionData     *selection_data,
                                       const gchar          *str,
                                       gint                  len);
+GDK_AVAILABLE_IN_ALL
 guchar * gtk_selection_data_get_text (const GtkSelectionData     *selection_data);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_set_pixbuf   (GtkSelectionData  *selection_data,
                                           GdkPixbuf         *pixbuf);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gtk_selection_data_get_pixbuf (const GtkSelectionData  *selection_data);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_set_uris (GtkSelectionData     *selection_data,
                                       gchar               **uris);
+GDK_AVAILABLE_IN_ALL
 gchar  **gtk_selection_data_get_uris (const GtkSelectionData     *selection_data);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_get_targets          (const GtkSelectionData  *selection_data,
                                                   GdkAtom          **targets,
                                                   gint              *n_atoms);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_targets_include_text (const GtkSelectionData  *selection_data);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_targets_include_rich_text (const GtkSelectionData *selection_data,
                                                        GtkTextBuffer    *buffer);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_targets_include_image (const GtkSelectionData  *selection_data,
                                                    gboolean           writable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_selection_data_targets_include_uri  (const GtkSelectionData  *selection_data);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_targets_include_text                (GdkAtom       *targets,
                                                   gint           n_targets);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_targets_include_rich_text           (GdkAtom       *targets,
                                                   gint           n_targets,
                                                   GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_targets_include_image               (GdkAtom       *targets,
                                                   gint           n_targets,
                                                   gboolean       writable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_targets_include_uri                 (GdkAtom       *targets,
                                                   gint           n_targets);
 
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_selection_data_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkSelectionData *gtk_selection_data_copy     (const GtkSelectionData *data);
+GDK_AVAILABLE_IN_ALL
 void              gtk_selection_data_free     (GtkSelectionData *data);
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_target_entry_get_type    (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTargetEntry   *gtk_target_entry_new        (const gchar    *target,
                                                guint           flags,
                                                guint           info);
+GDK_AVAILABLE_IN_ALL
 GtkTargetEntry   *gtk_target_entry_copy       (GtkTargetEntry *data);
+GDK_AVAILABLE_IN_ALL
 void              gtk_target_entry_free       (GtkTargetEntry *data);
 
 G_END_DECLS
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 4a9b63a..1ce4130 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -66,7 +66,9 @@ struct _GtkSeparatorClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType       gtk_separator_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_separator_new      (GtkOrientation orientation);
 
 
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index f2bb03f..98e4c56 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -63,7 +63,9 @@ struct _GtkSeparatorMenuItemClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_separator_menu_item_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_separator_menu_item_new            (void);
 
 
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 1a941f7..5513f83 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -58,10 +58,14 @@ struct _GtkSeparatorToolItemClass
   void (* _gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_separator_tool_item_new      (void);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item);
+GDK_AVAILABLE_IN_ALL
 void         gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
                                               gboolean              draw);
 
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 9e6434a..b6a13dc 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -78,44 +78,58 @@ struct _GtkSettingsValue
 
 
 /* --- functions --- */
+GDK_AVAILABLE_IN_ALL
 GType           gtk_settings_get_type                (void) G_GNUC_CONST;
 #ifndef GDK_MULTIHEAD_SAFE
+GDK_AVAILABLE_IN_ALL
 GtkSettings*    gtk_settings_get_default             (void);
 #endif
+GDK_AVAILABLE_IN_ALL
 GtkSettings*    gtk_settings_get_for_screen          (GdkScreen *screen);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_settings_install_property        (GParamSpec         *pspec);
+GDK_AVAILABLE_IN_ALL
 void            gtk_settings_install_property_parser (GParamSpec         *pspec,
                                                       GtkRcPropertyParser parser);
 
 /* --- precoded parsing functions --- */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_rc_property_parse_color       (const GParamSpec *pspec,
                                             const GString    *gstring,
                                             GValue           *property_value);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_rc_property_parse_enum        (const GParamSpec *pspec,
                                             const GString    *gstring,
                                             GValue           *property_value);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_rc_property_parse_flags       (const GParamSpec *pspec,
                                             const GString    *gstring,
                                             GValue           *property_value);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_rc_property_parse_requisition (const GParamSpec *pspec,
                                             const GString    *gstring,
                                             GValue           *property_value);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_rc_property_parse_border      (const GParamSpec *pspec,
                                             const GString    *gstring,
                                             GValue           *property_value);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_settings_set_property_value   (GtkSettings            *settings,
                                             const gchar            *name,
                                             const GtkSettingsValue *svalue);
+GDK_AVAILABLE_IN_ALL
 void     gtk_settings_set_string_property  (GtkSettings            *settings,
                                             const gchar            *name,
                                             const gchar            *v_string,
                                             const gchar            *origin);
+GDK_AVAILABLE_IN_ALL
 void     gtk_settings_set_long_property    (GtkSettings            *settings,
                                             const gchar            *name,
                                             glong                   v_long,
                                             const gchar            *origin);
+GDK_AVAILABLE_IN_ALL
 void     gtk_settings_set_double_property  (GtkSettings            *settings,
                                             const gchar            *name,
                                             gdouble                 v_double,
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index 339270a..c4acd9c 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -27,6 +27,7 @@
 
 G_BEGIN_DECLS
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_show_uri  (GdkScreen   *screen,
                         const gchar *uri,
                         guint32      timestamp,
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 9e14622..ae03cf6 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -58,19 +58,28 @@ struct _GtkSizeGroupClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_size_group_get_type      (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkSizeGroup *   gtk_size_group_new           (GtkSizeGroupMode  mode);
+GDK_AVAILABLE_IN_ALL
 void             gtk_size_group_set_mode      (GtkSizeGroup     *size_group,
                                               GtkSizeGroupMode  mode);
+GDK_AVAILABLE_IN_ALL
 GtkSizeGroupMode gtk_size_group_get_mode      (GtkSizeGroup     *size_group);
+GDK_AVAILABLE_IN_ALL
 void             gtk_size_group_set_ignore_hidden (GtkSizeGroup *size_group,
                                                   gboolean      ignore_hidden);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_size_group_get_ignore_hidden (GtkSizeGroup *size_group);
+GDK_AVAILABLE_IN_ALL
 void             gtk_size_group_add_widget    (GtkSizeGroup     *size_group,
                                               GtkWidget        *widget);
+GDK_AVAILABLE_IN_ALL
 void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
                                               GtkWidget        *widget);
+GDK_AVAILABLE_IN_ALL
 GSList *         gtk_size_group_get_widgets   (GtkSizeGroup     *size_group);
 
 G_END_DECLS
diff --git a/gtk/gtksizerequest.h b/gtk/gtksizerequest.h
index 3e22f96..155fc5d 100644
--- a/gtk/gtksizerequest.h
+++ b/gtk/gtksizerequest.h
@@ -47,6 +47,7 @@ struct _GtkRequestedSize
 
 
 /* General convenience function to aid in allocating natural sizes */
+GDK_AVAILABLE_IN_ALL
 gint                gtk_distribute_natural_allocation               (gint              extra_space,
                                                                      guint             n_requested_sizes,
                                                                      GtkRequestedSize *sizes);
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index 65f52e0..abd9bad 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -70,11 +70,16 @@ struct _GtkSocketClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_socket_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_socket_new             (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_socket_add_id          (GtkSocket *socket_,
                                        Window     window);
+GDK_AVAILABLE_IN_ALL
 Window     gtk_socket_get_id          (GtkSocket *socket_);
+GDK_AVAILABLE_IN_ALL
 GdkWindow *gtk_socket_get_plug_window (GtkSocket *socket_);
 
 G_END_DECLS
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 7ed6352..9ac4d21 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -137,70 +137,95 @@ struct _GtkSpinButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_spin_button_get_type           (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_configure          (GtkSpinButton  *spin_button,
                                                    GtkAdjustment  *adjustment,
                                                    gdouble         climb_rate,
                                                    guint           digits);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_spin_button_new                (GtkAdjustment  *adjustment,
                                                    gdouble         climb_rate,
                                                    guint           digits);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_spin_button_new_with_range     (gdouble  min,
                                                    gdouble  max,
                                                    gdouble  step);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_adjustment     (GtkSpinButton  *spin_button,
                                                    GtkAdjustment  *adjustment);
 
+GDK_AVAILABLE_IN_ALL
 GtkAdjustment* gtk_spin_button_get_adjustment     (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_digits         (GtkSpinButton  *spin_button,
                                                    guint           digits);
+GDK_AVAILABLE_IN_ALL
 guint           gtk_spin_button_get_digits         (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_increments     (GtkSpinButton  *spin_button,
                                                    gdouble         step,
                                                    gdouble         page);
+GDK_AVAILABLE_IN_ALL
 void            gtk_spin_button_get_increments     (GtkSpinButton  *spin_button,
                                                    gdouble        *step,
                                                    gdouble        *page);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_range          (GtkSpinButton  *spin_button,
                                                    gdouble         min,
                                                    gdouble         max);
+GDK_AVAILABLE_IN_ALL
 void            gtk_spin_button_get_range          (GtkSpinButton  *spin_button,
                                                    gdouble        *min,
                                                    gdouble        *max);
 
+GDK_AVAILABLE_IN_ALL
 gdouble                gtk_spin_button_get_value          (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 gint           gtk_spin_button_get_value_as_int   (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_value          (GtkSpinButton  *spin_button,
                                                    gdouble         value);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_update_policy  (GtkSpinButton  *spin_button,
                                                    GtkSpinButtonUpdatePolicy  policy);
+GDK_AVAILABLE_IN_ALL
 GtkSpinButtonUpdatePolicy gtk_spin_button_get_update_policy (GtkSpinButton *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_numeric        (GtkSpinButton  *spin_button,
                                                    gboolean        numeric);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_spin_button_get_numeric        (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_spin               (GtkSpinButton  *spin_button,
                                                    GtkSpinType     direction,
                                                    gdouble         increment);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_wrap           (GtkSpinButton  *spin_button,
                                                    gboolean        wrap);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_spin_button_get_wrap           (GtkSpinButton  *spin_button);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_snap_to_ticks  (GtkSpinButton  *spin_button,
                                                    gboolean        snap_to_ticks);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_spin_button_get_snap_to_ticks  (GtkSpinButton  *spin_button);
+GDK_AVAILABLE_IN_ALL
 void            gtk_spin_button_update             (GtkSpinButton  *spin_button);
 
 /* private */
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index ef5ff0d..0da77b5 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -61,9 +61,13 @@ struct _GtkSpinnerClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_spinner_get_type  (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_spinner_new (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_spinner_start      (GtkSpinner *spinner);
+GDK_AVAILABLE_IN_ALL
 void       gtk_spinner_stop       (GtkSpinner *spinner);
 
 G_END_DECLS
diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h
index f910dd7..38824e1 100644
--- a/gtk/gtkstack.h
+++ b/gtk/gtkstack.h
@@ -56,33 +56,48 @@ struct _GtkStackClass {
   GtkContainerClass parent_class;
 };
 
+GDK_AVAILABLE_IN_3_10
 GType                  gtk_stack_get_type                (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_3_10
 GtkWidget *            gtk_stack_new                     (void);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_add_named               (GtkStack               *stack,
                                                           GtkWidget              *child,
                                                           const gchar            *name);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_add_titled              (GtkStack               *stack,
                                                           GtkWidget              *child,
                                                           const gchar            *name,
                                                           const gchar            *title);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_visible_child       (GtkStack               *stack,
                                                           GtkWidget              *child);
+GDK_AVAILABLE_IN_3_10
 GtkWidget *            gtk_stack_get_visible_child       (GtkStack               *stack);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_visible_child_name  (GtkStack               *stack,
                                                           const gchar            *name);
+GDK_AVAILABLE_IN_3_10
 const gchar *          gtk_stack_get_visible_child_name  (GtkStack               *stack);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_visible_child_full  (GtkStack               *stack,
                                                           const gchar            *name,
                                                           GtkStackTransitionType  transition);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_homogeneous         (GtkStack               *stack,
                                                           gboolean                homogeneous);
+GDK_AVAILABLE_IN_3_10
 gboolean               gtk_stack_get_homogeneous         (GtkStack               *stack);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_transition_duration (GtkStack               *stack,
                                                           guint                   duration);
+GDK_AVAILABLE_IN_3_10
 guint                  gtk_stack_get_transition_duration (GtkStack               *stack);
+GDK_AVAILABLE_IN_3_10
 void                   gtk_stack_set_transition_type     (GtkStack               *stack,
                                                           GtkStackTransitionType  transition);
+GDK_AVAILABLE_IN_3_10
 GtkStackTransitionType gtk_stack_get_transition_type     (GtkStack               *stack);
 
 G_END_DECLS
diff --git a/gtk/gtkstackswitcher.h b/gtk/gtkstackswitcher.h
index 76d93a9..da52f3a 100644
--- a/gtk/gtkstackswitcher.h
+++ b/gtk/gtkstackswitcher.h
@@ -54,10 +54,14 @@ struct _GtkStackSwitcherClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_3_10
 GType        gtk_stack_switcher_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_10
 GtkWidget *  gtk_stack_switcher_new               (void);
+GDK_AVAILABLE_IN_3_10
 void         gtk_stack_switcher_set_stack         (GtkStackSwitcher *switcher,
                                                    GtkStack         *stack);
+GDK_AVAILABLE_IN_3_10
 GtkStack *   gtk_stack_switcher_get_stack         (GtkStackSwitcher *switcher);
 
 G_END_DECLS
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index af018b6..f80e178 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -75,25 +75,33 @@ struct _GtkStatusbarClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_statusbar_get_type      (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_statusbar_new           (void);
 /* If you don't want to use contexts, 0 is a predefined global
  * context_id you can pass to push/pop/remove
  */
+GDK_AVAILABLE_IN_ALL
 guint     gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
                                         const gchar  *context_description);
 /* Returns message_id used for gtk_statusbar_remove */
+GDK_AVAILABLE_IN_ALL
 guint      gtk_statusbar_push                  (GtkStatusbar *statusbar,
                                         guint         context_id,
                                         const gchar  *text);
+GDK_AVAILABLE_IN_ALL
 void       gtk_statusbar_pop           (GtkStatusbar *statusbar,
                                         guint         context_id);
+GDK_AVAILABLE_IN_ALL
 void       gtk_statusbar_remove                (GtkStatusbar *statusbar,
                                         guint         context_id,
                                         guint         message_id);
+GDK_AVAILABLE_IN_ALL
 void       gtk_statusbar_remove_all            (GtkStatusbar *statusbar,
                                         guint         context_id);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_statusbar_get_message_area  (GtkStatusbar *statusbar);
 
 G_END_DECLS
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index 36de4e6..76d5eff 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -77,69 +77,104 @@ struct _GtkStatusIconClass
   void (*__gtk_reserved4);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new                (void);
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new_from_pixbuf    (GdkPixbuf          *pixbuf);
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new_from_file      (const gchar        *filename);
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new_from_stock     (const gchar        *stock_id);
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new_from_icon_name (const gchar        *icon_name);
+GDK_AVAILABLE_IN_ALL
 GtkStatusIcon        *gtk_status_icon_new_from_gicon     (GIcon              *icon);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_from_pixbuf    (GtkStatusIcon      *status_icon,
                                                          GdkPixbuf          *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_from_file      (GtkStatusIcon      *status_icon,
                                                          const gchar        *filename);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_from_stock     (GtkStatusIcon      *status_icon,
                                                          const gchar        *stock_id);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_from_icon_name (GtkStatusIcon      *status_icon,
                                                          const gchar        *icon_name);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_from_gicon     (GtkStatusIcon      *status_icon,
                                                           GIcon              *icon);
 
+GDK_AVAILABLE_IN_ALL
 GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 GIcon                *gtk_status_icon_get_gicon          (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_screen         (GtkStatusIcon      *status_icon,
                                                           GdkScreen          *screen);
+GDK_AVAILABLE_IN_ALL
 GdkScreen            *gtk_status_icon_get_screen         (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_has_tooltip    (GtkStatusIcon      *status_icon,
                                                           gboolean            has_tooltip);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_tooltip_text   (GtkStatusIcon      *status_icon,
                                                           const gchar        *text);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *status_icon,
                                                           const gchar        *markup);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
                                                           const gchar        *title);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
                                                           const gchar        *name);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
                                                          gboolean            visible);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_status_icon_is_embedded        (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_status_icon_position_menu      (GtkMenu            *menu,
                                                          gint               *x,
                                                          gint               *y,
                                                          gboolean           *push_in,
                                                          gpointer            user_data);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_status_icon_get_geometry       (GtkStatusIcon      *status_icon,
                                                          GdkScreen         **screen,
                                                          GdkRectangle       *area,
                                                          GtkOrientation     *orientation);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_status_icon_get_has_tooltip    (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 gchar                *gtk_status_icon_get_tooltip_text   (GtkStatusIcon      *status_icon);
+GDK_AVAILABLE_IN_ALL
 gchar                *gtk_status_icon_get_tooltip_markup (GtkStatusIcon      *status_icon);
 
+GDK_AVAILABLE_IN_ALL
 guint32               gtk_status_icon_get_x11_window_id  (GtkStatusIcon      *status_icon);
 
 G_END_DECLS
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 0c60f67..c563083 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -59,21 +59,28 @@ struct _GtkStockItem
   gchar *translation_domain;
 };
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_stock_add        (const GtkStockItem  *items,
                                guint                n_items);
+GDK_AVAILABLE_IN_ALL
 void     gtk_stock_add_static (const GtkStockItem  *items,
                                guint                n_items);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_stock_lookup     (const gchar         *stock_id,
                                GtkStockItem        *item);
 
 /* Should free the list (and free each string in it also).
  * This function is only useful for GUI builders and such.
  */
+GDK_AVAILABLE_IN_ALL
 GSList*  gtk_stock_list_ids  (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkStockItem *gtk_stock_item_copy (const GtkStockItem *item);
+GDK_AVAILABLE_IN_ALL
 void          gtk_stock_item_free (GtkStockItem       *item);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_stock_set_translate_func (const gchar      *domain,
                                            GtkTranslateFunc  func,
                                            gpointer          data,
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index 35655f2..26709a1 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -748,41 +748,55 @@ struct _GtkStyleContextClass
  */
 #define GTK_STYLE_REGION_TAB "tab"
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_style_context_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkStyleContext * gtk_style_context_new (void);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_add_provider_for_screen    (GdkScreen        *screen,
                                                    GtkStyleProvider *provider,
                                                    guint             priority);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_remove_provider_for_screen (GdkScreen        *screen,
                                                    GtkStyleProvider *provider);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_add_provider    (GtkStyleContext  *context,
                                         GtkStyleProvider *provider,
                                         guint             priority);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_remove_provider (GtkStyleContext  *context,
                                         GtkStyleProvider *provider);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_save    (GtkStyleContext *context);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_restore (GtkStyleContext *context);
 
+GDK_AVAILABLE_IN_ALL
 GtkCssSection * gtk_style_context_get_section (GtkStyleContext *context,
                                                const gchar     *property);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_property (GtkStyleContext *context,
                                      const gchar     *property,
                                      GtkStateFlags    state,
                                      GValue          *value);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_valist   (GtkStyleContext *context,
                                      GtkStateFlags    state,
                                      va_list          args);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get          (GtkStyleContext *context,
                                      GtkStateFlags    state,
                                      ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_style_context_set_state    (GtkStyleContext *context,
                                               GtkStateFlags    flags);
+GDK_AVAILABLE_IN_ALL
 GtkStateFlags gtk_style_context_get_state    (GtkStyleContext *context);
 
 GDK_DEPRECATED_IN_3_6
@@ -790,50 +804,68 @@ gboolean      gtk_style_context_state_is_running (GtkStyleContext *context,
                                                   GtkStateType     state,
                                                   gdouble         *progress);
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_style_context_set_path     (GtkStyleContext *context,
                                               GtkWidgetPath   *path);
+GDK_AVAILABLE_IN_ALL
 const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
 GDK_AVAILABLE_IN_3_4
 void          gtk_style_context_set_parent   (GtkStyleContext *context,
                                               GtkStyleContext *parent);
+GDK_AVAILABLE_IN_ALL
 GtkStyleContext *gtk_style_context_get_parent (GtkStyleContext *context);
 
+GDK_AVAILABLE_IN_ALL
 GList *  gtk_style_context_list_classes (GtkStyleContext *context);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_context_add_class    (GtkStyleContext *context,
                                          const gchar     *class_name);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_context_remove_class (GtkStyleContext *context,
                                          const gchar     *class_name);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_style_context_has_class    (GtkStyleContext *context,
                                          const gchar     *class_name);
 
+GDK_AVAILABLE_IN_ALL
 GList *  gtk_style_context_list_regions (GtkStyleContext *context);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_context_add_region    (GtkStyleContext    *context,
                                           const gchar        *region_name,
                                           GtkRegionFlags      flags);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_context_remove_region (GtkStyleContext    *context,
                                           const gchar        *region_name);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_style_context_has_region    (GtkStyleContext    *context,
                                           const gchar        *region_name,
                                           GtkRegionFlags     *flags_return);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_style_property (GtkStyleContext *context,
                                            const gchar     *property_name,
                                            GValue          *value);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_style_valist   (GtkStyleContext *context,
                                            va_list          args);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_style          (GtkStyleContext *context,
                                            ...);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSet * gtk_style_context_lookup_icon_set (GtkStyleContext *context,
                                                 const gchar     *stock_id);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf  * gtk_icon_set_render_icon_pixbuf   (GtkIconSet      *icon_set,
                                                 GtkStyleContext *context,
                                                 GtkIconSize      size);
 
+GDK_AVAILABLE_IN_ALL
 void        gtk_style_context_set_screen (GtkStyleContext *context,
                                           GdkScreen       *screen);
+GDK_AVAILABLE_IN_ALL
 GdkScreen * gtk_style_context_get_screen (GtkStyleContext *context);
 
 GDK_AVAILABLE_IN_3_8
@@ -849,10 +881,13 @@ void             gtk_style_context_set_direction (GtkStyleContext  *context,
 GDK_DEPRECATED_IN_3_8_FOR(gtk_style_context_get_state)
 GtkTextDirection gtk_style_context_get_direction (GtkStyleContext  *context);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_style_context_set_junction_sides (GtkStyleContext  *context,
                                                        GtkJunctionSides  sides);
+GDK_AVAILABLE_IN_ALL
 GtkJunctionSides gtk_style_context_get_junction_sides (GtkStyleContext  *context);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_style_context_lookup_color (GtkStyleContext *context,
                                          const gchar     *color_name,
                                          GdkRGBA         *color);
@@ -879,12 +914,15 @@ GDK_DEPRECATED_IN_3_6
 void gtk_style_context_pop_animatable_region  (GtkStyleContext *context);
 
 /* Some helper functions to retrieve most common properties */
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_color            (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GdkRGBA         *color);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_background_color (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GdkRGBA         *color);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_border_color     (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GdkRGBA         *color);
@@ -893,76 +931,92 @@ GDK_DEPRECATED_IN_3_8_FOR(gtk_style_context_get)
 const PangoFontDescription *
      gtk_style_context_get_font             (GtkStyleContext *context,
                                              GtkStateFlags    state);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_border           (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GtkBorder       *border);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_padding          (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GtkBorder       *padding);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_margin           (GtkStyleContext *context,
                                              GtkStateFlags    state,
                                              GtkBorder       *margin);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_invalidate           (GtkStyleContext *context);
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_reset_widgets        (GdkScreen       *screen);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_style_context_set_background       (GtkStyleContext *context,
                                              GdkWindow       *window);
 
 /* Paint methods */
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_check       (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_option      (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_arrow       (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              angle,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              size);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_background  (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_frame       (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_expander    (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_focus       (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_layout      (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     PangoLayout         *layout);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_line        (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x0,
                                     gdouble              y0,
                                     gdouble              x1,
                                     gdouble              y1);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_slider      (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
@@ -970,6 +1024,7 @@ void        gtk_render_slider      (GtkStyleContext     *context,
                                     gdouble              width,
                                     gdouble              height,
                                     GtkOrientation       orientation);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_frame_gap   (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
@@ -979,6 +1034,7 @@ void        gtk_render_frame_gap   (GtkStyleContext     *context,
                                     GtkPositionType      gap_side,
                                     gdouble              xy0_gap,
                                     gdouble              xy1_gap);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_extension   (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
@@ -986,18 +1042,21 @@ void        gtk_render_extension   (GtkStyleContext     *context,
                                     gdouble              width,
                                     gdouble              height,
                                     GtkPositionType      gap_side);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_handle      (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 void        gtk_render_activity    (GtkStyleContext     *context,
                                     cairo_t             *cr,
                                     gdouble              x,
                                     gdouble              y,
                                     gdouble              width,
                                     gdouble              height);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf * gtk_render_icon_pixbuf (GtkStyleContext     *context,
                                     const GtkIconSource *source,
                                     GtkIconSize          size);
diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index fd81699..14746ed 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -63,6 +63,7 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
                                              GValue       *value,
                                              GError      **error);
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
 /* Next 2 are implemented in gtkcsscustomproperty.c */
@@ -74,6 +75,7 @@ gboolean gtk_style_properties_lookup_property   (const gchar             *proper
                                                  GtkStylePropertyParser  *parse_func,
                                                  GParamSpec             **pspec);
 
+GDK_AVAILABLE_IN_ALL
 GtkStyleProperties * gtk_style_properties_new (void);
 
 GDK_DEPRECATED_IN_3_8
@@ -84,34 +86,43 @@ GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *props,
                                                       const gchar        *name);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_set_property (GtkStyleProperties *props,
                                             const gchar        *property,
                                             GtkStateFlags       state,
                                             const GValue       *value);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_set_valist   (GtkStyleProperties *props,
                                             GtkStateFlags       state,
                                             va_list             args);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_set          (GtkStyleProperties *props,
                                             GtkStateFlags       state,
                                             ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_style_properties_get_property (GtkStyleProperties *props,
                                             const gchar        *property,
                                             GtkStateFlags       state,
                                             GValue             *value);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_get_valist   (GtkStyleProperties *props,
                                             GtkStateFlags       state,
                                             va_list             args);
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_get          (GtkStyleProperties *props,
                                             GtkStateFlags       state,
                                             ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_unset_property (GtkStyleProperties *props,
                                               const gchar        *property,
                                               GtkStateFlags       state);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_clear          (GtkStyleProperties  *props);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_style_properties_merge          (GtkStyleProperties       *props,
                                               const GtkStyleProperties *props_to_merge,
                                               gboolean                  replace);
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 81bf5d6..74ce032 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -107,12 +107,14 @@ struct _GtkStyleProviderIface
                                         GtkWidgetPath    *path);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_style_provider_get_type (void) G_GNUC_CONST;
 
 GDK_DEPRECATED_IN_3_8
 GtkStyleProperties *gtk_style_provider_get_style (GtkStyleProvider *provider,
                                                   GtkWidgetPath    *path);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_style_provider_get_style_property (GtkStyleProvider *provider,
                                                 GtkWidgetPath    *path,
                                                 GtkStateFlags     state,
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index 1f7ed4c..539d9e8 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -80,12 +80,16 @@ struct _GtkSwitchClass
   void (* _switch_padding_6) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_switch_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_switch_new          (void);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_switch_set_active   (GtkSwitch *sw,
                                          gboolean   is_active);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_switch_get_active   (GtkSwitch *sw);
 
 G_END_DECLS
diff --git a/gtk/gtktestutils.h b/gtk/gtktestutils.h
index c27decf..d382dea 100644
--- a/gtk/gtktestutils.h
+++ b/gtk/gtktestutils.h
@@ -29,42 +29,58 @@
 G_BEGIN_DECLS
 
 /* --- Gtk+ Test Utility API --- */
+GDK_AVAILABLE_IN_ALL
 void            gtk_test_init                   (int            *argcp,
                                                  char         ***argvp,
                                                  ...);
+GDK_AVAILABLE_IN_ALL
 void            gtk_test_register_all_types     (void);
+GDK_AVAILABLE_IN_ALL
 const GType*    gtk_test_list_all_types         (guint          *n_types);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_find_widget            (GtkWidget      *widget,
                                                  const gchar    *label_pattern,
                                                  GType           widget_type);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_create_widget          (GType           widget_type,
                                                  const gchar    *first_property_name,
                                                  ...);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_create_simple_window   (const gchar    *window_title,
                                                  const gchar    *dialog_text);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_display_button_window  (const gchar    *window_title,
                                                  const gchar    *dialog_text,
                                                  ...); /* NULL terminated list of (label, &int) pairs */
+GDK_AVAILABLE_IN_ALL
 void            gtk_test_slider_set_perc        (GtkWidget      *widget, /* GtkRange-alike */
                                                  double          percentage);
+GDK_AVAILABLE_IN_ALL
 double          gtk_test_slider_get_value       (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_test_spin_button_click      (GtkSpinButton  *spinner,
                                                  guint           button,
                                                  gboolean        upwards);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_test_widget_click           (GtkWidget      *widget,
                                                  guint           button,
                                                  GdkModifierType modifiers);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_test_widget_send_key        (GtkWidget      *widget,
                                                  guint           keyval,
                                                  GdkModifierType modifiers);
 /* operate on GtkEntry, GtkText, GtkTextView or GtkLabel */
+GDK_AVAILABLE_IN_ALL
 void            gtk_test_text_set               (GtkWidget      *widget,
                                                  const gchar    *string);
+GDK_AVAILABLE_IN_ALL
 gchar*          gtk_test_text_get               (GtkWidget      *widget);
 
 /* --- Gtk+ Test low-level API --- */
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_find_sibling           (GtkWidget      *base_widget,
                                                  GType           widget_type);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*      gtk_test_find_label             (GtkWidget      *widget,
                                                  const gchar    *label_pattern);
 G_END_DECLS
diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
index 76d6fe5..d712dbe 100644
--- a/gtk/gtktextattributes.h
+++ b/gtk/gtktextattributes.h
@@ -166,13 +166,19 @@ struct _GtkTextAttributes
   guint padding[3];
 };
 
+GDK_AVAILABLE_IN_ALL
 GtkTextAttributes* gtk_text_attributes_new         (void);
+GDK_AVAILABLE_IN_ALL
 GtkTextAttributes* gtk_text_attributes_copy        (GtkTextAttributes *src);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
                                                     GtkTextAttributes *dest);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_attributes_unref       (GtkTextAttributes *values);
+GDK_AVAILABLE_IN_ALL
 GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
 
+GDK_AVAILABLE_IN_ALL
 GType              gtk_text_attributes_get_type    (void) G_GNUC_CONST;
 
 
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 793b763..c045716 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -137,52 +137,65 @@ struct _GtkTextBufferClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;
 
 
 
 /* table is NULL to create a new one */
+GDK_AVAILABLE_IN_ALL
 GtkTextBuffer *gtk_text_buffer_new            (GtkTextTagTable *table);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_text_buffer_get_line_count (GtkTextBuffer   *buffer);
+GDK_AVAILABLE_IN_ALL
 gint           gtk_text_buffer_get_char_count (GtkTextBuffer   *buffer);
 
 
+GDK_AVAILABLE_IN_ALL
 GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer);
 
 /* Delete whole buffer, then insert */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_set_text          (GtkTextBuffer *buffer,
                                         const gchar   *text,
                                         gint           len);
 
 /* Insert into the buffer */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_insert            (GtkTextBuffer *buffer,
                                         GtkTextIter   *iter,
                                         const gchar   *text,
                                         gint           len);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_insert_at_cursor  (GtkTextBuffer *buffer,
                                         const gchar   *text,
                                         gint           len);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_insert_interactive           (GtkTextBuffer *buffer,
                                                        GtkTextIter   *iter,
                                                        const gchar   *text,
                                                        gint           len,
                                                        gboolean       default_editable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
                                                        const gchar   *text,
                                                        gint           len,
                                                        gboolean       default_editable);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_buffer_insert_range             (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const GtkTextIter *start,
                                                    const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const GtkTextIter *start,
                                                    const GtkTextIter *end,
                                                    gboolean           default_editable);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_insert_with_tags          (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const gchar       *text,
@@ -190,6 +203,7 @@ void    gtk_text_buffer_insert_with_tags          (GtkTextBuffer     *buffer,
                                                    GtkTextTag        *first_tag,
                                                    ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const gchar       *text,
@@ -198,71 +212,90 @@ void    gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer     *buffer,
                                                    ...) G_GNUC_NULL_TERMINATED;
 
 /* Delete from the buffer */
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_buffer_delete             (GtkTextBuffer *buffer,
                                             GtkTextIter   *start,
                                             GtkTextIter   *end);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
                                             GtkTextIter   *start_iter,
                                             GtkTextIter   *end_iter,
                                             gboolean       default_editable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_backspace          (GtkTextBuffer *buffer,
                                             GtkTextIter   *iter,
                                             gboolean       interactive,
                                             gboolean       default_editable);
 
 /* Obtain strings from the buffer */
+GDK_AVAILABLE_IN_ALL
 gchar          *gtk_text_buffer_get_text            (GtkTextBuffer     *buffer,
                                                      const GtkTextIter *start,
                                                      const GtkTextIter *end,
                                                      gboolean           include_hidden_chars);
 
+GDK_AVAILABLE_IN_ALL
 gchar          *gtk_text_buffer_get_slice           (GtkTextBuffer     *buffer,
                                                      const GtkTextIter *start,
                                                      const GtkTextIter *end,
                                                      gboolean           include_hidden_chars);
 
 /* Insert a pixbuf */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_insert_pixbuf         (GtkTextBuffer *buffer,
                                             GtkTextIter   *iter,
                                             GdkPixbuf     *pixbuf);
 
 /* Insert a child anchor */
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
                                                         GtkTextIter        *iter,
                                                         GtkTextChildAnchor *anchor);
 
 /* Convenience, create and insert a child anchor */
+GDK_AVAILABLE_IN_ALL
 GtkTextChildAnchor *gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
                                                          GtkTextIter   *iter);
 
 /* Mark manipulation */
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_buffer_add_mark    (GtkTextBuffer     *buffer,
                                             GtkTextMark       *mark,
                                             const GtkTextIter *where);
+GDK_AVAILABLE_IN_ALL
 GtkTextMark   *gtk_text_buffer_create_mark (GtkTextBuffer     *buffer,
                                             const gchar       *mark_name,
                                             const GtkTextIter *where,
                                             gboolean           left_gravity);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_buffer_move_mark   (GtkTextBuffer     *buffer,
                                             GtkTextMark       *mark,
                                             const GtkTextIter *where);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_buffer_delete_mark (GtkTextBuffer     *buffer,
                                             GtkTextMark       *mark);
+GDK_AVAILABLE_IN_ALL
 GtkTextMark*   gtk_text_buffer_get_mark    (GtkTextBuffer     *buffer,
                                             const gchar       *name);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_move_mark_by_name   (GtkTextBuffer     *buffer,
                                           const gchar       *name,
                                           const GtkTextIter *where);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
                                           const gchar       *name);
 
+GDK_AVAILABLE_IN_ALL
 GtkTextMark* gtk_text_buffer_get_insert          (GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 GtkTextMark* gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer);
 
 /* efficiently move insert and selection_bound at the same time */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
                                    const GtkTextIter *where);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
                                    const GtkTextIter *ins,
                                   const GtkTextIter *bound);
@@ -270,22 +303,27 @@ void gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
 
 
 /* Tag manipulation */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_apply_tag             (GtkTextBuffer     *buffer,
                                             GtkTextTag        *tag,
                                             const GtkTextIter *start,
                                             const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_remove_tag            (GtkTextBuffer     *buffer,
                                             GtkTextTag        *tag,
                                             const GtkTextIter *start,
                                             const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_apply_tag_by_name     (GtkTextBuffer     *buffer,
                                             const gchar       *name,
                                             const GtkTextIter *start,
                                             const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_remove_tag_by_name    (GtkTextBuffer     *buffer,
                                             const gchar       *name,
                                             const GtkTextIter *start,
                                             const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_remove_all_tags       (GtkTextBuffer     *buffer,
                                             const GtkTextIter *start,
                                             const GtkTextIter *end);
@@ -294,6 +332,7 @@ void gtk_text_buffer_remove_all_tags       (GtkTextBuffer     *buffer,
 /* You can either ignore the return value, or use it to
  * set the attributes of the tag. tag_name can be NULL
  */
+GDK_AVAILABLE_IN_ALL
 GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
                                            const gchar   *tag_name,
                                            const gchar   *first_property_name,
@@ -302,31 +341,40 @@ GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
 /* Obtain iterators pointed at various places, then you can move the
  * iterator around using the GtkTextIter operators
  */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
                                               gint           line_number,
                                               gint           char_offset);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
                                               gint           line_number,
                                               gint           byte_index);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_offset      (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
                                               gint           char_offset);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line        (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
                                               gint           line_number);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_start_iter          (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_end_iter            (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_bounds              (GtkTextBuffer *buffer,
                                               GtkTextIter   *start,
                                               GtkTextIter   *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_mark        (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
                                               GtkTextMark   *mark);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
                                                GtkTextIter        *iter,
                                                GtkTextChildAnchor *anchor);
@@ -340,39 +388,53 @@ void gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
    flag, but if you would like them to you can connect a handler to
    the tag/mark signals and call set_modified in your handler */
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_buffer_get_modified            (GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_set_modified            (GtkTextBuffer *buffer,
                                                          gboolean       setting);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_buffer_get_has_selection       (GtkTextBuffer *buffer);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_add_selection_clipboard    (GtkTextBuffer     *buffer,
                                                 GtkClipboard      *clipboard);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_remove_selection_clipboard (GtkTextBuffer     *buffer,
                                                 GtkClipboard      *clipboard);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_cut_clipboard           (GtkTextBuffer *buffer,
                                                         GtkClipboard  *clipboard,
                                                          gboolean       default_editable);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_copy_clipboard          (GtkTextBuffer *buffer,
                                                         GtkClipboard  *clipboard);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_paste_clipboard         (GtkTextBuffer *buffer,
                                                         GtkClipboard  *clipboard,
                                                         GtkTextIter   *override_location,
                                                          gboolean       default_editable);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_buffer_get_selection_bounds    (GtkTextBuffer *buffer,
                                                          GtkTextIter   *start,
                                                          GtkTextIter   *end);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_buffer_delete_selection        (GtkTextBuffer *buffer,
                                                          gboolean       interactive,
                                                          gboolean       default_editable);
 
 /* Called to specify atomic user actions, used to implement undo */
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_begin_user_action       (GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_buffer_end_user_action         (GtkTextBuffer *buffer);
 
+GDK_AVAILABLE_IN_ALL
 GtkTargetList * gtk_text_buffer_get_copy_target_list    (GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 GtkTargetList * gtk_text_buffer_get_paste_target_list   (GtkTextBuffer *buffer);
 
 /* INTERNAL private stuff */
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
index 44034df..3ab920d 100644
--- a/gtk/gtktextbufferrichtext.h
+++ b/gtk/gtktextbufferrichtext.h
@@ -75,44 +75,56 @@ typedef gboolean (* GtkTextBufferDeserializeFunc) (GtkTextBuffer     *register_b
                                                    gpointer           user_data,
                                                    GError           **error);
 
+GDK_AVAILABLE_IN_ALL
 GdkAtom   gtk_text_buffer_register_serialize_format   (GtkTextBuffer                *buffer,
                                                        const gchar                  *mime_type,
                                                        GtkTextBufferSerializeFunc    function,
                                                        gpointer                      user_data,
                                                        GDestroyNotify                user_data_destroy);
+GDK_AVAILABLE_IN_ALL
 GdkAtom   gtk_text_buffer_register_serialize_tagset   (GtkTextBuffer                *buffer,
                                                        const gchar                  *tagset_name);
 
+GDK_AVAILABLE_IN_ALL
 GdkAtom   gtk_text_buffer_register_deserialize_format (GtkTextBuffer                *buffer,
                                                        const gchar                  *mime_type,
                                                        GtkTextBufferDeserializeFunc  function,
                                                        gpointer                      user_data,
                                                        GDestroyNotify                user_data_destroy);
+GDK_AVAILABLE_IN_ALL
 GdkAtom   gtk_text_buffer_register_deserialize_tagset (GtkTextBuffer                *buffer,
                                                        const gchar                  *tagset_name);
 
+GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_unregister_serialize_format   (GtkTextBuffer                *buffer,
                                                        GdkAtom                       format);
+GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_unregister_deserialize_format (GtkTextBuffer                *buffer,
                                                        GdkAtom                       format);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_buffer_deserialize_set_can_create_tags (GtkTextBuffer             *buffer,
                                                           GdkAtom                    format,
                                                           gboolean                   can_create_tags);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_deserialize_get_can_create_tags (GtkTextBuffer             *buffer,
                                                           GdkAtom                    format);
 
+GDK_AVAILABLE_IN_ALL
 GdkAtom * gtk_text_buffer_get_serialize_formats       (GtkTextBuffer                *buffer,
                                                        gint                         *n_formats);
+GDK_AVAILABLE_IN_ALL
 GdkAtom * gtk_text_buffer_get_deserialize_formats     (GtkTextBuffer                *buffer,
                                                        gint                         *n_formats);
 
+GDK_AVAILABLE_IN_ALL
 guint8  * gtk_text_buffer_serialize                   (GtkTextBuffer                *register_buffer,
                                                        GtkTextBuffer                *content_buffer,
                                                        GdkAtom                       format,
                                                        const GtkTextIter            *start,
                                                        const GtkTextIter            *end,
                                                        gsize                        *length);
+GDK_AVAILABLE_IN_ALL
 gboolean  gtk_text_buffer_deserialize                 (GtkTextBuffer                *register_buffer,
                                                        GtkTextBuffer                *content_buffer,
                                                        GdkAtom                       format,
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 2aa859a..46ae1a0 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -71,11 +71,15 @@ struct _GtkTextChildAnchorClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType               gtk_text_child_anchor_get_type    (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkTextChildAnchor* gtk_text_child_anchor_new         (void);
 
+GDK_AVAILABLE_IN_ALL
 GList*              gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor);
+GDK_AVAILABLE_IN_ALL
 gboolean            gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
 
 G_END_DECLS
diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index 3f130b4..63c0897 100644
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -90,6 +90,7 @@ G_BEGIN_DECLS
  *                     is the top left of the layout
  * widgets           - list of widgets that need exposing
  */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_draw (GtkTextLayout        *layout,
                            GtkWidget            *widget,
                            cairo_t              *cr,
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 5fb9912..830d28e 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -78,142 +78,207 @@ struct _GtkTextIter {
 
 /* This is primarily intended for language bindings that want to avoid
    a "buffer" argument to text insertions, deletions, etc. */
+GDK_AVAILABLE_IN_ALL
 GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
 
 /*
  * Life cycle
  */
 
+GDK_AVAILABLE_IN_ALL
 GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 void         gtk_text_iter_free     (GtkTextIter       *iter);
 GDK_AVAILABLE_IN_3_2
 void         gtk_text_iter_assign   (GtkTextIter       *iter,
                                      const GtkTextIter *other);
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
 
 /*
  * Convert to different kinds of index
  */
 
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_offset      (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_line        (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_line_offset (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_line_index  (const GtkTextIter *iter);
 
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_iter_get_visible_line_index (const GtkTextIter *iter);
 
 
 /*
  * "Dereference" operators
  */
+GDK_AVAILABLE_IN_ALL
 gunichar gtk_text_iter_get_char          (const GtkTextIter  *iter);
 
 /* includes the 0xFFFC char for pixmaps/widgets, so char offsets
  * into the returned string map properly into buffer char offsets
  */
+GDK_AVAILABLE_IN_ALL
 gchar   *gtk_text_iter_get_slice         (const GtkTextIter  *start,
                                           const GtkTextIter  *end);
 
 /* includes only text, no 0xFFFC */
+GDK_AVAILABLE_IN_ALL
 gchar   *gtk_text_iter_get_text          (const GtkTextIter  *start,
                                           const GtkTextIter  *end);
 /* exclude invisible chars */
+GDK_AVAILABLE_IN_ALL
 gchar   *gtk_text_iter_get_visible_slice (const GtkTextIter  *start,
                                           const GtkTextIter  *end);
+GDK_AVAILABLE_IN_ALL
 gchar   *gtk_text_iter_get_visible_text  (const GtkTextIter  *start,
                                           const GtkTextIter  *end);
 
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf* gtk_text_iter_get_pixbuf (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 GSList  *  gtk_text_iter_get_marks  (const GtkTextIter *iter);
 
+GDK_AVAILABLE_IN_ALL
 GtkTextChildAnchor* gtk_text_iter_get_child_anchor (const GtkTextIter *iter);
 
 /* Return list of tags toggled at this point (toggled_on determines
  * whether the list is of on-toggles or off-toggles)
  */
+GDK_AVAILABLE_IN_ALL
 GSList  *gtk_text_iter_get_toggled_tags  (const GtkTextIter  *iter,
                                           gboolean            toggled_on);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_begins_tag        (const GtkTextIter  *iter,
                                           GtkTextTag         *tag);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_ends_tag          (const GtkTextIter  *iter,
                                           GtkTextTag         *tag);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_toggles_tag       (const GtkTextIter  *iter,
                                           GtkTextTag         *tag);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_has_tag           (const GtkTextIter   *iter,
                                           GtkTextTag          *tag);
+GDK_AVAILABLE_IN_ALL
 GSList  *gtk_text_iter_get_tags          (const GtkTextIter   *iter);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_editable          (const GtkTextIter   *iter,
                                           gboolean             default_setting);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_can_insert        (const GtkTextIter   *iter,
                                           gboolean             default_editability);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_starts_word        (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_ends_word          (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_inside_word        (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_starts_sentence    (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_ends_sentence      (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_inside_sentence    (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_starts_line        (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_ends_line          (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_is_cursor_position (const GtkTextIter   *iter);
 
+GDK_AVAILABLE_IN_ALL
 gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
 
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
                                             GtkTextAttributes *values);
+GDK_AVAILABLE_IN_ALL
 PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_iter_is_end         (const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_iter_is_start       (const GtkTextIter *iter);
 
 /*
  * Moving around the buffer
  */
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_char         (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_char        (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_chars        (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_chars       (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_line         (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_line        (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_lines        (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_lines       (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_word_end     (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_word_start  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_word_ends    (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_word_starts (GtkTextIter *iter,
                                              gint         count);
                                              
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_line   (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_line  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_lines  (GtkTextIter *iter,
                                                gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
                                                gint         count);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_word_end     (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_word_start  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_word_ends    (GtkTextIter *iter,
                                              gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_word_starts (GtkTextIter *iter,
                                              gint         count);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_sentence_end     (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_sentence_start  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_sentence_ends    (GtkTextIter *iter,
                                                  gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
                                                  gint         count);
 /* cursor positions are almost equivalent to chars, but not quite;
@@ -221,33 +286,49 @@ gboolean gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
  * chars. Also, you can't put the cursor between \r\n at the end
  * of a line.
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_cursor_position   (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_cursor_position  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_cursor_positions  (GtkTextIter *iter,
                                                   gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
                                                   gint         count);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_cursor_position   (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_cursor_position  (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_cursor_positions  (GtkTextIter *iter,
                                                           gint         count);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
                                                           gint         count);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_offset         (GtkTextIter *iter,
                                            gint         char_offset);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line           (GtkTextIter *iter,
                                            gint         line_number);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line_offset    (GtkTextIter *iter,
                                            gint         char_on_line);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line_index     (GtkTextIter *iter,
                                            gint         byte_on_line);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_forward_to_end     (GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_to_line_end (GtkTextIter *iter);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
                                                 gint         char_on_line);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_visible_line_index  (GtkTextIter *iter,
                                                 gint         byte_on_line);
 
@@ -255,23 +336,28 @@ void     gtk_text_iter_set_visible_line_index  (GtkTextIter *iter,
  * means "any tag toggle", otherwise the next toggle of the
  * specified tag is located.
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
                                               GtkTextTag  *tag);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
                                                GtkTextTag  *tag);
 
 typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_find_char  (GtkTextIter          *iter,
                                            GtkTextCharPredicate  pred,
                                            gpointer              user_data,
                                            const GtkTextIter    *limit);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_find_char (GtkTextIter          *iter,
                                            GtkTextCharPredicate  pred,
                                            gpointer              user_data,
                                            const GtkTextIter    *limit);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_search  (const GtkTextIter *iter,
                                         const gchar       *str,
                                         GtkTextSearchFlags flags,
@@ -279,6 +365,7 @@ gboolean gtk_text_iter_forward_search  (const GtkTextIter *iter,
                                         GtkTextIter       *match_end,
                                         const GtkTextIter *limit);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_search (const GtkTextIter *iter,
                                         const gchar       *str,
                                         GtkTextSearchFlags flags,
@@ -289,15 +376,19 @@ gboolean gtk_text_iter_backward_search (const GtkTextIter *iter,
 /*
  * Comparisons
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_equal           (const GtkTextIter *lhs,
                                         const GtkTextIter *rhs);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_text_iter_compare         (const GtkTextIter *lhs,
                                         const GtkTextIter *rhs);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
                                         const GtkTextIter *start,
                                         const GtkTextIter *end);
 
 /* Put these two in ascending order */
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_order           (GtkTextIter *first,
                                         GtkTextIter *second);
 
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 326b21e..b6379bc 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -261,34 +261,48 @@ struct _GtkTextLineDisplay
 extern G_GNUC_INTERNAL PangoAttrType gtk_text_attr_appearance_type;
 #endif
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_text_layout_get_type    (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkTextLayout*     gtk_text_layout_new                   (void);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_set_buffer            (GtkTextLayout     *layout,
                                                          GtkTextBuffer     *buffer);
+GDK_AVAILABLE_IN_ALL
 GtkTextBuffer     *gtk_text_layout_get_buffer            (GtkTextLayout     *layout);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_set_default_style     (GtkTextLayout     *layout,
                                                          GtkTextAttributes *values);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_set_contexts          (GtkTextLayout     *layout,
                                                          PangoContext      *ltr_context,
                                                          PangoContext      *rtl_context);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_set_cursor_direction  (GtkTextLayout     *layout,
                                                           GtkTextDirection   direction);
+GDK_AVAILABLE_IN_ALL
 void              gtk_text_layout_set_overwrite_mode    (GtkTextLayout     *layout,
                                                          gboolean           overwrite);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_set_keyboard_direction (GtkTextLayout     *layout,
                                                           GtkTextDirection keyboard_dir);
+GDK_AVAILABLE_IN_ALL
 void               gtk_text_layout_default_style_changed (GtkTextLayout     *layout);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_set_screen_width       (GtkTextLayout     *layout,
                                              gint               width);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_set_preedit_string     (GtkTextLayout     *layout,
                                             const gchar       *preedit_string,
                                             PangoAttrList     *preedit_attrs,
                                             gint               cursor_pos);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_set_cursor_visible (GtkTextLayout     *layout,
                                              gboolean           cursor_visible);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout     *layout);
 
 /* Getting the size or the lines potentially results in a call to
@@ -298,52 +312,67 @@ gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout     *layout);
  * Long-term, we would really like to be able to do these without
  * a full recompute so they may get cheaper over time.
  */
+GDK_AVAILABLE_IN_ALL
 void    gtk_text_layout_get_size  (GtkTextLayout  *layout,
                                    gint           *width,
                                    gint           *height);
+GDK_AVAILABLE_IN_ALL
 GSList* gtk_text_layout_get_lines (GtkTextLayout  *layout,
                                    /* [top_y, bottom_y) */
                                    gint            top_y,
                                    gint            bottom_y,
                                    gint           *first_line_y);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_wrap_loop_start (GtkTextLayout *layout);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_wrap_loop_end   (GtkTextLayout *layout);
 
+GDK_AVAILABLE_IN_ALL
 GtkTextLineDisplay* gtk_text_layout_get_line_display  (GtkTextLayout      *layout,
                                                        GtkTextLine        *line,
                                                        gboolean            size_only);
+GDK_AVAILABLE_IN_ALL
 void                gtk_text_layout_free_line_display (GtkTextLayout      *layout,
                                                        GtkTextLineDisplay *display);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_get_line_at_y     (GtkTextLayout     *layout,
                                         GtkTextIter       *target_iter,
                                         gint               y,
                                         gint              *line_top);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_get_iter_at_pixel (GtkTextLayout     *layout,
                                         GtkTextIter       *iter,
                                         gint               x,
                                         gint               y);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
                                           GtkTextIter       *iter,
                                           gint              *trailing,
                                           gint               x,
                                           gint               y);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_invalidate        (GtkTextLayout     *layout,
                                         const GtkTextIter *start,
                                         const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_invalidate_cursors(GtkTextLayout     *layout,
                                         const GtkTextIter *start,
                                         const GtkTextIter *end);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_free_line_data    (GtkTextLayout     *layout,
                                         GtkTextLine       *line,
                                         GtkTextLineData   *line_data);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_is_valid        (GtkTextLayout *layout);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_validate_yrange (GtkTextLayout *layout,
                                           GtkTextIter   *anchor_line,
                                           gint           y0_,
                                           gint           y1_);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_validate        (GtkTextLayout *layout,
                                           gint           max_pixels);
 
@@ -354,52 +383,66 @@ void     gtk_text_layout_validate        (GtkTextLayout *layout,
  * there should be exactly one line data for this view
  * stored on the btree line.
  */
+GDK_AVAILABLE_IN_ALL
 GtkTextLineData* gtk_text_layout_wrap  (GtkTextLayout   *layout,
                                         GtkTextLine     *line,
                                         GtkTextLineData *line_data); /* may be NULL */
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_changed              (GtkTextLayout     *layout,
                                                gint               y,
                                                gint               old_height,
                                                gint               new_height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_cursors_changed      (GtkTextLayout     *layout,
                                                gint               y,
                                                gint               old_height,
                                                gint               new_height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_get_iter_location    (GtkTextLayout     *layout,
                                                const GtkTextIter *iter,
                                                GdkRectangle      *rect);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_get_line_yrange      (GtkTextLayout     *layout,
                                                const GtkTextIter *iter,
                                                gint              *y,
                                                gint              *height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_get_cursor_locations (GtkTextLayout     *layout,
                                                GtkTextIter       *iter,
                                                GdkRectangle      *strong_pos,
                                                GdkRectangle      *weak_pos);
 gboolean _gtk_text_layout_get_block_cursor    (GtkTextLayout     *layout,
                                               GdkRectangle      *pos);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout     *layout,
                                                GtkTextIter       *iter,
                                                gint               top,
                                                gint               bottom);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_move_iter_to_line_end      (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
                                                      gint           direction);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
                                                      GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_move_iter_to_next_line     (GtkTextLayout *layout,
                                                      GtkTextIter   *iter);
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_move_iter_to_x             (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
                                                      gint           x);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_move_iter_visually         (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
                                                      gint           count);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_layout_iter_starts_line           (GtkTextLayout       *layout,
                                                      const GtkTextIter   *iter);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_text_layout_get_iter_at_line           (GtkTextLayout *layout,
                                                      GtkTextIter    *iter,
                                                      GtkTextLine    *line,
@@ -410,18 +453,23 @@ void     gtk_text_layout_get_iter_at_line           (GtkTextLayout *layout,
  * since they are semi-public and require GtkTextLayout to
  * be declared.
  */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_child_anchor_register_child   (GtkTextChildAnchor *anchor,
                                              GtkWidget          *child,
                                              GtkTextLayout      *layout);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_child_anchor_unregister_child (GtkTextChildAnchor *anchor,
                                              GtkWidget          *child);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_child_anchor_queue_resize     (GtkTextChildAnchor *anchor,
                                              GtkTextLayout      *layout);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
                                              GtkTextLayout      *layout);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_layout_spew (GtkTextLayout *layout);
 
 G_END_DECLS
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index a68a3ae..f9d3edb 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -85,17 +85,25 @@ struct _GtkTextMarkClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_text_mark_get_type         (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkTextMark          *gtk_text_mark_new              (const gchar *name,
                                                       gboolean     left_gravity);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_text_mark_set_visible      (GtkTextMark *mark,
                                                       gboolean     setting);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_text_mark_get_visible      (GtkTextMark *mark);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_text_mark_get_name         (GtkTextMark *mark);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
+GDK_AVAILABLE_IN_ALL
 GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
 
 G_END_DECLS
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
index 42c0c28..82ea6b2 100644
--- a/gtk/gtktextsegment.h
+++ b/gtk/gtktextsegment.h
@@ -150,6 +150,7 @@ struct _GtkTextLineSegment {
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GtkTextLineSegment  *gtk_text_line_segment_split (const GtkTextIter *iter);
 
 GtkTextLineSegment *_gtk_char_segment_new                  (const gchar    *text,
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 6c79924..1dae602 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -98,11 +98,16 @@ struct _GtkTextTagClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
+GDK_AVAILABLE_IN_ALL
 gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
+GDK_AVAILABLE_IN_ALL
 void         gtk_text_tag_set_priority (GtkTextTag        *tag,
                                         gint               priority);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_text_tag_event        (GtkTextTag        *tag,
                                         GObject           *event_object,
                                         GdkEvent          *event,
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 3a42e67..90664c8 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -67,18 +67,25 @@ struct _GtkTextTagTableClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_text_tag_table_get_type (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkTextTagTable *gtk_text_tag_table_new      (void);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_tag_table_add      (GtkTextTagTable        *table,
                                               GtkTextTag             *tag);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_tag_table_remove   (GtkTextTagTable        *table,
                                               GtkTextTag             *tag);
+GDK_AVAILABLE_IN_ALL
 GtkTextTag      *gtk_text_tag_table_lookup   (GtkTextTagTable        *table,
                                               const gchar            *name);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_tag_table_foreach  (GtkTextTagTable        *table,
                                               GtkTextTagTableForeach  func,
                                               gpointer                data);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_tag_table_get_size (GtkTextTagTable        *table);
 
 
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index d5ab1f3..ec6d990 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -59,9 +59,11 @@ extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_child_type;
 
 #define GTK_TEXT_UNKNOWN_CHAR 0xFFFC
 #define GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN 3
+GDK_AVAILABLE_IN_ALL
 const gchar *gtk_text_unknown_char_utf8_gtk_tests_only (void);
 extern const gchar _gtk_text_unknown_char_utf8[GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN+1];
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_byte_begins_utf8_char (const gchar *byte);
 
 G_END_DECLS
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 650e605..e77c1c4 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -117,68 +117,89 @@ struct _GtkTextViewClass
   void (*_gtk_reserved8) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_text_view_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_text_view_new                   (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *    gtk_text_view_new_with_buffer       (GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_set_buffer            (GtkTextView   *text_view,
                                                     GtkTextBuffer *buffer);
+GDK_AVAILABLE_IN_ALL
 GtkTextBuffer *gtk_text_view_get_buffer            (GtkTextView   *text_view);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_scroll_to_iter        (GtkTextView   *text_view,
                                                     GtkTextIter   *iter,
                                                     gdouble        within_margin,
                                                     gboolean       use_align,
                                                     gdouble        xalign,
                                                     gdouble        yalign);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_scroll_to_mark        (GtkTextView   *text_view,
                                                     GtkTextMark   *mark,
                                                     gdouble        within_margin,
                                                     gboolean       use_align,
                                                     gdouble        xalign,
                                                     gdouble        yalign);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_scroll_mark_onscreen  (GtkTextView   *text_view,
                                                     GtkTextMark   *mark);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_move_mark_onscreen    (GtkTextView   *text_view,
                                                     GtkTextMark   *mark);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_place_cursor_onscreen (GtkTextView   *text_view);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_visible_rect      (GtkTextView   *text_view,
                                                     GdkRectangle  *visible_rect);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_set_cursor_visible    (GtkTextView   *text_view,
                                                     gboolean       setting);
+GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_get_cursor_visible    (GtkTextView   *text_view);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_cursor_locations  (GtkTextView       *text_view,
                                                     const GtkTextIter *iter,
                                                     GdkRectangle      *strong,
                                                     GdkRectangle      *weak);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_iter_location     (GtkTextView   *text_view,
                                                     const GtkTextIter *iter,
                                                     GdkRectangle  *location);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_iter_at_location  (GtkTextView   *text_view,
                                                     GtkTextIter   *iter,
                                                     gint           x,
                                                     gint           y);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_iter_at_position  (GtkTextView   *text_view,
                                                     GtkTextIter   *iter,
                                                    gint          *trailing,
                                                     gint           x,
                                                     gint           y);
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_line_yrange       (GtkTextView       *text_view,
                                                     const GtkTextIter *iter,
                                                     gint              *y,
                                                     gint              *height);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_line_at_y         (GtkTextView       *text_view,
                                                     GtkTextIter       *target_iter,
                                                     gint               y,
                                                     gint              *line_top);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_buffer_to_window_coords (GtkTextView       *text_view,
                                             GtkTextWindowType  win,
                                             gint               buffer_x,
                                             gint               buffer_y,
                                             gint              *window_x,
                                             gint              *window_y);
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_window_to_buffer_coords (GtkTextView       *text_view,
                                             GtkTextWindowType  win,
                                             gint               window_x,
@@ -191,40 +212,54 @@ GtkAdjustment*   gtk_text_view_get_hadjustment (GtkTextView   *text_view);
 GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment*   gtk_text_view_get_vadjustment (GtkTextView   *text_view);
 
+GDK_AVAILABLE_IN_ALL
 GdkWindow*        gtk_text_view_get_window      (GtkTextView       *text_view,
                                                  GtkTextWindowType  win);
+GDK_AVAILABLE_IN_ALL
 GtkTextWindowType gtk_text_view_get_window_type (GtkTextView       *text_view,
                                                  GdkWindow         *window);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_set_border_window_size (GtkTextView       *text_view,
                                            GtkTextWindowType  type,
                                            gint               size);
+GDK_AVAILABLE_IN_ALL
 gint gtk_text_view_get_border_window_size (GtkTextView       *text_view,
                                           GtkTextWindowType  type);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_forward_display_line           (GtkTextView       *text_view,
                                                        GtkTextIter       *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_backward_display_line          (GtkTextView       *text_view,
                                                        GtkTextIter       *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_forward_display_line_end       (GtkTextView       *text_view,
                                                        GtkTextIter       *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_backward_display_line_start    (GtkTextView       *text_view,
                                                        GtkTextIter       *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_starts_display_line            (GtkTextView       *text_view,
                                                        const GtkTextIter *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_move_visually                  (GtkTextView       *text_view,
                                                        GtkTextIter       *iter,
                                                        gint               count);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_view_im_context_filter_keypress        (GtkTextView       *text_view,
                                                                  GdkEventKey       *event);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_view_reset_im_context                  (GtkTextView       *text_view);
 
 /* Adding child widgets */
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_add_child_at_anchor (GtkTextView          *text_view,
                                         GtkWidget            *child,
                                         GtkTextChildAnchor   *anchor);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_add_child_in_window (GtkTextView          *text_view,
                                         GtkWidget            *child,
                                         GtkTextWindowType     which_window,
@@ -232,6 +267,7 @@ void gtk_text_view_add_child_in_window (GtkTextView          *text_view,
                                         gint                  xpos,
                                         gint                  ypos);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_text_view_move_child          (GtkTextView          *text_view,
                                         GtkWidget            *child,
                                         /* window coordinates */
@@ -240,44 +276,69 @@ void gtk_text_view_move_child          (GtkTextView          *text_view,
 
 /* Default style settings (fallbacks if no tag affects the property) */
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_wrap_mode          (GtkTextView      *text_view,
                                                        GtkWrapMode       wrap_mode);
+GDK_AVAILABLE_IN_ALL
 GtkWrapMode      gtk_text_view_get_wrap_mode          (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_editable           (GtkTextView      *text_view,
                                                        gboolean          setting);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_text_view_get_editable           (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_overwrite          (GtkTextView      *text_view,
                                                       gboolean          overwrite);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_text_view_get_overwrite          (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void            gtk_text_view_set_accepts_tab        (GtkTextView      *text_view,
                                                       gboolean          accepts_tab);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_view_get_accepts_tab        (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_above_lines (GtkTextView      *text_view,
                                                        gint              pixels_above_lines);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_pixels_above_lines (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_below_lines (GtkTextView      *text_view,
                                                        gint              pixels_below_lines);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_pixels_below_lines (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_inside_wrap (GtkTextView      *text_view,
                                                        gint              pixels_inside_wrap);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_pixels_inside_wrap (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_justification      (GtkTextView      *text_view,
                                                        GtkJustification  justification);
+GDK_AVAILABLE_IN_ALL
 GtkJustification gtk_text_view_get_justification      (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_left_margin        (GtkTextView      *text_view,
                                                        gint              left_margin);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_left_margin        (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_right_margin       (GtkTextView      *text_view,
                                                        gint              right_margin);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_right_margin       (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_indent             (GtkTextView      *text_view,
                                                        gint              indent);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_text_view_get_indent             (GtkTextView      *text_view);
+GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_tabs               (GtkTextView      *text_view,
                                                        PangoTabArray    *tabs);
+GDK_AVAILABLE_IN_ALL
 PangoTabArray*   gtk_text_view_get_tabs               (GtkTextView      *text_view);
 
 /* note that the return value of this changes with the theme */
+GDK_AVAILABLE_IN_ALL
 GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView    *text_view);
 
 GDK_AVAILABLE_IN_3_6
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index be458bb..a3c48f2 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -179,6 +179,7 @@ struct _GtkThemingEngineClass
   gpointer padding[15];
 };
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_theming_engine_get_type (void) G_GNUC_CONST;
 
 /* function implemented in gtkcsscustomproperty.c */
@@ -187,37 +188,48 @@ void gtk_theming_engine_register_property (const gchar            *name_space,
                                            GtkStylePropertyParser  parse_func,
                                            GParamSpec             *pspec);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_property (GtkThemingEngine *engine,
                                       const gchar      *property,
                                       GtkStateFlags     state,
                                       GValue           *value);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_valist   (GtkThemingEngine *engine,
                                       GtkStateFlags     state,
                                       va_list           args);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get          (GtkThemingEngine *engine,
                                       GtkStateFlags     state,
                                       ...) G_GNUC_NULL_TERMINATED;
 
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_style_property (GtkThemingEngine *engine,
                                             const gchar      *property_name,
                                             GValue           *value);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_style_valist   (GtkThemingEngine *engine,
                                             va_list           args);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_style          (GtkThemingEngine *engine,
                                             ...);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
                                           const gchar      *color_name,
                                           GdkRGBA          *color);
 
+GDK_AVAILABLE_IN_ALL
 const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_theming_engine_has_class  (GtkThemingEngine *engine,
                                         const gchar      *style_class);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_theming_engine_has_region (GtkThemingEngine *engine,
                                         const gchar      *style_region,
                                         GtkRegionFlags   *flags);
 
+GDK_AVAILABLE_IN_ALL
 GtkStateFlags gtk_theming_engine_get_state        (GtkThemingEngine *engine);
 GDK_DEPRECATED_IN_3_6
 gboolean      gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
@@ -227,25 +239,32 @@ gboolean      gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
 GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get_state)
 GtkTextDirection gtk_theming_engine_get_direction (GtkThemingEngine *engine);
 
+GDK_AVAILABLE_IN_ALL
 GtkJunctionSides gtk_theming_engine_get_junction_sides (GtkThemingEngine *engine);
 
 /* Helper functions */
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_color            (GtkThemingEngine *engine,
                                               GtkStateFlags     state,
                                               GdkRGBA          *color);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_background_color (GtkThemingEngine *engine,
                                               GtkStateFlags     state,
                                               GdkRGBA          *color);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_border_color     (GtkThemingEngine *engine,
                                               GtkStateFlags     state,
                                               GdkRGBA          *color);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_border  (GtkThemingEngine *engine,
                                      GtkStateFlags     state,
                                      GtkBorder        *border);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_padding (GtkThemingEngine *engine,
                                      GtkStateFlags     state,
                                      GtkBorder        *padding);
+GDK_AVAILABLE_IN_ALL
 void gtk_theming_engine_get_margin  (GtkThemingEngine *engine,
                                      GtkStateFlags     state,
                                      GtkBorder        *margin);
@@ -254,8 +273,10 @@ GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get)
 const PangoFontDescription * gtk_theming_engine_get_font (GtkThemingEngine *engine,
                                                           GtkStateFlags     state);
 
+GDK_AVAILABLE_IN_ALL
 GtkThemingEngine * gtk_theming_engine_load (const gchar *name);
 
+GDK_AVAILABLE_IN_ALL
 GdkScreen * gtk_theming_engine_get_screen (GtkThemingEngine *engine);
 
 G_END_DECLS
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 4803594..7175e34 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -69,17 +69,24 @@ struct _GtkToggleActionClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_toggle_action_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToggleAction *gtk_toggle_action_new               (const gchar     *name,
                                                       const gchar     *label,
                                                       const gchar     *tooltip,
                                                       const gchar     *stock_id);
+GDK_AVAILABLE_IN_ALL
 void             gtk_toggle_action_toggled           (GtkToggleAction *action);
+GDK_AVAILABLE_IN_ALL
 void             gtk_toggle_action_set_active        (GtkToggleAction *action,
                                                       gboolean         is_active);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_toggle_action_get_active        (GtkToggleAction *action);
+GDK_AVAILABLE_IN_ALL
 void             gtk_toggle_action_set_draw_as_radio (GtkToggleAction *action,
                                                       gboolean         draw_as_radio);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action);
 
 /* private */
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 1183c9b..67a02f1 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -68,20 +68,31 @@ struct _GtkToggleButtonClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_toggle_button_get_type          (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_toggle_button_new               (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_toggle_button_new_with_label    (const gchar     *label);
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar     *label);
+GDK_AVAILABLE_IN_ALL
 void       gtk_toggle_button_set_mode          (GtkToggleButton *toggle_button,
                                                 gboolean         draw_indicator);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_toggle_button_get_mode          (GtkToggleButton *toggle_button);
+GDK_AVAILABLE_IN_ALL
 void       gtk_toggle_button_set_active        (GtkToggleButton *toggle_button,
                                                 gboolean         is_active);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_toggle_button_get_active        (GtkToggleButton *toggle_button);
+GDK_AVAILABLE_IN_ALL
 void       gtk_toggle_button_toggled           (GtkToggleButton *toggle_button);
+GDK_AVAILABLE_IN_ALL
 void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
                                                 gboolean         setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
 
 void       _gtk_toggle_button_set_active       (GtkToggleButton *toggle_button,
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 13368e9..fb8ac85 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -62,12 +62,17 @@ struct _GtkToggleToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_toggle_tool_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_toggle_tool_button_new            (void);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_toggle_tool_button_new_from_stock (const gchar *stock_id);
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_toggle_tool_button_set_active     (GtkToggleToolButton *button,
                                                    gboolean             is_active);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_toggle_tool_button_get_active     (GtkToggleToolButton *button);
 
 G_END_DECLS
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index deb50e4..805d0e9 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -86,37 +86,54 @@ struct _GtkToolbarClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_toolbar_get_type                (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_toolbar_new                     (void);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_insert                  (GtkToolbar      *toolbar,
                                                     GtkToolItem     *item,
                                                     gint             pos);
 
+GDK_AVAILABLE_IN_ALL
 gint            gtk_toolbar_get_item_index          (GtkToolbar      *toolbar,
                                                     GtkToolItem     *item);
+GDK_AVAILABLE_IN_ALL
 gint            gtk_toolbar_get_n_items             (GtkToolbar      *toolbar);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *   gtk_toolbar_get_nth_item            (GtkToolbar      *toolbar,
                                                     gint             n);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_toolbar_get_show_arrow          (GtkToolbar      *toolbar);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_set_show_arrow          (GtkToolbar      *toolbar,
                                                     gboolean         show_arrow);
 
+GDK_AVAILABLE_IN_ALL
 GtkToolbarStyle gtk_toolbar_get_style               (GtkToolbar      *toolbar);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_set_style               (GtkToolbar      *toolbar,
                                                     GtkToolbarStyle  style);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_unset_style             (GtkToolbar      *toolbar);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSize     gtk_toolbar_get_icon_size           (GtkToolbar      *toolbar);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_set_icon_size           (GtkToolbar      *toolbar,
                                                      GtkIconSize      icon_size);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_unset_icon_size         (GtkToolbar      *toolbar);
 
+GDK_AVAILABLE_IN_ALL
 GtkReliefStyle  gtk_toolbar_get_relief_style        (GtkToolbar      *toolbar);
+GDK_AVAILABLE_IN_ALL
 gint            gtk_toolbar_get_drop_index          (GtkToolbar      *toolbar,
                                                     gint             x,
                                                     gint             y);
+GDK_AVAILABLE_IN_ALL
 void            gtk_toolbar_set_drop_highlight_item (GtkToolbar      *toolbar,
                                                     GtkToolItem     *tool_item,
                                                     gint             index_);
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 144607f..ae0e45a 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -64,28 +64,43 @@ struct _GtkToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
                                             const gchar *label);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_label         (GtkToolButton *button,
                                                         const gchar   *label);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_tool_button_get_label         (GtkToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
                                                         gboolean       use_underline);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
                                                         const gchar   *stock_id);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_tool_button_get_stock_id      (GtkToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
                                                         const gchar   *icon_name);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_tool_button_get_icon_name     (GtkToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
                                                         GtkWidget     *icon_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_button_set_label_widget  (GtkToolButton *button,
                                                         GtkWidget     *label_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_tool_button_get_label_widget  (GtkToolButton *button);
 
 
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 1a62391..376239f 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -65,54 +65,84 @@ struct _GtkToolItemClass
   void (* _gtk_reserved4) (void);
 };
 
+
+GDK_AVAILABLE_IN_ALL
 GType        gtk_tool_item_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_tool_item_new      (void);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_homogeneous          (GtkToolItem *tool_item,
                                                        gboolean     homogeneous);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_homogeneous          (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_expand               (GtkToolItem *tool_item,
                                                        gboolean     expand);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_expand               (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_tooltip_text         (GtkToolItem *tool_item,
                                                        const gchar *text);
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_tooltip_markup       (GtkToolItem *tool_item,
                                                        const gchar *markup);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_use_drag_window      (GtkToolItem *tool_item,
                                                        gboolean     use_drag_window);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_use_drag_window      (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_visible_horizontal   (GtkToolItem *tool_item,
                                                        gboolean     visible_horizontal);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_visible_horizontal   (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_visible_vertical     (GtkToolItem *tool_item,
                                                        gboolean     visible_vertical);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_visible_vertical     (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_tool_item_get_is_important         (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_is_important         (GtkToolItem *tool_item,
                                                        gboolean     is_important);
 
+GDK_AVAILABLE_IN_ALL
 PangoEllipsizeMode gtk_tool_item_get_ellipsize_mode    (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkIconSize     gtk_tool_item_get_icon_size            (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation  gtk_tool_item_get_orientation          (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkToolbarStyle gtk_tool_item_get_toolbar_style        (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkReliefStyle  gtk_tool_item_get_relief_style         (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 gfloat          gtk_tool_item_get_text_alignment       (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation  gtk_tool_item_get_text_orientation     (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkSizeGroup *  gtk_tool_item_get_text_size_group      (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_tool_item_retrieve_proxy_menu_item (GtkToolItem *tool_item);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *     gtk_tool_item_get_proxy_menu_item      (GtkToolItem *tool_item,
                                                        const gchar *menu_item_id);
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_set_proxy_menu_item      (GtkToolItem *tool_item,
                                                        const gchar *menu_item_id,
                                                        GtkWidget   *menu_item);
+GDK_AVAILABLE_IN_ALL
 void           gtk_tool_item_rebuild_menu             (GtkToolItem *tool_item);
 
+GDK_AVAILABLE_IN_ALL
 void            gtk_tool_item_toolbar_reconfigured     (GtkToolItem *tool_item);
 
 /* private */
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index c61b282..dbe5cf5 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -63,38 +63,56 @@ struct _GtkToolItemGroupClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                 gtk_tool_item_group_get_type          (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*            gtk_tool_item_group_new               (const gchar        *label);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_label         (GtkToolItemGroup   *group,
                                                              const gchar        *label);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_label_widget  (GtkToolItemGroup   *group,
                                                              GtkWidget          *label_widget);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_collapsed      (GtkToolItemGroup  *group,
                                                              gboolean            collapsed);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_ellipsize     (GtkToolItemGroup   *group,
                                                              PangoEllipsizeMode  ellipsize);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_header_relief (GtkToolItemGroup   *group,
                                                              GtkReliefStyle      style);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_tool_item_group_get_label_widget  (GtkToolItemGroup   *group);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_tool_item_group_get_collapsed     (GtkToolItemGroup   *group);
+GDK_AVAILABLE_IN_ALL
 PangoEllipsizeMode    gtk_tool_item_group_get_ellipsize     (GtkToolItemGroup   *group);
+GDK_AVAILABLE_IN_ALL
 GtkReliefStyle        gtk_tool_item_group_get_header_relief (GtkToolItemGroup   *group);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_insert            (GtkToolItemGroup   *group,
                                                              GtkToolItem        *item,
                                                              gint                position);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_tool_item_group_set_item_position (GtkToolItemGroup   *group,
                                                              GtkToolItem        *item,
                                                              gint                position);
+GDK_AVAILABLE_IN_ALL
 gint                  gtk_tool_item_group_get_item_position (GtkToolItemGroup   *group,
                                                              GtkToolItem        *item);
 
+GDK_AVAILABLE_IN_ALL
 guint                 gtk_tool_item_group_get_n_items       (GtkToolItemGroup   *group);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem*          gtk_tool_item_group_get_nth_item      (GtkToolItemGroup   *group,
                                                              guint               index);
+GDK_AVAILABLE_IN_ALL
 GtkToolItem*          gtk_tool_item_group_get_drop_item     (GtkToolItemGroup   *group,
                                                              gint                x,
                                                              gint                y);
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 8b05547..721db21 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -78,47 +78,66 @@ struct _GtkToolPaletteClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                          gtk_tool_palette_get_type              (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*                     gtk_tool_palette_new                   (void);
 
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_group_position    (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group,
                                                                        gint                       position);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_exclusive         (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group,
                                                                        gboolean                   exclusive);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_expand            (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group,
                                                                        gboolean                   expand);
 
+GDK_AVAILABLE_IN_ALL
 gint                           gtk_tool_palette_get_group_position    (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group);
+GDK_AVAILABLE_IN_ALL
 gboolean                       gtk_tool_palette_get_exclusive         (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group);
+GDK_AVAILABLE_IN_ALL
 gboolean                       gtk_tool_palette_get_expand            (GtkToolPalette            *palette,
                                                                        GtkToolItemGroup          *group);
 
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_icon_size         (GtkToolPalette            *palette,
                                                                        GtkIconSize                icon_size);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_unset_icon_size       (GtkToolPalette            *palette);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_style             (GtkToolPalette            *palette,
                                                                        GtkToolbarStyle            style);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_unset_style           (GtkToolPalette            *palette);
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSize                    gtk_tool_palette_get_icon_size         (GtkToolPalette            *palette);
+GDK_AVAILABLE_IN_ALL
 GtkToolbarStyle                gtk_tool_palette_get_style             (GtkToolPalette            *palette);
 
+GDK_AVAILABLE_IN_ALL
 GtkToolItem*                   gtk_tool_palette_get_drop_item         (GtkToolPalette            *palette,
                                                                        gint                       x,
                                                                        gint                       y);
+GDK_AVAILABLE_IN_ALL
 GtkToolItemGroup*              gtk_tool_palette_get_drop_group        (GtkToolPalette            *palette,
                                                                        gint                       x,
                                                                        gint                       y);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*                     gtk_tool_palette_get_drag_item         (GtkToolPalette            *palette,
                                                                        const GtkSelectionData    *selection);
 
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_set_drag_source       (GtkToolPalette            *palette,
                                                                        GtkToolPaletteDragTargets  targets);
+GDK_AVAILABLE_IN_ALL
 void                           gtk_tool_palette_add_drag_dest         (GtkToolPalette            *palette,
                                                                        GtkWidget                 *widget,
                                                                        GtkDestDefaults            flags,
@@ -131,7 +150,9 @@ GtkAdjustment*                 gtk_tool_palette_get_hadjustment       (GtkToolPa
 GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment*                 gtk_tool_palette_get_vadjustment       (GtkToolPalette            *palette);
 
+GDK_AVAILABLE_IN_ALL
 const GtkTargetEntry*          gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 const GtkTargetEntry*          gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
 
 
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index 8cca4eb..c57699a 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -72,16 +72,26 @@ struct _GtkToolShellIface
   GtkSizeGroup *     (*get_text_size_group)  (GtkToolShell *shell);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType              gtk_tool_shell_get_type             (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkIconSize        gtk_tool_shell_get_icon_size        (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation     gtk_tool_shell_get_orientation      (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 GtkToolbarStyle    gtk_tool_shell_get_style            (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 GtkReliefStyle     gtk_tool_shell_get_relief_style     (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 void               gtk_tool_shell_rebuild_menu         (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 GtkOrientation     gtk_tool_shell_get_text_orientation (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 gfloat             gtk_tool_shell_get_text_alignment   (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 PangoEllipsizeMode gtk_tool_shell_get_ellipsize_mode   (GtkToolShell *shell);
+GDK_AVAILABLE_IN_ALL
 GtkSizeGroup *     gtk_tool_shell_get_text_size_group  (GtkToolShell *shell);
 
 G_END_DECLS
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index daa4a3e..2a6e7f2 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -32,29 +32,39 @@ G_BEGIN_DECLS
 #define GTK_TOOLTIP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIP, GtkTooltip))
 #define GTK_IS_TOOLTIP(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLTIP))
 
+GDK_AVAILABLE_IN_ALL
 GType gtk_tooltip_get_type (void);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_markup              (GtkTooltip         *tooltip,
                                           const gchar        *markup);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_text                (GtkTooltip         *tooltip,
                                           const gchar        *text);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon                (GtkTooltip         *tooltip,
                                           GdkPixbuf          *pixbuf);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon_from_stock     (GtkTooltip         *tooltip,
                                           const gchar        *stock_id,
                                           GtkIconSize         size);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon_from_icon_name (GtkTooltip         *tooltip,
                                          const gchar        *icon_name,
                                          GtkIconSize         size);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon_from_gicon     (GtkTooltip         *tooltip,
                                          GIcon              *gicon,
                                          GtkIconSize         size);
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_custom             (GtkTooltip         *tooltip,
                                           GtkWidget          *custom_widget);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_tip_area            (GtkTooltip         *tooltip,
                                           const GdkRectangle *rect);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_trigger_tooltip_query   (GdkDisplay         *display);
 
 
diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h
index cef5ce2..4be745e 100644
--- a/gtk/gtktrayicon.h
+++ b/gtk/gtktrayicon.h
@@ -51,6 +51,7 @@ struct _GtkTrayIconClass
   void (*_gtk_reserved4);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_tray_icon_get_type         (void) G_GNUC_CONST;
 
 GtkTrayIcon   *_gtk_tray_icon_new_for_screen  (GdkScreen   *screen,
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index 934d003..ca8152e 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -52,19 +52,23 @@ struct _GtkTreeDragSourceIface
                                          GtkTreePath       *path);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_tree_drag_source_get_type   (void) G_GNUC_CONST;
 
 /* Returns whether the given row can be dragged */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_drag_source_row_draggable    (GtkTreeDragSource *drag_source,
                                                 GtkTreePath       *path);
 
 /* Deletes the given row, or returns FALSE if it can't */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
                                                 GtkTreePath       *path);
 
 /* Fills in selection_data with type selection_data->target based on
  * the row denoted by path, returns TRUE if it does anything
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_drag_source_drag_data_get    (GtkTreeDragSource *drag_source,
                                                 GtkTreePath       *path,
                                                 GtkSelectionData  *selection_data);
@@ -92,17 +96,20 @@ struct _GtkTreeDragDestIface
                                       GtkSelectionData  *selection_data);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_tree_drag_dest_get_type   (void) G_GNUC_CONST;
 
 /* Inserts a row before dest which contains data in selection_data,
  * or returns FALSE if it can't
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_drag_dest_drag_data_received (GtkTreeDragDest   *drag_dest,
                                                GtkTreePath       *dest,
                                                GtkSelectionData  *selection_data);
 
 
 /* Returns TRUE if we can drop before path; path may not exist. */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_drag_dest_row_drop_possible  (GtkTreeDragDest   *drag_dest,
                                                GtkTreePath       *dest_path,
                                                GtkSelectionData  *selection_data);
@@ -111,9 +118,11 @@ gboolean gtk_tree_drag_dest_row_drop_possible  (GtkTreeDragDest   *drag_dest,
 /* The selection data would normally have target type GTK_TREE_MODEL_ROW in this
  * case. If the target is wrong these functions return FALSE.
  */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_set_row_drag_data            (GtkSelectionData  *selection_data,
                                                GtkTreeModel      *tree_model,
                                                GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_get_row_drag_data            (GtkSelectionData  *selection_data,
                                                GtkTreeModel     **tree_model,
                                                GtkTreePath      **path);
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index fed9850..41a4d2b 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -23,6 +23,7 @@
 #endif
 
 #include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -159,34 +160,54 @@ struct _GtkTreeModelIface
 
 
 /* GtkTreePath operations */
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new              (void);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new_from_string  (const gchar       *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new_from_indices (gint               first_index,
                                             ...);
+GDK_AVAILABLE_IN_ALL
 gchar       *gtk_tree_path_to_string        (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new_first        (void);
+GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_append_index     (GtkTreePath       *path,
                                             gint               index_);
+GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_prepend_index    (GtkTreePath       *path,
                                             gint               index_);
+GDK_AVAILABLE_IN_ALL
 gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
 
+GDK_AVAILABLE_IN_ALL
 gint        *gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
                                                   gint        *depth);
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_free             (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
+GDK_AVAILABLE_IN_ALL
 GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 gint         gtk_tree_path_compare          (const GtkTreePath *a,
                                             const GtkTreePath *b);
+GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_next             (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_tree_path_prev             (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_tree_path_up               (GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_down             (GtkTreePath       *path);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_tree_path_is_ancestor      (GtkTreePath       *path,
                                              GtkTreePath       *descendant);
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
                                              GtkTreePath       *ancestor);
 
@@ -198,103 +219,144 @@ gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
  * new GtkTreeRowReference with gtk_tree_row_reference_new().
  */
 
+GDK_AVAILABLE_IN_ALL
 GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
                                                       GtkTreePath         *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
                                                       GtkTreeModel        *model,
                                                       GtkTreePath         *path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath         *gtk_tree_row_reference_get_path  (GtkTreeRowReference *reference);
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel        *gtk_tree_row_reference_get_model (GtkTreeRowReference *reference);
+GDK_AVAILABLE_IN_ALL
 gboolean             gtk_tree_row_reference_valid     (GtkTreeRowReference *reference);
+GDK_AVAILABLE_IN_ALL
 GtkTreeRowReference *gtk_tree_row_reference_copy      (GtkTreeRowReference *reference);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_tree_row_reference_free      (GtkTreeRowReference *reference);
 /* These two functions are only needed if you created the row reference with a
  * proxy object */
+GDK_AVAILABLE_IN_ALL
 void                 gtk_tree_row_reference_inserted  (GObject     *proxy,
                                                       GtkTreePath *path);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_tree_row_reference_deleted   (GObject     *proxy,
                                                       GtkTreePath *path);
+GDK_AVAILABLE_IN_ALL
 void                 gtk_tree_row_reference_reordered (GObject     *proxy,
                                                       GtkTreePath *path,
                                                       GtkTreeIter *iter,
                                                       gint        *new_order);
 
 /* GtkTreeIter operations */
+GDK_AVAILABLE_IN_ALL
 GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_iter_free             (GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 GType             gtk_tree_iter_get_type         (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
+GDK_AVAILABLE_IN_ALL
 GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
                                                  gint          index_);
 
 
 /* Iterator movement */
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_get_iter        (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreePath  *path);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model,
                                                       GtkTreeIter  *iter,
                                                       const gchar  *path_string);
+GDK_AVAILABLE_IN_ALL
 gchar *           gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
                                                        GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_get_iter_first  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath *     gtk_tree_model_get_path        (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_get_value       (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  gint          column,
                                                  GValue       *value);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_previous   (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_next       (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_children   (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *parent);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_has_child  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 gint              gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_nth_child  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *parent,
                                                  gint          n);
+GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_parent     (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *child);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_ref_node        (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_unref_node      (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_get             (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  ...);
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_get_valist      (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  va_list       var_args);
 
 
+GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_foreach         (GtkTreeModel            *model,
                                                  GtkTreeModelForeachFunc  func,
                                                  gpointer                 user_data);
 
 /* Signals */
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_row_changed           (GtkTreeModel *tree_model,
                                           GtkTreePath  *path,
                                           GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_row_inserted          (GtkTreeModel *tree_model,
                                           GtkTreePath  *path,
                                           GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
                                           GtkTreePath  *path,
                                           GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_row_deleted           (GtkTreeModel *tree_model,
                                           GtkTreePath  *path);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_rows_reordered        (GtkTreeModel *tree_model,
                                           GtkTreePath  *path,
                                           GtkTreeIter  *iter,
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 832de50..4a520b9 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -105,38 +105,50 @@ struct _GtkTreeModelFilterClass
 };
 
 /* base */
+GDK_AVAILABLE_IN_ALL
 GType         gtk_tree_model_filter_get_type                   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel                 *child_model,
                                                                 GtkTreePath                  *root);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,
                                                                 GtkTreeModelFilterVisibleFunc func,
                                                                 gpointer                      data,
                                                                 GDestroyNotify                destroy);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilter           *filter,
                                                                 gint                          n_columns,
                                                                 GType                        *types,
                                                                 GtkTreeModelFilterModifyFunc  func,
                                                                 gpointer                      data,
                                                                 GDestroyNotify                destroy);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
                                                                 gint                          column);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_tree_model_filter_get_model                  (GtkTreeModelFilter           *filter);
 
 /* conversion */
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter           *filter,
                                                                 GtkTreeIter                  *filter_iter,
                                                                 GtkTreeIter                  *child_iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilter           *filter,
                                                                 GtkTreeIter                  *child_iter,
                                                                 GtkTreeIter                  *filter_iter);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath  *gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter           *filter,
                                                                 GtkTreePath                  *child_path);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *filter,
                                                                 GtkTreePath                  *filter_path);
 
 /* extras */
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_refilter                   (GtkTreeModelFilter           *filter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_clear_cache                (GtkTreeModelFilter           *filter);
 
 G_END_DECLS
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 9ba6d1f..7d09ca7 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -59,22 +59,32 @@ struct _GtkTreeModelSortClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreePath      *child_path);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreeIter      *sort_iter,
                                                              GtkTreeIter      *child_iter);
+GDK_AVAILABLE_IN_ALL
 GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreePath      *sorted_path);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreeIter      *child_iter,
                                                              GtkTreeIter      *sorted_iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_sort_reset_default_sort_func    (GtkTreeModelSort *tree_model_sort);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_sort_clear_cache                (GtkTreeModelSort *tree_model_sort);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
                                                               GtkTreeIter      *iter);
 
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 4600930..379961e 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -94,48 +94,69 @@ struct _GtkTreeSelectionClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
                                                         GtkSelectionMode             type);
+GDK_AVAILABLE_IN_ALL
 GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection            *selection);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_set_select_function (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionFunc         func,
                                                         gpointer                     data,
                                                         GDestroyNotify               destroy);
+GDK_AVAILABLE_IN_ALL
 gpointer         gtk_tree_selection_get_user_data       (GtkTreeSelection            *selection);
+GDK_AVAILABLE_IN_ALL
 GtkTreeView*     gtk_tree_selection_get_tree_view       (GtkTreeSelection            *selection);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeSelectionFunc gtk_tree_selection_get_select_function (GtkTreeSelection        *selection);
 
 /* Only meaningful if GTK_SELECTION_SINGLE or GTK_SELECTION_BROWSE is set */
 /* Use selected_foreach or get_selected_rows for GTK_SELECTION_MULTIPLE */
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_tree_selection_get_selected        (GtkTreeSelection            *selection,
                                                         GtkTreeModel               **model,
                                                         GtkTreeIter                 *iter);
+GDK_AVAILABLE_IN_ALL
 GList *          gtk_tree_selection_get_selected_rows   (GtkTreeSelection            *selection,
                                                          GtkTreeModel               **model);
+GDK_AVAILABLE_IN_ALL
 gint             gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_selected_foreach    (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionForeachFunc  func,
                                                         gpointer                     data);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_select_path         (GtkTreeSelection            *selection,
                                                         GtkTreePath                 *path);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_unselect_path       (GtkTreeSelection            *selection,
                                                         GtkTreePath                 *path);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_select_iter         (GtkTreeSelection            *selection,
                                                         GtkTreeIter                 *iter);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_unselect_iter       (GtkTreeSelection            *selection,
                                                         GtkTreeIter                 *iter);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_tree_selection_path_is_selected    (GtkTreeSelection            *selection,
                                                         GtkTreePath                 *path);
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_tree_selection_iter_is_selected    (GtkTreeSelection            *selection,
                                                         GtkTreeIter                 *iter);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_select_all          (GtkTreeSelection            *selection);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_unselect_all        (GtkTreeSelection            *selection);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_select_range        (GtkTreeSelection            *selection,
                                                         GtkTreePath                 *start_path,
                                                         GtkTreePath                 *end_path);
+GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_unselect_range      (GtkTreeSelection            *selection,
                                                          GtkTreePath                 *start_path,
                                                         GtkTreePath                 *end_path);
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 1023a17..4c46845 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -98,24 +98,31 @@ struct _GtkTreeSortableIface
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType    gtk_tree_sortable_get_type              (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_sort_column_changed   (GtkTreeSortable        *sortable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_sortable_get_sort_column_id    (GtkTreeSortable        *sortable,
                                                  gint                   *sort_column_id,
                                                  GtkSortType            *order);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_set_sort_column_id    (GtkTreeSortable        *sortable,
                                                  gint                    sort_column_id,
                                                  GtkSortType             order);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortable,
                                                  gint                    sort_column_id,
                                                  GtkTreeIterCompareFunc  sort_func,
                                                  gpointer                user_data,
                                                  GDestroyNotify          destroy);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
                                                  GtkTreeIterCompareFunc  sort_func,
                                                  gpointer                user_data,
                                                  GDestroyNotify          destroy);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
 
 G_END_DECLS
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 69a42be..584376d 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -61,51 +61,65 @@ struct _GtkTreeStoreClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
                                               ...);
+GDK_AVAILABLE_IN_ALL
 GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,
                                               GType        *types);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
                                               gint          n_columns,
                                               GType        *types);
 
 /* NOTE: use gtk_tree_model_get to get values from a GtkTreeStore */
 
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_value        (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               gint          column,
                                               GValue       *value);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set              (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               ...);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_valuesv      (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               gint         *columns,
                                               GValue       *values,
                                               gint          n_values);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_valist       (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               va_list       var_args);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_store_remove           (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert           (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent,
                                               gint          position);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_before    (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent,
                                               GtkTreeIter  *sibling);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_after     (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent,
                                               GtkTreeIter  *sibling);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
                                                 GtkTreeIter  *iter,
                                                 GtkTreeIter  *parent,
                                                 gint          position,
                                                 ...);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *parent,
@@ -113,29 +127,39 @@ void          gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
                                                  gint         *columns,
                                                  GValue       *values,
                                                  gint          n_values);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_prepend          (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_append           (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_store_is_ancestor      (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *descendant);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_tree_store_iter_depth       (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_clear            (GtkTreeStore *tree_store);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_store_iter_is_valid    (GtkTreeStore *tree_store,
                                                GtkTreeIter  *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_reorder          (GtkTreeStore *tree_store,
                                                GtkTreeIter  *parent,
                                                gint         *new_order);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_swap             (GtkTreeStore *tree_store,
                                                GtkTreeIter  *a,
                                                GtkTreeIter  *b);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_move_before      (GtkTreeStore *tree_store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_move_after       (GtkTreeStore *tree_store,
                                                GtkTreeIter  *iter,
                                                GtkTreeIter  *position);
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index cdd94f0..5ccc300 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -202,14 +202,20 @@ typedef void     (*GtkTreeViewSearchPositionFunc) (GtkTreeView  *tree_view,
 
 
 /* Creators */
+GDK_AVAILABLE_IN_ALL
 GType                  gtk_tree_view_get_type                      (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget             *gtk_tree_view_new                           (void);
+GDK_AVAILABLE_IN_ALL
 GtkWidget             *gtk_tree_view_new_with_model                (GtkTreeModel              *model);
 
 /* Accessors */
+GDK_AVAILABLE_IN_ALL
 GtkTreeModel          *gtk_tree_view_get_model                     (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_model                     (GtkTreeView               *tree_view,
                                                                    GtkTreeModel              *model);
+GDK_AVAILABLE_IN_ALL
 GtkTreeSelection      *gtk_tree_view_get_selection                 (GtkTreeView               *tree_view);
 
 GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
@@ -224,15 +230,22 @@ void                   gtk_tree_view_set_vadjustment               (GtkTreeView
                                                                    GtkAdjustment             *adjustment);
 
 
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_headers_visible           (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_headers_visible           (GtkTreeView               *tree_view,
                                                                    gboolean                   
headers_visible);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_columns_autosize              (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_headers_clickable         (GtkTreeView *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_headers_clickable         (GtkTreeView               *tree_view,
                                                                    gboolean                   setting);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_rules_hint                (GtkTreeView               *tree_view,
                                                                    gboolean                   setting);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_rules_hint                (GtkTreeView               *tree_view);
 GDK_AVAILABLE_IN_3_8
 gboolean               gtk_tree_view_get_activate_on_single_click  (GtkTreeView               *tree_view);
@@ -241,18 +254,23 @@ void                   gtk_tree_view_set_activate_on_single_click  (GtkTreeView
                                                                    gboolean                   single);
 
 /* Column funtions */
+GDK_AVAILABLE_IN_ALL
 gint                   gtk_tree_view_append_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column);
+GDK_AVAILABLE_IN_ALL
 gint                   gtk_tree_view_remove_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column);
+GDK_AVAILABLE_IN_ALL
 gint                   gtk_tree_view_insert_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column,
                                                                    gint                       position);
+GDK_AVAILABLE_IN_ALL
 gint                   gtk_tree_view_insert_column_with_attributes (GtkTreeView               *tree_view,
                                                                    gint                       position,
                                                                    const gchar               *title,
                                                                    GtkCellRenderer           *cell,
                                                                    ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
                                                                    gint                       position,
                                                                    const gchar               *title,
@@ -263,66 +281,89 @@ gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView
 
 GDK_AVAILABLE_IN_3_4
 guint                  gtk_tree_view_get_n_columns                 (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn     *gtk_tree_view_get_column                    (GtkTreeView               *tree_view,
                                                                    gint                       n);
+GDK_AVAILABLE_IN_ALL
 GList                 *gtk_tree_view_get_columns                   (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_move_column_after             (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column,
                                                                    GtkTreeViewColumn         *base_column);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_expander_column           (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn     *gtk_tree_view_get_expander_column           (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_column_drag_function      (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumnDropFunc  func,
                                                                    gpointer                   user_data,
                                                                    GDestroyNotify             destroy);
 
 /* Actions */
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_scroll_to_point               (GtkTreeView               *tree_view,
                                                                    gint                       tree_x,
                                                                    gint                       tree_y);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_scroll_to_cell                (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *column,
                                                                    gboolean                   use_align,
                                                                    gfloat                     row_align,
                                                                    gfloat                     col_align);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_row_activated                 (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *column);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_expand_all                    (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_collapse_all                  (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_expand_to_path                (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_expand_row                    (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    gboolean                   open_all);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_collapse_row                  (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_map_expanded_rows             (GtkTreeView               *tree_view,
                                                                    GtkTreeViewMappingFunc     func,
                                                                    gpointer                   data);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_row_expanded                  (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_reorderable               (GtkTreeView               *tree_view,
                                                                    gboolean                   reorderable);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_reorderable               (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_cursor                    (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *focus_column,
                                                                    gboolean                   start_editing);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_cursor_on_cell            (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *focus_column,
                                                                    GtkCellRenderer           *focus_cell,
                                                                    gboolean                   start_editing);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_cursor                    (GtkTreeView               *tree_view,
                                                                    GtkTreePath              **path,
                                                                    GtkTreeViewColumn        **focus_column);
 
 
 /* Layout information */
+GDK_AVAILABLE_IN_ALL
 GdkWindow             *gtk_tree_view_get_bin_window                (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_path_at_pos               (GtkTreeView               *tree_view,
                                                                    gint                       x,
                                                                    gint                       y,
@@ -330,19 +371,24 @@ gboolean               gtk_tree_view_get_path_at_pos               (GtkTreeView
                                                                    GtkTreeViewColumn        **column,
                                                                    gint                      *cell_x,
                                                                    gint                      *cell_y);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_cell_area                 (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *column,
                                                                    GdkRectangle              *rect);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_background_area           (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewColumn         *column,
                                                                    GdkRectangle              *rect);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_visible_rect              (GtkTreeView               *tree_view,
                                                                    GdkRectangle              *visible_rect);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_visible_range             (GtkTreeView               *tree_view,
                                                                    GtkTreePath              **start_path,
                                                                    GtkTreePath              **end_path);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_is_blank_at_pos               (GtkTreeView               *tree_view,
                                                                     gint                       x,
                                                                     gint                       y,
@@ -352,82 +398,106 @@ gboolean               gtk_tree_view_is_blank_at_pos               (GtkTreeView
                                                                     gint                      *cell_y);
 
 /* Drag-and-Drop support */
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_enable_model_drag_source      (GtkTreeView               *tree_view,
                                                                    GdkModifierType            
start_button_mask,
                                                                    const GtkTargetEntry      *targets,
                                                                    gint                       n_targets,
                                                                    GdkDragAction              actions);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_enable_model_drag_dest        (GtkTreeView               *tree_view,
                                                                    const GtkTargetEntry      *targets,
                                                                    gint                       n_targets,
                                                                    GdkDragAction              actions);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_unset_rows_drag_source        (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_unset_rows_drag_dest          (GtkTreeView               *tree_view);
 
 
 /* These are useful to implement your own custom stuff. */
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_set_drag_dest_row             (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
                                                                    GtkTreeViewDropPosition    pos);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_drag_dest_row             (GtkTreeView               *tree_view,
                                                                    GtkTreePath              **path,
                                                                    GtkTreeViewDropPosition   *pos);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_dest_row_at_pos           (GtkTreeView               *tree_view,
                                                                    gint                       drag_x,
                                                                    gint                       drag_y,
                                                                    GtkTreePath              **path,
                                                                    GtkTreeViewDropPosition   *pos);
+GDK_AVAILABLE_IN_ALL
 cairo_surface_t       *gtk_tree_view_create_row_drag_icon          (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path);
 
 /* Interactive search */
+GDK_AVAILABLE_IN_ALL
 void                       gtk_tree_view_set_enable_search     (GtkTreeView                *tree_view,
                                                                gboolean                    enable_search);
+GDK_AVAILABLE_IN_ALL
 gboolean                   gtk_tree_view_get_enable_search     (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 gint                       gtk_tree_view_get_search_column     (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                       gtk_tree_view_set_search_column     (GtkTreeView                *tree_view,
                                                                gint                        column);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                       gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
                                                                GtkTreeViewSearchEqualFunc  search_equal_func,
                                                                gpointer                    search_user_data,
                                                                GDestroyNotify              search_destroy);
 
+GDK_AVAILABLE_IN_ALL
 GtkEntry                     *gtk_tree_view_get_search_entry         (GtkTreeView                   
*tree_view);
+GDK_AVAILABLE_IN_ALL
 void                          gtk_tree_view_set_search_entry         (GtkTreeView                   
*tree_view,
                                                                      GtkEntry                      *entry);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewSearchPositionFunc gtk_tree_view_get_search_position_func (GtkTreeView                   
*tree_view);
+GDK_AVAILABLE_IN_ALL
 void                          gtk_tree_view_set_search_position_func (GtkTreeView                   
*tree_view,
                                                                      GtkTreeViewSearchPositionFunc  func,
                                                                      gpointer                       data,
                                                                      GDestroyNotify                 destroy);
 
 /* Convert between the different coordinate systems */
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_widget_to_tree_coords       (GtkTreeView *tree_view,
                                                        gint         wx,
                                                        gint         wy,
                                                        gint        *tx,
                                                        gint        *ty);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_tree_to_widget_coords       (GtkTreeView *tree_view,
                                                        gint         tx,
                                                        gint         ty,
                                                        gint        *wx,
                                                        gint        *wy);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
                                                        gint         wx,
                                                        gint         wy,
                                                        gint        *bx,
                                                        gint        *by);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
                                                        gint         bx,
                                                        gint         by,
                                                        gint        *wx,
                                                        gint        *wy);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_tree_to_bin_window_coords   (GtkTreeView *tree_view,
                                                        gint         tx,
                                                        gint         ty,
                                                        gint        *bx,
                                                        gint        *by);
+GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_bin_window_to_tree_coords   (GtkTreeView *tree_view,
                                                        gint         bx,
                                                        gint         by,
@@ -446,49 +516,71 @@ void gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
                                           gpointer                 data,
                                           GDestroyNotify           destroy);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_view_set_fixed_height_mode (GtkTreeView          *tree_view,
                                              gboolean              enable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_view_get_fixed_height_mode (GtkTreeView          *tree_view);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_view_set_hover_selection   (GtkTreeView          *tree_view,
                                              gboolean              hover);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_view_get_hover_selection   (GtkTreeView          *tree_view);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_view_set_hover_expand      (GtkTreeView          *tree_view,
                                              gboolean              expand);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_view_get_hover_expand      (GtkTreeView          *tree_view);
+GDK_AVAILABLE_IN_ALL
 void     gtk_tree_view_set_rubber_banding    (GtkTreeView          *tree_view,
                                              gboolean              enable);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_view_get_rubber_banding    (GtkTreeView          *tree_view);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_view_is_rubber_banding_active (GtkTreeView       *tree_view);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func (GtkTreeView               *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_row_separator_func (GtkTreeView                *tree_view,
                                                                  GtkTreeViewRowSeparatorFunc func,
                                                                  gpointer                    data,
                                                                  GDestroyNotify              destroy);
 
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewGridLines        gtk_tree_view_get_grid_lines         (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_grid_lines         (GtkTreeView                *tree_view,
                                                                  GtkTreeViewGridLines        grid_lines);
+GDK_AVAILABLE_IN_ALL
 gboolean                    gtk_tree_view_get_enable_tree_lines  (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_enable_tree_lines  (GtkTreeView                *tree_view,
                                                                  gboolean                    enabled);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_show_expanders     (GtkTreeView                *tree_view,
                                                                  gboolean                    enabled);
+GDK_AVAILABLE_IN_ALL
 gboolean                    gtk_tree_view_get_show_expanders     (GtkTreeView                *tree_view);
+GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_level_indentation  (GtkTreeView                *tree_view,
                                                                  gint                        indentation);
+GDK_AVAILABLE_IN_ALL
 gint                        gtk_tree_view_get_level_indentation  (GtkTreeView                *tree_view);
 
 /* Convenience functions for setting tooltips */
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_view_set_tooltip_row    (GtkTreeView       *tree_view,
                                                GtkTooltip        *tooltip,
                                                GtkTreePath       *path);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_view_set_tooltip_cell   (GtkTreeView       *tree_view,
                                                GtkTooltip        *tooltip,
                                                GtkTreePath       *path,
                                                GtkTreeViewColumn *column,
                                                GtkCellRenderer   *cell);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_view_get_tooltip_context(GtkTreeView       *tree_view,
                                                gint              *x,
                                                gint              *y,
@@ -496,8 +588,10 @@ gboolean      gtk_tree_view_get_tooltip_context(GtkTreeView       *tree_view,
                                                GtkTreeModel     **model,
                                                GtkTreePath      **path,
                                                GtkTreeIter       *iter);
+GDK_AVAILABLE_IN_ALL
 void          gtk_tree_view_set_tooltip_column (GtkTreeView       *tree_view,
                                                gint               column);
+GDK_AVAILABLE_IN_ALL
 gint          gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
 
 G_END_DECLS
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 47cea71..9579fc0 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -101,80 +101,119 @@ struct _GtkTreeViewColumnClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn      *gtk_tree_view_column_new_with_area       (GtkCellArea             *area);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
                                                                  GtkCellRenderer         *cell,
                                                                  ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_pack_start          (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_pack_end            (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_clear               (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  const gchar             *attribute,
                                                                  gint                     column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  ...) G_GNUC_NULL_TERMINATED;
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  GtkTreeCellDataFunc      func,
                                                                  gpointer                 func_data,
                                                                  GDestroyNotify           destroy);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,
                                                                  gint                     spacing);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_spacing         (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 visible);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_resizable       (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 resizable);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_resizable       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
                                                                  GtkTreeViewColumnSizing  type);
+GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_3_2
 gint                    gtk_tree_view_column_get_x_offset        (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_fixed_width     (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_fixed_width     (GtkTreeViewColumn       *tree_column,
                                                                  gint                     fixed_width);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
                                                                  gint                     min_width);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
                                                                  gint                     max_width);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
 
 
 
 /* Options for manipulating the column headers
  */
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
                                                                  const gchar             *title);
+GDK_AVAILABLE_IN_ALL
 const gchar *           gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 expand);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 clickable);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_widget          (GtkTreeViewColumn       *tree_column,
                                                                  GtkWidget               *widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget              *gtk_tree_view_column_get_widget          (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_alignment       (GtkTreeViewColumn       *tree_column,
                                                                  gfloat                   xalign);
+GDK_AVAILABLE_IN_ALL
 gfloat                  gtk_tree_view_column_get_alignment       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_reorderable     (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 reorderable);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewColumn       *tree_column);
 
 
@@ -182,39 +221,53 @@ gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewCol
 /* You probably only want to use gtk_tree_view_column_set_sort_column_id.  The
  * other sorting functions exist primarily to let others do their own custom sorting.
  */
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
                                                                  gint                     sort_column_id);
+GDK_AVAILABLE_IN_ALL
 gint                    gtk_tree_view_column_get_sort_column_id  (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 setting);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn       *tree_column,
                                                                  GtkSortType              order);
+GDK_AVAILABLE_IN_ALL
 GtkSortType             gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn       *tree_column);
 
 
 /* These functions are meant primarily for interaction between the GtkTreeView and the column.
  */
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewColumn       *tree_column,
                                                                  GtkTreeModel            *tree_model,
                                                                  GtkTreeIter             *iter,
                                                                  gboolean                 is_expander,
                                                                  gboolean                 is_expanded);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
                                                                  const GdkRectangle      *cell_area,
                                                                  gint                    *x_offset,
                                                                  gint                    *y_offset,
                                                                  gint                    *width,
                                                                  gint                    *height);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_focus_cell          (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell);
+GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  gint                    *x_offset,
                                                                  gint                    *width);
+GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 GtkWidget              *gtk_tree_view_column_get_tree_view       (GtkTreeViewColumn       *tree_column);
+GDK_AVAILABLE_IN_ALL
 GtkWidget              *gtk_tree_view_column_get_button          (GtkTreeViewColumn       *tree_column);
 
 
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 85f945a..53eb229 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -122,7 +122,9 @@ typedef enum {
   GTK_UI_MANAGER_POPUP_WITH_ACCELS = 1 << 9
 } GtkUIManagerItemType;
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkUIManager  *gtk_ui_manager_new                 (void);
 GDK_DEPRECATED_IN_3_4
 void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *manager,
@@ -130,29 +132,40 @@ void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *manage
 GDK_DEPRECATED_IN_3_4
 gboolean       gtk_ui_manager_get_add_tearoffs    (GtkUIManager          *manager);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_ui_manager_insert_action_group (GtkUIManager          *manager,
                                                   GtkActionGroup        *action_group,
                                                   gint                   pos);
+GDK_AVAILABLE_IN_ALL
 void           gtk_ui_manager_remove_action_group (GtkUIManager          *manager,
                                                   GtkActionGroup        *action_group);
+GDK_AVAILABLE_IN_ALL
 GList         *gtk_ui_manager_get_action_groups   (GtkUIManager          *manager);
+GDK_AVAILABLE_IN_ALL
 GtkAccelGroup *gtk_ui_manager_get_accel_group     (GtkUIManager          *manager);
+GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_ui_manager_get_widget          (GtkUIManager          *manager,
                                                   const gchar           *path);
+GDK_AVAILABLE_IN_ALL
 GSList        *gtk_ui_manager_get_toplevels       (GtkUIManager          *manager,
                                                   GtkUIManagerItemType   types);
+GDK_AVAILABLE_IN_ALL
 GtkAction     *gtk_ui_manager_get_action          (GtkUIManager          *manager,
                                                   const gchar           *path);
+GDK_AVAILABLE_IN_ALL
 guint          gtk_ui_manager_add_ui_from_string  (GtkUIManager          *manager,
                                                   const gchar           *buffer,
                                                   gssize                 length,
                                                   GError               **error);
+GDK_AVAILABLE_IN_ALL
 guint          gtk_ui_manager_add_ui_from_file    (GtkUIManager          *manager,
                                                   const gchar           *filename,
                                                   GError               **error);
+GDK_AVAILABLE_IN_ALL
 guint          gtk_ui_manager_add_ui_from_resource(GtkUIManager          *manager,
                                                   const gchar           *resource_path,
                                                   GError               **error);
+GDK_AVAILABLE_IN_ALL
 void           gtk_ui_manager_add_ui              (GtkUIManager          *manager,
                                                   guint                  merge_id,
                                                   const gchar           *path,
@@ -160,10 +173,14 @@ void           gtk_ui_manager_add_ui              (GtkUIManager          *manage
                                                   const gchar           *action,
                                                   GtkUIManagerItemType   type,
                                                   gboolean               top);
+GDK_AVAILABLE_IN_ALL
 void           gtk_ui_manager_remove_ui           (GtkUIManager          *manager,
                                                   guint                  merge_id);
+GDK_AVAILABLE_IN_ALL
 gchar         *gtk_ui_manager_get_ui              (GtkUIManager          *manager);
+GDK_AVAILABLE_IN_ALL
 void           gtk_ui_manager_ensure_update       (GtkUIManager          *manager);
+GDK_AVAILABLE_IN_ALL
 guint          gtk_ui_manager_new_merge_id        (GtkUIManager          *manager);
 
 G_END_DECLS
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index cd09357..af1397f 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -68,7 +68,9 @@ struct _GtkViewportClass
 };
 
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
                                             GtkAdjustment *vadjustment);
 
@@ -83,10 +85,14 @@ GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
                                              GtkAdjustment *adjustment);
 
+GDK_AVAILABLE_IN_ALL
 void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
                                             GtkShadowType  type);
+GDK_AVAILABLE_IN_ALL
 GtkShadowType  gtk_viewport_get_shadow_type (GtkViewport   *viewport);
+GDK_AVAILABLE_IN_ALL
 GdkWindow*     gtk_viewport_get_bin_window  (GtkViewport   *viewport);
+GDK_AVAILABLE_IN_ALL
 GdkWindow*     gtk_viewport_get_view_window (GtkViewport   *viewport);
 
 
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 74a1ca6..19b6076 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -62,7 +62,9 @@ struct _GtkVolumeButtonClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType          gtk_volume_button_get_type      (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_volume_button_new           (void);
 
 G_END_DECLS
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 58bcea6..0365e06 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -466,38 +466,59 @@ struct _GtkWidgetAuxInfo
   GtkBorder margin;
 };
 
+GDK_AVAILABLE_IN_ALL
 GType     gtk_widget_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_widget_new                (GType                type,
                                           const gchar         *first_property_name,
                                           ...);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_destroy             (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_destroyed           (GtkWidget           *widget,
                                           GtkWidget          **widget_pointer);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_unparent            (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show                (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_hide                (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show_now            (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show_all            (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
                                            gboolean             no_show_all);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_map                 (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_unmap               (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_realize             (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_unrealize           (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_draw                (GtkWidget           *widget,
                                            cairo_t             *cr);
 /* Queuing draws */
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_queue_draw          (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_queue_draw_area     (GtkWidget           *widget,
                                           gint                 x,
                                           gint                 y,
                                           gint                 width,
                                           gint                 height);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_queue_draw_region   (GtkWidget           *widget,
                                            const cairo_region_t*region);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_queue_resize        (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
 GDK_AVAILABLE_IN_3_8
 GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget           *widget);
@@ -505,6 +526,7 @@ GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget           *widget);
 GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
 void       gtk_widget_size_request        (GtkWidget           *widget,
                                            GtkRequisition      *requisition);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_size_allocate       (GtkWidget           *widget,
                                           GtkAllocation       *allocation);
 GDK_AVAILABLE_IN_3_10
@@ -512,17 +534,22 @@ void         gtk_widget_size_allocate_with_baseline         (GtkWidget           
*widget,
                                                           GtkAllocation       *allocation,
                                                           gint                 baseline);
 
+GDK_AVAILABLE_IN_ALL
 GtkSizeRequestMode  gtk_widget_get_request_mode               (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_get_preferred_width            (GtkWidget      *widget,
                                                                gint           *minimum_width,
                                                                gint           *natural_width);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_get_preferred_height_for_width (GtkWidget      *widget,
                                                                gint            width,
                                                                gint           *minimum_height,
                                                                gint           *natural_height);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_get_preferred_height           (GtkWidget      *widget,
                                                                gint           *minimum_height,
                                                                gint           *natural_height);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_get_preferred_width_for_height (GtkWidget      *widget,
                                                                gint            height,
                                                                gint           *minimum_width,
@@ -534,6 +561,7 @@ void   gtk_widget_get_preferred_height_and_baseline_for_width (GtkWidget     *wi
                                                               gint          *natural_height,
                                                               gint          *minimum_baseline,
                                                               gint          *natural_baseline);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_get_preferred_size             (GtkWidget      *widget,
                                                                GtkRequisition *minimum_size,
                                                                GtkRequisition *natural_size);
@@ -547,73 +575,104 @@ void                gtk_widget_get_preferred_size_and_baseline (GtkWidget      *
 GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
 void       gtk_widget_get_child_requisition (GtkWidget         *widget,
                                              GtkRequisition    *requisition);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_add_accelerator     (GtkWidget           *widget,
                                           const gchar         *accel_signal,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
                                           GdkModifierType      accel_mods,
                                           GtkAccelFlags        accel_flags);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
                                           GdkModifierType      accel_mods);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_accel_path      (GtkWidget           *widget,
                                           const gchar         *accel_path,
                                           GtkAccelGroup       *accel_group);
+GDK_AVAILABLE_IN_ALL
 GList*     gtk_widget_list_accel_closures (GtkWidget          *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_can_activate_accel  (GtkWidget           *widget,
                                            guint                signal_id);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
                                           gboolean             group_cycling);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_event              (GtkWidget           *widget,
                                           GdkEvent            *event);
+GDK_AVAILABLE_IN_ALL
 gint       gtk_widget_send_expose         (GtkWidget           *widget,
                                           GdkEvent            *event);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_send_focus_change   (GtkWidget           *widget,
                                            GdkEvent            *event);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_activate              (GtkWidget        *widget);
      
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_reparent            (GtkWidget           *widget,
                                           GtkWidget           *new_parent);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_intersect                  (GtkWidget           *widget,
                                           const GdkRectangle  *area,
                                           GdkRectangle        *intersection);
+GDK_AVAILABLE_IN_ALL
 cairo_region_t *gtk_widget_region_intersect      (GtkWidget           *widget,
                                           const cairo_region_t     *region);
 
+GDK_AVAILABLE_IN_ALL
 void   gtk_widget_freeze_child_notify    (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void   gtk_widget_child_notify           (GtkWidget           *widget,
                                           const gchar         *child_property);
+GDK_AVAILABLE_IN_ALL
 void   gtk_widget_thaw_child_notify      (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_can_focus       (GtkWidget           *widget,
                                            gboolean             can_focus);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_can_focus       (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_has_focus           (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
 GDK_AVAILABLE_IN_3_2
 gboolean   gtk_widget_has_visible_focus   (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_grab_focus          (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_can_default     (GtkWidget           *widget,
                                            gboolean             can_default);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_can_default     (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_has_default         (GtkWidget           *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_grab_default        (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_set_receives_default (GtkWidget           *widget,
                                            gboolean             receives_default);
+GDK_AVAILABLE_IN_ALL
 gboolean  gtk_widget_get_receives_default (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_has_grab            (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_device_is_shadowed  (GtkWidget           *widget,
                                            GdkDevice           *device);
 
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_name               (GtkWidget    *widget,
                                                         const gchar  *name);
+GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_widget_get_name               (GtkWidget    *widget);
 
 GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_set_state_flags)
@@ -623,61 +682,91 @@ void                  gtk_widget_set_state              (GtkWidget    *widget,
 GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_state_flags)
 GtkStateType          gtk_widget_get_state              (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_state_flags        (GtkWidget     *widget,
                                                          GtkStateFlags  flags,
                                                          gboolean       clear);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_unset_state_flags      (GtkWidget     *widget,
                                                          GtkStateFlags  flags);
+GDK_AVAILABLE_IN_ALL
 GtkStateFlags         gtk_widget_get_state_flags        (GtkWidget     *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
                                                         gboolean      sensitive);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_sensitive          (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_sensitive           (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_visible            (GtkWidget    *widget,
                                                          gboolean      visible);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_visible            (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_visible             (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_has_window         (GtkWidget    *widget,
                                                          gboolean      has_window);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_has_window         (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_toplevel            (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_drawable            (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_realized           (GtkWidget    *widget,
                                                          gboolean      realized);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_realized           (GtkWidget    *widget);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_mapped             (GtkWidget    *widget,
                                                          gboolean      mapped);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_mapped             (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
                                                         gboolean      app_paintable);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_app_paintable      (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
                                                         gboolean      double_buffered);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_double_buffered    (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
                                                         gboolean      redraw_on_allocate);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_parent             (GtkWidget    *widget,
                                                         GtkWidget    *parent);
+GDK_AVAILABLE_IN_ALL
 GtkWidget           * gtk_widget_get_parent             (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
                                                         GdkWindow    *parent_window);
+GDK_AVAILABLE_IN_ALL
 GdkWindow           * gtk_widget_get_parent_window      (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
                                                         gboolean      is_visible);
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_window             (GtkWidget    *widget,
                                                          GdkWindow    *window);
+GDK_AVAILABLE_IN_ALL
 GdkWindow           * gtk_widget_get_window             (GtkWidget    *widget);
 GDK_AVAILABLE_IN_3_8
 void                  gtk_widget_register_window        (GtkWidget    *widget,
@@ -686,13 +775,17 @@ GDK_AVAILABLE_IN_3_8
 void                  gtk_widget_unregister_window      (GtkWidget    *widget,
                                                          GdkWindow    *window);
 
+GDK_AVAILABLE_IN_ALL
 int                   gtk_widget_get_allocated_width    (GtkWidget     *widget);
+GDK_AVAILABLE_IN_ALL
 int                   gtk_widget_get_allocated_height   (GtkWidget     *widget);
 GDK_AVAILABLE_IN_3_10
 int                   gtk_widget_get_allocated_baseline (GtkWidget     *widget);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_get_allocation         (GtkWidget     *widget,
                                                          GtkAllocation *allocation);
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_allocation         (GtkWidget     *widget,
                                                          const GtkAllocation *allocation);
 
@@ -700,25 +793,34 @@ GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width and gtk_widget_get_pref
 void                  gtk_widget_get_requisition        (GtkWidget     *widget,
                                                          GtkRequisition *requisition);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
                                            GtkDirectionType     direction);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_keynav_failed       (GtkWidget           *widget,
                                            GtkDirectionType     direction);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_error_bell          (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_size_request    (GtkWidget           *widget,
                                            gint                 width,
                                            gint                 height);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_get_size_request    (GtkWidget           *widget,
                                            gint                *width,
                                            gint                *height);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_set_events          (GtkWidget           *widget,
                                           gint                 events);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_add_events          (GtkWidget           *widget,
                                           gint                 events);
+GDK_AVAILABLE_IN_ALL
 void      gtk_widget_set_device_events   (GtkWidget           *widget,
                                            GdkDevice           *device,
                                           GdkEventMask         events);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_add_device_events   (GtkWidget           *widget,
                                            GdkDevice           *device,
                                           GdkEventMask         events);
@@ -728,48 +830,72 @@ void         gtk_widget_set_opacity         (GtkWidget           *widget,
 GDK_AVAILABLE_IN_3_8
 double    gtk_widget_get_opacity         (GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_device_enabled  (GtkWidget    *widget,
                                            GdkDevice    *device,
                                            gboolean      enabled);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_device_enabled  (GtkWidget    *widget,
                                            GdkDevice    *device);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget*   gtk_widget_get_toplevel   (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget*   gtk_widget_get_ancestor   (GtkWidget      *widget,
                                         GType           widget_type);
+GDK_AVAILABLE_IN_ALL
 GdkVisual*   gtk_widget_get_visual     (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_set_visual     (GtkWidget      *widget,
                                          GdkVisual      *visual);
 
+GDK_AVAILABLE_IN_ALL
 GdkScreen *   gtk_widget_get_screen      (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean      gtk_widget_has_screen      (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 GdkWindow *   gtk_widget_get_root_window (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 GtkSettings*  gtk_widget_get_settings    (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 GtkClipboard *gtk_widget_get_clipboard   (GtkWidget *widget,
                                          GdkAtom    selection);
 
 
 /* Expand flags and related support */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_get_hexpand          (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_hexpand          (GtkWidget      *widget,
                                           gboolean        expand);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_get_hexpand_set      (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_hexpand_set      (GtkWidget      *widget,
                                           gboolean        set);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_get_vexpand          (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_vexpand          (GtkWidget      *widget,
                                           gboolean        expand);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_get_vexpand_set      (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_vexpand_set      (GtkWidget      *widget,
                                           gboolean        set);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_queue_compute_expand (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_compute_expand       (GtkWidget      *widget,
                                           GtkOrientation  orientation);
 
 
 /* Multidevice support */
+GDK_AVAILABLE_IN_ALL
 gboolean         gtk_widget_get_support_multidevice (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 void             gtk_widget_set_support_multidevice (GtkWidget      *widget,
                                                      gboolean        support_multidevice);
 
@@ -780,33 +906,48 @@ void             gtk_widget_class_set_accessible_type    (GtkWidgetClass     *wi
 GDK_AVAILABLE_IN_3_2
 void             gtk_widget_class_set_accessible_role    (GtkWidgetClass     *widget_class,
                                                           AtkRole             role);
+GDK_AVAILABLE_IN_ALL
 AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
 
 
 /* Margin and alignment */
+GDK_AVAILABLE_IN_ALL
 GtkAlign gtk_widget_get_halign        (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_halign        (GtkWidget *widget,
                                        GtkAlign   align);
+GDK_AVAILABLE_IN_ALL
 GtkAlign gtk_widget_get_valign        (GtkWidget *widget);
 GDK_AVAILABLE_IN_3_10
 GtkAlign gtk_widget_get_valign_with_baseline (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_valign        (GtkWidget *widget,
                                        GtkAlign   align);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_widget_get_margin_left   (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_left   (GtkWidget *widget,
                                        gint       margin);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_widget_get_margin_right  (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_right  (GtkWidget *widget,
                                        gint       margin);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_widget_get_margin_top    (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_top    (GtkWidget *widget,
                                        gint       margin);
+GDK_AVAILABLE_IN_ALL
 gint     gtk_widget_get_margin_bottom (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_bottom (GtkWidget *widget,
                                        gint       margin);
 
 
+GDK_AVAILABLE_IN_ALL
 gint        gtk_widget_get_events      (GtkWidget      *widget);
+GDK_AVAILABLE_IN_ALL
 GdkEventMask gtk_widget_get_device_events (GtkWidget   *widget,
                                            GdkDevice    *device);
 GDK_DEPRECATED_IN_3_4_FOR(gdk_window_get_device_position)
@@ -814,9 +955,11 @@ void            gtk_widget_get_pointer     (GtkWidget      *widget,
                                         gint           *x,
                                         gint           *y);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_is_ancestor    (GtkWidget      *widget,
                                         GtkWidget      *ancestor);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
                                               GtkWidget  *dest_widget,
                                               gint        src_x,
@@ -826,33 +969,44 @@ gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
 
 /* Hide widget and return TRUE.
  */
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_hide_on_delete (GtkWidget      *widget);
 
 /* Functions to override widget styling */
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_override_color            (GtkWidget     *widget,
                                                    GtkStateFlags  state,
                                                    const GdkRGBA *color);
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_override_background_color (GtkWidget     *widget,
                                                    GtkStateFlags  state,
                                                    const GdkRGBA *color);
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_override_font             (GtkWidget                  *widget,
                                                    const PangoFontDescription *font_desc);
 
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_override_symbolic_color   (GtkWidget     *widget,
                                                    const gchar   *name,
                                                    const GdkRGBA *color);
+GDK_AVAILABLE_IN_ALL
 void         gtk_widget_override_cursor           (GtkWidget       *widget,
                                                    const GdkRGBA   *cursor,
                                                    const GdkRGBA   *secondary_cursor);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_reset_style       (GtkWidget      *widget);
 
+GDK_AVAILABLE_IN_ALL
 PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 PangoContext *gtk_widget_get_pango_context    (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 PangoLayout  *gtk_widget_create_pango_layout  (GtkWidget   *widget,
                                               const gchar *text);
 
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf    *gtk_widget_render_icon_pixbuf   (GtkWidget   *widget,
                                                const gchar *stock_id,
                                                GtkIconSize  size);
@@ -877,79 +1031,114 @@ void         gtk_widget_pop_composite_child  (void);
 
 /* widget style properties
  */
+GDK_AVAILABLE_IN_ALL
 void gtk_widget_class_install_style_property        (GtkWidgetClass     *klass,
                                                     GParamSpec         *pspec);
+GDK_AVAILABLE_IN_ALL
 void gtk_widget_class_install_style_property_parser (GtkWidgetClass     *klass,
                                                     GParamSpec         *pspec,
                                                     GtkRcPropertyParser parser);
+GDK_AVAILABLE_IN_ALL
 GParamSpec*  gtk_widget_class_find_style_property   (GtkWidgetClass     *klass,
                                                     const gchar        *property_name);
+GDK_AVAILABLE_IN_ALL
 GParamSpec** gtk_widget_class_list_style_properties (GtkWidgetClass     *klass,
                                                     guint              *n_properties);
+GDK_AVAILABLE_IN_ALL
 void gtk_widget_style_get_property (GtkWidget       *widget,
                                    const gchar    *property_name,
                                    GValue           *value);
+GDK_AVAILABLE_IN_ALL
 void gtk_widget_style_get_valist   (GtkWidget       *widget,
                                    const gchar    *first_property_name,
                                    va_list         var_args);
+GDK_AVAILABLE_IN_ALL
 void gtk_widget_style_get          (GtkWidget       *widget,
                                    const gchar    *first_property_name,
                                    ...) G_GNUC_NULL_TERMINATED;
 
 /* Functions for setting directionality for widgets */
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_widget_set_direction         (GtkWidget        *widget,
                                                   GtkTextDirection  dir);
+GDK_AVAILABLE_IN_ALL
 GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
 
+GDK_AVAILABLE_IN_ALL
 void             gtk_widget_set_default_direction (GtkTextDirection  dir);
+GDK_AVAILABLE_IN_ALL
 GtkTextDirection gtk_widget_get_default_direction (void);
 
 /* Compositing manager functionality */
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_is_composited (GtkWidget *widget);
 
 /* Counterpart to gdk_window_shape_combine_region.
  */
+GDK_AVAILABLE_IN_ALL
 void        gtk_widget_shape_combine_region (GtkWidget *widget,
                                               cairo_region_t *region);
+GDK_AVAILABLE_IN_ALL
 void        gtk_widget_input_shape_combine_region (GtkWidget *widget,
                                                     cairo_region_t *region);
 
+GDK_AVAILABLE_IN_ALL
 GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
+GDK_AVAILABLE_IN_ALL
 void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
                                         GtkWidget *label);
+GDK_AVAILABLE_IN_ALL
 void   gtk_widget_remove_mnemonic_label (GtkWidget *widget,
                                         GtkWidget *label);
 
+GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_tooltip_window    (GtkWidget   *widget,
                                                         GtkWindow   *custom_window);
+GDK_AVAILABLE_IN_ALL
 GtkWindow *gtk_widget_get_tooltip_window    (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_trigger_tooltip_query (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_tooltip_text      (GtkWidget   *widget,
                                              const gchar *text);
+GDK_AVAILABLE_IN_ALL
 gchar *    gtk_widget_get_tooltip_text      (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_tooltip_markup    (GtkWidget   *widget,
                                              const gchar *markup);
+GDK_AVAILABLE_IN_ALL
 gchar *    gtk_widget_get_tooltip_markup    (GtkWidget   *widget);
+GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
                                             gboolean     has_tooltip);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_cairo_should_draw_window     (cairo_t     *cr,
                                              GdkWindow   *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_cairo_transform_to_window    (cairo_t     *cr,
                                              GtkWidget   *widget,
                                              GdkWindow   *window);
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_requisition_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkRequisition *gtk_requisition_new      (void) G_GNUC_MALLOC;
+GDK_AVAILABLE_IN_ALL
 GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
+GDK_AVAILABLE_IN_ALL
 void            gtk_requisition_free     (GtkRequisition       *requisition);
 
+GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_in_destruction (GtkWidget *widget);
 
+GDK_AVAILABLE_IN_ALL
 GtkStyleContext * gtk_widget_get_style_context (GtkWidget *widget);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidgetPath *   gtk_widget_get_path (GtkWidget *widget);
 
 GDK_AVAILABLE_IN_3_4
diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index 73bf7c0..ea40469 100644
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -31,22 +31,29 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ())
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_widget_path_get_type            (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidgetPath * gtk_widget_path_new                 (void);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidgetPath * gtk_widget_path_copy                (const GtkWidgetPath *path);
 GDK_AVAILABLE_IN_3_2
 GtkWidgetPath * gtk_widget_path_ref                 (GtkWidgetPath       *path);
 GDK_AVAILABLE_IN_3_2
 void            gtk_widget_path_unref               (GtkWidgetPath       *path);
+GDK_AVAILABLE_IN_ALL
 void            gtk_widget_path_free                (GtkWidgetPath       *path);
 
 GDK_AVAILABLE_IN_3_2
 char *          gtk_widget_path_to_string           (const GtkWidgetPath *path);
+GDK_AVAILABLE_IN_ALL
 gint            gtk_widget_path_length              (const GtkWidgetPath *path);
 
+GDK_AVAILABLE_IN_ALL
 gint            gtk_widget_path_append_type         (GtkWidgetPath       *path,
                                                      GType                type);
+GDK_AVAILABLE_IN_ALL
 void            gtk_widget_path_prepend_type        (GtkWidgetPath       *path,
                                                      GType                type);
 GDK_AVAILABLE_IN_3_2
@@ -58,72 +65,95 @@ GDK_AVAILABLE_IN_3_2
 gint            gtk_widget_path_append_for_widget   (GtkWidgetPath       *path,
                                                      GtkWidget           *widget);
 
+GDK_AVAILABLE_IN_ALL
 GType               gtk_widget_path_iter_get_object_type  (const GtkWidgetPath *path,
                                                            gint                 pos);
+GDK_AVAILABLE_IN_ALL
 void                gtk_widget_path_iter_set_object_type  (GtkWidgetPath       *path,
                                                            gint                 pos,
                                                            GType                type);
+GDK_AVAILABLE_IN_ALL
 const GtkWidgetPath *
                     gtk_widget_path_iter_get_siblings     (const GtkWidgetPath *path,
                                                            gint                 pos);
+GDK_AVAILABLE_IN_ALL
 guint               gtk_widget_path_iter_get_sibling_index(const GtkWidgetPath *path,
                                                            gint                 pos);
 
+GDK_AVAILABLE_IN_ALL
 const gchar *          gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
                                                        gint                 pos);
+GDK_AVAILABLE_IN_ALL
 void                   gtk_widget_path_iter_set_name  (GtkWidgetPath       *path,
                                                        gint                 pos,
                                                        const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_widget_path_iter_has_name  (const GtkWidgetPath *path,
                                                        gint                 pos,
                                                        const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 gboolean               gtk_widget_path_iter_has_qname (const GtkWidgetPath *path,
                                                        gint                 pos,
                                                        GQuark               qname);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_add_class     (GtkWidgetPath       *path,
                                              gint                 pos,
                                              const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_remove_class  (GtkWidgetPath       *path,
                                              gint                 pos,
                                              const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_clear_classes (GtkWidgetPath       *path,
                                              gint                 pos);
+GDK_AVAILABLE_IN_ALL
 GSList * gtk_widget_path_iter_list_classes  (const GtkWidgetPath *path,
                                              gint                 pos);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_path_iter_has_class     (const GtkWidgetPath *path,
                                              gint                 pos,
                                              const gchar         *name);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_path_iter_has_qclass    (const GtkWidgetPath *path,
                                              gint                 pos,
                                              GQuark               qname);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_add_region    (GtkWidgetPath      *path,
                                              gint                pos,
                                              const gchar        *name,
                                              GtkRegionFlags     flags);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_remove_region (GtkWidgetPath      *path,
                                              gint                pos,
                                              const gchar        *name);
+GDK_AVAILABLE_IN_ALL
 void     gtk_widget_path_iter_clear_regions (GtkWidgetPath      *path,
                                              gint                pos);
 
+GDK_AVAILABLE_IN_ALL
 GSList * gtk_widget_path_iter_list_regions  (const GtkWidgetPath *path,
                                              gint                 pos);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_path_iter_has_region    (const GtkWidgetPath *path,
                                              gint                 pos,
                                              const gchar         *name,
                                              GtkRegionFlags      *flags);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_widget_path_iter_has_qregion   (const GtkWidgetPath *path,
                                              gint                 pos,
                                              GQuark               qname,
                                              GtkRegionFlags      *flags);
 
+GDK_AVAILABLE_IN_ALL
 GType           gtk_widget_path_get_object_type (const GtkWidgetPath *path);
 
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_widget_path_is_type    (const GtkWidgetPath *path,
                                             GType                type);
+GDK_AVAILABLE_IN_ALL
 gboolean        gtk_widget_path_has_parent (const GtkWidgetPath *path,
                                             GType                type);
 
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 5de3dfe..a4de027 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -102,36 +102,55 @@ struct _GtkWindowGroupClass
   void (*_gtk_reserved4) (void);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      gtk_window_get_type                 (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_window_new                      (GtkWindowType        type);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_title                (GtkWindow           *window,
                                                const gchar         *title);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_window_get_title             (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_wmclass              (GtkWindow           *window,
                                                const gchar         *wmclass_name,
                                                const gchar         *wmclass_class);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_role                 (GtkWindow           *window,
                                                 const gchar         *role);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_startup_id           (GtkWindow           *window,
                                                 const gchar         *startup_id);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_window_get_role              (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_add_accel_group          (GtkWindow           *window,
                                                GtkAccelGroup       *accel_group);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_remove_accel_group       (GtkWindow           *window,
                                                GtkAccelGroup       *accel_group);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_position             (GtkWindow           *window,
                                                GtkWindowPosition    position);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_activate_focus          (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_focus                (GtkWindow           *window,
                                                GtkWidget           *focus);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_default              (GtkWindow           *window,
                                                GtkWidget           *default_widget);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_window_get_default_widget       (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_activate_default        (GtkWindow           *window);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_transient_for        (GtkWindow           *window, 
                                                GtkWindow           *parent);
+GDK_AVAILABLE_IN_ALL
 GtkWindow *gtk_window_get_transient_for        (GtkWindow           *window);
 GDK_AVAILABLE_IN_3_4
 void       gtk_window_set_attached_to          (GtkWindow           *window, 
@@ -143,34 +162,50 @@ void       gtk_window_set_opacity              (GtkWindow           *window,
                                                gdouble              opacity);
 GDK_DEPRECATED_IN_3_8_FOR(gtk_widget_get_opacity)
 gdouble    gtk_window_get_opacity              (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_type_hint            (GtkWindow           *window, 
                                                GdkWindowTypeHint    hint);
+GDK_AVAILABLE_IN_ALL
 GdkWindowTypeHint gtk_window_get_type_hint     (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_skip_taskbar_hint    (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_skip_taskbar_hint    (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_skip_pager_hint      (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_skip_pager_hint      (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_urgency_hint         (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_urgency_hint         (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_accept_focus         (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_accept_focus         (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_focus_on_map         (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_focus_on_map         (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
 GDK_AVAILABLE_IN_3_4
 void       gtk_window_set_hide_titlebar_when_maximized (GtkWindow   *window,
                                                         gboolean     setting);
 GDK_AVAILABLE_IN_3_4
 gboolean   gtk_window_get_hide_titlebar_when_maximized (GtkWindow   *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_mnemonics_visible    (GtkWindow           *window,
                                                 gboolean             setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_mnemonics_visible    (GtkWindow           *window);
 GDK_AVAILABLE_IN_3_2
 void       gtk_window_set_focus_visible        (GtkWindow           *window,
@@ -178,102 +213,154 @@ void       gtk_window_set_focus_visible        (GtkWindow           *window,
 GDK_AVAILABLE_IN_3_2
 gboolean   gtk_window_get_focus_visible        (GtkWindow           *window);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_resizable            (GtkWindow           *window,
                                                 gboolean             resizable);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_resizable            (GtkWindow           *window);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_gravity              (GtkWindow           *window,
                                                 GdkGravity           gravity);
+GDK_AVAILABLE_IN_ALL
 GdkGravity gtk_window_get_gravity              (GtkWindow           *window);
 
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_geometry_hints       (GtkWindow           *window,
                                                GtkWidget           *geometry_widget,
                                                GdkGeometry         *geometry,
                                                GdkWindowHints       geom_mask);
 
+GDK_AVAILABLE_IN_ALL
 void      gtk_window_set_screen               (GtkWindow           *window,
                                                GdkScreen           *screen);
+GDK_AVAILABLE_IN_ALL
 GdkScreen* gtk_window_get_screen              (GtkWindow           *window);
 
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_is_active                (GtkWindow           *window);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_has_toplevel_focus       (GtkWindow           *window);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_decorated            (GtkWindow *window,
                                                 gboolean   setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_decorated            (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_deletable            (GtkWindow *window,
                                                 gboolean   setting);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_deletable            (GtkWindow *window);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_icon_list                (GtkWindow  *window,
                                                     GList      *list);
+GDK_AVAILABLE_IN_ALL
 GList*     gtk_window_get_icon_list                (GtkWindow  *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_icon                     (GtkWindow  *window,
                                                     GdkPixbuf  *icon);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_icon_name                (GtkWindow   *window,
                                                    const gchar *name);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
                                                    const gchar *filename,
                                                    GError     **err);
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_window_get_icon_name             (GtkWindow  *window);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_default_icon_list        (GList      *list);
+GDK_AVAILABLE_IN_ALL
 GList*     gtk_window_get_default_icon_list        (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_default_icon_name        (const gchar *name);
+GDK_AVAILABLE_IN_ALL
 const gchar * gtk_window_get_default_icon_name     (void);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
                                                    GError     **err);
 
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_auto_startup_notification (gboolean setting);
 
 /* If window is set modal, input will be grabbed when show and released when hide */
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_modal      (GtkWindow *window,
                                      gboolean   modal);
+GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_get_modal      (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 GList*     gtk_window_list_toplevels (void);
+GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_has_user_ref_count (GtkWindow *window,
                                               gboolean   setting);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_add_mnemonic          (GtkWindow       *window,
                                           guint            keyval,
                                           GtkWidget       *target);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_remove_mnemonic       (GtkWindow       *window,
                                           guint            keyval,
                                           GtkWidget       *target);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_mnemonic_activate     (GtkWindow       *window,
                                           guint            keyval,
                                           GdkModifierType  modifier);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_mnemonic_modifier (GtkWindow       *window,
                                           GdkModifierType  modifier);
+GDK_AVAILABLE_IN_ALL
 GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window);
 
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_activate_key          (GtkWindow        *window,
                                           GdkEventKey      *event);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_propagate_key_event   (GtkWindow        *window,
                                           GdkEventKey      *event);
 
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_present            (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_present_with_time  (GtkWindow *window,
                                        guint32    timestamp);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_iconify       (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_deiconify     (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_stick         (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_unstick       (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_maximize      (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_unmaximize    (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_fullscreen    (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_unfullscreen  (GtkWindow *window);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_keep_above    (GtkWindow *window, gboolean setting);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_keep_below    (GtkWindow *window, gboolean setting);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_window_begin_resize_drag (GtkWindow     *window,
                                    GdkWindowEdge  edge,
                                    gint           button,
                                    gint           root_x,
                                    gint           root_y,
                                    guint32        timestamp);
+GDK_AVAILABLE_IN_ALL
 void gtk_window_begin_move_drag   (GtkWindow     *window,
                                    gint           button,
                                    gint           root_x,
@@ -283,69 +370,94 @@ void gtk_window_begin_move_drag   (GtkWindow     *window,
 /* Set initial default size of the window (does not constrain user
  * resize operations)
  */
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_default_size (GtkWindow   *window,
                                       gint         width,
                                       gint         height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_get_default_size (GtkWindow   *window,
                                       gint        *width,
                                       gint        *height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_resize           (GtkWindow   *window,
                                       gint         width,
                                       gint         height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_get_size         (GtkWindow   *window,
                                       gint        *width,
                                       gint        *height);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_move             (GtkWindow   *window,
                                       gint         x,
                                       gint         y);
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_get_position     (GtkWindow   *window,
                                       gint        *root_x,
                                       gint        *root_y);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_parse_geometry   (GtkWindow   *window,
                                       const gchar *geometry);
 
+GDK_AVAILABLE_IN_ALL
 void gtk_window_set_default_geometry (GtkWindow *window,
                                       gint       width,
                                       gint       height);
+GDK_AVAILABLE_IN_ALL
 void gtk_window_resize_to_geometry   (GtkWindow *window,
                                       gint       width,
                                       gint       height);
 
+GDK_AVAILABLE_IN_ALL
 GtkWindowGroup *gtk_window_get_group (GtkWindow   *window);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_has_group        (GtkWindow   *window);
 
 /* Ignore this unless you are writing a GUI builder */
 GDK_DEPRECATED_IN_3_10
 void     gtk_window_reshow_with_initial_size (GtkWindow *window);
 
+GDK_AVAILABLE_IN_ALL
 GtkWindowType gtk_window_get_window_type     (GtkWindow     *window);
 
 /* Window groups
  */
+GDK_AVAILABLE_IN_ALL
 GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_ALL
 GtkWindowGroup * gtk_window_group_new           (void);
+GDK_AVAILABLE_IN_ALL
 void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,
                                                 GtkWindow          *window);
+GDK_AVAILABLE_IN_ALL
 void             gtk_window_group_remove_window (GtkWindowGroup     *window_group,
                                                 GtkWindow          *window);
+GDK_AVAILABLE_IN_ALL
 GList *          gtk_window_group_list_windows  (GtkWindowGroup     *window_group);
 
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_window_group_get_current_grab (GtkWindowGroup *window_group);
+GDK_AVAILABLE_IN_ALL
 GtkWidget *      gtk_window_group_get_current_device_grab (GtkWindowGroup *window_group,
                                                            GdkDevice      *device);
 
+GDK_AVAILABLE_IN_ALL
 GtkApplication *gtk_window_get_application      (GtkWindow          *window);
+GDK_AVAILABLE_IN_ALL
 void            gtk_window_set_application      (GtkWindow          *window,
                                                  GtkApplication     *application);
 
 
 /* Window grips
  */
+GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_has_resize_grip    (GtkWindow    *window,
                                             gboolean      value);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_get_has_resize_grip    (GtkWindow    *window);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_resize_grip_is_visible (GtkWindow    *window);
+GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_get_resize_grip_area   (GtkWindow    *window,
                                             GdkRectangle *rect);
 



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