From b74988c3e95c2b64311f0867da9fc34f8bc81f56 Mon Sep 17 00:00:00 2001
From: David Korth <gerbilsoft@gerbilsoft.com>
Date: Tue, 21 Jul 2026 21:19:11 -0400
Subject: [PATCH 1/3] Remove the G_GNUC_CONST attribute from _get_type()
 functions.

GLib removed G_GNUC_CONST from _get_type() due to miscompilation
issues with gcc trunk.
---
 gdk/gdk.h                                     |   2 +-
 gdk/gdk.symbols                               | 142 ++--
 gdk/gdkcolor.h                                |   4 +-
 gdk/gdkcursor.h                               |   2 +-
 gdk/gdkdisplay.h                              |   2 +-
 gdk/gdkdisplaymanager.h                       |   2 +-
 gdk/gdkdnd.h                                  |   2 +-
 gdk/gdkdrawable.h                             |   2 +-
 gdk/gdkenumtypes.h.template                   |   2 +-
 gdk/gdkevents.h                               |   2 +-
 gdk/gdkfont.h                                 |   2 +-
 gdk/gdkgc.h                                   |   2 +-
 gdk/gdkimage.h                                |   2 +-
 gdk/gdkinput.h                                |   2 +-
 gdk/gdkinternals.h                            |   6 +-
 gdk/gdkkeys.h                                 |   2 +-
 gdk/gdkpango.h                                |   2 +-
 gdk/gdkpixmap.h                               |   2 +-
 gdk/gdkscreen.h                               |   2 +-
 gdk/gdkvisual.h                               |   2 +-
 gdk/gdkwindow.h                               |   2 +-
 gdk/gdkwindowimpl.h                           |   2 +-
 gtk/gtk.symbols                               | 678 +++++++++---------
 gtk/gtkaboutdialog.h                          |   2 +-
 gtk/gtkaccelgroup.h                           |   2 +-
 gtk/gtkaccellabel.h                           |   2 +-
 gtk/gtkaccelmap.h                             |   2 +-
 gtk/gtkaccessible.h                           |   2 +-
 gtk/gtkaction.h                               |   2 +-
 gtk/gtkactiongroup.h                          |   2 +-
 gtk/gtkactivatable.h                          |   2 +-
 gtk/gtkadjustment.h                           |   2 +-
 gtk/gtkalignment.h                            |   2 +-
 gtk/gtkarrow.h                                |   2 +-
 gtk/gtkaspectframe.h                          |   2 +-
 gtk/gtkassistant.h                            |   2 +-
 gtk/gtkbbox.h                                 |   2 +-
 gtk/gtkbin.h                                  |   2 +-
 gtk/gtkbox.h                                  |   2 +-
 gtk/gtkbuildable.h                            |   2 +-
 gtk/gtkbuilder.h                              |   2 +-
 gtk/gtkbutton.h                               |   2 +-
 gtk/gtkcalendar.h                             |   2 +-
 gtk/gtkcelleditable.h                         |   2 +-
 gtk/gtkcelllayout.h                           |   2 +-
 gtk/gtkcellrenderer.h                         |   2 +-
 gtk/gtkcellrendereraccel.h                    |   2 +-
 gtk/gtkcellrenderercombo.h                    |   2 +-
 gtk/gtkcellrendererpixbuf.h                   |   2 +-
 gtk/gtkcellrendererprogress.h                 |   2 +-
 gtk/gtkcellrendererspinner.h                  |   2 +-
 gtk/gtkcellrenderertext.h                     |   2 +-
 gtk/gtkcellrenderertoggle.h                   |   2 +-
 gtk/gtkcellview.h                             |   2 +-
 gtk/gtkcheckbutton.h                          |   2 +-
 gtk/gtkcheckmenuitem.h                        |   2 +-
 gtk/gtkclipboard.h                            |   2 +-
 gtk/gtkclist.h                                |   2 +-
 gtk/gtkcolorbutton.h                          |   2 +-
 gtk/gtkcolorsel.h                             |   2 +-
 gtk/gtkcolorseldialog.h                       |   2 +-
 gtk/gtkcombo.h                                |   2 +-
 gtk/gtkcombobox.h                             |   2 +-
 gtk/gtkcomboboxentry.h                        |   2 +-
 gtk/gtkcomboboxtext.h                         |   2 +-
 gtk/gtkcontainer.h                            |   2 +-
 gtk/gtkctree.h                                |   4 +-
 gtk/gtkcurve.h                                |   2 +-
 gtk/gtkcustompaperunixdialog.h                |   2 +-
 gtk/gtkdialog.h                               |   2 +-
 gtk/gtkdrawingarea.h                          |   2 +-
 gtk/gtkeditable.h                             |   2 +-
 gtk/gtkentry.h                                |   2 +-
 gtk/gtkentrybuffer.h                          |   2 +-
 gtk/gtkentrycompletion.h                      |   2 +-
 gtk/gtkeventbox.h                             |   2 +-
 gtk/gtkexpander.h                             |   2 +-
 gtk/gtkfilechooser.h                          |   2 +-
 gtk/gtkfilechooserbutton.h                    |   2 +-
 gtk/gtkfilechooserdefault.h                   |   2 +-
 gtk/gtkfilechooserdialog.h                    |   2 +-
 gtk/gtkfilechooserembed.h                     |   2 +-
 gtk/gtkfilechooserentry.h                     |   2 +-
 gtk/gtkfilechoosersettings.h                  |   2 +-
 gtk/gtkfilechooserwidget.h                    |   2 +-
 gtk/gtkfilefilter.h                           |   2 +-
 gtk/gtkfilesel.h                              |   2 +-
 gtk/gtkfilesystem.h                           |   2 +-
 gtk/gtkfilesystemmodel.h                      |   2 +-
 gtk/gtkfixed.h                                |   2 +-
 gtk/gtkfontbutton.h                           |   2 +-
 gtk/gtkfontsel.h                              |   4 +-
 gtk/gtkframe.h                                |   2 +-
 gtk/gtkgamma.h                                |   2 +-
 gtk/gtkhandlebox.h                            |   2 +-
 gtk/gtkhbbox.h                                |   2 +-
 gtk/gtkhbox.h                                 |   2 +-
 gtk/gtkhpaned.h                               |   2 +-
 gtk/gtkhruler.h                               |   2 +-
 gtk/gtkhscale.h                               |   2 +-
 gtk/gtkhscrollbar.h                           |   2 +-
 gtk/gtkhseparator.h                           |   2 +-
 gtk/gtkhsv.h                                  |   2 +-
 gtk/gtkiconfactory.h                          |   6 +-
 gtk/gtkicontheme.h                            |   4 +-
 gtk/gtkiconview.h                             |   2 +-
 gtk/gtkimage.h                                |   2 +-
 gtk/gtkimagemenuitem.h                        |   2 +-
 gtk/gtkimcontext.h                            |   2 +-
 gtk/gtkimcontextsimple.h                      |   2 +-
 gtk/gtkimmulticontext.h                       |   2 +-
 gtk/gtkinfobar.h                              |   2 +-
 gtk/gtkinputdialog.h                          |   2 +-
 gtk/gtkinvisible.h                            |   2 +-
 gtk/gtkitem.h                                 |   2 +-
 gtk/gtkitemfactory.h                          |   2 +-
 gtk/gtklabel.h                                |   2 +-
 gtk/gtklayout.h                               |   2 +-
 gtk/gtklinkbutton.h                           |   2 +-
 gtk/gtklist.h                                 |   2 +-
 gtk/gtklistitem.h                             |   2 +-
 gtk/gtkliststore.h                            |   2 +-
 gtk/gtkmenu.h                                 |   2 +-
 gtk/gtkmenubar.h                              |   2 +-
 gtk/gtkmenuitem.h                             |   2 +-
 gtk/gtkmenushell.h                            |   2 +-
 gtk/gtkmenutoolbutton.h                       |   2 +-
 gtk/gtkmessagedialog.h                        |   2 +-
 gtk/gtkmisc.h                                 |   2 +-
 gtk/gtknotebook.h                             |   2 +-
 gtk/gtkobject.h                               |   2 +-
 gtk/gtkoffscreenwindow.h                      |   2 +-
 gtk/gtkoldeditable.h                          |   2 +-
 gtk/gtkoptionmenu.h                           |   2 +-
 gtk/gtkorientable.h                           |   2 +-
 gtk/gtkpagesetup.h                            |   2 +-
 gtk/gtkpagesetupunixdialog.h                  |   2 +-
 gtk/gtkpaned.h                                |   2 +-
 gtk/gtkpapersize.h                            |   2 +-
 gtk/gtkpathbar.h                              |   2 +-
 gtk/gtkpixmap.h                               |   2 +-
 gtk/gtkplug.h                                 |   2 +-
 gtk/gtkpreview.h                              |   2 +-
 gtk/gtkprintbackend.h                         |   2 +-
 gtk/gtkprintcontext.h                         |   2 +-
 gtk/gtkprinter.h                              |   4 +-
 gtk/gtkprinteroption.h                        |   2 +-
 gtk/gtkprinteroptionset.h                     |   2 +-
 gtk/gtkprinteroptionwidget.h                  |   2 +-
 gtk/gtkprintjob.h                             |   2 +-
 gtk/gtkprintoperation.h                       |   2 +-
 gtk/gtkprintoperationpreview.h                |   2 +-
 gtk/gtkprintsettings.h                        |   2 +-
 gtk/gtkprintunixdialog.h                      |   2 +-
 gtk/gtkprogress.h                             |   2 +-
 gtk/gtkprogressbar.h                          |   2 +-
 gtk/gtkradioaction.h                          |   2 +-
 gtk/gtkradiobutton.h                          |   2 +-
 gtk/gtkradiomenuitem.h                        |   2 +-
 gtk/gtkradiotoolbutton.h                      |   2 +-
 gtk/gtkrange.h                                |   2 +-
 gtk/gtkrc.h                                   |   2 +-
 gtk/gtkrecentaction.h                         |   2 +-
 gtk/gtkrecentchooser.h                        |   2 +-
 gtk/gtkrecentchooserdefault.h                 |   2 +-
 gtk/gtkrecentchooserdialog.h                  |   2 +-
 gtk/gtkrecentchoosermenu.h                    |   2 +-
 gtk/gtkrecentchooserwidget.h                  |   2 +-
 gtk/gtkrecentfilter.h                         |   2 +-
 gtk/gtkrecentmanager.h                        |   4 +-
 gtk/gtkruler.h                                |   2 +-
 gtk/gtkscale.h                                |   2 +-
 gtk/gtkscalebutton.h                          |   2 +-
 gtk/gtkscrollbar.h                            |   2 +-
 gtk/gtkscrolledwindow.h                       |   2 +-
 gtk/gtkselection.h                            |   4 +-
 gtk/gtkseparator.h                            |   2 +-
 gtk/gtkseparatormenuitem.h                    |   2 +-
 gtk/gtkseparatortoolitem.h                    |   2 +-
 gtk/gtksettings.h                             |   2 +-
 gtk/gtksizegroup.h                            |   2 +-
 gtk/gtksocket.h                               |   2 +-
 gtk/gtkspinbutton.h                           |   2 +-
 gtk/gtkspinner.h                              |   2 +-
 gtk/gtkstatusbar.h                            |   2 +-
 gtk/gtkstatusicon.h                           |   2 +-
 gtk/gtkstyle.h                                |   4 +-
 gtk/gtktable.h                                |   2 +-
 gtk/gtktearoffmenuitem.h                      |   2 +-
 gtk/gtktext.h                                 |   2 +-
 gtk/gtktextbuffer.h                           |   2 +-
 gtk/gtktextchild.h                            |   2 +-
 gtk/gtktextiter.h                             |   2 +-
 gtk/gtktextlayout.h                           |   2 +-
 gtk/gtktextmark.h                             |   2 +-
 gtk/gtktexttag.h                              |   4 +-
 gtk/gtktexttagtable.h                         |   2 +-
 gtk/gtktextview.h                             |   2 +-
 gtk/gtkthemes.h                               |   2 +-
 gtk/gtktipsquery.h                            |   2 +-
 gtk/gtktoggleaction.h                         |   2 +-
 gtk/gtktogglebutton.h                         |   2 +-
 gtk/gtktoggletoolbutton.h                     |   2 +-
 gtk/gtktoolbar.h                              |   2 +-
 gtk/gtktoolbutton.h                           |   2 +-
 gtk/gtktoolitem.h                             |   2 +-
 gtk/gtktoolitemgroup.h                        |   2 +-
 gtk/gtktoolpalette.h                          |   2 +-
 gtk/gtktoolshell.h                            |   2 +-
 gtk/gtktooltips.h                             |   2 +-
 gtk/gtktrayicon.h                             |   2 +-
 gtk/gtktree.h                                 |   2 +-
 gtk/gtktreednd.h                              |   4 +-
 gtk/gtktreeitem.h                             |   2 +-
 gtk/gtktreemodel.h                            |   8 +-
 gtk/gtktreemodelfilter.h                      |   2 +-
 gtk/gtktreemodelsort.h                        |   2 +-
 gtk/gtktreeselection.h                        |   2 +-
 gtk/gtktreesortable.h                         |   2 +-
 gtk/gtktreestore.h                            |   2 +-
 gtk/gtktreeview.h                             |   2 +-
 gtk/gtktreeviewcolumn.h                       |   2 +-
 gtk/gtktypebuiltins.h.template                |   2 +-
 gtk/gtktypeutils.h                            |   2 +-
 gtk/gtkuimanager.h                            |   2 +-
 gtk/gtkvbbox.h                                |   2 +-
 gtk/gtkvbox.h                                 |   2 +-
 gtk/gtkviewport.h                             |   2 +-
 gtk/gtkvolumebutton.h                         |   2 +-
 gtk/gtkvpaned.h                               |   2 +-
 gtk/gtkvruler.h                               |   2 +-
 gtk/gtkvscale.h                               |   2 +-
 gtk/gtkvscrollbar.h                           |   2 +-
 gtk/gtkvseparator.h                           |   2 +-
 gtk/gtkwidget.h                               |   4 +-
 gtk/gtkwin32embedwidget.h                     |   2 +-
 gtk/gtkwindow.h                               |   4 +-
 .../printbackends/cups/gtkprintbackendcups.h  |   2 +-
 modules/printbackends/cups/gtkprintercups.h   |   2 +-
 .../printbackends/file/gtkprintbackendfile.h  |   2 +-
 .../printbackends/lpr/gtkprintbackendlpr.h    |   2 +-
 .../printbackends/papi/gtkprintbackendpapi.h  |   2 +-
 modules/printbackends/papi/gtkprinterpapi.h   |   2 +-
 .../printbackends/test/gtkprintbackendtest.h  |   2 +-
 perf/gtkwidgetprofiler.h                      |   2 +-
 perf/typebuiltins.h.template                  |   2 +-
 tests/gtkoffscreenbox.h                       |   2 +-
 247 files changed, 674 insertions(+), 674 deletions(-)

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 3f0b1acf676..929d98798c5 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -155,7 +155,7 @@ void     gdk_rectangle_union     (const GdkRectangle *src1,
 				  const GdkRectangle *src2,
 				  GdkRectangle       *dest);
 
-GType gdk_rectangle_get_type (void) G_GNUC_CONST;
+GType gdk_rectangle_get_type (void);
 
 #define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
 
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 44b03543603..77c69e148fc 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -48,7 +48,7 @@ gdk_event_get_root_coords
 gdk_event_get_screen
 gdk_event_get_state
 gdk_event_get_time
-gdk_event_get_type G_GNUC_CONST
+gdk_event_get_type
 gdk_event_handler_set
 gdk_event_new
 gdk_event_peek
@@ -223,54 +223,54 @@ gdk_x11_free_text_list
 
 #if IN_HEADER(__GDK_ENUM_TYPES_H__)
 #if IN_FILE(__GDK_ENUM_TYPES_C__)
-gdk_rgb_dither_get_type G_GNUC_CONST
-gdk_drag_protocol_get_type G_GNUC_CONST
-gdk_input_source_get_type G_GNUC_CONST
-gdk_input_condition_get_type G_GNUC_CONST
-gdk_input_mode_get_type G_GNUC_CONST
-gdk_axis_use_get_type G_GNUC_CONST
-gdk_byte_order_get_type G_GNUC_CONST
-gdk_cap_style_get_type G_GNUC_CONST
-gdk_crossing_mode_get_type G_GNUC_CONST
-gdk_extension_mode_get_type G_GNUC_CONST
-gdk_event_mask_get_type G_GNUC_CONST
-gdk_event_type_get_type G_GNUC_CONST
-gdk_fill_get_type G_GNUC_CONST
+gdk_rgb_dither_get_type
+gdk_drag_protocol_get_type
+gdk_input_source_get_type
+gdk_input_condition_get_type
+gdk_input_mode_get_type
+gdk_axis_use_get_type
+gdk_byte_order_get_type
+gdk_cap_style_get_type
+gdk_crossing_mode_get_type
+gdk_extension_mode_get_type
+gdk_event_mask_get_type
+gdk_event_type_get_type
+gdk_fill_get_type
 #ifndef GDK_DISABLE_DEPRECATED
-gdk_fill_rule_get_type G_GNUC_CONST
-#endif
-gdk_filter_return_get_type G_GNUC_CONST
-gdk_function_get_type G_GNUC_CONST
-gdk_grab_status_get_type G_GNUC_CONST
-gdk_gravity_get_type G_GNUC_CONST
-gdk_join_style_get_type G_GNUC_CONST
-gdk_line_style_get_type G_GNUC_CONST
-gdk_modifier_type_get_type G_GNUC_CONST
-gdk_notify_type_get_type G_GNUC_CONST
-gdk_overlap_type_get_type G_GNUC_CONST
-gdk_owner_change_get_type G_GNUC_CONST
-gdk_property_state_get_type G_GNUC_CONST
-gdk_prop_mode_get_type G_GNUC_CONST
-gdk_scroll_direction_get_type G_GNUC_CONST
-gdk_setting_action_get_type G_GNUC_CONST
-gdk_status_get_type G_GNUC_CONST
-gdk_subwindow_mode_get_type G_GNUC_CONST
-gdk_visibility_state_get_type G_GNUC_CONST
-gdk_wm_decoration_get_type G_GNUC_CONST
-gdk_wm_function_get_type G_GNUC_CONST
-gdk_font_type_get_type G_GNUC_CONST
-gdk_cursor_type_get_type G_GNUC_CONST
-gdk_drag_action_get_type G_GNUC_CONST
-gdk_gc_values_mask_get_type G_GNUC_CONST
-gdk_window_attributes_type_get_type G_GNUC_CONST
-gdk_window_class_get_type G_GNUC_CONST
-gdk_window_edge_get_type G_GNUC_CONST
-gdk_window_hints_get_type G_GNUC_CONST
-gdk_window_state_get_type G_GNUC_CONST
-gdk_window_type_get_type G_GNUC_CONST
-gdk_window_type_hint_get_type G_GNUC_CONST
-gdk_image_type_get_type G_GNUC_CONST
-gdk_visual_type_get_type G_GNUC_CONST
+gdk_fill_rule_get_type
+#endif
+gdk_filter_return_get_type
+gdk_function_get_type
+gdk_grab_status_get_type
+gdk_gravity_get_type
+gdk_join_style_get_type
+gdk_line_style_get_type
+gdk_modifier_type_get_type
+gdk_notify_type_get_type
+gdk_overlap_type_get_type
+gdk_owner_change_get_type
+gdk_property_state_get_type
+gdk_prop_mode_get_type
+gdk_scroll_direction_get_type
+gdk_setting_action_get_type
+gdk_status_get_type
+gdk_subwindow_mode_get_type
+gdk_visibility_state_get_type
+gdk_wm_decoration_get_type
+gdk_wm_function_get_type
+gdk_font_type_get_type
+gdk_cursor_type_get_type
+gdk_drag_action_get_type
+gdk_gc_values_mask_get_type
+gdk_window_attributes_type_get_type
+gdk_window_class_get_type
+gdk_window_edge_get_type
+gdk_window_hints_get_type
+gdk_window_state_get_type
+gdk_window_type_get_type
+gdk_window_type_hint_get_type
+gdk_image_type_get_type
+gdk_visual_type_get_type
 #endif
 #endif
 
@@ -279,7 +279,7 @@ gdk_visual_type_get_type G_GNUC_CONST
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_font_from_description
 #endif
-gdk_font_get_type G_GNUC_CONST
+gdk_font_get_type
 gdk_font_ref
 gdk_font_unref
 #ifndef GDK_DISABLE_DEPRECATED
@@ -340,7 +340,7 @@ gdk_color_alloc
 gdk_color_copy
 gdk_color_equal
 gdk_color_free
-gdk_color_get_type G_GNUC_CONST
+gdk_color_get_type
 gdk_color_hash
 gdk_colormap_alloc_color
 gdk_colormap_get_system
@@ -357,7 +357,7 @@ gdk_color_to_string
 #if IN_HEADER(__GDK_COLOR_H__)
 #if IN_FILE(__GDK_COLOR_X11_C__)
 gdk_colormap_new
-gdk_colormap_get_type G_GNUC_CONST
+gdk_colormap_get_type
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_colormap_change
 gdk_colors_alloc
@@ -374,7 +374,7 @@ gdk_colormap_get_screen
 
 #if IN_HEADER(__GDK_CURSOR_H__)
 #if IN_FILE(__GDK_CURSOR_C__)
-gdk_cursor_get_type G_GNUC_CONST
+gdk_cursor_get_type
 gdk_cursor_get_cursor_type
 gdk_cursor_new
 gdk_cursor_ref
@@ -406,7 +406,7 @@ gdk_device_get_name
 gdk_device_get_n_axes
 gdk_device_get_n_keys
 gdk_device_get_source
-gdk_device_get_type G_GNUC_CONST
+gdk_device_get_type
 gdk_device_set_axis_use
 gdk_device_set_key
 gdk_device_set_source
@@ -452,7 +452,7 @@ gdk_display_close
 gdk_display_get_core_pointer
 gdk_display_get_event
 gdk_display_get_pointer
-gdk_display_get_type G_GNUC_CONST
+gdk_display_get_type
 gdk_display_get_window_at_pointer
 gdk_display_is_closed
 gdk_display_peek_event
@@ -527,7 +527,7 @@ gdk_display_set_double_click_time
 #if IN_HEADER(__GDK_DISPLAY_MANAGER_H__)
 #if IN_FILE(__GDK_DISPLAY_MANAGER_C__)
 gdk_display_manager_get
-gdk_display_manager_get_type G_GNUC_CONST
+gdk_display_manager_get_type
 gdk_display_manager_list_displays
 gdk_display_manager_set_default_display
 gdk_display_manager_get_default_display
@@ -538,7 +538,7 @@ gdk_display_manager_get_default_display
 #if IN_FILE(__GDK_DND_X11_C__)
 gdk_drag_abort
 gdk_drag_begin
-gdk_drag_context_get_type G_GNUC_CONST
+gdk_drag_context_get_type
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_drag_context_new
 gdk_drag_context_ref
@@ -592,7 +592,7 @@ gdk_drawable_get_visual
 #endif
 gdk_drawable_get_depth
 gdk_drawable_get_image
-gdk_drawable_get_type G_GNUC_CONST
+gdk_drawable_get_type
 gdk_drawable_get_visible_region
 gdk_drawable_set_colormap
 gdk_draw_arc
@@ -624,7 +624,7 @@ gdk_draw_layout_with_colors
 #if IN_HEADER(__GDK_GC_H__)
 #if IN_FILE(__GDK_GC_C__)
 gdk_gc_new
-gdk_gc_get_type G_GNUC_CONST
+gdk_gc_get_type
 gdk_gc_new_with_values
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_gc_ref
@@ -666,7 +666,7 @@ gdk_gc_get_screen
 #if IN_HEADER(__GDK_PIXMAP_X11_H__)
 #if IN_FILE(__GDK_PIXMAP_X11_C__)
 #ifdef GDK_WINDOWING_X11
-gdk_pixmap_impl_x11_get_type G_GNUC_CONST
+gdk_pixmap_impl_x11_get_type
 #endif
 #endif
 #endif
@@ -674,7 +674,7 @@ gdk_pixmap_impl_x11_get_type G_GNUC_CONST
 #if IN_HEADER(__GDK_WINDOW_X11_H__)
 #if IN_FILE(__GDK_WINDOW_X11_C__)
 #ifdef GDK_WINDOWING_X11
-gdk_window_impl_x11_get_type G_GNUC_CONST
+gdk_window_impl_x11_get_type
 #endif
 #endif
 #endif
@@ -761,7 +761,7 @@ gdk_window_is_input_only
 gdk_window_is_shaped
 gdk_window_is_viewable
 gdk_window_is_visible
-gdk_window_object_get_type G_GNUC_CONST
+gdk_window_object_get_type
 gdk_window_peek_children
 gdk_window_process_all_updates
 gdk_window_process_updates
@@ -795,7 +795,7 @@ gdk_offscreen_window_get_embedder
 
 #if IN_HEADER(__GDK_INTERNALS_H__)
 #if IN_FILE(__GDK_OFFSCREEN_WINDOW_C__)
-gdk_offscreen_window_get_type G_GNUC_CONST
+gdk_offscreen_window_get_type
 #endif
 #endif
 
@@ -886,14 +886,14 @@ gdk_image_new_bitmap
 #endif
 gdk_image_get_pixel
 gdk_image_put_pixel
-gdk_image_get_type G_GNUC_CONST
+gdk_image_get_type
 #endif
 #endif
 
 #if IN_HEADER(__GDK_KEYS_H__)
 #if IN_FILE(__GDK_KEYS_C__)
 gdk_keymap_get_default
-gdk_keymap_get_type G_GNUC_CONST
+gdk_keymap_get_type
 gdk_keyval_is_lower G_GNUC_CONST
 gdk_keyval_is_upper G_GNUC_CONST
 gdk_keyval_to_lower G_GNUC_CONST
@@ -968,7 +968,7 @@ 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_type G_GNUC_CONST
+gdk_visual_get_type
 #endif
 #endif
 
@@ -993,7 +993,7 @@ gdk_pango_context_set_colormap
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
 gdk_pango_renderer_get_default
-gdk_pango_renderer_get_type G_GNUC_CONST
+gdk_pango_renderer_get_type
 gdk_pango_renderer_new
 gdk_pango_renderer_set_drawable
 gdk_pango_renderer_set_gc
@@ -1030,7 +1030,7 @@ gdk_pixmap_create_from_xpm
 gdk_pixmap_colormap_create_from_xpm_d
 gdk_pixmap_create_from_xpm_d
 gdk_pixmap_get_size
-gdk_pixmap_get_type G_GNUC_CONST
+gdk_pixmap_get_type
 gdk_pixmap_new
 #endif
 #endif
@@ -1112,7 +1112,7 @@ gdk_draw_rgb_image_dithalign
 
 #if IN_HEADER(__GDK_SCREEN_H__)
 #if IN_FILE(__GDK_SCREEN_C__)
-gdk_screen_get_type G_GNUC_CONST
+gdk_screen_get_type
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_set_font_options
@@ -1285,7 +1285,7 @@ gdk_win32_selection_add_targets
 
 #if IN_HEADER(__GDK_WIN32_H__)
 #if IN_FILE(__GDK_KEYS_WIN32_C__)
-gdk_win32_keymap_get_type G_GNUC_CONST
+gdk_win32_keymap_get_type
 gdk_win32_keymap_check_compose
 #endif
 #endif
@@ -1400,7 +1400,7 @@ gdk_xid_table_lookup_for_display
 
 #if IN_HEADER(__GDK_APP_LAUNCH_CONTEXT_H__)
 #if IN_FILE(__GDK_APP_LAUNCH_CONTEXT_C__)
-gdk_app_launch_context_get_type G_GNUC_CONST
+gdk_app_launch_context_get_type
 gdk_app_launch_context_new
 gdk_app_launch_context_set_display
 gdk_app_launch_context_set_screen
@@ -1413,7 +1413,7 @@ gdk_app_launch_context_set_icon_name
 
 #if IN_HEADER(__GDK_WINDOW_IMPL_H__)
 #if IN_FILE(__GDK_WINDOW_IMPL_C__)
-gdk_window_impl_get_type G_GNUC_CONST
+gdk_window_impl_get_type
 #endif
 #endif
 
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 6cf13aaf4d3..58165db59cc 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -86,7 +86,7 @@ struct _GdkColormapClass
 
 };
 
-GType        gdk_colormap_get_type (void) G_GNUC_CONST;
+GType        gdk_colormap_get_type (void);
 
 GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
 				   gboolean	allocate);
@@ -140,7 +140,7 @@ gboolean  gdk_color_equal     (const GdkColor *colora,
 			       const GdkColor *colorb);
 gchar *   gdk_color_to_string (const GdkColor *color);
 
-GType     gdk_color_get_type (void) G_GNUC_CONST;
+GType     gdk_color_get_type (void);
 
 /* The following functions are deprecated */
 #ifndef GDK_DISABLE_DEPRECATED
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 5a9bbcb923b..61c8db389e8 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -134,7 +134,7 @@ struct _GdkCursor
 /* Cursors
  */
 
-GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
+GType      gdk_cursor_get_type           (void);
 
 GdkCursor* gdk_cursor_new_for_display	 (GdkDisplay      *display,
 					  GdkCursorType    cursor_type);
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 7cc8665144e..2253d3ab26e 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -138,7 +138,7 @@ struct _GdkDisplayPointerHooks
 				    gint            *win_y);
 };
 
-GType       gdk_display_get_type (void) G_GNUC_CONST;
+GType       gdk_display_get_type (void);
 GdkDisplay *gdk_display_open                (const gchar *display_name);
 
 const gchar * gdk_display_get_name         (GdkDisplay *display);
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index 02d1cf697bc..2d4cf99eefa 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -54,7 +54,7 @@ struct _GdkDisplayManagerClass
 			  GdkDisplay *display);
 };
 
-GType gdk_display_manager_get_type (void) G_GNUC_CONST;
+GType gdk_display_manager_get_type (void);
 
 GdkDisplayManager *gdk_display_manager_get                 (void);
 GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *display_manager);
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index ac24315f8bc..da2f486ed29 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -103,7 +103,7 @@ struct _GdkDragContextClass {
 
 /* Drag and Drop */
 
-GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
+GType            gdk_drag_context_get_type   (void);
 #if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
 GdkDragContext * gdk_drag_context_new        (void);
 #endif
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index d20694dac91..5fc65bbdf80 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -236,7 +236,7 @@ struct _GdkTrapezoid
   double y1, x11, x21, y2, x12, x22;
 };
 
-GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
+GType           gdk_drawable_get_type     (void);
 
 /* Manipulation of drawables
  */
diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template
index 85487f47f40..469b75147ab 100644
--- a/gdk/gdkenumtypes.h.template
+++ b/gdk/gdkenumtypes.h.template
@@ -17,7 +17,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
+GType @enum_name@_get_type (void);
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 0602bd0df31..193f5020977 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -513,7 +513,7 @@ union _GdkEvent
   GdkEventGrabBroken        grab_broken;
 };
 
-GType     gdk_event_get_type            (void) G_GNUC_CONST;
+GType     gdk_event_get_type            (void);
 
 gboolean  gdk_events_pending	 	(void);
 GdkEvent* gdk_event_get			(void);
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index fe2e2644925..2b8cd05b5b4 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -53,7 +53,7 @@ struct _GdkFont
   gint descent;
 };
 
-GType    gdk_font_get_type  (void) G_GNUC_CONST;
+GType    gdk_font_get_type  (void);
 
 GdkFont* gdk_font_ref	    (GdkFont        *font);
 void	 gdk_font_unref	    (GdkFont        *font);
diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 05968199b20..8e43fe7e7a2 100644
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -221,7 +221,7 @@ struct _GdkGCClass
 
 
 #ifndef GDK_DISABLE_DEPRECATED
-GType  gdk_gc_get_type            (void) G_GNUC_CONST;
+GType  gdk_gc_get_type            (void);
 GdkGC *gdk_gc_new		  (GdkDrawable	    *drawable);
 GdkGC *gdk_gc_new_with_values	  (GdkDrawable	    *drawable,
 				   GdkGCValues	    *values,
diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index 12c8817bc40..d2792d84d0e 100644
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -90,7 +90,7 @@ struct _GdkImageClass
   GObjectClass parent_class;
 };
 
-GType     gdk_image_get_type   (void) G_GNUC_CONST;
+GType     gdk_image_get_type   (void);
 
 #ifndef GDK_DISABLE_DEPRECATED
 GdkImage*  gdk_image_new       (GdkImageType  type,
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index a8ed6aac91b..3234a7ff3ef 100644
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -123,7 +123,7 @@ struct _GdkTimeCoord
   gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };
 
-GType          gdk_device_get_type      (void) G_GNUC_CONST;
+GType          gdk_device_get_type      (void);
 
 #ifndef GDK_MULTIHEAD_SAFE
 /* Returns a list of GdkDevice * */	  
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index e7481257503..1cdad1040bb 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -538,11 +538,11 @@ struct _GdkPaintableIface
   void (* end_paint)                (GdkPaintable    *paintable);
 };
 
-GType _gdk_paintable_get_type (void) G_GNUC_CONST;
+GType _gdk_paintable_get_type (void);
 
 /* Implementation types */
-GType _gdk_window_impl_get_type (void) G_GNUC_CONST;
-GType _gdk_pixmap_impl_get_type (void) G_GNUC_CONST;
+GType _gdk_window_impl_get_type (void);
+GType _gdk_pixmap_impl_get_type (void);
 
 
 /**
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 4a7528fe198..0738a78e598 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -78,7 +78,7 @@ struct _GdkKeymapClass
   void (*state_changed)     (GdkKeymap *keymap);
 };
 
-GType gdk_keymap_get_type (void) G_GNUC_CONST;
+GType gdk_keymap_get_type (void);
 
 #ifndef GDK_MULTIHEAD_SAFE
 GdkKeymap* gdk_keymap_get_default     (void);
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 39ca22add5e..e40c4dce0dd 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -86,7 +86,7 @@ struct _GdkPangoRendererClass
   PangoRendererClass parent_class;
 };
 
-GType gdk_pango_renderer_get_type (void) G_GNUC_CONST;
+GType gdk_pango_renderer_get_type (void);
 
 PangoRenderer *gdk_pango_renderer_new         (GdkScreen *screen);
 PangoRenderer *gdk_pango_renderer_get_default (GdkScreen *screen);
diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index 40927adf7af..e2e03d532fd 100644
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -62,7 +62,7 @@ struct _GdkPixmapObjectClass
 
 };
 
-GType      gdk_pixmap_get_type          (void) G_GNUC_CONST;
+GType      gdk_pixmap_get_type          (void);
 
 /* Pixmaps
  */
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 418cecf3edc..9d5f4f01215 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -66,7 +66,7 @@ struct _GdkScreenClass
   void (*monitors_changed) (GdkScreen *screen);
 };
 
-GType        gdk_screen_get_type              (void) G_GNUC_CONST;
+GType        gdk_screen_get_type              (void);
 GdkColormap *gdk_screen_get_default_colormap  (GdkScreen   *screen);
 void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
 					       GdkColormap *colormap);
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index d255b416c03..757c6fda19d 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -97,7 +97,7 @@ struct _GdkVisual
   gint GSEAL (blue_prec);
 };
 
-GType         gdk_visual_get_type            (void) G_GNUC_CONST;
+GType         gdk_visual_get_type            (void);
 
 #ifndef GDK_MULTIHEAD_SAFE
 gint	      gdk_visual_get_best_depth	     (void);
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 572797b955d..6b8b1d144f0 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -328,7 +328,7 @@ struct _GdkWindowObjectClass
 
 /* Windows
  */
-GType         gdk_window_object_get_type       (void) G_GNUC_CONST;
+GType         gdk_window_object_get_type       (void);
 GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
                                                 GdkWindowAttr *attributes,
                                                 gint           attributes_mask);
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index 3a5029b0160..63efd1a9ee9 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -150,7 +150,7 @@ struct _GdkWindowImplIface
 };
 
 /* Interface Functions */
-GType gdk_window_impl_get_type (void) G_GNUC_CONST;
+GType gdk_window_impl_get_type (void);
 
 /* private definitions from gdkwindow.h */
 
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a264df87fb3..0a308d050b8 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -40,7 +40,7 @@ gtk_about_dialog_set_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_type
 gtk_about_dialog_get_version
 gtk_about_dialog_get_website
 gtk_about_dialog_get_website_label
@@ -82,7 +82,7 @@ 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_type
 gtk_accel_group_get_is_locked
 gtk_accel_group_get_modifier_mask
 gtk_accel_group_lock
@@ -98,7 +98,7 @@ gtk_accel_group_unlock
 #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
+gtk_accel_label_get_type
 gtk_accel_label_new
 gtk_accel_label_refetch
 gtk_accel_label_set_accel_closure
@@ -114,7 +114,7 @@ gtk_accel_map_change_entry
 gtk_accel_map_foreach
 gtk_accel_map_foreach_unfiltered
 gtk_accel_map_get
-gtk_accel_map_get_type G_GNUC_CONST
+gtk_accel_map_get_type
 #ifndef _WIN64
 gtk_accel_map_load PRIVATE
 #endif
@@ -139,7 +139,7 @@ gtk_accel_map_unlock_path
 #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_type
 gtk_accessible_get_widget
 gtk_accessible_set_widget
 #endif
@@ -180,7 +180,7 @@ gtk_action_get_sensitive
 gtk_action_get_short_label
 gtk_action_get_stock_id
 gtk_action_get_tooltip
-gtk_action_get_type G_GNUC_CONST
+gtk_action_get_type
 gtk_action_get_visible
 gtk_action_get_visible_horizontal
 gtk_action_get_visible_vertical
@@ -221,7 +221,7 @@ gtk_action_group_add_toggle_actions_full
 gtk_action_group_get_action
 gtk_action_group_get_name
 gtk_action_group_get_sensitive
-gtk_action_group_get_type G_GNUC_CONST
+gtk_action_group_get_type
 gtk_action_group_get_visible
 gtk_action_group_list_actions
 gtk_action_group_new
@@ -238,7 +238,7 @@ gtk_action_group_translate_string
 #if IN_FILE(__GTK_ACTIVATABLE_C__)
 gtk_activatable_do_set_related_action
 gtk_activatable_get_related_action
-gtk_activatable_get_type G_GNUC_CONST
+gtk_activatable_get_type
 gtk_activatable_get_use_action_appearance
 gtk_activatable_sync_action_properties
 gtk_activatable_set_related_action
@@ -251,7 +251,7 @@ gtk_activatable_set_use_action_appearance
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
 gtk_adjustment_configure
-gtk_adjustment_get_type G_GNUC_CONST
+gtk_adjustment_get_type
 gtk_adjustment_get_value
 gtk_adjustment_get_lower
 gtk_adjustment_get_upper
@@ -272,7 +272,7 @@ gtk_adjustment_value_changed
 #if IN_HEADER(__GTK_ALIGNMENT_H__)
 #if IN_FILE(__GTK_ALIGNMENT_C__)
 gtk_alignment_get_padding
-gtk_alignment_get_type G_GNUC_CONST
+gtk_alignment_get_type
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
@@ -282,7 +282,7 @@ gtk_alignment_set_padding
 
 #if IN_HEADER(__GTK_ASSISTANT_H__)
 #if IN_FILE(__GTK_ASSISTANT_C__)
-gtk_assistant_get_type G_GNUC_CONST
+gtk_assistant_get_type
 gtk_assistant_new
 gtk_assistant_get_current_page
 gtk_assistant_set_current_page
@@ -311,129 +311,129 @@ gtk_assistant_commit
 
 #if IN_HEADER(__GTK_TYPE_BUILTINS_H__)
 #if IN_FILE(__GTK_TYPE_BUILTINS_C__)
-gtk_pack_direction_get_type G_GNUC_CONST
-gtk_ui_manager_item_type_get_type G_GNUC_CONST
-gtk_spin_button_update_policy_get_type G_GNUC_CONST
-gtk_notebook_tab_get_type G_GNUC_CONST
-gtk_number_up_layout_get_type G_GNUC_CONST
-gtk_anchor_type_get_type G_GNUC_CONST
-gtk_arg_flags_get_type G_GNUC_CONST
-gtk_arrow_type_get_type G_GNUC_CONST
-gtk_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_button_action_get_type G_GNUC_CONST
-gtk_buttons_type_get_type G_GNUC_CONST
-gtk_calendar_display_options_get_type G_GNUC_CONST
-gtk_cell_renderer_mode_get_type G_GNUC_CONST
-gtk_cell_renderer_state_get_type G_GNUC_CONST
+gtk_pack_direction_get_type
+gtk_ui_manager_item_type_get_type
+gtk_spin_button_update_policy_get_type
+gtk_notebook_tab_get_type
+gtk_number_up_layout_get_type
+gtk_anchor_type_get_type
+gtk_arg_flags_get_type
+gtk_arrow_type_get_type
+gtk_arrow_placement_get_type
+gtk_assistant_page_type_get_type
+gtk_attach_options_get_type
+gtk_builder_error_get_type
+gtk_button_action_get_type
+gtk_buttons_type_get_type
+gtk_calendar_display_options_get_type
+gtk_cell_renderer_mode_get_type
+gtk_cell_renderer_state_get_type
 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_clist_drag_pos_get_type G_GNUC_CONST
-gtk_dialog_flags_get_type G_GNUC_CONST
-gtk_direction_type_get_type G_GNUC_CONST
-gtk_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_flags_get_type G_GNUC_CONST
-gtk_widget_help_type_get_type G_GNUC_CONST
-gtk_window_position_get_type G_GNUC_CONST
-gtk_tree_view_column_sizing_get_type G_GNUC_CONST
-gtk_tree_view_drop_position_get_type G_GNUC_CONST
-gtk_button_box_style_get_type G_GNUC_CONST
-gtk_cell_type_get_type G_GNUC_CONST
-gtk_ctree_expander_style_get_type G_GNUC_CONST
-gtk_ctree_expansion_type_get_type G_GNUC_CONST
-gtk_ctree_line_style_get_type G_GNUC_CONST
-gtk_ctree_pos_get_type G_GNUC_CONST
-gtk_curve_type_get_type G_GNUC_CONST
-gtk_icon_lookup_flags_get_type G_GNUC_CONST
-gtk_image_type_get_type G_GNUC_CONST
-gtk_im_preedit_style_get_type G_GNUC_CONST
-gtk_im_status_style_get_type G_GNUC_CONST
-gtk_justification_get_type G_GNUC_CONST
-gtk_match_type_get_type G_GNUC_CONST
-gtk_menu_direction_type_get_type G_GNUC_CONST
-gtk_message_type_get_type G_GNUC_CONST
-gtk_metric_type_get_type G_GNUC_CONST
-gtk_movement_step_get_type G_GNUC_CONST
-gtk_orientation_get_type G_GNUC_CONST
-gtk_pack_type_get_type G_GNUC_CONST
-gtk_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_preview_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_private_flags_get_type G_GNUC_CONST
-gtk_progress_bar_orientation_get_type G_GNUC_CONST
-gtk_progress_bar_style_get_type G_GNUC_CONST
-gtk_rc_flags_get_type G_GNUC_CONST
-gtk_rc_token_type_get_type G_GNUC_CONST
-gtk_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_side_type_get_type G_GNUC_CONST
-gtk_signal_run_type_get_type G_GNUC_CONST
-gtk_size_group_mode_get_type G_GNUC_CONST
-gtk_sort_type_get_type G_GNUC_CONST
-gtk_spin_type_get_type G_GNUC_CONST
-gtk_state_type_get_type G_GNUC_CONST
-gtk_submenu_direction_get_type G_GNUC_CONST
-gtk_submenu_placement_get_type G_GNUC_CONST
-gtk_target_flags_get_type G_GNUC_CONST
-gtk_text_direction_get_type G_GNUC_CONST
-gtk_text_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_mode_get_type G_GNUC_CONST
-gtk_tree_view_grid_lines_get_type G_GNUC_CONST
-gtk_update_type_get_type G_GNUC_CONST
-gtk_visibility_get_type G_GNUC_CONST
-gtk_object_flags_get_type G_GNUC_CONST
-gtk_accel_flags_get_type G_GNUC_CONST
-gtk_icon_size_get_type G_GNUC_CONST
-gtk_file_chooser_error_get_type G_GNUC_CONST
-gtk_icon_theme_error_get_type G_GNUC_CONST
-gtk_toolbar_child_type_get_type G_GNUC_CONST
-gtk_toolbar_space_style_get_type G_GNUC_CONST
-gtk_toolbar_style_get_type G_GNUC_CONST
+gtk_corner_type_get_type
+gtk_debug_flag_get_type
+gtk_delete_type_get_type
+gtk_dest_defaults_get_type
+gtk_drag_result_get_type
+gtk_clist_drag_pos_get_type
+gtk_dialog_flags_get_type
+gtk_direction_type_get_type
+gtk_entry_icon_position_get_type
+gtk_expander_style_get_type
+gtk_file_chooser_action_get_type
+gtk_file_chooser_confirmation_get_type
+gtk_file_filter_flags_get_type
+gtk_icon_view_drop_position_get_type
+gtk_sensitivity_type_get_type
+gtk_window_type_get_type
+gtk_wrap_mode_get_type
+gtk_widget_flags_get_type
+gtk_widget_help_type_get_type
+gtk_window_position_get_type
+gtk_tree_view_column_sizing_get_type
+gtk_tree_view_drop_position_get_type
+gtk_button_box_style_get_type
+gtk_cell_type_get_type
+gtk_ctree_expander_style_get_type
+gtk_ctree_expansion_type_get_type
+gtk_ctree_line_style_get_type
+gtk_ctree_pos_get_type
+gtk_curve_type_get_type
+gtk_icon_lookup_flags_get_type
+gtk_image_type_get_type
+gtk_im_preedit_style_get_type
+gtk_im_status_style_get_type
+gtk_justification_get_type
+gtk_match_type_get_type
+gtk_menu_direction_type_get_type
+gtk_message_type_get_type
+gtk_metric_type_get_type
+gtk_movement_step_get_type
+gtk_orientation_get_type
+gtk_pack_type_get_type
+gtk_page_orientation_get_type
+gtk_print_operation_result_get_type
+gtk_print_pages_get_type
+gtk_print_quality_get_type
+gtk_print_status_get_type
+gtk_page_set_get_type
+gtk_path_priority_type_get_type
+gtk_path_type_get_type
+gtk_policy_type_get_type
+gtk_position_type_get_type
+gtk_preview_type_get_type
+gtk_print_duplex_get_type
+gtk_print_error_get_type
+gtk_recent_filter_flags_get_type
+gtk_print_operation_action_get_type
+gtk_private_flags_get_type
+gtk_progress_bar_orientation_get_type
+gtk_progress_bar_style_get_type
+gtk_rc_flags_get_type
+gtk_rc_token_type_get_type
+gtk_recent_chooser_error_get_type
+gtk_recent_manager_error_get_type
+gtk_recent_sort_type_get_type
+gtk_unit_get_type
+gtk_relief_style_get_type
+gtk_resize_mode_get_type
+gtk_response_type_get_type
+gtk_scroll_step_get_type
+gtk_scroll_type_get_type
+gtk_selection_mode_get_type
+gtk_shadow_type_get_type
+gtk_side_type_get_type
+gtk_signal_run_type_get_type
+gtk_size_group_mode_get_type
+gtk_sort_type_get_type
+gtk_spin_type_get_type
+gtk_state_type_get_type
+gtk_submenu_direction_get_type
+gtk_submenu_placement_get_type
+gtk_target_flags_get_type
+gtk_text_direction_get_type
+gtk_text_buffer_target_info_get_type
+gtk_text_search_flags_get_type
+gtk_text_window_type_get_type
+gtk_tool_palette_drag_targets_get_type
+gtk_tree_model_flags_get_type
+gtk_tree_view_mode_get_type
+gtk_tree_view_grid_lines_get_type
+gtk_update_type_get_type
+gtk_visibility_get_type
+gtk_object_flags_get_type
+gtk_accel_flags_get_type
+gtk_icon_size_get_type
+gtk_file_chooser_error_get_type
+gtk_icon_theme_error_get_type
+gtk_toolbar_child_type_get_type
+gtk_toolbar_space_style_get_type
+gtk_toolbar_style_get_type
 #endif
 #endif
 
 #if IN_HEADER(__GTK_ARROW_H__)
 #if IN_FILE(__GTK_ARROW_C__)
-gtk_arrow_get_type G_GNUC_CONST
+gtk_arrow_get_type
 gtk_arrow_new
 gtk_arrow_set
 #endif
@@ -441,7 +441,7 @@ gtk_arrow_set
 
 #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_get_type
 gtk_aspect_frame_new
 gtk_aspect_frame_set
 #endif
@@ -470,7 +470,7 @@ gtk_binding_set_new
 #if IN_HEADER(__GTK_BIN_H__)
 #if IN_FILE(__GTK_BIN_C__)
 gtk_bin_get_child
-gtk_bin_get_type G_GNUC_CONST
+gtk_bin_get_type
 #endif
 #endif
 
@@ -478,7 +478,7 @@ gtk_bin_get_type G_GNUC_CONST
 #if IN_FILE(__GTK_BOX_C__)
 gtk_box_get_homogeneous
 gtk_box_get_spacing
-gtk_box_get_type G_GNUC_CONST
+gtk_box_get_type
 gtk_box_pack_end
 gtk_box_pack_start
 #ifndef GTK_DISABLE_DEPRECATED
@@ -502,7 +502,7 @@ gtk_buildable_custom_tag_end
 gtk_buildable_custom_finished
 gtk_buildable_get_internal_child
 gtk_buildable_get_name
-gtk_buildable_get_type G_GNUC_CONST
+gtk_buildable_get_type
 gtk_buildable_parser_finished
 gtk_buildable_set_name
 gtk_buildable_set_buildable_property
@@ -519,7 +519,7 @@ 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
 gtk_builder_get_type_from_name
 gtk_builder_new
 gtk_builder_set_translation_domain
@@ -540,7 +540,7 @@ gtk_button_box_get_child_size
 #endif
 gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
-gtk_button_box_get_type G_GNUC_CONST
+gtk_button_box_get_type
 gtk_button_box_set_child_secondary
 gtk_button_box_set_layout
 #endif
@@ -559,7 +559,7 @@ gtk_button_get_image
 gtk_button_get_image_position
 gtk_button_get_label
 gtk_button_get_relief
-gtk_button_get_type G_GNUC_CONST
+gtk_button_get_type
 gtk_button_get_use_stock
 gtk_button_get_use_underline
 #ifndef GTK_DISABLE_DEPRECATED
@@ -596,7 +596,7 @@ gtk_calendar_get_date
 gtk_calendar_get_detail_height_rows
 gtk_calendar_get_detail_width_chars
 gtk_calendar_get_display_options
-gtk_calendar_get_type G_GNUC_CONST
+gtk_calendar_get_type
 gtk_calendar_mark_day
 gtk_calendar_new
 gtk_calendar_select_day
@@ -612,7 +612,7 @@ gtk_calendar_unmark_day
 #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_get_type
 gtk_cell_editable_remove_widget
 gtk_cell_editable_start_editing
 #endif
@@ -623,7 +623,7 @@ gtk_cell_editable_start_editing
 gtk_cell_layout_add_attribute
 gtk_cell_layout_clear
 gtk_cell_layout_clear_attributes
-gtk_cell_layout_get_type G_GNUC_CONST
+gtk_cell_layout_get_type
 gtk_cell_layout_pack_end
 gtk_cell_layout_pack_start
 gtk_cell_layout_get_cells
@@ -644,7 +644,7 @@ gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_get_padding
 gtk_cell_renderer_get_sensitive
 gtk_cell_renderer_get_size
-gtk_cell_renderer_get_type G_GNUC_CONST
+gtk_cell_renderer_get_type
 gtk_cell_renderer_get_visible
 gtk_cell_renderer_render
 gtk_cell_renderer_set_alignment
@@ -659,49 +659,49 @@ gtk_cell_renderer_stop_editing
 
 #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_get_type
 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_get_type
 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_get_type
 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_get_type
 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_get_type
 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_get_type
 gtk_cell_renderer_progress_new
 #endif
 #endif
 
 #if IN_HEADER(__GTK_CELL_RENDERER_TEXT_H__)
 #if IN_FILE(__GTK_CELL_RENDERER_TEXT_C__)
-gtk_cell_renderer_text_get_type G_GNUC_CONST
+gtk_cell_renderer_text_get_type
 gtk_cell_renderer_text_new
 gtk_cell_renderer_text_set_fixed_height_from_font
 #endif
@@ -712,7 +712,7 @@ gtk_cell_renderer_text_set_fixed_height_from_font
 gtk_cell_renderer_toggle_get_activatable
 gtk_cell_renderer_toggle_get_active
 gtk_cell_renderer_toggle_get_radio
-gtk_cell_renderer_toggle_get_type G_GNUC_CONST
+gtk_cell_renderer_toggle_get_type
 gtk_cell_renderer_toggle_new
 gtk_cell_renderer_toggle_set_activatable
 gtk_cell_renderer_toggle_set_active
@@ -728,7 +728,7 @@ gtk_cell_view_get_cell_renderers
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_model
 gtk_cell_view_get_size_of_row
-gtk_cell_view_get_type G_GNUC_CONST
+gtk_cell_view_get_type
 gtk_cell_view_new
 gtk_cell_view_new_with_markup
 gtk_cell_view_new_with_pixbuf
@@ -741,7 +741,7 @@ gtk_cell_view_set_model
 
 #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_get_type
 gtk_check_button_new
 gtk_check_button_new_with_label
 gtk_check_button_new_with_mnemonic
@@ -753,7 +753,7 @@ gtk_check_button_new_with_mnemonic
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
-gtk_check_menu_item_get_type G_GNUC_CONST
+gtk_check_menu_item_get_type
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
 gtk_check_menu_item_new_with_mnemonic
@@ -774,7 +774,7 @@ gtk_clipboard_get
 gtk_clipboard_get_display
 gtk_clipboard_get_for_display
 gtk_clipboard_get_owner
-gtk_clipboard_get_type G_GNUC_CONST
+gtk_clipboard_get_type
 gtk_clipboard_request_contents
 gtk_clipboard_request_image
 gtk_clipboard_request_rich_text
@@ -827,7 +827,7 @@ gtk_clist_get_row_style
 gtk_clist_get_selectable
 gtk_clist_get_selection_info
 gtk_clist_get_text
-gtk_clist_get_type G_GNUC_CONST
+gtk_clist_get_type
 gtk_clist_get_vadjustment
 gtk_clist_insert
 gtk_clist_moveto
@@ -887,7 +887,7 @@ gtk_clist_unselect_row
 gtk_color_button_get_alpha
 gtk_color_button_get_color
 gtk_color_button_get_title
-gtk_color_button_get_type G_GNUC_CONST
+gtk_color_button_get_type
 gtk_color_button_get_use_alpha
 gtk_color_button_new
 gtk_color_button_new_with_color
@@ -906,7 +906,7 @@ gtk_color_selection_get_has_opacity_control
 gtk_color_selection_get_has_palette
 gtk_color_selection_get_previous_alpha
 gtk_color_selection_get_previous_color
-gtk_color_selection_get_type G_GNUC_CONST
+gtk_color_selection_get_type
 gtk_color_selection_is_adjusting
 gtk_color_selection_new
 gtk_color_selection_palette_from_string
@@ -929,7 +929,7 @@ gtk_color_selection_set_previous_color
 
 #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_get_type
 gtk_color_selection_dialog_new
 gtk_color_selection_dialog_get_color_selection
 #endif
@@ -952,7 +952,7 @@ 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_type
 gtk_combo_box_get_wrap_width
 gtk_combo_box_insert_text
 gtk_combo_box_new
@@ -983,7 +983,7 @@ gtk_combo_box_set_wrap_width
 #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
+gtk_combo_box_text_get_type
 gtk_combo_box_text_insert_text
 gtk_combo_box_text_new
 gtk_combo_box_text_new_with_entry
@@ -996,7 +996,7 @@ gtk_combo_box_text_remove
 #if IN_FILE(__GTK_COMBO_BOX_ENTRY_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_combo_box_entry_get_text_column
-gtk_combo_box_entry_get_type G_GNUC_CONST
+gtk_combo_box_entry_get_type
 gtk_combo_box_entry_new
 gtk_combo_box_entry_new_text
 gtk_combo_box_entry_new_with_model
@@ -1009,7 +1009,7 @@ gtk_combo_box_entry_set_text_column
 #if IN_FILE(__GTK_SMART_COMBO_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_combo_disable_activate
-gtk_combo_get_type G_GNUC_CONST
+gtk_combo_get_type
 gtk_combo_new
 gtk_combo_set_case_sensitive
 gtk_combo_set_item_string
@@ -1048,7 +1048,7 @@ gtk_container_get_focus_child
 gtk_container_get_focus_hadjustment
 gtk_container_get_focus_vadjustment
 gtk_container_get_resize_mode
-gtk_container_get_type G_GNUC_CONST
+gtk_container_get_type
 gtk_container_propagate_expose
 gtk_container_remove
 gtk_container_resize_children
@@ -1080,7 +1080,7 @@ gtk_ctree_find_by_row_data
 gtk_ctree_find_by_row_data_custom
 gtk_ctree_find_node_ptr
 gtk_ctree_get_node_info
-gtk_ctree_get_type G_GNUC_CONST
+gtk_ctree_get_type
 gtk_ctree_insert_gnode
 gtk_ctree_insert_node
 gtk_ctree_is_ancestor
@@ -1098,7 +1098,7 @@ gtk_ctree_node_get_row_data
 gtk_ctree_node_get_row_style
 gtk_ctree_node_get_selectable
 gtk_ctree_node_get_text
-gtk_ctree_node_get_type G_GNUC_CONST
+gtk_ctree_node_get_type
 gtk_ctree_node_is_visible
 gtk_ctree_node_moveto
 gtk_ctree_node_nth
@@ -1141,7 +1141,7 @@ gtk_ctree_unselect_recursive
 #if IN_HEADER(__GTK_CURVE_H__)
 #if IN_FILE(__GTK_CURVE_C__)
 #ifndef GTK_DISABLE_DEPRECATED
-gtk_curve_get_type G_GNUC_CONST
+gtk_curve_get_type
 gtk_curve_get_vector
 gtk_curve_new
 gtk_curve_reset
@@ -1171,7 +1171,7 @@ 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_type
 gtk_dialog_new
 gtk_dialog_new_with_buttons
 gtk_dialog_response
@@ -1233,7 +1233,7 @@ gtk_drag_unhighlight
 
 #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_get_type
 gtk_status_icon_new
 gtk_status_icon_new_from_pixbuf
 gtk_status_icon_new_from_file
@@ -1332,12 +1332,12 @@ gtk_paint_vline
 gtk_border_new G_GNUC_MALLOC
 gtk_border_copy
 gtk_border_free
-gtk_border_get_type G_GNUC_CONST
+gtk_border_get_type
 gtk_style_apply_default_background
 gtk_style_attach
 gtk_style_copy
 gtk_style_detach
-gtk_style_get_type G_GNUC_CONST
+gtk_style_get_type
 gtk_style_lookup_icon_set
 gtk_style_lookup_color
 gtk_style_new
@@ -1352,7 +1352,7 @@ gtk_style_get
 
 #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_get_type
 gtk_drawing_area_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_drawing_area_size
@@ -1370,7 +1370,7 @@ gtk_editable_get_chars
 gtk_editable_get_editable
 gtk_editable_get_position
 gtk_editable_get_selection_bounds
-gtk_editable_get_type G_GNUC_CONST
+gtk_editable_get_type
 gtk_editable_insert_text
 gtk_editable_paste_clipboard
 gtk_editable_select_region
@@ -1409,7 +1409,7 @@ gtk_entry_get_progress_fraction
 gtk_entry_get_progress_pulse_step
 gtk_entry_get_text
 gtk_entry_get_text_length
-gtk_entry_get_type G_GNUC_CONST
+gtk_entry_get_type
 gtk_entry_get_visibility
 gtk_entry_get_width_chars
 gtk_entry_get_text_window
@@ -1470,7 +1470,7 @@ 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_get_type
 gtk_entry_completion_insert_action_markup
 gtk_entry_completion_insert_action_text
 gtk_entry_completion_insert_prefix
@@ -1489,7 +1489,7 @@ gtk_entry_completion_set_text_column
 
 #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_get_type
 gtk_entry_buffer_new
 gtk_entry_buffer_get_bytes
 gtk_entry_buffer_get_length
@@ -1507,7 +1507,7 @@ gtk_entry_buffer_emit_deleted_text
 #if IN_HEADER(__GTK_EVENT_BOX_H__)
 #if IN_FILE(__GTK_EVENT_BOX_C__)
 gtk_event_box_get_above_child
-gtk_event_box_get_type G_GNUC_CONST
+gtk_event_box_get_type
 gtk_event_box_get_visible_window
 gtk_event_box_new
 gtk_event_box_set_above_child
@@ -1522,7 +1522,7 @@ gtk_expander_get_label
 gtk_expander_get_label_fill
 gtk_expander_get_label_widget
 gtk_expander_get_spacing
-gtk_expander_get_type G_GNUC_CONST
+gtk_expander_get_type
 gtk_expander_get_use_markup
 gtk_expander_get_use_underline
 gtk_expander_new
@@ -1590,7 +1590,7 @@ 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_type
 gtk_file_chooser_get_uri
 gtk_file_chooser_get_uris
 gtk_file_chooser_get_use_preview_label
@@ -1659,7 +1659,7 @@ gtk_file_chooser_unselect_uri
 
 #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_get_type
 gtk_file_chooser_dialog_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_file_chooser_dialog_new_with_backend
@@ -1669,7 +1669,7 @@ gtk_file_chooser_dialog_new_with_backend
 
 #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_get_type
 gtk_file_chooser_widget_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_file_chooser_widget_new_with_backend
@@ -1680,7 +1680,7 @@ gtk_file_chooser_widget_new_with_backend
 #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_type
 gtk_file_chooser_button_get_width_chars
 gtk_file_chooser_button_new
 #ifndef GTK_DISABLE_DEPRECATED
@@ -1703,7 +1703,7 @@ gtk_file_filter_add_pixbuf_formats
 gtk_file_filter_filter
 gtk_file_filter_get_name
 gtk_file_filter_get_needed
-gtk_file_filter_get_type G_GNUC_CONST
+gtk_file_filter_get_type
 gtk_file_filter_new
 gtk_file_filter_set_name
 #endif
@@ -1726,7 +1726,7 @@ gtk_file_selection_get_selections PRIVATE
 gtk_file_selection_get_selections_utf8
 #endif
 gtk_file_selection_get_select_multiple
-gtk_file_selection_get_type G_GNUC_CONST
+gtk_file_selection_get_type
 gtk_file_selection_hide_fileop_buttons
 gtk_file_selection_new
 #ifndef _WIN64
@@ -1743,7 +1743,7 @@ gtk_file_selection_show_fileop_buttons
 
 #if IN_HEADER(__GTK_FIXED_H__)
 #if IN_FILE(__GTK_FIXED_C__)
-gtk_fixed_get_type G_GNUC_CONST
+gtk_fixed_get_type
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
@@ -1760,7 +1760,7 @@ gtk_font_button_get_font_name
 gtk_font_button_get_show_size
 gtk_font_button_get_show_style
 gtk_font_button_get_title
-gtk_font_button_get_type G_GNUC_CONST
+gtk_font_button_get_type
 gtk_font_button_get_use_font
 gtk_font_button_get_use_size
 gtk_font_button_new
@@ -1781,7 +1781,7 @@ gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_font_selection
 gtk_font_selection_dialog_get_ok_button
 gtk_font_selection_dialog_get_preview_text
-gtk_font_selection_dialog_get_type G_GNUC_CONST
+gtk_font_selection_dialog_get_type
 gtk_font_selection_dialog_new
 gtk_font_selection_dialog_set_font_name
 gtk_font_selection_dialog_set_preview_text
@@ -1800,7 +1800,7 @@ gtk_font_selection_get_preview_text
 gtk_font_selection_get_size
 gtk_font_selection_get_size_entry
 gtk_font_selection_get_size_list
-gtk_font_selection_get_type G_GNUC_CONST
+gtk_font_selection_get_type
 gtk_font_selection_new
 gtk_font_selection_set_font_name
 gtk_font_selection_set_preview_text
@@ -1813,7 +1813,7 @@ gtk_frame_get_label
 gtk_frame_get_label_align
 gtk_frame_get_label_widget
 gtk_frame_get_shadow_type
-gtk_frame_get_type G_GNUC_CONST
+gtk_frame_get_type
 gtk_frame_new
 gtk_frame_set_label
 gtk_frame_set_label_align
@@ -1825,7 +1825,7 @@ gtk_frame_set_shadow_type
 #if IN_HEADER(__GTK_GAMMA_CURVE_H__)
 #if IN_FILE(__GTK_GAMMA_CURVE_C__)
 #ifndef GTK_DISABLE_DEPRECATED
-gtk_gamma_curve_get_type G_GNUC_CONST
+gtk_gamma_curve_get_type
 gtk_gamma_curve_new
 #endif
 #endif
@@ -1844,7 +1844,7 @@ 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_get_type
 gtk_handle_box_new
 gtk_handle_box_set_handle_position
 gtk_handle_box_set_shadow_type
@@ -1854,7 +1854,7 @@ gtk_handle_box_set_snap_edge
 
 #if IN_HEADER(__GTK_HBOX_H__)
 #if IN_FILE(__GTK_HBOX_C__)
-gtk_hbox_get_type G_GNUC_CONST
+gtk_hbox_get_type
 gtk_hbox_new
 #endif
 #endif
@@ -1862,7 +1862,7 @@ gtk_hbox_new
 #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
+gtk_hbutton_box_get_type
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_hbutton_box_get_layout_default
 gtk_hbutton_box_get_spacing_default
@@ -1874,7 +1874,7 @@ gtk_hbutton_box_set_spacing_default
 
 #if IN_HEADER(__GTK_HPANED_H__)
 #if IN_FILE(__GTK_HPANED_C__)
-gtk_hpaned_get_type G_GNUC_CONST
+gtk_hpaned_get_type
 gtk_hpaned_new
 #endif
 #endif
@@ -1882,7 +1882,7 @@ gtk_hpaned_new
 #if IN_HEADER(__GTK_HRULER_H__)
 #if IN_FILE(__GTK_HRULER_C__)
 #ifndef GTK_DISABLE_DEPRECATED
-gtk_hruler_get_type G_GNUC_CONST
+gtk_hruler_get_type
 gtk_hruler_new
 #endif
 #endif
@@ -1890,7 +1890,7 @@ gtk_hruler_new
 
 #if IN_HEADER(__GTK_HSCALE_H__)
 #if IN_FILE(__GTK_HSCALE_C__)
-gtk_hscale_get_type G_GNUC_CONST
+gtk_hscale_get_type
 gtk_hscale_new
 gtk_hscale_new_with_range
 #endif
@@ -1898,14 +1898,14 @@ gtk_hscale_new_with_range
 
 #if IN_HEADER(__GTK_HSCROLLBAR_H__)
 #if IN_FILE(__GTK_HSCROLLBAR_C__)
-gtk_hscrollbar_get_type G_GNUC_CONST
+gtk_hscrollbar_get_type
 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_get_type
 gtk_hseparator_new
 #endif
 #endif
@@ -1914,7 +1914,7 @@ gtk_hseparator_new
 #if IN_FILE(__GTK_HSV_C__)
 gtk_hsv_get_color
 gtk_hsv_get_metrics
-gtk_hsv_get_type G_GNUC_CONST
+gtk_hsv_get_type
 gtk_hsv_is_adjusting
 gtk_hsv_new
 gtk_hsv_set_color
@@ -1928,7 +1928,7 @@ gtk_rgb_to_hsv
 #if IN_FILE(__GTK_ICON_FACTORY_C__)
 gtk_icon_factory_add
 gtk_icon_factory_add_default
-gtk_icon_factory_get_type G_GNUC_CONST
+gtk_icon_factory_get_type
 gtk_icon_factory_lookup
 gtk_icon_factory_lookup_default
 gtk_icon_factory_new
@@ -1942,7 +1942,7 @@ gtk_icon_size_register_alias
 gtk_icon_set_add_source
 gtk_icon_set_copy
 gtk_icon_set_get_sizes
-gtk_icon_set_get_type G_GNUC_CONST
+gtk_icon_set_get_type
 gtk_icon_set_new
 gtk_icon_set_new_from_pixbuf
 gtk_icon_set_ref
@@ -1964,7 +1964,7 @@ gtk_icon_source_get_size
 gtk_icon_source_get_size_wildcarded
 gtk_icon_source_get_state
 gtk_icon_source_get_state_wildcarded
-gtk_icon_source_get_type G_GNUC_CONST
+gtk_icon_source_get_type
 gtk_icon_source_new
 gtk_icon_source_set_direction
 gtk_icon_source_set_direction_wildcarded
@@ -1999,7 +1999,7 @@ gtk_icon_info_get_filename PRIVATE
 #ifdef G_OS_WIN32
 gtk_icon_info_get_filename_utf8
 #endif
-gtk_icon_info_get_type G_GNUC_CONST
+gtk_icon_info_get_type
 gtk_icon_info_load_icon
 gtk_icon_info_set_raw_coordinates
 gtk_icon_theme_add_builtin_icon
@@ -2020,7 +2020,7 @@ gtk_icon_theme_get_search_path PRIVATE
 #ifdef G_OS_WIN32
 gtk_icon_theme_get_search_path_utf8
 #endif
-gtk_icon_theme_get_type G_GNUC_CONST
+gtk_icon_theme_get_type
 gtk_icon_theme_has_icon
 gtk_icon_theme_list_contexts
 gtk_icon_theme_list_icons
@@ -2068,7 +2068,7 @@ gtk_icon_view_get_selected_items
 gtk_icon_view_get_selection_mode
 gtk_icon_view_get_spacing
 gtk_icon_view_get_text_column
-gtk_icon_view_get_type G_GNUC_CONST
+gtk_icon_view_get_type
 gtk_icon_view_get_visible_range
 gtk_icon_view_item_activated
 gtk_icon_view_new
@@ -2132,7 +2132,7 @@ gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_gicon
 gtk_image_get_storage_type
-gtk_image_get_type G_GNUC_CONST
+gtk_image_get_type
 gtk_image_new
 gtk_image_new_from_animation
 #ifndef _WIN64
@@ -2170,7 +2170,7 @@ gtk_image_set_pixel_size
 #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_type
 gtk_image_menu_item_get_use_stock
 gtk_image_menu_item_new
 gtk_image_menu_item_new_from_stock
@@ -2191,7 +2191,7 @@ gtk_im_context_focus_in
 gtk_im_context_focus_out
 gtk_im_context_get_preedit_string
 gtk_im_context_get_surrounding
-gtk_im_context_get_type G_GNUC_CONST
+gtk_im_context_get_type
 gtk_im_context_reset
 gtk_im_context_set_client_window
 gtk_im_context_set_cursor_location
@@ -2203,7 +2203,7 @@ gtk_im_context_set_use_preedit
 #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_get_type
 gtk_im_context_simple_new
 #endif
 #endif
@@ -2213,7 +2213,7 @@ gtk_im_context_simple_new
 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_get_type
 gtk_im_multicontext_new
 #endif
 #endif
@@ -2221,7 +2221,7 @@ gtk_im_multicontext_new
 #if IN_HEADER(__GTK_INVISIBLE_H__)
 #if IN_FILE(__GTK_INVISIBLE_C__)
 gtk_invisible_get_screen
-gtk_invisible_get_type G_GNUC_CONST
+gtk_invisible_get_type
 gtk_invisible_new
 gtk_invisible_new_for_screen
 gtk_invisible_set_screen
@@ -2230,7 +2230,7 @@ gtk_invisible_set_screen
 
 #if IN_HEADER(__GTK_ITEM_H__)
 #if IN_FILE(__GTK_ITEM_C__)
-gtk_item_get_type G_GNUC_CONST
+gtk_item_get_type
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_item_deselect
 gtk_item_select
@@ -2256,7 +2256,7 @@ gtk_item_factory_from_path
 gtk_item_factory_from_widget
 gtk_item_factory_get_item
 gtk_item_factory_get_item_by_action
-gtk_item_factory_get_type G_GNUC_CONST
+gtk_item_factory_get_type
 gtk_item_factory_get_widget
 gtk_item_factory_get_widget_by_action
 gtk_item_factory_new
@@ -2292,7 +2292,7 @@ gtk_label_get_selectable
 gtk_label_get_selection_bounds
 gtk_label_get_single_line_mode
 gtk_label_get_text
-gtk_label_get_type G_GNUC_CONST
+gtk_label_get_type
 gtk_label_get_use_markup
 gtk_label_get_use_underline
 gtk_label_get_width_chars
@@ -2329,7 +2329,7 @@ gtk_label_get_track_visited_links
 gtk_layout_get_bin_window
 gtk_layout_get_hadjustment
 gtk_layout_get_size
-gtk_layout_get_type G_GNUC_CONST
+gtk_layout_get_type
 gtk_layout_get_vadjustment
 gtk_layout_move
 gtk_layout_new
@@ -2346,7 +2346,7 @@ gtk_layout_thaw
 
 #if IN_HEADER(__GTK_LINK_BUTTON_H__)
 #if IN_FILE(__GTK_LINK_BUTTON_C__)
-gtk_link_button_get_type G_GNUC_CONST
+gtk_link_button_get_type
 gtk_link_button_new
 gtk_link_button_new_with_label
 gtk_link_button_get_uri
@@ -2368,7 +2368,7 @@ gtk_list_clear_items
 gtk_list_end_drag_selection
 gtk_list_end_selection
 gtk_list_extend_selection
-gtk_list_get_type G_GNUC_CONST
+gtk_list_get_type
 gtk_list_insert_items
 gtk_list_new
 gtk_list_prepend_items
@@ -2396,7 +2396,7 @@ gtk_list_unselect_item
 #if IN_FILE(__GTK_LIST_ITEM_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_list_item_deselect
-gtk_list_item_get_type G_GNUC_CONST
+gtk_list_item_get_type
 gtk_list_item_new
 gtk_list_item_new_with_label
 gtk_list_item_select
@@ -2408,7 +2408,7 @@ gtk_list_item_select
 #if IN_FILE(__GTK_LIST_STORE_C__)
 gtk_list_store_append
 gtk_list_store_clear
-gtk_list_store_get_type G_GNUC_CONST
+gtk_list_store_get_type
 gtk_list_store_insert
 gtk_list_store_insert_after
 gtk_list_store_insert_before
@@ -2492,7 +2492,7 @@ gtk_main_quit
 #if IN_HEADER(__GTK_INPUTDIALOG_H__)
 #if IN_FILE(__GTK_INPUTDIALOG_C__)
 #ifndef GTK_DISABLE_DEPRECATED
-gtk_input_dialog_get_type G_GNUC_CONST
+gtk_input_dialog_get_type
 gtk_input_dialog_new
 #endif
 #endif
@@ -2533,7 +2533,7 @@ gtk_marshal_VOID__UINT_STRING
 
 #if IN_HEADER(__GTK_MENU_BAR_H__)
 #if IN_FILE(__GTK_MENU_BAR_C__)
-gtk_menu_bar_get_type G_GNUC_CONST
+gtk_menu_bar_get_type
 gtk_menu_bar_new
 gtk_menu_bar_get_child_pack_direction
 gtk_menu_bar_set_child_pack_direction
@@ -2556,7 +2556,7 @@ gtk_menu_get_for_attach_widget
 gtk_menu_get_reserve_toggle_size
 gtk_menu_get_tearoff_state
 gtk_menu_get_title
-gtk_menu_get_type G_GNUC_CONST
+gtk_menu_get_type
 gtk_menu_new
 gtk_menu_popdown
 gtk_menu_popup
@@ -2581,7 +2581,7 @@ gtk_menu_item_get_accel_path
 gtk_menu_item_get_label
 gtk_menu_item_get_right_justified
 gtk_menu_item_get_submenu
-gtk_menu_item_get_type G_GNUC_CONST
+gtk_menu_item_get_type
 gtk_menu_item_get_use_underline
 gtk_menu_item_new
 gtk_menu_item_new_with_label
@@ -2607,7 +2607,7 @@ gtk_menu_shell_append
 gtk_menu_shell_cancel
 gtk_menu_shell_deactivate
 gtk_menu_shell_deselect
-gtk_menu_shell_get_type G_GNUC_CONST
+gtk_menu_shell_get_type
 gtk_menu_shell_insert
 gtk_menu_shell_prepend
 gtk_menu_shell_select_first
@@ -2620,7 +2620,7 @@ gtk_menu_shell_get_take_focus
 #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_get_type
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 #ifndef GTK_DISABLE_DEPRECATED
@@ -2637,7 +2637,7 @@ gtk_menu_tool_button_set_menu
 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_message_area
-gtk_message_dialog_get_type G_GNUC_CONST
+gtk_message_dialog_get_type
 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
@@ -2650,7 +2650,7 @@ gtk_message_dialog_get_image
 #if IN_FILE(__GTK_MISC_C__)
 gtk_misc_get_alignment
 gtk_misc_get_padding
-gtk_misc_get_type G_GNUC_CONST
+gtk_misc_get_type
 gtk_misc_set_alignment
 gtk_misc_set_padding
 #endif
@@ -2658,7 +2658,7 @@ gtk_misc_set_padding
 
 #if IN_HEADER(__GTK_MOUNT_OPERATION_H__)
 #if IN_FILE(__GTK_MOUNT_OPERATION_C__)
-gtk_mount_operation_get_type G_GNUC_CONST
+gtk_mount_operation_get_type
 gtk_mount_operation_new
 gtk_mount_operation_is_showing
 gtk_mount_operation_set_parent
@@ -2683,7 +2683,7 @@ gtk_notebook_get_show_tabs
 gtk_notebook_get_tab_label
 gtk_notebook_get_tab_label_text
 gtk_notebook_get_tab_pos
-gtk_notebook_get_type G_GNUC_CONST
+gtk_notebook_get_type
 gtk_notebook_insert_page
 gtk_notebook_insert_page_menu
 gtk_notebook_new
@@ -2763,13 +2763,13 @@ gtk_object_set_user_data
 gtk_object_sink
 #endif
 gtk_object_destroy
-gtk_object_get_type G_GNUC_CONST
+gtk_object_get_type
 #endif
 #endif
 
 #if IN_HEADER(__GTK_OFFSCREEN_WINDOW_H__)
 #if IN_FILE(__GTK_OFFSCREEN_WINDOW_C__)
-gtk_offscreen_window_get_type G_GNUC_CONST
+gtk_offscreen_window_get_type
 gtk_offscreen_window_new
 gtk_offscreen_window_get_pixmap
 gtk_offscreen_window_get_pixbuf
@@ -2779,7 +2779,7 @@ gtk_offscreen_window_get_pixbuf
 #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_get_type
 gtk_orientable_set_orientation
 #endif
 #endif
@@ -2788,7 +2788,7 @@ gtk_orientable_set_orientation
 #if IN_FILE(__GTK_OLD_EDITABLE_C__)
 gtk_old_editable_changed
 gtk_old_editable_claim_selection
-gtk_old_editable_get_type G_GNUC_CONST
+gtk_old_editable_get_type
 #endif
 #endif
 
@@ -2796,7 +2796,7 @@ gtk_old_editable_get_type G_GNUC_CONST
 #if IN_FILE(__GTK_OPTION_MENU_C__)
 gtk_option_menu_get_history
 gtk_option_menu_get_menu
-gtk_option_menu_get_type G_GNUC_CONST
+gtk_option_menu_get_type
 gtk_option_menu_new
 gtk_option_menu_remove_menu
 gtk_option_menu_set_history
@@ -2812,7 +2812,7 @@ 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_get_type
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_set_position
@@ -2824,7 +2824,7 @@ gtk_paned_compute_position
 
 #if IN_HEADER(__GTK_PATH_BAR_H__)
 #if IN_FILE(__GTK_PATH_BAR_C__)
-gtk_path_bar_get_type G_GNUC_CONST
+gtk_path_bar_get_type
 #endif
 #endif
 
@@ -2832,7 +2832,7 @@ gtk_path_bar_get_type G_GNUC_CONST
 #if IN_FILE(__GTK_PIXMAP_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_pixmap_get
-gtk_pixmap_get_type G_GNUC_CONST
+gtk_pixmap_get_type
 gtk_pixmap_new
 gtk_pixmap_set
 gtk_pixmap_set_build_insensitive
@@ -2847,7 +2847,7 @@ 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_get_type
 gtk_plug_new
 gtk_plug_new_for_display
 #endif
@@ -2859,7 +2859,7 @@ gtk_plug_new_for_display
 gtk_preview_draw_row
 gtk_preview_get_cmap
 gtk_preview_get_info
-gtk_preview_get_type G_GNUC_CONST
+gtk_preview_get_type
 gtk_preview_get_visual
 gtk_preview_new
 gtk_preview_put
@@ -2878,7 +2878,7 @@ gtk_preview_uninit
 
 #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_get_type
 gtk_page_setup_new
 gtk_page_setup_new_from_file
 gtk_page_setup_new_from_key_file
@@ -2910,7 +2910,7 @@ gtk_page_setup_get_page_height
 #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_unix_dialog_get_type G_GNUC_CONST
+gtk_page_setup_unix_dialog_get_type
 gtk_page_setup_unix_dialog_new
 gtk_page_setup_unix_dialog_set_page_setup
 gtk_page_setup_unix_dialog_get_page_setup
@@ -2922,7 +2922,7 @@ gtk_page_setup_unix_dialog_get_print_settings
 
 #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_get_type
 gtk_paper_size_new
 gtk_paper_size_new_from_ppd
 gtk_paper_size_new_custom
@@ -2950,7 +2950,7 @@ gtk_paper_size_get_default
 #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
+gtk_custom_paper_unix_dialog_get_type
 #endif
 #endif
 #endif
@@ -2959,7 +2959,7 @@ gtk_custom_paper_unix_dialog_get_type G_GNUC_CONST
 #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_print_backend_get_type
 gtk_print_backend_add_printer
 gtk_print_backend_remove_printer
 gtk_print_backend_set_list_done
@@ -2976,7 +2976,7 @@ gtk_print_backend_set_password
 
 #if IN_HEADER(__GTK_PRINT_CONTEXT_H__)
 #if IN_FILE(__GTK_PRINT_CONTEXT_C__)
-gtk_print_context_get_type G_GNUC_CONST
+gtk_print_context_get_type
 gtk_print_context_get_cairo_context
 gtk_print_context_get_page_setup
 gtk_print_context_get_width
@@ -2994,7 +2994,7 @@ gtk_print_context_set_cairo_context
 #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_type
 gtk_printer_get_backend
 gtk_printer_get_name
 gtk_printer_get_description
@@ -3013,7 +3013,7 @@ gtk_printer_request_details
 gtk_printer_get_capabilities
 gtk_printer_get_hard_margins
 gtk_enumerate_printers
-gtk_print_capabilities_get_type G_GNUC_CONST
+gtk_print_capabilities_get_type
 #endif
 #endif
 #endif
@@ -3065,7 +3065,7 @@ gtk_printer_option_get_activates_default
 #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_get_type
 gtk_printer_option_set_new
 gtk_printer_option_set_add
 gtk_printer_option_set_lookup
@@ -3081,7 +3081,7 @@ gtk_printer_option_set_foreach_in_group
 #if IN_HEADER(__GTK_PRINTER_OPTION_WIDGET_H__)
 #if IN_FILE(__GTK_PRINTER_OPTION_WIDGET_C__)
 #ifdef G_OS_UNIX
-gtk_printer_option_widget_get_type G_GNUC_CONST
+gtk_printer_option_widget_get_type
 gtk_printer_option_widget_new
 gtk_printer_option_widget_set_source
 gtk_printer_option_widget_has_external_label
@@ -3094,7 +3094,7 @@ gtk_printer_option_widget_get_value
 #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_get_type
 gtk_print_job_new
 gtk_print_job_get_settings
 gtk_print_job_get_printer
@@ -3120,7 +3120,7 @@ gtk_print_job_set_status
 #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_get_type
 gtk_print_operation_new
 gtk_print_operation_set_allow_async
 gtk_print_operation_set_default_page_setup
@@ -3183,7 +3183,7 @@ gtk_print_run_page_setup_dialog_async
 
 #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_get_type
 gtk_print_settings_new
 gtk_print_settings_new_from_file
 gtk_print_settings_new_from_key_file
@@ -3264,7 +3264,7 @@ gtk_print_settings_set_output_bin
 #if IN_HEADER(__GTK_PRINT_UNIX_DIALOG_H__)
 #if IN_FILE(__GTK_PRINT_UNIX_DIALOG_C__)
 #ifdef G_OS_UNIX
-gtk_print_unix_dialog_get_type G_GNUC_CONST
+gtk_print_unix_dialog_get_type
 gtk_print_unix_dialog_new
 gtk_print_unix_dialog_set_page_setup
 gtk_print_unix_dialog_get_page_setup
@@ -3305,7 +3305,7 @@ gtk_progress_bar_get_orientation
 gtk_progress_bar_get_pulse_step
 gtk_progress_bar_get_text
 gtk_progress_bar_get_ellipsize
-gtk_progress_bar_get_type G_GNUC_CONST
+gtk_progress_bar_get_type
 gtk_progress_bar_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_progress_bar_new_with_adjustment
@@ -3332,7 +3332,7 @@ gtk_progress_get_current_percentage
 gtk_progress_get_current_text
 gtk_progress_get_percentage_from_value
 gtk_progress_get_text_from_value
-gtk_progress_get_type G_GNUC_CONST
+gtk_progress_get_type
 gtk_progress_get_value
 gtk_progress_set_activity_mode
 gtk_progress_set_adjustment
@@ -3349,7 +3349,7 @@ gtk_progress_set_value
 #if IN_FILE(__GTK_RADIO_ACTION_C__)
 gtk_radio_action_get_current_value
 gtk_radio_action_get_group
-gtk_radio_action_get_type G_GNUC_CONST
+gtk_radio_action_get_type
 gtk_radio_action_new
 gtk_radio_action_set_current_value
 gtk_radio_action_set_group
@@ -3359,7 +3359,7 @@ gtk_radio_action_set_group
 #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_get_type
 gtk_radio_button_new
 gtk_radio_button_new_from_widget
 gtk_radio_button_new_with_label
@@ -3373,7 +3373,7 @@ gtk_radio_button_set_group
 #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_get_type
 gtk_radio_menu_item_new
 gtk_radio_menu_item_new_from_widget
 gtk_radio_menu_item_new_with_label
@@ -3387,7 +3387,7 @@ gtk_radio_menu_item_set_group
 #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_get_type
 gtk_radio_tool_button_new
 gtk_radio_tool_button_new_from_stock
 gtk_radio_tool_button_new_from_widget
@@ -3409,7 +3409,7 @@ gtk_range_get_restrict_to_fill_level
 gtk_range_get_show_fill_level
 gtk_range_get_slider_range
 gtk_range_get_slider_size_fixed
-gtk_range_get_type G_GNUC_CONST
+gtk_range_get_type
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_range_get_update_policy
 #endif
@@ -3480,7 +3480,7 @@ gtk_rc_set_default_files PRIVATE
 gtk_rc_set_default_files_utf8
 #endif
 gtk_rc_style_copy
-gtk_rc_style_get_type G_GNUC_CONST
+gtk_rc_style_get_type
 gtk_rc_style_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_rc_style_ref
@@ -3491,7 +3491,7 @@ gtk_rc_style_unref
 
 #if IN_HEADER(__GTK_RECENT_ACTION_H__)
 #if IN_FILE(__GTK_RECENT_ACTION_C__)
-gtk_recent_action_get_type G_GNUC_CONST
+gtk_recent_action_get_type
 gtk_recent_action_new
 gtk_recent_action_new_for_manager
 gtk_recent_action_set_show_numbers
@@ -3536,14 +3536,14 @@ 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_get_type
 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_get_type
 gtk_recent_chooser_dialog_new G_GNUC_NULL_TERMINATED
 gtk_recent_chooser_dialog_new_for_manager G_GNUC_NULL_TERMINATED
 #endif
@@ -3551,7 +3551,7 @@ gtk_recent_chooser_dialog_new_for_manager G_GNUC_NULL_TERMINATED
 
 #if IN_HEADER(__GTK_RECENT_CHOOSER_MENU_H__)
 #if IN_FILE(__GTK_RECENT_CHOOSER_MENU_C__)
-gtk_recent_chooser_menu_get_type G_GNUC_CONST
+gtk_recent_chooser_menu_get_type
 gtk_recent_chooser_menu_new
 gtk_recent_chooser_menu_new_for_manager
 gtk_recent_chooser_menu_get_show_numbers
@@ -3561,7 +3561,7 @@ gtk_recent_chooser_menu_set_show_numbers
 
 #if IN_HEADER(__GTK_RECENT_CHOOSER_WIDGET_H__)
 #if IN_FILE(__GTK_RECENT_CHOOSER_WIDGET_C__)
-gtk_recent_chooser_widget_get_type G_GNUC_CONST
+gtk_recent_chooser_widget_get_type
 gtk_recent_chooser_widget_new
 gtk_recent_chooser_widget_new_for_manager
 #endif
@@ -3569,7 +3569,7 @@ gtk_recent_chooser_widget_new_for_manager
 
 #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_get_type
 gtk_recent_filter_new
 gtk_recent_filter_set_name
 gtk_recent_filter_get_name
@@ -3588,7 +3588,7 @@ gtk_recent_filter_filter
 #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_get_type
 gtk_recent_manager_new
 gtk_recent_manager_get_items
 gtk_recent_manager_get_default
@@ -3605,7 +3605,7 @@ gtk_recent_manager_move_item
 gtk_recent_manager_set_limit
 gtk_recent_manager_get_limit
 gtk_recent_manager_purge_items
-gtk_recent_info_get_type G_GNUC_CONST
+gtk_recent_info_get_type
 gtk_recent_info_ref
 gtk_recent_info_unref
 gtk_recent_info_get_uri
@@ -3677,7 +3677,7 @@ gtk_ruler_draw_pos
 gtk_ruler_draw_ticks
 gtk_ruler_get_metric
 gtk_ruler_get_range
-gtk_ruler_get_type G_GNUC_CONST
+gtk_ruler_get_type
 gtk_ruler_set_metric
 gtk_ruler_set_range
 #endif
@@ -3690,7 +3690,7 @@ 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_type
 gtk_scale_get_value_pos
 gtk_scale_set_digits
 gtk_scale_set_draw_value
@@ -3702,7 +3702,7 @@ gtk_scale_clear_marks
 
 #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_type
 gtk_scale_button_get_value
 gtk_scale_button_new
 gtk_scale_button_set_icons
@@ -3721,7 +3721,7 @@ gtk_scale_button_get_popup
 
 #if IN_HEADER(__GTK_SCROLLBAR_H__)
 #if IN_FILE(__GTK_SCROLLBAR_C__)
-gtk_scrollbar_get_type G_GNUC_CONST
+gtk_scrollbar_get_type
 #endif
 #endif
 
@@ -3733,7 +3733,7 @@ gtk_scrolled_window_get_hscrollbar
 gtk_scrolled_window_get_placement
 gtk_scrolled_window_get_policy
 gtk_scrolled_window_get_shadow_type
-gtk_scrolled_window_get_type G_GNUC_CONST
+gtk_scrolled_window_get_type
 gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_get_vscrollbar
 gtk_scrolled_window_new
@@ -3765,7 +3765,7 @@ gtk_selection_data_get_length
 gtk_selection_data_get_pixbuf
 gtk_selection_data_get_targets
 gtk_selection_data_get_text
-gtk_selection_data_get_type G_GNUC_CONST
+gtk_selection_data_get_type
 gtk_selection_data_get_uris
 gtk_selection_data_set
 gtk_selection_data_set_pixbuf
@@ -3789,7 +3789,7 @@ 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_get_type
 gtk_target_list_new
 gtk_target_list_ref
 gtk_target_list_remove
@@ -3801,13 +3801,13 @@ gtk_target_table_free
 
 #if IN_HEADER(__GTK_SEPARATOR_H__)
 #if IN_FILE(__GTK_SEPARATOR_C__)
-gtk_separator_get_type G_GNUC_CONST
+gtk_separator_get_type
 #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_get_type
 gtk_separator_menu_item_new
 #endif
 #endif
@@ -3815,7 +3815,7 @@ gtk_separator_menu_item_new
 #if IN_HEADER(__GTK_SEPARATOR_TOOL_ITEM_H__)
 #if IN_FILE(__GTK_SEPARATOR_TOOL_ITEM_C__)
 gtk_separator_tool_item_get_draw
-gtk_separator_tool_item_get_type G_GNUC_CONST
+gtk_separator_tool_item_get_type
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
 #endif
@@ -3825,7 +3825,7 @@ gtk_separator_tool_item_set_draw
 #if IN_FILE(__GTK_SETTINGS_C__)
 gtk_settings_get_default
 gtk_settings_get_for_screen
-gtk_settings_get_type G_GNUC_CONST
+gtk_settings_get_type
 gtk_settings_install_property
 gtk_settings_install_property_parser
 gtk_settings_set_double_property
@@ -3863,7 +3863,7 @@ gtk_signal_newv
 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_type
 gtk_size_group_get_widgets
 gtk_size_group_new
 gtk_size_group_remove_widget
@@ -3883,7 +3883,7 @@ gtk_show_uri
 gtk_socket_add_id
 gtk_socket_get_id
 gtk_socket_get_plug_window
-gtk_socket_get_type G_GNUC_CONST
+gtk_socket_get_type
 gtk_socket_new
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_socket_steal
@@ -3900,7 +3900,7 @@ gtk_spin_button_get_increments
 gtk_spin_button_get_numeric
 gtk_spin_button_get_range
 gtk_spin_button_get_snap_to_ticks
-gtk_spin_button_get_type G_GNUC_CONST
+gtk_spin_button_get_type
 gtk_spin_button_get_update_policy
 gtk_spin_button_get_value
 gtk_spin_button_get_value_as_int
@@ -3923,7 +3923,7 @@ gtk_spin_button_update
 
 #if IN_HEADER(__GTK_SPINNER_H__)
 #if IN_FILE(__GTK_SPINNER_C__)
-gtk_spinner_get_type G_GNUC_CONST
+gtk_spinner_get_type
 gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
@@ -3935,7 +3935,7 @@ gtk_spinner_stop
 gtk_statusbar_get_context_id
 gtk_statusbar_get_has_resize_grip
 gtk_statusbar_get_message_area
-gtk_statusbar_get_type G_GNUC_CONST
+gtk_statusbar_get_type
 gtk_statusbar_new
 gtk_statusbar_pop
 gtk_statusbar_push
@@ -3967,7 +3967,7 @@ gtk_table_get_default_row_spacing
 gtk_table_get_homogeneous
 gtk_table_get_row_spacing
 gtk_table_get_size
-gtk_table_get_type G_GNUC_CONST
+gtk_table_get_type
 gtk_table_new
 gtk_table_resize
 gtk_table_set_col_spacing
@@ -3980,7 +3980,7 @@ gtk_table_set_row_spacings
 
 #if IN_HEADER(__GTK_TEAROFF_MENU_ITEM_H__)
 #if IN_FILE(__GTK_TEAROFF_MENU_ITEM_C__)
-gtk_tearoff_menu_item_get_type G_GNUC_CONST
+gtk_tearoff_menu_item_get_type
 gtk_tearoff_menu_item_new
 #endif
 #endif
@@ -3989,13 +3989,13 @@ gtk_tearoff_menu_item_new
 #if IN_FILE(__GTK_TEXT_TAG_C__)
 gtk_text_attributes_copy
 gtk_text_attributes_copy_values
-gtk_text_attributes_get_type G_GNUC_CONST
+gtk_text_attributes_get_type
 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_get_type
 gtk_text_tag_new
 gtk_text_tag_set_priority
 #endif
@@ -4006,7 +4006,7 @@ 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_get_type
 gtk_text_tag_table_lookup
 gtk_text_tag_table_new
 gtk_text_tag_table_remove
@@ -4020,7 +4020,7 @@ gtk_text_forward_delete
 gtk_text_freeze
 gtk_text_get_length
 gtk_text_get_point
-gtk_text_get_type G_GNUC_CONST
+gtk_text_get_type
 gtk_text_insert
 gtk_text_new
 gtk_text_set_adjustments
@@ -4073,7 +4073,7 @@ gtk_text_buffer_get_slice
 gtk_text_buffer_get_start_iter
 gtk_text_buffer_get_tag_table
 gtk_text_buffer_get_text
-gtk_text_buffer_get_type G_GNUC_CONST
+gtk_text_buffer_get_type
 gtk_text_buffer_insert
 gtk_text_buffer_insert_at_cursor
 gtk_text_buffer_insert_child_anchor
@@ -4175,7 +4175,7 @@ gtk_text_iter_get_slice
 gtk_text_iter_get_tags
 gtk_text_iter_get_text
 gtk_text_iter_get_toggled_tags
-gtk_text_iter_get_type G_GNUC_CONST
+gtk_text_iter_get_type
 gtk_text_iter_get_visible_line_index
 gtk_text_iter_get_visible_line_offset
 gtk_text_iter_get_visible_slice
@@ -4221,7 +4221,7 @@ gtk_text_layout_get_line_display
 gtk_text_layout_get_lines
 gtk_text_layout_get_line_yrange
 gtk_text_layout_get_size
-gtk_text_layout_get_type G_GNUC_CONST
+gtk_text_layout_get_type
 gtk_text_layout_invalidate
 gtk_text_layout_invalidate_cursors
 gtk_text_layout_is_valid
@@ -4253,7 +4253,7 @@ gtk_text_layout_wrap_loop_start
 #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_type
 gtk_text_child_anchor_get_widgets
 gtk_text_child_anchor_new
 #endif
@@ -4287,7 +4287,7 @@ 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_type
 gtk_text_mark_get_visible
 #endif
 #endif
@@ -4328,7 +4328,7 @@ gtk_text_view_get_pixels_below_lines
 gtk_text_view_get_pixels_inside_wrap
 gtk_text_view_get_right_margin
 gtk_text_view_get_tabs
-gtk_text_view_get_type G_GNUC_CONST
+gtk_text_view_get_type
 gtk_text_view_get_vadjustment
 gtk_text_view_get_visible_rect
 gtk_text_view_get_window
@@ -4369,13 +4369,13 @@ gtk_text_view_window_to_buffer_coords
 #if IN_FILE(__GTK_THEMES_C__)
 gtk_theme_engine_create_rc_style
 gtk_theme_engine_get
-gtk_theme_engine_get_type G_GNUC_CONST
+gtk_theme_engine_get_type
 #endif
 #endif
 
 #if IN_HEADER(__GTK_TIPS_QUERY_H__)
 #if IN_FILE(__GTK_TIPS_QUERY_C__)
-gtk_tips_query_get_type G_GNUC_CONST
+gtk_tips_query_get_type
 gtk_tips_query_new
 gtk_tips_query_set_caller
 gtk_tips_query_set_labels
@@ -4388,7 +4388,7 @@ gtk_tips_query_stop_query
 #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
+gtk_toggle_action_get_type
 gtk_toggle_action_new
 gtk_toggle_action_set_active
 gtk_toggle_action_set_draw_as_radio
@@ -4401,7 +4401,7 @@ gtk_toggle_action_toggled
 gtk_toggle_button_get_active
 gtk_toggle_button_get_inconsistent
 gtk_toggle_button_get_mode
-gtk_toggle_button_get_type G_GNUC_CONST
+gtk_toggle_button_get_type
 gtk_toggle_button_new
 gtk_toggle_button_new_with_label
 gtk_toggle_button_new_with_mnemonic
@@ -4415,7 +4415,7 @@ gtk_toggle_button_toggled
 #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_get_type
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
@@ -4456,7 +4456,7 @@ gtk_toolbar_get_style
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_toolbar_get_tooltips
 #endif
-gtk_toolbar_get_type G_GNUC_CONST
+gtk_toolbar_get_type
 gtk_toolbar_insert
 gtk_toolbar_new
 gtk_toolbar_set_drop_highlight_item
@@ -4474,7 +4474,7 @@ gtk_toolbar_unset_style
 
 #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_type
 gtk_tool_shell_get_ellipsize_mode
 gtk_tool_shell_get_icon_size
 gtk_tool_shell_get_orientation
@@ -4494,7 +4494,7 @@ gtk_tool_button_get_icon_widget
 gtk_tool_button_get_label
 gtk_tool_button_get_label_widget
 gtk_tool_button_get_stock_id
-gtk_tool_button_get_type G_GNUC_CONST
+gtk_tool_button_get_type
 gtk_tool_button_get_use_underline
 gtk_tool_button_new
 gtk_tool_button_new_from_stock
@@ -4521,7 +4521,7 @@ gtk_tool_item_get_text_alignment
 gtk_tool_item_get_text_orientation
 gtk_tool_item_get_text_size_group
 gtk_tool_item_get_toolbar_style
-gtk_tool_item_get_type G_GNUC_CONST
+gtk_tool_item_get_type
 gtk_tool_item_get_use_drag_window
 gtk_tool_item_get_visible_horizontal
 gtk_tool_item_get_visible_vertical
@@ -4546,7 +4546,7 @@ gtk_tool_item_toolbar_reconfigured
 
 #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_get_type
 gtk_tool_item_group_new
 gtk_tool_item_group_set_label
 gtk_tool_item_group_set_label_widget
@@ -4569,7 +4569,7 @@ gtk_tool_item_group_get_collapsed
 
 #if IN_HEADER(__GTK_TOOL_PALETTE_H__)
 #if IN_FILE(__GTK_TOOL_PALETTE_C__)
-gtk_tool_palette_get_type G_GNUC_CONST
+gtk_tool_palette_get_type
 gtk_tool_palette_new
 gtk_tool_palette_set_group_position
 gtk_tool_palette_set_exclusive
@@ -4597,7 +4597,7 @@ gtk_tool_palette_get_drag_target_group G_GNUC_CONST
 
 #if IN_HEADER(__GTK_TOOLTIP_H__)
 #if IN_FILE(__GTK_TOOLTIP_C__)
-gtk_tooltip_get_type G_GNUC_CONST
+gtk_tooltip_get_type
 gtk_tooltip_set_custom
 gtk_tooltip_set_icon
 gtk_tooltip_set_icon_from_stock
@@ -4618,7 +4618,7 @@ gtk_tooltips_disable
 gtk_tooltips_enable
 gtk_tooltips_force_window
 gtk_tooltips_get_info_from_tip_window
-gtk_tooltips_get_type G_GNUC_CONST
+gtk_tooltips_get_type
 gtk_tooltips_new
 gtk_tooltips_set_delay
 gtk_tooltips_set_tip
@@ -4629,7 +4629,7 @@ gtk_tooltips_set_tip
 #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
+gtk_tray_icon_get_type
 #endif
 #endif
 #endif
@@ -4639,7 +4639,7 @@ gtk_tray_icon_get_type G_GNUC_CONST
 gtk_tree_append
 gtk_tree_child_position
 gtk_tree_clear_items
-gtk_tree_get_type G_GNUC_CONST
+gtk_tree_get_type
 gtk_tree_insert
 gtk_tree_prepend
 gtk_tree_remove_item
@@ -4658,11 +4658,11 @@ gtk_tree_new
 #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_get_type
 gtk_tree_drag_dest_row_drop_possible
 gtk_tree_drag_source_drag_data_delete
 gtk_tree_drag_source_drag_data_get
-gtk_tree_drag_source_get_type G_GNUC_CONST
+gtk_tree_drag_source_get_type
 gtk_tree_drag_source_row_draggable
 gtk_tree_get_row_drag_data
 gtk_tree_set_row_drag_data
@@ -4674,7 +4674,7 @@ gtk_tree_set_row_drag_data
 gtk_tree_item_collapse
 gtk_tree_item_deselect
 gtk_tree_item_expand
-gtk_tree_item_get_type G_GNUC_CONST
+gtk_tree_item_get_type
 gtk_tree_item_new
 gtk_tree_item_new_with_label
 gtk_tree_item_remove_subtree
@@ -4687,7 +4687,7 @@ gtk_tree_item_set_subtree
 #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_iter_get_type
 gtk_tree_model_foreach
 gtk_tree_model_get
 gtk_tree_model_get_column_type
@@ -4698,7 +4698,7 @@ gtk_tree_model_get_iter_from_string
 gtk_tree_model_get_n_columns
 gtk_tree_model_get_path
 gtk_tree_model_get_string_from_iter
-gtk_tree_model_get_type G_GNUC_CONST
+gtk_tree_model_get_type
 gtk_tree_model_get_valist
 gtk_tree_model_get_value
 gtk_tree_model_iter_children
@@ -4722,7 +4722,7 @@ gtk_tree_path_free
 gtk_tree_path_get_depth
 gtk_tree_path_get_indices
 gtk_tree_path_get_indices_with_depth
-gtk_tree_path_get_type G_GNUC_CONST
+gtk_tree_path_get_type
 gtk_tree_path_is_ancestor
 gtk_tree_path_is_descendant
 gtk_tree_path_new
@@ -4739,7 +4739,7 @@ gtk_tree_row_reference_deleted
 gtk_tree_row_reference_free
 gtk_tree_row_reference_get_model
 gtk_tree_row_reference_get_path
-gtk_tree_row_reference_get_type G_GNUC_CONST
+gtk_tree_row_reference_get_type
 gtk_tree_row_reference_inserted
 gtk_tree_row_reference_new
 gtk_tree_row_reference_new_proxy
@@ -4756,7 +4756,7 @@ 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_get_type
 gtk_tree_model_sort_iter_is_valid
 gtk_tree_model_sort_new_with_model
 gtk_tree_model_sort_reset_default_sort_func
@@ -4771,7 +4771,7 @@ 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_get_type
 gtk_tree_model_filter_new
 gtk_tree_model_filter_refilter
 gtk_tree_model_filter_set_modify_func
@@ -4788,7 +4788,7 @@ gtk_tree_selection_get_select_function
 gtk_tree_selection_get_selected
 gtk_tree_selection_get_selected_rows
 gtk_tree_selection_get_tree_view
-gtk_tree_selection_get_type G_GNUC_CONST
+gtk_tree_selection_get_type
 gtk_tree_selection_get_user_data
 gtk_tree_selection_iter_is_selected
 gtk_tree_selection_path_is_selected
@@ -4809,7 +4809,7 @@ gtk_tree_selection_unselect_range
 #if IN_HEADER(__GTK_TREE_SORTABLE_H__)
 #if IN_FILE(__GTK_TREE_SORTABLE_C__)
 gtk_tree_sortable_get_sort_column_id
-gtk_tree_sortable_get_type G_GNUC_CONST
+gtk_tree_sortable_get_type
 gtk_tree_sortable_has_default_sort_func
 gtk_tree_sortable_set_default_sort_func
 gtk_tree_sortable_set_sort_column_id
@@ -4822,7 +4822,7 @@ gtk_tree_sortable_sort_column_changed
 #if IN_FILE(__GTK_TREE_STORE_C__)
 gtk_tree_store_append
 gtk_tree_store_clear
-gtk_tree_store_get_type G_GNUC_CONST
+gtk_tree_store_get_type
 gtk_tree_store_insert
 gtk_tree_store_insert_after
 gtk_tree_store_insert_before
@@ -4876,7 +4876,7 @@ gtk_tree_view_column_get_sort_order
 gtk_tree_view_column_get_spacing
 gtk_tree_view_column_get_title
 gtk_tree_view_column_get_tree_view
-gtk_tree_view_column_get_type G_GNUC_CONST
+gtk_tree_view_column_get_type
 gtk_tree_view_column_get_visible
 gtk_tree_view_column_get_widget
 gtk_tree_view_column_get_width
@@ -4956,7 +4956,7 @@ gtk_tree_view_get_selection
 gtk_tree_view_get_show_expanders
 gtk_tree_view_get_tooltip_column
 gtk_tree_view_get_tooltip_context
-gtk_tree_view_get_type G_GNUC_CONST
+gtk_tree_view_get_type
 gtk_tree_view_get_vadjustment
 gtk_tree_view_get_visible_range
 gtk_tree_view_get_visible_rect
@@ -5017,7 +5017,7 @@ gtk_tree_view_columns_autosize
 
 #if IN_HEADER(__GTK_TYPE_UTILS_H__)
 #if IN_FILE(__GTK_TYPE_UTILS_C__)
-gtk_identifier_get_type G_GNUC_CONST
+gtk_identifier_get_type
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_type_enum_find_value
 gtk_type_enum_get_values
@@ -5047,7 +5047,7 @@ gtk_ui_manager_get_action
 gtk_ui_manager_get_action_groups
 gtk_ui_manager_get_add_tearoffs
 gtk_ui_manager_get_toplevels
-gtk_ui_manager_get_type G_GNUC_CONST
+gtk_ui_manager_get_type
 gtk_ui_manager_get_ui
 gtk_ui_manager_get_widget
 gtk_ui_manager_insert_action_group
@@ -5061,7 +5061,7 @@ gtk_ui_manager_set_add_tearoffs
 
 #if IN_HEADER(__GTK_VBOX_H__)
 #if IN_FILE(__GTK_VBOX_C__)
-gtk_vbox_get_type G_GNUC_CONST
+gtk_vbox_get_type
 gtk_vbox_new
 #endif
 #endif
@@ -5074,7 +5074,7 @@ gtk_vbutton_box_get_spacing_default
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
 #endif
-gtk_vbutton_box_get_type G_GNUC_CONST
+gtk_vbutton_box_get_type
 gtk_vbutton_box_new
 #endif
 #endif
@@ -5083,7 +5083,7 @@ gtk_vbutton_box_new
 #if IN_FILE(__GTK_VIEWPORT_C__)
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
-gtk_viewport_get_type G_GNUC_CONST
+gtk_viewport_get_type
 gtk_viewport_get_vadjustment
 gtk_viewport_get_bin_window
 gtk_viewport_get_view_window
@@ -5096,14 +5096,14 @@ gtk_viewport_set_vadjustment
 
 #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_get_type
 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_get_type
 gtk_vpaned_new
 #endif
 #endif
@@ -5111,7 +5111,7 @@ gtk_vpaned_new
 #if IN_HEADER(__GTK_VRULER_H__)
 #if IN_FILE(__GTK_VRULER_C__)
 #ifndef GTK_DISABLE_DEPRECATED
-gtk_vruler_get_type G_GNUC_CONST
+gtk_vruler_get_type
 gtk_vruler_new
 #endif
 #endif
@@ -5119,7 +5119,7 @@ gtk_vruler_new
 
 #if IN_HEADER(__GTK_VSCALE_H__)
 #if IN_FILE(__GTK_VSCALE_C__)
-gtk_vscale_get_type G_GNUC_CONST
+gtk_vscale_get_type
 gtk_vscale_new
 gtk_vscale_new_with_range
 #endif
@@ -5127,14 +5127,14 @@ gtk_vscale_new_with_range
 
 #if IN_HEADER(__GTK_VSCROLLBAR_H__)
 #if IN_FILE(__GTK_VSCROLLBAR_C__)
-gtk_vscrollbar_get_type G_GNUC_CONST
+gtk_vscrollbar_get_type
 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_get_type
 gtk_vseparator_new
 #endif
 #endif
@@ -5143,7 +5143,7 @@ gtk_vseparator_new
 #if IN_FILE(__GTK_WIDGET_C__)
 gtk_requisition_copy
 gtk_requisition_free
-gtk_requisition_get_type G_GNUC_CONST
+gtk_requisition_get_type
 gtk_widget_activate
 gtk_widget_is_composited
 gtk_widget_add_accelerator
@@ -5205,7 +5205,7 @@ gtk_widget_get_tooltip_markup
 gtk_widget_get_tooltip_text
 gtk_widget_get_tooltip_window
 gtk_widget_get_toplevel
-gtk_widget_get_type G_GNUC_CONST
+gtk_widget_get_type
 gtk_widget_get_visible
 gtk_widget_get_visual
 gtk_widget_grab_default
@@ -5366,11 +5366,11 @@ 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
 gtk_window_get_type_hint
 gtk_window_get_window_type
 gtk_window_group_add_window
-gtk_window_group_get_type G_GNUC_CONST
+gtk_window_group_get_type
 gtk_window_group_new
 gtk_window_group_remove_window
 gtk_window_group_list_windows
@@ -5460,14 +5460,14 @@ gtk_window_unstick
 #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
+gtk_win32_embed_widget_get_type
 #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_get_type
 gtk_info_bar_new
 gtk_info_bar_new_with_buttons
 gtk_info_bar_get_action_area
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 4fd9986ee7a..62b76adbc63 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -70,7 +70,7 @@ struct _GtkAboutDialogClass
   void (*_gtk_reserved3) (void);
 };
 
-GType                  gtk_about_dialog_get_type               (void) G_GNUC_CONST;
+GType                  gtk_about_dialog_get_type               (void);
 GtkWidget             *gtk_about_dialog_new                    (void);
 void                   gtk_show_about_dialog                   (GtkWindow       *parent,
 								const gchar     *first_property_name,
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index f78e8bbbfd6..f564fd71017 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -119,7 +119,7 @@ struct _GtkAccelKey
 
 
 /* -- Accelerator Groups --- */
-GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
+GType          gtk_accel_group_get_type           (void);
 GtkAccelGroup* gtk_accel_group_new	      	  (void);
 gboolean       gtk_accel_group_get_is_locked      (GtkAccelGroup  *accel_group);
 GdkModifierType 
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index d5d2fa43bc4..19e51447d68 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -94,7 +94,7 @@ struct _GtkAccelLabelClass
 #define	gtk_accel_label_accelerator_width	gtk_accel_label_get_accel_width
 #endif /* GTK_DISABLE_DEPRECATED */
 
-GType	   gtk_accel_label_get_type	     (void) G_GNUC_CONST;
+GType	   gtk_accel_label_get_type	     (void);
 GtkWidget* gtk_accel_label_new		     (const gchar   *string);
 GtkWidget* gtk_accel_label_get_accel_widget  (GtkAccelLabel *accel_label);
 guint	   gtk_accel_label_get_accel_width   (GtkAccelLabel *accel_label);
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 19b573da02a..66388448844 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -82,7 +82,7 @@ void	gtk_accel_map_foreach_unfiltered (gpointer		 data,
 					  GtkAccelMapForeach	 foreach_func);
 
 /* --- notification --- */
-GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
+GType        gtk_accel_map_get_type (void);
 GtkAccelMap *gtk_accel_map_get      (void);
 
 
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 04e6077126a..e72b30dc343 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -66,7 +66,7 @@ struct _GtkAccessibleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType gtk_accessible_get_type (void) G_GNUC_CONST;
+GType gtk_accessible_get_type (void);
 
 void        gtk_accessible_set_widget                  (GtkAccessible     *accessible,
                                                         GtkWidget         *widget);
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 2fe85e63504..f13cbe96f8f 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -85,7 +85,7 @@ struct _GtkActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_action_get_type               (void) G_GNUC_CONST;
+GType        gtk_action_get_type               (void);
 GtkAction   *gtk_action_new                    (const gchar *name,
 						const gchar *label,
 						const gchar *tooltip,
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 06fd735d57c..0988274ebb8 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -108,7 +108,7 @@ struct _GtkRadioActionEntry
   gint   value; 
 };
 
-GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
+GType           gtk_action_group_get_type                (void);
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
 const gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 94114923c7f..6d9279ca905 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -66,7 +66,7 @@ struct _GtkActivatableIface
 };
 
 
-GType      gtk_activatable_get_type                   (void) G_GNUC_CONST;
+GType      gtk_activatable_get_type                   (void);
 
 void       gtk_activatable_sync_action_properties     (GtkActivatable *activatable,
 						       GtkAction      *action);
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index f79179bbc2b..a03741271f5 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -75,7 +75,7 @@ struct _GtkAdjustmentClass
 };
 
 
-GType	   gtk_adjustment_get_type		(void) G_GNUC_CONST;
+GType	   gtk_adjustment_get_type		(void);
 GtkObject* gtk_adjustment_new			(gdouble	  value,
 						 gdouble	  lower,
 						 gdouble	  upper,
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 086a2f4bc54..c1e5067c193 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -65,7 +65,7 @@ struct _GtkAlignmentClass
 };
 
 
-GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
+GType      gtk_alignment_get_type   (void);
 GtkWidget* gtk_alignment_new        (gfloat             xalign,
 				     gfloat             yalign,
 				     gfloat             xscale,
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index a0ef78a7284..a451400b97f 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -63,7 +63,7 @@ struct _GtkArrowClass
 };
 
 
-GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
+GType      gtk_arrow_get_type   (void);
 GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
 				 GtkShadowType  shadow_type);
 void       gtk_arrow_set        (GtkArrow      *arrow,
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index c149477f08e..af820d16687 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -66,7 +66,7 @@ struct _GtkAspectFrameClass
 };
 
 
-GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
+GType      gtk_aspect_frame_get_type   (void);
 GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
 					gfloat           xalign,
 					gfloat           yalign,
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 41c3b5e6313..273c659d063 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -119,7 +119,7 @@ struct _GtkAssistantClass
  */
 typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
 
-GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
+GType                 gtk_assistant_get_type              (void);
 GtkWidget            *gtk_assistant_new                   (void);
 gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
 void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 0809150e3e9..68857a4f5bb 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -65,7 +65,7 @@ struct _GtkButtonBoxClass
 };
 
 
-GType gtk_button_box_get_type (void) G_GNUC_CONST;
+GType gtk_button_box_get_type (void);
 
 GtkButtonBoxStyle gtk_button_box_get_layout          (GtkButtonBox      *widget);
 void              gtk_button_box_set_layout          (GtkButtonBox      *widget,
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 1366f7beda9..72fe30a8b44 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -61,7 +61,7 @@ struct _GtkBinClass
 };
 
 
-GType      gtk_bin_get_type  (void) G_GNUC_CONST;
+GType      gtk_bin_get_type  (void);
 
 GtkWidget *gtk_bin_get_child (GtkBin *bin);
 
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 6967687cdc6..ead2ba7dca5 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -101,7 +101,7 @@ struct _GtkBoxChild
 };
 #endif
 
-GType       gtk_box_get_type            (void) G_GNUC_CONST;
+GType       gtk_box_get_type            (void);
 GtkWidget* _gtk_box_new                 (GtkOrientation  orientation,
                                          gboolean        homogeneous,
                                          gint            spacing);
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 78a46173dbe..67fd41c66bd 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -133,7 +133,7 @@ struct _GtkBuildableIface
 };
 
 
-GType     gtk_buildable_get_type               (void) G_GNUC_CONST;
+GType     gtk_buildable_get_type               (void);
 
 void      gtk_buildable_set_name               (GtkBuildable        *buildable,
 						const gchar         *name);
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 41bfa585c44..6cac20ca42e 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -91,7 +91,7 @@ typedef void (*GtkBuilderConnectFunc) (GtkBuilder    *builder,
 				       GConnectFlags  flags,
 				       gpointer       user_data);
 
-GType        gtk_builder_get_type                (void) G_GNUC_CONST;
+GType        gtk_builder_get_type                (void);
 GtkBuilder*  gtk_builder_new                     (void);
 
 guint        gtk_builder_add_from_file           (GtkBuilder    *builder,
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 3419b81747d..fb79da4adf2 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -88,7 +88,7 @@ struct _GtkButtonClass
 };
 
 
-GType          gtk_button_get_type          (void) G_GNUC_CONST;
+GType          gtk_button_get_type          (void);
 GtkWidget*     gtk_button_new               (void);
 GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index b75fdeb893b..362d0989dd5 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -156,7 +156,7 @@ struct _GtkCalendarClass
 };
 
 
-GType	   gtk_calendar_get_type	(void) G_GNUC_CONST;
+GType	   gtk_calendar_get_type	(void);
 GtkWidget* gtk_calendar_new		(void);
 
 gboolean   gtk_calendar_select_month	(GtkCalendar *calendar,
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 9d5a6332eaf..39bd5a0b2d6 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -51,7 +51,7 @@ struct _GtkCellEditableIface
 };
 
 
-GType gtk_cell_editable_get_type      (void) G_GNUC_CONST;
+GType gtk_cell_editable_get_type      (void);
 
 void  gtk_cell_editable_start_editing (GtkCellEditable *cell_editable,
 				       GdkEvent        *event);
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 828105c9e05..e1f257ef4f9 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -75,7 +75,7 @@ struct _GtkCellLayoutIface
   GList* (* get_cells)        (GtkCellLayout         *cell_layout);
 };
 
-GType gtk_cell_layout_get_type           (void) G_GNUC_CONST;
+GType gtk_cell_layout_get_type           (void);
 void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           gboolean               expand);
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index c4831f960fe..bc70c084476 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -122,7 +122,7 @@ struct _GtkCellRendererClass
   void (*_gtk_reserved2) (void);
 };
 
-GType            gtk_cell_renderer_get_type       (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_get_type       (void);
 
 void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
 						   GtkWidget            *widget,
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 905882a9422..7353b1d0c5b 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -82,7 +82,7 @@ struct _GtkCellRendererAccelClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_accel_get_type        (void);
 GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
 
 
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index acd2109ffba..2975cb9c091 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -56,7 +56,7 @@ struct _GtkCellRendererComboClass
   GtkCellRendererTextClass parent;
 };
 
-GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_combo_get_type (void);
 GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 581d6a692da..05d390ea6f6 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -61,7 +61,7 @@ struct _GtkCellRendererPixbufClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_pixbuf_get_type (void);
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
 
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index b9043cfa8c2..d95362ad093 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -66,7 +66,7 @@ struct _GtkCellRendererProgressClass
   void (*_gtk_reserved4) (void);
 };
 
-GType		 gtk_cell_renderer_progress_get_type (void) G_GNUC_CONST;
+GType		 gtk_cell_renderer_progress_get_type (void);
 GtkCellRenderer* gtk_cell_renderer_progress_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrendererspinner.h b/gtk/gtkcellrendererspinner.h
index 7a9dc276b01..17c0febb71c 100644
--- a/gtk/gtkcellrendererspinner.h
+++ b/gtk/gtkcellrendererspinner.h
@@ -59,7 +59,7 @@ struct _GtkCellRendererSpinnerClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_spinner_get_type (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_spinner_get_type (void);
 GtkCellRenderer *gtk_cell_renderer_spinner_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 1156bf38222..21ad88f4980 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -93,7 +93,7 @@ struct _GtkCellRendererTextClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_text_get_type (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_text_get_type (void);
 GtkCellRenderer *gtk_cell_renderer_text_new      (void);
 
 void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index d6145e6a5b2..60989f75cbf 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -64,7 +64,7 @@ struct _GtkCellRendererToggleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_toggle_get_type       (void) G_GNUC_CONST;
+GType            gtk_cell_renderer_toggle_get_type       (void);
 GtkCellRenderer *gtk_cell_renderer_toggle_new            (void);
 
 gboolean         gtk_cell_renderer_toggle_get_radio      (GtkCellRendererToggle *toggle);
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 1835c7a1c68..5e943f373b3 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -54,7 +54,7 @@ struct _GtkCellViewClass
   GtkWidgetClass parent_class;
 };
 
-GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;
+GType             gtk_cell_view_get_type               (void);
 GtkWidget        *gtk_cell_view_new                    (void);
 GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
 GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 8b1a9aa0d2e..3ff627f2b1b 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -68,7 +68,7 @@ struct _GtkCheckButtonClass
 };
 
 
-GType      gtk_check_button_get_type       (void) G_GNUC_CONST;
+GType      gtk_check_button_get_type       (void);
 GtkWidget* gtk_check_button_new               (void);
 GtkWidget* gtk_check_button_new_with_label    (const gchar *label);
 GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label);
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 5e0ecba8a35..651f235a4a7 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -74,7 +74,7 @@ struct _GtkCheckMenuItemClass
 };
 
 
-GType	   gtk_check_menu_item_get_type	         (void) G_GNUC_CONST;
+GType	   gtk_check_menu_item_get_type	         (void);
 
 GtkWidget* gtk_check_menu_item_new               (void);
 GtkWidget* gtk_check_menu_item_new_with_label    (const gchar      *label);
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index bead067f31a..ff399c496d4 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -67,7 +67,7 @@ typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
 typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
 					       gpointer          user_data_or_owner);
 
-GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
+GType         gtk_clipboard_get_type (void);
 
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
 					     GdkAtom       selection);
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index d97b5473ee1..6e7ad4c51eb 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -440,7 +440,7 @@ struct _GtkCell
   } u;
 };
 
-GType gtk_clist_get_type (void) G_GNUC_CONST;
+GType gtk_clist_get_type (void);
 
 /* create a new GtkCList */
 GtkWidget* gtk_clist_new             (gint   columns);
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index c16220734ab..b5117058c1c 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -80,7 +80,7 @@ struct _GtkColorButtonClass {
 };
 
 
-GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
+GType      gtk_color_button_get_type       (void);
 GtkWidget *gtk_color_button_new            (void);
 GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
 void       gtk_color_button_set_color      (GtkColorButton *color_button,
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 4d71f19f60d..b5e0e2d74ce 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -79,7 +79,7 @@ struct _GtkColorSelectionClass
 
 /* ColorSelection */
 
-GType      gtk_color_selection_get_type                (void) G_GNUC_CONST;
+GType      gtk_color_selection_get_type                (void);
 GtkWidget *gtk_color_selection_new                     (void);
 gboolean   gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
 void       gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 9cc70b897f3..edb66760772 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -72,7 +72,7 @@ struct _GtkColorSelectionDialogClass
 
 
 /* ColorSelectionDialog */
-GType      gtk_color_selection_dialog_get_type            (void) G_GNUC_CONST;
+GType      gtk_color_selection_dialog_get_type            (void);
 GtkWidget* gtk_color_selection_dialog_new                 (const gchar *title);
 GtkWidget* gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel);
 
diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h
index c9c8b930c0f..1a158a2c40b 100644
--- a/gtk/gtkcombo.h
+++ b/gtk/gtkcombo.h
@@ -84,7 +84,7 @@ struct _GtkComboClass {
         void (*_gtk_reserved4) (void);
 };
 
-GType      gtk_combo_get_type              (void) G_GNUC_CONST;
+GType      gtk_combo_get_type              (void);
 
 GtkWidget* gtk_combo_new                   (void);
 /* the text in the entry must be or not be in the list */
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 56dd9e6dee5..55b6aa2dfd8 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -67,7 +67,7 @@ struct _GtkComboBoxClass
 
 
 /* construction */
-GType         gtk_combo_box_get_type                 (void) G_GNUC_CONST;
+GType         gtk_combo_box_get_type                 (void);
 GtkWidget    *gtk_combo_box_new                      (void);
 GtkWidget    *gtk_combo_box_new_with_entry           (void);
 GtkWidget    *gtk_combo_box_new_with_model           (GtkTreeModel *model);
diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h
index c4099445d47..00b589d580b 100644
--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@@ -62,7 +62,7 @@ struct _GtkComboBoxEntryClass
 };
 
 
-GType       gtk_combo_box_entry_get_type        (void) G_GNUC_CONST;
+GType       gtk_combo_box_entry_get_type        (void);
 GtkWidget  *gtk_combo_box_entry_new             (void);
 GtkWidget  *gtk_combo_box_entry_new_with_model  (GtkTreeModel     *model,
                                                  gint              text_column);
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index 4158a2b73b5..957e2669155 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -57,7 +57,7 @@ struct _GtkComboBoxTextClass
   void (*_gtk_reserved4) (void);
 };
 
-GType         gtk_combo_box_text_get_type        (void) G_GNUC_CONST;
+GType         gtk_combo_box_text_get_type        (void);
 GtkWidget*    gtk_combo_box_text_new             (void);
 GtkWidget*    gtk_combo_box_text_new_with_entry  (void);
 void          gtk_combo_box_text_append_text     (GtkComboBoxText     *combo_box,
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index ac169c249cc..59612465e9e 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -104,7 +104,7 @@ struct _GtkContainerClass
 
 /* Application-level methods */
 
-GType   gtk_container_get_type		 (void) G_GNUC_CONST;
+GType   gtk_container_get_type		 (void);
 void    gtk_container_set_border_width	 (GtkContainer	   *container,
 					  guint		    border_width);
 guint   gtk_container_get_border_width   (GtkContainer     *container);
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index a4aa83773bd..9c96d0d0aaa 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -172,7 +172,7 @@ struct _GtkCTreeNode {
  *           Creation, insertion, deletion                 *
  ***********************************************************/
 
-GType   gtk_ctree_get_type                       (void) G_GNUC_CONST;
+GType   gtk_ctree_get_type                       (void);
 GtkWidget * gtk_ctree_new_with_titles            (gint          columns, 
 						  gint          tree_column,
 						  gchar        *titles[]);
@@ -436,7 +436,7 @@ void gtk_ctree_sort_recursive                    (GtkCTree     *ctree,
  * no-op's for the copy and free routines.  It is defined in order to
  * provide type information for the signal arguments
  */
-GType   gtk_ctree_node_get_type                  (void) G_GNUC_CONST;
+GType   gtk_ctree_node_get_type                  (void);
 
 G_END_DECLS
 
diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h
index 68ee716edbe..29426dcd585 100644
--- a/gtk/gtkcurve.h
+++ b/gtk/gtkcurve.h
@@ -85,7 +85,7 @@ struct _GtkCurveClass
 };
 
 
-GType		gtk_curve_get_type	(void) G_GNUC_CONST;
+GType		gtk_curve_get_type	(void);
 GtkWidget*	gtk_curve_new		(void);
 void		gtk_curve_reset		(GtkCurve *curve);
 void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma_);
diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h
index 0ff3af165d2..f1c5aa7357f 100644
--- a/gtk/gtkcustompaperunixdialog.h
+++ b/gtk/gtkcustompaperunixdialog.h
@@ -57,7 +57,7 @@ struct _GtkCustomPaperUnixDialogClass
   void (*_gtk_reserved7) (void);
 };
 
-GType             gtk_custom_paper_unix_dialog_get_type           (void) G_GNUC_CONST;
+GType             gtk_custom_paper_unix_dialog_get_type           (void);
 GtkWidget *       _gtk_custom_paper_unix_dialog_new                (GtkWindow   *parent,
 								   const gchar *title);
 GtkUnit           _gtk_print_get_default_user_units                (void);
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 389c52473b7..74c43f8db0e 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -124,7 +124,7 @@ struct _GtkDialogClass
 };
 
 
-GType      gtk_dialog_get_type (void) G_GNUC_CONST;
+GType      gtk_dialog_get_type (void);
 GtkWidget* gtk_dialog_new      (void);
 
 GtkWidget* gtk_dialog_new_with_buttons (const gchar     *title,
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index e667c65df4e..6c5b2da9a62 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -67,7 +67,7 @@ struct _GtkDrawingAreaClass
 };
 
 
-GType      gtk_drawing_area_get_type   (void) G_GNUC_CONST;
+GType      gtk_drawing_area_get_type   (void);
 GtkWidget* gtk_drawing_area_new        (void);
 
 #ifndef GTK_DISABLE_DEPRECATED
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 1f5ed3f8e8d..e1ff68b1bce 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -84,7 +84,7 @@ struct _GtkEditableClass
   gint (* get_position)             (GtkEditable    *editable);
 };
 
-GType    gtk_editable_get_type             (void) G_GNUC_CONST;
+GType    gtk_editable_get_type             (void);
 void     gtk_editable_select_region        (GtkEditable *editable,
 					    gint         start_pos,
 					    gint         end_pos);
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index f771e1774b1..84ef0a7a368 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -163,7 +163,7 @@ struct _GtkEntryClass
   void (*_gtk_reserved2)      (void);
 };
 
-GType      gtk_entry_get_type       		(void) G_GNUC_CONST;
+GType      gtk_entry_get_type       		(void);
 GtkWidget* gtk_entry_new            		(void);
 GtkWidget* gtk_entry_new_with_buffer            (GtkEntryBuffer *buffer);
 
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 5f78b801813..c28c706f71b 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -90,7 +90,7 @@ struct _GtkEntryBufferClass
   void (*_gtk_reserved5) (void);
 };
 
-GType                     gtk_entry_buffer_get_type               (void) G_GNUC_CONST;
+GType                     gtk_entry_buffer_get_type               (void);
 
 GtkEntryBuffer*           gtk_entry_buffer_new                    (const gchar     *initial_chars,
                                                                    gint             n_initial_chars);
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 7a99f787cb6..efd3fd985cf 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -77,7 +77,7 @@ struct _GtkEntryCompletionClass
 };
 
 /* core */
-GType               gtk_entry_completion_get_type               (void) G_GNUC_CONST;
+GType               gtk_entry_completion_get_type               (void);
 GtkEntryCompletion *gtk_entry_completion_new                    (void);
 
 GtkWidget          *gtk_entry_completion_get_entry              (GtkEntryCompletion          *completion);
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 15675cb37f4..46c220d3f66 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -57,7 +57,7 @@ struct _GtkEventBoxClass
   GtkBinClass parent_class;
 };
 
-GType	   gtk_event_box_get_type           (void) G_GNUC_CONST;
+GType	   gtk_event_box_get_type           (void);
 GtkWidget* gtk_event_box_new                (void);
 gboolean   gtk_event_box_get_visible_window (GtkEventBox *event_box);
 void       gtk_event_box_set_visible_window (GtkEventBox *event_box,
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 0cfa0e12aaa..257c0d6f605 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -60,7 +60,7 @@ struct _GtkExpanderClass
   void        (* activate) (GtkExpander *expander);
 };
 
-GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
+GType                 gtk_expander_get_type          (void);
 
 GtkWidget            *gtk_expander_new               (const gchar *label);
 GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index aa27be43577..74cb9d3f1af 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -85,7 +85,7 @@ typedef enum
   GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
 } GtkFileChooserConfirmation;
 
-GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
+GType gtk_file_chooser_get_type (void);
 
 /* GError enumeration for GtkFileChooser */
 /**
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index fdacc4b6ecb..5de7d9546d4 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -66,7 +66,7 @@ struct _GtkFileChooserButtonClass
 };
 
 
-GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CONST;
+GType                 gtk_file_chooser_button_get_type         (void);
 GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
 								GtkFileChooserAction  action);
 
diff --git a/gtk/gtkfilechooserdefault.h b/gtk/gtkfilechooserdefault.h
index e6eabefefc5..c7602d7ed9a 100644
--- a/gtk/gtkfilechooserdefault.h
+++ b/gtk/gtkfilechooserdefault.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkFileChooserDefault      GtkFileChooserDefault;
 
-GType      _gtk_file_chooser_default_get_type (void) G_GNUC_CONST;
+GType      _gtk_file_chooser_default_get_type (void);
 GtkWidget *_gtk_file_chooser_default_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 78c02d2a40c..0d861309d30 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -53,7 +53,7 @@ struct _GtkFileChooserDialogClass
   GtkDialogClass parent_class;
 };
 
-GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
+GType      gtk_file_chooser_dialog_get_type         (void);
 GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
 						     GtkWindow            *parent,
 						     GtkFileChooserAction  action,
diff --git a/gtk/gtkfilechooserembed.h b/gtk/gtkfilechooserembed.h
index 65888981e24..49061f57f7f 100644
--- a/gtk/gtkfilechooserembed.h
+++ b/gtk/gtkfilechooserembed.h
@@ -53,7 +53,7 @@ struct _GtkFileChooserEmbedIface
   void (*response_requested)      (GtkFileChooserEmbed *chooser_embed);
 };
 
-GType _gtk_file_chooser_embed_get_type (void) G_GNUC_CONST;
+GType _gtk_file_chooser_embed_get_type (void);
 
 void  _gtk_file_chooser_embed_get_default_size    (GtkFileChooserEmbed *chooser_embed,
 						   gint                *default_width,
diff --git a/gtk/gtkfilechooserentry.h b/gtk/gtkfilechooserentry.h
index 216b8ae7247..e46ea89e19f 100644
--- a/gtk/gtkfilechooserentry.h
+++ b/gtk/gtkfilechooserentry.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkFileChooserEntry      GtkFileChooserEntry;
 
-GType              _gtk_file_chooser_entry_get_type           (void) G_GNUC_CONST;
+GType              _gtk_file_chooser_entry_get_type           (void);
 GtkWidget *        _gtk_file_chooser_entry_new                (gboolean             eat_tab);
 void               _gtk_file_chooser_entry_set_action         (GtkFileChooserEntry *chooser_entry,
 							       GtkFileChooserAction action);
diff --git a/gtk/gtkfilechoosersettings.h b/gtk/gtkfilechoosersettings.h
index 2283192c018..dd002cb6da7 100644
--- a/gtk/gtkfilechoosersettings.h
+++ b/gtk/gtkfilechoosersettings.h
@@ -65,7 +65,7 @@ struct _GtkFileChooserSettingsClass
   GObjectClass parent_class;
 };
 
-GType _gtk_file_chooser_settings_get_type (void) G_GNUC_CONST;
+GType _gtk_file_chooser_settings_get_type (void);
 
 GtkFileChooserSettings *_gtk_file_chooser_settings_new (void);
 
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 4d3fa3bcbc4..2e8cf3ef288 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -53,7 +53,7 @@ struct _GtkFileChooserWidgetClass
   GtkVBoxClass parent_class;
 };
 
-GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;
+GType      gtk_file_chooser_widget_get_type         (void);
 GtkWidget *gtk_file_chooser_widget_new              (GtkFileChooserAction  action);
 
 
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index 491143d4b99..696c7b510e5 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -56,7 +56,7 @@ struct _GtkFileFilterInfo
   const gchar *mime_type;
 };
 
-GType gtk_file_filter_get_type (void) G_GNUC_CONST;
+GType gtk_file_filter_get_type (void);
 
 GtkFileFilter *       gtk_file_filter_new      (void);
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,
diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index af3aa8ee99d..958330296d6 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -99,7 +99,7 @@ struct _GtkFileSelectionClass
 #define gtk_file_selection_get_selections gtk_file_selection_get_selections_utf8
 #endif
 
-GType      gtk_file_selection_get_type            (void) G_GNUC_CONST;
+GType      gtk_file_selection_get_type            (void);
 GtkWidget* gtk_file_selection_new                 (const gchar      *title);
 void       gtk_file_selection_set_filename        (GtkFileSelection *filesel,
 						   const gchar      *filename);
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index 7fc539ec189..cfefe888f65 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -93,7 +93,7 @@ typedef void (* GtkFileSystemVolumeMountCallback)  (GCancellable        *cancell
 						    gpointer             data);
 
 /* GtkFileSystem methods */
-GType           _gtk_file_system_get_type     (void) G_GNUC_CONST;
+GType           _gtk_file_system_get_type     (void);
 
 GtkFileSystem * _gtk_file_system_new          (void);
 
diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
index 46743f124fb..69db42c1952 100644
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkFileSystemModel      GtkFileSystemModel;
 
-GType _gtk_file_system_model_get_type (void) G_GNUC_CONST;
+GType _gtk_file_system_model_get_type (void);
 
 typedef gboolean (*GtkFileSystemModelGetValue)   (GtkFileSystemModel *model,
                                                   GFile              *file,
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 14aad5d0268..8297e4fab4d 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -69,7 +69,7 @@ struct _GtkFixedChild
 };
 
 
-GType      gtk_fixed_get_type          (void) G_GNUC_CONST;
+GType      gtk_fixed_get_type          (void);
 GtkWidget* gtk_fixed_new               (void);
 void       gtk_fixed_put               (GtkFixed       *fixed,
                                         GtkWidget      *widget,
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index e5d97431f48..7e273c8b52d 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -71,7 +71,7 @@ struct _GtkFontButtonClass {
 };
 
 
-GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
+GType                 gtk_font_button_get_type       (void);
 GtkWidget            *gtk_font_button_new            (void);
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 5aa86483bb8..076541b3176 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -142,7 +142,7 @@ struct _GtkFontSelectionDialogClass
  *   see the comments in the GtkFontSelectionDialog functions.
  *****************************************************************************/
 
-GType	     gtk_font_selection_get_type	  (void) G_GNUC_CONST;
+GType	     gtk_font_selection_get_type	  (void);
 GtkWidget *  gtk_font_selection_new               (void);
 GtkWidget *  gtk_font_selection_get_family_list   (GtkFontSelection *fontsel);
 GtkWidget *  gtk_font_selection_get_face_list     (GtkFontSelection *fontsel);
@@ -172,7 +172,7 @@ void         gtk_font_selection_set_preview_text  (GtkFontSelection *fontsel,
  *   GtkFontSelection.
  *****************************************************************************/
 
-GType	   gtk_font_selection_dialog_get_type	       (void) G_GNUC_CONST;
+GType	   gtk_font_selection_dialog_get_type	       (void);
 GtkWidget *gtk_font_selection_dialog_new	       (const gchar            *title);
 
 GtkWidget *gtk_font_selection_dialog_get_ok_button     (GtkFontSelectionDialog *fsd);
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 7164f673643..5e76e8d7329 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -69,7 +69,7 @@ struct _GtkFrameClass
 };
 
 
-GType      gtk_frame_get_type         (void) G_GNUC_CONST;
+GType      gtk_frame_get_type         (void);
 GtkWidget* gtk_frame_new              (const gchar   *label);
 
 void                  gtk_frame_set_label (GtkFrame    *frame,
diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h
index 0173f960ac1..90e181e1e4e 100644
--- a/gtk/gtkgamma.h
+++ b/gtk/gtkgamma.h
@@ -71,7 +71,7 @@ struct _GtkGammaCurveClass
 };
 
 
-GType      gtk_gamma_curve_get_type (void) G_GNUC_CONST;
+GType      gtk_gamma_curve_get_type (void);
 GtkWidget* gtk_gamma_curve_new      (void);
 
 
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 2dd96b286d1..fcd416afda1 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -94,7 +94,7 @@ struct _GtkHandleBoxClass
 };
 
 
-GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
+GType         gtk_handle_box_get_type             (void);
 GtkWidget*    gtk_handle_box_new                  (void);
 void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
                                                    GtkShadowType    type);
diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index bbd05bcac5d..5bc651f9405 100644
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -59,7 +59,7 @@ struct _GtkHButtonBoxClass
 };
 
 
-GType      gtk_hbutton_box_get_type (void) G_GNUC_CONST;
+GType      gtk_hbutton_box_get_type (void);
 GtkWidget* gtk_hbutton_box_new      (void);
 
 /* buttons can be added by gtk_container_add() */
diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index e547aa3592e..9a026dec3e2 100644
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -59,7 +59,7 @@ struct _GtkHBoxClass
 };
 
 
-GType       gtk_hbox_get_type (void) G_GNUC_CONST;
+GType       gtk_hbox_get_type (void);
 GtkWidget * gtk_hbox_new      (gboolean homogeneous,
                                gint     spacing);
 
diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h
index 2f10427b214..38e5edb417f 100644
--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@@ -57,7 +57,7 @@ struct _GtkHPanedClass
 };
 
 
-GType       gtk_hpaned_get_type (void) G_GNUC_CONST;
+GType       gtk_hpaned_get_type (void);
 GtkWidget * gtk_hpaned_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index c0e2118b768..9fae3c559f5 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -72,7 +72,7 @@ struct _GtkHRulerClass
 };
 
 
-GType      gtk_hruler_get_type (void) G_GNUC_CONST;
+GType      gtk_hruler_get_type (void);
 GtkWidget* gtk_hruler_new      (void);
 
 
diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index a90fd45176d..7c8e4b712d1 100644
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -59,7 +59,7 @@ struct _GtkHScaleClass
 };
 
 
-GType      gtk_hscale_get_type       (void) G_GNUC_CONST;
+GType      gtk_hscale_get_type       (void);
 GtkWidget* gtk_hscale_new            (GtkAdjustment *adjustment);
 GtkWidget* gtk_hscale_new_with_range (gdouble        min,
                                       gdouble        max,
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index e12941ad5ba..373f1b01e44 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -60,7 +60,7 @@ struct _GtkHScrollbarClass
 };
 
 
-GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
+GType      gtk_hscrollbar_get_type (void);
 GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
 
 
diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 464f6bcd101..82951c99990 100644
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -59,7 +59,7 @@ struct _GtkHSeparatorClass
 };
 
 
-GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
+GType      gtk_hseparator_get_type (void);
 GtkWidget* gtk_hseparator_new      (void);
 
 
diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index c352b9922c0..ad035fafc02 100644
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -78,7 +78,7 @@ struct _GtkHSVClass
 };
 
 
-GType      gtk_hsv_get_type     (void) G_GNUC_CONST;
+GType      gtk_hsv_get_type     (void);
 GtkWidget* gtk_hsv_new          (void);
 void       gtk_hsv_set_color    (GtkHSV    *hsv,
 				 double     h,
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index ea97123bd85..a6fd73298b8 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -71,7 +71,7 @@ struct _GtkIconFactoryClass
 #define gtk_icon_source_get_filename gtk_icon_source_get_filename_utf8
 #endif
 
-GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
+GType           gtk_icon_factory_get_type (void);
 GtkIconFactory* gtk_icon_factory_new      (void);
 void            gtk_icon_factory_add      (GtkIconFactory *factory,
                                            const gchar    *stock_id,
@@ -116,7 +116,7 @@ const gchar *         gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
-GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
+GType       gtk_icon_set_get_type        (void);
 GtkIconSet* gtk_icon_set_new             (void);
 GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
 
@@ -143,7 +143,7 @@ void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
                                           GtkIconSize        **sizes,
                                           gint                *n_sizes);
 
-GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
+GType          gtk_icon_source_get_type                 (void);
 GtkIconSource* gtk_icon_source_new                      (void);
 GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
 void           gtk_icon_source_free                     (GtkIconSource       *source);
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 3611c7401fc..da1ac08b05e 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -111,7 +111,7 @@ GQuark gtk_icon_theme_error_quark (void);
 #define gtk_icon_info_get_filename gtk_icon_info_get_filename_utf8
 #endif
 
-GType         gtk_icon_theme_get_type              (void) G_GNUC_CONST;
+GType         gtk_icon_theme_get_type              (void);
 
 GtkIconTheme *gtk_icon_theme_new                   (void);
 GtkIconTheme *gtk_icon_theme_get_default           (void);
@@ -167,7 +167,7 @@ void          gtk_icon_theme_add_builtin_icon      (const gchar *icon_name,
 					            gint         size,
 					            GdkPixbuf   *pixbuf);
 
-GType                 gtk_icon_info_get_type           (void) G_GNUC_CONST;
+GType                 gtk_icon_info_get_type           (void);
 GtkIconInfo *         gtk_icon_info_copy               (GtkIconInfo  *icon_info);
 void                  gtk_icon_info_free               (GtkIconInfo  *icon_info);
 
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index e19401c4ba6..1f7be4e5646 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -87,7 +87,7 @@ struct _GtkIconViewClass
   gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
 };
 
-GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;
+GType          gtk_icon_view_get_type          (void);
 GtkWidget *    gtk_icon_view_new               (void);
 GtkWidget *    gtk_icon_view_new_with_model    (GtkTreeModel   *model);
 
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index e40ed710022..6d8a10ca230 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -187,7 +187,7 @@ struct _GtkImageClass
 #define gtk_image_set_from_file gtk_image_set_from_file_utf8
 #endif
 
-GType      gtk_image_get_type (void) G_GNUC_CONST;
+GType      gtk_image_get_type (void);
 
 GtkWidget* gtk_image_new                (void);
 GtkWidget* gtk_image_new_from_pixmap    (GdkPixmap       *pixmap,
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 7aef6181efa..605ab1b14b8 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -63,7 +63,7 @@ struct _GtkImageMenuItemClass
 };
 
 
-GType	   gtk_image_menu_item_get_type          (void) G_GNUC_CONST;
+GType	   gtk_image_menu_item_get_type          (void);
 GtkWidget* gtk_image_menu_item_new               (void);
 GtkWidget* gtk_image_menu_item_new_with_label    (const gchar      *label);
 GtkWidget* gtk_image_menu_item_new_with_mnemonic (const gchar      *label);
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index 4ee0a1456c3..23dfde993b4 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -99,7 +99,7 @@ struct _GtkIMContextClass
   void (*_gtk_reserved6) (void);
 };
 
-GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
+GType    gtk_im_context_get_type            (void);
 
 void     gtk_im_context_set_client_window   (GtkIMContext       *context,
 					     GdkWindow          *window);
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index a8db87646f3..07fddb8bb03 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -62,7 +62,7 @@ struct _GtkIMContextSimpleClass
   GtkIMContextClass parent_class;
 };
 
-GType         gtk_im_context_simple_get_type  (void) G_GNUC_CONST;
+GType         gtk_im_context_simple_get_type  (void);
 GtkIMContext *gtk_im_context_simple_new       (void);
 
 void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index e24f6ce80e3..a52abaf3d50 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -63,7 +63,7 @@ struct _GtkIMMulticontextClass
   void (*_gtk_reserved4) (void);
 };
 
-GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
+GType         gtk_im_multicontext_get_type (void);
 GtkIMContext *gtk_im_multicontext_new      (void);
 
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index becbc333727..edb95eba5e6 100644
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -84,7 +84,7 @@ struct _GtkInfoBarClass
   void (*_gtk_reserved6) (void);
 };
 
-GType          gtk_info_bar_get_type               (void) G_GNUC_CONST;
+GType          gtk_info_bar_get_type               (void);
 GtkWidget     *gtk_info_bar_new                    (void);
 
 GtkWidget     *gtk_info_bar_new_with_buttons       (const gchar    *first_button_text,
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index 6e95356beab..dbb579a402e 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -90,7 +90,7 @@ struct _GtkInputDialogClass
   void (*_gtk_reserved4) (void);
 };
 
-GType      gtk_input_dialog_get_type     (void) G_GNUC_CONST;
+GType      gtk_input_dialog_get_type     (void);
 GtkWidget* gtk_input_dialog_new          (void);
 
 G_END_DECLS
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 6cc193d60de..2549a449301 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -65,7 +65,7 @@ struct _GtkInvisibleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType gtk_invisible_get_type (void) G_GNUC_CONST;
+GType gtk_invisible_get_type (void);
 
 GtkWidget* gtk_invisible_new            (void);
 GtkWidget* gtk_invisible_new_for_screen (GdkScreen    *screen);
diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 486aa1f26ce..0bdb04bc952 100644
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -69,7 +69,7 @@ struct _GtkItemClass
 };
 
 
-GType gtk_item_get_type (void) G_GNUC_CONST;
+GType gtk_item_get_type (void);
 #if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
 void  gtk_item_select   (GtkItem *item);
 void  gtk_item_deselect (GtkItem *item);
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index d67d6cf8ab2..d26cc48f979 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -129,7 +129,7 @@ struct _GtkItemFactoryItem
 };
 
 
-GType		gtk_item_factory_get_type	    (void) G_GNUC_CONST;
+GType		gtk_item_factory_get_type	    (void);
 
 /* `container_type' must be of GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
  * or GTK_TYPE_OPTION_MENU.
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 015108e632d..30fe67609f8 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -106,7 +106,7 @@ struct _GtkLabelClass
   void (*_gtk_reserved3) (void);
 };
 
-GType                 gtk_label_get_type          (void) G_GNUC_CONST;
+GType                 gtk_label_get_type          (void);
 GtkWidget*            gtk_label_new               (const gchar   *str);
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
 void                  gtk_label_set_text          (GtkLabel      *label,
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index c1e404bb1d5..9c24d3ede23 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -91,7 +91,7 @@ struct _GtkLayoutClass
   void (*_gtk_reserved4) (void);
 };
 
-GType          gtk_layout_get_type        (void) G_GNUC_CONST;
+GType          gtk_layout_get_type        (void);
 GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
 				           GtkAdjustment *vadjustment);
 GdkWindow*     gtk_layout_get_bin_window  (GtkLayout     *layout);
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 9a2e7a5c68d..dac56283c13 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -65,7 +65,7 @@ struct _GtkLinkButtonClass
   void (*_gtk_padding4) (void);
 };
 
-GType                 gtk_link_button_get_type          (void) G_GNUC_CONST;
+GType                 gtk_link_button_get_type          (void);
 
 GtkWidget *           gtk_link_button_new               (const gchar   *uri);
 GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
diff --git a/gtk/gtklist.h b/gtk/gtklist.h
index 3a2f13f13b1..03215109912 100644
--- a/gtk/gtklist.h
+++ b/gtk/gtklist.h
@@ -81,7 +81,7 @@ struct _GtkListClass
 };
 
 
-GType      gtk_list_get_type		  (void) G_GNUC_CONST;
+GType      gtk_list_get_type		  (void);
 GtkWidget* gtk_list_new			  (void);
 void	   gtk_list_insert_items	  (GtkList	    *list,
 					   GList	    *items,
diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 9f83a48722b..1c1b08e14e6 100644
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -75,7 +75,7 @@ struct _GtkListItemClass
 };
 
 
-GType      gtk_list_item_get_type       (void) G_GNUC_CONST;
+GType      gtk_list_item_get_type       (void);
 GtkWidget* gtk_list_item_new            (void);
 GtkWidget* gtk_list_item_new_with_label (const gchar      *label);
 void       gtk_list_item_select         (GtkListItem      *list_item);
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 89514016b84..2d5247ab81e 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -74,7 +74,7 @@ struct _GtkListStoreClass
 };
 
 
-GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
+GType         gtk_list_store_get_type         (void);
 GtkListStore *gtk_list_store_new              (gint          n_columns,
 					       ...);
 GtkListStore *gtk_list_store_newv             (gint          n_columns,
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 60174e154e8..6f7afe78120 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -122,7 +122,7 @@ struct _GtkMenuClass
 };
 
 
-GType	   gtk_menu_get_type		  (void) G_GNUC_CONST;
+GType	   gtk_menu_get_type		  (void);
 GtkWidget* gtk_menu_new			  (void);
 
 /* Display the menu onscreen */
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 95479010a6e..11a759cc219 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -65,7 +65,7 @@ struct _GtkMenuBarClass
 };
 
 
-GType      gtk_menu_bar_get_type        (void) G_GNUC_CONST;
+GType      gtk_menu_bar_get_type        (void);
 GtkWidget* gtk_menu_bar_new             (void);
 
 GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar       *menubar);
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 5de985d19f9..529d27ed952 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -96,7 +96,7 @@ struct _GtkMenuItemClass
 };
 
 
-GType	   gtk_menu_item_get_type	      (void) G_GNUC_CONST;
+GType	   gtk_menu_item_get_type	      (void);
 GtkWidget* gtk_menu_item_new                  (void);
 GtkWidget* gtk_menu_item_new_with_label       (const gchar         *label);
 GtkWidget* gtk_menu_item_new_with_mnemonic    (const gchar         *label);
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index 2d90c3388f7..2624a3ca2ca 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -97,7 +97,7 @@ struct _GtkMenuShellClass
 };
 
 
-GType gtk_menu_shell_get_type          (void) G_GNUC_CONST;
+GType gtk_menu_shell_get_type          (void);
 void  gtk_menu_shell_append            (GtkMenuShell *menu_shell,
 					GtkWidget    *child);
 void  gtk_menu_shell_prepend           (GtkMenuShell *menu_shell,
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 43ff8452549..e83fb73ab3e 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -63,7 +63,7 @@ struct _GtkMenuToolButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
+GType         gtk_menu_tool_button_get_type       (void);
 GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
                                                    const gchar *label);
 GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index b65078c2476..c2690139b0c 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -96,7 +96,7 @@ typedef enum
   GTK_BUTTONS_OK_CANCEL
 } GtkButtonsType;
 
-GType      gtk_message_dialog_get_type (void) G_GNUC_CONST;
+GType      gtk_message_dialog_get_type (void);
 
 GtkWidget* gtk_message_dialog_new      (GtkWindow      *parent,
                                         GtkDialogFlags  flags,
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 4246f5388fe..6fa565413b0 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -65,7 +65,7 @@ struct _GtkMiscClass
 };
 
 
-GType   gtk_misc_get_type      (void) G_GNUC_CONST;
+GType   gtk_misc_get_type      (void);
 void	gtk_misc_set_alignment (GtkMisc *misc,
 				gfloat	 xalign,
 				gfloat	 yalign);
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 6373e680b5f..34a0e630aa5 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -148,7 +148,7 @@ typedef GtkNotebook* (*GtkNotebookWindowCreationFunc) (GtkNotebook *source,
  *           Creation, insertion, deletion                 *
  ***********************************************************/
 
-GType   gtk_notebook_get_type       (void) G_GNUC_CONST;
+GType   gtk_notebook_get_type       (void);
 GtkWidget * gtk_notebook_new        (void);
 gint gtk_notebook_append_page       (GtkNotebook *notebook,
 				     GtkWidget   *child,
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 97f1efaa525..dbddd20c36d 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -143,7 +143,7 @@ struct _GtkObjectClass
 
 /* Application-level methods */
 
-GType gtk_object_get_type (void) G_GNUC_CONST;
+GType gtk_object_get_type (void);
 
 #ifndef GTK_DISABLE_DEPRECATED
 void gtk_object_sink	  (GtkObject *object);
diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h
index cb1c56e4df3..3cab8fd4a6e 100644
--- a/gtk/gtkoffscreenwindow.h
+++ b/gtk/gtkoffscreenwindow.h
@@ -49,7 +49,7 @@ struct _GtkOffscreenWindowClass
   GtkWindowClass parent_class;
 };
 
-GType      gtk_offscreen_window_get_type   (void) G_GNUC_CONST;
+GType      gtk_offscreen_window_get_type   (void);
 
 GtkWidget *gtk_offscreen_window_new        (void);
 GdkPixmap *gtk_offscreen_window_get_pixmap (GtkOffscreenWindow *offscreen);
diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h
index ba497cd1cc5..eec6bfd50cc 100644
--- a/gtk/gtkoldeditable.h
+++ b/gtk/gtkoldeditable.h
@@ -113,7 +113,7 @@ struct _GtkOldEditableClass
 			 gint             position);
 };
 
-GType      gtk_old_editable_get_type        (void) G_GNUC_CONST;
+GType      gtk_old_editable_get_type        (void);
 void       gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
 					     gboolean        claim,
 					     guint32         time_);
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
index 8521020edd6..48228cd6c74 100644
--- a/gtk/gtkoptionmenu.h
+++ b/gtk/gtkoptionmenu.h
@@ -70,7 +70,7 @@ struct _GtkOptionMenuClass
 };
 
 
-GType      gtk_option_menu_get_type    (void) G_GNUC_CONST;
+GType      gtk_option_menu_get_type    (void);
 GtkWidget* gtk_option_menu_new         (void);
 GtkWidget* gtk_option_menu_get_menu    (GtkOptionMenu *option_menu);
 void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index f9014e72cbd..41aa8ff7219 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -49,7 +49,7 @@ struct _GtkOrientableIface
 };
 
 
-GType          gtk_orientable_get_type        (void) G_GNUC_CONST;
+GType          gtk_orientable_get_type        (void);
 
 void           gtk_orientable_set_orientation (GtkOrientable  *orientable,
                                                GtkOrientation  orientation);
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 34e2e256c01..c1fb5028e08 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -37,7 +37,7 @@ typedef struct _GtkPageSetup GtkPageSetup;
 #define GTK_PAGE_SETUP(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PAGE_SETUP, GtkPageSetup))
 #define GTK_IS_PAGE_SETUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PAGE_SETUP))
 
-GType              gtk_page_setup_get_type          (void) G_GNUC_CONST;
+GType              gtk_page_setup_get_type          (void);
 GtkPageSetup *     gtk_page_setup_new               (void);
 GtkPageSetup *     gtk_page_setup_copy              (GtkPageSetup       *other);
 GtkPageOrientation gtk_page_setup_get_orientation   (GtkPageSetup       *setup);
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 4d889fe56e2..f77e4ccf1ad 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -61,7 +61,7 @@ struct _GtkPageSetupUnixDialogClass
   void (*_gtk_reserved7) (void);
 };
 
-GType 		  gtk_page_setup_unix_dialog_get_type	        (void) G_GNUC_CONST;
+GType 		  gtk_page_setup_unix_dialog_get_type	        (void);
 GtkWidget *       gtk_page_setup_unix_dialog_new                (const gchar            *title,
 								 GtkWindow              *parent);
 void              gtk_page_setup_unix_dialog_set_page_setup     (GtkPageSetupUnixDialog *dialog,
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 7d361efa69d..eb13f7b37f8 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -106,7 +106,7 @@ struct _GtkPanedClass
 };
 
 
-GType       gtk_paned_get_type     (void) G_GNUC_CONST;
+GType       gtk_paned_get_type     (void);
 void        gtk_paned_add1         (GtkPaned       *paned,
                                     GtkWidget      *child);
 void        gtk_paned_add2         (GtkPaned       *paned,
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 9be6ed1b015..591c0ac84db 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -44,7 +44,7 @@ typedef struct _GtkPaperSize GtkPaperSize;
 #define GTK_PAPER_NAME_EXECUTIVE "na_executive"
 #define GTK_PAPER_NAME_LEGAL "na_legal"
 
-GType gtk_paper_size_get_type (void) G_GNUC_CONST;
+GType gtk_paper_size_get_type (void);
 
 GtkPaperSize *gtk_paper_size_new          (const gchar  *name);
 GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar  *ppd_name,
diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
index 2006411a0a5..4058794dc7c 100644
--- a/gtk/gtkpathbar.h
+++ b/gtk/gtkpathbar.h
@@ -81,7 +81,7 @@ struct _GtkPathBarClass
 			 gboolean     child_is_hidden);
 };
 
-GType    gtk_path_bar_get_type (void) G_GNUC_CONST;
+GType    gtk_path_bar_get_type (void);
 void     _gtk_path_bar_set_file_system (GtkPathBar         *path_bar,
 					GtkFileSystem      *file_system);
 gboolean _gtk_path_bar_set_file        (GtkPathBar         *path_bar,
diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h
index 21fa349938f..4002033b71d 100644
--- a/gtk/gtkpixmap.h
+++ b/gtk/gtkpixmap.h
@@ -62,7 +62,7 @@ struct _GtkPixmapClass
 };
 
 
-GType	   gtk_pixmap_get_type	 (void) G_GNUC_CONST;
+GType	   gtk_pixmap_get_type	 (void);
 GtkWidget* gtk_pixmap_new	 (GdkPixmap  *pixmap,
 				  GdkBitmap  *mask);
 void	   gtk_pixmap_set	 (GtkPixmap  *pixmap,
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 69f90ba75ff..d9ff02c1b4b 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -75,7 +75,7 @@ struct _GtkPlugClass
 };
 
 
-GType      gtk_plug_get_type  (void) G_GNUC_CONST;
+GType      gtk_plug_get_type  (void);
 
 #ifndef GDK_MULTIHEAD_SAFE
 void       gtk_plug_construct (GtkPlug         *plug,
diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index 5e87c94aa31..c4098023df7 100644
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -86,7 +86,7 @@ struct _GtkPreviewClass
 };
 
 
-GType           gtk_preview_get_type           (void) G_GNUC_CONST;
+GType           gtk_preview_get_type           (void);
 void            gtk_preview_uninit             (void);
 GtkWidget*      gtk_preview_new                (GtkPreviewType   type);
 void            gtk_preview_size               (GtkPreview      *preview,
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index bdf5b699734..58002eb7a04 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -139,7 +139,7 @@ struct _GtkPrintBackendClass
   void (*_gtk_reserved4) (void);
 };
 
-GType   gtk_print_backend_get_type       (void) G_GNUC_CONST;
+GType   gtk_print_backend_get_type       (void);
 
 GList      *gtk_print_backend_get_printer_list     (GtkPrintBackend         *print_backend);
 gboolean    gtk_print_backend_printer_list_is_done (GtkPrintBackend         *print_backend);
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 7501d05e130..dfc4b40ab3c 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -38,7 +38,7 @@ typedef struct _GtkPrintContext GtkPrintContext;
 #define GTK_PRINT_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_CONTEXT, GtkPrintContext))
 #define GTK_IS_PRINT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_CONTEXT))
 
-GType          gtk_print_context_get_type (void) G_GNUC_CONST;
+GType          gtk_print_context_get_type (void);
 
 
 /* Rendering */
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 0ef09f82d55..f292c17adce 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -48,7 +48,7 @@ typedef enum
   GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT = 1 << 9
 } GtkPrintCapabilities;
 
-GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
+GType gtk_print_capabilities_get_type (void);
 
 #define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
 #define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
@@ -88,7 +88,7 @@ struct _GtkPrinterClass
   void (*_gtk_reserved7) (void);
 };
 
-GType                    gtk_printer_get_type              (void) G_GNUC_CONST;
+GType                    gtk_printer_get_type              (void);
 GtkPrinter              *gtk_printer_new                   (const gchar     *name,
 							    GtkPrintBackend *backend,
 							    gboolean         virtual_);
diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h
index f1831a31c2e..059307b3c11 100644
--- a/gtk/gtkprinteroption.h
+++ b/gtk/gtkprinteroption.h
@@ -92,7 +92,7 @@ struct _GtkPrinterOptionClass
   void (*_gtk_reserved7) (void);
 };
 
-GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;
+GType   gtk_printer_option_get_type       (void);
 
 GtkPrinterOption *gtk_printer_option_new                    (const char           *name,
 							     const char           *display_text,
diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionset.h
index 1a2cfca8ec8..dc3345a883a 100644
--- a/gtk/gtkprinteroptionset.h
+++ b/gtk/gtkprinteroptionset.h
@@ -71,7 +71,7 @@ typedef void (*GtkPrinterOptionSetFunc) (GtkPrinterOption  *option,
 					 gpointer           user_data);
 
 
-GType   gtk_printer_option_set_get_type       (void) G_GNUC_CONST;
+GType   gtk_printer_option_set_get_type       (void);
 
 GtkPrinterOptionSet *gtk_printer_option_set_new              (void);
 void                 gtk_printer_option_set_add              (GtkPrinterOptionSet     *set,
diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidget.h
index 3e08b00dc9e..31dc3308348 100644
--- a/gtk/gtkprinteroptionwidget.h
+++ b/gtk/gtkprinteroptionwidget.h
@@ -50,7 +50,7 @@ struct _GtkPrinterOptionWidgetClass
   void (*changed) (GtkPrinterOptionWidget *widget);
 };
 
-GType	     gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;
+GType	     gtk_printer_option_widget_get_type           (void);
 
 GtkWidget   *gtk_printer_option_widget_new                (GtkPrinterOption       *source);
 void         gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index e5505d7672a..d48eab3b925 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -86,7 +86,7 @@ struct _GtkPrintJobClass
   void (*_gtk_reserved7) (void);
 };
 
-GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;
+GType                    gtk_print_job_get_type               (void);
 GtkPrintJob             *gtk_print_job_new                    (const gchar              *title,
 							       GtkPrinter               *printer,
 							       GtkPrintSettings         *settings,
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 579335ee2ea..29dd3906a3f 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -138,7 +138,7 @@ typedef enum
 
 GQuark gtk_print_error_quark (void);
 
-GType                   gtk_print_operation_get_type               (void) G_GNUC_CONST;
+GType                   gtk_print_operation_get_type               (void);
 GtkPrintOperation *     gtk_print_operation_new                    (void);
 void                    gtk_print_operation_set_default_page_setup (GtkPrintOperation  *op,
 								    GtkPageSetup       *default_page_setup);
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index 32b2eadccea..61de3f7c7bc 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -67,7 +67,7 @@ struct _GtkPrintOperationPreviewIface
   void (*_gtk_reserved7) (void);
 };
 
-GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;
+GType   gtk_print_operation_preview_get_type       (void);
 
 void     gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
 						  gint                      page_nr);
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 89bdb2ae199..f2de68c04c0 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -46,7 +46,7 @@ struct _GtkPageRange
   gint end;
 };
 
-GType             gtk_print_settings_get_type                (void) G_GNUC_CONST;
+GType             gtk_print_settings_get_type                (void);
 GtkPrintSettings *gtk_print_settings_new                     (void);
 
 GtkPrintSettings *gtk_print_settings_copy                    (GtkPrintSettings     *other);
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index dcf6bbf8508..e38a585532d 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -64,7 +64,7 @@ struct _GtkPrintUnixDialogClass
   void (*_gtk_reserved7) (void);
 };
 
-GType                gtk_print_unix_dialog_get_type                (void) G_GNUC_CONST;
+GType                gtk_print_unix_dialog_get_type                (void);
 GtkWidget *          gtk_print_unix_dialog_new                     (const gchar *title,
                                                                     GtkWindow   *parent);
 
diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h
index b5f42e8518d..1f60db69a29 100644
--- a/gtk/gtkprogress.h
+++ b/gtk/gtkprogress.h
@@ -85,7 +85,7 @@ struct _GtkProgressClass
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PROGRESS_C__) || defined (__GTK_PROGRESS_BAR_C__)
 
-GType      gtk_progress_get_type            (void) G_GNUC_CONST;
+GType      gtk_progress_get_type            (void);
 void       gtk_progress_set_show_text       (GtkProgress   *progress,
 					     gboolean       show_text);
 void       gtk_progress_set_text_alignment  (GtkProgress   *progress,
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 0086aa3f6b8..c38e1df2933 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -95,7 +95,7 @@ struct _GtkProgressBarClass
 };
 
 
-GType      gtk_progress_bar_get_type             (void) G_GNUC_CONST;
+GType      gtk_progress_bar_get_type             (void);
 GtkWidget* gtk_progress_bar_new                  (void);
 
 /*
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 03b04a8adde..ffdbdbd69b6 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -72,7 +72,7 @@ struct _GtkRadioActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType           gtk_radio_action_get_type          (void) G_GNUC_CONST;
+GType           gtk_radio_action_get_type          (void);
 GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
                                                     const gchar           *label,
                                                     const gchar           *tooltip,
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 8f91d40f3e3..08c61a63b36 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -69,7 +69,7 @@ struct _GtkRadioButtonClass
 };
 
 
-GType	   gtk_radio_button_get_type	     (void) G_GNUC_CONST;
+GType	   gtk_radio_button_get_type	     (void);
 
 GtkWidget* gtk_radio_button_new                           (GSList         *group);
 GtkWidget* gtk_radio_button_new_from_widget               (GtkRadioButton *radio_group_member);
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index d08a97c932d..8df4bf02413 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -69,7 +69,7 @@ struct _GtkRadioMenuItemClass
 };
 
 
-GType      gtk_radio_menu_item_get_type	         (void) G_GNUC_CONST;
+GType      gtk_radio_menu_item_get_type	         (void);
 
 GtkWidget* gtk_radio_menu_item_new                           (GSList           *group);
 GtkWidget* gtk_radio_menu_item_new_with_label                (GSList           *group,
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 6ea4caba51a..22720ede92d 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -57,7 +57,7 @@ struct _GtkRadioToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_radio_tool_button_get_type       (void) G_GNUC_CONST;
+GType        gtk_radio_tool_button_get_type       (void);
 
 GtkToolItem *gtk_radio_tool_button_new                        (GSList             *group);
 GtkToolItem *gtk_radio_tool_button_new_from_stock             (GSList             *group,
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 5463140e8d6..86487823a7b 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -133,7 +133,7 @@ struct _GtkRangeClass
 };
 
 
-GType              gtk_range_get_type                      (void) G_GNUC_CONST;
+GType              gtk_range_get_type                      (void);
 
 #ifndef GTK_DISABLE_DEPRECATED
 void               gtk_range_set_update_policy             (GtkRange      *range,
diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index d1e19e9fa64..69c988f2cbe 100644
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -169,7 +169,7 @@ void	  gtk_rc_add_class_style	(GtkRcStyle   *rc_style,
 #endif /* GTK_DISABLE_DEPRECATED */
 
 
-GType       gtk_rc_style_get_type   (void) G_GNUC_CONST;
+GType       gtk_rc_style_get_type   (void);
 GtkRcStyle* gtk_rc_style_new        (void);
 GtkRcStyle* gtk_rc_style_copy       (GtkRcStyle *orig);
 
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index c180e7b3ed5..f9e9d166aab 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -55,7 +55,7 @@ struct _GtkRecentActionClass
   GtkActionClass parent_class;
 };
 
-GType      gtk_recent_action_get_type         (void) G_GNUC_CONST;
+GType      gtk_recent_action_get_type         (void);
 GtkAction *gtk_recent_action_new              (const gchar      *name,
                                                const gchar      *label,
                                                const gchar      *tooltip,
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 8df0cb2c0fa..2af67541151 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -115,7 +115,7 @@ struct _GtkRecentChooserIface
   void		    (* selection_changed)  (GtkRecentChooser  *chooser);
 };
 
-GType   gtk_recent_chooser_get_type    (void) G_GNUC_CONST;
+GType   gtk_recent_chooser_get_type    (void);
 
 /*
  * Configuration
diff --git a/gtk/gtkrecentchooserdefault.h b/gtk/gtkrecentchooserdefault.h
index 71dec2a457d..46ad00b6af0 100644
--- a/gtk/gtkrecentchooserdefault.h
+++ b/gtk/gtkrecentchooserdefault.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkRecentChooserDefault GtkRecentChooserDefault;
 
-GType      _gtk_recent_chooser_default_get_type (void) G_GNUC_CONST;
+GType      _gtk_recent_chooser_default_get_type (void);
 GtkWidget *_gtk_recent_chooser_default_new      (GtkRecentManager *recent_manager);
 
 
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index c48e6b10028..e81e3181e09 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -57,7 +57,7 @@ struct _GtkRecentChooserDialogClass
 };
 
 
-GType      gtk_recent_chooser_dialog_get_type        (void) G_GNUC_CONST;
+GType      gtk_recent_chooser_dialog_get_type        (void);
 
 GtkWidget *gtk_recent_chooser_dialog_new             (const gchar      *title,
 					              GtkWindow        *parent,
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index 9fb99cd9387..c630e276428 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -60,7 +60,7 @@ struct _GtkRecentChooserMenuClass
   void (* gtk_recent4) (void);
 };
 
-GType      gtk_recent_chooser_menu_get_type         (void) G_GNUC_CONST;
+GType      gtk_recent_chooser_menu_get_type         (void);
 
 GtkWidget *gtk_recent_chooser_menu_new              (void);
 GtkWidget *gtk_recent_chooser_menu_new_for_manager  (GtkRecentManager     *manager);
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index 557f134c0db..7c3f068e340 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -55,7 +55,7 @@ struct _GtkRecentChooserWidgetClass
   GtkVBoxClass parent_class;
 };
 
-GType      gtk_recent_chooser_widget_get_type        (void) G_GNUC_CONST;
+GType      gtk_recent_chooser_widget_get_type        (void);
 GtkWidget *gtk_recent_chooser_widget_new             (void);
 GtkWidget *gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager);
 
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 83cad90bc95..2afe445168e 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -61,7 +61,7 @@ struct _GtkRecentFilterInfo
   gint age;
 };
 
-GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
+GType                 gtk_recent_filter_get_type (void);
 
 GtkRecentFilter *     gtk_recent_filter_new      (void);
 void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 10dd2eebb00..1a4c759353f 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -135,7 +135,7 @@ typedef enum
 GQuark 	gtk_recent_manager_error_quark (void);
 
 
-GType 		  gtk_recent_manager_get_type       (void) G_GNUC_CONST;
+GType 		  gtk_recent_manager_get_type       (void);
 
 GtkRecentManager *gtk_recent_manager_new            (void);
 GtkRecentManager *gtk_recent_manager_get_default    (void);
@@ -171,7 +171,7 @@ gint              gtk_recent_manager_purge_items    (GtkRecentManager     *manag
 						     GError              **error);
 
 
-GType	              gtk_recent_info_get_type             (void) G_GNUC_CONST;
+GType	              gtk_recent_info_get_type             (void);
 
 GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
 void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index b2260524dd0..a2ae204e91a 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -111,7 +111,7 @@ struct _GtkRulerMetric
 };
 
 
-GType           gtk_ruler_get_type   (void) G_GNUC_CONST;
+GType           gtk_ruler_get_type   (void);
 void            gtk_ruler_set_metric (GtkRuler       *ruler,
                                       GtkMetricType   metric);
 GtkMetricType   gtk_ruler_get_metric (GtkRuler       *ruler);
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 01b70e0c90e..7c19cfd3a4e 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -76,7 +76,7 @@ struct _GtkScaleClass
   void (*_gtk_reserved3) (void);
 };
 
-GType             gtk_scale_get_type           (void) G_GNUC_CONST;
+GType             gtk_scale_get_type           (void);
 void              gtk_scale_set_digits         (GtkScale        *scale,
                                                 gint             digits);
 gint              gtk_scale_get_digits         (GtkScale        *scale);
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 29ab8a8758f..ede1865f7c3 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -81,7 +81,7 @@ struct _GtkScaleButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_scale_button_get_type         (void) G_GNUC_CONST;
+GType            gtk_scale_button_get_type         (void);
 GtkWidget *      gtk_scale_button_new              (GtkIconSize      size,
                                                     gdouble          min,
                                                     gdouble          max,
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 8ce77d3ba96..d3155818f93 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -65,7 +65,7 @@ struct _GtkScrollbarClass
 };
 
 
-GType       gtk_scrollbar_get_type (void) G_GNUC_CONST;
+GType       gtk_scrollbar_get_type (void);
 
 G_END_DECLS
 
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 5407547c1fe..9f51bfac739 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -99,7 +99,7 @@ struct _GtkScrolledWindowClass
 };
 
 
-GType          gtk_scrolled_window_get_type          (void) G_GNUC_CONST;
+GType          gtk_scrolled_window_get_type          (void);
 GtkWidget*     gtk_scrolled_window_new               (GtkAdjustment     *hadjustment,
 						      GtkAdjustment     *vadjustment);
 void           gtk_scrolled_window_set_hadjustment   (GtkScrolledWindow *scrolled_window,
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 012e7d4b4f6..7db23e75432 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -210,11 +210,11 @@ gboolean _gtk_selection_notify		  (GtkWidget         *widget,
 gboolean _gtk_selection_property_notify	  (GtkWidget         *widget,
 					   GdkEventProperty  *event);
 
-GType             gtk_selection_data_get_type (void) G_GNUC_CONST;
+GType             gtk_selection_data_get_type (void);
 GtkSelectionData *gtk_selection_data_copy     (GtkSelectionData *data);
 void		  gtk_selection_data_free     (GtkSelectionData *data);
 
-GType             gtk_target_list_get_type    (void) G_GNUC_CONST;
+GType             gtk_target_list_get_type    (void);
 
 G_END_DECLS
 
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 98441b6671b..eea41a039bc 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -59,7 +59,7 @@ struct _GtkSeparatorClass
 };
 
 
-GType       gtk_separator_get_type (void) G_GNUC_CONST;
+GType       gtk_separator_get_type (void);
 
 G_END_DECLS
 
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index 2c99572d1e7..c6196481fee 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -59,7 +59,7 @@ struct _GtkSeparatorMenuItemClass
 };
 
 
-GType	   gtk_separator_menu_item_get_type	   (void) G_GNUC_CONST;
+GType	   gtk_separator_menu_item_get_type	   (void);
 GtkWidget* gtk_separator_menu_item_new	           (void);
 
 
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 58b04bfde63..3d904dcf79d 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -60,7 +60,7 @@ struct _GtkSeparatorToolItemClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
+GType        gtk_separator_tool_item_get_type (void);
 GtkToolItem *gtk_separator_tool_item_new      (void);
 
 gboolean     gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item);
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index eb499e8338d..ef291cfd2f0 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -75,7 +75,7 @@ struct _GtkSettingsValue
 
 
 /* --- functions --- */
-GType		gtk_settings_get_type		     (void) G_GNUC_CONST;
+GType		gtk_settings_get_type		     (void);
 #ifndef GDK_MULTIHEAD_SAFE
 GtkSettings*	gtk_settings_get_default	     (void);
 #endif
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index f1ff8b1f9e8..f4b580ac821 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -84,7 +84,7 @@ typedef enum {
   GTK_SIZE_GROUP_BOTH
 } GtkSizeGroupMode;
 
-GType            gtk_size_group_get_type      (void) G_GNUC_CONST;
+GType            gtk_size_group_get_type      (void);
 
 GtkSizeGroup *   gtk_size_group_new           (GtkSizeGroupMode  mode);
 void             gtk_size_group_set_mode      (GtkSizeGroup     *size_group,
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index c7bf32ddb21..ff284e385e4 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -84,7 +84,7 @@ struct _GtkSocketClass
 };
 
 
-GType          gtk_socket_get_type (void) G_GNUC_CONST;
+GType          gtk_socket_get_type (void);
 GtkWidget*     gtk_socket_new      (void);
 
 void            gtk_socket_add_id (GtkSocket       *socket_,
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 3fc70d7a26e..680512b186e 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -120,7 +120,7 @@ struct _GtkSpinButtonClass
 };
 
 
-GType		gtk_spin_button_get_type	   (void) G_GNUC_CONST;
+GType		gtk_spin_button_get_type	   (void);
 
 void		gtk_spin_button_configure	   (GtkSpinButton  *spin_button,
 						    GtkAdjustment  *adjustment,
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index c0715be51a7..944f7589840 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -55,7 +55,7 @@ struct _GtkSpinnerClass
   GtkDrawingAreaClass parent_class;
 };
 
-GType      gtk_spinner_get_type  (void) G_GNUC_CONST;
+GType      gtk_spinner_get_type  (void);
 GtkWidget *gtk_spinner_new (void);
 void       gtk_spinner_start      (GtkSpinner *spinner);
 void       gtk_spinner_stop       (GtkSpinner *spinner);
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 398412c6516..bdbb2b40869 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -86,7 +86,7 @@ struct _GtkStatusbarClass
 };
 
 
-GType      gtk_statusbar_get_type     	(void) G_GNUC_CONST;
+GType      gtk_statusbar_get_type     	(void);
 GtkWidget* gtk_statusbar_new          	(void);
 /* If you don't want to use contexts, 0 is a predefined global
  * context_id you can pass to push/pop/remove
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index c45caca5aeb..c581d87225d 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -77,7 +77,7 @@ struct _GtkStatusIconClass
   void *__gtk_reserved2;
 };
 
-GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
+GType                 gtk_status_icon_get_type           (void);
 
 GtkStatusIcon        *gtk_status_icon_new                (void);
 GtkStatusIcon        *gtk_status_icon_new_from_pixbuf    (GdkPixbuf          *pixbuf);
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 77d3ae1af55..43d3b53a085 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -437,7 +437,7 @@ struct _GtkBorder
   gint bottom;
 };
 
-GType     gtk_style_get_type                 (void) G_GNUC_CONST;
+GType     gtk_style_get_type                 (void);
 GtkStyle* gtk_style_new			     (void);
 GtkStyle* gtk_style_copy		     (GtkStyle	   *style);
 GtkStyle* gtk_style_attach		     (GtkStyle	   *style,
@@ -878,7 +878,7 @@ void gtk_paint_spinner     (GtkStyle           *style,
 			    gint                width,
 			    gint                height);
 
-GType      gtk_border_get_type (void) G_GNUC_CONST;
+GType      gtk_border_get_type (void);
 GtkBorder *gtk_border_new      (void) G_GNUC_MALLOC;
 GtkBorder *gtk_border_copy     (const GtkBorder *border_);
 void       gtk_border_free     (GtkBorder       *border_);
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index 0e2bb874feb..5a098be5f5e 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -99,7 +99,7 @@ struct _GtkTableRowCol
 };
 
 
-GType	   gtk_table_get_type	      (void) G_GNUC_CONST;
+GType	   gtk_table_get_type	      (void);
 GtkWidget* gtk_table_new	      (guint		rows,
 				       guint		columns,
 				       gboolean		homogeneous);
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index 3900fd08160..8dc03ecd6e5 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -67,7 +67,7 @@ struct _GtkTearoffMenuItemClass
 };
 
 
-GType	   gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
+GType	   gtk_tearoff_menu_item_get_type     (void);
 GtkWidget* gtk_tearoff_menu_item_new	      (void);
 
 G_END_DECLS
diff --git a/gtk/gtktext.h b/gtk/gtktext.h
index 8bfa71aa21c..2035d087cd2 100644
--- a/gtk/gtktext.h
+++ b/gtk/gtktext.h
@@ -175,7 +175,7 @@ struct _GtkTextClass
 };
 
 
-GType      gtk_text_get_type        (void) G_GNUC_CONST;
+GType      gtk_text_get_type        (void);
 GtkWidget* gtk_text_new             (GtkAdjustment *hadj,
 				     GtkAdjustment *vadj);
 void       gtk_text_set_editable    (GtkText       *text,
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 5b6e7bf7d79..9aa190c26f8 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -154,7 +154,7 @@ struct _GtkTextBufferClass
   void (*_gtk_reserved5) (void);
 };
 
-GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;
+GType        gtk_text_buffer_get_type       (void);
 
 
 
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 7a814cec3bc..91bc9ca7b5d 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -70,7 +70,7 @@ struct _GtkTextChildAnchorClass
   void (*_gtk_reserved4) (void);
 };
 
-GType gtk_text_child_anchor_get_type (void) G_GNUC_CONST;
+GType gtk_text_child_anchor_get_type (void);
 
 GtkTextChildAnchor* gtk_text_child_anchor_new (void);
 
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 749af441553..e8395c11475 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -87,7 +87,7 @@ GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
 GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
 void         gtk_text_iter_free     (GtkTextIter       *iter);
 
-GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
+GType        gtk_text_iter_get_type (void);
 
 /*
  * Convert to different kinds of index
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index a2e8aa3a5d4..a130254f276 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -267,7 +267,7 @@ struct _GtkTextLineDisplay
 
 extern PangoAttrType gtk_text_attr_appearance_type;
 
-GType         gtk_text_layout_get_type    (void) G_GNUC_CONST;
+GType         gtk_text_layout_get_type    (void);
 
 GtkTextLayout*     gtk_text_layout_new                   (void);
 void               gtk_text_layout_set_buffer            (GtkTextLayout     *layout,
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 4eab445190d..5d29405c74c 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -86,7 +86,7 @@ struct _GtkTextMarkClass
   void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_text_mark_get_type   (void) G_GNUC_CONST;
+GType        gtk_text_mark_get_type   (void);
 
 void           gtk_text_mark_set_visible (GtkTextMark *mark,
                                           gboolean     setting);
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 9976df4c5cd..133cbb2aa78 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -153,7 +153,7 @@ struct _GtkTextTagClass
   void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
+GType        gtk_text_tag_get_type     (void);
 GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
 gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
 void         gtk_text_tag_set_priority (GtkTextTag        *tag,
@@ -280,7 +280,7 @@ void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
 void               gtk_text_attributes_unref       (GtkTextAttributes *values);
 GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
 
-GType              gtk_text_attributes_get_type    (void) G_GNUC_CONST;
+GType              gtk_text_attributes_get_type    (void);
 
 
 G_END_DECLS
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index aa7d985d901..c1292b0333f 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -72,7 +72,7 @@ struct _GtkTextTagTableClass
   void (*_gtk_reserved4) (void);
 };
 
-GType          gtk_text_tag_table_get_type (void) G_GNUC_CONST;
+GType          gtk_text_tag_table_get_type (void);
 
 GtkTextTagTable *gtk_text_tag_table_new      (void);
 void             gtk_text_tag_table_add      (GtkTextTagTable        *table,
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 86c6c37a6e4..0739aaa9b95 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -214,7 +214,7 @@ struct _GtkTextViewClass
   void (*_gtk_reserved7) (void);
 };
 
-GType          gtk_text_view_get_type              (void) G_GNUC_CONST;
+GType          gtk_text_view_get_type              (void);
 GtkWidget *    gtk_text_view_new                   (void);
 GtkWidget *    gtk_text_view_new_with_buffer       (GtkTextBuffer *buffer);
 void           gtk_text_view_set_buffer            (GtkTextView   *text_view,
diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index 49d3e511dc0..ec89f7353ab 100644
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 #define GTK_THEME_ENGINE(theme_engine)    (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine))
 #define GTK_IS_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_TYPE ((theme_engine), GTK_TYPE_THEME_ENGINE))
 
-GType           gtk_theme_engine_get_type        (void) G_GNUC_CONST;
+GType           gtk_theme_engine_get_type        (void);
 GtkThemeEngine *gtk_theme_engine_get             (const gchar     *name);
 GtkRcStyle     *gtk_theme_engine_create_rc_style (GtkThemeEngine  *engine);
 
diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h
index b792d812191..8e9d8739b99 100644
--- a/gtk/gtktipsquery.h
+++ b/gtk/gtktipsquery.h
@@ -93,7 +93,7 @@ struct	_GtkTipsQueryClass
 
 
 /* --- prototypes --- */
-GType		gtk_tips_query_get_type		(void) G_GNUC_CONST;
+GType		gtk_tips_query_get_type		(void);
 GtkWidget*	gtk_tips_query_new		(void);
 void		gtk_tips_query_start_query	(GtkTipsQuery	*tips_query);
 void		gtk_tips_query_stop_query	(GtkTipsQuery	*tips_query);
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 34210f5885f..db448039f00 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -72,7 +72,7 @@ struct _GtkToggleActionClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_toggle_action_get_type          (void) G_GNUC_CONST;
+GType            gtk_toggle_action_get_type          (void);
 GtkToggleAction *gtk_toggle_action_new               (const gchar     *name,
                                                       const gchar     *label,
                                                       const gchar     *tooltip,
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 931b013d048..e523b486a94 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -71,7 +71,7 @@ struct _GtkToggleButtonClass
 };
 
 
-GType      gtk_toggle_button_get_type          (void) G_GNUC_CONST;
+GType      gtk_toggle_button_get_type          (void);
 
 GtkWidget* gtk_toggle_button_new               (void);
 GtkWidget* gtk_toggle_button_new_with_label    (const gchar     *label);
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index d90f6428f2e..5dbdeb8567d 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -64,7 +64,7 @@ struct _GtkToggleToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_toggle_tool_button_get_type       (void) G_GNUC_CONST;
+GType        gtk_toggle_tool_button_get_type       (void);
 GtkToolItem *gtk_toggle_tool_button_new            (void);
 GtkToolItem *gtk_toggle_tool_button_new_from_stock (const gchar *stock_id);
 
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 931c20d9832..37fd0285ef4 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -138,7 +138,7 @@ struct _GtkToolbarClass
   void (*_gtk_reserved3) (void);
 };
 
-GType           gtk_toolbar_get_type                (void) G_GNUC_CONST;
+GType           gtk_toolbar_get_type                (void);
 GtkWidget *     gtk_toolbar_new                     (void);
 
 void            gtk_toolbar_insert                  (GtkToolbar      *toolbar,
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index fdb8273dbd1..de582e78362 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -66,7 +66,7 @@ struct _GtkToolButtonClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_tool_button_get_type       (void) G_GNUC_CONST;
+GType        gtk_tool_button_get_type       (void);
 GtkToolItem *gtk_tool_button_new            (GtkWidget   *icon_widget,
 					     const gchar *label);
 GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 0455ae58ac3..1febca0b72f 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -76,7 +76,7 @@ struct _GtkToolItemClass
   void (* _gtk_reserved4) (void);
 };
 
-GType        gtk_tool_item_get_type (void) G_GNUC_CONST;
+GType        gtk_tool_item_get_type (void);
 GtkToolItem *gtk_tool_item_new      (void);
 
 void            gtk_tool_item_set_homogeneous          (GtkToolItem *tool_item,
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index 6b1c936ec63..8bdd151278d 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -58,7 +58,7 @@ struct _GtkToolItemGroupClass
   GtkContainerClass parent_class;
 };
 
-GType                 gtk_tool_item_group_get_type          (void) G_GNUC_CONST;
+GType                 gtk_tool_item_group_get_type          (void);
 GtkWidget*            gtk_tool_item_group_new               (const gchar        *label);
 
 void                  gtk_tool_item_group_set_label         (GtkToolItemGroup   *group,
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 90aa701e4ec..2a643d4218b 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -85,7 +85,7 @@ struct _GtkToolPaletteClass
   void (*_gtk_reserved6) (void);
 };
 
-GType                          gtk_tool_palette_get_type              (void) G_GNUC_CONST;
+GType                          gtk_tool_palette_get_type              (void);
 GtkWidget*                     gtk_tool_palette_new                   (void);
 
 void                           gtk_tool_palette_set_group_position    (GtkToolPalette            *palette,
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index 6cf3db5ae6a..a4dc1699d63 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -74,7 +74,7 @@ struct _GtkToolShellIface
   GtkSizeGroup *     (*get_text_size_group)  (GtkToolShell *shell);
 };
 
-GType              gtk_tool_shell_get_type             (void) G_GNUC_CONST;
+GType              gtk_tool_shell_get_type             (void);
 
 GtkIconSize        gtk_tool_shell_get_icon_size        (GtkToolShell *shell);
 GtkOrientation     gtk_tool_shell_get_orientation      (GtkToolShell *shell);
diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h
index a86085652ca..1d3ee53cf7c 100644
--- a/gtk/gtktooltips.h
+++ b/gtk/gtktooltips.h
@@ -84,7 +84,7 @@ struct _GtkTooltipsClass
   void (*_gtk_reserved4) (void);
 };
 
-GType		 gtk_tooltips_get_type	   (void) G_GNUC_CONST;
+GType		 gtk_tooltips_get_type	   (void);
 GtkTooltips*	 gtk_tooltips_new	   (void);
 
 void		 gtk_tooltips_enable	   (GtkTooltips   *tooltips);
diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h
index 4c1e18489fe..ff7f13b993c 100644
--- a/gtk/gtktrayicon.h
+++ b/gtk/gtktrayicon.h
@@ -54,7 +54,7 @@ struct _GtkTrayIconClass
   void (*__gtk_reserved6);
 };
 
-GType          gtk_tray_icon_get_type         (void) G_GNUC_CONST;
+GType          gtk_tray_icon_get_type         (void);
 
 GtkTrayIcon   *_gtk_tray_icon_new_for_screen  (GdkScreen   *screen,
 					       const gchar *name);
diff --git a/gtk/gtktree.h b/gtk/gtktree.h
index 1d0e1f73430..56618849692 100644
--- a/gtk/gtktree.h
+++ b/gtk/gtktree.h
@@ -88,7 +88,7 @@ struct _GtkTreeClass
 };
 
 
-GType      gtk_tree_get_type           (void) G_GNUC_CONST;
+GType      gtk_tree_get_type           (void);
 GtkWidget* gtk_tree_new                (void);
 void       gtk_tree_append             (GtkTree          *tree,
 				        GtkWidget        *tree_item);
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index aa0684f0b5d..94fcfd254ed 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -54,7 +54,7 @@ struct _GtkTreeDragSourceIface
                                          GtkTreePath       *path);
 };
 
-GType           gtk_tree_drag_source_get_type   (void) G_GNUC_CONST;
+GType           gtk_tree_drag_source_get_type   (void);
 
 /* Returns whether the given row can be dragged */
 gboolean gtk_tree_drag_source_row_draggable    (GtkTreeDragSource *drag_source,
@@ -94,7 +94,7 @@ struct _GtkTreeDragDestIface
 				       GtkSelectionData  *selection_data);
 };
 
-GType           gtk_tree_drag_dest_get_type   (void) G_GNUC_CONST;
+GType           gtk_tree_drag_dest_get_type   (void);
 
 /* Inserts a row before dest which contains data in selection_data,
  * or returns FALSE if it can't
diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h
index 0e8dbaf1dd9..c60236136eb 100644
--- a/gtk/gtktreeitem.h
+++ b/gtk/gtktreeitem.h
@@ -71,7 +71,7 @@ struct _GtkTreeItemClass
 };
 
 
-GType      gtk_tree_item_get_type       (void) G_GNUC_CONST;
+GType      gtk_tree_item_get_type       (void);
 GtkWidget* gtk_tree_item_new            (void);
 GtkWidget* gtk_tree_item_new_with_label (const gchar *label);
 void       gtk_tree_item_set_subtree    (GtkTreeItem *tree_item,
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 1faff6468f3..ba318a9ff75 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -138,7 +138,7 @@ gint        *gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
                                                    gint        *depth);
 void         gtk_tree_path_free             (GtkTreePath       *path);
 GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
-GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
+GType        gtk_tree_path_get_type         (void);
 gint         gtk_tree_path_compare          (const GtkTreePath *a,
 					     const GtkTreePath *b);
 void         gtk_tree_path_next             (GtkTreePath       *path);
@@ -160,7 +160,7 @@ gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
  * want to call gtk_tree_row_reference_new.
  */
 
-GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
+GType                gtk_tree_row_reference_get_type (void);
 GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
 						       GtkTreePath         *path);
 GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
@@ -185,9 +185,9 @@ void                 gtk_tree_row_reference_reordered (GObject     *proxy,
 /* GtkTreeIter operations */
 GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
 void              gtk_tree_iter_free             (GtkTreeIter  *iter);
-GType             gtk_tree_iter_get_type         (void) G_GNUC_CONST;
+GType             gtk_tree_iter_get_type         (void);
 
-GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
+GType             gtk_tree_model_get_type        (void);
 GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
 gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
 GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index d8887584fe8..f511b1d67d3 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -70,7 +70,7 @@ struct _GtkTreeModelFilterClass
 };
 
 /* base */
-GType         gtk_tree_model_filter_get_type                   (void) G_GNUC_CONST;
+GType         gtk_tree_model_filter_get_type                   (void);
 GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel                 *child_model,
                                                                 GtkTreePath                  *root);
 void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index ca3dcc94fec..942f4c170ff 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -81,7 +81,7 @@ struct _GtkTreeModelSortClass
 };
 
 
-GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
+GType         gtk_tree_model_sort_get_type                   (void);
 GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
 
 GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 32038dcafa2..ecf2cc27418 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -73,7 +73,7 @@ struct _GtkTreeSelectionClass
 };
 
 
-GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
+GType            gtk_tree_selection_get_type            (void);
 
 void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
 							 GtkSelectionMode             type);
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 968c42fb807..079383b1fa2 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -78,7 +78,7 @@ struct _GtkTreeSortableIface
 };
 
 
-GType    gtk_tree_sortable_get_type              (void) G_GNUC_CONST;
+GType    gtk_tree_sortable_get_type              (void);
 
 void     gtk_tree_sortable_sort_column_changed   (GtkTreeSortable        *sortable);
 gboolean gtk_tree_sortable_get_sort_column_id    (GtkTreeSortable        *sortable,
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 9e4f13dbc38..fe4778661ba 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -73,7 +73,7 @@ struct _GtkTreeStoreClass
 };
 
 
-GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
+GType         gtk_tree_store_get_type         (void);
 GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
 					       ...);
 GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 23d8055f417..838f017966c 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -137,7 +137,7 @@ typedef void     (*GtkTreeViewSearchPositionFunc) (GtkTreeView  *tree_view,
 
 
 /* Creators */
-GType                  gtk_tree_view_get_type                      (void) G_GNUC_CONST;
+GType                  gtk_tree_view_get_type                      (void);
 GtkWidget             *gtk_tree_view_new                           (void);
 GtkWidget             *gtk_tree_view_new_with_model                (GtkTreeModel              *model);
 
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index d36f6077f91..3ce3dd92b9f 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -123,7 +123,7 @@ struct _GtkTreeViewColumnClass
   void (*_gtk_reserved4) (void);
 };
 
-GType                   gtk_tree_view_column_get_type            (void) G_GNUC_CONST;
+GType                   gtk_tree_view_column_get_type            (void);
 GtkTreeViewColumn      *gtk_tree_view_column_new                 (void);
 GtkTreeViewColumn      *gtk_tree_view_column_new_with_attributes (const gchar             *title,
 								  GtkCellRenderer         *cell,
diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template
index 9b2538dc136..f4a0f15ffbc 100644
--- a/gtk/gtktypebuiltins.h.template
+++ b/gtk/gtktypebuiltins.h.template
@@ -17,7 +17,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
+GType @enum_name@_get_type (void);
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index a8dcb722040..d465ae71145 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 
 /* urg */
 #define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
-GType gtk_identifier_get_type (void) G_GNUC_CONST;
+GType gtk_identifier_get_type (void);
 
 /* --- typedefs --- */
 /* here we come with some necessary forward declarations for structures and
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 5faa53c4a55..e4a7f2c4857 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -110,7 +110,7 @@ typedef enum {
 #define gtk_ui_manager_add_ui_from_file gtk_ui_manager_add_ui_from_file_utf8
 #endif
 
-GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
+GType          gtk_ui_manager_get_type            (void);
 GtkUIManager  *gtk_ui_manager_new                 (void);
 void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *self,
 						   gboolean               add_tearoffs);
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 26f69909364..0c6a3e195d9 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -60,7 +60,7 @@ struct _GtkVButtonBoxClass
 };
 
 
-GType      gtk_vbutton_box_get_type (void) G_GNUC_CONST;
+GType      gtk_vbutton_box_get_type (void);
 GtkWidget *gtk_vbutton_box_new      (void);
 
 /* buttons can be added by gtk_container_add() */
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index 7b6af6dbc27..4ccf03fca53 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -59,7 +59,7 @@ struct _GtkVBoxClass
 };
 
 
-GType       gtk_vbox_get_type (void) G_GNUC_CONST;
+GType       gtk_vbox_get_type (void);
 GtkWidget * gtk_vbox_new      (gboolean homogeneous,
                                gint     spacing);
 
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index ee74e34a958..8a7c93dc41e 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -71,7 +71,7 @@ struct _GtkViewportClass
 };
 
 
-GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
+GType          gtk_viewport_get_type        (void);
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
 					     GtkAdjustment *vadjustment);
 GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index d8a3c72cb9f..40e3d444873 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -64,7 +64,7 @@ struct _GtkVolumeButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType		gtk_volume_button_get_type	(void) G_GNUC_CONST;
+GType		gtk_volume_button_get_type	(void);
 GtkWidget*	gtk_volume_button_new		(void);
 
 G_END_DECLS
diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index 9f210f7144e..b8ce3bf72f6 100644
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -57,7 +57,7 @@ struct _GtkVPanedClass
 };
 
 
-GType       gtk_vpaned_get_type (void) G_GNUC_CONST;
+GType       gtk_vpaned_get_type (void);
 GtkWidget * gtk_vpaned_new      (void);
 
 G_END_DECLS
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 9bff47c15ef..667944f7eef 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -72,7 +72,7 @@ struct _GtkVRulerClass
 };
 
 
-GType      gtk_vruler_get_type (void) G_GNUC_CONST;
+GType      gtk_vruler_get_type (void);
 GtkWidget* gtk_vruler_new      (void);
 
 
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index b5d5d85d65a..1a165945018 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -66,7 +66,7 @@ struct _GtkVScaleClass
 };
 
 
-GType      gtk_vscale_get_type       (void) G_GNUC_CONST;
+GType      gtk_vscale_get_type       (void);
 GtkWidget* gtk_vscale_new            (GtkAdjustment *adjustment);
 GtkWidget* gtk_vscale_new_with_range (gdouble        min,
                                       gdouble        max,
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index e7692af0959..5df16a129fa 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -66,7 +66,7 @@ struct _GtkVScrollbarClass
 };
 
 
-GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
+GType      gtk_vscrollbar_get_type (void);
 GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
 
 
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index f41d491cc88..2a0e5d0332f 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -66,7 +66,7 @@ struct _GtkVSeparatorClass
 };
 
 
-GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
+GType      gtk_vseparator_get_type (void);
 GtkWidget* gtk_vseparator_new      (void);
 
 
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 1fcf21a12d9..64fcdd2a212 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -830,7 +830,7 @@ struct _GtkWidgetShapeInfo
   GdkBitmap *shape_mask;
 };
 
-GType	   gtk_widget_get_type		  (void) G_GNUC_CONST;
+GType	   gtk_widget_get_type		  (void);
 GtkWidget* gtk_widget_new		  (GType		type,
 					   const gchar	       *first_property_name,
 					   ...);
@@ -1305,7 +1305,7 @@ void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
 					     gboolean     has_tooltip);
 gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
 
-GType           gtk_requisition_get_type (void) G_GNUC_CONST;
+GType           gtk_requisition_get_type (void);
 GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
 void            gtk_requisition_free     (GtkRequisition       *requisition);
 
diff --git a/gtk/gtkwin32embedwidget.h b/gtk/gtkwin32embedwidget.h
index 92515cfb82b..21fdb54aaab 100644
--- a/gtk/gtkwin32embedwidget.h
+++ b/gtk/gtkwin32embedwidget.h
@@ -65,7 +65,7 @@ struct _GtkWin32EmbedWidgetClass
 };
 
 
-GType      gtk_win32_embed_widget_get_type (void) G_GNUC_CONST;
+GType      gtk_win32_embed_widget_get_type (void);
 GtkWidget* _gtk_win32_embed_widget_new              (GdkNativeWindow  parent_id);
 BOOL       _gtk_win32_embed_widget_dialog_procedure (GtkWin32EmbedWidget *embed_widget,
 						     HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 720be9d7a0a..b253b35923c 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -175,7 +175,7 @@ struct _GtkWindowGroupClass
 #define gtk_window_set_default_icon_from_file gtk_window_set_default_icon_from_file_utf8
 #endif
 
-GType      gtk_window_get_type                 (void) G_GNUC_CONST;
+GType      gtk_window_get_type                 (void);
 GtkWidget* gtk_window_new                      (GtkWindowType        type);
 void       gtk_window_set_title                (GtkWindow           *window,
 						const gchar         *title);
@@ -394,7 +394,7 @@ GtkWindowType gtk_window_get_window_type     (GtkWindow     *window);
 
 /* Window groups
  */
-GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
+GType            gtk_window_group_get_type      (void);
 
 GtkWindowGroup * gtk_window_group_new           (void);
 void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,
diff --git a/modules/printbackends/cups/gtkprintbackendcups.h b/modules/printbackends/cups/gtkprintbackendcups.h
index 81c1d987aac..3f9476a3fe6 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.h
+++ b/modules/printbackends/cups/gtkprintbackendcups.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 typedef struct _GtkPrintBackendCups      GtkPrintBackendCups;
 
 GtkPrintBackend *gtk_print_backend_cups_new      (void);
-GType          gtk_print_backend_cups_get_type (void) G_GNUC_CONST;
+GType          gtk_print_backend_cups_get_type (void);
 
 G_END_DECLS
 
diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/cups/gtkprintercups.h
index d10bd7ec3ba..1e8205897d0 100644
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/cups/gtkprintercups.h
@@ -81,7 +81,7 @@ struct _GtkPrinterCupsClass
 
 };
 
-GType                    gtk_printer_cups_get_type      (void) G_GNUC_CONST;
+GType                    gtk_printer_cups_get_type      (void);
 void                     gtk_printer_cups_register_type (GTypeModule     *module);
 GtkPrinterCups          *gtk_printer_cups_new           (const char      *name,
 							 GtkPrintBackend *backend);
diff --git a/modules/printbackends/file/gtkprintbackendfile.h b/modules/printbackends/file/gtkprintbackendfile.h
index 94b30c3d4fa..8ae77d390ee 100644
--- a/modules/printbackends/file/gtkprintbackendfile.h
+++ b/modules/printbackends/file/gtkprintbackendfile.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 typedef struct _GtkPrintBackendFile    GtkPrintBackendFile;
 
 GtkPrintBackend *gtk_print_backend_file_new      (void);
-GType            gtk_print_backend_file_get_type (void) G_GNUC_CONST;
+GType            gtk_print_backend_file_get_type (void);
 
 G_END_DECLS
 
diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.h b/modules/printbackends/lpr/gtkprintbackendlpr.h
index 51c529a2fa1..be86308abf5 100644
--- a/modules/printbackends/lpr/gtkprintbackendlpr.h
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 typedef struct _GtkPrintBackendLpr      GtkPrintBackendLpr;
 
 GtkPrintBackend *gtk_print_backend_lpr_new      (void);
-GType          gtk_print_backend_lpr_get_type (void) G_GNUC_CONST;
+GType          gtk_print_backend_lpr_get_type (void);
 
 G_END_DECLS
 
diff --git a/modules/printbackends/papi/gtkprintbackendpapi.h b/modules/printbackends/papi/gtkprintbackendpapi.h
index 4eba665e000..d007c98f4b0 100644
--- a/modules/printbackends/papi/gtkprintbackendpapi.h
+++ b/modules/printbackends/papi/gtkprintbackendpapi.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 typedef struct _GtkPrintBackendPapi      GtkPrintBackendPapi;
 
 GtkPrintBackend *gtk_print_backend_papi_new      (void);
-GType          gtk_print_backend_papi_get_type (void) G_GNUC_CONST;
+GType          gtk_print_backend_papi_get_type (void);
 
 G_END_DECLS
 
diff --git a/modules/printbackends/papi/gtkprinterpapi.h b/modules/printbackends/papi/gtkprinterpapi.h
index 300cf171108..73e71a4cbad 100644
--- a/modules/printbackends/papi/gtkprinterpapi.h
+++ b/modules/printbackends/papi/gtkprinterpapi.h
@@ -52,7 +52,7 @@ struct _GtkPrinterPapiClass
 
 };
 
-GType                    gtk_printer_papi_get_type      (void) G_GNUC_CONST;
+GType                    gtk_printer_papi_get_type      (void);
 void                     gtk_printer_papi_register_type (GTypeModule     *module);
 GtkPrinterPapi          *gtk_printer_papi_new           (const char      *name, GtkPrintBackend *backend);
 
diff --git a/modules/printbackends/test/gtkprintbackendtest.h b/modules/printbackends/test/gtkprintbackendtest.h
index c48a85a198d..1a74b50e8d6 100644
--- a/modules/printbackends/test/gtkprintbackendtest.h
+++ b/modules/printbackends/test/gtkprintbackendtest.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 typedef struct _GtkPrintBackendTest    GtkPrintBackendTest;
 
 GtkPrintBackend *gtk_print_backend_test_new      (void);
-GType            gtk_print_backend_test_get_type (void) G_GNUC_CONST;
+GType            gtk_print_backend_test_get_type (void);
 
 G_END_DECLS
 
diff --git a/perf/gtkwidgetprofiler.h b/perf/gtkwidgetprofiler.h
index 59c47889439..5f0287fcee3 100644
--- a/perf/gtkwidgetprofiler.h
+++ b/perf/gtkwidgetprofiler.h
@@ -43,7 +43,7 @@ struct _GtkWidgetProfilerClass {
 			 gdouble                 elapsed);
 };
 
-GType gtk_widget_profiler_get_type (void) G_GNUC_CONST;
+GType gtk_widget_profiler_get_type (void);
 
 GtkWidgetProfiler *gtk_widget_profiler_new (void);
 
diff --git a/perf/typebuiltins.h.template b/perf/typebuiltins.h.template
index ea31ae83433..b918b072809 100644
--- a/perf/typebuiltins.h.template
+++ b/perf/typebuiltins.h.template
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
+GType @enum_name@_get_type (void);
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 
diff --git a/tests/gtkoffscreenbox.h b/tests/gtkoffscreenbox.h
index aa1d15d7756..18c662915f4 100644
--- a/tests/gtkoffscreenbox.h
+++ b/tests/gtkoffscreenbox.h
@@ -36,7 +36,7 @@ struct _GtkOffscreenBoxClass
   GtkBinClass parent_class;
 };
 
-GType	   gtk_offscreen_box_get_type           (void) G_GNUC_CONST;
+GType	   gtk_offscreen_box_get_type           (void);
 GtkWidget* gtk_offscreen_box_new       (void);
 void       gtk_offscreen_box_add1      (GtkOffscreenBox *offscreen,
 					GtkWidget       *child);
-- 
GitLab


From c2310274694271c891d0f1362edff37d58367f05 Mon Sep 17 00:00:00 2001
From: David Korth <gerbilsoft@gerbilsoft.com>
Date: Tue, 21 Jul 2026 21:19:57 -0400
Subject: [PATCH 2/3] Also remove the G_GNUC_CONST attribute from _get_quark()
 functions.

They have the same one-time initialization pattern as _get_type().
---
 gtk/gtkfilechooserutils.h   | 2 +-
 gtk/gtkrecentchooserutils.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkfilechooserutils.h b/gtk/gtkfilechooserutils.h
index 90768b04e36..8a16a344d68 100644
--- a/gtk/gtkfilechooserutils.h
+++ b/gtk/gtkfilechooserutils.h
@@ -51,7 +51,7 @@ void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
 void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,
 					    GtkFileChooser *delegate);
 
-GQuark _gtk_file_chooser_delegate_get_quark (void) G_GNUC_CONST;
+GQuark _gtk_file_chooser_delegate_get_quark (void);
 
 GList *_gtk_file_chooser_extract_recent_folders (GList *infos);
 
diff --git a/gtk/gtkrecentchooserutils.h b/gtk/gtkrecentchooserutils.h
index 24ba75b67ce..51a819a3090 100644
--- a/gtk/gtkrecentchooserutils.h
+++ b/gtk/gtkrecentchooserutils.h
@@ -55,7 +55,7 @@ void   _gtk_recent_chooser_delegate_iface_init (GtkRecentChooserIface *iface);
 void   _gtk_recent_chooser_set_delegate        (GtkRecentChooser      *receiver,
 						GtkRecentChooser      *delegate);
 
-GQuark _gtk_recent_chooser_delegate_get_quark  (void) G_GNUC_CONST;
+GQuark _gtk_recent_chooser_delegate_get_quark  (void);
 
 G_END_DECLS
 
-- 
GitLab


From 7e72fdc8b549ee471db918b101beedfdf46c2c0b Mon Sep 17 00:00:00 2001
From: David Korth <gerbilsoft@gerbilsoft.com>
Date: Tue, 21 Jul 2026 21:42:23 -0400
Subject: [PATCH 3/3] docs: Remove FAQ entry

Matches main branch removal for G_GNUC_CONST changes.
---
 docs/reference/gtk/question_index.sgml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml
index 652550901ac..96ea217f8b7 100644
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -515,32 +515,6 @@ to the GNOME 2.0 platform</ulink>.
 </answer>
 </qandaentry>
 
-<qandaentry>
-<question>
-<para>
-Why are types not registered if I use their <literal>GTK_TYPE_BLAH</literal> 
-macro ?
-</para>
-</question>
-
-<answer>
-<para>
-The <literal>GTK_TYPE_BLAH</literal> macros are defined as calls to 
-<literal>gtk_blah_get_type()</literal>, and the <literal>_get_type()</literal> i
-functions are declared as %G_GNUC_CONST which allows the compiler to optimize
-the call away if it appears that the value is not being used.
-</para>
-
-<para>
-A common workaround for this problem is to store the result in a volatile 
-variable, which keeps the compiler from optimizing the call away.
-<informalexample><programlisting>
-volatile GType dummy = GTK_TYPE_BLAH;
-</programlisting></informalexample>
-</para>
-</answer>
-</qandaentry>
-
 <qandaentry>
 <question>
 <para>
-- 
GitLab

