Add hidden aliases for exported symbols which are used internally in order

Mon Aug  9 15:41:17 2004  Matthias Clasen  <maclas@gmx.de>

	Add hidden aliases for exported symbols which are
	used internally in order to get rid of many PLT
	entries.  (#145519, Arjan van de Ven)

	* gdk/Makefile.am: Add rules to generate gdk.def and
	gdkalias.h from gdk.symbols, and make make check check
	the abi with abicheck.sh.

	* gdk/gdk.symbols: New file. Definition of the GDK ABI.
	The file can be processed by cpp to filter out certain
	subsets of symbols.

	* gdk/abicheck.sh: New file. Script to check the actually
	symbols exported from libgdk-x11.2.0.so against the symbols
	found in gdk.symbols.

	* gdk/makegdkalias.pl: New file. Perl script to generate the
	header containing the alias definitions for internally used
	exported symbols from a list of symbols.

	* gdk/*.c, gdk/x11/*.c: Include gdkalias.h

61 files changed, 785 insertions, 577 deletions

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 29cfbcc46d..36919d8cbd 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -8,7 +8,10 @@ EXTRA_DIST =			\
 	gdk.def 		\
 	gdkmarshalers.list	\
 	makeenums.pl		\
-	makefile.msc
+	makefile.msc		\
+	gdk.symbols		\
+	makegdkalias.pl		\
+	abicheck.sh
 
 INCLUDES =                              \
 	-DG_LOG_DOMAIN=\"Gdk\"		\
@@ -77,7 +80,8 @@ gdk_public_h_sources =				\
 gdk_headers =                     \
 	$(gdk_public_h_sources)   \
 	gdkenumtypes.h		  \
-	gdkprivate.h
+	gdkprivate.h		  \
+	gdkalias.h
 
 gdk_c_sources =                 \
 	gdk.c			\
@@ -172,6 +176,16 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+gdk.def: gdk.symbols
+	(echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES gdk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk.def
+
+gdkalias.h: gdk.symbols
+	 cpp -P gdk.symbols -DGDK_WINDOWING_X11 | ./makegdkalias.pl > gdkalias.h
+
+if OS_UNIX
+TEST = abicheck.sh
+endif
+
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
new file mode 100755
index 0000000000..c0a7e33ee9
--- /dev/null
+++ b/gdk/abicheck.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+cpp -P -DGDK_WINDOWING_X11 gdk.symbols | sed -e '/^$/d' | sort > expected-abi
+nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -c12- | sort > actual-abi
+diff -u expected-abi actual-abi
diff --git a/gdk/gdk.c b/gdk/gdk.c
index cf3e98cb80..8226564f31 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkinternals.h"
 
diff --git a/gdk/gdk.def b/gdk/gdk.def
deleted file mode 100644
index a64798d8b2..0000000000
--- a/gdk/gdk.def
+++ /dev/null
@@ -1,574 +0,0 @@
-EXPORTS
-	gdk_add_client_message_filter
-	gdk_atom_intern
-	gdk_atom_name
-	gdk_axis_use_get_type
-	gdk_beep
-	gdk_bitmap_create_from_data
-	gdk_byte_order_get_type
-	gdk_cap_style_get_type
-	gdk_char_height
-	gdk_char_measure
-	gdk_char_width
-	gdk_char_width_wc
-	gdk_color_alloc
-	gdk_color_black
-	gdk_color_change
-	gdk_color_copy
-	gdk_color_equal
-	gdk_color_free
-	gdk_color_get_type
-	gdk_color_hash
-	gdk_color_parse
-	gdk_color_white
-	gdk_colormap_alloc_color
-	gdk_colormap_alloc_colors
-	gdk_colormap_change
-	gdk_colormap_free_colors
-	gdk_colormap_get_screen
-	gdk_colormap_get_system
-	gdk_colormap_get_system_size
-	gdk_colormap_get_type
-	gdk_colormap_get_visual
-	gdk_colormap_new
-	gdk_colormap_query_color
-	gdk_colormap_ref
-	gdk_colormap_unref
-	gdk_colors_alloc
-	gdk_colors_free
-	gdk_colors_store
-	gdk_crossing_mode_get_type
-	gdk_cursor_get_display
-	gdk_cursor_get_type
-	gdk_cursor_new
-	gdk_cursor_new_for_display
-	gdk_cursor_new_from_pixbuf
-	gdk_cursor_new_from_pixmap
-	gdk_cursor_ref
-	gdk_cursor_type_get_type
-	gdk_cursor_unref
-	gdk_device_free_history
-	gdk_device_get_axis
-	gdk_device_get_core_pointer
-	gdk_device_get_history
-	gdk_device_get_state
-	gdk_device_get_type
-	gdk_device_set_axis_use
-	gdk_device_set_key
-	gdk_device_set_mode
-	gdk_device_set_source
-	gdk_devices_list
-	gdk_display_add_client_message_filter
-	gdk_display_beep
-	gdk_display_close
-	gdk_display_flush
-	gdk_display_get_core_pointer
-	gdk_display_get_default
-	gdk_display_get_default_cursor_size
-	gdk_display_get_default_group
-	gdk_display_get_default_screen
-	gdk_display_get_event
-	gdk_display_get_maximal_cursor_size
-	gdk_display_get_n_screens
-	gdk_display_get_name
-	gdk_display_get_pointer
-	gdk_display_get_screen
-	gdk_display_get_type
-	gdk_display_get_window_at_pointer
-	gdk_display_keyboard_ungrab
-	gdk_display_list_devices
-	gdk_display_manager_get
-	gdk_display_manager_get_default_display
-	gdk_display_manager_get_type
-	gdk_display_manager_list_displays
-	gdk_display_manager_set_default_display
-	gdk_display_open
-	gdk_display_open_default_libgtk_only
-	gdk_display_peek_event
-	gdk_display_pointer_is_grabbed
-	gdk_display_pointer_ungrab
-	gdk_display_put_event
-	gdk_display_request_selection_notification
-	gdk_display_set_double_click_distance
-	gdk_display_set_double_click_time
-	gdk_display_set_pointer_hooks
-	gdk_display_supports_cursor_alpha
-	gdk_display_supports_cursor_color
-	gdk_display_supports_selection_notification
-	gdk_display_sync
-	gdk_drag_abort
-	gdk_drag_action_get_type
-	gdk_drag_begin
-	gdk_drag_context_get_type
-	gdk_drag_context_new
-	gdk_drag_context_ref
-	gdk_drag_context_unref
-	gdk_drag_drop
-	gdk_drag_find_window
-	gdk_drag_find_window_for_screen
-	gdk_drag_get_protocol
-	gdk_drag_get_protocol_for_display
-	gdk_drag_get_selection
-	gdk_drag_motion
-	gdk_drag_protocol_get_type
-	gdk_drag_status
-	gdk_draw_arc
-	gdk_draw_drawable
-	gdk_draw_glyphs
-	gdk_draw_gray_image
-	gdk_draw_image
-	gdk_draw_indexed_image
-	gdk_draw_layout
-	gdk_draw_layout_line
-	gdk_draw_layout_line_with_colors
-	gdk_draw_layout_with_colors
-	gdk_draw_line
-	gdk_draw_lines
-	gdk_draw_pixbuf
-	gdk_draw_point
-	gdk_draw_points
-	gdk_draw_polygon
-	gdk_draw_rectangle
-	gdk_draw_rectangle_alpha_libgtk_only
-	gdk_draw_rgb_32_image
-	gdk_draw_rgb_32_image_dithalign
-	gdk_draw_rgb_image
-	gdk_draw_rgb_image_dithalign
-	gdk_draw_segments
-	gdk_draw_string
-	gdk_draw_text
-	gdk_draw_text_wc
-	gdk_drawable_copy_to_image
-	gdk_drawable_get_clip_region
-	gdk_drawable_get_colormap
-	gdk_drawable_get_data
-	gdk_drawable_get_depth
-	gdk_drawable_get_display
-	gdk_drawable_get_image
-	gdk_drawable_get_screen
-	gdk_drawable_get_size
-	gdk_drawable_get_type
-	gdk_drawable_get_visible_region
-	gdk_drawable_get_visual
-	gdk_drawable_impl_win32_get_type
-	gdk_drawable_ref
-	gdk_drawable_set_colormap
-	gdk_drawable_set_data
-	gdk_drawable_unref
-	gdk_drop_finish
-	gdk_drop_reply
-	gdk_error_trap_pop
-	gdk_error_trap_push
-	gdk_event_copy
-	gdk_event_free
-	gdk_event_get
-	gdk_event_get_axis
-	gdk_event_get_coords
-	gdk_event_get_graphics_expose
-	gdk_event_get_root_coords
-	gdk_event_get_screen
-	gdk_event_get_state
-	gdk_event_get_time
-	gdk_event_get_type
-	gdk_event_handler_set
-	gdk_event_mask_get_type
-	gdk_event_new
-	gdk_event_peek
-	gdk_event_put
-	gdk_event_send_client_message
-	gdk_event_send_client_message_for_display
-	gdk_event_send_clientmessage_toall
-	gdk_event_set_screen
-	gdk_event_type_get_type
-	gdk_events_pending
-	gdk_exit
-	gdk_extension_mode_get_type
-	gdk_fill_get_type
-	gdk_fill_rule_get_type
-	gdk_filter_return_get_type
-	gdk_flush
-	gdk_font_equal
-	gdk_font_from_description
-	gdk_font_from_description_for_display
-	gdk_font_get_display
-	gdk_font_get_type
-	gdk_font_id
-	gdk_font_load
-	gdk_font_load_for_display
-	gdk_font_ref
-	gdk_font_type_get_type
-	gdk_font_unref
-	gdk_fontset_load
-	gdk_fontset_load_for_display
-	gdk_free_compound_text
-	gdk_free_text_list
-	gdk_function_get_type
-	gdk_gc_copy
-	gdk_gc_get_colormap
-	gdk_gc_get_screen
-	gdk_gc_get_type
-	gdk_gc_get_values
-	gdk_gc_new
-	gdk_gc_new_with_values
-	gdk_gc_offset
-	gdk_gc_ref
-	gdk_gc_set_background
-	gdk_gc_set_clip_mask
-	gdk_gc_set_clip_origin
-	gdk_gc_set_clip_rectangle
-	gdk_gc_set_clip_region
-	gdk_gc_set_colormap
-	gdk_gc_set_dashes
-	gdk_gc_set_exposures
-	gdk_gc_set_fill
-	gdk_gc_set_font
-	gdk_gc_set_foreground
-	gdk_gc_set_function
-	gdk_gc_set_line_attributes
-	gdk_gc_set_rgb_bg_color
-	gdk_gc_set_rgb_fg_color
-	gdk_gc_set_stipple
-	gdk_gc_set_subwindow
-	gdk_gc_set_tile
-	gdk_gc_set_ts_origin
-	gdk_gc_set_values
-	gdk_gc_unref
-	gdk_gc_values_mask_get_type
-	gdk_get_default_root_window
-	gdk_get_display
-	gdk_get_display_arg_name
-	gdk_get_program_class
-	gdk_get_show_events
-	gdk_get_use_xshm
-	gdk_grab_status_get_type
-	gdk_gravity_get_type
-	gdk_image_get
-	gdk_image_get_colormap
-	gdk_image_get_pixel
-	gdk_image_get_type
-	gdk_image_new
-	gdk_image_new_bitmap
-	gdk_image_put_pixel
-	gdk_image_ref
-	gdk_image_set_colormap
-	gdk_image_type_get_type
-	gdk_image_unref
-	gdk_init
-	gdk_init_check
-	gdk_input_add
-	gdk_input_add_full
-	gdk_input_condition_get_type
-	gdk_input_mode_get_type
-	gdk_input_remove
-	gdk_input_set_extension_events
-	gdk_input_source_get_type
-	gdk_join_style_get_type
-	gdk_keyboard_grab
-	gdk_keyboard_grab_info_libgtk_only
-	gdk_keyboard_ungrab
-	gdk_keymap_get_default
-	gdk_keymap_get_direction
-	gdk_keymap_get_entries_for_keycode
-	gdk_keymap_get_entries_for_keyval
-	gdk_keymap_get_for_display
-	gdk_keymap_get_type
-	gdk_keymap_lookup_key
-	gdk_keymap_translate_keyboard_state
-	gdk_keyval_convert_case
-	gdk_keyval_from_name
-	gdk_keyval_is_lower
-	gdk_keyval_is_upper
-	gdk_keyval_name
-	gdk_keyval_to_lower
-	gdk_keyval_to_unicode
-	gdk_keyval_to_upper
-	gdk_line_style_get_type
-	gdk_list_visuals
-	gdk_mbstowcs
-	gdk_modifier_type_get_type
-	gdk_net_wm_supports
-	gdk_notify_startup_complete
-	gdk_notify_type_get_type
-	gdk_overlap_type_get_type
-	gdk_pango_attr_embossed_new
-	gdk_pango_attr_stipple_new
-	gdk_pango_context_get
-	gdk_pango_context_get_for_screen
-	gdk_pango_context_set_colormap
-	gdk_pango_layout_get_clip_region
-	gdk_pango_layout_line_get_clip_region
-	gdk_parse_args
-	gdk_pixbuf_get_from_drawable
-	gdk_pixbuf_get_from_image
-	gdk_pixbuf_render_pixmap_and_mask
-	gdk_pixbuf_render_pixmap_and_mask_for_colormap
-	gdk_pixbuf_render_threshold_alpha
-	gdk_pixbuf_render_to_drawable
-	gdk_pixbuf_render_to_drawable_alpha
-	gdk_pixmap_colormap_create_from_xpm
-	gdk_pixmap_colormap_create_from_xpm_d
-	gdk_pixmap_create_from_data
-	gdk_pixmap_create_from_xpm
-	gdk_pixmap_create_from_xpm_d
-	gdk_pixmap_foreign_new
-	gdk_pixmap_get_type
-	gdk_pixmap_foreign_new_for_display
-	gdk_pixmap_lookup
-	gdk_pixmap_lookup_for_display
-	gdk_pixmap_new
-	gdk_pointer_grab
-	gdk_pointer_grab_info_libgtk_only
-	gdk_pointer_is_grabbed
-	gdk_pointer_ungrab
-	gdk_prop_mode_get_type
-	gdk_property_change
-	gdk_property_delete
-	gdk_property_get
-	gdk_property_state_get_type
-	gdk_query_depths
-	gdk_query_visual_types
-	gdk_rectangle_get_type
-	gdk_rectangle_intersect
-	gdk_rectangle_union
-	gdk_region_copy
-	gdk_region_destroy
-	gdk_region_empty
-	gdk_region_equal
-	gdk_region_get_clipbox
-	gdk_region_get_rectangles
-	gdk_region_intersect
-	gdk_region_new
-	gdk_region_offset
-	gdk_region_point_in
-	gdk_region_polygon
-	gdk_region_rect_in
-	gdk_region_rectangle
-	gdk_region_shrink
-	gdk_region_spans_intersect_foreach
-	gdk_region_subtract
-	gdk_region_union
-	gdk_region_union_with_rect
-	gdk_region_xor
-	gdk_rgb_cmap_free
-	gdk_rgb_cmap_new
-	gdk_rgb_colormap_ditherable
-	gdk_rgb_dither_get_type
-	gdk_rgb_ditherable
-	gdk_rgb_find_color
-	gdk_rgb_gc_set_background
-	gdk_rgb_gc_set_foreground
-	gdk_rgb_get_colormap
-	gdk_rgb_get_visual
-	gdk_rgb_init
-	gdk_rgb_set_install
-	gdk_rgb_set_min_colors
-	gdk_rgb_set_verbose
-	gdk_rgb_xpixel_from_rgb
-	gdk_screen_broadcast_client_message
-	gdk_screen_get_default
-	gdk_screen_get_default_colormap
-	gdk_screen_get_display
-	gdk_screen_get_height
-	gdk_screen_get_height_mm
-	gdk_screen_get_monitor_at_point
-	gdk_screen_get_monitor_at_window
-	gdk_screen_get_monitor_geometry
-	gdk_screen_get_n_monitors
-	gdk_screen_get_number
-	gdk_screen_get_rgb_colormap
-	gdk_screen_get_rgb_visual
-	gdk_screen_get_root_window
-	gdk_screen_get_setting
-	gdk_screen_get_system_colormap
-	gdk_screen_get_system_visual
-	gdk_screen_get_toplevel_windows
-	gdk_screen_get_type
-	gdk_screen_get_width
-	gdk_screen_get_width_mm
-	gdk_screen_height
-	gdk_screen_height_mm
-	gdk_screen_list_visuals
-	gdk_screen_make_display_name
-	gdk_screen_set_default_colormap
-	gdk_screen_width
-	gdk_screen_width_mm
-	gdk_scroll_direction_get_type
-	gdk_selection_convert
-	gdk_selection_owner_get
-	gdk_selection_owner_get_for_display
-	gdk_selection_owner_set
-	gdk_selection_owner_set_for_display
-	gdk_selection_property_get
-	gdk_selection_send_notify
-	gdk_selection_send_notify_for_display
-	gdk_set_double_click_time
-	gdk_set_locale
-	gdk_set_pointer_hooks
-	gdk_set_program_class
-	gdk_set_show_events
-	gdk_set_sm_client_id
-	gdk_set_use_xshm
-	gdk_setting_action_get_type
-	gdk_setting_get
-	gdk_spawn_command_line_on_screen
-	gdk_spawn_on_screen
-	gdk_spawn_on_screen_with_pipes
-	gdk_status_get_type
-	gdk_string_extents
-	gdk_string_height
-	gdk_string_measure
-	gdk_string_to_compound_text
-	gdk_string_to_compound_text_for_display
-	gdk_string_width
-	gdk_subwindow_mode_get_type
-	gdk_synthesize_window_state
-	gdk_text_extents
-	gdk_text_extents_wc
-	gdk_text_height
-	gdk_text_measure
-	gdk_text_property_to_text_list
-	gdk_text_property_to_text_list_for_display
-	gdk_text_property_to_utf8_list
-	gdk_text_property_to_utf8_list_for_display
-	gdk_text_width
-	gdk_text_width_wc
-	gdk_threads_enter
-	gdk_threads_init
-	gdk_threads_leave
-	gdk_threads_lock
-	gdk_threads_mutex
-	gdk_threads_set_lock_functions
-	gdk_threads_unlock
-	gdk_unicode_to_keyval
-	gdk_utf8_to_compound_text
-	gdk_utf8_to_compound_text_for_display
-	gdk_utf8_to_string_target
-	gdk_visibility_state_get_type
-	gdk_visual_get_best
-	gdk_visual_get_best_depth
-	gdk_visual_get_best_type
-	gdk_visual_get_best_with_both
-	gdk_visual_get_best_with_depth
-	gdk_visual_get_best_with_type
-	gdk_visual_get_screen
-	gdk_visual_get_system
-	gdk_visual_get_type
-	gdk_visual_type_get_type
-	gdk_wcstombs
-	gdk_win32_drawable_get_handle
-	gdk_win32_handle_table_lookup
-	gdk_win32_hdc_get
-	gdk_win32_hdc_release
-	gdk_window_add_filter
-	gdk_window_at_pointer
-	gdk_window_attributes_type_get_type
-	gdk_window_begin_move_drag
-	gdk_window_begin_paint_rect
-	gdk_window_begin_paint_region
-	gdk_window_begin_resize_drag
-	gdk_window_class_get_type
-	gdk_window_clear
-	gdk_window_clear_area
-	gdk_window_clear_area_e
-	gdk_window_configure_finished
-	gdk_window_constrain_size
-	gdk_window_deiconify
-	gdk_window_destroy
-	gdk_window_destroy_notify
-	gdk_window_edge_get_type
-	gdk_window_enable_synchronized_configure
-	gdk_window_end_paint
-	gdk_window_focus
-	gdk_window_foreign_new
-	gdk_window_foreign_new_for_display
-	gdk_window_freeze_updates
-	gdk_window_fullscreen
-	gdk_window_get_children
-	gdk_window_get_decorations
-	gdk_window_get_deskrelative_origin
-	gdk_window_get_events
-	gdk_window_get_frame_extents
-	gdk_window_get_geometry
-	gdk_window_get_group
-	gdk_window_get_internal_paint_info
-	gdk_window_get_origin
-	gdk_window_get_parent
-	gdk_window_get_pointer
-	gdk_window_get_position
-	gdk_window_get_root_origin
-	gdk_window_get_state
-	gdk_window_get_toplevel
-	gdk_window_get_toplevels
-	gdk_window_get_update_area
-	gdk_window_get_user_data
-	gdk_window_get_window_type
-	gdk_window_hide
-	gdk_window_hints_get_type
-	gdk_window_iconify
-	gdk_window_invalidate_maybe_recurse
-	gdk_window_invalidate_rect
-	gdk_window_invalidate_region
-	gdk_window_is_viewable
-	gdk_window_is_visible
-	gdk_window_lookup
-	gdk_window_lookup_for_display
-	gdk_window_lower
-	gdk_window_maximize
-	gdk_window_merge_child_shapes
-	gdk_window_move
-	gdk_window_move_resize
-	gdk_window_new
-	gdk_window_object_get_type
-	gdk_window_peek_children
-	gdk_window_process_all_updates
-	gdk_window_process_updates
-	gdk_window_raise
-	gdk_window_register_dnd
-	gdk_window_remove_filter
-	gdk_window_reparent
-	gdk_window_resize
-	gdk_window_scroll
-	gdk_window_set_accept_focus
-	gdk_window_set_back_pixmap
-	gdk_window_set_background
-	gdk_window_set_child_shapes
-	gdk_window_set_cursor
-	gdk_window_set_debug_updates
-	gdk_window_set_decorations
-	gdk_window_set_events
-	gdk_window_set_focus_on_map
-	gdk_window_set_functions
-	gdk_window_set_geometry_hints
-	gdk_window_set_group
-	gdk_window_set_hints
-	gdk_window_set_icon
-	gdk_window_set_icon_list
-	gdk_window_set_icon_name
-	gdk_window_set_keep_above
-	gdk_window_set_keep_below
-	gdk_window_set_modal_hint
-	gdk_window_set_override_redirect
-	gdk_window_set_role
-	gdk_window_set_skip_pager_hint
-	gdk_window_set_skip_taskbar_hint
-	gdk_window_set_static_gravities
-	gdk_window_set_title
-	gdk_window_set_transient_for
-	gdk_window_set_type_hint
-	gdk_window_set_user_data
-	gdk_window_shape_combine_mask
-	gdk_window_shape_combine_region
-	gdk_window_show
-	gdk_window_show_unraised
-	gdk_window_state_get_type
-	gdk_window_stick
-	gdk_window_thaw_updates
-	gdk_window_type_get_type
-	gdk_window_type_hint_get_type
-	gdk_window_unfullscreen
-	gdk_window_unmaximize
-	gdk_window_unstick
-	gdk_window_withdraw
-	gdk_wm_decoration_get_type
-	gdk_wm_function_get_type
-
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
new file mode 100644
index 0000000000..16103aed83
--- /dev/null
+++ b/gdk/gdk.symbols
@@ -0,0 +1,628 @@
+gdk_add_client_message_filter
+gdk_atom_intern
+gdk_atom_name
+gdk_axis_use_get_type
+gdk_beep
+gdk_bitmap_create_from_data
+gdk_byte_order_get_type
+gdk_cap_style_get_type
+gdk_char_height
+gdk_char_measure
+gdk_char_width
+gdk_char_width_wc
+gdk_color_alloc
+gdk_color_black
+gdk_color_change
+gdk_color_copy
+gdk_color_equal
+gdk_color_free
+gdk_color_get_type
+gdk_color_hash
+gdk_colormap_alloc_color
+gdk_colormap_alloc_colors
+gdk_colormap_change
+gdk_colormap_free_colors
+gdk_colormap_get_screen
+gdk_colormap_get_system
+gdk_colormap_get_system_size
+gdk_colormap_get_type
+gdk_colormap_get_visual
+gdk_colormap_new
+gdk_colormap_query_color
+gdk_colormap_ref
+gdk_colormap_unref
+gdk_color_parse
+gdk_colors_alloc
+gdk_colors_free
+gdk_colors_store
+gdk_color_white
+gdk_crossing_mode_get_type
+gdk_cursor_get_display
+gdk_cursor_get_type
+gdk_cursor_new
+gdk_cursor_new_for_display
+gdk_cursor_new_from_pixbuf
+gdk_cursor_new_from_pixmap
+gdk_cursor_ref
+gdk_cursor_type_get_type
+gdk_cursor_unref
+gdk_device_free_history
+gdk_device_get_axis
+gdk_device_get_core_pointer
+gdk_device_get_history
+gdk_device_get_state
+gdk_device_get_type
+gdk_device_set_axis_use
+gdk_device_set_key
+gdk_device_set_mode
+gdk_device_set_source
+gdk_devices_list
+gdk_display_add_client_message_filter
+gdk_display_beep
+gdk_display_close
+gdk_display_flush
+gdk_display_get_core_pointer
+gdk_display_get_default
+gdk_display_get_default_cursor_size
+gdk_display_get_default_group
+gdk_display_get_default_screen
+gdk_display_get_event
+gdk_display_get_maximal_cursor_size
+gdk_display_get_name
+gdk_display_get_n_screens
+gdk_display_get_pointer
+gdk_display_get_screen
+gdk_display_get_type
+gdk_display_get_window_at_pointer
+gdk_display_keyboard_ungrab
+gdk_display_list_devices
+gdk_display_manager_get
+gdk_display_manager_get_default_display
+gdk_display_manager_get_type
+gdk_display_manager_list_displays
+gdk_display_manager_set_default_display
+gdk_display_open
+gdk_display_open_default_libgtk_only
+gdk_display_peek_event
+gdk_display_pointer_is_grabbed
+gdk_display_pointer_ungrab
+gdk_display_put_event
+gdk_display_request_selection_notification
+gdk_display_set_double_click_distance
+gdk_display_set_double_click_time
+gdk_display_set_pointer_hooks
+gdk_display_supports_cursor_alpha
+gdk_display_supports_cursor_color
+gdk_display_supports_selection_notification
+gdk_display_sync
+gdk_drag_abort
+gdk_drag_action_get_type
+gdk_drag_begin
+gdk_drag_context_get_type
+gdk_drag_context_new
+gdk_drag_context_ref
+gdk_drag_context_unref
+gdk_drag_drop
+gdk_drag_drop_succeeded
+gdk_drag_find_window
+gdk_drag_find_window_for_screen
+gdk_drag_get_protocol
+gdk_drag_get_protocol_for_display
+gdk_drag_get_selection
+gdk_drag_motion
+gdk_drag_protocol_get_type
+gdk_drag_status
+gdk_drawable_copy_to_image
+gdk_drawable_get_clip_region
+gdk_drawable_get_colormap
+gdk_drawable_get_data
+gdk_drawable_get_depth
+gdk_drawable_get_display
+gdk_drawable_get_image
+gdk_drawable_get_screen
+gdk_drawable_get_size
+gdk_drawable_get_type
+gdk_drawable_get_visible_region
+gdk_drawable_get_visual
+gdk_drawable_ref
+gdk_drawable_set_colormap
+gdk_drawable_set_data
+gdk_drawable_unref
+gdk_draw_arc
+gdk_draw_drawable
+gdk_draw_glyphs
+gdk_draw_gray_image
+gdk_draw_image
+gdk_draw_indexed_image
+gdk_draw_layout
+gdk_draw_layout_line
+gdk_draw_layout_line_with_colors
+gdk_draw_layout_with_colors
+gdk_draw_line
+gdk_draw_lines
+gdk_draw_pixbuf
+gdk_draw_point
+gdk_draw_points
+gdk_draw_polygon
+gdk_draw_rectangle
+gdk_draw_rectangle_alpha_libgtk_only
+gdk_draw_rgb_32_image
+gdk_draw_rgb_32_image_dithalign
+gdk_draw_rgb_image
+gdk_draw_rgb_image_dithalign
+gdk_draw_segments
+gdk_draw_string
+gdk_draw_text
+gdk_draw_text_wc
+gdk_drop_finish
+gdk_drop_reply
+gdk_error_trap_pop
+gdk_error_trap_push
+gdk_event_copy
+gdk_event_free
+gdk_event_get
+gdk_event_get_axis
+gdk_event_get_coords
+gdk_event_get_graphics_expose
+gdk_event_get_root_coords
+gdk_event_get_screen
+gdk_event_get_state
+gdk_event_get_time
+gdk_event_get_type
+gdk_event_handler_set
+gdk_event_mask_get_type
+gdk_event_new
+gdk_event_peek
+gdk_event_put
+gdk_event_send_client_message
+gdk_event_send_client_message_for_display
+gdk_event_send_clientmessage_toall
+gdk_event_set_screen
+gdk_events_pending
+gdk_event_type_get_type
+gdk_exit
+gdk_extension_mode_get_type
+gdk_fill_get_type
+gdk_fill_rule_get_type
+gdk_filter_return_get_type
+gdk_flush
+gdk_font_equal
+gdk_font_from_description
+gdk_font_from_description_for_display
+gdk_font_get_display
+gdk_font_get_type
+gdk_font_id
+gdk_font_load
+gdk_font_load_for_display
+gdk_font_ref
+gdk_fontset_load
+gdk_fontset_load_for_display
+gdk_font_type_get_type
+gdk_font_unref
+gdk_free_compound_text
+gdk_free_text_list
+gdk_function_get_type
+gdk_gc_copy
+gdk_gc_get_colormap
+gdk_gc_get_screen
+gdk_gc_get_type
+gdk_gc_get_values
+gdk_gc_new
+gdk_gc_new_with_values
+gdk_gc_offset
+gdk_gc_ref
+gdk_gc_set_background
+gdk_gc_set_clip_mask
+gdk_gc_set_clip_origin
+gdk_gc_set_clip_rectangle
+gdk_gc_set_clip_region
+gdk_gc_set_colormap
+gdk_gc_set_dashes
+gdk_gc_set_exposures
+gdk_gc_set_fill
+gdk_gc_set_font
+gdk_gc_set_foreground
+gdk_gc_set_function
+gdk_gc_set_line_attributes
+gdk_gc_set_rgb_bg_color
+gdk_gc_set_rgb_fg_color
+gdk_gc_set_stipple
+gdk_gc_set_subwindow
+gdk_gc_set_tile
+gdk_gc_set_ts_origin
+gdk_gc_set_values
+gdk_gc_unref
+gdk_gc_values_mask_get_type
+gdk_get_default_root_window
+gdk_get_display
+gdk_get_display_arg_name
+gdk_get_program_class
+gdk_get_show_events
+gdk_get_use_xshm
+gdk_grab_status_get_type
+gdk_gravity_get_type
+gdk_image_get
+gdk_image_get_colormap
+gdk_image_get_pixel
+gdk_image_get_type
+gdk_image_new
+gdk_image_new_bitmap
+gdk_image_put_pixel
+gdk_image_ref
+gdk_image_set_colormap
+gdk_image_type_get_type
+gdk_image_unref
+gdk_init
+gdk_init_check
+gdk_input_add
+gdk_input_add_full
+gdk_input_condition_get_type
+gdk_input_mode_get_type
+gdk_input_remove
+gdk_input_set_extension_events
+gdk_input_source_get_type
+gdk_join_style_get_type
+gdk_keyboard_grab
+gdk_keyboard_grab_info_libgtk_only
+gdk_keyboard_ungrab
+gdk_keymap_get_default
+gdk_keymap_get_direction
+gdk_keymap_get_entries_for_keycode
+gdk_keymap_get_entries_for_keyval
+gdk_keymap_get_for_display
+gdk_keymap_get_type
+gdk_keymap_lookup_key
+gdk_keymap_translate_keyboard_state
+gdk_keyval_convert_case
+gdk_keyval_from_name
+gdk_keyval_is_lower
+gdk_keyval_is_upper
+gdk_keyval_name
+gdk_keyval_to_lower
+gdk_keyval_to_unicode
+gdk_keyval_to_upper
+gdk_line_style_get_type
+gdk_list_visuals
+gdk_mbstowcs
+gdk_modifier_type_get_type
+#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+gdk_net_wm_supports
+#endif
+gdk_notify_startup_complete
+gdk_notify_type_get_type
+gdk_overlap_type_get_type
+gdk_owner_change_get_type
+gdk_pango_attr_embossed_new
+gdk_pango_attr_stipple_new
+gdk_pango_context_get
+gdk_pango_context_get_for_screen
+gdk_pango_context_set_colormap
+gdk_pango_layout_get_clip_region
+gdk_pango_layout_line_get_clip_region
+gdk_parse_args
+gdk_pixbuf_get_from_drawable
+gdk_pixbuf_get_from_image
+gdk_pixbuf_render_pixmap_and_mask
+gdk_pixbuf_render_pixmap_and_mask_for_colormap
+gdk_pixbuf_render_threshold_alpha
+gdk_pixbuf_render_to_drawable
+gdk_pixbuf_render_to_drawable_alpha
+gdk_pixmap_colormap_create_from_xpm
+gdk_pixmap_colormap_create_from_xpm_d
+gdk_pixmap_create_from_data
+gdk_pixmap_create_from_xpm
+gdk_pixmap_create_from_xpm_d
+gdk_pixmap_foreign_new
+gdk_pixmap_foreign_new_for_display
+gdk_pixmap_get_type
+gdk_pixmap_lookup
+gdk_pixmap_lookup_for_display
+gdk_pixmap_new
+gdk_pointer_grab
+gdk_pointer_grab_info_libgtk_only
+gdk_pointer_is_grabbed
+gdk_pointer_ungrab
+gdk_property_change
+gdk_property_delete
+gdk_property_get
+gdk_property_state_get_type
+gdk_prop_mode_get_type
+gdk_query_depths
+gdk_query_visual_types
+gdk_rectangle_get_type
+gdk_rectangle_intersect
+gdk_rectangle_union
+gdk_region_copy
+gdk_region_destroy
+gdk_region_empty
+gdk_region_equal
+gdk_region_get_clipbox
+gdk_region_get_rectangles
+gdk_region_intersect
+gdk_region_new
+gdk_region_offset
+gdk_region_point_in
+gdk_region_polygon
+gdk_region_rectangle
+gdk_region_rect_in
+gdk_region_shrink
+gdk_region_spans_intersect_foreach
+gdk_region_subtract
+gdk_region_union
+gdk_region_union_with_rect
+gdk_region_xor
+gdk_rgb_cmap_free
+gdk_rgb_cmap_new
+gdk_rgb_colormap_ditherable
+gdk_rgb_ditherable
+gdk_rgb_dither_get_type
+gdk_rgb_find_color
+gdk_rgb_gc_set_background
+gdk_rgb_gc_set_foreground
+gdk_rgb_get_colormap
+gdk_rgb_get_visual
+gdk_rgb_init
+gdk_rgb_set_install
+gdk_rgb_set_min_colors
+gdk_rgb_set_verbose
+gdk_rgb_xpixel_from_rgb
+gdk_screen_broadcast_client_message
+gdk_screen_get_default
+gdk_screen_get_default_colormap
+gdk_screen_get_display
+gdk_screen_get_height
+gdk_screen_get_height_mm
+gdk_screen_get_monitor_at_point
+gdk_screen_get_monitor_at_window
+gdk_screen_get_monitor_geometry
+gdk_screen_get_n_monitors
+gdk_screen_get_number
+gdk_screen_get_rgb_colormap
+gdk_screen_get_rgb_visual
+gdk_screen_get_root_window
+gdk_screen_get_setting
+gdk_screen_get_system_colormap
+gdk_screen_get_system_visual
+gdk_screen_get_toplevel_windows
+gdk_screen_get_type
+gdk_screen_get_width
+gdk_screen_get_width_mm
+gdk_screen_height
+gdk_screen_height_mm
+gdk_screen_list_visuals
+gdk_screen_make_display_name
+gdk_screen_set_default_colormap
+gdk_screen_width
+gdk_screen_width_mm
+gdk_scroll_direction_get_type
+gdk_selection_convert
+gdk_selection_owner_get
+gdk_selection_owner_get_for_display
+gdk_selection_owner_set
+gdk_selection_owner_set_for_display
+gdk_selection_property_get
+gdk_selection_send_notify
+gdk_selection_send_notify_for_display
+gdk_set_double_click_time
+gdk_set_locale
+gdk_set_pointer_hooks
+gdk_set_program_class
+gdk_set_show_events
+gdk_set_sm_client_id
+gdk_setting_action_get_type
+gdk_setting_get
+gdk_set_use_xshm
+gdk_spawn_command_line_on_screen
+gdk_spawn_on_screen
+gdk_spawn_on_screen_with_pipes
+gdk_status_get_type
+gdk_string_extents
+gdk_string_height
+gdk_string_measure
+gdk_string_to_compound_text
+gdk_string_to_compound_text_for_display
+gdk_string_width
+gdk_subwindow_mode_get_type
+gdk_synthesize_window_state
+gdk_text_extents
+gdk_text_extents_wc
+gdk_text_height
+gdk_text_measure
+gdk_text_property_to_text_list
+gdk_text_property_to_text_list_for_display
+gdk_text_property_to_utf8_list
+gdk_text_property_to_utf8_list_for_display
+gdk_text_width
+gdk_text_width_wc
+gdk_threads_enter
+gdk_threads_init
+gdk_threads_leave
+#ifdef INCLUDE_VARIABLES
+gdk_threads_mutex
+gdk_threads_lock
+gdk_threads_unlock
+#endif
+gdk_threads_set_lock_functions
+gdk_unicode_to_keyval
+gdk_utf8_to_compound_text
+gdk_utf8_to_compound_text_for_display
+gdk_utf8_to_string_target
+gdk_visibility_state_get_type
+gdk_visual_get_best
+gdk_visual_get_best_depth
+gdk_visual_get_best_type
+gdk_visual_get_best_with_both
+gdk_visual_get_best_with_depth
+gdk_visual_get_best_with_type
+gdk_visual_get_screen
+gdk_visual_get_system
+gdk_visual_get_type
+gdk_visual_type_get_type
+gdk_wcstombs
+#ifdef GDK_WINDOWING_WIN32
+gdk_win32_drawable_get_handle
+gdk_win32_handle_table_lookup
+gdk_win32_hdc_get
+gdk_win32_hdc_release
+#endif
+gdk_window_add_filter
+gdk_window_at_pointer
+gdk_window_attributes_type_get_type
+gdk_window_begin_move_drag
+gdk_window_begin_paint_rect
+gdk_window_begin_paint_region
+gdk_window_begin_resize_drag
+gdk_window_class_get_type
+gdk_window_clear
+gdk_window_clear_area
+gdk_window_clear_area_e
+gdk_window_configure_finished
+gdk_window_constrain_size
+gdk_window_deiconify
+gdk_window_destroy
+gdk_window_destroy_notify
+gdk_window_edge_get_type
+gdk_window_enable_synchronized_configure
+gdk_window_end_paint
+gdk_window_focus
+gdk_window_foreign_new
+gdk_window_foreign_new_for_display
+gdk_window_freeze_updates
+gdk_window_fullscreen
+gdk_window_get_children
+gdk_window_get_decorations
+gdk_window_get_deskrelative_origin
+gdk_window_get_events
+gdk_window_get_frame_extents
+gdk_window_get_geometry
+gdk_window_get_group
+gdk_window_get_internal_paint_info
+gdk_window_get_origin
+gdk_window_get_parent
+gdk_window_get_pointer
+gdk_window_get_position
+gdk_window_get_root_origin
+gdk_window_get_state
+gdk_window_get_toplevel
+gdk_window_get_toplevels
+gdk_window_get_update_area
+gdk_window_get_user_data
+gdk_window_get_window_type
+gdk_window_hide
+gdk_window_hints_get_type
+gdk_window_iconify
+#ifdef GDK_WINDOWING_X11
+gdk_window_impl_x11_get_type
+#endif
+gdk_window_invalidate_maybe_recurse
+gdk_window_invalidate_rect
+gdk_window_invalidate_region
+gdk_window_is_viewable
+gdk_window_is_visible
+gdk_window_lookup
+gdk_window_lookup_for_display
+gdk_window_lower
+gdk_window_maximize
+gdk_window_merge_child_shapes
+gdk_window_move
+gdk_window_move_resize
+gdk_window_new
+gdk_window_object_get_type
+gdk_window_peek_children
+gdk_window_process_all_updates
+gdk_window_process_updates
+gdk_window_raise
+gdk_window_register_dnd
+gdk_window_remove_filter
+gdk_window_reparent
+gdk_window_resize
+gdk_window_scroll
+gdk_window_set_accept_focus
+gdk_window_set_background
+gdk_window_set_back_pixmap
+gdk_window_set_child_shapes
+gdk_window_set_cursor
+gdk_window_set_debug_updates
+gdk_window_set_decorations
+gdk_window_set_events
+gdk_window_set_focus_on_map
+gdk_window_set_functions
+gdk_window_set_geometry_hints
+gdk_window_set_group
+gdk_window_set_hints
+gdk_window_set_icon
+gdk_window_set_icon_list
+gdk_window_set_icon_name
+gdk_window_set_keep_above
+gdk_window_set_keep_below
+gdk_window_set_modal_hint
+gdk_window_set_override_redirect
+gdk_window_set_role
+gdk_window_set_skip_pager_hint
+gdk_window_set_skip_taskbar_hint
+gdk_window_set_static_gravities
+gdk_window_set_title
+gdk_window_set_transient_for
+gdk_window_set_type_hint
+gdk_window_set_user_data
+gdk_window_shape_combine_mask
+gdk_window_shape_combine_region
+gdk_window_show
+gdk_window_show_unraised
+gdk_window_state_get_type
+gdk_window_stick
+gdk_window_thaw_updates
+gdk_window_type_get_type
+gdk_window_type_hint_get_type
+gdk_window_unfullscreen
+gdk_window_unmaximize
+gdk_window_unstick
+gdk_window_withdraw
+gdk_wm_decoration_get_type
+gdk_wm_function_get_type
+#ifdef GDK_WINDOWING_X11
+gdk_x11_atom_to_xatom
+gdk_x11_atom_to_xatom_for_display
+gdk_x11_colormap_foreign_new
+gdk_x11_colormap_get_xcolormap
+gdk_x11_colormap_get_xdisplay
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
+gdk_x11_display_get_xdisplay
+gdk_x11_display_grab
+gdk_x11_display_ungrab
+gdk_x11_drawable_get_xdisplay
+gdk_x11_drawable_get_xid
+gdk_x11_font_get_name
+gdk_x11_font_get_xdisplay
+gdk_x11_font_get_xfont
+gdk_x11_gc_get_xdisplay
+gdk_x11_gc_get_xgc
+gdk_x11_get_default_root_xwindow
+gdk_x11_get_default_screen
+gdk_x11_get_default_xdisplay
+gdk_x11_get_server_time
+gdk_x11_get_xatom_by_name
+gdk_x11_get_xatom_by_name_for_display
+gdk_x11_get_xatom_name
+gdk_x11_get_xatom_name_for_display
+gdk_x11_grab_server
+gdk_x11_image_get_xdisplay
+gdk_x11_image_get_ximage
+gdk_x11_lookup_xdisplay
+gdk_x11_register_standard_event_type
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_lookup_visual
+gdk_x11_screen_supports_net_wm_hint
+gdk_x11_ungrab_server
+gdk_x11_visual_get_xvisual
+gdk_x11_window_set_user_time
+gdk_x11_xatom_to_atom
+gdk_x11_xatom_to_atom_for_display
+gdkx_colormap_get
+gdk_xid_table_lookup
+gdk_xid_table_lookup_for_display
+gdkx_visual_get
+#endif
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 52232720c0..56bd848517 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <time.h>
 
+#include "gdkalias.h"
 #include "gdkscreen.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 52b888e0b0..2329a7a463 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkcursor.h"
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index b1f9f183f0..f115c7cb2d 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <glib.h>
+#include "gdkalias.h"
 #include "gdk.h"		/* gdk_event_send_client_message() */
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 4a0e658ef3..8079ca7929 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkalias.h"
 #include "gdkdisplay.h"
 #include "gdkdisplaymanager.h"
 
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 4c04ed89c4..6c45678add 100644
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include <gdkdnd.h>
 #include <gdkdrawable.h>
 #include <gdkdisplay.h>
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 7d77eaed01..2145a72302 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
 #include "gdkwindow.h"
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index c0a20bd77a..8398146714 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <string.h>		/* For memset() */
 
+#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkinternals.h"
 
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index fd1c387e9f..1bc2cc94fd 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -27,6 +27,7 @@
 #undef GDK_DISABLE_DEPRECATED
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkdisplay.h"
 #include "gdkfont.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index db922d2680..d436f93ac2 100644
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdkgc.h"
 #include "gdkrgb.h"
 #include "gdkprivate.h"
diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 3a033caf3d..ca8ccc4b48 100644
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 
+#include "gdkalias.h"
 #include "gdktypes.h"
 #include "gdkprivate.h"
 
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 7ba108d522..8b7d3b584b 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
+#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkimage.h"
 #include "gdkprivate.h"
diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index b6120dfb86..6f0262f466 100644
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdkkeysyms.h"
 #include "gdkinternals.h"
 
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index b6af0d5c53..435ede8afd 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkalias.h"
 #include "gdkdisplay.h"
 #include "gdkkeys.h"
 
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index a05c957b61..bbd06f71f8 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -1,4 +1,5 @@
 #include <config.h>
+#include "gdkalias.h"
 #include "gdk.h"
 
 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index a9d612ac91..93e5ab2883 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkgc.h"
 #include "gdkpango.h"
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 7ec5c6d5cf..0505eb1c99 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkimage.h"
 #include "gdkvisual.h"
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index 2675c39951..a0cae704f4 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include <gdk/gdk.h>
 #include "gdk-pixbuf-private.h"
 #include "gdkpixbuf.h"
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index e131e45770..c4b9c55fd1 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
 #include "gdkpixbuf.h"
diff --git a/gdk/gdkpolyreg-generic.c b/gdk/gdkpolyreg-generic.c
index 916d257b5f..8c9ca2d7dc 100644
--- a/gdk/gdkpolyreg-generic.c
+++ b/gdk/gdkpolyreg-generic.c
@@ -47,6 +47,7 @@ SOFTWARE.
 #define SMALL_COORDINATE -LARGE_COORDINATE
 
 #include <config.h>
+#include "gdkalias.h"
 #include <gdkregion.h>
 #include "gdkregion-generic.h"
 #include "gdkpoly-generic.h"
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index f59c7ec955..eb3e9d95b4 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include <gdk/gdk.h>
 
 void
diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c
index 3c12fde3ff..0307272c9a 100644
--- a/gdk/gdkregion-generic.c
+++ b/gdk/gdkregion-generic.c
@@ -71,6 +71,7 @@ SOFTWARE.
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
+#include "gdkalias.h"
 #include <gdkregion.h>
 #include "gdkregion-generic.h"
 
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 13e034e160..555cf7d1f5 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -36,6 +36,7 @@
 
 #define ENABLE_GRAYSCALE
 
+#include "gdkalias.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"	/* _gdk_windowing_get_bits_for_depth() */
 
diff --git a/gdk/gdkrgb.h b/gdk/gdkrgb.h
index 3ca5553ecf..efd6a23806 100644
--- a/gdk/gdkrgb.h
+++ b/gdk/gdkrgb.h
@@ -137,7 +137,7 @@ void gdk_rgb_set_min_colors (gint     min_colors);
 GdkColormap *gdk_rgb_get_colormap (void);
 GdkVisual *  gdk_rgb_get_visual   (void);
 gboolean     gdk_rgb_ditherable   (void);
-gboolean     gdk_rgb_colormap_ditherable   (GdkColormap *cmap);
+gboolean     gdk_rgb_colormap_ditherable (GdkColormap *cmap);
 #endif
 
 #ifdef __cplusplus
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 3ab113e571..6185700c5e 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -22,6 +22,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_rectangle_intersect() */
 #include "gdkcolor.h"
 #include "gdkwindow.h"
diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c
index cc0c453328..e601c41a71 100644
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.c
@@ -1,4 +1,5 @@
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkproperty.h"
 #include "gdkdisplay.h"
 #include "gdkselection.h"
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index 39c09e1405..929db2d561 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -22,6 +22,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkvisual.h"
 #include "gdkscreen.h"
 
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c110a1fefe..3e6a3112ef 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdk.h"		/* For gdk_rectangle_union() */
diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl
new file mode 100755
index 0000000000..c5fb8e4e97
--- /dev/null
+++ b/gdk/makegdkalias.pl
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -w
+
+my $preamble = <<EOF;
+/* Generated by makegdkalias.pl */
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+
+#ifdef  GDK_ENABLE_BROKEN
+#define WAS_BROKEN
+#endif
+#define GDK_ENABLE_BROKEN
+
+#ifdef  GDK_MULTIHEAD_SAFE
+#define WAS_MULTIHEAD
+#endif
+#undef GDK_MULTIHEAD_SAVE
+
+#ifdef  GDK_DISABLE_DEPRECATED
+#define WAS_NO_DEPR
+#endif
+#undef  GDK_DISABLE_DEPRECATED
+
+#ifdef  G_DISABLE_DEPRECATED
+#define WAS_NO_G_DEPR
+#endif
+#undef  G_DISABLE_DEPRECATED
+
+#include "gdk.h"
+
+#include "x11/gdkx.h"
+
+EOF
+
+my $postamble = <<EOF;
+
+#ifndef WAS_BROKEN
+#undef  GDK_ENABLE_BROKEN
+#else
+#undef  WAS_BROKEN
+#endif
+
+#ifdef  WAS_MULTIHEAD
+#define GDK_MULTIHEAD_SAFE
+#undef  WAS_MULTIHEAD
+#endif
+
+#ifdef  WAS_NO_DEPR
+#define GDK_DISABLE_DEPRECATED
+#undef  WAS_NO_DEPR
+#endif
+
+#ifdef  WAS_NO_G_DEPR
+#define G_DISABLE_DEPRECATED
+#undef  WAS_NO_G_DEPR
+#endif
+
+#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) */
+EOF
+
+print $preamble;
+while (<>) {
+  my $str = $_;
+  chomp($str);
+
+  # ignore empty lines
+  if ("$str" eq "") {
+      next;
+  }
+
+  my $alias = $str."__internal_alias";
+  
+  print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";
+  print "extern __typeof ($str) $str __attribute((alias(\"$alias\"), visibility(\"default\"))); \n";
+  print "#define $str $alias \n";
+  print "\n";
+}
+
+print $postamble;
+
diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index 7e906d9668..812064d07f 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
 */
 #include <config.h>
 #include <X11/Xlibint.h>
+#include "gdkalias.h"
 #include "gdkasync.h"
 #include "gdkx.h"
 
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 4a0b9ebf8a..ac212a6281 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <time.h>
 
+#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 51eb0e84c2..68dc9f1a1c 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -31,6 +31,7 @@
 #include <X11/Xcursor/Xcursor.h>
 #endif
 
+#include "gdkalias.h"
 #include "gdkprivate-x11.h"
 #include "gdkcursor.h"
 #include "gdkpixmap-x11.h"
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 705dccacc8..5da3426aad 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include <glib.h>
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index db5c37cae3..fb5ad5f859 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -29,6 +29,7 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_flush() */
 #include "gdkx.h"
 #include "gdkasync.h"
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 1247b45ea8..f55c29f803 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkregion-generic.h"
 
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 16716511a6..733fd56845 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index ce2f977ed8..023190ec78 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -31,6 +31,7 @@
 #include <X11/Xos.h>
 #include <locale.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkfont.h"
 #include "gdkprivate-x11.h"
diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 078f16f35b..fec9784dfd 100644
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "gdkalias.h"
 #include "gdkgc.h"
 #include "gdkprivate-x11.h"
 #include "gdkregion-generic.h"
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 3620495212..8be30c4f92 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -130,6 +130,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_rectangle_intersect */
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 5332bc5ede..447aa317c4 100644
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <stdio.h>
 
+#include "gdkalias.h"
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"
 
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 868fab0eec..20d68ca522 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkx.h"
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 29fc13bc7e..47363f326b 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -47,6 +47,7 @@
 
 #include <errno.h>
 
+#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_error_trap_* / gdk_flush_* */
 #include "gdkx.h"
 #include "gdkimage.h"
diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c
index 7f8a92f771..f719b1bdf1 100644
--- a/gdk/x11/gdkinput-none.c
+++ b/gdk/x11/gdkinput-none.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
 
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index a920c27df5..47d4ae2955 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c
index 88ec80ca90..d9cef9bdf3 100644
--- a/gdk/x11/gdkinput-xfree.c
+++ b/gdk/x11/gdkinput-xfree.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
 
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index f9e6530261..3436696927 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -30,6 +30,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkinput.h"
 #include "gdkprivate.h"
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 694477a5ef..29571ec035 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -33,6 +33,7 @@
 #include <limits.h>
 #include <errno.h>
 
+#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkx.h"
 
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 50f7df90d6..2eeea4afb3 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -41,6 +41,7 @@
 #include <X11/XKBlib.h>
 #endif
 
+#include "gdkalias.h"
 #include "gdk.h"
 
 #include "gdkx.h"
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c
index b4bf0cf290..eb9923fc39 100644
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdlib.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay-x11.h"
 #include "gdkpango.h"
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 83a0ec5224..1b7776fd46 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 
 #include "gdkpixmap-x11.h"
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 3c5057cdb4..c1cb0adfec 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -29,6 +29,7 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_error_trap_push/pop() */
 #include "gdkx.h"
 #include "gdkproperty.h"
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index f575ffa529..80908580d7 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include "gdkalias.h"
 #include "gdkscreen.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay.h"
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 5b37607be7..ef079dee22 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -29,6 +29,7 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkproperty.h"
 #include "gdkselection.h"
diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c
index 11365f0af9..daa25aad5a 100644
--- a/gdk/x11/gdkspawn-x11.c
+++ b/gdk/x11/gdkspawn-x11.c
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gdkalias.h"
 #include "gdkspawn.h"
 
 #include <glib.h>
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 29bcf8e56b..c2ce5cdecd 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -28,6 +28,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "gdkalias.h"
 #include "gdkvisual.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 413218187b..822701420b 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -31,6 +31,8 @@
 #include <X11/Xatom.h>
 #include <netinet/in.h>
 #include <unistd.h>
+
+#include "gdkalias.h"
 #include "gdk.h"
 
 #include "gdkwindow.h"
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 43fef8cc16..0c1a6051d4 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gdkalias.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include <stdio.h>