gtk+-3.0: Add a11y.h header to accessible objects

Based on patch by Peter Vagner

Fixes bug 735265

(cherry picked from commit 0bc2ab935da1a16128d5595aaf208f48d069781d)

2 files changed, 102 insertions, 102 deletions

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 4a20e9f9d..8c6d36101 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -344,7 +344,7 @@ namespace Gtk {
 	[Compact]
 	public class AccelMapClass {
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_accessible_get_type ()")]
 	public class Accessible : Atk.Object {
 		[CCode (has_construct_function = false)]
 		protected Accessible ();
@@ -636,7 +636,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_arrow_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_arrow_accessible_get_type ()")]
 	public class ArrowAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected ArrowAccessible ();
@@ -744,7 +744,7 @@ namespace Gtk {
 		public weak Gtk.BindingSignal next;
 		public weak string signal_name;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_boolean_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_boolean_cell_accessible_get_type ()")]
 	public class BooleanCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected BooleanCellAccessible ();
@@ -863,7 +863,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void released ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_button_accessible_get_type ()")]
 	public class ButtonAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected ButtonAccessible ();
@@ -925,7 +925,7 @@ namespace Gtk {
 		public virtual signal void prev_month ();
 		public virtual signal void prev_year ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_cell_accessible_get_type ()")]
 	public class CellAccessible : Gtk.Accessible, Atk.Action, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected CellAccessible ();
@@ -1385,7 +1385,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void toggled ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_check_menu_item_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_check_menu_item_accessible_get_type ()")]
 	public class CheckMenuItemAccessible : Gtk.MenuItemAccessible, Atk.Component, Atk.Action, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected CheckMenuItemAccessible ();
@@ -1587,7 +1587,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void popup ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_combo_box_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_combo_box_accessible_get_type ()")]
 	public class ComboBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected ComboBoxAccessible ();
@@ -1668,7 +1668,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void set_focus_child (Gtk.Widget? child);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_container_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_container_accessible_get_type ()")]
 	public class ContainerAccessible : Gtk.WidgetAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected ContainerAccessible ();
@@ -1677,7 +1677,7 @@ namespace Gtk {
 		[NoWrapper]
 		public virtual int remove_gtk (Gtk.Container container, Gtk.Widget widget, void* data);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_container_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_container_cell_accessible_get_type ()")]
 	public class ContainerCellAccessible : Gtk.CellAccessible, Atk.Action, Atk.Component {
 		[CCode (has_construct_function = false)]
 		public ContainerCellAccessible ();
@@ -1918,7 +1918,7 @@ namespace Gtk {
 		public virtual signal void preedit_changed (string p0);
 		public virtual signal void toggle_overwrite ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_entry_accessible_get_type ()")]
 	public class EntryAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.EditableText, Atk.Text, Atk.Action {
 		[CCode (has_construct_function = false)]
 		protected EntryAccessible ();
@@ -1990,7 +1990,7 @@ namespace Gtk {
 		public virtual signal bool match_selected (Gtk.TreeModel model, Gtk.TreeIter iter);
 		public virtual signal void no_matches ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_icon_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_entry_icon_accessible_get_type ()")]
 	public class EntryIconAccessible : Atk.Object, Atk.Action, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected EntryIconAccessible ();
@@ -2050,7 +2050,7 @@ namespace Gtk {
 		public bool use_underline { get; set construct; }
 		public virtual signal void activate ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_expander_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_expander_accessible_get_type ()")]
 	public class ExpanderAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action {
 		[CCode (has_construct_function = false)]
 		protected ExpanderAccessible ();
@@ -2179,7 +2179,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void unselect_all ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_flow_box_accessible_get_type ()")]
 	public class FlowBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected FlowBoxAccessible ();
@@ -2193,7 +2193,7 @@ namespace Gtk {
 		public bool is_selected ();
 		public virtual signal void activate ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_child_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_flow_box_child_accessible_get_type ()")]
 	public class FlowBoxChildAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected FlowBoxChildAccessible ();
@@ -2288,7 +2288,7 @@ namespace Gtk {
 		public float label_yalign { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_frame_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_frame_accessible_get_type ()")]
 	public class FrameAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected FrameAccessible ();
@@ -2793,7 +2793,7 @@ namespace Gtk {
 		public virtual signal void toggle_cursor_item ();
 		public virtual signal void unselect_all ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_icon_view_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_icon_view_accessible_get_type ()")]
 	public class IconViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected IconViewAccessible ();
@@ -2864,12 +2864,12 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool use_fallback { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_image_accessible_get_type ()")]
 	public class ImageAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected ImageAccessible ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_image_cell_accessible_get_type ()")]
 	public class ImageCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected ImageCellAccessible ();
@@ -3009,7 +3009,7 @@ namespace Gtk {
 		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
 		public virtual signal void populate_popup (Gtk.Menu menu);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_label_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_label_accessible_get_type ()")]
 	public class LabelAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Text, Atk.Hypertext {
 		[CCode (has_construct_function = false)]
 		protected LabelAccessible ();
@@ -3062,7 +3062,7 @@ namespace Gtk {
 		public double value { get; set; }
 		public virtual signal void offset_changed (string name);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_level_bar_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_level_bar_accessible_get_type ()")]
 	public class LevelBarAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected LevelBarAccessible ();
@@ -3081,7 +3081,7 @@ namespace Gtk {
 		public bool visited { get; set; }
 		public virtual signal bool activate_link ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_link_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_link_button_accessible_get_type ()")]
 	public class LinkButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image, Atk.HyperlinkImpl {
 		[CCode (has_construct_function = false)]
 		protected LinkButtonAccessible ();
@@ -3127,7 +3127,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void unselect_all ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_list_box_accessible_get_type ()")]
 	public class ListBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected ListBoxAccessible ();
@@ -3149,7 +3149,7 @@ namespace Gtk {
 		public bool selectable { get; set; }
 		public virtual signal void activate ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_row_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_list_box_row_accessible_get_type ()")]
 	public class ListBoxRowAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected ListBoxRowAccessible ();
@@ -3200,7 +3200,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string tooltip_unlock { owned get; set construct; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_lock_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_lock_button_accessible_get_type ()")]
 	public class LockButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected LockButtonAccessible ();
@@ -3248,7 +3248,7 @@ namespace Gtk {
 		public string tearoff_title { owned get; set; }
 		public virtual signal void move_scroll (Gtk.ScrollType p0);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_menu_accessible_get_type ()")]
 	public class MenuAccessible : Gtk.MenuShellAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected MenuAccessible ();
@@ -3289,7 +3289,7 @@ namespace Gtk {
 		public Gtk.Menu popup { get; set; }
 		public bool use_popover { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_menu_button_accessible_get_type ()")]
 	public class MenuButtonAccessible : Gtk.ToggleButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected MenuButtonAccessible ();
@@ -3331,7 +3331,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void toggle_size_request (void* requisition);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_item_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_menu_item_accessible_get_type ()")]
 	public class MenuItemAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected MenuItemAccessible ();
@@ -3366,7 +3366,7 @@ namespace Gtk {
 		public virtual signal bool move_selected (int distance);
 		public virtual signal void selection_done ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_shell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_menu_shell_accessible_get_type ()")]
 	public class MenuShellAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected MenuShellAccessible ();
@@ -3515,12 +3515,12 @@ namespace Gtk {
 		public virtual signal bool select_page (bool move_focus);
 		public virtual signal void switch_page (Gtk.Widget page, uint page_num);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_notebook_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_notebook_accessible_get_type ()")]
 	public class NotebookAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected NotebookAccessible ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_notebook_page_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_notebook_page_accessible_get_type ()")]
 	public class NotebookPageAccessible : Atk.Object, Atk.Component {
 		[CCode (has_construct_function = false, type = "AtkObject*")]
 		public NotebookPageAccessible (Gtk.NotebookAccessible notebook, Gtk.Widget child);
@@ -3621,7 +3621,7 @@ namespace Gtk {
 		public virtual signal bool move_handle (Gtk.ScrollType scroll);
 		public virtual signal bool toggle_handle_focus ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_paned_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_paned_accessible_get_type ()")]
 	public class PanedAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected PanedAccessible ();
@@ -3722,7 +3722,7 @@ namespace Gtk {
 		public Gtk.Widget relative_to { get; set; }
 		public virtual signal void closed ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_popover_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_popover_accessible_get_type ()")]
 	public class PopoverAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected PopoverAccessible ();
@@ -3920,7 +3920,7 @@ namespace Gtk {
 		public bool show_text { get; set; }
 		public string text { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_progress_bar_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_progress_bar_accessible_get_type ()")]
 	public class ProgressBarAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected ProgressBarAccessible ();
@@ -3962,7 +3962,7 @@ namespace Gtk {
 		public Gtk.RadioButton group { set; }
 		public virtual signal void group_changed ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_radio_button_accessible_get_type ()")]
 	public class RadioButtonAccessible : Gtk.ToggleButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected RadioButtonAccessible ();
@@ -3986,7 +3986,7 @@ namespace Gtk {
 		public Gtk.RadioMenuItem group { set; }
 		public virtual signal void group_changed ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_menu_item_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_radio_menu_item_accessible_get_type ()")]
 	public class RadioMenuItemAccessible : Gtk.CheckMenuItemAccessible, Atk.Component, Atk.Action, Atk.Selection {
 		[CCode (has_construct_function = false)]
 		protected RadioMenuItemAccessible ();
@@ -4052,7 +4052,7 @@ namespace Gtk {
 		public virtual signal void move_slider (Gtk.ScrollType scroll);
 		public virtual signal void value_changed ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_range_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_range_accessible_get_type ()")]
 	public class RangeAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected RangeAccessible ();
@@ -4206,7 +4206,7 @@ namespace Gtk {
 		public int size { get; }
 		public virtual signal void changed ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_renderer_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_renderer_cell_accessible_get_type ()")]
 	public class RendererCellAccessible : Gtk.CellAccessible, Atk.Action, Atk.Component {
 		[CCode (has_construct_function = false, type = "AtkObject*")]
 		public RendererCellAccessible (Gtk.CellRenderer renderer);
@@ -4253,7 +4253,7 @@ namespace Gtk {
 		public Gtk.PositionType value_pos { get; set; }
 		public virtual signal string format_value (double value);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_scale_accessible_get_type ()")]
 	public class ScaleAccessible : Gtk.RangeAccessible, Atk.Component, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected ScaleAccessible ();
@@ -4281,7 +4281,7 @@ namespace Gtk {
 		public virtual signal void popup ();
 		public virtual signal void value_changed (double value);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_scale_button_accessible_get_type ()")]
 	public class ScaleButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected ScaleButtonAccessible ();
@@ -4334,7 +4334,7 @@ namespace Gtk {
 		public virtual signal void move_focus_out (Gtk.DirectionType direction);
 		public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scrolled_window_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_scrolled_window_accessible_get_type ()")]
 	public class ScrolledWindowAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected ScrolledWindowAccessible ();
@@ -4649,7 +4649,7 @@ namespace Gtk {
 		public virtual signal void value_changed ();
 		public virtual signal void wrapped ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spin_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_spin_button_accessible_get_type ()")]
 	public class SpinButtonAccessible : Gtk.EntryAccessible, Atk.Component, Atk.EditableText, Atk.Text, Atk.Action, Atk.Value {
 		[CCode (has_construct_function = false)]
 		protected SpinButtonAccessible ();
@@ -4663,7 +4663,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool active { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spinner_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_spinner_accessible_get_type ()")]
 	public class SpinnerAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected SpinnerAccessible ();
@@ -4788,7 +4788,7 @@ namespace Gtk {
 		public virtual signal void text_popped (uint context_id, string text);
 		public virtual signal void text_pushed (uint context_id, string text);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_statusbar_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_statusbar_accessible_get_type ()")]
 	public class StatusbarAccessible : Gtk.ContainerAccessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected StatusbarAccessible ();
@@ -5020,7 +5020,7 @@ namespace Gtk {
 		public virtual signal void activate ();
 		public virtual signal bool state_set (bool state);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_switch_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_switch_accessible_get_type ()")]
 	public class SwitchAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Action {
 		[CCode (has_construct_function = false)]
 		protected SwitchAccessible ();
@@ -5232,7 +5232,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start, Gtk.TextIter end);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_cell_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_text_cell_accessible_get_type ()")]
 	public class TextCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component, Atk.Text {
 		[CCode (has_construct_function = false)]
 		protected TextCellAccessible ();
@@ -5521,7 +5521,7 @@ namespace Gtk {
 		public virtual signal void toggle_cursor_visible ();
 		public virtual signal void toggle_overwrite ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_view_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_text_view_accessible_get_type ()")]
 	public class TextViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.EditableText, Atk.Text, Atk.StreamableContent {
 		[CCode (has_construct_function = false)]
 		protected TextViewAccessible ();
@@ -5630,7 +5630,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void toggled ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toggle_button_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_toggle_button_accessible_get_type ()")]
 	public class ToggleButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
 		[CCode (has_construct_function = false)]
 		protected ToggleButtonAccessible ();
@@ -5806,7 +5806,7 @@ namespace Gtk {
 		public void set_tip_area (Gdk.Rectangle rect);
 		public static void trigger_tooltip_query (Gdk.Display display);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toplevel_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_toplevel_accessible_get_type ()")]
 	public class ToplevelAccessible : Atk.Object {
 		[CCode (has_construct_function = false)]
 		protected ToplevelAccessible ();
@@ -6094,7 +6094,7 @@ namespace Gtk {
 		public virtual signal bool toggle_cursor_row ();
 		public virtual signal bool unselect_all ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_view_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_tree_view_accessible_get_type ()")]
 	public class TreeViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Table, Atk.Selection, Gtk.CellAccessibleParent {
 		[CCode (has_construct_function = false)]
 		protected TreeViewAccessible ();
@@ -6674,7 +6674,7 @@ namespace Gtk {
 		public virtual signal bool visibility_notify_event (Gdk.EventVisibility event);
 		public virtual signal bool window_state_event (Gdk.EventWindowState event);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_widget_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_widget_accessible_get_type ()")]
 	public class WidgetAccessible : Gtk.Accessible, Atk.Component {
 		[CCode (has_construct_function = false)]
 		protected WidgetAccessible ();
@@ -6887,7 +6887,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void set_focus (Gtk.Widget? focus);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_window_accessible_get_type ()")]
+	[CCode (cheader_filename = "gtk/gtk.h,gtk/gtk-a11y.h", type_id = "gtk_window_accessible_get_type ()")]
 	public class WindowAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Window {
 		[CCode (has_construct_function = false)]
 		protected WindowAccessible ();
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 7a8fda15a..420a3a7ea 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -1627,7 +1627,7 @@ GtkAboutDialog type_id="gtk_about_dialog_get_type ()"
 GtkAccelGroup type_id="gtk_accel_group_get_type ()"
 GtkAccelLabel type_id="gtk_accel_label_get_type ()"
 GtkAccelMap type_id="gtk_accel_map_get_type ()"
-GtkAccessible type_id="gtk_accessible_get_type ()"
+GtkAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_accessible_get_type ()"
 GtkAction type_id="gtk_action_get_type ()" deprecated_since="3.10" replacement="GLib.Action"
 GtkActionBar type_id="gtk_action_bar_get_type ()"
 GtkActionGroup type_id="gtk_action_group_get_type ()" deprecated_since="3.10"
@@ -1639,18 +1639,18 @@ GtkAppChooserWidget type_id="gtk_app_chooser_widget_get_type ()"
 GtkApplication type_id="gtk_application_get_type ()"
 GtkApplicationWindow type_id="gtk_application_window_get_type ()"
 GtkArrow type_id="gtk_arrow_get_type ()"
-GtkArrowAccessible type_id="gtk_arrow_accessible_get_type ()"
+GtkArrowAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_arrow_accessible_get_type ()"
 GtkAspectFrame type_id="gtk_aspect_frame_get_type ()"
 GtkAssistant type_id="gtk_assistant_get_type ()"
 GtkBin type_id="gtk_bin_get_type ()" abstract="1"
-GtkBooleanCellAccessible type_id="gtk_boolean_cell_accessible_get_type ()"
+GtkBooleanCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_boolean_cell_accessible_get_type ()"
 GtkBox type_id="gtk_box_get_type ()"
 GtkBuilder type_id="gtk_builder_get_type ()"
 GtkButton type_id="gtk_button_get_type ()"
-GtkButtonAccessible type_id="gtk_button_accessible_get_type ()"
+GtkButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_button_accessible_get_type ()"
 GtkButtonBox type_id="gtk_button_box_get_type ()"
 GtkCalendar type_id="gtk_calendar_get_type ()"
-GtkCellAccessible type_id="gtk_cell_accessible_get_type ()"
+GtkCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_cell_accessible_get_type ()"
 GtkCellArea type_id="gtk_cell_area_get_type ()" abstract="1"
 GtkCellAreaBox type_id="gtk_cell_area_box_get_type ()"
 GtkCellAreaContext type_id="gtk_cell_area_context_get_type ()"
@@ -1666,7 +1666,7 @@ GtkCellRendererToggle type_id="gtk_cell_renderer_toggle_get_type ()"
 GtkCellView type_id="gtk_cell_view_get_type ()"
 GtkCheckButton type_id="gtk_check_button_get_type ()"
 GtkCheckMenuItem type_id="gtk_check_menu_item_get_type ()"
-GtkCheckMenuItemAccessible type_id="gtk_check_menu_item_accessible_get_type ()"
+GtkCheckMenuItemAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_check_menu_item_accessible_get_type ()"
 GtkClipboard type_id="gtk_clipboard_get_type ()"
 GtkColorButton type_id="gtk_color_button_get_type ()"
 GtkColorChooserDialog type_id="gtk_color_chooser_dialog_get_type ()"
@@ -1674,38 +1674,38 @@ GtkColorChooserWidget type_id="gtk_color_chooser_widget_get_type ()"
 GtkColorSelection type_id="gtk_color_selection_get_type ()"
 GtkColorSelectionDialog type_id="gtk_color_selection_dialog_get_type ()"
 GtkComboBox type_id="gtk_combo_box_get_type ()"
-GtkComboBoxAccessible type_id="gtk_combo_box_accessible_get_type ()"
+GtkComboBoxAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_combo_box_accessible_get_type ()"
 GtkComboBoxText type_id="gtk_combo_box_text_get_type ()"
 //GtkContainer type_id="gtk_container_get_type ()" abstract="1"
-GtkContainerAccessible type_id="gtk_container_accessible_get_type ()"
-GtkContainerCellAccessible type_id="gtk_container_cell_accessible_get_type ()"
+GtkContainerAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_container_accessible_get_type ()"
+GtkContainerCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_container_cell_accessible_get_type ()"
 GtkDialog type_id="gtk_dialog_get_type ()"
 GtkDrawingArea type_id="gtk_drawing_area_get_type ()"
 GtkEntry type_id="gtk_entry_get_type ()"
-GtkEntryAccessible type_id="gtk_entry_accessible_get_type ()"
+GtkEntryAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_entry_accessible_get_type ()"
 GtkEntryBuffer type_id="gtk_entry_buffer_get_type ()"
 GtkEntryCompletion type_id="gtk_entry_completion_get_type ()"
-GtkEntryIconAccessible type_id="gtk_entry_icon_accessible_get_type ()"
+GtkEntryIconAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_entry_icon_accessible_get_type ()"
 GtkEventBox type_id="gtk_event_box_get_type ()"
 GtkEventController type_id="gtk_event_controller_get_type ()" abstract="1"
 GtkExpander type_id="gtk_expander_get_type ()"
-GtkExpanderAccessible type_id="gtk_expander_accessible_get_type ()"
+GtkExpanderAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_expander_accessible_get_type ()"
 GtkFileChooserButton type_id="gtk_file_chooser_button_get_type ()"
 GtkFileChooserDialog type_id="gtk_file_chooser_dialog_get_type ()"
 GtkFileChooserWidget type_id="gtk_file_chooser_widget_get_type ()"
 GtkFileFilter type_id="gtk_file_filter_get_type ()"
 GtkFixed type_id="gtk_fixed_get_type ()"
 GtkFlowBox type_id="gtk_flow_box_get_type ()"
-GtkFlowBoxAccessible type_id="gtk_flow_box_accessible_get_type ()"
+GtkFlowBoxAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_flow_box_accessible_get_type ()"
 GtkFlowBoxChild type_id="gtk_flow_box_child_get_type ()"
-GtkFlowBoxChildAccessible type_id="gtk_flow_box_child_accessible_get_type ()"
+GtkFlowBoxChildAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_flow_box_child_accessible_get_type ()"
 GtkFontButton type_id="gtk_font_button_get_type ()"
 GtkFontChooserDialog type_id="gtk_font_chooser_dialog_get_type ()"
 GtkFontChooserWidget type_id="gtk_font_chooser_widget_get_type ()"
 GtkFontSelection type_id="gtk_font_selection_get_type ()"
 GtkFontSelectionDialog type_id="gtk_font_selection_dialog_get_type ()" deprecated_since="3.2" replacement="FontChooserDialog"
 GtkFrame type_id="gtk_frame_get_type ()"
-GtkFrameAccessible type_id="gtk_frame_accessible_get_type ()"
+GtkFrameAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_frame_accessible_get_type ()"
 GtkGesture type_id="gtk_gesture_get_type ()" abstract="1"
 GtkGestureDrag type_id="gtk_gesture_drag_get_type ()"
 GtkGestureLongPress type_id="gtk_gesture_long_press_get_type ()"
@@ -1733,67 +1733,67 @@ GtkIconInfo type_id="gtk_icon_info_get_type ()" compact="1" copy_function="gtk_i
 GtkIconSource type_id="gtk_icon_source_get_type ()" deprecated_since="3.10" replacement="Gtk.IconTheme"
 GtkIconTheme type_id="gtk_icon_theme_get_type ()"
 GtkIconView type_id="gtk_icon_view_get_type ()"
-GtkIconViewAccessible type_id="gtk_icon_view_accessible_get_type ()"
+GtkIconViewAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_icon_view_accessible_get_type ()"
 GtkImage type_id="gtk_image_get_type ()"
-GtkImageAccessible type_id="gtk_image_accessible_get_type ()"
-GtkImageCellAccessible type_id="gtk_image_cell_accessible_get_type ()"
+GtkImageAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_image_accessible_get_type ()"
+GtkImageCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_image_cell_accessible_get_type ()"
 GtkImageMenuItem type_id="gtk_image_menu_item_get_type ()"
 GtkInfoBar type_id="gtk_info_bar_get_type ()"
 GtkInvisible type_id="gtk_invisible_get_type ()"
 GtkLabel type_id="gtk_label_get_type ()"
-GtkLabelAccessible type_id="gtk_label_accessible_get_type ()"
+GtkLabelAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_label_accessible_get_type ()"
 GtkLayout type_id="gtk_layout_get_type ()"
 GtkLevelBar type_id="gtk_level_bar_get_type ()"
-GtkLevelBarAccessible type_id="gtk_level_bar_accessible_get_type ()"
+GtkLevelBarAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_level_bar_accessible_get_type ()"
 GtkLinkButton type_id="gtk_link_button_get_type ()"
-GtkLinkButtonAccessible type_id="gtk_link_button_accessible_get_type ()"
+GtkLinkButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_link_button_accessible_get_type ()"
 GtkListBox type_id="gtk_list_box_get_type ()"
-GtkListBoxAccessible type_id="gtk_list_box_accessible_get_type ()"
+GtkListBoxAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_list_box_accessible_get_type ()"
 GtkListBoxRow type_id="gtk_list_box_row_get_type ()"
-GtkListBoxRowAccessible type_id="gtk_list_box_row_accessible_get_type ()"
+GtkListBoxRowAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_list_box_row_accessible_get_type ()"
 GtkListStore type_id="gtk_list_store_get_type ()"
 GtkLockButton type_id="gtk_lock_button_get_type ()"
-GtkLockButtonAccessible type_id="gtk_lock_button_accessible_get_type ()"
+GtkLockButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_lock_button_accessible_get_type ()"
 GtkMenu type_id="gtk_menu_get_type ()"
-GtkMenuAccessible type_id="gtk_menu_accessible_get_type ()"
+GtkMenuAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_menu_accessible_get_type ()"
 GtkMenuBar type_id="gtk_menu_bar_get_type ()"
 GtkMenuButton type_id="gtk_menu_button_get_type ()"
-GtkMenuButtonAccessible type_id="gtk_menu_button_accessible_get_type ()"
+GtkMenuButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_menu_button_accessible_get_type ()"
 GtkMenuItem type_id="gtk_menu_item_get_type ()"
-GtkMenuItemAccessible type_id="gtk_menu_item_accessible_get_type ()"
+GtkMenuItemAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_menu_item_accessible_get_type ()"
 GtkMenuShell type_id="gtk_menu_shell_get_type ()" abstract="1"
-GtkMenuShellAccessible type_id="gtk_menu_shell_accessible_get_type ()"
+GtkMenuShellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_menu_shell_accessible_get_type ()"
 GtkMenuToolButton type_id="gtk_menu_tool_button_get_type ()"
 GtkMessageDialog type_id="gtk_message_dialog_get_type ()"
 GtkMisc type_id="gtk_misc_get_type ()" abstract="1"
 GtkMountOperation type_id="gtk_mount_operation_get_type ()"
 GtkNotebook type_id="gtk_notebook_get_type ()"
-GtkNotebookAccessible type_id="gtk_notebook_accessible_get_type ()"
-GtkNotebookPageAccessible type_id="gtk_notebook_page_accessible_get_type ()"
+GtkNotebookAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_notebook_accessible_get_type ()"
+GtkNotebookPageAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_notebook_page_accessible_get_type ()"
 GtkNumerableIcon type_id="gtk_numerable_icon_get_type ()"
 GtkOffscreenWindow type_id="gtk_offscreen_window_get_type ()"
 GtkOverlay type_id="gtk_overlay_get_type ()"
 GtkPageSetup type_id="gtk_page_setup_get_type ()"
 GtkPaned type_id="gtk_paned_get_type ()"
-GtkPanedAccessible type_id="gtk_paned_accessible_get_type ()"
+GtkPanedAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_paned_accessible_get_type ()"
 GtkPaperSize type_id="gtk_paper_size_get_type ()"
 GtkPlacesSidebar type_id="gtk_places_sidebar_get_type ()"
 GtkPlug type_id="gtk_plug_get_type ()" cheader_filename="gtk/gtkx.h"
 GtkPopover type_id="gtk_popover_get_type ()"
-GtkPopoverAccessible type_id="gtk_popover_accessible_get_type ()"
+GtkPopoverAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_popover_accessible_get_type ()"
 GtkPrintContext type_id="gtk_print_context_get_type ()"
 GtkPrintOperation type_id="gtk_print_operation_get_type ()"
 GtkPrintSettings type_id="gtk_print_settings_get_type ()"
 GtkProgressBar type_id="gtk_progress_bar_get_type ()"
-GtkProgressBarAccessible type_id="gtk_progress_bar_accessible_get_type ()"
+GtkProgressBarAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_progress_bar_accessible_get_type ()"
 GtkRadioAction type_id="gtk_radio_action_get_type ()"
 GtkRadioButton type_id="gtk_radio_button_get_type ()"
-GtkRadioButtonAccessible type_id="gtk_radio_button_accessible_get_type ()"
+GtkRadioButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_radio_button_accessible_get_type ()"
 GtkRadioMenuItem type_id="gtk_radio_menu_item_get_type ()"
-GtkRadioMenuItemAccessible type_id="gtk_radio_menu_item_accessible_get_type ()"
+GtkRadioMenuItemAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_radio_menu_item_accessible_get_type ()"
 GtkRadioToolButton type_id="gtk_radio_tool_button_get_type ()"
 GtkRange type_id="gtk_range_get_type ()" abstract="1"
-GtkRangeAccessible type_id="gtk_range_accessible_get_type ()"
+GtkRangeAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_range_accessible_get_type ()"
 GtkRcStyle type_id="gtk_rc_style_get_type ()" deprecated_since="3.0" replacement="CssProvider"
 GtkRecentAction type_id="gtk_recent_action_get_type ()"
 GtkRecentChooserDialog type_id="gtk_recent_chooser_dialog_get_type ()"
@@ -1801,15 +1801,15 @@ GtkRecentChooserMenu type_id="gtk_recent_chooser_menu_get_type ()"
 GtkRecentChooserWidget type_id="gtk_recent_chooser_widget_get_type ()"
 GtkRecentFilter type_id="gtk_recent_filter_get_type ()"
 GtkRecentManager type_id="gtk_recent_manager_get_type ()"
-GtkRendererCellAccessible type_id="gtk_renderer_cell_accessible_get_type ()"
+GtkRendererCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_renderer_cell_accessible_get_type ()"
 GtkRevealer type_id="gtk_revealer_get_type ()"
 GtkScale type_id="gtk_scale_get_type ()"
-GtkScaleAccessible type_id="gtk_scale_accessible_get_type ()"
+GtkScaleAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_scale_accessible_get_type ()"
 GtkScaleButton type_id="gtk_scale_button_get_type ()"
-GtkScaleButtonAccessible type_id="gtk_scale_button_accessible_get_type ()"
+GtkScaleButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_scale_button_accessible_get_type ()"
 GtkScrollbar type_id="gtk_scrollbar_get_type ()"
 GtkScrolledWindow type_id="gtk_scrolled_window_get_type ()"
-GtkScrolledWindowAccessible type_id="gtk_scrolled_window_accessible_get_type ()"
+GtkScrolledWindowAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_scrolled_window_accessible_get_type ()"
 GtkSearchBar type_id="gtk_search_bar_get_type ()"
 GtkSearchEntry type_id="gtk_search_entry_get_type ()"
 GtkSelectionData type_id="gtk_selection_data_get_type ()"
@@ -1820,32 +1820,32 @@ GtkSettings type_id="gtk_settings_get_type ()"
 GtkSizeGroup type_id="gtk_size_group_get_type ()"
 GtkSocket type_id="gtk_socket_get_type ()" cheader_filename="gtk/gtkx.h"
 GtkSpinButton type_id="gtk_spin_button_get_type ()"
-GtkSpinButtonAccessible type_id="gtk_spin_button_accessible_get_type ()"
+GtkSpinButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_spin_button_accessible_get_type ()"
 GtkSpinner type_id="gtk_spinner_get_type ()"
-GtkSpinnerAccessible type_id="gtk_spinner_accessible_get_type ()"
+GtkSpinnerAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_spinner_accessible_get_type ()"
 GtkStack type_id="gtk_stack_get_type ()"
 GtkStackSwitcher type_id="gtk_stack_switcher_get_type ()"
 GtkStatusIcon type_id="gtk_status_icon_get_type ()"
 GtkStatusbar type_id="gtk_statusbar_get_type ()"
-GtkStatusbarAccessible type_id="gtk_statusbar_accessible_get_type ()"
+GtkStatusbarAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_statusbar_accessible_get_type ()"
 GtkStyleContext type_id="gtk_style_context_get_type ()"
 GtkStyleProperties type_id="gtk_style_properties_get_type ()"
 GtkSwitch type_id="gtk_switch_get_type ()"
-GtkSwitchAccessible type_id="gtk_switch_accessible_get_type ()"
+GtkSwitchAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_switch_accessible_get_type ()"
 GtkTable type_id="gtk_table_get_type ()" deprecated_since="3.4" replacement="Grid"
 GtkTearoffMenuItem type_id="gtk_tearoff_menu_item_get_type ()" deprecated_since="3.4"
 GtkTextBuffer type_id="gtk_text_buffer_get_type ()"
-GtkTextCellAccessible type_id="gtk_text_cell_accessible_get_type ()"
+GtkTextCellAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_text_cell_accessible_get_type ()"
 GtkTextChildAnchor type_id="gtk_text_child_anchor_get_type ()"
 GtkTextMark type_id="gtk_text_mark_get_type ()"
 GtkTextTag type_id="gtk_text_tag_get_type ()"
 GtkTextTagTable type_id="gtk_text_tag_table_get_type ()"
 GtkTextView type_id="gtk_text_view_get_type ()"
-GtkTextViewAccessible type_id="gtk_text_view_accessible_get_type ()"
+GtkTextViewAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_text_view_accessible_get_type ()"
 GtkThemingEngine type_id="gtk_theming_engine_get_type ()"
 GtkToggleAction type_id="gtk_toggle_action_get_type ()"
 GtkToggleButton type_id="gtk_toggle_button_get_type ()"
-GtkToggleButtonAccessible type_id="gtk_toggle_button_accessible_get_type ()"
+GtkToggleButtonAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_toggle_button_accessible_get_type ()"
 GtkToggleToolButton type_id="gtk_toggle_tool_button_get_type ()"
 GtkToolButton type_id="gtk_tool_button_get_type ()"
 GtkToolItem type_id="gtk_tool_item_get_type ()"
@@ -1853,7 +1853,7 @@ GtkToolItemGroup type_id="gtk_tool_item_group_get_type ()"
 GtkToolPalette type_id="gtk_tool_palette_get_type ()"
 GtkToolbar type_id="gtk_toolbar_get_type ()"
 GtkTooltip type_id="gtk_tooltip_get_type ()"
-GtkToplevelAccessible type_id="gtk_toplevel_accessible_get_type ()"
+GtkToplevelAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_toplevel_accessible_get_type ()"
 GtkTreeModelFilter type_id="gtk_tree_model_filter_get_type ()"
 GtkTreeModelSort type_id="gtk_tree_model_sort_get_type ()"
 # GtkTreePath should be an opaque value type as it is not immutable
@@ -1863,7 +1863,7 @@ GtkTreeRowReference type_id="gtk_tree_row_reference_get_type ()" is_value_type="
 GtkTreeSelection type_id="gtk_tree_selection_get_type ()"
 GtkTreeStore type_id="gtk_tree_store_get_type ()"
 GtkTreeView type_id="gtk_tree_view_get_type ()"
-GtkTreeViewAccessible type_id="gtk_tree_view_accessible_get_type ()"
+GtkTreeViewAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_tree_view_accessible_get_type ()"
 GtkTreeViewColumn type_id="gtk_tree_view_column_get_type ()"
 GtkUIManager type_id="gtk_ui_manager_get_type ()"
 GtkVBox type_id="gtk_vbox_get_type ()" deprecated_since="3.2" replacement="Box"
@@ -1875,9 +1875,9 @@ GtkVSeparator type_id="gtk_vseparator_get_type ()"
 GtkViewport type_id="gtk_viewport_get_type ()"
 GtkVolumeButton type_id="gtk_volume_button_get_type ()"
 GtkWidget type_id="gtk_widget_get_type ()"
-GtkWidgetAccessible type_id="gtk_widget_accessible_get_type ()"
+GtkWidgetAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_widget_accessible_get_type ()"
 GtkWindow type_id="gtk_window_get_type ()"
-GtkWindowAccessible type_id="gtk_window_accessible_get_type ()"
+GtkWindowAccessible cheader_filename="gtk/gtk.h,gtk/gtk-a11y.h" type_id="gtk_window_accessible_get_type ()"
 GtkWindowGroup type_id="gtk_window_group_get_type ()"
 
 *.dummy* hidden="1"