Support the ICCCM urgency hint. (#61858, Havoc Pennington)

[~andy/gtk] / gtk / gtk.symbols

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 39ac93de7242b1edc46c494dc9ea589052cf9a13..9fa563c28ac75cf6ffbbdc8489f6bf5159189348 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -6,7 +6,23 @@
  * or only on Unix, or only with the X11 backend must be included in 
  * similar ifdefs, using the symbols G_OS_WIN32, G_OS_UNIX and 
  * GTK_WINDOWING_X11. 
+ * 
+ * Every symbol must be included in the right
+ * #ifdef IN_HEADER(sym) #endif and
+ * #ifdef IN_FILE(sym) #endif sections.
+ * 
+ * gdkalias.h must be included *after* all other gdk headers
+ * in each source file, gdkaliasdef.c must be included at the
+ * very bottom, after a line defining the right symbol.
  */ 
+#ifdef ALL_FILES
+#define IN_FILE(x) 1
+#define IN_HEADER(x) 1
+#endif
+
+#if IN_HEADER(__GTK_ABOUT_DIALOG_H__)
+#if IN_FILE(__GTK_ABOUT_DIALOG_C__)
+gtk_show_about_dialog G_GNUC_NULL_TERMINATED
 gtk_about_dialog_get_artists
 gtk_about_dialog_get_authors
 gtk_about_dialog_get_comments
@@ -17,7 +33,7 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_get_name
 gtk_about_dialog_get_translator_credits
-gtk_about_dialog_get_type
+gtk_about_dialog_get_type G_GNUC_CONST
 gtk_about_dialog_get_version
 gtk_about_dialog_get_website
 gtk_about_dialog_get_website_label
@@ -37,13 +53,18 @@ gtk_about_dialog_set_url_hook
 gtk_about_dialog_set_version
 gtk_about_dialog_set_website
 gtk_about_dialog_set_website_label
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_GROUP_H__)
+#if IN_FILE(__GTK_ACCEL_GROUP_C__)
 gtk_accelerator_get_default_mod_mask
 gtk_accelerator_get_label
 gtk_accelerator_name
 gtk_accelerator_parse
 gtk_accelerator_set_default_mod_mask
-gtk_accelerator_valid
-gtk_accel_flags_get_type
+gtk_accelerator_valid G_GNUC_CONST
+
 gtk_accel_group_activate
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
@@ -51,37 +72,63 @@ gtk_accel_group_disconnect
 gtk_accel_group_disconnect_key
 gtk_accel_group_find
 gtk_accel_group_from_accel_closure
-gtk_accel_group_get_type
+gtk_accel_group_get_type G_GNUC_CONST
 gtk_accel_group_lock
 gtk_accel_group_new
 gtk_accel_group_query
 gtk_accel_groups_activate
 gtk_accel_groups_from_object
 gtk_accel_group_unlock
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_LABEL_H__)
+#if IN_FILE(__GTK_ACCEL_LABEL_C__)
 gtk_accel_label_get_accel_widget
 gtk_accel_label_get_accel_width
-gtk_accel_label_get_type
+gtk_accel_label_get_type G_GNUC_CONST
 gtk_accel_label_new
 gtk_accel_label_refetch
 gtk_accel_label_set_accel_closure
 gtk_accel_label_set_accel_widget
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_MAP_H__)
+#if IN_FILE(__GTK_ACCEL_MAP_C__)
 gtk_accel_map_add_entry
 gtk_accel_map_add_filter
 gtk_accel_map_change_entry
 gtk_accel_map_foreach
 gtk_accel_map_foreach_unfiltered
 gtk_accel_map_get
-gtk_accel_map_get_type
-gtk_accel_map_load
+gtk_accel_map_get_type G_GNUC_CONST
+gtk_accel_map_load PRIVATE
+#ifdef G_OS_WIN32
+gtk_accel_map_load_utf8
+#endif
 gtk_accel_map_load_fd
 gtk_accel_map_load_scanner
 gtk_accel_map_lock_path
 gtk_accel_map_lookup_entry
-gtk_accel_map_save
+gtk_accel_map_save PRIVATE
+#ifdef G_OS_WIN32
+gtk_accel_map_save_utf8
+#endif
 gtk_accel_map_save_fd
 gtk_accel_map_unlock_path
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCESSIBLE_H__)
+#if IN_FILE(__GTK_ACCESSIBLE_C__)
 gtk_accessible_connect_widget_destroyed
-gtk_accessible_get_type
+gtk_accessible_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACTION_H__)
+#if IN_FILE(__GTK_ACTION_C__)
 gtk_action_activate
 gtk_action_block_activate_from
 gtk_action_connect_accelerator
@@ -91,11 +138,26 @@ gtk_action_create_menu_item
 gtk_action_create_tool_item
 gtk_action_disconnect_accelerator
 gtk_action_disconnect_proxy
+gtk_action_get_accel_closure
+gtk_action_get_accel_path
 gtk_action_get_name
 gtk_action_get_proxies
 gtk_action_get_sensitive
-gtk_action_get_type
+gtk_action_get_type G_GNUC_CONST
 gtk_action_get_visible
+gtk_action_is_sensitive
+gtk_action_is_visible
+gtk_action_new
+gtk_action_set_accel_group
+gtk_action_set_accel_path
+gtk_action_set_sensitive
+gtk_action_set_visible
+gtk_action_unblock_activate_from
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACTION_GROUP_H__)
+#if IN_FILE(__GTK_ACTION_GROUP_C__)
 gtk_action_group_add_action
 gtk_action_group_add_actions
 gtk_action_group_add_actions_full
@@ -107,7 +169,7 @@ gtk_action_group_add_toggle_actions_full
 gtk_action_group_get_action
 gtk_action_group_get_name
 gtk_action_group_get_sensitive
-gtk_action_group_get_type
+gtk_action_group_get_type G_GNUC_CONST
 gtk_action_group_get_visible
 gtk_action_group_list_actions
 gtk_action_group_new
@@ -117,40 +179,144 @@ gtk_action_group_set_translate_func
 gtk_action_group_set_translation_domain
 gtk_action_group_set_visible
 gtk_action_group_translate_string
-gtk_action_is_sensitive
-gtk_action_is_visible
-gtk_action_new
-gtk_action_set_accel_group
-gtk_action_set_accel_path
-gtk_action_set_sensitive
-gtk_action_set_visible
-gtk_action_unblock_activate_from
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ADJUSTMENT_H__)
+#if IN_FILE(__GTK_ADJUSTMENT_C__)
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
-gtk_adjustment_get_type
+gtk_adjustment_get_type G_GNUC_CONST
 gtk_adjustment_get_value
 gtk_adjustment_new
 gtk_adjustment_set_value
 gtk_adjustment_value_changed
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ALIGNMENT_H__)
+#if IN_FILE(__GTK_ALIGNMENT_C__)
 gtk_alignment_get_padding
-gtk_alignment_get_type
+gtk_alignment_get_type G_GNUC_CONST
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
-gtk_alternative_dialog_button_order
-gtk_anchor_type_get_type
-gtk_arg_flags_get_type
-gtk_arrow_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TYPE_BUILTINS_H__)
+#if IN_FILE(__GTK_TYPE_BUILTINS_C__)
+gtk_pack_direction_get_type G_GNUC_CONST
+gtk_ui_manager_item_type_get_type G_GNUC_CONST
+gtk_spin_button_update_policy_get_type G_GNUC_CONST
+gtk_notebook_tab_get_type G_GNUC_CONST
+gtk_anchor_type_get_type G_GNUC_CONST
+gtk_arg_flags_get_type G_GNUC_CONST
+gtk_arrow_type_get_type G_GNUC_CONST
+gtk_attach_options_get_type G_GNUC_CONST
+gtk_button_action_get_type G_GNUC_CONST
+gtk_buttons_type_get_type G_GNUC_CONST
+gtk_calendar_display_options_get_type G_GNUC_CONST
+gtk_cell_renderer_mode_get_type G_GNUC_CONST
+gtk_cell_renderer_state_get_type G_GNUC_CONST
+gtk_corner_type_get_type G_GNUC_CONST
+gtk_debug_flag_get_type G_GNUC_CONST
+gtk_delete_type_get_type G_GNUC_CONST
+gtk_dest_defaults_get_type G_GNUC_CONST
+gtk_clist_drag_pos_get_type G_GNUC_CONST
+gtk_dialog_flags_get_type G_GNUC_CONST
+gtk_direction_type_get_type G_GNUC_CONST
+gtk_expander_style_get_type G_GNUC_CONST
+gtk_file_chooser_action_get_type G_GNUC_CONST
+gtk_file_filter_flags_get_type G_GNUC_CONST
+gtk_window_type_get_type G_GNUC_CONST
+gtk_wrap_mode_get_type G_GNUC_CONST
+gtk_widget_flags_get_type G_GNUC_CONST
+gtk_widget_help_type_get_type G_GNUC_CONST
+gtk_window_position_get_type G_GNUC_CONST
+gtk_tree_view_column_sizing_get_type G_GNUC_CONST
+gtk_tree_view_drop_position_get_type G_GNUC_CONST
+gtk_button_box_style_get_type G_GNUC_CONST
+gtk_cell_type_get_type G_GNUC_CONST
+gtk_ctree_expander_style_get_type G_GNUC_CONST
+gtk_ctree_expansion_type_get_type G_GNUC_CONST
+gtk_ctree_line_style_get_type G_GNUC_CONST
+gtk_ctree_pos_get_type G_GNUC_CONST
+gtk_curve_type_get_type G_GNUC_CONST
+gtk_icon_lookup_flags_get_type G_GNUC_CONST
+gtk_image_type_get_type G_GNUC_CONST
+gtk_im_preedit_style_get_type G_GNUC_CONST
+gtk_im_status_style_get_type G_GNUC_CONST
+gtk_justification_get_type G_GNUC_CONST
+gtk_match_type_get_type G_GNUC_CONST
+gtk_menu_direction_type_get_type G_GNUC_CONST
+gtk_message_type_get_type G_GNUC_CONST
+gtk_metric_type_get_type G_GNUC_CONST
+gtk_movement_step_get_type G_GNUC_CONST
+gtk_orientation_get_type G_GNUC_CONST
+gtk_pack_type_get_type G_GNUC_CONST
+gtk_path_priority_type_get_type G_GNUC_CONST
+gtk_path_type_get_type G_GNUC_CONST
+gtk_policy_type_get_type G_GNUC_CONST
+gtk_position_type_get_type G_GNUC_CONST
+gtk_preview_type_get_type G_GNUC_CONST
+gtk_private_flags_get_type G_GNUC_CONST
+gtk_progress_bar_orientation_get_type G_GNUC_CONST
+gtk_progress_bar_style_get_type G_GNUC_CONST
+gtk_rc_flags_get_type G_GNUC_CONST
+gtk_rc_token_type_get_type G_GNUC_CONST
+gtk_relief_style_get_type G_GNUC_CONST
+gtk_resize_mode_get_type G_GNUC_CONST
+gtk_response_type_get_type G_GNUC_CONST
+gtk_scroll_step_get_type G_GNUC_CONST
+gtk_scroll_type_get_type G_GNUC_CONST
+gtk_selection_mode_get_type G_GNUC_CONST
+gtk_shadow_type_get_type G_GNUC_CONST
+gtk_side_type_get_type G_GNUC_CONST
+gtk_signal_run_type_get_type G_GNUC_CONST
+gtk_size_group_mode_get_type G_GNUC_CONST
+gtk_sort_type_get_type G_GNUC_CONST
+gtk_spin_type_get_type G_GNUC_CONST
+gtk_state_type_get_type G_GNUC_CONST
+gtk_submenu_direction_get_type G_GNUC_CONST
+gtk_submenu_placement_get_type G_GNUC_CONST
+gtk_target_flags_get_type G_GNUC_CONST
+gtk_text_direction_get_type G_GNUC_CONST
+gtk_text_search_flags_get_type G_GNUC_CONST
+gtk_text_window_type_get_type G_GNUC_CONST
+gtk_tree_model_flags_get_type G_GNUC_CONST
+gtk_tree_view_mode_get_type G_GNUC_CONST
+gtk_update_type_get_type G_GNUC_CONST
+gtk_visibility_get_type G_GNUC_CONST
+gtk_object_flags_get_type G_GNUC_CONST
+gtk_accel_flags_get_type G_GNUC_CONST
+gtk_icon_size_get_type G_GNUC_CONST
+gtk_file_chooser_error_get_type G_GNUC_CONST
+gtk_icon_theme_error_get_type G_GNUC_CONST
+gtk_toolbar_child_type_get_type G_GNUC_CONST
+gtk_toolbar_space_style_get_type G_GNUC_CONST
+gtk_toolbar_style_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ARROW_H__)
+#if IN_FILE(__GTK_ARROW_C__)
+gtk_arrow_get_type G_GNUC_CONST
 gtk_arrow_new
 gtk_arrow_set
-gtk_arrow_type_get_type
-gtk_aspect_frame_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ASPECT_FRAME_H__)
+#if IN_FILE(__GTK_ASPECT_FRAME_C__)
+gtk_aspect_frame_get_type G_GNUC_CONST
 gtk_aspect_frame_new
 gtk_aspect_frame_set
-gtk_attach_options_get_type
-#ifdef INCLUDE_VARIABLES
-gtk_binary_age
 #endif
+#endif
+
+#if IN_HEADER(__GTK_BINDINGS_H__)
+#if IN_FILE(__GTK_BINDINGS_C__)
 gtk_binding_entry_add_signal
 gtk_binding_entry_add_signall
 gtk_binding_entry_clear
@@ -163,14 +329,21 @@ gtk_binding_set_add_path
 gtk_binding_set_by_class
 gtk_binding_set_find
 gtk_binding_set_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BIN_H__)
+#if IN_FILE(__GTK_BIN_C__)
 gtk_bin_get_child
-gtk_bin_get_type
-gtk_border_copy
-gtk_border_free
-gtk_border_get_type
+gtk_bin_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BOX_H__)
+#if IN_FILE(__GTK_BOX_C__)
 gtk_box_get_homogeneous
 gtk_box_get_spacing
-gtk_box_get_type
+gtk_box_get_type G_GNUC_CONST
 gtk_box_pack_end
 gtk_box_pack_end_defaults
 gtk_box_pack_start
@@ -180,24 +353,35 @@ gtk_box_reorder_child
 gtk_box_set_child_packing
 gtk_box_set_homogeneous
 gtk_box_set_spacing
-gtk_button_action_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BUTTON_BOX_H__)
+#if IN_FILE(__GTK_BUTTON_BOX_C__)
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_button_box_set_child_size
+gtk_button_box_set_child_ipadding
 gtk_button_box_get_child_ipadding
-gtk_button_box_get_child_secondary
 gtk_button_box_get_child_size
+#endif
+gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
-gtk_button_box_get_type
-gtk_button_box_set_child_ipadding
+gtk_button_box_get_type G_GNUC_CONST
 gtk_button_box_set_child_secondary
-gtk_button_box_set_child_size
 gtk_button_box_set_layout
-gtk_button_box_style_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BUTTON_H__)
+#if IN_FILE(__GTK_BUTTON_C__)
 gtk_button_clicked
 gtk_button_enter
 gtk_button_get_alignment
 gtk_button_get_focus_on_click
+gtk_button_get_image
 gtk_button_get_label
 gtk_button_get_relief
-gtk_button_get_type
+gtk_button_get_type G_GNUC_CONST
 gtk_button_get_use_stock
 gtk_button_get_use_underline
 gtk_button_leave
@@ -209,101 +393,165 @@ gtk_button_pressed
 gtk_button_released
 gtk_button_set_alignment
 gtk_button_set_focus_on_click
+gtk_button_set_image
 gtk_button_set_label
 gtk_button_set_relief
 gtk_button_set_use_stock
 gtk_button_set_use_underline
-gtk_buttons_type_get_type
-gtk_calendar_clear_marks
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CALENDAR_H__)
+#if IN_FILE(__GTK_CALENDAR_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_calendar_display_options
-gtk_calendar_display_options_get_type
 gtk_calendar_freeze
+gtk_calendar_thaw
+#endif
+gtk_calendar_clear_marks
 gtk_calendar_get_date
 gtk_calendar_get_display_options
-gtk_calendar_get_type
+gtk_calendar_get_type G_GNUC_CONST
 gtk_calendar_mark_day
 gtk_calendar_new
 gtk_calendar_select_day
 gtk_calendar_select_month
 gtk_calendar_set_display_options
-gtk_calendar_thaw
 gtk_calendar_unmark_day
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_EDITABLE_H__)
+#if IN_FILE(__GTK_CELL_EDITABLE_C__)
 gtk_cell_editable_editing_done
-gtk_cell_editable_get_type
+gtk_cell_editable_get_type G_GNUC_CONST
 gtk_cell_editable_remove_widget
 gtk_cell_editable_start_editing
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_LAYOUT_H__)
+#if IN_FILE(__GTK_CELL_LAYOUT_C__)
 gtk_cell_layout_add_attribute
 gtk_cell_layout_clear
 gtk_cell_layout_clear_attributes
-gtk_cell_layout_get_type
+gtk_cell_layout_get_type G_GNUC_CONST
 gtk_cell_layout_pack_end
 gtk_cell_layout_pack_start
 gtk_cell_layout_reorder
-gtk_cell_layout_set_attributes
+gtk_cell_layout_set_attributes G_GNUC_NULL_TERMINATED
 gtk_cell_layout_set_cell_data_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_C__)
 gtk_cell_renderer_activate
-gtk_cell_renderer_combo_get_type
-gtk_cell_renderer_combo_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_cell_renderer_editing_canceled
+#endif
 gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_get_size
-gtk_cell_renderer_get_type
-gtk_cell_renderer_mode_get_type
-gtk_cell_renderer_pixbuf_get_type
-gtk_cell_renderer_pixbuf_new
-gtk_cell_renderer_progress_get_type
-gtk_cell_renderer_progress_new
+gtk_cell_renderer_get_type G_GNUC_CONST
 gtk_cell_renderer_render
 gtk_cell_renderer_set_fixed_size
 gtk_cell_renderer_start_editing
-gtk_cell_renderer_state_get_type
-gtk_cell_renderer_text_get_type
+gtk_cell_renderer_stop_editing
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_COMBO_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_COMBO_C__)
+gtk_cell_renderer_combo_get_type G_GNUC_CONST
+gtk_cell_renderer_combo_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_PIXBUF_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_PIXBUF_C__)
+gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST
+gtk_cell_renderer_pixbuf_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_PROGRESS_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_PROGRESS_C__)
+gtk_cell_renderer_progress_get_type G_GNUC_CONST
+gtk_cell_renderer_progress_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_TEXT_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_TEXT_C__)
+gtk_cell_renderer_text_get_type G_GNUC_CONST
 gtk_cell_renderer_text_new
 gtk_cell_renderer_text_set_fixed_height_from_font
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_TOGGLE_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_TOGGLE_C__)
 gtk_cell_renderer_toggle_get_active
 gtk_cell_renderer_toggle_get_radio
-gtk_cell_renderer_toggle_get_type
+gtk_cell_renderer_toggle_get_type G_GNUC_CONST
 gtk_cell_renderer_toggle_new
 gtk_cell_renderer_toggle_set_active
 gtk_cell_renderer_toggle_set_radio
-gtk_cell_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_VIEW_H__)
+#if IN_FILE(__GTK_CELL_VIEW_C__)
 gtk_cell_view_get_cell_renderers
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_size_of_row
-gtk_cell_view_get_type
+gtk_cell_view_get_type G_GNUC_CONST
 gtk_cell_view_new
 gtk_cell_view_new_with_markup
 gtk_cell_view_new_with_pixbuf
 gtk_cell_view_new_with_text
 gtk_cell_view_set_background_color
-gtk_cell_view_set_cell_data
 gtk_cell_view_set_displayed_row
 gtk_cell_view_set_model
-gtk_cell_view_set_value
-gtk_cell_view_set_values
-gtk_check_button_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CHECK_BUTTON_H__)
+#if IN_FILE(__GTK_CHECK_BUTTON_C__)
+gtk_check_button_get_type G_GNUC_CONST
 gtk_check_button_new
 gtk_check_button_new_with_label
 gtk_check_button_new_with_mnemonic
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__)
+#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__)
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
-gtk_check_menu_item_get_type
+gtk_check_menu_item_get_type G_GNUC_CONST
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
 gtk_check_menu_item_new_with_mnemonic
 gtk_check_menu_item_set_active
 gtk_check_menu_item_set_draw_as_radio
 gtk_check_menu_item_set_inconsistent
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_check_menu_item_set_show_toggle
+#endif
 gtk_check_menu_item_toggled
-gtk_check_version
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CLIPBOARD_H__)
+#if IN_FILE(__GTK_CLIPBOARD_C__)
 gtk_clipboard_clear
 gtk_clipboard_get
 gtk_clipboard_get_display
 gtk_clipboard_get_for_display
 gtk_clipboard_get_owner
-gtk_clipboard_get_type
+gtk_clipboard_get_type G_GNUC_CONST
 gtk_clipboard_request_contents
 gtk_clipboard_request_image
 gtk_clipboard_request_targets
@@ -321,6 +569,12 @@ gtk_clipboard_wait_for_text
 gtk_clipboard_wait_is_image_available
 gtk_clipboard_wait_is_text_available
 gtk_clipboard_wait_is_target_available
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CLIST_H__)
+#if IN_FILE(__GTK_CLIST_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_clist_append
 gtk_clist_clear
 gtk_clist_columns_autosize
@@ -330,7 +584,6 @@ gtk_clist_column_titles_active
 gtk_clist_column_titles_hide
 gtk_clist_column_titles_passive
 gtk_clist_column_titles_show
-gtk_clist_drag_pos_get_type
 gtk_clist_find_row_from_data
 gtk_clist_freeze
 gtk_clist_get_cell_style
@@ -345,7 +598,7 @@ gtk_clist_get_row_style
 gtk_clist_get_selectable
 gtk_clist_get_selection_info
 gtk_clist_get_text
-gtk_clist_get_type
+gtk_clist_get_type G_GNUC_CONST
 gtk_clist_get_vadjustment
 gtk_clist_insert
 gtk_clist_moveto
@@ -396,10 +649,16 @@ gtk_clist_thaw
 gtk_clist_undo_selection
 gtk_clist_unselect_all
 gtk_clist_unselect_row
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_BUTTON_H__)
+#if IN_FILE(__GTK_COLOR_BUTTON_C__)
 gtk_color_button_get_alpha
 gtk_color_button_get_color
 gtk_color_button_get_title
-gtk_color_button_get_type
+gtk_color_button_get_type G_GNUC_CONST
 gtk_color_button_get_use_alpha
 gtk_color_button_new
 gtk_color_button_new_with_color
@@ -407,37 +666,48 @@ gtk_color_button_set_alpha
 gtk_color_button_set_color
 gtk_color_button_set_title
 gtk_color_button_set_use_alpha
-gtk_color_selection_dialog_get_type
-gtk_color_selection_dialog_new
-gtk_color_selection_get_color
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_SELECTION_H__)
+#if IN_FILE(__GTK_COLOR_SELECTION_C__)
 gtk_color_selection_get_current_alpha
 gtk_color_selection_get_current_color
 gtk_color_selection_get_has_opacity_control
 gtk_color_selection_get_has_palette
 gtk_color_selection_get_previous_alpha
 gtk_color_selection_get_previous_color
-gtk_color_selection_get_type
+gtk_color_selection_get_type G_GNUC_CONST
 gtk_color_selection_is_adjusting
 gtk_color_selection_new
 gtk_color_selection_palette_from_string
 gtk_color_selection_palette_to_string
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_color_selection_set_change_palette_hook
-gtk_color_selection_set_change_palette_with_screen_hook
 gtk_color_selection_set_color
+gtk_color_selection_get_color
+gtk_color_selection_set_update_policy
+#endif
+gtk_color_selection_set_change_palette_with_screen_hook
 gtk_color_selection_set_current_alpha
 gtk_color_selection_set_current_color
 gtk_color_selection_set_has_opacity_control
 gtk_color_selection_set_has_palette
 gtk_color_selection_set_previous_alpha
 gtk_color_selection_set_previous_color
-gtk_color_selection_set_update_policy
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_SELECTION_DIALOG_H__)
+#if IN_FILE(__GTK_COLOR_SELECTION_DIALOG_C__)
+gtk_color_selection_dialog_get_type G_GNUC_CONST
+gtk_color_selection_dialog_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COMBO_BOX_H__)
+#if IN_FILE(__GTK_COMBO_BOX_C__)
 gtk_combo_box_append_text
-gtk_combo_box_entry_get_text_column
-gtk_combo_box_entry_get_type
-gtk_combo_box_entry_new
-gtk_combo_box_entry_new_text
-gtk_combo_box_entry_new_with_model
-gtk_combo_box_entry_set_text_column
 gtk_combo_box_get_active
 gtk_combo_box_get_active_iter
 gtk_combo_box_get_active_text
@@ -448,7 +718,7 @@ gtk_combo_box_get_model
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_get_row_span_column
-gtk_combo_box_get_type
+gtk_combo_box_get_type G_GNUC_CONST
 gtk_combo_box_get_wrap_width
 gtk_combo_box_insert_text
 gtk_combo_box_new
@@ -467,8 +737,25 @@ gtk_combo_box_set_model
 gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column
 gtk_combo_box_set_wrap_width
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COMBO_BOX_ENTRY_H__)
+#if IN_FILE(__GTK_COMBO_BOX_ENTRY_C__)
+gtk_combo_box_entry_get_text_column
+gtk_combo_box_entry_get_type G_GNUC_CONST
+gtk_combo_box_entry_new
+gtk_combo_box_entry_new_text
+gtk_combo_box_entry_new_with_model
+gtk_combo_box_entry_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SMART_COMBO_H__)
+#if IN_FILE(__GTK_SMART_COMBO_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_combo_disable_activate
-gtk_combo_get_type
+gtk_combo_get_type G_GNUC_CONST
 gtk_combo_new
 gtk_combo_set_case_sensitive
 gtk_combo_set_item_string
@@ -476,16 +763,19 @@ gtk_combo_set_popdown_strings
 gtk_combo_set_use_arrows
 gtk_combo_set_use_arrows_always
 gtk_combo_set_value_in_list
-#ifdef INCLUDE_VARIABLES
-gtk_combo_string_key
 #endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CONTAINER_H__)
+#if IN_FILE(__GTK_CONTAINER_C__)
 gtk_container_add
-gtk_container_add_with_properties
+gtk_container_add_with_properties G_GNUC_NULL_TERMINATED
 gtk_container_check_resize
-gtk_container_child_get
+gtk_container_child_get G_GNUC_NULL_TERMINATED
 gtk_container_child_get_property
 gtk_container_child_get_valist
-gtk_container_child_set
+gtk_container_child_set G_GNUC_NULL_TERMINATED
 gtk_container_child_set_property
 gtk_container_child_set_valist
 gtk_container_child_type
@@ -494,14 +784,16 @@ gtk_container_class_install_child_property
 gtk_container_class_list_child_properties
 gtk_container_forall
 gtk_container_foreach
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_container_foreach_full
+#endif
 gtk_container_get_border_width
 gtk_container_get_children
 gtk_container_get_focus_chain
 gtk_container_get_focus_hadjustment
 gtk_container_get_focus_vadjustment
 gtk_container_get_resize_mode
-gtk_container_get_type
+gtk_container_get_type G_GNUC_CONST
 gtk_container_propagate_expose
 gtk_container_remove
 gtk_container_resize_children
@@ -513,15 +805,18 @@ gtk_container_set_focus_vadjustment
 gtk_container_set_reallocate_redraws
 gtk_container_set_resize_mode
 gtk_container_unset_focus_chain
-gtk_corner_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__C_TREE_H__)
+#if IN_FILE(__G_TREE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_ctree_collapse
 gtk_ctree_collapse_recursive
 gtk_ctree_collapse_to_depth
 gtk_ctree_expand
-gtk_ctree_expander_style_get_type
 gtk_ctree_expand_recursive
 gtk_ctree_expand_to_depth
-gtk_ctree_expansion_type_get_type
 gtk_ctree_export_to_gnode
 gtk_ctree_find
 gtk_ctree_find_all_by_row_data
@@ -530,14 +825,13 @@ gtk_ctree_find_by_row_data
 gtk_ctree_find_by_row_data_custom
 gtk_ctree_find_node_ptr
 gtk_ctree_get_node_info
-gtk_ctree_get_type
+gtk_ctree_get_type G_GNUC_CONST
 gtk_ctree_insert_gnode
 gtk_ctree_insert_node
 gtk_ctree_is_ancestor
 gtk_ctree_is_hot_spot
 gtk_ctree_is_viewable
 gtk_ctree_last
-gtk_ctree_line_style_get_type
 gtk_ctree_move
 gtk_ctree_new
 gtk_ctree_new_with_titles
@@ -549,7 +843,7 @@ gtk_ctree_node_get_row_data
 gtk_ctree_node_get_row_style
 gtk_ctree_node_get_selectable
 gtk_ctree_node_get_text
-gtk_ctree_node_get_type
+gtk_ctree_node_get_type G_GNUC_CONST
 gtk_ctree_node_is_visible
 gtk_ctree_node_moveto
 gtk_ctree_node_nth
@@ -564,7 +858,6 @@ gtk_ctree_node_set_row_style
 gtk_ctree_node_set_selectable
 gtk_ctree_node_set_shift
 gtk_ctree_node_set_text
-gtk_ctree_pos_get_type
 gtk_ctree_post_recursive
 gtk_ctree_post_recursive_to_depth
 gtk_ctree_pre_recursive
@@ -586,7 +879,13 @@ gtk_ctree_toggle_expansion
 gtk_ctree_toggle_expansion_recursive
 gtk_ctree_unselect
 gtk_ctree_unselect_recursive
-gtk_curve_get_type
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CURVE_H__)
+#if IN_FILE(__GTK_CURVE_C__)
+gtk_curve_get_type G_GNUC_CONST
 gtk_curve_get_vector
 gtk_curve_new
 gtk_curve_reset
@@ -594,33 +893,41 @@ gtk_curve_set_curve_type
 gtk_curve_set_gamma
 gtk_curve_set_range
 gtk_curve_set_vector
-gtk_curve_type_get_type
-gtk_debug_flag_get_type
-#ifdef INCLUDE_VARIABLES
-gtk_debug_flags
 #endif
+#endif
+
+#if IN_HEADER(__GTK_WINDOW_DECORATE_H__)
+#if IN_FILE(__GTK_WINDOW_DECORATE_C__)
 gtk_decorated_window_calculate_frame_size
 gtk_decorated_window_init
 gtk_decorated_window_move_resize_window
 gtk_decorated_window_set_title
-gtk_delete_type_get_type
-gtk_dest_defaults_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DIALOG_H__)
+#if IN_FILE(__GTK_DIALOG_C__)
 gtk_dialog_add_action_widget
 gtk_dialog_add_button
-gtk_dialog_add_buttons
-gtk_dialog_flags_get_type
+gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED
 gtk_dialog_get_has_separator
-gtk_dialog_get_type
+gtk_dialog_get_response_for_widget
+gtk_dialog_get_type G_GNUC_CONST
 gtk_dialog_new
-gtk_dialog_new_with_buttons
+gtk_dialog_new_with_buttons G_GNUC_NULL_TERMINATED
 gtk_dialog_response
 gtk_dialog_run
+gtk_alternative_dialog_button_order
 gtk_dialog_set_alternative_button_order
+gtk_dialog_set_alternative_button_order_from_array
 gtk_dialog_set_default_response
 gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
-gtk_direction_type_get_type
-gtk_disable_setlocale
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DND_H__)
+#if IN_FILE(__GTK_DND_C__)
 gtk_drag_begin
 gtk_drag_check_threshold
 gtk_drag_dest_add_image_targets
@@ -636,8 +943,11 @@ gtk_drag_finish
 gtk_drag_get_data
 gtk_drag_get_source_widget
 gtk_drag_highlight
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_drag_set_default_icon
+#endif
 gtk_drag_set_icon_default
+gtk_drag_set_icon_name
 gtk_drag_set_icon_pixbuf
 gtk_drag_set_icon_pixmap
 gtk_drag_set_icon_stock
@@ -648,11 +958,18 @@ gtk_drag_source_add_uri_targets
 gtk_drag_source_get_target_list
 gtk_drag_source_set
 gtk_drag_source_set_icon
+gtk_drag_source_set_icon_name
 gtk_drag_source_set_icon_pixbuf
 gtk_drag_source_set_icon_stock
 gtk_drag_source_set_target_list
 gtk_drag_source_unset
 gtk_drag_unhighlight
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STYLE_H__)
+#if IN_FILE(__GTK_STYLE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_draw_arrow
 gtk_draw_box
 gtk_draw_box_gap
@@ -664,9 +981,6 @@ gtk_draw_flat_box
 gtk_draw_focus
 gtk_draw_handle
 gtk_draw_hline
-gtk_drawing_area_get_type
-gtk_drawing_area_new
-gtk_drawing_area_size
 gtk_draw_insertion_cursor
 gtk_draw_layout
 gtk_draw_option
@@ -678,6 +992,59 @@ gtk_draw_slider
 gtk_draw_string
 gtk_draw_tab
 gtk_draw_vline
+gtk_style_set_font
+gtk_style_get_font
+gtk_style_ref
+gtk_style_unref
+gtk_paint_string
+#endif
+gtk_paint_arrow
+gtk_paint_box
+gtk_paint_box_gap
+gtk_paint_check
+gtk_paint_diamond
+gtk_paint_expander
+gtk_paint_extension
+gtk_paint_flat_box
+gtk_paint_focus
+gtk_paint_handle
+gtk_paint_hline
+gtk_paint_layout
+gtk_paint_option
+gtk_paint_polygon
+gtk_paint_resize_grip
+gtk_paint_shadow
+gtk_paint_shadow_gap
+gtk_paint_slider
+gtk_paint_tab
+gtk_paint_vline
+gtk_border_copy
+gtk_border_free
+gtk_border_get_type G_GNUC_CONST
+gtk_style_apply_default_background
+gtk_style_attach
+gtk_style_copy
+gtk_style_detach
+gtk_style_get_type G_GNUC_CONST
+gtk_style_lookup_icon_set
+gtk_style_new
+gtk_style_render_icon
+gtk_style_set_background
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DRAWING_AREA_H__)
+#if IN_FILE(__GTK_DRAWING_AREA_C__)
+gtk_drawing_area_get_type G_GNUC_CONST
+gtk_drawing_area_new
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_drawing_area_size
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EDITABLE_H__)
+#if IN_FILE(__GTK_EDITABLE_C__)
 gtk_editable_copy_clipboard
 gtk_editable_cut_clipboard
 gtk_editable_delete_selection
@@ -686,32 +1053,17 @@ gtk_editable_get_chars
 gtk_editable_get_editable
 gtk_editable_get_position
 gtk_editable_get_selection_bounds
-gtk_editable_get_type
+gtk_editable_get_type G_GNUC_CONST
 gtk_editable_insert_text
 gtk_editable_paste_clipboard
 gtk_editable_select_region
 gtk_editable_set_editable
 gtk_editable_set_position
-gtk_entry_append_text
-gtk_entry_completion_complete
-gtk_entry_completion_delete_action
-gtk_entry_completion_get_entry
-gtk_entry_completion_get_inline_completion
-gtk_entry_completion_get_minimum_key_length
-gtk_entry_completion_get_model
-gtk_entry_completion_get_popup_completion
-gtk_entry_completion_get_text_column
-gtk_entry_completion_get_type
-gtk_entry_completion_insert_action_markup
-gtk_entry_completion_insert_action_text
-gtk_entry_completion_insert_prefix
-gtk_entry_completion_new
-gtk_entry_completion_set_inline_completion
-gtk_entry_completion_set_match_func
-gtk_entry_completion_set_minimum_key_length
-gtk_entry_completion_set_model
-gtk_entry_completion_set_popup_completion
-gtk_entry_completion_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ENTRY_H__)
+#if IN_FILE(__GTK_ENTRY_C__)
 gtk_entry_get_activates_default
 gtk_entry_get_alignment
 gtk_entry_get_completion
@@ -721,39 +1073,78 @@ gtk_entry_get_layout
 gtk_entry_get_layout_offsets
 gtk_entry_get_max_length
 gtk_entry_get_text
-gtk_entry_get_type
+gtk_entry_get_type G_GNUC_CONST
 gtk_entry_get_visibility
 gtk_entry_get_width_chars
 gtk_entry_layout_index_to_text_index
 gtk_entry_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_entry_new_with_max_length
+gtk_entry_append_text
 gtk_entry_prepend_text
 gtk_entry_select_region
+gtk_entry_set_position
+gtk_entry_set_editable
+#endif
 gtk_entry_set_activates_default
 gtk_entry_set_alignment
 gtk_entry_set_completion
-gtk_entry_set_editable
 gtk_entry_set_has_frame
 gtk_entry_set_invisible_char
 gtk_entry_set_max_length
-gtk_entry_set_position
 gtk_entry_set_text
 gtk_entry_set_visibility
 gtk_entry_set_width_chars
 gtk_entry_text_index_to_layout_index
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ENTRY_COMPLETION_H__)
+#if IN_FILE(__GTK_ENTRY_COMPLETION_C__)
+gtk_entry_completion_complete
+gtk_entry_completion_delete_action
+gtk_entry_completion_get_entry
+gtk_entry_completion_get_inline_completion
+gtk_entry_completion_get_minimum_key_length
+gtk_entry_completion_get_model
+gtk_entry_completion_get_popup_completion
+gtk_entry_completion_get_popup_set_width
+gtk_entry_completion_get_popup_single_match
+gtk_entry_completion_get_text_column
+gtk_entry_completion_get_type G_GNUC_CONST
+gtk_entry_completion_insert_action_markup
+gtk_entry_completion_insert_action_text
+gtk_entry_completion_insert_prefix
+gtk_entry_completion_new
+gtk_entry_completion_set_inline_completion
+gtk_entry_completion_set_match_func
+gtk_entry_completion_set_minimum_key_length
+gtk_entry_completion_set_model
+gtk_entry_completion_set_popup_completion
+gtk_entry_completion_set_popup_set_width
+gtk_entry_completion_set_popup_single_match
+gtk_entry_completion_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EVENT_BOX_H__)
+#if IN_FILE(__GTK_EVENT_BOX_C__)
 gtk_event_box_get_above_child
-gtk_event_box_get_type
+gtk_event_box_get_type G_GNUC_CONST
 gtk_event_box_get_visible_window
 gtk_event_box_new
 gtk_event_box_set_above_child
 gtk_event_box_set_visible_window
-gtk_events_pending
-gtk_exit
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EXPANDER_H__)
+#if IN_FILE(__GTK_EXPANDER_C__)
 gtk_expander_get_expanded
 gtk_expander_get_label
 gtk_expander_get_label_widget
 gtk_expander_get_spacing
-gtk_expander_get_type
+gtk_expander_get_type G_GNUC_CONST
 gtk_expander_get_use_markup
 gtk_expander_get_use_underline
 gtk_expander_new
@@ -764,60 +1155,78 @@ gtk_expander_set_label_widget
 gtk_expander_set_spacing
 gtk_expander_set_use_markup
 gtk_expander_set_use_underline
-gtk_expander_style_get_type
-gtk_false
-gtk_file_chooser_action_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_C__)
 gtk_file_chooser_add_filter
-gtk_file_chooser_add_shortcut_folder
+gtk_file_chooser_add_shortcut_folder PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_add_shortcut_folder_utf8
+#endif
 gtk_file_chooser_add_shortcut_folder_uri
-gtk_file_chooser_button_get_active
-gtk_file_chooser_button_get_title
-gtk_file_chooser_button_get_type
-gtk_file_chooser_button_get_width_chars
-gtk_file_chooser_button_new
-gtk_file_chooser_button_new_with_backend
-gtk_file_chooser_button_new_with_dialog
-gtk_file_chooser_button_set_active
-gtk_file_chooser_button_set_title
-gtk_file_chooser_button_set_width_chars
-gtk_file_chooser_dialog_get_type
-gtk_file_chooser_dialog_new
-gtk_file_chooser_dialog_new_with_backend
-gtk_file_chooser_error_get_type
 gtk_file_chooser_error_quark
 gtk_file_chooser_get_action
-gtk_file_chooser_get_current_folder
+gtk_file_chooser_get_current_folder PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_get_current_folder_utf8
+#endif
 gtk_file_chooser_get_current_folder_uri
 gtk_file_chooser_get_extra_widget
-gtk_file_chooser_get_filename
-gtk_file_chooser_get_filenames
+gtk_file_chooser_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_get_filename_utf8
+#endif
+gtk_file_chooser_get_filenames PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_get_filenames_utf8
+#endif
 gtk_file_chooser_get_filter
 gtk_file_chooser_get_local_only
-gtk_file_chooser_get_preview_filename
+gtk_file_chooser_get_preview_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_get_preview_filename_utf8
+#endif
 gtk_file_chooser_get_preview_uri
 gtk_file_chooser_get_preview_widget
 gtk_file_chooser_get_preview_widget_active
 gtk_file_chooser_get_select_multiple
 gtk_file_chooser_get_show_hidden
-gtk_file_chooser_get_type
+gtk_file_chooser_get_type G_GNUC_CONST
 gtk_file_chooser_get_uri
 gtk_file_chooser_get_uris
 gtk_file_chooser_get_use_preview_label
 gtk_file_chooser_list_filters
-gtk_file_chooser_list_shortcut_folders
+gtk_file_chooser_list_shortcut_folders PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_list_shortcut_folders_utf8
+#endif
 gtk_file_chooser_list_shortcut_folder_uris
 gtk_file_chooser_remove_filter
-gtk_file_chooser_remove_shortcut_folder
+gtk_file_chooser_remove_shortcut_folder PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_remove_shortcut_folder_utf8
+#endif
 gtk_file_chooser_remove_shortcut_folder_uri
 gtk_file_chooser_select_all
-gtk_file_chooser_select_filename
+gtk_file_chooser_select_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_select_filename_utf8
+#endif
 gtk_file_chooser_select_uri
 gtk_file_chooser_set_action
-gtk_file_chooser_set_current_folder
+gtk_file_chooser_set_current_folder PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_set_current_folder_utf8
+#endif
 gtk_file_chooser_set_current_folder_uri
 gtk_file_chooser_set_current_name
 gtk_file_chooser_set_extra_widget
-gtk_file_chooser_set_filename
+gtk_file_chooser_set_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_set_filename_utf8
+#endif
 gtk_file_chooser_set_filter
 gtk_file_chooser_set_local_only
 gtk_file_chooser_set_preview_widget
@@ -827,24 +1236,62 @@ gtk_file_chooser_set_show_hidden
 gtk_file_chooser_set_uri
 gtk_file_chooser_set_use_preview_label
 gtk_file_chooser_unselect_all
-gtk_file_chooser_unselect_filename
+gtk_file_chooser_unselect_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_chooser_unselect_filename_utf8
+#endif
 gtk_file_chooser_unselect_uri
-gtk_file_chooser_widget_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_DIALOG_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_DIALOG_C__)
+gtk_file_chooser_dialog_get_type G_GNUC_CONST
+gtk_file_chooser_dialog_new G_GNUC_NULL_TERMINATED
+gtk_file_chooser_dialog_new_with_backend G_GNUC_NULL_TERMINATED
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
+gtk_file_chooser_widget_get_type G_GNUC_CONST
 gtk_file_chooser_widget_new
 gtk_file_chooser_widget_new_with_backend
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_BUTTON_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_BUTTON_C__)
+gtk_file_chooser_button_get_title
+gtk_file_chooser_button_get_type G_GNUC_CONST
+gtk_file_chooser_button_get_width_chars
+gtk_file_chooser_button_new
+gtk_file_chooser_button_new_with_backend
+gtk_file_chooser_button_new_with_dialog
+gtk_file_chooser_button_set_title
+gtk_file_chooser_button_set_width_chars
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_FILTER_H__)
+#if IN_FILE(__GTK_FILE_FILTER_C__)
 gtk_file_filter_add_custom
 gtk_file_filter_add_mime_type
 gtk_file_filter_add_pattern
 gtk_file_filter_add_pixbuf_formats
 gtk_file_filter_filter
-gtk_file_filter_flags_get_type
 gtk_file_filter_get_name
 gtk_file_filter_get_needed
-gtk_file_filter_get_type
+gtk_file_filter_get_type G_GNUC_CONST
 gtk_file_filter_new
 gtk_file_filter_set_name
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_C__)
 gtk_file_folder_get_info
-gtk_file_folder_get_type
+gtk_file_folder_get_type G_GNUC_CONST
 gtk_file_folder_is_finished_loading
 gtk_file_folder_list_children
 gtk_file_info_copy
@@ -856,7 +1303,7 @@ gtk_file_info_get_is_hidden
 gtk_file_info_get_mime_type
 gtk_file_info_get_modification_time
 gtk_file_info_get_size
-gtk_file_info_get_type
+gtk_file_info_get_type G_GNUC_CONST
 gtk_file_info_new
 gtk_file_info_set_display_name
 gtk_file_info_set_is_folder
@@ -864,26 +1311,16 @@ gtk_file_info_set_is_hidden
 gtk_file_info_set_mime_type
 gtk_file_info_set_modification_time
 gtk_file_info_set_size
-gtk_file_path_get_type
+gtk_file_path_get_type G_GNUC_CONST
 gtk_file_paths_copy
 gtk_file_paths_free
 gtk_file_paths_sort
-gtk_file_selection_complete
-gtk_file_selection_get_filename
-gtk_file_selection_get_selections
-gtk_file_selection_get_select_multiple
-gtk_file_selection_get_type
-gtk_file_selection_hide_fileop_buttons
-gtk_file_selection_new
-gtk_file_selection_set_filename
-gtk_file_selection_set_select_multiple
-gtk_file_selection_show_fileop_buttons
 gtk_file_system_create_folder
 gtk_file_system_error_quark
 gtk_file_system_filename_to_path
 gtk_file_system_get_folder
 gtk_file_system_get_parent
-gtk_file_system_get_type
+gtk_file_system_get_type G_GNUC_CONST
 gtk_file_system_get_volume_for_path
 gtk_file_system_insert_bookmark
 gtk_file_system_list_bookmarks
@@ -895,10 +1332,6 @@ gtk_file_system_path_to_filename
 gtk_file_system_path_to_uri
 gtk_file_system_remove_bookmark
 gtk_file_system_render_icon
-#ifdef G_OS_UNIX
-gtk_file_system_unix_get_type
-gtk_file_system_unix_new
-#endif
 gtk_file_system_uri_to_path
 gtk_file_system_volume_free
 gtk_file_system_volume_get_base_path
@@ -906,21 +1339,72 @@ gtk_file_system_volume_get_display_name
 gtk_file_system_volume_get_is_mounted
 gtk_file_system_volume_mount
 gtk_file_system_volume_render_icon
+gtk_file_system_get_bookmark_label
+gtk_file_system_set_bookmark_label
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_UNIX_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_UNIX_C__)
+#ifdef G_OS_UNIX
+gtk_file_system_unix_get_type G_GNUC_CONST
+gtk_file_system_unix_new
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_WIN32_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_WIN32_C__)
 #ifdef G_OS_WIN32
-gtk_file_system_win32_get_type
+gtk_file_system_win32_get_type G_GNUC_CONST
 gtk_file_system_win32_new
+_gtk_file_system_win32_path_compare
+#endif
 #endif
+#endif
+
+#if IN_HEADER(__GTK_FILESEL_H__)
+#if IN_FILE(__GTK_FILESEL_C__)
+gtk_file_selection_complete
+gtk_file_selection_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_get_filename_utf8
+#endif
+gtk_file_selection_get_selections PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_get_selections_utf8
+#endif
+gtk_file_selection_get_select_multiple
+gtk_file_selection_get_type G_GNUC_CONST
+gtk_file_selection_hide_fileop_buttons
+gtk_file_selection_new
+gtk_file_selection_set_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_set_filename_utf8
+#endif
+gtk_file_selection_set_select_multiple
+gtk_file_selection_show_fileop_buttons
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FIXED_H__)
+#if IN_FILE(__GTK_FIXED_C__)
 gtk_fixed_get_has_window
-gtk_fixed_get_type
+gtk_fixed_get_type G_GNUC_CONST
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
 gtk_fixed_set_has_window
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FONT_BUTTON_H__)
+#if IN_FILE(__GTK_FONT_BUTTON_C__)
 gtk_font_button_get_font_name
 gtk_font_button_get_show_size
 gtk_font_button_get_show_style
 gtk_font_button_get_title
-gtk_font_button_get_type
+gtk_font_button_get_type G_GNUC_CONST
 gtk_font_button_get_use_font
 gtk_font_button_get_use_size
 gtk_font_button_new
@@ -931,186 +1415,309 @@ gtk_font_button_set_show_style
 gtk_font_button_set_title
 gtk_font_button_set_use_font
 gtk_font_button_set_use_size
-gtk_font_selection_dialog_get_font
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FONSEL_H__)
+#if IN_FILE(__GTK_FONSEL_C__)
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_preview_text
-gtk_font_selection_dialog_get_type
+gtk_font_selection_dialog_get_type G_GNUC_CONST
 gtk_font_selection_dialog_new
 gtk_font_selection_dialog_set_font_name
 gtk_font_selection_dialog_set_preview_text
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_font_selection_get_font
+gtk_font_selection_dialog_get_font
+#endif
 gtk_font_selection_get_font_name
 gtk_font_selection_get_preview_text
-gtk_font_selection_get_type
+gtk_font_selection_get_type G_GNUC_CONST
 gtk_font_selection_new
 gtk_font_selection_set_font_name
 gtk_font_selection_set_preview_text
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FRAME_H__)
+#if IN_FILE(__GTK_FRAME_C__)
 gtk_frame_get_label
 gtk_frame_get_label_align
 gtk_frame_get_label_widget
 gtk_frame_get_shadow_type
-gtk_frame_get_type
+gtk_frame_get_type G_GNUC_CONST
 gtk_frame_new
 gtk_frame_set_label
 gtk_frame_set_label_align
 gtk_frame_set_label_widget
 gtk_frame_set_shadow_type
-gtk_gamma_curve_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_GAMMA_CURVE_H__)
+#if IN_FILE(__GTK_GAMMA_CURVE_C__)
+gtk_gamma_curve_get_type G_GNUC_CONST
 gtk_gamma_curve_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_GC_H__)
+#if IN_FILE(__GTK_GC_C__)
 gtk_gc_get
 gtk_gc_release
-gtk_get_current_event
-gtk_get_current_event_state
-gtk_get_current_event_time
-gtk_get_default_language
-gtk_get_event_widget
-gtk_get_option_group
-gtk_grab_add
-gtk_grab_get_current
-gtk_grab_remove
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HANDLE_BOX_H__)
+#if IN_FILE(__GTK_HANDLE_BOX_C__)
 gtk_handle_box_get_handle_position
 gtk_handle_box_get_shadow_type
 gtk_handle_box_get_snap_edge
-gtk_handle_box_get_type
+gtk_handle_box_get_type G_GNUC_CONST
 gtk_handle_box_new
 gtk_handle_box_set_handle_position
 gtk_handle_box_set_shadow_type
 gtk_handle_box_set_snap_edge
-gtk_hbox_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HBOX_H__)
+#if IN_FILE(__GTK_HBOX_C__)
+gtk_hbox_get_type G_GNUC_CONST
 gtk_hbox_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HBUTTON_BOX_H__)
+#if IN_FILE(__GTK_HBUTTON_BOX_C__)
+gtk_hbutton_box_new
+gtk_hbutton_box_get_type G_GNUC_CONST
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_hbutton_box_get_layout_default
 gtk_hbutton_box_get_spacing_default
-gtk_hbutton_box_get_type
-gtk_hbutton_box_new
 gtk_hbutton_box_set_layout_default
 gtk_hbutton_box_set_spacing_default
-gtk_hpaned_get_type
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HPANED_H__)
+#if IN_FILE(__GTK_HPANED_C__)
+gtk_hpaned_get_type G_GNUC_CONST
 gtk_hpaned_new
-gtk_hruler_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HRULER_H__)
+#if IN_FILE(__GTK_HRULER_C__)
+gtk_hruler_get_type G_GNUC_CONST
 gtk_hruler_new
-gtk_hscale_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSCALE_H__)
+#if IN_FILE(__GTK_HSCALE_C__)
+gtk_hscale_get_type G_GNUC_CONST
 gtk_hscale_new
 gtk_hscale_new_with_range
-gtk_hscrollbar_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSCROLLBAR_H__)
+#if IN_FILE(__GTK_HSCROLLBAR_C__)
+gtk_hscrollbar_get_type G_GNUC_CONST
 gtk_hscrollbar_new
-gtk_hseparator_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSEPARATOR_H__)
+#if IN_FILE(__GTK_HSEPARATOR_C__)
+gtk_hseparator_get_type G_GNUC_CONST
 gtk_hseparator_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSV_H__)
+#if IN_FILE(__GTK_HSV_C__)
 gtk_hsv_get_color
 gtk_hsv_get_metrics
-gtk_hsv_get_type
+gtk_hsv_get_type G_GNUC_CONST
 gtk_hsv_is_adjusting
 gtk_hsv_new
 gtk_hsv_set_color
 gtk_hsv_set_metrics
 gtk_hsv_to_rgb
+gtk_rgb_to_hsv
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_FACTORY_H__)
+#if IN_FILE(__GTK_ICON_FACTORY_C__)
 gtk_icon_factory_add
 gtk_icon_factory_add_default
-gtk_icon_factory_get_type
+gtk_icon_factory_get_type G_GNUC_CONST
 gtk_icon_factory_lookup
 gtk_icon_factory_lookup_default
 gtk_icon_factory_new
 gtk_icon_factory_remove_default
-gtk_icon_info_copy
-gtk_icon_info_free
-gtk_icon_info_get_attach_points
-gtk_icon_info_get_base_size
-gtk_icon_info_get_builtin_pixbuf
-gtk_icon_info_get_display_name
-gtk_icon_info_get_embedded_rect
-gtk_icon_info_get_filename
-gtk_icon_info_get_type
-gtk_icon_info_load_icon
-gtk_icon_info_set_raw_coordinates
-gtk_icon_lookup_flags_get_type
+gtk_icon_size_from_name
+gtk_icon_size_get_name
+gtk_icon_size_lookup
+gtk_icon_size_lookup_for_settings
+gtk_icon_size_register
+gtk_icon_size_register_alias
 gtk_icon_set_add_source
 gtk_icon_set_copy
 gtk_icon_set_get_sizes
-gtk_icon_set_get_type
+gtk_icon_set_get_type G_GNUC_CONST
 gtk_icon_set_new
 gtk_icon_set_new_from_pixbuf
 gtk_icon_set_ref
 gtk_icon_set_render_icon
 gtk_icon_set_unref
-gtk_icon_size_from_name
-gtk_icon_size_get_name
-gtk_icon_size_get_type
-gtk_icon_size_lookup
-gtk_icon_size_lookup_for_settings
-gtk_icon_size_register
-gtk_icon_size_register_alias
 gtk_icon_source_copy
 gtk_icon_source_free
 gtk_icon_source_get_direction
 gtk_icon_source_get_direction_wildcarded
-gtk_icon_source_get_filename
+gtk_icon_source_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_source_get_filename_utf8
+#endif
 gtk_icon_source_get_icon_name
 gtk_icon_source_get_pixbuf
 gtk_icon_source_get_size
 gtk_icon_source_get_size_wildcarded
 gtk_icon_source_get_state
 gtk_icon_source_get_state_wildcarded
-gtk_icon_source_get_type
+gtk_icon_source_get_type G_GNUC_CONST
 gtk_icon_source_new
 gtk_icon_source_set_direction
 gtk_icon_source_set_direction_wildcarded
-gtk_icon_source_set_filename
+gtk_icon_source_set_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_source_set_filename_utf8
+#endif
 gtk_icon_source_set_icon_name
 gtk_icon_source_set_pixbuf
 gtk_icon_source_set_size
 gtk_icon_source_set_size_wildcarded
 gtk_icon_source_set_state
 gtk_icon_source_set_state_wildcarded
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_THEME_H__)
+#if IN_FILE(__GTK_ICON_THEME_C__)
+gtk_icon_info_copy
+gtk_icon_info_free
+gtk_icon_info_get_attach_points
+gtk_icon_info_get_base_size
+gtk_icon_info_get_builtin_pixbuf
+gtk_icon_info_get_display_name
+gtk_icon_info_get_embedded_rect
+gtk_icon_info_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_info_get_filename_utf8
+#endif
+gtk_icon_info_get_type G_GNUC_CONST
+gtk_icon_info_load_icon
+gtk_icon_info_set_raw_coordinates
 gtk_icon_theme_add_builtin_icon
-gtk_icon_theme_append_search_path
-gtk_icon_theme_error_get_type
+gtk_icon_theme_append_search_path PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_theme_append_search_path_utf8
+#endif
 gtk_icon_theme_error_quark
 gtk_icon_theme_get_default
 gtk_icon_theme_get_example_icon_name
 gtk_icon_theme_get_for_screen
 gtk_icon_theme_get_icon_sizes
-gtk_icon_theme_get_search_path
-gtk_icon_theme_get_type
+gtk_icon_theme_get_search_path PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_theme_get_search_path_utf8
+#endif
+gtk_icon_theme_get_type G_GNUC_CONST
 gtk_icon_theme_has_icon
 gtk_icon_theme_list_icons
 gtk_icon_theme_load_icon
 gtk_icon_theme_lookup_icon
 gtk_icon_theme_new
-gtk_icon_theme_prepend_search_path
+gtk_icon_theme_prepend_search_path PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_theme_prepend_search_path_utf8
+#endif
 gtk_icon_theme_rescan_if_needed
 gtk_icon_theme_set_custom_theme
 gtk_icon_theme_set_screen
-gtk_icon_theme_set_search_path
+gtk_icon_theme_set_search_path PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_theme_set_search_path_utf8
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_VIEW_H__)
+#if IN_FILE(__GTK_ICON_VIEW_C__)
+gtk_icon_view_get_column_spacing
+gtk_icon_view_get_columns
+gtk_icon_view_get_cursor
+gtk_icon_view_get_item_width
+gtk_icon_view_get_margin
 gtk_icon_view_get_markup_column
 gtk_icon_view_get_model
 gtk_icon_view_get_orientation
 gtk_icon_view_get_path_at_pos
+gtk_icon_view_get_item_at_pos
 gtk_icon_view_get_pixbuf_column
+gtk_icon_view_get_row_spacing
 gtk_icon_view_get_selected_items
 gtk_icon_view_get_selection_mode
+gtk_icon_view_get_spacing
 gtk_icon_view_get_text_column
-gtk_icon_view_get_type
+gtk_icon_view_get_type G_GNUC_CONST
+gtk_icon_view_get_visible_range
 gtk_icon_view_item_activated
 gtk_icon_view_new
 gtk_icon_view_new_with_model
 gtk_icon_view_path_is_selected
+gtk_icon_view_scroll_to_path
 gtk_icon_view_select_all
 gtk_icon_view_selected_foreach
 gtk_icon_view_select_path
+gtk_icon_view_set_column_spacing
+gtk_icon_view_set_columns
+gtk_icon_view_set_cursor
+gtk_icon_view_set_item_width
+gtk_icon_view_set_margin
 gtk_icon_view_set_markup_column
 gtk_icon_view_set_model
 gtk_icon_view_set_orientation
 gtk_icon_view_set_pixbuf_column
+gtk_icon_view_set_row_spacing
 gtk_icon_view_set_selection_mode
+gtk_icon_view_set_spacing
 gtk_icon_view_set_text_column
 gtk_icon_view_unselect_all
 gtk_icon_view_unselect_path
-gtk_identifier_get_type
-gtk_idle_add
-gtk_idle_add_full
-gtk_idle_add_priority
-gtk_idle_remove
-gtk_idle_remove_by_data
+gtk_icon_view_enable_model_drag_source
+gtk_icon_view_enable_model_drag_dest
+gtk_icon_view_unset_model_drag_source
+gtk_icon_view_unset_model_drag_dest
+gtk_icon_view_set_reorderable
+gtk_icon_view_get_reorderable
+gtk_icon_view_set_drag_dest_item
+gtk_icon_view_get_drag_dest_item
+gtk_icon_view_get_dest_item_at_pos
+gtk_icon_view_create_drag_icon
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IMAGE_H__)
+#if IN_FILE(__GTK_IMAGE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_image_get
+gtk_image_set
+#endif
 gtk_image_get_animation
 gtk_image_get_icon_name
 gtk_image_get_icon_set
@@ -1120,26 +1727,24 @@ gtk_image_get_pixel_size
 gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_storage_type
-gtk_image_get_type
-gtk_image_menu_item_get_image
-gtk_image_menu_item_get_type
-gtk_image_menu_item_new
-gtk_image_menu_item_new_from_stock
-gtk_image_menu_item_new_with_label
-gtk_image_menu_item_new_with_mnemonic
-gtk_image_menu_item_set_image
+gtk_image_get_type G_GNUC_CONST
 gtk_image_new
 gtk_image_new_from_animation
-gtk_image_new_from_file
+gtk_image_new_from_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_image_new_from_file_utf8
+#endif
 gtk_image_new_from_icon_name
 gtk_image_new_from_icon_set
 gtk_image_new_from_image
 gtk_image_new_from_pixbuf
 gtk_image_new_from_pixmap
 gtk_image_new_from_stock
-gtk_image_set
 gtk_image_set_from_animation
-gtk_image_set_from_file
+gtk_image_set_from_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_image_set_from_file_utf8
+#endif
 gtk_image_set_from_icon_name
 gtk_image_set_from_icon_set
 gtk_image_set_from_image
@@ -1147,50 +1752,76 @@ gtk_image_set_from_pixbuf
 gtk_image_set_from_pixmap
 gtk_image_set_from_stock
 gtk_image_set_pixel_size
-gtk_image_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IMAGE_MENU_ITEM_H__)
+#if IN_FILE(__GTK_IMAGE_MENU_ITEM_C__)
+gtk_image_menu_item_get_image
+gtk_image_menu_item_get_type G_GNUC_CONST
+gtk_image_menu_item_new
+gtk_image_menu_item_new_from_stock
+gtk_image_menu_item_new_with_label
+gtk_image_menu_item_new_with_mnemonic
+gtk_image_menu_item_set_image
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_CONTEXT_H__)
+#if IN_FILE(__GTK_IM_CONTEXT_C__)
 gtk_im_context_delete_surrounding
 gtk_im_context_filter_keypress
 gtk_im_context_focus_in
 gtk_im_context_focus_out
 gtk_im_context_get_preedit_string
 gtk_im_context_get_surrounding
-gtk_im_context_get_type
+gtk_im_context_get_type G_GNUC_CONST
 gtk_im_context_reset
 gtk_im_context_set_client_window
 gtk_im_context_set_cursor_location
 gtk_im_context_set_surrounding
 gtk_im_context_set_use_preedit
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_CONTEXT_SIMPLE_H__)
+#if IN_FILE(__GTK_IM_CONTEXT_SIMPLE_C__)
 gtk_im_context_simple_add_table
-gtk_im_context_simple_get_type
+gtk_im_context_simple_get_type G_GNUC_CONST
 gtk_im_context_simple_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_MULTICONTEXT_H__)
+#if IN_FILE(__GTK_IM_MULTICONTEXT_C__)
 gtk_im_multicontext_append_menuitems
-gtk_im_multicontext_get_type
+gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
-gtk_im_preedit_style_get_type
-gtk_im_status_style_get_type
-gtk_init
-#ifdef G_OS_WIN32
-gtk_init_abi_check
 #endif
-gtk_init_add
-gtk_init_check
-#ifdef G_OS_WIN32
-gtk_init_check_abi_check
-#endif
-gtk_init_with_args
-gtk_input_add_full
-gtk_input_dialog_get_type
-gtk_input_dialog_new
-gtk_input_remove
-#ifdef INCLUDE_VARIABLES
-gtk_interface_age
 #endif
+
+#if IN_HEADER(__GTK_INVISIBLE_H__)
+#if IN_FILE(__GTK_INVISIBLE_C__)
 gtk_invisible_get_screen
-gtk_invisible_get_type
+gtk_invisible_get_type G_GNUC_CONST
 gtk_invisible_new
 gtk_invisible_new_for_screen
 gtk_invisible_set_screen
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ITEM_H__)
+#if IN_FILE(__GTK_ITEM_C__)
 gtk_item_deselect
+gtk_item_get_type G_GNUC_CONST
+gtk_item_select
+gtk_item_toggle
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ITEM__FACTORY_H__)
+#if IN_FILE(__GTK_ITEM_FACTORY_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_item_factories_path_delete
 gtk_item_factory_add_foreign
 gtk_item_factory_construct
@@ -1205,7 +1836,7 @@ gtk_item_factory_from_path
 gtk_item_factory_from_widget
 gtk_item_factory_get_item
 gtk_item_factory_get_item_by_action
-gtk_item_factory_get_type
+gtk_item_factory_get_type G_GNUC_CONST
 gtk_item_factory_get_widget
 gtk_item_factory_get_widget_by_action
 gtk_item_factory_new
@@ -1215,13 +1846,17 @@ gtk_item_factory_popup_data
 gtk_item_factory_popup_data_from_widget
 gtk_item_factory_popup_with_data
 gtk_item_factory_set_translate_func
-gtk_item_get_type
-gtk_item_select
-gtk_item_toggle
-gtk_justification_get_type
-gtk_key_snooper_install
-gtk_key_snooper_remove
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LABEL_H__)
+#if IN_FILE(__GTK_LABEL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_label_get
+gtk_label_parse_uline
+#endif
+gtk_label_get_angle
 gtk_label_get_attributes
 gtk_label_get_ellipsize
 gtk_label_get_justify
@@ -1229,20 +1864,21 @@ gtk_label_get_label
 gtk_label_get_layout
 gtk_label_get_layout_offsets
 gtk_label_get_line_wrap
+gtk_label_get_max_width_chars
 gtk_label_get_mnemonic_keyval
 gtk_label_get_mnemonic_widget
 gtk_label_get_selectable
 gtk_label_get_selection_bounds
 gtk_label_get_single_line_mode
 gtk_label_get_text
-gtk_label_get_type
+gtk_label_get_type G_GNUC_CONST
 gtk_label_get_use_markup
 gtk_label_get_use_underline
 gtk_label_get_width_chars
 gtk_label_new
 gtk_label_new_with_mnemonic
-gtk_label_parse_uline
 gtk_label_select_region
+gtk_label_set_angle
 gtk_label_set_attributes
 gtk_label_set_ellipsize
 gtk_label_set_justify
@@ -1250,6 +1886,7 @@ gtk_label_set_label
 gtk_label_set_line_wrap
 gtk_label_set_markup
 gtk_label_set_markup_with_mnemonic
+gtk_label_set_max_width_chars
 gtk_label_set_mnemonic_widget
 gtk_label_set_pattern
 gtk_label_set_selectable
@@ -1259,10 +1896,14 @@ gtk_label_set_text_with_mnemonic
 gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_width_chars
-gtk_layout_freeze
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LAYOUT_H__)
+#if IN_FILE(__GTK_LAYOUT_C__)
 gtk_layout_get_hadjustment
 gtk_layout_get_size
-gtk_layout_get_type
+gtk_layout_get_type G_GNUC_CONST
 gtk_layout_get_vadjustment
 gtk_layout_move
 gtk_layout_new
@@ -1270,20 +1911,23 @@ gtk_layout_put
 gtk_layout_set_hadjustment
 gtk_layout_set_size
 gtk_layout_set_vadjustment
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_layout_freeze
 gtk_layout_thaw
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_H__)
+#if IN_FILE(__GTK_LIST_C__)
 gtk_list_append_items
 gtk_list_child_position
 gtk_list_clear_items
 gtk_list_end_drag_selection
 gtk_list_end_selection
 gtk_list_extend_selection
-gtk_list_get_type
+gtk_list_get_type G_GNUC_CONST
 gtk_list_insert_items
-gtk_list_item_deselect
-gtk_list_item_get_type
-gtk_list_item_new
-gtk_list_item_new_with_label
-gtk_list_item_select
 gtk_list_new
 gtk_list_prepend_items
 gtk_list_remove_items
@@ -1295,12 +1939,36 @@ gtk_list_select_child
 gtk_list_select_item
 gtk_list_set_selection_mode
 gtk_list_start_selection
+gtk_list_toggle_add_mode
+gtk_list_toggle_focus_row
+gtk_list_toggle_row
+gtk_list_undo_selection
+gtk_list_unselect_all
+gtk_list_unselect_child
+gtk_list_unselect_item
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_ITEM_H__)
+#if IN_FILE(__GTK_LIST_ITEM_C__)
+gtk_list_item_deselect
+gtk_list_item_get_type G_GNUC_CONST
+gtk_list_item_new
+gtk_list_item_new_with_label
+gtk_list_item_select
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_STORE_H__)
+#if IN_FILE(__GTK_LIST_STORE_C__)
 gtk_list_store_append
 gtk_list_store_clear
-gtk_list_store_get_type
+gtk_list_store_get_type G_GNUC_CONST
 gtk_list_store_insert
 gtk_list_store_insert_after
 gtk_list_store_insert_before
+gtk_list_store_insert_with_values
+gtk_list_store_insert_with_valuesv
 gtk_list_store_iter_is_valid
 gtk_list_store_move_after
 gtk_list_store_move_before
@@ -1314,22 +1982,76 @@ gtk_list_store_set_column_types
 gtk_list_store_set_valist
 gtk_list_store_set_value
 gtk_list_store_swap
-gtk_list_toggle_add_mode
-gtk_list_toggle_focus_row
-gtk_list_toggle_row
-gtk_list_undo_selection
-gtk_list_unselect_all
-gtk_list_unselect_child
-gtk_list_unselect_item
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MAIN_H__)
+#if IN_FILE(__GTK_MAIN_C__)
+gtk_get_option_group
+gtk_get_current_event
+gtk_get_current_event_state
+gtk_get_current_event_time
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_exit
+gtk_idle_add
+gtk_idle_add_full
+gtk_idle_add_priority
+gtk_idle_remove
+gtk_idle_remove_by_data
+gtk_timeout_add
+gtk_timeout_add_full
+gtk_timeout_remove
+gtk_input_add_full
+gtk_input_remove
+#endif
+gtk_false G_GNUC_CONST
+gtk_true G_GNUC_CONST
+gtk_events_pending
+gtk_disable_setlocale
+gtk_set_locale
+gtk_check_version
+gtk_get_default_language
+gtk_get_event_widget
+gtk_grab_add
+gtk_grab_get_current
+gtk_grab_remove
+gtk_propagate_event
+gtk_quit_add
+gtk_quit_add_destroy
+gtk_quit_add_full
+gtk_quit_remove
+gtk_quit_remove_by_data
+gtk_key_snooper_install
+gtk_key_snooper_remove
+gtk_init
+#ifdef G_OS_WIN32
+gtk_init_abi_check
+#endif
+gtk_init_add
+gtk_init_check
+#ifdef G_OS_WIN32
+gtk_init_check_abi_check
+#endif
+gtk_init_with_args
+gtk_parse_args
 gtk_main
 gtk_main_do_event
 gtk_main_iteration
 gtk_main_iteration_do
 gtk_main_level
 gtk_main_quit
-#ifdef INCLUDE_VARIABLES
-gtk_major_version
 #endif
+#endif
+
+#if IN_HEADER(__GTK_INPUTDIALOG_H__)
+#if IN_FILE(__GTK_INPUTDIALOG_C__)
+gtk_input_dialog_get_type G_GNUC_CONST
+gtk_input_dialog_new
+#endif
+#endif
+
+#if IN_HEADER(__gtk_marshal_MARSHAL_H__)
+#if IN_FILE(__gtk_marshal_MARSHAL_C__)
 gtk_marshal_BOOLEAN__POINTER
 gtk_marshal_BOOLEAN__POINTER_INT_INT
 gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
@@ -1356,25 +2078,54 @@ gtk_marshal_VOID__STRING_INT_POINTER
 gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
 gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
 gtk_marshal_VOID__UINT_STRING
-gtk_match_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_BAR_H__)
+#if IN_FILE(__GTK_MENU_BAR_C__)
+gtk_menu_bar_get_type G_GNUC_CONST
+gtk_menu_bar_new
+gtk_menu_bar_get_child_pack_direction
+gtk_menu_bar_set_child_pack_direction
+gtk_menu_bar_get_pack_direction
+gtk_menu_bar_set_pack_direction
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_H__)
+#if IN_FILE(__GTK_MENU_C__)
 gtk_menu_attach
 gtk_menu_attach_to_widget
-gtk_menu_bar_get_type
-gtk_menu_bar_new
 gtk_menu_detach
-gtk_menu_direction_type_get_type
 gtk_menu_get_accel_group
 gtk_menu_get_active
 gtk_menu_get_attach_widget
 gtk_menu_get_for_attach_widget
 gtk_menu_get_tearoff_state
 gtk_menu_get_title
-gtk_menu_get_type
+gtk_menu_get_type G_GNUC_CONST
+gtk_menu_new
+gtk_menu_popdown
+gtk_menu_popup
+gtk_menu_reorder_child
+gtk_menu_reposition
+gtk_menu_set_accel_group
+gtk_menu_set_accel_path
+gtk_menu_set_active
+gtk_menu_set_monitor
+gtk_menu_set_screen
+gtk_menu_set_tearoff_state
+gtk_menu_set_title
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_ITEM_H__)
+#if IN_FILE(__GTK_MENU_ITEM_C__)
 gtk_menu_item_activate
 gtk_menu_item_deselect
 gtk_menu_item_get_right_justified
 gtk_menu_item_get_submenu
-gtk_menu_item_get_type
+gtk_menu_item_get_type G_GNUC_CONST
 gtk_menu_item_new
 gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
@@ -1385,52 +2136,60 @@ gtk_menu_item_set_right_justified
 gtk_menu_item_set_submenu
 gtk_menu_item_toggle_size_allocate
 gtk_menu_item_toggle_size_request
-gtk_menu_new
-gtk_menu_popdown
-gtk_menu_popup
-gtk_menu_reorder_child
-gtk_menu_reposition
-gtk_menu_set_accel_group
-gtk_menu_set_accel_path
-gtk_menu_set_active
-gtk_menu_set_monitor
-gtk_menu_set_screen
-gtk_menu_set_tearoff_state
-gtk_menu_set_title
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_SHELL_H__)
+#if IN_FILE(__GTK_MENU_SHELL_C__)
 gtk_menu_shell_activate_item
 gtk_menu_shell_append
 gtk_menu_shell_cancel
 gtk_menu_shell_deactivate
 gtk_menu_shell_deselect
-gtk_menu_shell_get_type
+gtk_menu_shell_get_type G_GNUC_CONST
 gtk_menu_shell_insert
 gtk_menu_shell_prepend
 gtk_menu_shell_select_first
 gtk_menu_shell_select_item
+gtk_menu_shell_set_take_focus
+gtk_menu_shell_get_take_focus
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_MENU_TOOL_BUTTON_C__)
 gtk_menu_tool_button_get_menu
-gtk_menu_tool_button_get_type
+gtk_menu_tool_button_get_type G_GNUC_CONST
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_arrow_tooltip
 gtk_menu_tool_button_set_menu
-gtk_message_dialog_format_secondary_markup
-gtk_message_dialog_format_secondary_text
-gtk_message_dialog_get_type
-gtk_message_dialog_new
-gtk_message_dialog_new_with_markup
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MESSAGE_DIALOG_H__)
+#if IN_FILE(__GTK_MESSAGE_DIALOG_C__)
+gtk_message_dialog_format_secondary_markup G_GNUC_PRINTF(2,3)
+gtk_message_dialog_format_secondary_text G_GNUC_PRINTF(2,3)
+gtk_message_dialog_get_type G_GNUC_CONST
+gtk_message_dialog_new G_GNUC_PRINTF(5,6)
+gtk_message_dialog_new_with_markup G_GNUC_PRINTF(5,6)
 gtk_message_dialog_set_markup
-gtk_message_type_get_type
-gtk_metric_type_get_type
-#ifdef INCLUDE_VARIABLES
-gtk_micro_version
-gtk_minor_version
 #endif
+#endif
+
+#if IN_HEADER(__GTK_MISC_H__)
+#if IN_FILE(__GTK_MISC_C__)
 gtk_misc_get_alignment
 gtk_misc_get_padding
-gtk_misc_get_type
+gtk_misc_get_type G_GNUC_CONST
 gtk_misc_set_alignment
 gtk_misc_set_padding
-gtk_movement_step_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_NOTEBOOK_H__)
+#if IN_FILE(__GTK_NOTEBOOK_C__)
 gtk_notebook_append_page
 gtk_notebook_append_page_menu
 gtk_notebook_get_current_page
@@ -1444,7 +2203,7 @@ gtk_notebook_get_show_tabs
 gtk_notebook_get_tab_label
 gtk_notebook_get_tab_label_text
 gtk_notebook_get_tab_pos
-gtk_notebook_get_type
+gtk_notebook_get_type G_GNUC_CONST
 gtk_notebook_insert_page
 gtk_notebook_insert_page_menu
 gtk_notebook_new
@@ -1459,110 +2218,124 @@ gtk_notebook_query_tab_label_packing
 gtk_notebook_remove_page
 gtk_notebook_reorder_child
 gtk_notebook_set_current_page
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_set_homogeneous_tabs
+gtk_notebook_set_tab_border
+gtk_notebook_set_tab_hborder
+gtk_notebook_set_tab_vborder
+#endif
 gtk_notebook_set_menu_label
 gtk_notebook_set_menu_label_text
 gtk_notebook_set_scrollable
 gtk_notebook_set_show_border
 gtk_notebook_set_show_tabs
-gtk_notebook_set_tab_border
-gtk_notebook_set_tab_hborder
 gtk_notebook_set_tab_label
 gtk_notebook_set_tab_label_packing
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
-gtk_notebook_set_tab_vborder
-gtk_notebook_tab_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OBJECT_H__)
+#if IN_FILE(__GTK_OBJECT_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_object_add_arg_type
-gtk_object_destroy
-gtk_object_flags_get_type
-gtk_object_get
+gtk_object_get G_GNUC_NULL_TERMINATED
+gtk_object_set G_GNUC_NULL_TERMINATED
 gtk_object_get_data
 gtk_object_get_data_by_id
-gtk_object_get_type
 gtk_object_get_user_data
-gtk_object_new
-gtk_object_ref
+gtk_object_new G_GNUC_NULL_TERMINATED
 gtk_object_remove_data
 gtk_object_remove_data_by_id
 gtk_object_remove_no_notify
 gtk_object_remove_no_notify_by_id
-gtk_object_set
+gtk_object_ref
+gtk_object_unref
+gtk_object_weakref
+gtk_object_weakunref
 gtk_object_set_data
 gtk_object_set_data_by_id
 gtk_object_set_data_by_id_full
 gtk_object_set_data_full
 gtk_object_set_user_data
+#endif
+gtk_object_destroy
+gtk_object_get_type G_GNUC_CONST
 gtk_object_sink
-gtk_object_unref
-gtk_object_weakref
-gtk_object_weakunref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OLD_EDITABLE_H__)
+#if IN_FILE(__GTK_OLD_EDITABLE_C__)
 gtk_old_editable_changed
 gtk_old_editable_claim_selection
-gtk_old_editable_get_type
+gtk_old_editable_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OPTION_MENU_H__)
+#if IN_FILE(__GTK_OPTION_MENU_C__)
 gtk_option_menu_get_history
 gtk_option_menu_get_menu
-gtk_option_menu_get_type
+gtk_option_menu_get_type G_GNUC_CONST
 gtk_option_menu_new
 gtk_option_menu_remove_menu
 gtk_option_menu_set_history
 gtk_option_menu_set_menu
-gtk_orientation_get_type
-gtk_pack_type_get_type
-gtk_paint_arrow
-gtk_paint_box
-gtk_paint_box_gap
-gtk_paint_check
-gtk_paint_diamond
-gtk_paint_expander
-gtk_paint_extension
-gtk_paint_flat_box
-gtk_paint_focus
-gtk_paint_handle
-gtk_paint_hline
-gtk_paint_layout
-gtk_paint_option
-gtk_paint_polygon
-gtk_paint_resize_grip
-gtk_paint_shadow
-gtk_paint_shadow_gap
-gtk_paint_slider
-gtk_paint_string
-gtk_paint_tab
-gtk_paint_vline
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PANED_H__)
+#if IN_FILE(__GTK_PANED_C__)
 gtk_paned_add1
 gtk_paned_add2
 gtk_paned_compute_position
 gtk_paned_get_child1
 gtk_paned_get_child2
 gtk_paned_get_position
-gtk_paned_get_type
+gtk_paned_get_type G_GNUC_CONST
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_set_position
-gtk_parse_args
-gtk_path_bar_get_type
-gtk_path_priority_type_get_type
-gtk_path_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PATH_BAR_H__)
+#if IN_FILE(__GTK_PATH_BAR_C__)
+gtk_path_bar_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PIXMAP_H__)
+#if IN_FILE(__GTK_PIXMAP_C__)
 gtk_pixmap_get
-gtk_pixmap_get_type
+gtk_pixmap_get_type G_GNUC_CONST
 gtk_pixmap_new
 gtk_pixmap_set
 gtk_pixmap_set_build_insensitive
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PLUG_H__)
+#if IN_FILE(__GTK_PLUG_C__)
 #ifdef GTK_WINDOWING_X11
 gtk_plug_construct
 gtk_plug_construct_for_display
 gtk_plug_get_id
-gtk_plug_get_type
+gtk_plug_get_type G_GNUC_CONST
 gtk_plug_new
 gtk_plug_new_for_display
 #endif
-gtk_policy_type_get_type
-gtk_position_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PREVIEW_H__)
+#if IN_FILE(__GTK_PREVIEW_C__)
 gtk_preview_draw_row
 gtk_preview_get_cmap
 gtk_preview_get_info
-gtk_preview_get_type
+gtk_preview_get_type G_GNUC_CONST
 gtk_preview_get_visual
 gtk_preview_new
 gtk_preview_put
@@ -1574,34 +2347,44 @@ gtk_preview_set_gamma
 gtk_preview_set_install_cmap
 gtk_preview_set_reserved
 gtk_preview_size
-gtk_preview_type_get_type
 gtk_preview_uninit
-gtk_private_flags_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PROGRESS_BAR_H__)
+#if IN_FILE(__GTK_PROGRESS_BAR_C__)
 gtk_progress_bar_get_fraction
 gtk_progress_bar_get_orientation
 gtk_progress_bar_get_pulse_step
 gtk_progress_bar_get_text
-gtk_progress_bar_get_type
+gtk_progress_bar_get_ellipsize
+gtk_progress_bar_get_type G_GNUC_CONST
 gtk_progress_bar_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_progress_bar_new_with_adjustment
-gtk_progress_bar_orientation_get_type
-gtk_progress_bar_pulse
-gtk_progress_bar_set_activity_blocks
-gtk_progress_bar_set_activity_step
 gtk_progress_bar_set_bar_style
 gtk_progress_bar_set_discrete_blocks
+gtk_progress_bar_set_activity_blocks
+gtk_progress_bar_set_activity_step
+gtk_progress_bar_update
+#endif
+gtk_progress_bar_pulse
 gtk_progress_bar_set_fraction
 gtk_progress_bar_set_orientation
 gtk_progress_bar_set_pulse_step
 gtk_progress_bar_set_text
-gtk_progress_bar_style_get_type
-gtk_progress_bar_update
+gtk_progress_bar_set_ellipsize
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PROGRESS_H__)
+#if IN_FILE(__GTK_PROGRESS_C__)
 gtk_progress_configure
 gtk_progress_get_current_percentage
 gtk_progress_get_current_text
 gtk_progress_get_percentage_from_value
 gtk_progress_get_text_from_value
-gtk_progress_get_type
+gtk_progress_get_type G_GNUC_CONST
 gtk_progress_get_value
 gtk_progress_set_activity_mode
 gtk_progress_set_adjustment
@@ -1610,19 +2393,23 @@ gtk_progress_set_percentage
 gtk_progress_set_show_text
 gtk_progress_set_text_alignment
 gtk_progress_set_value
-gtk_propagate_event
-gtk_quit_add
-gtk_quit_add_destroy
-gtk_quit_add_full
-gtk_quit_remove
-gtk_quit_remove_by_data
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_ACTION_H__)
+#if IN_FILE(__GTK_RADIO_ACTION_C__)
 gtk_radio_action_get_current_value
 gtk_radio_action_get_group
-gtk_radio_action_get_type
+gtk_radio_action_get_type G_GNUC_CONST
 gtk_radio_action_new
 gtk_radio_action_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_BUTTON_H__)
+#if IN_FILE(__GTK_RADIO_BUTTON_C__)
 gtk_radio_button_get_group
-gtk_radio_button_get_type
+gtk_radio_button_get_type G_GNUC_CONST
 gtk_radio_button_new
 gtk_radio_button_new_from_widget
 gtk_radio_button_new_with_label
@@ -1630,8 +2417,13 @@ gtk_radio_button_new_with_label_from_widget
 gtk_radio_button_new_with_mnemonic
 gtk_radio_button_new_with_mnemonic_from_widget
 gtk_radio_button_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_MENU_ITEM_H__)
+#if IN_FILE(__GTK_RADIO_MENU_ITEM_C__)
 gtk_radio_menu_item_get_group
-gtk_radio_menu_item_get_type
+gtk_radio_menu_item_get_type G_GNUC_CONST
 gtk_radio_menu_item_new
 gtk_radio_menu_item_new_from_widget
 gtk_radio_menu_item_new_with_label
@@ -1639,16 +2431,26 @@ gtk_radio_menu_item_new_with_label_from_widget
 gtk_radio_menu_item_new_with_mnemonic
 gtk_radio_menu_item_new_with_mnemonic_from_widget
 gtk_radio_menu_item_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_RADIO_TOOL_BUTTON_C__)
 gtk_radio_tool_button_get_group
-gtk_radio_tool_button_get_type
+gtk_radio_tool_button_get_type G_GNUC_CONST
 gtk_radio_tool_button_new
 gtk_radio_tool_button_new_from_stock
 gtk_radio_tool_button_new_from_widget
 gtk_radio_tool_button_new_with_stock_from_widget
 gtk_radio_tool_button_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RANGE_H__)
+#if IN_FILE(__GTK_RANGE_C__)
 gtk_range_get_adjustment
 gtk_range_get_inverted
-gtk_range_get_type
+gtk_range_get_type G_GNUC_CONST
 gtk_range_get_update_policy
 gtk_range_get_value
 gtk_range_set_adjustment
@@ -1657,13 +2459,22 @@ gtk_range_set_inverted
 gtk_range_set_range
 gtk_range_set_update_policy
 gtk_range_set_value
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RC_H__)
+#if IN_FILE(__GTK_RC_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_rc_add_class_style
-gtk_rc_add_default_file
 gtk_rc_add_widget_class_style
 gtk_rc_add_widget_name_style
+#endif
+gtk_rc_add_default_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_rc_add_default_file_utf8
+#endif
 gtk_rc_find_module_in_path
 gtk_rc_find_pixmap_in_path
-gtk_rc_flags_get_type
 gtk_rc_get_default_files
 gtk_rc_get_im_module_file
 gtk_rc_get_im_module_path
@@ -1671,66 +2482,84 @@ gtk_rc_get_module_dir
 gtk_rc_get_style
 gtk_rc_get_style_by_paths
 gtk_rc_get_theme_dir
-gtk_rc_parse
+gtk_rc_parse PRIVATE
+#ifdef G_OS_WIN32
+gtk_rc_parse_utf8
+#endif
 gtk_rc_parse_color
 gtk_rc_parse_priority
 gtk_rc_parse_state
 gtk_rc_parse_string
-gtk_rc_property_parse_border
-gtk_rc_property_parse_color
-gtk_rc_property_parse_enum
-gtk_rc_property_parse_flags
-gtk_rc_property_parse_requisition
 gtk_rc_reparse_all
 gtk_rc_reparse_all_for_settings
 gtk_rc_reset_styles
 gtk_rc_scanner_new
-gtk_rc_set_default_files
+gtk_rc_set_default_files PRIVATE
+#ifdef G_OS_WIN32
+gtk_rc_set_default_files_utf8
+#endif
 gtk_rc_style_copy
-gtk_rc_style_get_type
+gtk_rc_style_get_type G_GNUC_CONST
 gtk_rc_style_new
 gtk_rc_style_ref
 gtk_rc_style_unref
-gtk_rc_token_type_get_type
-gtk_relief_style_get_type
-gtk_requisition_copy
-gtk_requisition_free
-gtk_requisition_get_type
-gtk_resize_mode_get_type
-gtk_response_type_get_type
-gtk_rgb_to_hsv
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RULER_H__)
+#if IN_FILE(__GTK_RULER_C__)
 gtk_ruler_draw_pos
 gtk_ruler_draw_ticks
 gtk_ruler_get_metric
 gtk_ruler_get_range
-gtk_ruler_get_type
+gtk_ruler_get_type G_GNUC_CONST
 gtk_ruler_set_metric
 gtk_ruler_set_range
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCALE_H__)
+#if IN_FILE(__GTK_SCALE_C__)
 gtk_scale_get_digits
 gtk_scale_get_draw_value
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
-gtk_scale_get_type
+gtk_scale_get_type G_GNUC_CONST
 gtk_scale_get_value_pos
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
-gtk_scrollbar_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCROLLBAR_H__)
+#if IN_FILE(__GTK_SCROLLBAR_C__)
+gtk_scrollbar_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCROLLED_WINDOW_H__)
+#if IN_FILE(__GTK_SCROLLED_WINDOW_C__)
 gtk_scrolled_window_add_with_viewport
 gtk_scrolled_window_get_hadjustment
+gtk_scrolled_window_get_hscrollbar
 gtk_scrolled_window_get_placement
 gtk_scrolled_window_get_policy
 gtk_scrolled_window_get_shadow_type
-gtk_scrolled_window_get_type
+gtk_scrolled_window_get_type G_GNUC_CONST
 gtk_scrolled_window_get_vadjustment
+gtk_scrolled_window_get_vscrollbar
 gtk_scrolled_window_new
 gtk_scrolled_window_set_hadjustment
 gtk_scrolled_window_set_placement
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_set_shadow_type
 gtk_scrolled_window_set_vadjustment
-gtk_scroll_step_get_type
-gtk_scroll_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SELECTION_H__)
+#if IN_FILE(__GTK_SELECTION_C__)
 gtk_selection_add_target
 gtk_selection_add_targets
 gtk_selection_clear
@@ -1741,7 +2570,7 @@ gtk_selection_data_free
 gtk_selection_data_get_pixbuf
 gtk_selection_data_get_targets
 gtk_selection_data_get_text
-gtk_selection_data_get_type
+gtk_selection_data_get_type G_GNUC_CONST
 gtk_selection_data_get_uris
 gtk_selection_data_set
 gtk_selection_data_set_pixbuf
@@ -1749,30 +2578,66 @@ gtk_selection_data_set_text
 gtk_selection_data_set_uris
 gtk_selection_data_targets_include_image
 gtk_selection_data_targets_include_text
-gtk_selection_mode_get_type
 gtk_selection_owner_set
 gtk_selection_owner_set_for_display
 gtk_selection_remove_all
-gtk_separator_get_type
-gtk_separator_menu_item_get_type
+gtk_target_list_add
+gtk_target_list_add_image_targets
+gtk_target_list_add_table
+gtk_target_list_add_text_targets
+gtk_target_list_add_uri_targets
+gtk_target_list_find
+gtk_target_list_new
+gtk_target_list_ref
+gtk_target_list_remove
+gtk_target_list_unref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_H__)
+#if IN_FILE(__GTK_SEPARATOR_C__)
+gtk_separator_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_MENU_ITEM_H__)
+#if IN_FILE(__GTK_SEPARATOR_MENU_ITEM_C__)
+gtk_separator_menu_item_get_type G_GNUC_CONST
 gtk_separator_menu_item_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_TOOL_ITEM_H__)
+#if IN_FILE(__GTK_SEPARATOR_TOOL_ITEM_C__)
 gtk_separator_tool_item_get_draw
-gtk_separator_tool_item_get_type
+gtk_separator_tool_item_get_type G_GNUC_CONST
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
-gtk_set_locale
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SETTINGS_H__)
+#if IN_FILE(__GTK_SETTINGS_C__)
 gtk_settings_get_default
 gtk_settings_get_for_screen
-gtk_settings_get_type
+gtk_settings_get_type G_GNUC_CONST
 gtk_settings_install_property
 gtk_settings_install_property_parser
 gtk_settings_set_double_property
 gtk_settings_set_long_property
 gtk_settings_set_property_value
 gtk_settings_set_string_property
-gtk_shadow_type_get_type
-gtk_show_about_dialog
-gtk_side_type_get_type
+gtk_rc_property_parse_border
+gtk_rc_property_parse_color
+gtk_rc_property_parse_enum
+gtk_rc_property_parse_flags
+gtk_rc_property_parse_requisition
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SIGNAL_H__)
+#if IN_FILE(__GTK_SIGNAL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_signal_compat_matched
 gtk_signal_connect_full
 gtk_signal_connect_object_while_alive
@@ -1784,22 +2649,36 @@ gtk_signal_emitv
 gtk_signal_emitv_by_name
 gtk_signal_new
 gtk_signal_newv
-gtk_signal_run_type_get_type
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SIZE_GROUP_H__)
+#if IN_FILE(__GTK_SIZE_GROUP_C__)
 gtk_size_group_add_widget
 gtk_size_group_get_mode
-gtk_size_group_get_type
-gtk_size_group_mode_get_type
+gtk_size_group_get_type G_GNUC_CONST
 gtk_size_group_new
 gtk_size_group_remove_widget
 gtk_size_group_set_mode
+#endif
+#endif
+
+
+#if IN_HEADER(__GTK_SOCKET_H__)
+#if IN_FILE(__GTK_SOCKET_C__)
 #ifdef GTK_WINDOWING_X11
 gtk_socket_add_id
 gtk_socket_get_id
-gtk_socket_get_type
+gtk_socket_get_type G_GNUC_CONST
 gtk_socket_new
 gtk_socket_steal
 #endif
-gtk_sort_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SPIN_BUTTON_H__)
+#if IN_FILE(__GTK_SPIN_BUTTON_C__)
 gtk_spin_button_configure
 gtk_spin_button_get_adjustment
 gtk_spin_button_get_digits
@@ -1807,7 +2686,7 @@ gtk_spin_button_get_increments
 gtk_spin_button_get_numeric
 gtk_spin_button_get_range
 gtk_spin_button_get_snap_to_ticks
-gtk_spin_button_get_type
+gtk_spin_button_get_type G_GNUC_CONST
 gtk_spin_button_get_update_policy
 gtk_spin_button_get_value
 gtk_spin_button_get_value_as_int
@@ -1825,38 +2704,36 @@ gtk_spin_button_set_value
 gtk_spin_button_set_wrap
 gtk_spin_button_spin
 gtk_spin_button_update
-gtk_spin_button_update_policy_get_type
-gtk_spin_type_get_type
-gtk_state_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STATUSBAR_H__)
+#if IN_FILE(__GTK_STATUSBAR_C__)
 gtk_statusbar_get_context_id
 gtk_statusbar_get_has_resize_grip
-gtk_statusbar_get_type
+gtk_statusbar_get_type G_GNUC_CONST
 gtk_statusbar_new
 gtk_statusbar_pop
 gtk_statusbar_push
 gtk_statusbar_remove
 gtk_statusbar_set_has_resize_grip
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STOCK_H__)
+#if IN_FILE(__GTK_STOCK_C__)
 gtk_stock_add
 gtk_stock_add_static
 gtk_stock_item_copy
 gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
-gtk_style_apply_default_background
-gtk_style_attach
-gtk_style_copy
-gtk_style_detach
-gtk_style_get_font
-gtk_style_get_type
-gtk_style_lookup_icon_set
-gtk_style_new
-gtk_style_ref
-gtk_style_render_icon
-gtk_style_set_background
-gtk_style_set_font
-gtk_style_unref
-gtk_submenu_direction_get_type
-gtk_submenu_placement_get_type
+gtk_stock_set_translate_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TABLE_H__)
+#if IN_FILE(__GTK_TABLE_C__)
 gtk_table_attach
 gtk_table_attach_defaults
 gtk_table_get_col_spacing
@@ -1864,7 +2741,7 @@ gtk_table_get_default_col_spacing
 gtk_table_get_default_row_spacing
 gtk_table_get_homogeneous
 gtk_table_get_row_spacing
-gtk_table_get_type
+gtk_table_get_type G_GNUC_CONST
 gtk_table_new
 gtk_table_resize
 gtk_table_set_col_spacing
@@ -1872,30 +2749,65 @@ gtk_table_set_col_spacings
 gtk_table_set_homogeneous
 gtk_table_set_row_spacing
 gtk_table_set_row_spacings
-gtk_target_flags_get_type
-gtk_target_list_add
-gtk_target_list_add_image_targets
-gtk_target_list_add_table
-gtk_target_list_add_text_targets
-gtk_target_list_add_uri_targets
-gtk_target_list_find
-gtk_target_list_new
-gtk_target_list_ref
-gtk_target_list_remove
-gtk_target_list_unref
-gtk_tearoff_menu_item_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEAROFF_MENU_ITEM_H__)
+#if IN_FILE(__GTK_TEAROFF_MENU_ITEM_C__)
+gtk_tearoff_menu_item_get_type G_GNUC_CONST
 gtk_tearoff_menu_item_new
-gtk_text_anchored_child_set_layout
-#ifdef INCLUDE_VARIABLES
-gtk_text_attr_appearance_type
 #endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_TAG_H__)
+#if IN_FILE(__GTK_TEXT_TAG_C__)
 gtk_text_attributes_copy
 gtk_text_attributes_copy_values
-gtk_text_attributes_get_type
+gtk_text_attributes_get_type G_GNUC_CONST
 gtk_text_attributes_new
 gtk_text_attributes_ref
 gtk_text_attributes_unref
+gtk_text_tag_event
+gtk_text_tag_get_priority
+gtk_text_tag_get_type G_GNUC_CONST
+gtk_text_tag_new
+gtk_text_tag_set_priority
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_TAG_TABLE_H__)
+#if IN_FILE(__GTK_TEXT_TAG_TABLE_C__)
+gtk_text_tag_table_add
+gtk_text_tag_table_foreach
+gtk_text_tag_table_get_size
+gtk_text_tag_table_get_type G_GNUC_CONST
+gtk_text_tag_table_lookup
+gtk_text_tag_table_new
+gtk_text_tag_table_remove
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_H__)
+#if IN_FILE(__GTK_TEXT_C__)
 gtk_text_backward_delete
+gtk_text_forward_delete
+gtk_text_freeze
+gtk_text_get_length
+gtk_text_get_point
+gtk_text_get_type G_GNUC_CONST
+gtk_text_insert
+gtk_text_new
+gtk_text_set_adjustments
+gtk_text_set_editable
+gtk_text_set_line_wrap
+gtk_text_set_point
+gtk_text_set_word_wrap
+gtk_text_thaw
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_BUFFER_H__)
+#if IN_FILE(__GTK_TEXT_BUFFER_C__)
 gtk_text_buffer_add_selection_clipboard
 gtk_text_buffer_apply_tag
 gtk_text_buffer_apply_tag_by_name
@@ -1904,7 +2816,7 @@ gtk_text_buffer_begin_user_action
 gtk_text_buffer_copy_clipboard
 gtk_text_buffer_create_child_anchor
 gtk_text_buffer_create_mark
-gtk_text_buffer_create_tag
+gtk_text_buffer_create_tag G_GNUC_NULL_TERMINATED
 gtk_text_buffer_cut_clipboard
 gtk_text_buffer_delete
 gtk_text_buffer_delete_interactive
@@ -1931,7 +2843,7 @@ gtk_text_buffer_get_slice
 gtk_text_buffer_get_start_iter
 gtk_text_buffer_get_tag_table
 gtk_text_buffer_get_text
-gtk_text_buffer_get_type
+gtk_text_buffer_get_type G_GNUC_CONST
 gtk_text_buffer_insert
 gtk_text_buffer_insert_at_cursor
 gtk_text_buffer_insert_child_anchor
@@ -1940,8 +2852,8 @@ gtk_text_buffer_insert_interactive_at_cursor
 gtk_text_buffer_insert_pixbuf
 gtk_text_buffer_insert_range
 gtk_text_buffer_insert_range_interactive
-gtk_text_buffer_insert_with_tags
-gtk_text_buffer_insert_with_tags_by_name
+gtk_text_buffer_insert_with_tags G_GNUC_NULL_TERMINATED
+gtk_text_buffer_insert_with_tags_by_name G_GNUC_NULL_TERMINATED
 gtk_text_buffer_move_mark
 gtk_text_buffer_move_mark_by_name
 gtk_text_buffer_new
@@ -1954,27 +2866,17 @@ gtk_text_buffer_remove_tag_by_name
 gtk_text_buffer_select_range
 gtk_text_buffer_set_modified
 gtk_text_buffer_set_text
-gtk_text_byte_begins_utf8_char
-#ifdef INCLUDE_VARIABLES
-gtk_text_char_type
 #endif
-gtk_text_child_anchor_get_deleted
-gtk_text_child_anchor_get_type
-gtk_text_child_anchor_get_widgets
-gtk_text_child_anchor_new
-gtk_text_child_anchor_queue_resize
-gtk_text_child_anchor_register_child
-gtk_text_child_anchor_unregister_child
-#ifdef INCLUDE_VARIABLES
-gtk_text_child_type
 #endif
-gtk_text_direction_get_type
-gtk_text_forward_delete
-gtk_text_freeze
-gtk_text_get_length
-gtk_text_get_point
-gtk_text_get_type
-gtk_text_insert
+
+#if IN_HEADER(__GTK_TEXT_TYPES_H__)
+#if IN_FILE(__GTK_TEXT_TYPES_C__)
+gtk_text_byte_begins_utf8_char
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_ITER_H__)
+#if IN_FILE(__GTK_TEXT_ITER_C__)
 gtk_text_iter_backward_char
 gtk_text_iter_backward_chars
 gtk_text_iter_backward_cursor_position
@@ -1988,6 +2890,8 @@ gtk_text_iter_backward_sentence_starts
 gtk_text_iter_backward_to_tag_toggle
 gtk_text_iter_backward_visible_cursor_position
 gtk_text_iter_backward_visible_cursor_positions
+gtk_text_iter_backward_visible_line
+gtk_text_iter_backward_visible_lines
 gtk_text_iter_backward_visible_word_start
 gtk_text_iter_backward_visible_word_starts
 gtk_text_iter_backward_word_start
@@ -2017,6 +2921,8 @@ gtk_text_iter_forward_to_line_end
 gtk_text_iter_forward_to_tag_toggle
 gtk_text_iter_forward_visible_cursor_position
 gtk_text_iter_forward_visible_cursor_positions
+gtk_text_iter_forward_visible_line
+gtk_text_iter_forward_visible_lines
 gtk_text_iter_forward_visible_word_end
 gtk_text_iter_forward_visible_word_ends
 gtk_text_iter_forward_word_end
@@ -2039,7 +2945,7 @@ gtk_text_iter_get_slice
 gtk_text_iter_get_tags
 gtk_text_iter_get_text
 gtk_text_iter_get_toggled_tags
-gtk_text_iter_get_type
+gtk_text_iter_get_type G_GNUC_CONST
 gtk_text_iter_get_visible_line_index
 gtk_text_iter_get_visible_line_offset
 gtk_text_iter_get_visible_slice
@@ -2062,10 +2968,14 @@ gtk_text_iter_starts_line
 gtk_text_iter_starts_sentence
 gtk_text_iter_starts_word
 gtk_text_iter_toggles_tag
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_LAYOUT_H__)
+#if IN_FILE(__GTK_TEXT_LAYOUT_C__)
 gtk_text_layout_changed
 gtk_text_layout_clamp_iter_to_vrange
 gtk_text_layout_default_style_changed
-gtk_text_layout_draw
 gtk_text_layout_free_line_data
 gtk_text_layout_free_line_display
 gtk_text_layout_get_buffer
@@ -2073,13 +2983,14 @@ gtk_text_layout_get_cursor_locations
 gtk_text_layout_get_cursor_visible
 gtk_text_layout_get_iter_at_line
 gtk_text_layout_get_iter_at_pixel
+gtk_text_layout_get_iter_at_position
 gtk_text_layout_get_iter_location
 gtk_text_layout_get_line_at_y
 gtk_text_layout_get_line_display
 gtk_text_layout_get_lines
 gtk_text_layout_get_line_yrange
 gtk_text_layout_get_size
-gtk_text_layout_get_type
+gtk_text_layout_get_type G_GNUC_CONST
 gtk_text_layout_invalidate
 gtk_text_layout_is_valid
 gtk_text_layout_iter_starts_line
@@ -2103,46 +3014,58 @@ gtk_text_layout_validate_yrange
 gtk_text_layout_wrap
 gtk_text_layout_wrap_loop_end
 gtk_text_layout_wrap_loop_start
-#ifdef INCLUDE_VARIABLES
-gtk_text_left_mark_type
 #endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_CHILD_H__)
+#if IN_FILE(__GTK_TEXT_CHILD_C__)
+gtk_text_child_anchor_get_deleted
+gtk_text_child_anchor_get_type G_GNUC_CONST
+gtk_text_child_anchor_get_widgets
+gtk_text_child_anchor_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_LAYOUT_H__)
+#if IN_FILE(__GTK_TEXT_CHILD_C__)
+gtk_text_child_anchor_queue_resize
+gtk_text_child_anchor_register_child
+gtk_text_child_anchor_unregister_child
+gtk_text_anchored_child_set_layout
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_DISPLAY_H__)
+#if IN_FILE(__GTK_TEXT_DISPLAY_C__)
+gtk_text_layout_draw
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_SEGMENT_H__)
+#if IN_FILE(__GTK_TEXT_SEGMENT_C__)
 gtk_text_line_segment_split
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_MARK_H__)
+#if IN_FILE(__GTK_TEXT_MARK_C__)
 gtk_text_mark_get_buffer
 gtk_text_mark_get_deleted
 gtk_text_mark_get_left_gravity
 gtk_text_mark_get_name
-gtk_text_mark_get_type
+gtk_text_mark_get_type G_GNUC_CONST
 gtk_text_mark_get_visible
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_MARK_H__)
+#if IN_FILE(__GTK_TEXT_BTREE_C__)
 gtk_text_mark_set_visible
-gtk_text_new
-#ifdef INCLUDE_VARIABLES
-gtk_text_pixbuf_type
-gtk_text_right_mark_type
 #endif
-gtk_text_search_flags_get_type
-gtk_text_set_adjustments
-gtk_text_set_editable
-gtk_text_set_line_wrap
-gtk_text_set_point
-gtk_text_set_word_wrap
-gtk_text_tag_event
-gtk_text_tag_get_priority
-gtk_text_tag_get_type
-gtk_text_tag_new
-gtk_text_tag_set_priority
-gtk_text_tag_table_add
-gtk_text_tag_table_foreach
-gtk_text_tag_table_get_size
-gtk_text_tag_table_get_type
-gtk_text_tag_table_lookup
-gtk_text_tag_table_new
-gtk_text_tag_table_remove
-gtk_text_thaw
-#ifdef INCLUDE_VARIABLES
-gtk_text_toggle_off_type
-gtk_text_toggle_on_type
-gtk_text_unknown_char_utf8
 #endif
+
+#if IN_HEADER(__GTK_TEXT_VIEW_H__)
+#if IN_FILE(__GTK_TEXT_VIEW_C__)
 gtk_text_view_add_child_at_anchor
 gtk_text_view_add_child_in_window
 gtk_text_view_backward_display_line
@@ -2158,6 +3081,7 @@ gtk_text_view_get_default_attributes
 gtk_text_view_get_editable
 gtk_text_view_get_indent
 gtk_text_view_get_iter_at_location
+gtk_text_view_get_iter_at_position
 gtk_text_view_get_iter_location
 gtk_text_view_get_justification
 gtk_text_view_get_left_margin
@@ -2169,7 +3093,7 @@ gtk_text_view_get_pixels_below_lines
 gtk_text_view_get_pixels_inside_wrap
 gtk_text_view_get_right_margin
 gtk_text_view_get_tabs
-gtk_text_view_get_type
+gtk_text_view_get_type G_GNUC_CONST
 gtk_text_view_get_visible_rect
 gtk_text_view_get_window
 gtk_text_view_get_window_type
@@ -2200,30 +3124,46 @@ gtk_text_view_set_tabs
 gtk_text_view_set_wrap_mode
 gtk_text_view_starts_display_line
 gtk_text_view_window_to_buffer_coords
-gtk_text_window_type_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_THEMES_H__)
+#if IN_FILE(__GTK_THEMES_C__)
 gtk_theme_engine_create_rc_style
 gtk_theme_engine_get
-gtk_theme_engine_get_type
-gtk_timeout_add
-gtk_timeout_add_full
-gtk_timeout_remove
-gtk_tips_query_get_type
+gtk_theme_engine_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TIPS_QUERY_H__)
+#if IN_FILE(__GTK_TIPS_QUERY_C__)
+gtk_tips_query_get_type G_GNUC_CONST
 gtk_tips_query_new
 gtk_tips_query_set_caller
 gtk_tips_query_set_labels
 gtk_tips_query_start_query
 gtk_tips_query_stop_query
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_ACTION_H__)
+#if IN_FILE(__GTK_TOGGLE_ACTION_C__)
 gtk_toggle_action_get_active
 gtk_toggle_action_get_draw_as_radio
-gtk_toggle_action_get_type
+gtk_toggle_action_get_type G_GNUC_CONST
 gtk_toggle_action_new
 gtk_toggle_action_set_active
 gtk_toggle_action_set_draw_as_radio
 gtk_toggle_action_toggled
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_BUTTON_H__)
+#if IN_FILE(__GTK_TOGGLE_BUTTON_C__)
 gtk_toggle_button_get_active
 gtk_toggle_button_get_inconsistent
 gtk_toggle_button_get_mode
-gtk_toggle_button_get_type
+gtk_toggle_button_get_type G_GNUC_CONST
 gtk_toggle_button_new
 gtk_toggle_button_new_with_label
 gtk_toggle_button_new_with_mnemonic
@@ -2231,16 +3171,39 @@ gtk_toggle_button_set_active
 gtk_toggle_button_set_inconsistent
 gtk_toggle_button_set_mode
 gtk_toggle_button_toggled
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_TOGGLE_TOOL_BUTTON_C__)
 gtk_toggle_tool_button_get_active
-gtk_toggle_tool_button_get_type
+gtk_toggle_tool_button_get_type G_GNUC_CONST
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOLBAR_H__)
+#if IN_FILE(__GTK_TOOLBAR_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_toolbar_append_element
+gtk_toolbar_set_icon_size
+gtk_toolbar_unset_icon_size
 gtk_toolbar_append_item
+gtk_toolbar_prepend_element
+gtk_toolbar_prepend_item
+gtk_toolbar_insert_element
+gtk_toolbar_insert_item
+gtk_toolbar_insert_space
+gtk_toolbar_insert_stock
 gtk_toolbar_append_space
+gtk_toolbar_prepend_space
+gtk_toolbar_remove_space
 gtk_toolbar_append_widget
-gtk_toolbar_child_type_get_type
+gtk_toolbar_insert_widget
+gtk_toolbar_prepend_widget
+#endif
 gtk_toolbar_get_drop_index
 gtk_toolbar_get_icon_size
 gtk_toolbar_get_item_index
@@ -2251,42 +3214,40 @@ gtk_toolbar_get_relief_style
 gtk_toolbar_get_show_arrow
 gtk_toolbar_get_style
 gtk_toolbar_get_tooltips
-gtk_toolbar_get_type
+gtk_toolbar_get_type G_GNUC_CONST
 gtk_toolbar_insert
-gtk_toolbar_insert_element
-gtk_toolbar_insert_item
-gtk_toolbar_insert_space
-gtk_toolbar_insert_stock
-gtk_toolbar_insert_widget
 gtk_toolbar_new
-gtk_toolbar_prepend_element
-gtk_toolbar_prepend_item
-gtk_toolbar_prepend_space
-gtk_toolbar_prepend_widget
-gtk_toolbar_remove_space
 gtk_toolbar_set_drop_highlight_item
-gtk_toolbar_set_icon_size
 gtk_toolbar_set_orientation
 gtk_toolbar_set_show_arrow
 gtk_toolbar_set_style
 gtk_toolbar_set_tooltips
-gtk_toolbar_space_style_get_type
-gtk_toolbar_style_get_type
-gtk_toolbar_unset_icon_size
 gtk_toolbar_unset_style
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_TOOL_BUTTON_C__)
+gtk_tool_button_get_icon_name
 gtk_tool_button_get_icon_widget
 gtk_tool_button_get_label
 gtk_tool_button_get_label_widget
 gtk_tool_button_get_stock_id
-gtk_tool_button_get_type
+gtk_tool_button_get_type G_GNUC_CONST
 gtk_tool_button_get_use_underline
 gtk_tool_button_new
 gtk_tool_button_new_from_stock
+gtk_tool_button_set_icon_name
 gtk_tool_button_set_icon_widget
 gtk_tool_button_set_label
 gtk_tool_button_set_label_widget
 gtk_tool_button_set_stock_id
 gtk_tool_button_set_use_underline
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOL_ITEM_H__)
+#if IN_FILE(__GTK_TOOL_ITEM_C__)
 gtk_tool_item_get_expand
 gtk_tool_item_get_homogeneous
 gtk_tool_item_get_icon_size
@@ -2295,7 +3256,7 @@ gtk_tool_item_get_orientation
 gtk_tool_item_get_proxy_menu_item
 gtk_tool_item_get_relief_style
 gtk_tool_item_get_toolbar_style
-gtk_tool_item_get_type
+gtk_tool_item_get_type G_GNUC_CONST
 gtk_tool_item_get_use_drag_window
 gtk_tool_item_get_visible_horizontal
 gtk_tool_item_get_visible_vertical
@@ -2310,53 +3271,79 @@ gtk_tool_item_set_tooltip
 gtk_tool_item_set_use_drag_window
 gtk_tool_item_set_visible_horizontal
 gtk_tool_item_set_visible_vertical
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOLTIPS_H__)
+#if IN_FILE(__GTK_TOOLTIPS_C__)
 gtk_tooltips_data_get
 gtk_tooltips_disable
 gtk_tooltips_enable
 gtk_tooltips_force_window
 gtk_tooltips_get_info_from_tip_window
-gtk_tooltips_get_type
+gtk_tooltips_get_type G_GNUC_CONST
 gtk_tooltips_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_tooltips_set_delay
+#endif
 gtk_tooltips_set_tip
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_H__)
+#if IN_FILE(__GTK_TREE_C__)
 gtk_tree_append
 gtk_tree_child_position
 gtk_tree_clear_items
+gtk_tree_get_type G_GNUC_CONST
+gtk_tree_insert
+gtk_tree_prepend
+gtk_tree_remove_item
+gtk_tree_remove_items
+gtk_tree_select_child
+gtk_tree_select_item
+gtk_tree_set_selection_mode
+gtk_tree_set_view_lines
+gtk_tree_set_view_mode
+gtk_tree_unselect_child
+gtk_tree_unselect_item
+gtk_tree_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_DND_H__)
+#if IN_FILE(__GTK_TREE_DND_C__)
 gtk_tree_drag_dest_drag_data_received
-gtk_tree_drag_dest_get_type
+gtk_tree_drag_dest_get_type G_GNUC_CONST
 gtk_tree_drag_dest_row_drop_possible
 gtk_tree_drag_source_drag_data_delete
 gtk_tree_drag_source_drag_data_get
-gtk_tree_drag_source_get_type
+gtk_tree_drag_source_get_type G_GNUC_CONST
 gtk_tree_drag_source_row_draggable
 gtk_tree_get_row_drag_data
-gtk_tree_get_type
-gtk_tree_insert
+gtk_tree_set_row_drag_data
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_ITEM_H__)
+#if IN_FILE(__GTK_TREE_ITEM_C__)
 gtk_tree_item_collapse
 gtk_tree_item_deselect
 gtk_tree_item_expand
-gtk_tree_item_get_type
+gtk_tree_item_get_type G_GNUC_CONST
 gtk_tree_item_new
 gtk_tree_item_new_with_label
 gtk_tree_item_remove_subtree
 gtk_tree_item_select
 gtk_tree_item_set_subtree
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_H__)
+#if IN_FILE(__GTK_TREE_MODEL_C__)
 gtk_tree_iter_copy
 gtk_tree_iter_free
-gtk_tree_iter_get_type
-gtk_tree_model_filter_clear_cache
-gtk_tree_model_filter_convert_child_iter_to_iter
-gtk_tree_model_filter_convert_child_path_to_path
-gtk_tree_model_filter_convert_iter_to_child_iter
-gtk_tree_model_filter_convert_path_to_child_path
-gtk_tree_model_filter_get_model
-gtk_tree_model_filter_get_type
-gtk_tree_model_filter_new
-gtk_tree_model_filter_refilter
-gtk_tree_model_filter_set_modify_func
-gtk_tree_model_filter_set_visible_column
-gtk_tree_model_filter_set_visible_func
-gtk_tree_model_flags_get_type
+gtk_tree_iter_get_type G_GNUC_CONST
 gtk_tree_model_foreach
 gtk_tree_model_get
 gtk_tree_model_get_column_type
@@ -2367,7 +3354,7 @@ gtk_tree_model_get_iter_from_string
 gtk_tree_model_get_n_columns
 gtk_tree_model_get_path
 gtk_tree_model_get_string_from_iter
-gtk_tree_model_get_type
+gtk_tree_model_get_type G_GNUC_CONST
 gtk_tree_model_get_valist
 gtk_tree_model_get_value
 gtk_tree_model_iter_children
@@ -2382,18 +3369,7 @@ gtk_tree_model_row_deleted
 gtk_tree_model_row_has_child_toggled
 gtk_tree_model_row_inserted
 gtk_tree_model_rows_reordered
-gtk_tree_model_sort_clear_cache
-gtk_tree_model_sort_convert_child_iter_to_iter
-gtk_tree_model_sort_convert_child_path_to_path
-gtk_tree_model_sort_convert_iter_to_child_iter
-gtk_tree_model_sort_convert_path_to_child_path
-gtk_tree_model_sort_get_model
-gtk_tree_model_sort_get_type
-gtk_tree_model_sort_iter_is_valid
-gtk_tree_model_sort_new_with_model
-gtk_tree_model_sort_reset_default_sort_func
 gtk_tree_model_unref_node
-gtk_tree_new
 gtk_tree_path_append_index
 gtk_tree_path_compare
 gtk_tree_path_copy
@@ -2401,7 +3377,7 @@ gtk_tree_path_down
 gtk_tree_path_free
 gtk_tree_path_get_depth
 gtk_tree_path_get_indices
-gtk_tree_path_get_type
+gtk_tree_path_get_type G_GNUC_CONST
 gtk_tree_path_is_ancestor
 gtk_tree_path_is_descendant
 gtk_tree_path_new
@@ -2413,26 +3389,59 @@ gtk_tree_path_prepend_index
 gtk_tree_path_prev
 gtk_tree_path_to_string
 gtk_tree_path_up
-gtk_tree_prepend
-gtk_tree_remove_item
-gtk_tree_remove_items
 gtk_tree_row_reference_copy
 gtk_tree_row_reference_deleted
 gtk_tree_row_reference_free
 gtk_tree_row_reference_get_path
-gtk_tree_row_reference_get_type
+gtk_tree_row_reference_get_type G_GNUC_CONST
 gtk_tree_row_reference_inserted
 gtk_tree_row_reference_new
 gtk_tree_row_reference_new_proxy
 gtk_tree_row_reference_reordered
 gtk_tree_row_reference_valid
-gtk_tree_select_child
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_SORT_H__)
+#if IN_FILE(__GTK_TREE_MODEL_SORT_C__)
+gtk_tree_model_sort_clear_cache
+gtk_tree_model_sort_convert_child_iter_to_iter
+gtk_tree_model_sort_convert_child_path_to_path
+gtk_tree_model_sort_convert_iter_to_child_iter
+gtk_tree_model_sort_convert_path_to_child_path
+gtk_tree_model_sort_get_model
+gtk_tree_model_sort_get_type G_GNUC_CONST
+gtk_tree_model_sort_iter_is_valid
+gtk_tree_model_sort_new_with_model
+gtk_tree_model_sort_reset_default_sort_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_FILTER_H__)
+#if IN_FILE(__GTK_TREE_MODEL_FILTER_C__)
+gtk_tree_model_filter_clear_cache
+gtk_tree_model_filter_convert_child_iter_to_iter
+gtk_tree_model_filter_convert_child_path_to_path
+gtk_tree_model_filter_convert_iter_to_child_iter
+gtk_tree_model_filter_convert_path_to_child_path
+gtk_tree_model_filter_get_model
+gtk_tree_model_filter_get_type G_GNUC_CONST
+gtk_tree_model_filter_new
+gtk_tree_model_filter_refilter
+gtk_tree_model_filter_set_modify_func
+gtk_tree_model_filter_set_visible_column
+gtk_tree_model_filter_set_visible_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_SELECTION_H__)
+#if IN_FILE(__GTK_TREE_SELECTION_C__)
 gtk_tree_selection_count_selected_rows
 gtk_tree_selection_get_mode
 gtk_tree_selection_get_selected
 gtk_tree_selection_get_selected_rows
 gtk_tree_selection_get_tree_view
-gtk_tree_selection_get_type
+gtk_tree_selection_get_type G_GNUC_CONST
 gtk_tree_selection_get_user_data
 gtk_tree_selection_iter_is_selected
 gtk_tree_selection_path_is_selected
@@ -2447,21 +3456,26 @@ gtk_tree_selection_unselect_all
 gtk_tree_selection_unselect_iter
 gtk_tree_selection_unselect_path
 gtk_tree_selection_unselect_range
-gtk_tree_select_item
-gtk_tree_set_row_drag_data
-gtk_tree_set_selection_mode
-gtk_tree_set_view_lines
-gtk_tree_set_view_mode
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_SORTABLE_H__)
+#if IN_FILE(__GTK_TREE_SORTABLE_C__)
 gtk_tree_sortable_get_sort_column_id
-gtk_tree_sortable_get_type
+gtk_tree_sortable_get_type G_GNUC_CONST
 gtk_tree_sortable_has_default_sort_func
 gtk_tree_sortable_set_default_sort_func
 gtk_tree_sortable_set_sort_column_id
 gtk_tree_sortable_set_sort_func
 gtk_tree_sortable_sort_column_changed
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_STORE_H__)
+#if IN_FILE(__GTK_TREE_STORE_C__)
 gtk_tree_store_append
 gtk_tree_store_clear
-gtk_tree_store_get_type
+gtk_tree_store_get_type G_GNUC_CONST
 gtk_tree_store_insert
 gtk_tree_store_insert_after
 gtk_tree_store_insert_before
@@ -2480,11 +3494,11 @@ gtk_tree_store_set_column_types
 gtk_tree_store_set_valist
 gtk_tree_store_set_value
 gtk_tree_store_swap
-gtk_tree_unselect_child
-gtk_tree_unselect_item
-gtk_tree_view_append_column
-gtk_tree_view_collapse_all
-gtk_tree_view_collapse_row
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_VIEW_COLUMN_H__)
+#if IN_FILE(__GTK_TREE_VIEW_COLUMN_C__)
 gtk_tree_view_column_add_attribute
 gtk_tree_view_column_cell_get_position
 gtk_tree_view_column_cell_get_size
@@ -2509,15 +3523,14 @@ gtk_tree_view_column_get_sort_indicator
 gtk_tree_view_column_get_sort_order
 gtk_tree_view_column_get_spacing
 gtk_tree_view_column_get_title
-gtk_tree_view_column_get_type
+gtk_tree_view_column_get_type G_GNUC_CONST
 gtk_tree_view_column_get_visible
 gtk_tree_view_column_get_widget
 gtk_tree_view_column_get_width
 gtk_tree_view_column_new
-gtk_tree_view_column_new_with_attributes
+gtk_tree_view_column_new_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_column_pack_end
 gtk_tree_view_column_pack_start
-gtk_tree_view_columns_autosize
 gtk_tree_view_column_set_alignment
 gtk_tree_view_column_set_attributes
 gtk_tree_view_column_set_cell_data_func
@@ -2536,9 +3549,15 @@ gtk_tree_view_column_set_spacing
 gtk_tree_view_column_set_title
 gtk_tree_view_column_set_visible
 gtk_tree_view_column_set_widget
-gtk_tree_view_column_sizing_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_VIEW_H__)
+#if IN_FILE(__GTK_TREE_VIEW_C__)
+gtk_tree_view_append_column
+gtk_tree_view_collapse_all
+gtk_tree_view_collapse_row
 gtk_tree_view_create_row_drag_icon
-gtk_tree_view_drop_position_get_type
 gtk_tree_view_enable_model_drag_dest
 gtk_tree_view_enable_model_drag_source
 gtk_tree_view_expand_all
@@ -2567,14 +3586,13 @@ gtk_tree_view_get_rules_hint
 gtk_tree_view_get_search_column
 gtk_tree_view_get_search_equal_func
 gtk_tree_view_get_selection
-gtk_tree_view_get_type
+gtk_tree_view_get_type G_GNUC_CONST
 gtk_tree_view_get_vadjustment
 gtk_tree_view_get_visible_rect
 gtk_tree_view_insert_column
-gtk_tree_view_insert_column_with_attributes
+gtk_tree_view_insert_column_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_insert_column_with_data_func
 gtk_tree_view_map_expanded_rows
-gtk_tree_view_mode_get_type
 gtk_tree_view_move_column_after
 gtk_tree_view_new
 gtk_tree_view_new_with_model
@@ -2607,8 +3625,15 @@ gtk_tree_view_tree_to_widget_coords
 gtk_tree_view_unset_rows_drag_dest
 gtk_tree_view_unset_rows_drag_source
 gtk_tree_view_widget_to_tree_coords
-gtk_true
+gtk_tree_view_columns_autosize
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TYPE_UTILS_H__)
+#if IN_FILE(__GTK_TYPE_UTILS_C__)
 gtk_type_class
+gtk_identifier_get_type G_GNUC_CONST
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_type_enum_find_value
 gtk_type_enum_get_values
 gtk_type_flags_find_value
@@ -2616,8 +3641,17 @@ gtk_type_flags_get_values
 gtk_type_init
 gtk_type_new
 gtk_type_unique
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_UI_MANAGER_H__)
+#if IN_FILE(__GTK_UI_MANAGER_C__)
 gtk_ui_manager_add_ui
-gtk_ui_manager_add_ui_from_file
+gtk_ui_manager_add_ui_from_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_ui_manager_add_ui_from_file_utf8
+#endif
 gtk_ui_manager_add_ui_from_string
 gtk_ui_manager_ensure_update
 gtk_ui_manager_get_accel_group
@@ -2625,45 +3659,90 @@ gtk_ui_manager_get_action
 gtk_ui_manager_get_action_groups
 gtk_ui_manager_get_add_tearoffs
 gtk_ui_manager_get_toplevels
-gtk_ui_manager_get_type
+gtk_ui_manager_get_type G_GNUC_CONST
 gtk_ui_manager_get_ui
 gtk_ui_manager_get_widget
 gtk_ui_manager_insert_action_group
-gtk_ui_manager_item_type_get_type
 gtk_ui_manager_new
 gtk_ui_manager_new_merge_id
 gtk_ui_manager_remove_action_group
 gtk_ui_manager_remove_ui
 gtk_ui_manager_set_add_tearoffs
-gtk_update_type_get_type
-gtk_vbox_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VBOX_H__)
+#if IN_FILE(__GTK_VBOX_C__)
+gtk_vbox_get_type G_GNUC_CONST
 gtk_vbox_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VBUTTONBOX_H__)
+#if IN_FILE(__GTK_VBUTTONBOX_C__)
 gtk_vbutton_box_get_layout_default
 gtk_vbutton_box_get_spacing_default
-gtk_vbutton_box_get_type
+gtk_vbutton_box_get_type G_GNUC_CONST
 gtk_vbutton_box_new
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VIEPORT_H__)
+#if IN_FILE(__GTK_VIEPORT_C__)
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
-gtk_viewport_get_type
+gtk_viewport_get_type G_GNUC_CONST
 gtk_viewport_get_vadjustment
 gtk_viewport_new
 gtk_viewport_set_hadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_set_vadjustment
-gtk_visibility_get_type
-gtk_vpaned_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VPANED_H__)
+#if IN_FILE(__GTK_VPANED_C__)
+gtk_vpaned_get_type G_GNUC_CONST
 gtk_vpaned_new
-gtk_vruler_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VRULER_H__)
+#if IN_FILE(__GTK_VRULER_C__)
+gtk_vruler_get_type G_GNUC_CONST
 gtk_vruler_new
-gtk_vscale_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSCALE_H__)
+#if IN_FILE(__GTK_VSCALE_C__)
+gtk_vscale_get_type G_GNUC_CONST
 gtk_vscale_new
 gtk_vscale_new_with_range
-gtk_vscrollbar_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSCROLLBAR_H__)
+#if IN_FILE(__GTK_VSCROLLBAR_C__)
+gtk_vscrollbar_get_type G_GNUC_CONST
 gtk_vscrollbar_new
-gtk_vseparator_get_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSEPARATOR_H__)
+#if IN_FILE(__GTK_VSEPARATOR_C__)
+gtk_vseparator_get_type G_GNUC_CONST
 gtk_vseparator_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_WIDGET_H__)
+#if IN_FILE(__GTK_WIDGET_C__)
+gtk_requisition_copy
+gtk_requisition_free
+gtk_requisition_get_type G_GNUC_CONST
 gtk_widget_activate
 gtk_widget_add_accelerator
 gtk_widget_add_events
@@ -2680,10 +3759,8 @@ gtk_widget_create_pango_context
 gtk_widget_create_pango_layout
 gtk_widget_destroy
 gtk_widget_destroyed
-gtk_widget_draw
 gtk_widget_ensure_style
 gtk_widget_event
-gtk_widget_flags_get_type
 gtk_widget_freeze_child_notify
 gtk_widget_get_accessible
 gtk_widget_get_ancestor
@@ -2713,12 +3790,11 @@ gtk_widget_get_settings
 gtk_widget_get_size_request
 gtk_widget_get_style
 gtk_widget_get_toplevel
-gtk_widget_get_type
+gtk_widget_get_type G_GNUC_CONST
 gtk_widget_get_visual
 gtk_widget_grab_default
 gtk_widget_grab_focus
 gtk_widget_has_screen
-gtk_widget_help_type_get_type
 gtk_widget_hide
 gtk_widget_hide_all
 gtk_widget_hide_on_delete
@@ -2735,14 +3811,20 @@ gtk_widget_modify_fg
 gtk_widget_modify_font
 gtk_widget_modify_style
 gtk_widget_modify_text
-gtk_widget_new
+gtk_widget_new G_GNUC_NULL_TERMINATED
 gtk_widget_path
 gtk_widget_pop_colormap
 gtk_widget_pop_composite_child
 gtk_widget_push_colormap
 gtk_widget_push_composite_child
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_widget_draw
 gtk_widget_queue_clear
 gtk_widget_queue_clear_area
+gtk_widget_set
+gtk_widget_set_uposition
+gtk_widget_set_usize
+#endif
 gtk_widget_queue_draw
 gtk_widget_queue_draw_area
 gtk_widget_queue_resize
@@ -2757,7 +3839,6 @@ gtk_widget_reparent
 gtk_widget_reset_rc_styles
 gtk_widget_reset_shapes
 gtk_widget_send_expose
-gtk_widget_set
 gtk_widget_set_accel_path
 gtk_widget_set_app_paintable
 gtk_widget_set_child_visible
@@ -2779,15 +3860,13 @@ gtk_widget_set_sensitive
 gtk_widget_set_size_request
 gtk_widget_set_state
 gtk_widget_set_style
-gtk_widget_set_uposition
-gtk_widget_set_usize
 gtk_widget_shape_combine_mask
 gtk_widget_show
 gtk_widget_show_all
 gtk_widget_show_now
 gtk_widget_size_allocate
 gtk_widget_size_request
-gtk_widget_style_get
+gtk_widget_style_get G_GNUC_NULL_TERMINATED
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
 gtk_widget_thaw_child_notify
@@ -2796,6 +3875,11 @@ gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
 gtk_widget_unref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_WINDOW_H__)
+#if IN_FILE(__GTK_WINDOW_C__)
 gtk_window_activate_default
 gtk_window_activate_focus
 gtk_window_activate_key
@@ -2828,12 +3912,13 @@ gtk_window_get_screen
 gtk_window_get_size
 gtk_window_get_skip_pager_hint
 gtk_window_get_skip_taskbar_hint
+gtk_window_get_urgency_hint
 gtk_window_get_title
 gtk_window_get_transient_for
-gtk_window_get_type
+gtk_window_get_type G_GNUC_CONST
 gtk_window_get_type_hint
 gtk_window_group_add_window
-gtk_window_group_get_type
+gtk_window_group_get_type G_GNUC_CONST
 gtk_window_group_new
 gtk_window_group_remove_window
 gtk_window_has_toplevel_focus
@@ -2845,7 +3930,6 @@ gtk_window_mnemonic_activate
 gtk_window_move
 gtk_window_new
 gtk_window_parse_geometry
-gtk_window_position_get_type
 gtk_window_present
 gtk_window_propagate_key_event
 gtk_window_remove_accel_group
@@ -2858,7 +3942,10 @@ gtk_window_set_auto_startup_notification
 gtk_window_set_decorated
 gtk_window_set_default
 gtk_window_set_default_icon
-gtk_window_set_default_icon_from_file
+gtk_window_set_default_icon_from_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_window_set_default_icon_from_file_utf8
+#endif
 gtk_window_set_default_icon_list
 gtk_window_set_default_icon_name
 gtk_window_set_default_size
@@ -2870,27 +3957,52 @@ gtk_window_set_geometry_hints
 gtk_window_set_gravity
 gtk_window_set_has_frame
 gtk_window_set_icon
-gtk_window_set_icon_from_file
+gtk_window_set_icon_from_file PRIVATE
+#ifdef G_OS_WIN32
+gtk_window_set_icon_from_file_utf8
+#endif
 gtk_window_set_icon_list
 gtk_window_set_icon_name
 gtk_window_set_keep_above
 gtk_window_set_keep_below
 gtk_window_set_mnemonic_modifier
 gtk_window_set_modal
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_window_set_policy
+#endif
 gtk_window_set_position
 gtk_window_set_resizable
 gtk_window_set_role
 gtk_window_set_screen
 gtk_window_set_skip_pager_hint
 gtk_window_set_skip_taskbar_hint
+gtk_window_set_urgency_hint
 gtk_window_set_title
 gtk_window_set_transient_for
 gtk_window_set_type_hint
 gtk_window_set_wmclass
 gtk_window_stick
-gtk_window_type_get_type
 gtk_window_unfullscreen
 gtk_window_unmaximize
 gtk_window_unstick
-gtk_wrap_mode_get_type
+#endif
+#endif
+
+#ifdef INCLUDE_VARIABLES
+gtk_binary_age
+gtk_interface_age
+gtk_major_version
+gtk_minor_version
+gtk_micro_version
+gtk_combo_string_key
+gtk_debug_flags
+gtk_text_attr_appearance_type
+gtk_text_char_type
+gtk_text_child_type
+gtk_text_left_mark_type
+gtk_text_pixbuf_type
+gtk_text_right_mark_type
+gtk_text_toggle_off_type
+gtk_text_toggle_on_type
+gtk_text_unknown_char_utf8
+#endif