[gtk+] gtk: Uncruftify gtk.symbols

[Benjamin Otte <otte src gnome org>]

commit 0c0b1c3a466db890ba4d3427457ad44f6c641384
Author: Benjamin Otte <otte redhat com>
Date:   Wed Nov 24 16:39:32 2010 +0100

    gtk: Uncruftify gtk.symbols

 gtk/gtk.symbols | 3175 ++++++++++++++++++-------------------------------------
 1 files changed, 1031 insertions(+), 2144 deletions(-)
---
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index d81a8ab..d649119 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1,30 +1,6 @@
 /* This list defines the GTK+ ABI. It is used to generate the gtk.def
- * file and the gtkalias.h header.
- *
- * Variables must be put into ifdef INCLUDE_VARIABLES ... endif sections.
- *
- * Internal symbols must be protected by ifdef INCLUDE_INTERNAL_SYMBOLS.
- *
- * Symbols which occur only on Windows, 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.
+ * file.
  */
-#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
@@ -35,7 +11,6 @@ gtk_about_dialog_get_license_type
 gtk_about_dialog_get_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_get_program_name
-gtk_about_dialog_set_program_name
 gtk_about_dialog_get_translator_credits
 gtk_about_dialog_get_type G_GNUC_CONST
 gtk_about_dialog_get_version
@@ -52,23 +27,19 @@ gtk_about_dialog_set_license
 gtk_about_dialog_set_license_type
 gtk_about_dialog_set_logo
 gtk_about_dialog_set_logo_icon_name
+gtk_about_dialog_set_program_name
 gtk_about_dialog_set_translator_credits
 gtk_about_dialog_set_version
 gtk_about_dialog_set_website
 gtk_about_dialog_set_website_label
 gtk_about_dialog_set_wrap_license
-#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 G_GNUC_CONST
-
+gtk_accel_flags_get_type G_GNUC_CONST
 gtk_accel_group_activate
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
@@ -76,20 +47,15 @@ gtk_accel_group_disconnect
 gtk_accel_group_disconnect_key
 gtk_accel_group_find
 gtk_accel_group_from_accel_closure
-gtk_accel_group_get_type G_GNUC_CONST
 gtk_accel_group_get_is_locked
 gtk_accel_group_get_modifier_mask
+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 G_GNUC_CONST
@@ -97,11 +63,6 @@ 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
@@ -117,37 +78,27 @@ gtk_accel_map_lookup_entry
 gtk_accel_map_save
 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 G_GNUC_CONST
 gtk_accessible_get_widget
 gtk_accessible_set_widget
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ACTION_H__)
-#if IN_FILE(__GTK_ACTION_C__)
 gtk_action_activate
 gtk_action_block_activate
 gtk_action_connect_accelerator
 gtk_action_create_icon
+gtk_action_create_menu
 gtk_action_create_menu_item
 gtk_action_create_tool_item
-gtk_action_create_menu
 gtk_action_disconnect_accelerator
-gtk_action_get_always_show_image
 gtk_action_get_accel_closure
 gtk_action_get_accel_path
+gtk_action_get_always_show_image
 gtk_action_get_gicon
+gtk_action_get_icon_name
+gtk_action_get_is_important
 gtk_action_get_label
 gtk_action_get_name
 gtk_action_get_proxies
-gtk_action_get_icon_name
-gtk_action_get_is_important
 gtk_action_get_sensitive
 gtk_action_get_short_label
 gtk_action_get_stock_id
@@ -156,29 +107,6 @@ gtk_action_get_type G_GNUC_CONST
 gtk_action_get_visible
 gtk_action_get_visible_horizontal
 gtk_action_get_visible_vertical
-gtk_action_is_sensitive
-gtk_action_is_visible
-gtk_action_new
-gtk_action_set_accel_group
-gtk_action_set_accel_path
-gtk_action_set_always_show_image
-gtk_action_set_gicon
-gtk_action_set_icon_name
-gtk_action_set_is_important
-gtk_action_set_label
-gtk_action_set_sensitive
-gtk_action_set_short_label
-gtk_action_set_stock_id
-gtk_action_set_tooltip
-gtk_action_set_visible
-gtk_action_set_visible_horizontal
-gtk_action_set_visible_vertical
-gtk_action_unblock_activate
-#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
@@ -200,218 +128,101 @@ gtk_action_group_set_translate_func
 gtk_action_group_set_translation_domain
 gtk_action_group_set_visible
 gtk_action_group_translate_string
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ACTIVATABLE_H__)
-#if IN_FILE(__GTK_ACTIVATABLE_C__)
+gtk_action_is_sensitive
+gtk_action_is_visible
+gtk_action_new
+gtk_action_set_accel_group
+gtk_action_set_accel_path
+gtk_action_set_always_show_image
+gtk_action_set_gicon
+gtk_action_set_icon_name
+gtk_action_set_is_important
+gtk_action_set_label
+gtk_action_set_sensitive
+gtk_action_set_short_label
+gtk_action_set_stock_id
+gtk_action_set_tooltip
+gtk_action_set_visible
+gtk_action_set_visible_horizontal
+gtk_action_set_visible_vertical
+gtk_action_unblock_activate
 gtk_activatable_do_set_related_action
 gtk_activatable_get_related_action
 gtk_activatable_get_type G_GNUC_CONST
 gtk_activatable_get_use_action_appearance
-gtk_activatable_sync_action_properties
 gtk_activatable_set_related_action
 gtk_activatable_set_use_action_appearance
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ADJUSTMENT_H__)
-#if IN_FILE(__GTK_ADJUSTMENT_C__)
+gtk_activatable_sync_action_properties
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
 gtk_adjustment_configure
-gtk_adjustment_get_type G_GNUC_CONST
-gtk_adjustment_get_value
 gtk_adjustment_get_lower
-gtk_adjustment_get_upper
-gtk_adjustment_get_step_increment
 gtk_adjustment_get_page_increment
 gtk_adjustment_get_page_size
+gtk_adjustment_get_step_increment
+gtk_adjustment_get_type G_GNUC_CONST
+gtk_adjustment_get_upper
+gtk_adjustment_get_value
 gtk_adjustment_new
-gtk_adjustment_set_value
 gtk_adjustment_set_lower
-gtk_adjustment_set_upper
-gtk_adjustment_set_step_increment
 gtk_adjustment_set_page_increment
 gtk_adjustment_set_page_size
+gtk_adjustment_set_step_increment
+gtk_adjustment_set_upper
+gtk_adjustment_set_value
 gtk_adjustment_value_changed
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ALIGNMENT_H__)
-#if IN_FILE(__GTK_ALIGNMENT_C__)
+gtk_align_get_type G_GNUC_CONST
 gtk_alignment_get_padding
 gtk_alignment_get_type G_GNUC_CONST
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
-#endif
-#endif
-
-#if IN_HEADER(__GTK_APPLICATION_H__)
-#if IN_FILE(__GTK_APPLICATION_C__)
-gtk_application_get_type G_GNUC_CONST
+gtk_alternative_dialog_button_order
 gtk_application_add_window
-gtk_application_new
+gtk_application_get_type G_GNUC_CONST
 gtk_application_get_windows
+gtk_application_new
 gtk_application_remove_window
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ASSISTANT_H__)
-#if IN_FILE(__GTK_ASSISTANT_C__)
+gtk_arrow_get_type G_GNUC_CONST
+gtk_arrow_new
+gtk_arrow_placement_get_type G_GNUC_CONST
+gtk_arrow_set
+gtk_arrow_type_get_type G_GNUC_CONST
+gtk_aspect_frame_get_type G_GNUC_CONST
+gtk_aspect_frame_new
+gtk_aspect_frame_set
+gtk_assistant_add_action_widget
+gtk_assistant_append_page
+gtk_assistant_commit
+gtk_assistant_get_current_page
+gtk_assistant_get_n_pages
+gtk_assistant_get_nth_page
+gtk_assistant_get_page_complete
+gtk_assistant_get_page_header_image
+gtk_assistant_get_page_side_image
+gtk_assistant_get_page_title
+gtk_assistant_get_page_type
 gtk_assistant_get_type G_GNUC_CONST
+gtk_assistant_insert_page
 gtk_assistant_new
 gtk_assistant_next_page
+gtk_assistant_page_type_get_type G_GNUC_CONST
+gtk_assistant_prepend_page
 gtk_assistant_previous_page
-gtk_assistant_get_current_page
+gtk_assistant_remove_action_widget
 gtk_assistant_set_current_page
-gtk_assistant_get_n_pages
-gtk_assistant_get_nth_page
-gtk_assistant_prepend_page
-gtk_assistant_append_page
-gtk_assistant_insert_page
 gtk_assistant_set_forward_page_func
-gtk_assistant_set_page_type
-gtk_assistant_get_page_type
-gtk_assistant_set_page_title
-gtk_assistant_get_page_title
+gtk_assistant_set_page_complete
 gtk_assistant_set_page_header_image
-gtk_assistant_get_page_header_image
 gtk_assistant_set_page_side_image
-gtk_assistant_get_page_side_image
-gtk_assistant_set_page_complete
-gtk_assistant_get_page_complete
-gtk_assistant_add_action_widget
-gtk_assistant_remove_action_widget
+gtk_assistant_set_page_title
+gtk_assistant_set_page_type
 gtk_assistant_update_buttons_state
-gtk_assistant_commit
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TYPE_BUILTINS_H__)
-#if IN_FILE(__GTK_TYPE_BUILTINS_C__)
-gtk_align_get_type G_GNUC_CONST
-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_number_up_layout_get_type G_GNUC_CONST
-gtk_arrow_type_get_type G_GNUC_CONST
-gtk_arrow_placement_get_type G_GNUC_CONST
-gtk_assistant_page_type_get_type G_GNUC_CONST
 gtk_attach_options_get_type G_GNUC_CONST
-gtk_builder_error_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_cell_renderer_accel_mode_get_type
-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_drag_result_get_type G_GNUC_CONST
-gtk_dialog_flags_get_type G_GNUC_CONST
-gtk_direction_type_get_type G_GNUC_CONST
-gtk_entry_icon_position_get_type G_GNUC_CONST
-gtk_expander_style_get_type G_GNUC_CONST
-gtk_file_chooser_action_get_type G_GNUC_CONST
-gtk_file_chooser_confirmation_get_type G_GNUC_CONST
-gtk_file_filter_flags_get_type G_GNUC_CONST
-gtk_icon_view_drop_position_get_type G_GNUC_CONST
-gtk_sensitivity_type_get_type G_GNUC_CONST
-gtk_window_type_get_type G_GNUC_CONST
-gtk_wrap_mode_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_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_license_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_page_orientation_get_type G_GNUC_CONST
-gtk_print_operation_result_get_type G_GNUC_CONST
-gtk_print_pages_get_type G_GNUC_CONST
-gtk_print_quality_get_type G_GNUC_CONST
-gtk_print_status_get_type G_GNUC_CONST
-gtk_page_set_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_print_duplex_get_type G_GNUC_CONST
-gtk_print_error_get_type G_GNUC_CONST
-gtk_recent_filter_flags_get_type G_GNUC_CONST
-gtk_print_operation_action_get_type G_GNUC_CONST
-gtk_rc_flags_get_type G_GNUC_CONST
-gtk_rc_token_type_get_type G_GNUC_CONST
-gtk_recent_chooser_error_get_type G_GNUC_CONST
-gtk_recent_manager_error_get_type G_GNUC_CONST
-gtk_recent_sort_type_get_type G_GNUC_CONST
-gtk_unit_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_size_group_mode_get_type G_GNUC_CONST
-gtk_size_request_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_target_flags_get_type G_GNUC_CONST
-gtk_text_direction_get_type G_GNUC_CONST
-gtk_text_buffer_target_info_get_type G_GNUC_CONST
-gtk_text_search_flags_get_type G_GNUC_CONST
-gtk_text_window_type_get_type G_GNUC_CONST
-gtk_tool_palette_drag_targets_get_type G_GNUC_CONST
-gtk_tree_model_flags_get_type G_GNUC_CONST
-gtk_tree_view_grid_lines_get_type G_GNUC_CONST
-gtk_update_type_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_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
-#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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BINDINGS_H__)
-#if IN_FILE(__GTK_BINDINGS_C__)
-gtk_binding_entry_skip
 gtk_binding_entry_add_signal
 gtk_binding_entry_add_signall
 gtk_binding_entry_remove
+gtk_binding_entry_skip
 gtk_bindings_activate
 gtk_bindings_activate_event
 gtk_binding_set_activate
@@ -419,22 +230,16 @@ 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 G_GNUC_CONST
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BOX_H__)
-#if IN_FILE(__GTK_BOX_C__)
-gtk_box_new
+gtk_border_copy
+gtk_border_free
+gtk_border_get_type G_GNUC_CONST
+gtk_border_new G_GNUC_MALLOC
 gtk_box_get_homogeneous
 gtk_box_get_spacing
 gtk_box_get_type G_GNUC_CONST
+gtk_box_new
 gtk_box_pack_end
 gtk_box_pack_start
 gtk_box_query_child_packing
@@ -442,63 +247,43 @@ gtk_box_reorder_child
 gtk_box_set_child_packing
 gtk_box_set_homogeneous
 gtk_box_set_spacing
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BUILDABLE_H__)
-#if IN_FILE(__GTK_BUILDABLE_C__)
 gtk_buildable_add_child
 gtk_buildable_construct_child
-gtk_buildable_custom_tag_start
-gtk_buildable_custom_tag_end
 gtk_buildable_custom_finished
+gtk_buildable_custom_tag_end
+gtk_buildable_custom_tag_start
 gtk_buildable_get_internal_child
 gtk_buildable_get_name
 gtk_buildable_get_type G_GNUC_CONST
 gtk_buildable_parser_finished
-gtk_buildable_set_name
 gtk_buildable_set_buildable_property
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BUILDER_H__)
-#if IN_FILE(__GTK_BUILDER_C__)
+gtk_buildable_set_name
 gtk_builder_add_from_file
 gtk_builder_add_from_string
 gtk_builder_add_objects_from_file
 gtk_builder_add_objects_from_string
+gtk_builder_connect_signals
+gtk_builder_connect_signals_full
+gtk_builder_error_get_type G_GNUC_CONST
 gtk_builder_error_quark
 gtk_builder_get_object
 gtk_builder_get_objects
 gtk_builder_get_translation_domain
-gtk_builder_get_type G_GNUC_CONST
 gtk_builder_get_type_from_name
+gtk_builder_get_type G_GNUC_CONST
 gtk_builder_new
 gtk_builder_set_translation_domain
-gtk_builder_connect_signals
-gtk_builder_connect_signals_full
 gtk_builder_value_from_string
 gtk_builder_value_from_string_type
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BUTTON_BOX_H__)
-#if IN_FILE(__GTK_BUTTON_BOX_C__)
-gtk_button_box_new
 gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
 gtk_button_box_get_type G_GNUC_CONST
+gtk_button_box_new
 gtk_button_box_set_child_secondary
 gtk_button_box_set_layout
-#endif
-#endif
-
-#if IN_HEADER(__GTK_BUTTON_H__)
-#if IN_FILE(__GTK_BUTTON_C__)
+gtk_button_box_style_get_type G_GNUC_CONST
 gtk_button_clicked
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_enter
-#endif
 gtk_button_get_alignment
 gtk_button_get_event_window
 gtk_button_get_focus_on_click
@@ -509,17 +294,13 @@ gtk_button_get_relief
 gtk_button_get_type G_GNUC_CONST
 gtk_button_get_use_stock
 gtk_button_get_use_underline
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_leave
-#endif
 gtk_button_new
 gtk_button_new_from_stock
 gtk_button_new_with_label
 gtk_button_new_with_mnemonic
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_pressed
 gtk_button_released
-#endif
 gtk_button_set_alignment
 gtk_button_set_focus_on_click
 gtk_button_set_image
@@ -528,12 +309,11 @@ gtk_button_set_label
 gtk_button_set_relief
 gtk_button_set_use_stock
 gtk_button_set_use_underline
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CALENDAR_H__)
-#if IN_FILE(__GTK_CALENDAR_C__)
+gtk_buttons_type_get_type G_GNUC_CONST
+gtk_cairo_should_draw_window
+gtk_cairo_transform_to_window
 gtk_calendar_clear_marks
+gtk_calendar_display_options_get_type G_GNUC_CONST
 gtk_calendar_get_date
 gtk_calendar_get_day_is_marked
 gtk_calendar_get_detail_height_rows
@@ -549,36 +329,26 @@ gtk_calendar_set_detail_height_rows
 gtk_calendar_set_detail_width_chars
 gtk_calendar_set_display_options
 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 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_cells
 gtk_cell_layout_get_type G_GNUC_CONST
 gtk_cell_layout_pack_end
 gtk_cell_layout_pack_start
-gtk_cell_layout_get_cells
 gtk_cell_layout_reorder
 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_accel_get_type G_GNUC_CONST
+gtk_cell_renderer_accel_mode_get_type
+gtk_cell_renderer_accel_new
 gtk_cell_renderer_activate
+gtk_cell_renderer_combo_get_type G_GNUC_CONST
+gtk_cell_renderer_combo_new
 gtk_cell_renderer_get_alignment
 gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_get_padding
@@ -589,74 +359,30 @@ gtk_cell_renderer_get_preferred_width
 gtk_cell_renderer_get_preferred_width_for_height
 gtk_cell_renderer_get_request_mode
 gtk_cell_renderer_get_sensitive
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_cell_renderer_get_size
-#endif
 gtk_cell_renderer_get_type G_GNUC_CONST
 gtk_cell_renderer_get_visible
+gtk_cell_renderer_mode_get_type G_GNUC_CONST
+gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST
+gtk_cell_renderer_pixbuf_new
+gtk_cell_renderer_progress_get_type G_GNUC_CONST
+gtk_cell_renderer_progress_new
 gtk_cell_renderer_render
 gtk_cell_renderer_set_alignment
 gtk_cell_renderer_set_fixed_size
 gtk_cell_renderer_set_padding
 gtk_cell_renderer_set_sensitive
 gtk_cell_renderer_set_visible
-gtk_cell_renderer_start_editing
-gtk_cell_renderer_stop_editing
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CELL_RENDERER_ACCEL_H__)
-#if IN_FILE(__GTK_CELL_RENDERER_ACCEL_C__)
-gtk_cell_renderer_accel_get_type G_GNUC_CONST
-gtk_cell_renderer_accel_new
-#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_SPIN_H__)
-#if IN_FILE(__GTK_CELL_RENDERER_SPIN_C__)
 gtk_cell_renderer_spin_get_type G_GNUC_CONST
-gtk_cell_renderer_spin_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CELL_RENDERER_SPINNER_H__)
-#if IN_FILE(__GTK_CELL_RENDERER_SPINNER_C__)
 gtk_cell_renderer_spinner_get_type G_GNUC_CONST
 gtk_cell_renderer_spinner_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_spin_new
+gtk_cell_renderer_start_editing
+gtk_cell_renderer_state_get_type G_GNUC_CONST
+gtk_cell_renderer_stop_editing
 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_activatable
 gtk_cell_renderer_toggle_get_active
 gtk_cell_renderer_toggle_get_radio
@@ -665,18 +391,11 @@ gtk_cell_renderer_toggle_new
 gtk_cell_renderer_toggle_set_activatable
 gtk_cell_renderer_toggle_set_active
 gtk_cell_renderer_toggle_set_radio
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CELL_VIEW_H__)
-#if IN_FILE(__GTK_CELL_VIEW_C__)
 gtk_cell_view_get_desired_height_for_width_of_row
 gtk_cell_view_get_desired_width_of_row
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_model
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_cell_view_get_size_of_row
-#endif
 gtk_cell_view_get_type G_GNUC_CONST
 gtk_cell_view_new
 gtk_cell_view_new_with_markup
@@ -686,20 +405,10 @@ gtk_cell_view_set_background_color
 gtk_cell_view_set_background_rgba
 gtk_cell_view_set_displayed_row
 gtk_cell_view_set_model
-#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_CHECK_MENU_ITEM_H__)
-#if IN_FILE(__GTK_CHECK_MENU_ITEM_C__)
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
@@ -711,11 +420,7 @@ gtk_check_menu_item_set_active
 gtk_check_menu_item_set_draw_as_radio
 gtk_check_menu_item_set_inconsistent
 gtk_check_menu_item_toggled
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CLIPBOARD_H__)
-#if IN_FILE(__GTK_CLIPBOARD_C__)
+gtk_check_version
 gtk_clipboard_clear
 gtk_clipboard_get
 gtk_clipboard_get_display
@@ -737,19 +442,14 @@ gtk_clipboard_store
 gtk_clipboard_wait_for_contents
 gtk_clipboard_wait_for_image
 gtk_clipboard_wait_for_rich_text
-gtk_clipboard_wait_for_uris
 gtk_clipboard_wait_for_targets
 gtk_clipboard_wait_for_text
+gtk_clipboard_wait_for_uris
 gtk_clipboard_wait_is_image_available
 gtk_clipboard_wait_is_rich_text_available
+gtk_clipboard_wait_is_target_available
 gtk_clipboard_wait_is_text_available
 gtk_clipboard_wait_is_uris_available
-gtk_clipboard_wait_is_target_available
-#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_rgba
@@ -764,11 +464,9 @@ gtk_color_button_set_color
 gtk_color_button_set_rgba
 gtk_color_button_set_title
 gtk_color_button_set_use_alpha
-#endif
-#endif
-
-#if IN_HEADER(__GTK_COLOR_SELECTION_H__)
-#if IN_FILE(__GTK_COLOR_SELECTION_C__)
+gtk_color_selection_dialog_get_color_selection
+gtk_color_selection_dialog_get_type G_GNUC_CONST
+gtk_color_selection_dialog_new
 gtk_color_selection_get_current_alpha
 gtk_color_selection_get_current_color
 gtk_color_selection_get_current_rgba
@@ -791,22 +489,10 @@ gtk_color_selection_set_has_palette
 gtk_color_selection_set_previous_alpha
 gtk_color_selection_set_previous_color
 gtk_color_selection_set_previous_rgba
-#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
-gtk_color_selection_dialog_get_color_selection
-#endif
-#endif
-
-#if IN_HEADER(__GTK_COMBO_BOX_H__)
-#if IN_FILE(__GTK_COMBO_BOX_C__)
 gtk_combo_box_get_active
 gtk_combo_box_get_active_iter
 gtk_combo_box_get_add_tearoffs
+gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_column_span_column
 gtk_combo_box_get_entry_text_column
 gtk_combo_box_get_focus_on_click
@@ -816,7 +502,6 @@ gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_popup_fixed_width
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_get_row_span_column
-gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_title
 gtk_combo_box_get_type G_GNUC_CONST
 gtk_combo_box_get_wrap_width
@@ -830,6 +515,7 @@ gtk_combo_box_popup_for_device
 gtk_combo_box_set_active
 gtk_combo_box_set_active_iter
 gtk_combo_box_set_add_tearoffs
+gtk_combo_box_set_button_sensitivity
 gtk_combo_box_set_column_span_column
 gtk_combo_box_set_entry_text_column
 gtk_combo_box_set_focus_on_click
@@ -837,14 +523,8 @@ gtk_combo_box_set_model
 gtk_combo_box_set_popup_fixed_width
 gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column
-gtk_combo_box_set_button_sensitivity
 gtk_combo_box_set_title
 gtk_combo_box_set_wrap_width
-#endif
-#endif
-
-#if IN_HEADER(__GTK_COMBO_BOX_TEXT_H__)
-#if IN_FILE(__GTK_COMBO_BOX_TEXT_C__)
 gtk_combo_box_text_append_text
 gtk_combo_box_text_get_active_text
 gtk_combo_box_text_get_type G_GNUC_CONST
@@ -854,11 +534,6 @@ gtk_combo_box_text_new_with_entry
 gtk_combo_box_text_prepend_text
 gtk_combo_box_text_remove
 gtk_combo_box_text_remove_all
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CONTAINER_H__)
-#if IN_FILE(__GTK_CONTAINER_C__)
 gtk_container_add
 gtk_container_add_with_properties G_GNUC_NULL_TERMINATED
 gtk_container_check_resize
@@ -870,9 +545,9 @@ gtk_container_child_set_property
 gtk_container_child_set_valist
 gtk_container_child_type
 gtk_container_class_find_child_property
+gtk_container_class_handle_border_width
 gtk_container_class_install_child_property
 gtk_container_class_list_child_properties
-gtk_container_class_handle_border_width
 gtk_container_forall
 gtk_container_foreach
 gtk_container_get_border_width
@@ -894,42 +569,37 @@ gtk_container_set_focus_vadjustment
 gtk_container_set_reallocate_redraws
 gtk_container_set_resize_mode
 gtk_container_unset_focus_chain
-#endif
-#endif
-
-#if IN_HEADER(__GTK_WINDOW_DECORATE_H__)
-#if IN_FILE(__GTK_WINDOW_DECORATE_C__)
+gtk_corner_type_get_type G_GNUC_CONST
+gtk_custom_paper_unix_dialog_get_type G_GNUC_CONST
+gtk_debug_flag_get_type G_GNUC_CONST
 gtk_decorated_window_calculate_frame_size
 gtk_decorated_window_init
 gtk_decorated_window_move_resize_window
 gtk_decorated_window_set_title
-#endif
-#endif
-
-#if IN_HEADER(__GTK_DIALOG_H__)
-#if IN_FILE(__GTK_DIALOG_C__)
+gtk_delete_type_get_type G_GNUC_CONST
+gtk_dest_defaults_get_type G_GNUC_CONST
+gtk_device_grab_add
+gtk_device_grab_remove
 gtk_dialog_add_action_widget
 gtk_dialog_add_button
 gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED
+gtk_dialog_flags_get_type G_GNUC_CONST
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
-gtk_dialog_get_widget_for_response
 gtk_dialog_get_response_for_widget
 gtk_dialog_get_type G_GNUC_CONST
+gtk_dialog_get_widget_for_response
 gtk_dialog_new
 gtk_dialog_new_with_buttons
 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_response_sensitive
-#endif
-#endif
-
-#if IN_HEADER(__GTK_DND_H__)
-#if IN_FILE(__GTK_DND_C__)
+gtk_direction_type_get_type G_GNUC_CONST
+gtk_disable_setlocale
+gtk_distribute_natural_allocation
 gtk_drag_begin
 gtk_drag_check_threshold
 gtk_drag_dest_add_image_targets
@@ -937,16 +607,17 @@ gtk_drag_dest_add_text_targets
 gtk_drag_dest_add_uri_targets
 gtk_drag_dest_find_target
 gtk_drag_dest_get_target_list
+gtk_drag_dest_get_track_motion
 gtk_drag_dest_set
 gtk_drag_dest_set_proxy
 gtk_drag_dest_set_target_list
 gtk_drag_dest_set_track_motion
-gtk_drag_dest_get_track_motion
 gtk_drag_dest_unset
 gtk_drag_finish
 gtk_drag_get_data
 gtk_drag_get_source_widget
 gtk_drag_highlight
+gtk_drag_result_get_type G_GNUC_CONST
 gtk_drag_set_icon_default
 gtk_drag_set_icon_name
 gtk_drag_set_icon_pixbuf
@@ -964,101 +635,9 @@ 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_STATUS_ICON_H__)
-#if IN_FILE(__GTK_STATUS_ICON_C__)
-gtk_status_icon_get_type G_GNUC_CONST
-gtk_status_icon_new
-gtk_status_icon_new_from_pixbuf
-gtk_status_icon_new_from_file
-gtk_status_icon_new_from_stock
-gtk_status_icon_new_from_icon_name
-gtk_status_icon_new_from_gicon
-gtk_status_icon_set_from_pixbuf
-gtk_status_icon_set_from_file
-gtk_status_icon_set_from_stock
-gtk_status_icon_set_from_icon_name
-gtk_status_icon_set_from_gicon
-gtk_status_icon_get_storage_type
-gtk_status_icon_get_pixbuf
-gtk_status_icon_get_screen
-gtk_status_icon_get_stock
-gtk_status_icon_get_icon_name
-gtk_status_icon_get_gicon
-gtk_status_icon_get_size
-gtk_status_icon_set_screen
-gtk_status_icon_set_tooltip_text
-gtk_status_icon_get_tooltip_text
-gtk_status_icon_set_tooltip_markup
-gtk_status_icon_get_tooltip_markup
-gtk_status_icon_set_has_tooltip
-gtk_status_icon_get_has_tooltip
-gtk_status_icon_set_visible
-gtk_status_icon_get_visible
-gtk_status_icon_is_embedded
-gtk_status_icon_position_menu
-gtk_status_icon_get_geometry
-gtk_status_icon_get_x11_window_id
-gtk_status_icon_get_title
-gtk_status_icon_set_title
-gtk_status_icon_set_name
-#endif
-#endif
-
-#if IN_HEADER(__GTK_STYLE_H__)
-#if IN_FILE(__GTK_STYLE_C__)
-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_resize_grip
-gtk_paint_shadow
-gtk_paint_shadow_gap
-gtk_paint_slider
-gtk_paint_spinner
-gtk_paint_tab
-gtk_paint_vline
-gtk_border_new G_GNUC_MALLOC
-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_lookup_color
-gtk_style_new
-gtk_style_render_icon
-gtk_style_set_background
-gtk_draw_insertion_cursor
-gtk_style_get_style_property
-gtk_style_get_valist
-gtk_style_get
-#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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_EDITABLE_H__)
-#if IN_FILE(__GTK_EDITABLE_C__)
+gtk_draw_insertion_cursor
 gtk_editable_copy_clipboard
 gtk_editable_cut_clipboard
 gtk_editable_delete_selection
@@ -1073,11 +652,44 @@ gtk_editable_paste_clipboard
 gtk_editable_select_region
 gtk_editable_set_editable
 gtk_editable_set_position
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ENTRY_H__)
-#if IN_FILE(__GTK_ENTRY_C__)
+gtk_entry_buffer_delete_text
+gtk_entry_buffer_emit_deleted_text
+gtk_entry_buffer_emit_inserted_text
+gtk_entry_buffer_get_bytes
+gtk_entry_buffer_get_length
+gtk_entry_buffer_get_max_length
+gtk_entry_buffer_get_text
+gtk_entry_buffer_get_type G_GNUC_CONST
+gtk_entry_buffer_insert_text
+gtk_entry_buffer_new
+gtk_entry_buffer_set_max_length
+gtk_entry_buffer_set_text
+gtk_entry_completion_complete
+gtk_entry_completion_delete_action
+gtk_entry_completion_get_completion_prefix
+gtk_entry_completion_get_entry
+gtk_entry_completion_get_inline_completion
+gtk_entry_completion_get_inline_selection
+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_inline_selection
+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
 gtk_entry_get_activates_default
 gtk_entry_get_alignment
 gtk_entry_get_buffer
@@ -1110,6 +722,7 @@ gtk_entry_get_text_length
 gtk_entry_get_type G_GNUC_CONST
 gtk_entry_get_visibility
 gtk_entry_get_width_chars
+gtk_entry_icon_position_get_type G_GNUC_CONST
 gtk_entry_im_context_filter_keypress
 gtk_entry_layout_index_to_text_index
 gtk_entry_new
@@ -1142,70 +755,14 @@ gtk_entry_set_visibility
 gtk_entry_set_width_chars
 gtk_entry_text_index_to_layout_index
 gtk_entry_unset_invisible_char
-#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_inline_selection
-gtk_entry_completion_get_minimum_key_length
-gtk_entry_completion_get_completion_prefix
-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_inline_selection
-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_ENTRY_BUFFER_H__)
-#if IN_FILE(__GTK_ENTRY_BUFFER_C__)
-gtk_entry_buffer_get_type G_GNUC_CONST
-gtk_entry_buffer_new
-gtk_entry_buffer_get_bytes
-gtk_entry_buffer_get_length
-gtk_entry_buffer_get_text
-gtk_entry_buffer_set_text
-gtk_entry_buffer_set_max_length
-gtk_entry_buffer_get_max_length
-gtk_entry_buffer_insert_text
-gtk_entry_buffer_delete_text
-gtk_entry_buffer_emit_inserted_text
-gtk_entry_buffer_emit_deleted_text
-#endif
-#endif
-
-#if IN_HEADER(__GTK_EVENT_BOX_H__)
-#if IN_FILE(__GTK_EVENT_BOX_C__)
+gtk_enumerate_printers
 gtk_event_box_get_above_child
 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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_EXPANDER_H__)
-#if IN_FILE(__GTK_EXPANDER_C__)
+gtk_events_pending
 gtk_expander_get_expanded
 gtk_expander_get_label
 gtk_expander_get_label_fill
@@ -1223,19 +780,32 @@ gtk_expander_set_label_widget
 gtk_expander_set_spacing
 gtk_expander_set_use_markup
 gtk_expander_set_use_underline
-#endif
-#endif
-
-#if IN_HEADER(__GTK_FILE_CHOOSER_H__)
-#if IN_FILE(__GTK_FILE_CHOOSER_C__)
+gtk_expander_style_get_type G_GNUC_CONST
+gtk_false G_GNUC_CONST
+gtk_file_chooser_action_get_type G_GNUC_CONST
 gtk_file_chooser_add_filter
 gtk_file_chooser_add_shortcut_folder
 gtk_file_chooser_add_shortcut_folder_uri
+gtk_file_chooser_button_get_focus_on_click
+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_dialog
+gtk_file_chooser_button_set_focus_on_click
+gtk_file_chooser_button_set_title
+gtk_file_chooser_button_set_width_chars
+gtk_file_chooser_confirmation_get_type G_GNUC_CONST
+gtk_file_chooser_dialog_get_type G_GNUC_CONST
+gtk_file_chooser_dialog_new
+gtk_file_chooser_error_get_type G_GNUC_CONST
 gtk_file_chooser_error_quark
 gtk_file_chooser_get_action
+gtk_file_chooser_get_create_folders
 gtk_file_chooser_get_current_folder
 gtk_file_chooser_get_current_folder_file
 gtk_file_chooser_get_current_folder_uri
+gtk_file_chooser_get_do_overwrite_confirmation
 gtk_file_chooser_get_extra_widget
 gtk_file_chooser_get_file
 gtk_file_chooser_get_filename
@@ -1250,10 +820,6 @@ 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_set_do_overwrite_confirmation
-gtk_file_chooser_get_do_overwrite_confirmation
-gtk_file_chooser_set_create_folders
-gtk_file_chooser_get_create_folders
 gtk_file_chooser_get_type G_GNUC_CONST
 gtk_file_chooser_get_uri
 gtk_file_chooser_get_uris
@@ -1269,10 +835,12 @@ gtk_file_chooser_select_file
 gtk_file_chooser_select_filename
 gtk_file_chooser_select_uri
 gtk_file_chooser_set_action
+gtk_file_chooser_set_create_folders
 gtk_file_chooser_set_current_folder
 gtk_file_chooser_set_current_folder_file
 gtk_file_chooser_set_current_folder_uri
 gtk_file_chooser_set_current_name
+gtk_file_chooser_set_do_overwrite_confirmation
 gtk_file_chooser_set_extra_widget
 gtk_file_chooser_set_file
 gtk_file_chooser_set_filename
@@ -1288,63 +856,23 @@ gtk_file_chooser_unselect_all
 gtk_file_chooser_unselect_file
 gtk_file_chooser_unselect_filename
 gtk_file_chooser_unselect_uri
-#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
-#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
-#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_dialog
-gtk_file_chooser_button_set_title
-gtk_file_chooser_button_set_width_chars
-gtk_file_chooser_button_get_focus_on_click
-gtk_file_chooser_button_set_focus_on_click
-#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 G_GNUC_CONST
 gtk_file_filter_get_name
 gtk_file_filter_get_needed
 gtk_file_filter_get_type G_GNUC_CONST
 gtk_file_filter_new
 gtk_file_filter_set_name
-#endif
-#endif
-
-#if IN_HEADER(__GTK_FIXED_H__)
-#if IN_FILE(__GTK_FIXED_C__)
 gtk_fixed_get_type G_GNUC_CONST
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
-#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
@@ -1360,11 +888,6 @@ gtk_font_button_set_show_style
 gtk_font_button_set_title
 gtk_font_button_set_use_font
 gtk_font_button_set_use_size
-#endif
-#endif
-
-#if IN_HEADER(__GTK_FONTSEL_H__)
-#if IN_FILE(__GTK_FONTSEL_C__)
 gtk_font_selection_dialog_get_cancel_button
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_font_selection
@@ -1388,11 +911,6 @@ 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
@@ -1403,75 +921,58 @@ gtk_frame_set_label
 gtk_frame_set_label_align
 gtk_frame_set_label_widget
 gtk_frame_set_shadow_type
-#endif
-#endif
-
-#if IN_HEADER(__GTK_HANDLE_BOX_H__)
-#if IN_FILE(__GTK_HANDLE_BOX_C__)
+gtk_get_binary_age
+gtk_get_current_event
+gtk_get_current_event_device
+gtk_get_current_event_state
+gtk_get_current_event_time
+gtk_get_debug_flags
+gtk_get_default_language
+gtk_get_event_widget
+gtk_get_interface_age
+gtk_get_major_version
+gtk_get_micro_version
+gtk_get_minor_version
+gtk_get_option_group
+gtk_grab_add
+gtk_grab_get_current
+gtk_grab_remove
+gtk_grid_attach
+gtk_grid_attach_next_to
+gtk_grid_get_column_homogeneous
+gtk_grid_get_column_spacing
+gtk_grid_get_row_homogeneous
+gtk_grid_get_row_spacing
+gtk_grid_get_type G_GNUC_CONST
+gtk_grid_new
+gtk_grid_set_column_homogeneous
+gtk_grid_set_column_spacing
+gtk_grid_set_row_homogeneous
+gtk_grid_set_row_spacing
+gtk_handle_box_get_child_detached
 gtk_handle_box_get_handle_position
 gtk_handle_box_get_shadow_type
 gtk_handle_box_get_snap_edge
-gtk_handle_box_get_child_detached
 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
-#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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_HPANED_H__)
-#if IN_FILE(__GTK_HPANED_C__)
+gtk_hbutton_box_new
 gtk_hpaned_get_type G_GNUC_CONST
 gtk_hpaned_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_HRULER_H__)
-#if IN_FILE(__GTK_HRULER_C__)
 gtk_hruler_get_type G_GNUC_CONST
 gtk_hruler_new
-#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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_HSCROLLBAR_H__)
-#if IN_FILE(__GTK_HSCROLLBAR_C__)
 gtk_hscrollbar_get_type G_GNUC_CONST
 gtk_hscrollbar_new
-#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 G_GNUC_CONST
@@ -1480,12 +981,6 @@ 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 G_GNUC_CONST
@@ -1493,12 +988,21 @@ gtk_icon_factory_lookup
 gtk_icon_factory_lookup_default
 gtk_icon_factory_new
 gtk_icon_factory_remove_default
-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_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 G_GNUC_CONST
+gtk_icon_info_load_icon
+gtk_icon_info_load_symbolic
+gtk_icon_info_load_symbolic_for_style
+gtk_icon_info_new_for_pixbuf
+gtk_icon_info_set_raw_coordinates
+gtk_icon_lookup_flags_get_type G_GNUC_CONST
 gtk_icon_set_add_source
 gtk_icon_set_copy
 gtk_icon_set_get_sizes
@@ -1508,6 +1012,13 @@ 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 G_GNUC_CONST
+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
@@ -1530,27 +1041,10 @@ 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_new_for_pixbuf
-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 G_GNUC_CONST
-gtk_icon_info_load_icon
-gtk_icon_info_load_symbolic
-gtk_icon_info_load_symbolic_for_style
-gtk_icon_info_set_raw_coordinates
 gtk_icon_theme_add_builtin_icon
 gtk_icon_theme_append_search_path
+gtk_icon_theme_choose_icon
+gtk_icon_theme_error_get_type G_GNUC_CONST
 gtk_icon_theme_error_quark
 gtk_icon_theme_get_default
 gtk_icon_theme_get_example_icon_name
@@ -1562,38 +1056,43 @@ gtk_icon_theme_has_icon
 gtk_icon_theme_list_contexts
 gtk_icon_theme_list_icons
 gtk_icon_theme_load_icon
-gtk_icon_theme_lookup_icon
 gtk_icon_theme_lookup_by_gicon
-gtk_icon_theme_choose_icon
+gtk_icon_theme_lookup_icon
 gtk_icon_theme_new
 gtk_icon_theme_prepend_search_path
 gtk_icon_theme_rescan_if_needed
 gtk_icon_theme_set_custom_theme
 gtk_icon_theme_set_screen
 gtk_icon_theme_set_search_path
-#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_convert_widget_to_bin_window_coords
+gtk_icon_view_create_drag_icon
+gtk_icon_view_drop_position_get_type G_GNUC_CONST
+gtk_icon_view_enable_model_drag_dest
+gtk_icon_view_enable_model_drag_source
 gtk_icon_view_get_columns
+gtk_icon_view_get_column_spacing
 gtk_icon_view_get_cursor
+gtk_icon_view_get_dest_item_at_pos
+gtk_icon_view_get_drag_dest_item
+gtk_icon_view_get_item_at_pos
+gtk_icon_view_get_item_column
+gtk_icon_view_get_item_orientation
 gtk_icon_view_get_item_padding
+gtk_icon_view_get_item_row
 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_item_orientation
 gtk_icon_view_get_path_at_pos
-gtk_icon_view_get_item_at_pos
-gtk_icon_view_convert_widget_to_bin_window_coords
 gtk_icon_view_get_pixbuf_column
+gtk_icon_view_get_reorderable
 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_tooltip_column
+gtk_icon_view_get_tooltip_context
 gtk_icon_view_get_type G_GNUC_CONST
 gtk_icon_view_get_visible_range
 gtk_icon_view_item_activated
@@ -1604,92 +1103,69 @@ 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_column_spacing
 gtk_icon_view_set_cursor
+gtk_icon_view_set_drag_dest_item
+gtk_icon_view_set_item_orientation
 gtk_icon_view_set_item_padding
 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_item_orientation
 gtk_icon_view_set_pixbuf_column
+gtk_icon_view_set_reorderable
 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_set_tooltip_cell
+gtk_icon_view_set_tooltip_column
+gtk_icon_view_set_tooltip_item
 gtk_icon_view_unselect_all
 gtk_icon_view_unselect_path
-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
-gtk_icon_view_set_tooltip_item
-gtk_icon_view_set_tooltip_cell
-gtk_icon_view_get_tooltip_context
-gtk_icon_view_set_tooltip_column
-gtk_icon_view_get_tooltip_column
-gtk_icon_view_get_item_row
-gtk_icon_view_get_item_column
-#endif
-#endif
-
-#if IN_HEADER(__GTK_IMAGE_H__)
-#if IN_FILE(__GTK_IMAGE_C__)
+gtk_icon_view_unset_model_drag_source
+gtk_identifier_get_type G_GNUC_CONST
 gtk_image_clear
 gtk_image_get_animation
+gtk_image_get_gicon
 gtk_image_get_icon_name
 gtk_image_get_icon_set
 gtk_image_get_pixbuf
 gtk_image_get_pixel_size
 gtk_image_get_stock
-gtk_image_get_gicon
 gtk_image_get_storage_type
 gtk_image_get_type G_GNUC_CONST
+gtk_image_menu_item_get_always_show_image
+gtk_image_menu_item_get_image
+gtk_image_menu_item_get_type G_GNUC_CONST
+gtk_image_menu_item_get_use_stock
+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_accel_group
+gtk_image_menu_item_set_always_show_image
+gtk_image_menu_item_set_image
+gtk_image_menu_item_set_use_stock
 gtk_image_new
 gtk_image_new_from_animation
 gtk_image_new_from_file
+gtk_image_new_from_gicon
 gtk_image_new_from_icon_name
 gtk_image_new_from_icon_set
 gtk_image_new_from_pixbuf
 gtk_image_new_from_stock
-gtk_image_new_from_gicon
 gtk_image_set_from_animation
 gtk_image_set_from_file
+gtk_image_set_from_gicon
 gtk_image_set_from_icon_name
 gtk_image_set_from_icon_set
 gtk_image_set_from_pixbuf
 gtk_image_set_from_stock
-gtk_image_set_from_gicon
 gtk_image_set_pixel_size
-#endif
-#endif
-
-#if IN_HEADER(__GTK_IMAGE_MENU_ITEM_H__)
-#if IN_FILE(__GTK_IMAGE_MENU_ITEM_C__)
-gtk_image_menu_item_get_always_show_image
-gtk_image_menu_item_get_image
-gtk_image_menu_item_get_type G_GNUC_CONST
-gtk_image_menu_item_get_use_stock
-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_accel_group
-gtk_image_menu_item_set_always_show_image
-gtk_image_menu_item_set_image
-gtk_image_menu_item_set_use_stock
-#endif
-#endif
-
-#if IN_HEADER(__GTK_IM_CONTEXT_H__)
-#if IN_FILE(__GTK_IM_CONTEXT_C__)
+gtk_image_type_get_type G_GNUC_CONST
 gtk_im_context_delete_surrounding
 gtk_im_context_filter_keypress
 gtk_im_context_focus_in
@@ -1702,41 +1178,45 @@ 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 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_context_id
-gtk_im_multicontext_set_context_id
 gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_INVISIBLE_H__)
-#if IN_FILE(__GTK_INVISIBLE_C__)
+gtk_im_multicontext_set_context_id
+gtk_im_preedit_style_get_type G_GNUC_CONST
+gtk_im_status_style_get_type G_GNUC_CONST
+gtk_info_bar_add_action_widget
+gtk_info_bar_add_button
+gtk_info_bar_add_buttons
+gtk_info_bar_get_action_area
+gtk_info_bar_get_content_area
+gtk_info_bar_get_message_type
+gtk_info_bar_get_type G_GNUC_CONST
+gtk_info_bar_new
+gtk_info_bar_new_with_buttons
+gtk_info_bar_response
+gtk_info_bar_set_default_response
+gtk_info_bar_set_message_type
+gtk_info_bar_set_response_sensitive
+gtk_init
+gtk_init_abi_check
+gtk_init_check
+gtk_init_check_abi_check
+gtk_init_with_args
 gtk_invisible_get_screen
 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_LABEL_H__)
-#if IN_FILE(__GTK_LABEL_C__)
+gtk_justification_get_type G_GNUC_CONST
+gtk_key_snooper_install
+gtk_key_snooper_remove
 gtk_label_get_angle
 gtk_label_get_attributes
+gtk_label_get_current_uri
 gtk_label_get_ellipsize
 gtk_label_get_justify
 gtk_label_get_label
@@ -1751,6 +1231,7 @@ gtk_label_get_selectable
 gtk_label_get_selection_bounds
 gtk_label_get_single_line_mode
 gtk_label_get_text
+gtk_label_get_track_visited_links
 gtk_label_get_type G_GNUC_CONST
 gtk_label_get_use_markup
 gtk_label_get_use_underline
@@ -1774,17 +1255,10 @@ gtk_label_set_selectable
 gtk_label_set_single_line_mode
 gtk_label_set_text
 gtk_label_set_text_with_mnemonic
+gtk_label_set_track_visited_links
 gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_width_chars
-gtk_label_get_current_uri
-gtk_label_set_track_visited_links
-gtk_label_get_track_visited_links
-#endif
-#endif
-
-#if IN_HEADER(__GTK_LAYOUT_H__)
-#if IN_FILE(__GTK_LAYOUT_C__)
 gtk_layout_get_bin_window
 gtk_layout_get_hadjustment
 gtk_layout_get_size
@@ -1796,23 +1270,14 @@ gtk_layout_put
 gtk_layout_set_hadjustment
 gtk_layout_set_size
 gtk_layout_set_vadjustment
-#endif
-#endif
-
-#if IN_HEADER(__GTK_LINK_BUTTON_H__)
-#if IN_FILE(__GTK_LINK_BUTTON_C__)
+gtk_license_get_type G_GNUC_CONST
 gtk_link_button_get_type G_GNUC_CONST
+gtk_link_button_get_uri
+gtk_link_button_get_visited
 gtk_link_button_new
 gtk_link_button_new_with_label
-gtk_link_button_get_uri
 gtk_link_button_set_uri
-gtk_link_button_get_visited
 gtk_link_button_set_visited
-#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 G_GNUC_CONST
@@ -1835,109 +1300,32 @@ gtk_list_store_set_valist
 gtk_list_store_set_value
 gtk_list_store_set_valuesv
 gtk_list_store_swap
-#endif
-#endif
-
-#if IN_HEADER(__GTK_MAIN_H__)
-#if IN_FILE(__GTK_MAIN_C__)
-gtk_get_debug_flags
-gtk_set_debug_flags
-gtk_get_option_group
-gtk_get_current_event
-gtk_get_current_event_device
-gtk_get_current_event_state
-gtk_get_current_event_time
-gtk_false G_GNUC_CONST
-gtk_true G_GNUC_CONST
-gtk_events_pending
-gtk_disable_setlocale
-gtk_distribute_natural_allocation
-gtk_set_locale
-gtk_get_major_version
-gtk_get_minor_version
-gtk_get_micro_version
-gtk_get_binary_age
-gtk_get_interface_age
-gtk_check_version
-gtk_get_default_language
-gtk_get_event_widget
-gtk_grab_add
-gtk_grab_get_current
-gtk_grab_remove
-gtk_device_grab_add
-gtk_device_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_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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_MENU_BAR_H__)
-#if IN_FILE(__GTK_MENU_BAR_C__)
+gtk_menu_attach
+gtk_menu_attach_to_widget
+gtk_menu_bar_get_child_pack_direction
+gtk_menu_bar_get_pack_direction
 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_detach
+gtk_menu_direction_type_get_type G_GNUC_CONST
 gtk_menu_get_accel_group
 gtk_menu_get_accel_path
 gtk_menu_get_active
-gtk_menu_get_monitor
 gtk_menu_get_attach_widget
 gtk_menu_get_for_attach_widget
+gtk_menu_get_monitor
 gtk_menu_get_reserve_toggle_size
 gtk_menu_get_tearoff_state
 gtk_menu_get_title
 gtk_menu_get_type G_GNUC_CONST
-gtk_menu_new
-gtk_menu_popdown
-gtk_menu_popup
-gtk_menu_popup_for_device
-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_reserve_toggle_size
-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_accel_path
@@ -1957,28 +1345,32 @@ gtk_menu_item_set_submenu
 gtk_menu_item_set_use_underline
 gtk_menu_item_toggle_size_allocate
 gtk_menu_item_toggle_size_request
-#endif
-#endif
-
-#if IN_HEADER(__GTK_MENU_SHELL_H__)
-#if IN_FILE(__GTK_MENU_SHELL_C__)
+gtk_menu_new
+gtk_menu_popdown
+gtk_menu_popup
+gtk_menu_popup_for_device
+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_reserve_toggle_size
+gtk_menu_set_screen
+gtk_menu_set_tearoff_state
+gtk_menu_set_title
 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_take_focus
 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 G_GNUC_CONST
 gtk_menu_tool_button_new
@@ -1986,50 +1378,35 @@ gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_arrow_tooltip_markup
 gtk_menu_tool_button_set_arrow_tooltip_text
 gtk_menu_tool_button_set_menu
-#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_image
 gtk_message_dialog_get_message_area
 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_dialog_set_image
-gtk_message_dialog_get_image
-#endif
-#endif
-
-#if IN_HEADER(__GTK_MISC_H__)
-#if IN_FILE(__GTK_MISC_C__)
+gtk_message_dialog_set_markup
+gtk_message_type_get_type G_GNUC_CONST
+gtk_metric_type_get_type G_GNUC_CONST
 gtk_misc_get_alignment
 gtk_misc_get_padding
 gtk_misc_get_type G_GNUC_CONST
 gtk_misc_set_alignment
 gtk_misc_set_padding
-#endif
-#endif
-
-#if IN_HEADER(__GTK_MOUNT_OPERATION_H__)
-#if IN_FILE(__GTK_MOUNT_OPERATION_C__)
+gtk_mount_operation_get_parent
+gtk_mount_operation_get_screen
 gtk_mount_operation_get_type G_GNUC_CONST
-gtk_mount_operation_new
 gtk_mount_operation_is_showing
+gtk_mount_operation_new
 gtk_mount_operation_set_parent
-gtk_mount_operation_get_parent
 gtk_mount_operation_set_screen
-gtk_mount_operation_get_screen
-#endif
-#endif
-
-#if IN_HEADER(__GTK_NOTEBOOK_H__)
-#if IN_FILE(__GTK_NOTEBOOK_C__)
+gtk_movement_step_get_type G_GNUC_CONST
 gtk_notebook_append_page
 gtk_notebook_append_page_menu
+gtk_notebook_get_action_widget
 gtk_notebook_get_current_page
+gtk_notebook_get_group_name
 gtk_notebook_get_menu_label
 gtk_notebook_get_menu_label_text
 gtk_notebook_get_n_pages
@@ -2037,9 +1414,13 @@ gtk_notebook_get_nth_page
 gtk_notebook_get_scrollable
 gtk_notebook_get_show_border
 gtk_notebook_get_show_tabs
+gtk_notebook_get_tab_detachable
+gtk_notebook_get_tab_hborder
 gtk_notebook_get_tab_label
 gtk_notebook_get_tab_label_text
 gtk_notebook_get_tab_pos
+gtk_notebook_get_tab_reorderable
+gtk_notebook_get_tab_vborder
 gtk_notebook_get_type G_GNUC_CONST
 gtk_notebook_insert_page
 gtk_notebook_insert_page_menu
@@ -2053,535 +1434,403 @@ gtk_notebook_prepend_page_menu
 gtk_notebook_prev_page
 gtk_notebook_remove_page
 gtk_notebook_reorder_child
+gtk_notebook_set_action_widget
 gtk_notebook_set_current_page
+gtk_notebook_set_group_name
 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_detachable
 gtk_notebook_set_tab_label
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
-gtk_notebook_get_tab_hborder
-gtk_notebook_get_tab_vborder
-gtk_notebook_get_group_name
-gtk_notebook_set_group_name
-gtk_notebook_get_tab_reorderable
 gtk_notebook_set_tab_reorderable
-gtk_notebook_get_tab_detachable
-gtk_notebook_set_tab_detachable
-gtk_notebook_get_action_widget
-gtk_notebook_set_action_widget
-#endif
-#endif
-
-#if IN_HEADER(__GTK_OFFSCREEN_WINDOW_H__)
-#if IN_FILE(__GTK_OFFSCREEN_WINDOW_C__)
+gtk_notebook_tab_get_type G_GNUC_CONST
+gtk_number_up_layout_get_type G_GNUC_CONST
+gtk_offscreen_window_get_pixbuf
+gtk_offscreen_window_get_surface
 gtk_offscreen_window_get_type G_GNUC_CONST
 gtk_offscreen_window_new
-gtk_offscreen_window_get_surface
-gtk_offscreen_window_get_pixbuf
-#endif
-#endif
-
-#if IN_HEADER(__GTK_ORIENTABLE_H__)
-#if IN_FILE(__GTK_ORIENTABLE_C__)
 gtk_orientable_get_orientation
 gtk_orientable_get_type G_GNUC_CONST
 gtk_orientable_set_orientation
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PANED_H__)
-#if IN_FILE(__GTK_PANED_C__)
-gtk_paned_new
-gtk_paned_add1
-gtk_paned_add2
-gtk_paned_get_child1
-gtk_paned_get_child2
-gtk_paned_get_handle_window
-gtk_paned_get_position
-gtk_paned_get_type G_GNUC_CONST
-gtk_paned_pack1
-gtk_paned_pack2
-gtk_paned_set_position
-#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_PLUG_H__)
-#if IN_FILE(__GTK_PLUG_C__)
-gtk_plug_construct
-gtk_plug_construct_for_display
-gtk_plug_get_id
-gtk_plug_get_embedded
-gtk_plug_get_socket_window
-gtk_plug_get_type G_GNUC_CONST
-gtk_plug_new
-gtk_plug_new_for_display
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PAGE_SETUP_H__)
-#if IN_FILE(__GTK_PAGE_SETUP_C__)
-gtk_page_setup_get_type G_GNUC_CONST
-gtk_page_setup_new
-gtk_page_setup_new_from_file
-gtk_page_setup_new_from_key_file
-gtk_page_setup_load_file
-gtk_page_setup_load_key_file
-gtk_page_setup_to_file
-gtk_page_setup_to_key_file
+gtk_orientation_get_type G_GNUC_CONST
+gtk_pack_direction_get_type G_GNUC_CONST
+gtk_pack_type_get_type G_GNUC_CONST
+gtk_page_orientation_get_type G_GNUC_CONST
+gtk_page_set_get_type G_GNUC_CONST
 gtk_page_setup_copy
+gtk_page_setup_get_bottom_margin
+gtk_page_setup_get_left_margin
 gtk_page_setup_get_orientation
-gtk_page_setup_set_orientation
+gtk_page_setup_get_page_height
+gtk_page_setup_get_page_width
+gtk_page_setup_get_paper_height
 gtk_page_setup_get_paper_size
-gtk_page_setup_set_paper_size
+gtk_page_setup_get_paper_width
+gtk_page_setup_get_right_margin
 gtk_page_setup_get_top_margin
-gtk_page_setup_set_top_margin
-gtk_page_setup_get_bottom_margin
+gtk_page_setup_get_type G_GNUC_CONST
+gtk_page_setup_load_file
+gtk_page_setup_load_key_file
+gtk_page_setup_new
+gtk_page_setup_new_from_file
+gtk_page_setup_new_from_key_file
 gtk_page_setup_set_bottom_margin
-gtk_page_setup_get_left_margin
 gtk_page_setup_set_left_margin
-gtk_page_setup_get_right_margin
-gtk_page_setup_set_right_margin
+gtk_page_setup_set_orientation
+gtk_page_setup_set_paper_size
 gtk_page_setup_set_paper_size_and_default_margins
-gtk_page_setup_get_paper_width
-gtk_page_setup_get_paper_height
-gtk_page_setup_get_page_width
-gtk_page_setup_get_page_height
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PAGE_SETUP_UNIX_DIALOG_H__)
-#if IN_FILE(__GTK_PAGE_SETUP_UNIX_DIALOG_C__)
-#ifdef G_OS_UNIX
+gtk_page_setup_set_right_margin
+gtk_page_setup_set_top_margin
+gtk_page_setup_to_file
+gtk_page_setup_to_key_file
+gtk_page_setup_unix_dialog_get_page_setup
+gtk_page_setup_unix_dialog_get_print_settings
 gtk_page_setup_unix_dialog_get_type G_GNUC_CONST
 gtk_page_setup_unix_dialog_new
 gtk_page_setup_unix_dialog_set_page_setup
-gtk_page_setup_unix_dialog_get_page_setup
 gtk_page_setup_unix_dialog_set_print_settings
-gtk_page_setup_unix_dialog_get_print_settings
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PAPER_SIZE_H__)
-#if IN_FILE(__GTK_PAPER_SIZE_C__)
-gtk_paper_size_get_type G_GNUC_CONST
-gtk_paper_size_new
-gtk_paper_size_new_from_ppd
-gtk_paper_size_new_custom
-gtk_paper_size_new_from_key_file
-gtk_paper_size_to_key_file
+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_resize_grip
+gtk_paint_shadow
+gtk_paint_shadow_gap
+gtk_paint_slider
+gtk_paint_spinner
+gtk_paint_tab
+gtk_paint_vline
+gtk_paned_add1
+gtk_paned_add2
+gtk_paned_get_child1
+gtk_paned_get_child2
+gtk_paned_get_handle_window
+gtk_paned_get_position
+gtk_paned_get_type G_GNUC_CONST
+gtk_paned_new
+gtk_paned_pack1
+gtk_paned_pack2
+gtk_paned_set_position
 gtk_paper_size_copy
 gtk_paper_size_free
-gtk_paper_size_is_equal
-gtk_paper_size_get_paper_sizes
-gtk_paper_size_get_name
+gtk_paper_size_get_default
+gtk_paper_size_get_default_bottom_margin
+gtk_paper_size_get_default_left_margin
+gtk_paper_size_get_default_right_margin
+gtk_paper_size_get_default_top_margin
 gtk_paper_size_get_display_name
+gtk_paper_size_get_height
+gtk_paper_size_get_name
+gtk_paper_size_get_paper_sizes
 gtk_paper_size_get_ppd_name
+gtk_paper_size_get_type G_GNUC_CONST
 gtk_paper_size_get_width
-gtk_paper_size_get_height
 gtk_paper_size_is_custom
+gtk_paper_size_is_equal
+gtk_paper_size_new
+gtk_paper_size_new_custom
+gtk_paper_size_new_from_key_file
+gtk_paper_size_new_from_ppd
 gtk_paper_size_set_size
-gtk_paper_size_get_default_top_margin
-gtk_paper_size_get_default_bottom_margin
-gtk_paper_size_get_default_left_margin
-gtk_paper_size_get_default_right_margin
-gtk_paper_size_get_default
-#endif
-#endif
-
-#if IN_HEADER(__GTK_CUSTOM_PAPER_UNIX_DIALOG_H__)
-#if IN_FILE(__GTK_CUSTOM_PAPER_UNIX_DIALOG_C__)
-#ifdef G_OS_UNIX
-gtk_custom_paper_unix_dialog_get_type G_GNUC_CONST
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_BACKEND_H__)
-#if IN_FILE(__GTK_PRINT_BACKEND_C__)
-#ifdef G_OS_UNIX
-gtk_print_backend_error_quark
-gtk_print_backend_get_type G_GNUC_CONST
+gtk_paper_size_to_key_file
+gtk_parse_args
+gtk_path_bar_get_type G_GNUC_CONST
+gtk_path_priority_type_get_type G_GNUC_CONST
+gtk_path_type_get_type G_GNUC_CONST
+gtk_plug_construct
+gtk_plug_construct_for_display
+gtk_plug_get_embedded
+gtk_plug_get_id
+gtk_plug_get_socket_window
+gtk_plug_get_type G_GNUC_CONST
+gtk_plug_new
+gtk_plug_new_for_display
+gtk_policy_type_get_type G_GNUC_CONST
+gtk_position_type_get_type G_GNUC_CONST
 gtk_print_backend_add_printer
-gtk_print_backend_remove_printer
-gtk_print_backend_set_list_done
 gtk_print_backend_destroy
+gtk_print_backend_error_quark
+gtk_print_backend_find_printer
 gtk_print_backend_get_printer_list
+gtk_print_backend_get_type G_GNUC_CONST
+gtk_print_backend_load_modules
 gtk_print_backend_printer_list_is_done
-gtk_print_backend_find_printer
 gtk_print_backend_print_stream
-gtk_print_backend_load_modules
+gtk_print_backend_remove_printer
+gtk_print_backend_set_list_done
 gtk_print_backend_set_password
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_CONTEXT_H__)
-#if IN_FILE(__GTK_PRINT_CONTEXT_C__)
-gtk_print_context_get_type G_GNUC_CONST
+gtk_print_capabilities_get_type G_GNUC_CONST
+gtk_print_context_create_pango_context
+gtk_print_context_create_pango_layout
 gtk_print_context_get_cairo_context
-gtk_print_context_get_page_setup
-gtk_print_context_get_width
-gtk_print_context_get_height
 gtk_print_context_get_dpi_x
 gtk_print_context_get_dpi_y
 gtk_print_context_get_hard_margins
+gtk_print_context_get_height
+gtk_print_context_get_page_setup
 gtk_print_context_get_pango_fontmap
-gtk_print_context_create_pango_context
-gtk_print_context_create_pango_layout
+gtk_print_context_get_type G_GNUC_CONST
+gtk_print_context_get_width
 gtk_print_context_set_cairo_context
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINTER_H__)
-#if IN_FILE(__GTK_PRINTER_C__)
-#ifdef G_OS_UNIX
-gtk_printer_get_type G_GNUC_CONST
-gtk_printer_get_backend
-gtk_printer_get_name
-gtk_printer_get_description
-gtk_printer_get_default_page_size
-gtk_printer_get_state_message
-gtk_printer_get_location
-gtk_printer_get_icon_name
-gtk_printer_get_job_count
-gtk_printer_is_virtual
-gtk_printer_list_papers
+gtk_print_duplex_get_type G_GNUC_CONST
 gtk_printer_accepts_pdf
 gtk_printer_accepts_ps
 gtk_printer_compare
-gtk_printer_has_details
-gtk_printer_request_details
+gtk_printer_get_backend
 gtk_printer_get_capabilities
+gtk_printer_get_default_page_size
+gtk_printer_get_description
 gtk_printer_get_hard_margins
-gtk_enumerate_printers
-gtk_print_capabilities_get_type G_GNUC_CONST
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_BACKEND_H__)
-#if IN_FILE(__GTK_PRINTER_C__)
-#ifdef G_OS_UNIX
-gtk_printer_new
-gtk_printer_set_description
-gtk_printer_set_has_details
-gtk_printer_set_icon_name
-gtk_printer_set_is_active
-gtk_printer_set_is_paused
-gtk_printer_set_is_accepting_jobs
-gtk_printer_set_is_default
-gtk_printer_set_is_new
-gtk_printer_set_job_count
-gtk_printer_set_location
-gtk_printer_set_state_message
-gtk_printer_is_active
-gtk_printer_is_paused
+gtk_printer_get_icon_name
+gtk_printer_get_job_count
+gtk_printer_get_location
+gtk_printer_get_name
+gtk_printer_get_state_message
+gtk_printer_get_type G_GNUC_CONST
+gtk_printer_has_details
 gtk_printer_is_accepting_jobs
-gtk_printer_is_new
+gtk_printer_is_active
 gtk_printer_is_default
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINTER_OPTION_H__)
-#if IN_FILE(__GTK_PRINTER_OPTION_C__)
-#ifdef G_OS_UNIX
+gtk_printer_is_new
+gtk_printer_is_paused
+gtk_printer_is_virtual
+gtk_printer_list_papers
+gtk_printer_new
+gtk_printer_option_allocate_choices
+gtk_printer_option_choices_from_array
+gtk_printer_option_clear_has_conflict
+gtk_printer_option_get_activates_default
 gtk_printer_option_get_type
 gtk_printer_option_has_choice
 gtk_printer_option_new
 gtk_printer_option_set
-gtk_printer_option_set_has_conflict
-gtk_printer_option_clear_has_conflict
-gtk_printer_option_set_boolean
-gtk_printer_option_allocate_choices
-gtk_printer_option_choices_from_array
 gtk_printer_option_set_activates_default
-gtk_printer_option_get_activates_default
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINTER_OPTION_SET_H__)
-#if IN_FILE(__GTK_PRINTER_OPTION_SET_C__)
-#ifdef G_OS_UNIX
-gtk_printer_option_set_get_type G_GNUC_CONST
-gtk_printer_option_set_new
 gtk_printer_option_set_add
-gtk_printer_option_set_lookup
-gtk_printer_option_set_remove
-gtk_printer_option_set_foreach
+gtk_printer_option_set_boolean
 gtk_printer_option_set_clear_conflicts
-gtk_printer_option_set_get_groups
+gtk_printer_option_set_foreach
 gtk_printer_option_set_foreach_in_group
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINTER_OPTION_WIDGET_H__)
-#if IN_FILE(__GTK_PRINTER_OPTION_WIDGET_C__)
-#ifdef G_OS_UNIX
+gtk_printer_option_set_get_groups
+gtk_printer_option_set_get_type G_GNUC_CONST
+gtk_printer_option_set_has_conflict
+gtk_printer_option_set_lookup
+gtk_printer_option_set_new
+gtk_printer_option_set_remove
+gtk_printer_option_widget_get_external_label
 gtk_printer_option_widget_get_type G_GNUC_CONST
+gtk_printer_option_widget_get_value
+gtk_printer_option_widget_has_external_label
 gtk_printer_option_widget_new
 gtk_printer_option_widget_set_source
-gtk_printer_option_widget_has_external_label
-gtk_printer_option_widget_get_external_label
-gtk_printer_option_widget_get_value
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_JOB_H__)
-#if IN_FILE(__GTK_PRINT_JOB_C__)
-#ifdef G_OS_UNIX
-gtk_print_job_get_type G_GNUC_CONST
-gtk_print_job_new
-gtk_print_job_get_settings
+gtk_printer_request_details
+gtk_print_error_get_type G_GNUC_CONST
+gtk_print_error_quark
+gtk_printer_set_description
+gtk_printer_set_has_details
+gtk_printer_set_icon_name
+gtk_printer_set_is_accepting_jobs
+gtk_printer_set_is_active
+gtk_printer_set_is_default
+gtk_printer_set_is_new
+gtk_printer_set_is_paused
+gtk_printer_set_job_count
+gtk_printer_set_location
+gtk_printer_set_state_message
 gtk_print_job_get_printer
-gtk_print_job_get_title
+gtk_print_job_get_settings
 gtk_print_job_get_status
-gtk_print_job_set_source_file
 gtk_print_job_get_surface
-gtk_print_job_send
-gtk_print_job_set_track_print_status
+gtk_print_job_get_title
 gtk_print_job_get_track_print_status
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINTER_PRIVATE_H__)
-#if IN_FILE(__GTK_PRINT_JOB_C__)
-#ifdef G_OS_UNIX
+gtk_print_job_get_type G_GNUC_CONST
+gtk_print_job_new
+gtk_print_job_send
+gtk_print_job_set_source_file
 gtk_print_job_set_status
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_OPERATION_H__)
-#if IN_FILE(__GTK_PRINT_OPERATION_C__)
-gtk_print_error_quark
-gtk_print_operation_get_type G_GNUC_CONST
-gtk_print_operation_new
-gtk_print_operation_set_allow_async
-gtk_print_operation_set_default_page_setup
+gtk_print_job_set_track_print_status
+gtk_print_operation_action_get_type G_GNUC_CONST
+gtk_print_operation_cancel
+gtk_print_operation_draw_page_finish
 gtk_print_operation_get_default_page_setup
-gtk_print_operation_set_print_settings
+gtk_print_operation_get_embed_page_setup
+gtk_print_operation_get_error
+gtk_print_operation_get_has_selection
 gtk_print_operation_get_n_pages_to_print
 gtk_print_operation_get_print_settings
-gtk_print_operation_set_job_name
-gtk_print_operation_set_n_pages
-gtk_print_operation_set_current_page
-gtk_print_operation_set_use_full_page
-gtk_print_operation_set_unit
-gtk_print_operation_set_export_filename
-gtk_print_operation_set_track_print_status
-gtk_print_operation_set_show_progress
-gtk_print_operation_set_custom_tab_label
-gtk_print_operation_get_error
-gtk_print_operation_run
 gtk_print_operation_get_status
 gtk_print_operation_get_status_string
-gtk_print_operation_is_finished
-gtk_print_operation_cancel
-gtk_print_operation_draw_page_finish
-gtk_print_operation_set_defer_drawing
-gtk_print_operation_set_support_selection
 gtk_print_operation_get_support_selection
-gtk_print_operation_set_has_selection
-gtk_print_operation_get_has_selection
-gtk_print_operation_set_embed_page_setup
-gtk_print_operation_get_embed_page_setup
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_OPERATION_PREVIEW_H__)
-#if IN_FILE(__GTK_PRINT_OPERATION_PREVIEW_C__)
+gtk_print_operation_get_type G_GNUC_CONST
+gtk_print_operation_is_finished
+gtk_print_operation_new
 gtk_print_operation_preview_end_preview
 gtk_print_operation_preview_get_type
 gtk_print_operation_preview_is_selected
 gtk_print_operation_preview_render_page
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_OPERATION_H__)
-#if IN_FILE(__GTK_PRINT_OPERATION_UNIX_C__)
-#ifdef G_OS_UNIX
+gtk_print_operation_result_get_type G_GNUC_CONST
+gtk_print_operation_run
+gtk_print_operation_set_allow_async
+gtk_print_operation_set_current_page
+gtk_print_operation_set_custom_tab_label
+gtk_print_operation_set_default_page_setup
+gtk_print_operation_set_defer_drawing
+gtk_print_operation_set_embed_page_setup
+gtk_print_operation_set_export_filename
+gtk_print_operation_set_has_selection
+gtk_print_operation_set_job_name
+gtk_print_operation_set_n_pages
+gtk_print_operation_set_print_settings
+gtk_print_operation_set_show_progress
+gtk_print_operation_set_support_selection
+gtk_print_operation_set_track_print_status
+gtk_print_operation_set_unit
+gtk_print_operation_set_use_full_page
+gtk_print_pages_get_type G_GNUC_CONST
+gtk_print_quality_get_type G_GNUC_CONST
 gtk_print_run_page_setup_dialog
-gtk_print_run_page_setup_dialog_async
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_OPERATION_H__)
-#if IN_FILE(__GTK_PRINT_OPERATION_WIN32_C__)
-#ifdef G_OS_WIN32
 gtk_print_run_page_setup_dialog
 gtk_print_run_page_setup_dialog_async
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_SETTINGS_H__)
-#if IN_FILE(__GTK_PRINT_SETTINGS_C__)
-gtk_print_settings_get_type G_GNUC_CONST
-gtk_print_settings_new
-gtk_print_settings_new_from_file
-gtk_print_settings_new_from_key_file
-gtk_print_settings_load_file
-gtk_print_settings_load_key_file
-gtk_print_settings_to_file
-gtk_print_settings_to_key_file
+gtk_print_run_page_setup_dialog_async
 gtk_print_settings_copy
-gtk_print_settings_has_key
-gtk_print_settings_get
-gtk_print_settings_set
-gtk_print_settings_unset
 gtk_print_settings_foreach
+gtk_print_settings_get
 gtk_print_settings_get_bool
-gtk_print_settings_set_bool
+gtk_print_settings_get_collate
+gtk_print_settings_get_default_source
+gtk_print_settings_get_dither
 gtk_print_settings_get_double
 gtk_print_settings_get_double_with_default
-gtk_print_settings_set_double
-gtk_print_settings_get_length
-gtk_print_settings_set_length
+gtk_print_settings_get_duplex
+gtk_print_settings_get_finishings
 gtk_print_settings_get_int
 gtk_print_settings_get_int_with_default
-gtk_print_settings_set_int
-gtk_print_settings_get_printer
-gtk_print_settings_set_printer
+gtk_print_settings_get_length
+gtk_print_settings_get_media_type
+gtk_print_settings_get_n_copies
+gtk_print_settings_get_number_up
+gtk_print_settings_get_number_up_layout
 gtk_print_settings_get_orientation
-gtk_print_settings_set_orientation
+gtk_print_settings_get_output_bin
+gtk_print_settings_get_page_ranges
+gtk_print_settings_get_page_set
+gtk_print_settings_get_paper_height
 gtk_print_settings_get_paper_size
-gtk_print_settings_set_paper_size
 gtk_print_settings_get_paper_width
-gtk_print_settings_set_paper_width
-gtk_print_settings_get_paper_height
-gtk_print_settings_set_paper_height
-gtk_print_settings_get_use_color
-gtk_print_settings_set_use_color
-gtk_print_settings_get_collate
-gtk_print_settings_set_collate
-gtk_print_settings_get_reverse
-gtk_print_settings_set_reverse
-gtk_print_settings_get_duplex
-gtk_print_settings_set_duplex
+gtk_print_settings_get_printer
+gtk_print_settings_get_printer_lpi
+gtk_print_settings_get_print_pages
 gtk_print_settings_get_quality
-gtk_print_settings_set_quality
-gtk_print_settings_get_n_copies
-gtk_print_settings_set_n_copies
-gtk_print_settings_get_number_up
-gtk_print_settings_set_number_up
-gtk_print_settings_get_number_up_layout
-gtk_print_settings_set_number_up_layout
 gtk_print_settings_get_resolution
-gtk_print_settings_set_resolution
 gtk_print_settings_get_resolution_x
 gtk_print_settings_get_resolution_y
-gtk_print_settings_set_resolution_xy
-gtk_print_settings_get_printer_lpi
-gtk_print_settings_set_printer_lpi
+gtk_print_settings_get_reverse
 gtk_print_settings_get_scale
-gtk_print_settings_set_scale
-gtk_print_settings_get_print_pages
-gtk_print_settings_set_print_pages
-gtk_print_settings_get_page_ranges
-gtk_print_settings_set_page_ranges
-gtk_print_settings_get_page_set
-gtk_print_settings_set_page_set
-gtk_print_settings_get_default_source
+gtk_print_settings_get_type G_GNUC_CONST
+gtk_print_settings_get_use_color
+gtk_print_settings_has_key
+gtk_print_settings_load_file
+gtk_print_settings_load_key_file
+gtk_print_settings_new
+gtk_print_settings_new_from_file
+gtk_print_settings_new_from_key_file
+gtk_print_settings_set
+gtk_print_settings_set_bool
+gtk_print_settings_set_collate
 gtk_print_settings_set_default_source
-gtk_print_settings_get_media_type
-gtk_print_settings_set_media_type
-gtk_print_settings_get_dither
 gtk_print_settings_set_dither
-gtk_print_settings_get_finishings
+gtk_print_settings_set_double
+gtk_print_settings_set_duplex
 gtk_print_settings_set_finishings
-gtk_print_settings_get_output_bin
+gtk_print_settings_set_int
+gtk_print_settings_set_length
+gtk_print_settings_set_media_type
+gtk_print_settings_set_n_copies
+gtk_print_settings_set_number_up
+gtk_print_settings_set_number_up_layout
+gtk_print_settings_set_orientation
 gtk_print_settings_set_output_bin
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_UNIX_DIALOG_H__)
-#if IN_FILE(__GTK_PRINT_UNIX_DIALOG_C__)
-#ifdef G_OS_UNIX
+gtk_print_settings_set_page_ranges
+gtk_print_settings_set_page_set
+gtk_print_settings_set_paper_height
+gtk_print_settings_set_paper_size
+gtk_print_settings_set_paper_width
+gtk_print_settings_set_printer
+gtk_print_settings_set_printer_lpi
+gtk_print_settings_set_print_pages
+gtk_print_settings_set_quality
+gtk_print_settings_set_resolution
+gtk_print_settings_set_resolution_xy
+gtk_print_settings_set_reverse
+gtk_print_settings_set_scale
+gtk_print_settings_set_use_color
+gtk_print_settings_to_file
+gtk_print_settings_to_key_file
+gtk_print_settings_unset
+gtk_print_status_get_type G_GNUC_CONST
+gtk_print_unix_dialog_add_custom_tab
+gtk_print_unix_dialog_get_current_page
+gtk_print_unix_dialog_get_embed_page_setup
+gtk_print_unix_dialog_get_has_selection
+gtk_print_unix_dialog_get_manual_capabilities
+gtk_print_unix_dialog_get_page_setup
+gtk_print_unix_dialog_get_page_setup_set
+gtk_print_unix_dialog_get_selected_printer
+gtk_print_unix_dialog_get_settings
+gtk_print_unix_dialog_get_support_selection
 gtk_print_unix_dialog_get_type G_GNUC_CONST
 gtk_print_unix_dialog_new
-gtk_print_unix_dialog_set_page_setup
-gtk_print_unix_dialog_get_page_setup
 gtk_print_unix_dialog_set_current_page
-gtk_print_unix_dialog_get_current_page
-gtk_print_unix_dialog_set_settings
-gtk_print_unix_dialog_get_settings
-gtk_print_unix_dialog_get_selected_printer
-gtk_print_unix_dialog_add_custom_tab
+gtk_print_unix_dialog_set_embed_page_setup
+gtk_print_unix_dialog_set_has_selection
 gtk_print_unix_dialog_set_manual_capabilities
-gtk_print_unix_dialog_get_manual_capabilities
+gtk_print_unix_dialog_set_page_setup
+gtk_print_unix_dialog_set_settings
 gtk_print_unix_dialog_set_support_selection
-gtk_print_unix_dialog_get_support_selection
-gtk_print_unix_dialog_set_has_selection
-gtk_print_unix_dialog_get_has_selection
-gtk_print_unix_dialog_set_embed_page_setup
-gtk_print_unix_dialog_get_embed_page_setup
-gtk_print_unix_dialog_get_page_setup_set
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_PRINT_WIN32_H__)
-#if IN_FILE(__GTK_PRINT_WIN32_C__)
-#ifdef G_OS_WIN32
 gtk_print_win32_devnames_free
+gtk_print_win32_devnames_from_printer_name
 gtk_print_win32_devnames_from_win32
 gtk_print_win32_devnames_to_win32
-gtk_print_win32_devnames_from_printer_name
-#endif
-#endif
-#endif
-
-
-#if IN_HEADER(__GTK_PROGRESS_BAR_H__)
-#if IN_FILE(__GTK_PROGRESS_BAR_C__)
+gtk_progress_bar_get_ellipsize
 gtk_progress_bar_get_fraction
 gtk_progress_bar_get_inverted
 gtk_progress_bar_get_pulse_step
+gtk_progress_bar_get_show_text
 gtk_progress_bar_get_text
-gtk_progress_bar_get_ellipsize
 gtk_progress_bar_get_type G_GNUC_CONST
 gtk_progress_bar_new
 gtk_progress_bar_pulse
+gtk_progress_bar_set_ellipsize
 gtk_progress_bar_set_fraction
 gtk_progress_bar_set_inverted
 gtk_progress_bar_set_pulse_step
-gtk_progress_bar_set_text
-gtk_progress_bar_set_ellipsize
 gtk_progress_bar_set_show_text
-gtk_progress_bar_get_show_text
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RADIO_ACTION_H__)
-#if IN_FILE(__GTK_RADIO_ACTION_C__)
+gtk_progress_bar_set_text
+gtk_propagate_event
+gtk_quit_add
+gtk_quit_add_destroy
+gtk_quit_add_full
+gtk_quit_remove
+gtk_quit_remove_by_data
 gtk_radio_action_get_current_value
 gtk_radio_action_get_group
 gtk_radio_action_get_type G_GNUC_CONST
+gtk_radio_action_join_group
 gtk_radio_action_new
 gtk_radio_action_set_current_value
 gtk_radio_action_set_group
-gtk_radio_action_join_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 G_GNUC_CONST
 gtk_radio_button_join_group
@@ -2592,11 +1841,6 @@ 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 G_GNUC_CONST
 gtk_radio_menu_item_new
@@ -2606,11 +1850,6 @@ 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 G_GNUC_CONST
 gtk_radio_tool_button_new
@@ -2618,11 +1857,6 @@ 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_fill_level
 gtk_range_get_flippable
@@ -2652,14 +1886,10 @@ gtk_range_set_slider_size_fixed
 gtk_range_set_update_policy
 gtk_range_set_upper_stepper_sensitivity
 gtk_range_set_value
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RC_H__)
-#if IN_FILE(__GTK_RC_C__)
 gtk_rc_add_default_file
 gtk_rc_find_module_in_path
 gtk_rc_find_pixmap_in_path
+gtk_rc_flags_get_type G_GNUC_CONST
 gtk_rc_get_default_files
 gtk_rc_get_im_module_file
 gtk_rc_get_im_module_path
@@ -2673,6 +1903,11 @@ gtk_rc_parse_color_full
 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
@@ -2681,231 +1916,151 @@ gtk_rc_set_default_files
 gtk_rc_style_copy
 gtk_rc_style_get_type G_GNUC_CONST
 gtk_rc_style_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_ACTION_H__)
-#if IN_FILE(__GTK_RECENT_ACTION_C__)
+gtk_rc_token_type_get_type G_GNUC_CONST
+gtk_recent_action_get_show_numbers
 gtk_recent_action_get_type G_GNUC_CONST
 gtk_recent_action_new
 gtk_recent_action_new_for_manager
 gtk_recent_action_set_show_numbers
-gtk_recent_action_get_show_numbers
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_CHOOSER_H__)
-#if IN_FILE(__GTK_RECENT_CHOOSER_C__)
-gtk_recent_chooser_set_show_private
-gtk_recent_chooser_get_show_private
-gtk_recent_chooser_set_show_not_found
-gtk_recent_chooser_get_show_not_found
-gtk_recent_chooser_set_show_icons
-gtk_recent_chooser_get_show_icons
-gtk_recent_chooser_set_select_multiple
-gtk_recent_chooser_get_select_multiple
-gtk_recent_chooser_set_local_only
-gtk_recent_chooser_get_local_only
-gtk_recent_chooser_set_limit
+gtk_recent_chooser_add_filter
+gtk_recent_chooser_dialog_get_type G_GNUC_CONST
+gtk_recent_chooser_dialog_new_for_manager G_GNUC_NULL_TERMINATED
+gtk_recent_chooser_dialog_new G_GNUC_NULL_TERMINATED
+gtk_recent_chooser_error_get_type G_GNUC_CONST
+gtk_recent_chooser_error_quark
+gtk_recent_chooser_get_current_item
+gtk_recent_chooser_get_current_uri
+gtk_recent_chooser_get_filter
+gtk_recent_chooser_get_items
 gtk_recent_chooser_get_limit
-gtk_recent_chooser_set_show_tips
+gtk_recent_chooser_get_local_only
+gtk_recent_chooser_get_select_multiple
+gtk_recent_chooser_get_show_icons
+gtk_recent_chooser_get_show_not_found
+gtk_recent_chooser_get_show_private
 gtk_recent_chooser_get_show_tips
-gtk_recent_chooser_set_sort_type
 gtk_recent_chooser_get_sort_type
-gtk_recent_chooser_set_sort_func
-gtk_recent_chooser_set_current_uri
-gtk_recent_chooser_get_current_uri
-gtk_recent_chooser_get_current_item
-gtk_recent_chooser_select_uri
-gtk_recent_chooser_unselect_uri
-gtk_recent_chooser_select_all
-gtk_recent_chooser_unselect_all
-gtk_recent_chooser_get_items
+gtk_recent_chooser_get_type G_GNUC_CONST
 gtk_recent_chooser_get_uris
-gtk_recent_chooser_add_filter
-gtk_recent_chooser_remove_filter
 gtk_recent_chooser_list_filters
-gtk_recent_chooser_set_filter
-gtk_recent_chooser_get_filter
-gtk_recent_chooser_get_type G_GNUC_CONST
-gtk_recent_chooser_error_quark
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_CHOOSER_DIALOG_H__)
-#if IN_FILE(__GTK_RECENT_CHOOSER_DIALOG_C__)
-gtk_recent_chooser_dialog_get_type G_GNUC_CONST
-gtk_recent_chooser_dialog_new G_GNUC_NULL_TERMINATED
-gtk_recent_chooser_dialog_new_for_manager G_GNUC_NULL_TERMINATED
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_CHOOSER_MENU_H__)
-#if IN_FILE(__GTK_RECENT_CHOOSER_MENU_C__)
+gtk_recent_chooser_menu_get_show_numbers
 gtk_recent_chooser_menu_get_type G_GNUC_CONST
 gtk_recent_chooser_menu_new
 gtk_recent_chooser_menu_new_for_manager
-gtk_recent_chooser_menu_get_show_numbers
 gtk_recent_chooser_menu_set_show_numbers
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_CHOOSER_WIDGET_H__)
-#if IN_FILE(__GTK_RECENT_CHOOSER_WIDGET_C__)
+gtk_recent_chooser_remove_filter
+gtk_recent_chooser_select_all
+gtk_recent_chooser_select_uri
+gtk_recent_chooser_set_current_uri
+gtk_recent_chooser_set_filter
+gtk_recent_chooser_set_limit
+gtk_recent_chooser_set_local_only
+gtk_recent_chooser_set_select_multiple
+gtk_recent_chooser_set_show_icons
+gtk_recent_chooser_set_show_not_found
+gtk_recent_chooser_set_show_private
+gtk_recent_chooser_set_show_tips
+gtk_recent_chooser_set_sort_func
+gtk_recent_chooser_set_sort_type
+gtk_recent_chooser_unselect_all
+gtk_recent_chooser_unselect_uri
 gtk_recent_chooser_widget_get_type G_GNUC_CONST
 gtk_recent_chooser_widget_new
 gtk_recent_chooser_widget_new_for_manager
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_FILTER_H__)
-#if IN_FILE(__GTK_RECENT_FILTER_C__)
-gtk_recent_filter_get_type G_GNUC_CONST
-gtk_recent_filter_new
-gtk_recent_filter_set_name
-gtk_recent_filter_get_name
+gtk_recent_filter_add_age
+gtk_recent_filter_add_application
+gtk_recent_filter_add_custom
+gtk_recent_filter_add_group
 gtk_recent_filter_add_mime_type
 gtk_recent_filter_add_pattern
 gtk_recent_filter_add_pixbuf_formats
-gtk_recent_filter_add_application
-gtk_recent_filter_add_group
-gtk_recent_filter_add_age
-gtk_recent_filter_add_custom
-gtk_recent_filter_get_needed
 gtk_recent_filter_filter
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RECENT_MANAGER_H__)
-#if IN_FILE(__GTK_RECENT_MANAGER_C__)
-gtk_recent_manager_error_quark
-gtk_recent_manager_get_type G_GNUC_CONST
-gtk_recent_manager_new
-gtk_recent_manager_get_items
-gtk_recent_manager_get_default
-gtk_recent_manager_add_item
-gtk_recent_manager_add_full
-gtk_recent_manager_remove_item
-gtk_recent_manager_lookup_item
-gtk_recent_manager_has_item
-gtk_recent_manager_move_item
-gtk_recent_manager_purge_items
-gtk_recent_info_get_type G_GNUC_CONST
-gtk_recent_info_ref
-gtk_recent_info_unref
-gtk_recent_info_get_uri
-gtk_recent_info_get_display_name
-gtk_recent_info_get_description
-gtk_recent_info_get_mime_type
+gtk_recent_filter_flags_get_type G_GNUC_CONST
+gtk_recent_filter_get_name
+gtk_recent_filter_get_needed
+gtk_recent_filter_get_type G_GNUC_CONST
+gtk_recent_filter_new
+gtk_recent_filter_set_name
+gtk_recent_info_create_app_info
+gtk_recent_info_exists
 gtk_recent_info_get_added
-gtk_recent_info_get_modified
-gtk_recent_info_get_visited
-gtk_recent_info_get_private_hint
+gtk_recent_info_get_age
 gtk_recent_info_get_application_info
 gtk_recent_info_get_applications G_GNUC_MALLOC
-gtk_recent_info_last_application G_GNUC_MALLOC
-gtk_recent_info_has_application
-gtk_recent_info_create_app_info
+gtk_recent_info_get_description
+gtk_recent_info_get_display_name
+gtk_recent_info_get_gicon
 gtk_recent_info_get_groups G_GNUC_MALLOC
-gtk_recent_info_has_group
 gtk_recent_info_get_icon
-gtk_recent_info_get_gicon
+gtk_recent_info_get_mime_type
+gtk_recent_info_get_modified
+gtk_recent_info_get_private_hint
 gtk_recent_info_get_short_name G_GNUC_MALLOC
+gtk_recent_info_get_type G_GNUC_CONST
+gtk_recent_info_get_uri
 gtk_recent_info_get_uri_display G_GNUC_MALLOC
-gtk_recent_info_get_age
+gtk_recent_info_get_visited
+gtk_recent_info_has_application
+gtk_recent_info_has_group
 gtk_recent_info_is_local
-gtk_recent_info_exists
+gtk_recent_info_last_application G_GNUC_MALLOC
 gtk_recent_info_match
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEST_UTILS_H__)
-#if IN_FILE(__GTK_TEST_UTILS_C__)
-gtk_test_create_simple_window
-gtk_test_create_widget
-gtk_test_display_button_window
-gtk_test_find_label
-gtk_test_find_sibling
-gtk_test_find_widget
-gtk_test_init
-gtk_test_register_all_types
-gtk_test_list_all_types
-gtk_test_slider_get_value
-gtk_test_slider_set_perc
-gtk_test_spin_button_click
-gtk_test_text_get
-gtk_test_text_set
-gtk_test_widget_click
-gtk_test_widget_send_key
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEXT_BUFFER_RICH_TEXT_H__)
-#if IN_FILE(__GTK_TEXT_BUFFER_RICH_TEXT_C__)
-gtk_text_buffer_deserialize
-gtk_text_buffer_deserialize_get_can_create_tags
-gtk_text_buffer_deserialize_set_can_create_tags
-gtk_text_buffer_get_deserialize_formats
-gtk_text_buffer_get_serialize_formats
-gtk_text_buffer_register_deserialize_format
-gtk_text_buffer_register_deserialize_tagset
-gtk_text_buffer_register_serialize_format
-gtk_text_buffer_register_serialize_tagset
-gtk_text_buffer_serialize
-gtk_text_buffer_unregister_deserialize_format
-gtk_text_buffer_unregister_serialize_format
-#endif
-#endif
-
-#if IN_HEADER(__GTK_RULER_H__)
-#if IN_FILE(__GTK_RULER_C__)
-gtk_ruler_new
+gtk_recent_info_ref
+gtk_recent_info_unref
+gtk_recent_manager_add_full
+gtk_recent_manager_add_item
+gtk_recent_manager_error_get_type G_GNUC_CONST
+gtk_recent_manager_error_quark
+gtk_recent_manager_get_default
+gtk_recent_manager_get_items
+gtk_recent_manager_get_type G_GNUC_CONST
+gtk_recent_manager_has_item
+gtk_recent_manager_lookup_item
+gtk_recent_manager_move_item
+gtk_recent_manager_new
+gtk_recent_manager_purge_items
+gtk_recent_manager_remove_item
+gtk_recent_sort_type_get_type G_GNUC_CONST
+gtk_relief_style_get_type G_GNUC_CONST
+gtk_requisition_copy
+gtk_requisition_free
+gtk_requisition_get_type G_GNUC_CONST
+gtk_requisition_new G_GNUC_MALLOC
+gtk_resize_mode_get_type G_GNUC_CONST
+gtk_response_type_get_type G_GNUC_CONST
+gtk_rgb_to_hsv
 gtk_ruler_get_metric
 gtk_ruler_get_range
 gtk_ruler_get_type G_GNUC_CONST
+gtk_ruler_new
 gtk_ruler_set_metric
 gtk_ruler_set_range
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SCALE_H__)
-#if IN_FILE(__GTK_SCALE_C__)
-gtk_scale_new
-gtk_scale_new_with_range
+gtk_scale_add_mark
+gtk_scale_button_get_adjustment
+gtk_scale_button_get_minus_button
+gtk_scale_button_get_plus_button
+gtk_scale_button_get_popup
+gtk_scale_button_get_type G_GNUC_CONST
+gtk_scale_button_get_value
+gtk_scale_button_new
+gtk_scale_button_set_adjustment
+gtk_scale_button_set_icons
+gtk_scale_button_set_value
+gtk_scale_clear_marks
 gtk_scale_get_digits
 gtk_scale_get_draw_value
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
 gtk_scale_get_type G_GNUC_CONST
 gtk_scale_get_value_pos
+gtk_scale_new
+gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
-gtk_scale_add_mark
-gtk_scale_clear_marks
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SCALE_BUTTON_H__)
-#if IN_FILE(__GTK_SCALE_BUTTON_C__)
-gtk_scale_button_get_type G_GNUC_CONST
-gtk_scale_button_get_value
-gtk_scale_button_new
-gtk_scale_button_set_icons
-gtk_scale_button_set_value
-gtk_scale_button_get_adjustment
-gtk_scale_button_set_adjustment
-gtk_scale_button_get_plus_button
-gtk_scale_button_get_minus_button
-gtk_scale_button_get_popup
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SCROLLABLE_H__)
-#if IN_FILE(__GTK_SCROLLABLE_C__)
-gtk_scrollable_get_type G_GNUC_CONST
 gtk_scrollable_get_hadjustment
 gtk_scrollable_get_hscroll_policy
+gtk_scrollable_get_type G_GNUC_CONST
 gtk_scrollable_get_vadjustment
 gtk_scrollable_get_vscroll_policy
 gtk_scrollable_policy_get_type G_GNUC_CONST
@@ -2913,21 +2068,13 @@ gtk_scrollable_set_hadjustment
 gtk_scrollable_set_hscroll_policy
 gtk_scrollable_set_vadjustment
 gtk_scrollable_set_vscroll_policy
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SCROLLBAR_H__)
-#if IN_FILE(__GTK_SCROLLBAR_C__)
 gtk_scrollbar_get_type G_GNUC_CONST
 gtk_scrollbar_new
-#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_min_content_height
+gtk_scrolled_window_get_min_content_width
 gtk_scrolled_window_get_placement
 gtk_scrolled_window_get_policy
 gtk_scrolled_window_get_shadow_type
@@ -2936,34 +2083,29 @@ gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_get_vscrollbar
 gtk_scrolled_window_new
 gtk_scrolled_window_set_hadjustment
+gtk_scrolled_window_set_min_content_height
+gtk_scrolled_window_set_min_content_width
 gtk_scrolled_window_set_placement
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_set_shadow_type
 gtk_scrolled_window_set_vadjustment
 gtk_scrolled_window_unset_placement
-gtk_scrolled_window_get_min_content_width
-gtk_scrolled_window_set_min_content_width
-gtk_scrolled_window_get_min_content_height
-gtk_scrolled_window_set_min_content_height
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SELECTION_H__)
-#if IN_FILE(__GTK_SELECTION_C__)
+gtk_scroll_step_get_type G_GNUC_CONST
+gtk_scroll_type_get_type G_GNUC_CONST
 gtk_selection_add_target
 gtk_selection_add_targets
 gtk_selection_clear_targets
 gtk_selection_convert
 gtk_selection_data_copy
 gtk_selection_data_free
-gtk_selection_data_get_selection
-gtk_selection_data_get_target
+gtk_selection_data_get_data
 gtk_selection_data_get_data_type
 gtk_selection_data_get_display
 gtk_selection_data_get_format
-gtk_selection_data_get_data
 gtk_selection_data_get_length
 gtk_selection_data_get_pixbuf
+gtk_selection_data_get_selection
+gtk_selection_data_get_target
 gtk_selection_data_get_targets
 gtk_selection_data_get_text
 gtk_selection_data_get_type G_GNUC_CONST
@@ -2976,59 +2118,21 @@ gtk_selection_data_targets_include_image
 gtk_selection_data_targets_include_rich_text
 gtk_selection_data_targets_include_text
 gtk_selection_data_targets_include_uri
-gtk_targets_include_image
-gtk_targets_include_rich_text
-gtk_targets_include_text
-gtk_targets_include_uri
+gtk_selection_mode_get_type G_GNUC_CONST
 gtk_selection_owner_set
 gtk_selection_owner_set_for_display
 gtk_selection_remove_all
-gtk_target_list_add
-gtk_target_list_add_image_targets
-gtk_target_list_add_rich_text_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_get_type G_GNUC_CONST
-gtk_target_list_new
-gtk_target_list_ref
-gtk_target_list_remove
-gtk_target_list_unref
-gtk_target_table_new_from_list
-gtk_target_table_free
-gtk_target_entry_get_type G_GNUC_CONST
-gtk_target_entry_new
-gtk_target_entry_copy
-gtk_target_entry_free
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SEPARATOR_H__)
-#if IN_FILE(__GTK_SEPARATOR_C__)
+gtk_sensitivity_type_get_type G_GNUC_CONST
 gtk_separator_get_type G_GNUC_CONST
-gtk_separator_new
-#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_new
 gtk_separator_tool_item_get_draw
 gtk_separator_tool_item_get_type G_GNUC_CONST
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SETTINGS_H__)
-#if IN_FILE(__GTK_SETTINGS_C__)
+gtk_set_debug_flags
+gtk_set_locale
 gtk_settings_get_default
 gtk_settings_get_for_screen
 gtk_settings_get_type G_GNUC_CONST
@@ -3038,46 +2142,26 @@ gtk_settings_set_double_property
 gtk_settings_set_long_property
 gtk_settings_set_property_value
 gtk_settings_set_string_property
-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_SIZE_GROUP_H__)
-#if IN_FILE(__GTK_SIZE_GROUP_C__)
+gtk_shadow_type_get_type G_GNUC_CONST
+gtk_show_about_dialog G_GNUC_NULL_TERMINATED
+gtk_show_uri
 gtk_size_group_add_widget
 gtk_size_group_get_ignore_hidden
 gtk_size_group_get_mode
 gtk_size_group_get_type G_GNUC_CONST
 gtk_size_group_get_widgets
+gtk_size_group_mode_get_type G_GNUC_CONST
 gtk_size_group_new
 gtk_size_group_remove_widget
 gtk_size_group_set_ignore_hidden
 gtk_size_group_set_mode
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SHOW_H__)
-#if IN_FILE(__GTK_SHOW_C__)
-gtk_show_uri
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SOCKET_H__)
-#if IN_FILE(__GTK_SOCKET_C__)
+gtk_size_request_mode_get_type G_GNUC_CONST
 gtk_socket_add_id
 gtk_socket_get_id
 gtk_socket_get_plug_window
 gtk_socket_get_type G_GNUC_CONST
 gtk_socket_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SPIN_BUTTON_H__)
-#if IN_FILE(__GTK_SPIN_BUTTON_C__)
+gtk_sort_type_get_type G_GNUC_CONST
 gtk_spin_button_configure
 gtk_spin_button_get_adjustment
 gtk_spin_button_get_digits
@@ -3103,20 +2187,13 @@ gtk_spin_button_set_value
 gtk_spin_button_set_wrap
 gtk_spin_button_spin
 gtk_spin_button_update
-#endif
-#endif
-
-#if IN_HEADER(__GTK_SPINNER_H__)
-#if IN_FILE(__GTK_SPINNER_C__)
+gtk_spin_button_update_policy_get_type G_GNUC_CONST
 gtk_spinner_get_type G_GNUC_CONST
 gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
-#endif
-#endif
-
-#if IN_HEADER(__GTK_STATUSBAR_H__)
-#if IN_FILE(__GTK_STATUSBAR_C__)
+gtk_spin_type_get_type G_GNUC_CONST
+gtk_state_type_get_type G_GNUC_CONST
 gtk_statusbar_get_context_id
 gtk_statusbar_get_message_area
 gtk_statusbar_get_type G_GNUC_CONST
@@ -3125,11 +2202,41 @@ gtk_statusbar_pop
 gtk_statusbar_push
 gtk_statusbar_remove
 gtk_statusbar_remove_all
-#endif
-#endif
-
-#if IN_HEADER(__GTK_STOCK_H__)
-#if IN_FILE(__GTK_STOCK_C__)
+gtk_status_icon_get_geometry
+gtk_status_icon_get_gicon
+gtk_status_icon_get_has_tooltip
+gtk_status_icon_get_icon_name
+gtk_status_icon_get_pixbuf
+gtk_status_icon_get_screen
+gtk_status_icon_get_size
+gtk_status_icon_get_stock
+gtk_status_icon_get_storage_type
+gtk_status_icon_get_title
+gtk_status_icon_get_tooltip_markup
+gtk_status_icon_get_tooltip_text
+gtk_status_icon_get_type G_GNUC_CONST
+gtk_status_icon_get_visible
+gtk_status_icon_get_x11_window_id
+gtk_status_icon_is_embedded
+gtk_status_icon_new
+gtk_status_icon_new_from_file
+gtk_status_icon_new_from_gicon
+gtk_status_icon_new_from_icon_name
+gtk_status_icon_new_from_pixbuf
+gtk_status_icon_new_from_stock
+gtk_status_icon_position_menu
+gtk_status_icon_set_from_file
+gtk_status_icon_set_from_gicon
+gtk_status_icon_set_from_icon_name
+gtk_status_icon_set_from_pixbuf
+gtk_status_icon_set_from_stock
+gtk_status_icon_set_has_tooltip
+gtk_status_icon_set_name
+gtk_status_icon_set_screen
+gtk_status_icon_set_title
+gtk_status_icon_set_tooltip_markup
+gtk_status_icon_set_tooltip_text
+gtk_status_icon_set_visible
 gtk_stock_add
 gtk_stock_add_static
 gtk_stock_item_copy
@@ -3137,11 +2244,19 @@ gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
 gtk_stock_set_translate_func
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TABLE_H__)
-#if IN_FILE(__GTK_TABLE_C__)
+gtk_style_apply_default_background
+gtk_style_attach
+gtk_style_copy
+gtk_style_detach
+gtk_style_get
+gtk_style_get_style_property
+gtk_style_get_type G_GNUC_CONST
+gtk_style_get_valist
+gtk_style_lookup_color
+gtk_style_lookup_icon_set
+gtk_style_new
+gtk_style_render_icon
+gtk_style_set_background
 gtk_table_attach
 gtk_table_attach_defaults
 gtk_table_get_col_spacing
@@ -3158,46 +2273,55 @@ gtk_table_set_col_spacings
 gtk_table_set_homogeneous
 gtk_table_set_row_spacing
 gtk_table_set_row_spacings
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEAROFF_MENU_ITEM_H__)
-#if IN_FILE(__GTK_TEAROFF_MENU_ITEM_C__)
+gtk_target_entry_copy
+gtk_target_entry_free
+gtk_target_entry_get_type G_GNUC_CONST
+gtk_target_entry_new
+gtk_target_flags_get_type G_GNUC_CONST
+gtk_target_list_add
+gtk_target_list_add_image_targets
+gtk_target_list_add_rich_text_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_get_type G_GNUC_CONST
+gtk_target_list_new
+gtk_target_list_ref
+gtk_target_list_remove
+gtk_target_list_unref
+gtk_targets_include_image
+gtk_targets_include_rich_text
+gtk_targets_include_text
+gtk_targets_include_uri
+gtk_target_table_free
+gtk_target_table_new_from_list
 gtk_tearoff_menu_item_get_type G_GNUC_CONST
 gtk_tearoff_menu_item_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEXT_TAG_H__)
-#if IN_FILE(__GTK_TEXT_TAG_C__)
+gtk_test_create_simple_window
+gtk_test_create_widget
+gtk_test_display_button_window
+gtk_test_find_label
+gtk_test_find_sibling
+gtk_test_find_widget
+gtk_test_init
+gtk_test_list_all_types
+gtk_test_register_all_types
+gtk_test_slider_get_value
+gtk_test_slider_set_perc
+gtk_test_spin_button_click
+gtk_test_text_get
+gtk_test_text_set
+gtk_test_widget_click
+gtk_test_widget_send_key
+gtk_text_anchored_child_set_layout
 gtk_text_attributes_copy
 gtk_text_attributes_copy_values
 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_BUFFER_H__)
-#if IN_FILE(__GTK_TEXT_BUFFER_C__)
+gtk_text_buffer_add_mark
 gtk_text_buffer_add_selection_clipboard
 gtk_text_buffer_apply_tag
 gtk_text_buffer_apply_tag_by_name
@@ -3205,7 +2329,6 @@ gtk_text_buffer_backspace
 gtk_text_buffer_begin_user_action
 gtk_text_buffer_copy_clipboard
 gtk_text_buffer_create_child_anchor
-gtk_text_buffer_add_mark
 gtk_text_buffer_create_mark
 gtk_text_buffer_create_tag
 gtk_text_buffer_cut_clipboard
@@ -3214,10 +2337,14 @@ gtk_text_buffer_delete_interactive
 gtk_text_buffer_delete_mark
 gtk_text_buffer_delete_mark_by_name
 gtk_text_buffer_delete_selection
+gtk_text_buffer_deserialize
+gtk_text_buffer_deserialize_get_can_create_tags
+gtk_text_buffer_deserialize_set_can_create_tags
 gtk_text_buffer_end_user_action
 gtk_text_buffer_get_bounds
 gtk_text_buffer_get_char_count
 gtk_text_buffer_get_copy_target_list
+gtk_text_buffer_get_deserialize_formats
 gtk_text_buffer_get_end_iter
 gtk_text_buffer_get_has_selection
 gtk_text_buffer_get_insert
@@ -3233,6 +2360,7 @@ gtk_text_buffer_get_modified
 gtk_text_buffer_get_paste_target_list
 gtk_text_buffer_get_selection_bound
 gtk_text_buffer_get_selection_bounds
+gtk_text_buffer_get_serialize_formats
 gtk_text_buffer_get_slice
 gtk_text_buffer_get_start_iter
 gtk_text_buffer_get_tag_table
@@ -3246,32 +2374,37 @@ 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 G_GNUC_NULL_TERMINATED
 gtk_text_buffer_insert_with_tags_by_name G_GNUC_NULL_TERMINATED
+gtk_text_buffer_insert_with_tags G_GNUC_NULL_TERMINATED
 gtk_text_buffer_move_mark
 gtk_text_buffer_move_mark_by_name
 gtk_text_buffer_new
 gtk_text_buffer_paste_clipboard
 gtk_text_buffer_place_cursor
+gtk_text_buffer_register_deserialize_format
+gtk_text_buffer_register_deserialize_tagset
+gtk_text_buffer_register_serialize_format
+gtk_text_buffer_register_serialize_tagset
 gtk_text_buffer_remove_all_tags
 gtk_text_buffer_remove_selection_clipboard
 gtk_text_buffer_remove_tag
 gtk_text_buffer_remove_tag_by_name
 gtk_text_buffer_select_range
+gtk_text_buffer_serialize
 gtk_text_buffer_set_modified
 gtk_text_buffer_set_text
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEXT_TYPES_H__)
-#if IN_FILE(__GTK_TEXT_TYPES_C__)
-gtk_text_unknown_char_utf8_gtk_tests_only
+gtk_text_buffer_target_info_get_type G_GNUC_CONST
+gtk_text_buffer_unregister_deserialize_format
+gtk_text_buffer_unregister_serialize_format
 gtk_text_byte_begins_utf8_char
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEXT_ITER_H__)
-#if IN_FILE(__GTK_TEXT_ITER_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
+gtk_text_child_anchor_queue_resize
+gtk_text_child_anchor_register_child
+gtk_text_child_anchor_unregister_child
+gtk_text_direction_get_type G_GNUC_CONST
 gtk_text_iter_backward_char
 gtk_text_iter_backward_chars
 gtk_text_iter_backward_cursor_position
@@ -3363,15 +2496,11 @@ 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_cursors_changed
 gtk_text_layout_clamp_iter_to_vrange
+gtk_text_layout_cursors_changed
 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
@@ -3412,59 +2541,29 @@ gtk_text_layout_validate_yrange
 gtk_text_layout_wrap
 gtk_text_layout_wrap_loop_end
 gtk_text_layout_wrap_loop_start
-#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_new
 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 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_new
 gtk_text_mark_set_visible
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TEXT_VIEW_H__)
-#if IN_FILE(__GTK_TEXT_VIEW_C__)
+gtk_text_search_flags_get_type G_GNUC_CONST
+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
+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
+gtk_text_unknown_char_utf8_gtk_tests_only
 gtk_text_view_add_child_at_anchor
 gtk_text_view_add_child_in_window
 gtk_text_view_backward_display_line
@@ -3527,19 +2626,10 @@ gtk_text_view_set_tabs
 gtk_text_view_set_wrap_mode
 gtk_text_view_starts_display_line
 gtk_text_view_window_to_buffer_coords
-#endif
-#endif
-
-#if IN_HEADER(__GTK_THEMES_H__)
-#if IN_FILE(__GTK_THEMES_C__)
+gtk_text_window_type_get_type G_GNUC_CONST
 gtk_theme_engine_create_rc_style
 gtk_theme_engine_get
 gtk_theme_engine_get_type G_GNUC_CONST
-#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 G_GNUC_CONST
@@ -3547,11 +2637,6 @@ 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
@@ -3563,21 +2648,11 @@ 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 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__)
 gtk_toolbar_get_drop_index
 gtk_toolbar_get_icon_size
 gtk_toolbar_get_item_index
@@ -3593,28 +2668,10 @@ gtk_toolbar_set_drop_highlight_item
 gtk_toolbar_set_icon_size
 gtk_toolbar_set_show_arrow
 gtk_toolbar_set_style
+gtk_toolbar_space_style_get_type G_GNUC_CONST
+gtk_toolbar_style_get_type G_GNUC_CONST
 gtk_toolbar_unset_icon_size
 gtk_toolbar_unset_style
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TOOL_SHELL_H__)
-#if IN_FILE(__GTK_TOOL_SHELL_C__)
-gtk_tool_shell_get_type G_GNUC_CONST
-gtk_tool_shell_get_ellipsize_mode
-gtk_tool_shell_get_icon_size
-gtk_tool_shell_get_orientation
-gtk_tool_shell_get_style
-gtk_tool_shell_get_relief_style
-gtk_tool_shell_get_text_alignment
-gtk_tool_shell_get_text_orientation
-gtk_tool_shell_get_text_size_group
-gtk_tool_shell_rebuild_menu
-#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
@@ -3630,11 +2687,6 @@ 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_ellipsize_mode
 gtk_tool_item_get_expand
 gtk_tool_item_get_homogeneous
@@ -3651,6 +2703,24 @@ 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
+gtk_tool_item_group_get_collapsed
+gtk_tool_item_group_get_drop_item
+gtk_tool_item_group_get_ellipsize
+gtk_tool_item_group_get_header_relief
+gtk_tool_item_group_get_item_position
+gtk_tool_item_group_get_label
+gtk_tool_item_group_get_label_widget
+gtk_tool_item_group_get_n_items
+gtk_tool_item_group_get_nth_item
+gtk_tool_item_group_get_type G_GNUC_CONST
+gtk_tool_item_group_insert
+gtk_tool_item_group_new
+gtk_tool_item_group_set_collapsed
+gtk_tool_item_group_set_ellipsize
+gtk_tool_item_group_set_header_relief
+gtk_tool_item_group_set_item_position
+gtk_tool_item_group_set_label
+gtk_tool_item_group_set_label_widget
 gtk_tool_item_new
 gtk_tool_item_rebuild_menu
 gtk_tool_item_retrieve_proxy_menu_item
@@ -3664,85 +2734,51 @@ gtk_tool_item_set_use_drag_window
 gtk_tool_item_set_visible_horizontal
 gtk_tool_item_set_visible_vertical
 gtk_tool_item_toolbar_reconfigured
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TOOL_ITEM_GROUP_H__)
-#if IN_FILE(__GTK_TOOL_ITEM_GROUP_C__)
-gtk_tool_item_group_get_type G_GNUC_CONST
-gtk_tool_item_group_new
-gtk_tool_item_group_set_label
-gtk_tool_item_group_set_label_widget
-gtk_tool_item_group_set_collapsed
-gtk_tool_item_group_set_ellipsize
-gtk_tool_item_group_set_header_relief
-gtk_tool_item_group_get_label
-gtk_tool_item_group_get_label_widget
-gtk_tool_item_group_get_ellipsize
-gtk_tool_item_group_get_header_relief
-gtk_tool_item_group_insert
-gtk_tool_item_group_set_item_position
-gtk_tool_item_group_get_item_position
-gtk_tool_item_group_get_n_items
-gtk_tool_item_group_get_nth_item
-gtk_tool_item_group_get_drop_item
-gtk_tool_item_group_get_collapsed
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TOOL_PALETTE_H__)
-#if IN_FILE(__GTK_TOOL_PALETTE_C__)
+gtk_tool_palette_add_drag_dest
+gtk_tool_palette_drag_targets_get_type G_GNUC_CONST
+gtk_tool_palette_get_drag_item
+gtk_tool_palette_get_drag_target_group G_GNUC_CONST
+gtk_tool_palette_get_drag_target_item G_GNUC_CONST
+gtk_tool_palette_get_drop_group
+gtk_tool_palette_get_drop_item
+gtk_tool_palette_get_exclusive
+gtk_tool_palette_get_expand
+gtk_tool_palette_get_group_position
+gtk_tool_palette_get_hadjustment
+gtk_tool_palette_get_icon_size
+gtk_tool_palette_get_style
 gtk_tool_palette_get_type G_GNUC_CONST
+gtk_tool_palette_get_vadjustment
 gtk_tool_palette_new
-gtk_tool_palette_set_group_position
+gtk_tool_palette_set_drag_source
 gtk_tool_palette_set_exclusive
 gtk_tool_palette_set_expand
-gtk_tool_palette_get_group_position
-gtk_tool_palette_get_exclusive
-gtk_tool_palette_get_expand
+gtk_tool_palette_set_group_position
 gtk_tool_palette_set_icon_size
-gtk_tool_palette_unset_icon_size
 gtk_tool_palette_set_style
+gtk_tool_palette_unset_icon_size
 gtk_tool_palette_unset_style
-gtk_tool_palette_get_icon_size
-gtk_tool_palette_get_style
-gtk_tool_palette_get_drop_item
-gtk_tool_palette_get_drop_group
-gtk_tool_palette_get_drag_item
-gtk_tool_palette_set_drag_source
-gtk_tool_palette_add_drag_dest
-gtk_tool_palette_get_hadjustment
-gtk_tool_palette_get_vadjustment
-gtk_tool_palette_get_drag_target_item G_GNUC_CONST
-gtk_tool_palette_get_drag_target_group G_GNUC_CONST
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TOOLTIP_H__)
-#if IN_FILE(__GTK_TOOLTIP_C__)
+gtk_tool_shell_get_ellipsize_mode
+gtk_tool_shell_get_icon_size
+gtk_tool_shell_get_orientation
+gtk_tool_shell_get_relief_style
+gtk_tool_shell_get_style
+gtk_tool_shell_get_text_alignment
+gtk_tool_shell_get_text_orientation
+gtk_tool_shell_get_text_size_group
+gtk_tool_shell_get_type G_GNUC_CONST
+gtk_tool_shell_rebuild_menu
 gtk_tooltip_get_type G_GNUC_CONST
 gtk_tooltip_set_custom
 gtk_tooltip_set_icon
-gtk_tooltip_set_icon_from_stock
-gtk_tooltip_set_icon_from_icon_name
 gtk_tooltip_set_icon_from_gicon
+gtk_tooltip_set_icon_from_icon_name
+gtk_tooltip_set_icon_from_stock
 gtk_tooltip_set_markup
 gtk_tooltip_set_text
 gtk_tooltip_set_tip_area
 gtk_tooltip_trigger_tooltip_query
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TRAY_ICON_H__)
-#if IN_FILE(__GTK_TRAY_ICON_X11_C__)
-#ifndef G_OS_WIN32
 gtk_tray_icon_get_type G_GNUC_CONST
-#endif
-#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 G_GNUC_CONST
 gtk_tree_drag_dest_row_drop_possible
@@ -3751,15 +2787,22 @@ gtk_tree_drag_source_drag_data_get
 gtk_tree_drag_source_get_type G_GNUC_CONST
 gtk_tree_drag_source_row_draggable
 gtk_tree_get_row_drag_data
-gtk_tree_set_row_drag_data
-#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 G_GNUC_CONST
+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
+gtk_tree_model_flags_get_type G_GNUC_CONST
 gtk_tree_model_foreach
 gtk_tree_model_get
 gtk_tree_model_get_column_type
@@ -3785,6 +2828,16 @@ 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 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
 gtk_tree_model_unref_node
 gtk_tree_path_append_index
 gtk_tree_path_compare
@@ -3817,48 +2870,11 @@ gtk_tree_row_reference_new
 gtk_tree_row_reference_new_proxy
 gtk_tree_row_reference_reordered
 gtk_tree_row_reference_valid
-#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_select_function
 gtk_tree_selection_get_selected
 gtk_tree_selection_get_selected_rows
+gtk_tree_selection_get_select_function
 gtk_tree_selection_get_tree_view
 gtk_tree_selection_get_type G_GNUC_CONST
 gtk_tree_selection_get_user_data
@@ -3875,11 +2891,7 @@ gtk_tree_selection_unselect_all
 gtk_tree_selection_unselect_iter
 gtk_tree_selection_unselect_path
 gtk_tree_selection_unselect_range
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TREE_SORTABLE_H__)
-#if IN_FILE(__GTK_TREE_SORTABLE_C__)
+gtk_tree_set_row_drag_data
 gtk_tree_sortable_get_sort_column_id
 gtk_tree_sortable_get_type G_GNUC_CONST
 gtk_tree_sortable_has_default_sort_func
@@ -3887,11 +2899,6 @@ 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 G_GNUC_CONST
@@ -3916,11 +2923,9 @@ gtk_tree_store_set_valist
 gtk_tree_store_set_value
 gtk_tree_store_set_valuesv
 gtk_tree_store_swap
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TREE_VIEW_COLUMN_H__)
-#if IN_FILE(__GTK_TREE_VIEW_COLUMN_C__)
+gtk_tree_view_append_column
+gtk_tree_view_collapse_all
+gtk_tree_view_collapse_row
 gtk_tree_view_column_add_attribute
 gtk_tree_view_column_cell_get_position
 gtk_tree_view_column_cell_get_size
@@ -3952,8 +2957,9 @@ gtk_tree_view_column_get_width
 gtk_tree_view_column_new
 gtk_tree_view_column_new_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_column_pack_end
-gtk_tree_view_column_queue_resize
 gtk_tree_view_column_pack_start
+gtk_tree_view_column_queue_resize
+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
@@ -3972,14 +2978,7 @@ gtk_tree_view_column_set_spacing
 gtk_tree_view_column_set_title
 gtk_tree_view_column_set_visible
 gtk_tree_view_column_set_widget
-#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_column_sizing_get_type G_GNUC_CONST
 gtk_tree_view_convert_bin_window_to_tree_coords
 gtk_tree_view_convert_bin_window_to_widget_coords
 gtk_tree_view_convert_tree_to_bin_window_coords
@@ -3987,6 +2986,7 @@ gtk_tree_view_convert_tree_to_widget_coords
 gtk_tree_view_convert_widget_to_bin_window_coords
 gtk_tree_view_convert_widget_to_tree_coords
 gtk_tree_view_create_row_drag_icon
+gtk_tree_view_drop_position_get_type G_GNUC_CONST
 gtk_tree_view_enable_model_drag_dest
 gtk_tree_view_enable_model_drag_source
 gtk_tree_view_expand_all
@@ -4029,6 +3029,7 @@ gtk_tree_view_get_type G_GNUC_CONST
 gtk_tree_view_get_vadjustment
 gtk_tree_view_get_visible_range
 gtk_tree_view_get_visible_rect
+gtk_tree_view_grid_lines_get_type G_GNUC_CONST
 gtk_tree_view_insert_column
 gtk_tree_view_insert_column_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_insert_column_with_data_func
@@ -4067,23 +3068,12 @@ gtk_tree_view_set_search_entry
 gtk_tree_view_set_search_equal_func
 gtk_tree_view_set_search_position_func
 gtk_tree_view_set_show_expanders
-gtk_tree_view_set_tooltip_row
 gtk_tree_view_set_tooltip_cell
 gtk_tree_view_set_tooltip_column
+gtk_tree_view_set_tooltip_row
 gtk_tree_view_unset_rows_drag_dest
 gtk_tree_view_unset_rows_drag_source
-gtk_tree_view_columns_autosize
-#endif
-#endif
-
-#if IN_HEADER(__GTK_TYPE_UTILS_H__)
-#if IN_FILE(__GTK_TYPE_UTILS_C__)
-gtk_identifier_get_type G_GNUC_CONST
-#endif
-#endif
-
-#if IN_HEADER(__GTK_UI_MANAGER_H__)
-#if IN_FILE(__GTK_UI_MANAGER_C__)
+gtk_true G_GNUC_CONST
 gtk_ui_manager_add_ui
 gtk_ui_manager_add_ui_from_file
 gtk_ui_manager_add_ui_from_string
@@ -4097,98 +3087,45 @@ 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 G_GNUC_CONST
 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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VBOX_H__)
-#if IN_FILE(__GTK_VBOX_C__)
+gtk_unit_get_type G_GNUC_CONST
+gtk_update_type_get_type G_GNUC_CONST
 gtk_vbox_get_type G_GNUC_CONST
 gtk_vbox_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VBBOX_H__)
-#if IN_FILE(__GTK_VBBOX_C__)
 gtk_vbutton_box_get_type G_GNUC_CONST
 gtk_vbutton_box_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VIEWPORT_H__)
-#if IN_FILE(__GTK_VIEWPORT_C__)
+gtk_viewport_get_bin_window
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
 gtk_viewport_get_type G_GNUC_CONST
 gtk_viewport_get_vadjustment
-gtk_viewport_get_bin_window
 gtk_viewport_get_view_window
 gtk_viewport_new
 gtk_viewport_set_hadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_set_vadjustment
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VOLUME_BUTTON_H__)
-#if IN_FILE(__GTK_VOLUME_BUTTON_C__)
 gtk_volume_button_get_type G_GNUC_CONST
 gtk_volume_button_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VPANED_H__)
-#if IN_FILE(__GTK_VPANED_C__)
 gtk_vpaned_get_type G_GNUC_CONST
 gtk_vpaned_new
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VRULER_H__)
-#if IN_FILE(__GTK_VRULER_C__)
 gtk_vruler_get_type G_GNUC_CONST
 gtk_vruler_new
-#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
-#endif
-#endif
-
-#if IN_HEADER(__GTK_VSCROLLBAR_H__)
-#if IN_FILE(__GTK_VSCROLLBAR_C__)
 gtk_vscrollbar_get_type G_GNUC_CONST
 gtk_vscrollbar_new
-#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_cairo_should_draw_window
-gtk_requisition_copy
-gtk_requisition_free
-gtk_requisition_get_type G_GNUC_CONST
-gtk_requisition_new G_GNUC_MALLOC
 gtk_widget_activate
-gtk_widget_is_composited
 gtk_widget_add_accelerator
-gtk_widget_add_events
 gtk_widget_add_device_events
+gtk_widget_add_events
 gtk_widget_add_mnemonic_label
 gtk_widget_can_activate_accel
 gtk_widget_child_focus
@@ -4198,36 +3135,47 @@ gtk_widget_class_install_style_property
 gtk_widget_class_install_style_property_parser
 gtk_widget_class_list_style_properties
 gtk_widget_class_path
+gtk_widget_compute_expand
 gtk_widget_create_pango_context
 gtk_widget_create_pango_layout
 gtk_widget_destroy
 gtk_widget_destroyed
+gtk_widget_device_is_shadowed
 gtk_widget_draw
 gtk_widget_ensure_style
 gtk_widget_error_bell
 gtk_widget_event
 gtk_widget_freeze_child_notify
 gtk_widget_get_accessible
-gtk_widget_get_allocation
-gtk_widget_get_allocated_width
 gtk_widget_get_allocated_height
+gtk_widget_get_allocated_width
+gtk_widget_get_allocation
 gtk_widget_get_ancestor
 gtk_widget_get_app_paintable
-#ifndef GTK_DISABLE_DEPRECATED
+gtk_widget_get_can_default
+gtk_widget_get_can_focus
 gtk_widget_get_child_requisition
-#endif
 gtk_widget_get_child_visible
 gtk_widget_get_clipboard
 gtk_widget_get_composite_name
 gtk_widget_get_default_direction
 gtk_widget_get_default_style
+gtk_widget_get_device_events
 gtk_widget_get_direction
 gtk_widget_get_display
 gtk_widget_get_double_buffered
 gtk_widget_get_events
-gtk_widget_get_device_events
 gtk_widget_get_extension_events
+gtk_widget_get_halign
 gtk_widget_get_has_tooltip
+gtk_widget_get_has_window
+gtk_widget_get_hexpand
+gtk_widget_get_hexpand_set
+gtk_widget_get_mapped
+gtk_widget_get_margin_bottom
+gtk_widget_get_margin_left
+gtk_widget_get_margin_right
+gtk_widget_get_margin_top
 gtk_widget_get_modifier_style
 gtk_widget_get_name
 gtk_widget_get_no_show_all
@@ -4235,24 +3183,34 @@ gtk_widget_get_pango_context
 gtk_widget_get_parent
 gtk_widget_get_parent_window
 gtk_widget_get_pointer
+gtk_widget_get_preferred_height
+gtk_widget_get_preferred_height_for_width
+gtk_widget_get_preferred_size
+gtk_widget_get_preferred_width
+gtk_widget_get_preferred_width_for_height
+gtk_widget_get_realized
 gtk_widget_get_receives_default
-gtk_widget_get_root_window
+gtk_widget_get_request_mode
 gtk_widget_get_requisition
+gtk_widget_get_root_window
 gtk_widget_get_screen
 gtk_widget_get_sensitive
 gtk_widget_get_settings
 gtk_widget_get_size_request
 gtk_widget_get_state
 gtk_widget_get_style
+gtk_widget_get_support_multidevice
 gtk_widget_get_tooltip_markup
 gtk_widget_get_tooltip_text
 gtk_widget_get_tooltip_window
 gtk_widget_get_toplevel
-gtk_cairo_transform_to_window
 gtk_widget_get_type G_GNUC_CONST
+gtk_widget_get_valign
+gtk_widget_get_vexpand
+gtk_widget_get_vexpand_set
 gtk_widget_get_visible
 gtk_widget_get_visual
-gtk_widget_get_request_mode
+gtk_widget_get_window
 gtk_widget_grab_default
 gtk_widget_grab_focus
 gtk_widget_has_default
@@ -4260,14 +3218,18 @@ gtk_widget_has_focus
 gtk_widget_has_grab
 gtk_widget_has_rc_style
 gtk_widget_has_screen
+gtk_widget_help_type_get_type G_GNUC_CONST
 gtk_widget_hide
 gtk_widget_hide_on_delete
+gtk_widget_in_destruction
+gtk_widget_input_shape_combine_region
 gtk_widget_intersect
 gtk_widget_is_ancestor
+gtk_widget_is_composited
+gtk_widget_is_drawable
 gtk_widget_is_focus
 gtk_widget_is_sensitive
 gtk_widget_is_toplevel
-gtk_widget_is_drawable
 gtk_widget_keynav_failed
 gtk_widget_list_accel_closures
 gtk_widget_list_mnemonic_labels
@@ -4275,16 +3237,17 @@ gtk_widget_map
 gtk_widget_mnemonic_activate
 gtk_widget_modify_base
 gtk_widget_modify_bg
-gtk_widget_modify_fg
 gtk_widget_modify_cursor
+gtk_widget_modify_fg
 gtk_widget_modify_font
 gtk_widget_modify_style
-gtk_widget_modify_text
 gtk_widget_modify_symbolic_color
+gtk_widget_modify_text
 gtk_widget_new
 gtk_widget_path
 gtk_widget_pop_composite_child
 gtk_widget_push_composite_child
+gtk_widget_queue_compute_expand
 gtk_widget_queue_draw
 gtk_widget_queue_draw_area
 gtk_widget_queue_draw_region
@@ -4303,40 +3266,53 @@ gtk_widget_send_focus_change
 gtk_widget_set_accel_path
 gtk_widget_set_allocation
 gtk_widget_set_app_paintable
+gtk_widget_set_can_default
+gtk_widget_set_can_focus
 gtk_widget_set_child_visible
 gtk_widget_set_composite_name
 gtk_widget_set_default_direction
+gtk_widget_set_device_events
 gtk_widget_set_direction
 gtk_widget_set_double_buffered
 gtk_widget_set_events
-gtk_widget_set_device_events
 gtk_widget_set_extension_events
+gtk_widget_set_halign
 gtk_widget_set_has_tooltip
+gtk_widget_set_has_window
+gtk_widget_set_hexpand
+gtk_widget_set_hexpand_set
+gtk_widget_set_mapped
+gtk_widget_set_margin_bottom
+gtk_widget_set_margin_left
+gtk_widget_set_margin_right
+gtk_widget_set_margin_top
 gtk_widget_set_name
 gtk_widget_set_no_show_all
 gtk_widget_set_parent
 gtk_widget_set_parent_window
+gtk_widget_set_realized
 gtk_widget_set_receives_default
 gtk_widget_set_redraw_on_allocate
 gtk_widget_set_sensitive
 gtk_widget_set_size_request
 gtk_widget_set_state
 gtk_widget_set_style
+gtk_widget_set_support_multidevice
 gtk_widget_set_tooltip_markup
 gtk_widget_set_tooltip_text
 gtk_widget_set_tooltip_window
+gtk_widget_set_valign
+gtk_widget_set_vexpand
+gtk_widget_set_vexpand_set
 gtk_widget_set_visible
 gtk_widget_set_visual
 gtk_widget_set_window
 gtk_widget_shape_combine_region
-gtk_widget_input_shape_combine_region
 gtk_widget_show
 gtk_widget_show_all
 gtk_widget_show_now
 gtk_widget_size_allocate
-#ifndef GTK_DISABLE_DEPRECATED
 gtk_widget_size_request
-#endif
 gtk_widget_style_attach
 gtk_widget_style_get G_GNUC_NULL_TERMINATED
 gtk_widget_style_get_property
@@ -4347,53 +3323,7 @@ gtk_widget_trigger_tooltip_query
 gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
-gtk_widget_get_window
-gtk_widget_set_has_window
-gtk_widget_get_has_window
-gtk_widget_set_can_default
-gtk_widget_get_can_default
-gtk_widget_set_can_focus
-gtk_widget_get_can_focus
-gtk_widget_set_realized
-gtk_widget_get_realized
-gtk_widget_set_mapped
-gtk_widget_get_mapped
-gtk_widget_get_support_multidevice
-gtk_widget_set_support_multidevice
-gtk_widget_device_is_shadowed
-gtk_widget_get_halign
-gtk_widget_set_halign
-gtk_widget_get_valign
-gtk_widget_set_valign
-gtk_widget_get_margin_left
-gtk_widget_set_margin_left
-gtk_widget_get_margin_right
-gtk_widget_set_margin_right
-gtk_widget_get_margin_top
-gtk_widget_set_margin_top
-gtk_widget_get_margin_bottom
-gtk_widget_set_margin_bottom
-gtk_widget_in_destruction
-gtk_widget_get_preferred_height
-gtk_widget_get_preferred_height_for_width
-gtk_widget_get_preferred_size
-gtk_widget_get_preferred_width
-gtk_widget_get_preferred_width_for_height
-gtk_widget_get_hexpand
-gtk_widget_set_hexpand
-gtk_widget_get_hexpand_set
-gtk_widget_set_hexpand_set
-gtk_widget_get_vexpand
-gtk_widget_set_vexpand
-gtk_widget_get_vexpand_set
-gtk_widget_set_vexpand_set
-gtk_widget_queue_compute_expand
-gtk_widget_compute_expand
-#endif
-#endif
-
-#if IN_HEADER(__GTK_WINDOW_H__)
-#if IN_FILE(__GTK_WINDOW_C__)
+gtk_win32_embed_widget_get_type G_GNUC_CONST
 gtk_window_activate_default
 gtk_window_activate_focus
 gtk_window_activate_key
@@ -4407,11 +3337,11 @@ gtk_window_fullscreen
 gtk_window_get_accept_focus
 gtk_window_get_application
 gtk_window_get_decorated
-gtk_window_get_deletable
-gtk_window_get_default_widget
 gtk_window_get_default_icon_list
 gtk_window_get_default_icon_name
 gtk_window_get_default_size
+gtk_window_get_default_widget
+gtk_window_get_deletable
 gtk_window_get_destroy_with_parent
 gtk_window_get_focus
 gtk_window_get_focus_on_map
@@ -4426,6 +3356,7 @@ gtk_window_get_icon_name
 gtk_window_get_mnemonic_modifier
 gtk_window_get_mnemonics_visible
 gtk_window_get_modal
+gtk_window_get_opacity
 gtk_window_get_position
 gtk_window_get_resizable
 gtk_window_get_resize_grip_area
@@ -4434,19 +3365,19 @@ 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 G_GNUC_CONST
 gtk_window_get_type_hint
+gtk_window_get_urgency_hint
 gtk_window_get_window_type
 gtk_window_group_add_window
+gtk_window_group_get_current_device_grab
+gtk_window_group_get_current_grab
 gtk_window_group_get_type G_GNUC_CONST
+gtk_window_group_list_windows
 gtk_window_group_new
 gtk_window_group_remove_window
-gtk_window_group_list_windows
-gtk_window_group_get_current_grab
-gtk_window_group_get_current_device_grab
 gtk_window_has_group
 gtk_window_has_toplevel_focus
 gtk_window_iconify
@@ -4457,6 +3388,7 @@ gtk_window_mnemonic_activate
 gtk_window_move
 gtk_window_new
 gtk_window_parse_geometry
+gtk_window_position_get_type G_GNUC_CONST
 gtk_window_present
 gtk_window_present_with_time
 gtk_window_propagate_key_event
@@ -4471,7 +3403,6 @@ gtk_window_set_accept_focus
 gtk_window_set_application
 gtk_window_set_auto_startup_notification
 gtk_window_set_decorated
-gtk_window_set_deletable
 gtk_window_set_default
 gtk_window_set_default_geometry
 gtk_window_set_default_icon
@@ -4479,10 +3410,10 @@ gtk_window_set_default_icon_from_file
 gtk_window_set_default_icon_list
 gtk_window_set_default_icon_name
 gtk_window_set_default_size
+gtk_window_set_deletable
 gtk_window_set_destroy_with_parent
 gtk_window_set_focus
 gtk_window_set_focus_on_map
-gtk_window_set_startup_id
 gtk_window_set_frame_dimensions
 gtk_window_set_geometry_hints
 gtk_window_set_gravity
@@ -4498,65 +3429,21 @@ gtk_window_set_mnemonic_modifier
 gtk_window_set_mnemonics_visible
 gtk_window_set_modal
 gtk_window_set_opacity
-gtk_window_get_opacity
 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_startup_id
 gtk_window_set_title
 gtk_window_set_transient_for
 gtk_window_set_type_hint
+gtk_window_set_urgency_hint
 gtk_window_set_wmclass
 gtk_window_stick
+gtk_window_type_get_type G_GNUC_CONST
 gtk_window_unfullscreen
 gtk_window_unmaximize
 gtk_window_unstick
-#endif
-#endif
-
-
-#if IN_HEADER(__GTK_WIN32_EMBED_WIDGET_H__)
-#if IN_FILE(__GTK_WIN32_EMBED_WIDGET_C__)
-#ifdef G_OS_WIN32
-gtk_win32_embed_widget_get_type G_GNUC_CONST
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GTK_INFO_BAR_H__)
-#if IN_FILE(__GTK_INFO_BAR_C__)
-gtk_info_bar_get_type G_GNUC_CONST
-gtk_info_bar_new
-gtk_info_bar_new_with_buttons
-gtk_info_bar_get_action_area
-gtk_info_bar_get_content_area
-gtk_info_bar_add_action_widget
-gtk_info_bar_add_button
-gtk_info_bar_add_buttons
-gtk_info_bar_set_response_sensitive
-gtk_info_bar_set_default_response
-gtk_info_bar_response
-gtk_info_bar_set_message_type
-gtk_info_bar_get_message_type
-#endif
-#endif
-
-#if IN_HEADER(__GTK_GRID_H__)
-#if IN_FILE(__GTK_GRID_c__)
-gtk_grid_get_type G_GNUC_CONST
-gtk_grid_new
-gtk_grid_attach
-gtk_grid_attach_next_to
-gtk_grid_set_row_homogeneous
-gtk_grid_get_row_homogeneous
-gtk_grid_set_row_spacing
-gtk_grid_get_row_spacing
-gtk_grid_set_column_homogeneous
-gtk_grid_get_column_homogeneous
-gtk_grid_set_column_spacing
-gtk_grid_get_column_spacing
-#endif
-#endif
+gtk_wrap_mode_get_type G_GNUC_CONST