--- gimp-2.3.8/libgimp/gimpchannel_pdb.h.orig	2006-05-31 08:31:34.172832000 +0100
+++ gimp-2.3.8/libgimp/gimpchannel_pdb.h	2006-05-31 08:32:20.386055000 +0100
@@ -29,12 +29,12 @@
 /* For information look into the C source or the html documentation */
 
 
-gint32   _gimp_channel_new               (gint32           image_ID,
+G_GNUC_INTERNAL gint32   _gimp_channel_new               (gint32           image_ID,
                                           gint             width,
                                           gint             height,
                                           const gchar     *name,
                                           gdouble          opacity,
-                                          const GimpRGB   *color) G_GNUC_INTERNAL;
+                                          const GimpRGB   *color);
 gint32   gimp_channel_new_from_component (gint32           image_ID,
                                           GimpChannelType  component,
                                           const gchar     *name);
--- gimp-2.3.8/libgimp/gimpdrawable_pdb.h.orig	2006-05-31 08:31:34.179099000 +0100
+++ gimp-2.3.8/libgimp/gimpdrawable_pdb.h	2006-05-31 08:32:52.359135000 +0100
@@ -95,15 +95,15 @@
                                                 GimpOffsetType              fill_type,
                                                 gint                        offset_x,
                                                 gint                        offset_y);
-gboolean      _gimp_drawable_thumbnail         (gint32                      drawable_ID,
+G_GNUC_INTERNAL gboolean      _gimp_drawable_thumbnail         (gint32                      drawable_ID,
                                                 gint                        width,
                                                 gint                        height,
                                                 gint                       *actual_width,
                                                 gint                       *actual_height,
                                                 gint                       *bpp,
                                                 gint                       *thumbnail_data_count,
-                                                guint8                    **thumbnail_data) G_GNUC_INTERNAL;
-gboolean      _gimp_drawable_sub_thumbnail     (gint32                      drawable_ID,
+                                                guint8                    **thumbnail_data);
+G_GNUC_INTERNAL gboolean      _gimp_drawable_sub_thumbnail     (gint32                      drawable_ID,
                                                 gint                        src_x,
                                                 gint                        src_y,
                                                 gint                        src_width,
@@ -114,7 +114,7 @@
                                                 gint                       *height,
                                                 gint                       *bpp,
                                                 gint                       *thumbnail_data_count,
-                                                guint8                    **thumbnail_data) G_GNUC_INTERNAL;
+                                                guint8                    **thumbnail_data);
 gboolean      gimp_drawable_foreground_extract (gint32                      drawable_ID,
                                                 GimpForegroundExtractMode   mode,
                                                 gint32                      mask_ID);
--- gimp-2.3.8/libgimp/gimpdrawablepreview.h.orig	2006-05-31 08:31:34.185227000 +0100
+++ gimp-2.3.8/libgimp/gimpdrawablepreview.h	2006-05-31 08:33:10.786246000 +0100
@@ -69,15 +69,15 @@
                                                    const GimpPixelRgn  *region);
 
 /*  for internal use only  */
-void          _gimp_drawable_preview_area_draw_thumb  (GimpPreviewArea *area,
+G_GNUC_INTERNAL void          _gimp_drawable_preview_area_draw_thumb  (GimpPreviewArea *area,
                                                        GimpDrawable    *drawable,
                                                        gint             width,
-                                                       gint             height) G_GNUC_INTERNAL;
-gboolean      _gimp_drawable_preview_get_bounds       (GimpDrawable    *drawable,
+                                                       gint             height);
+G_GNUC_INTERNAL gboolean      _gimp_drawable_preview_get_bounds       (GimpDrawable    *drawable,
                                                        gint            *xmin,
                                                        gint            *ymin,
                                                        gint            *xmax,
-                                                       gint            *ymax) G_GNUC_INTERNAL;
+                                                       gint            *ymax);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimp/gimpgimprc_pdb.h.orig	2006-05-31 08:31:34.191218000 +0100
+++ gimp-2.3.8/libgimp/gimpgimprc_pdb.h	2006-05-31 08:33:21.958084000 +0100
@@ -36,7 +36,7 @@
 gboolean gimp_get_monitor_resolution   (gdouble     *xres,
                                         gdouble     *yres);
 gchar*   gimp_get_theme_dir            (void);
-gchar*   _gimp_get_color_configuration (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gchar*   _gimp_get_color_configuration (void);
 gchar*   gimp_get_module_load_inhibit  (void);
 
 
--- gimp-2.3.8/libgimp/gimpimage_pdb.h.orig	2006-05-31 08:31:34.197315000 +0100
+++ gimp-2.3.8/libgimp/gimpimage_pdb.h	2006-05-31 08:33:48.503428000 +0100
@@ -119,21 +119,21 @@
 gint32            gimp_image_merge_down               (gint32                image_ID,
                                                        gint32                merge_layer_ID,
                                                        GimpMergeType         merge_type);
-guint8*           _gimp_image_get_colormap            (gint32                image_ID,
-                                                       gint                 *num_bytes) G_GNUC_INTERNAL;
-gboolean          _gimp_image_set_colormap            (gint32                image_ID,
+G_GNUC_INTERNAL guint8*           _gimp_image_get_colormap            (gint32                image_ID,
+                                                       gint                 *num_bytes);
+G_GNUC_INTERNAL gboolean          _gimp_image_set_colormap            (gint32                image_ID,
                                                        gint                  num_bytes,
-                                                       const guint8         *colormap) G_GNUC_INTERNAL;
+                                                       const guint8         *colormap);
 gboolean          gimp_image_clean_all                (gint32                image_ID);
 gboolean          gimp_image_is_dirty                 (gint32                image_ID);
-gboolean          _gimp_image_thumbnail               (gint32                image_ID,
+G_GNUC_INTERNAL gboolean          _gimp_image_thumbnail               (gint32                image_ID,
                                                        gint                  width,
                                                        gint                  height,
                                                        gint                 *actual_width,
                                                        gint                 *actual_height,
                                                        gint                 *bpp,
                                                        gint                 *thumbnail_data_count,
-                                                       guint8              **thumbnail_data) G_GNUC_INTERNAL;
+                                                       guint8              **thumbnail_data);
 gint32            gimp_image_get_active_layer         (gint32                image_ID);
 gboolean          gimp_image_set_active_layer         (gint32                image_ID,
                                                        gint32                active_layer_ID);
--- gimp-2.3.8/libgimp/gimplayer_pdb.h.orig	2006-05-31 08:31:34.203407000 +0100
+++ gimp-2.3.8/libgimp/gimplayer_pdb.h	2006-05-31 08:34:03.310615000 +0100
@@ -29,17 +29,17 @@
 /* For information look into the C source or the html documentation */
 
 
-gint32               _gimp_layer_new                 (gint32                image_ID,
+G_GNUC_INTERNAL gint32               _gimp_layer_new                 (gint32                image_ID,
                                                       gint                  width,
                                                       gint                  height,
                                                       GimpImageType         type,
                                                       const gchar          *name,
                                                       gdouble               opacity,
-                                                      GimpLayerModeEffects  mode) G_GNUC_INTERNAL;
+                                                      GimpLayerModeEffects  mode);
 gint32               gimp_layer_new_from_drawable    (gint32                drawable_ID,
                                                       gint32                dest_image_ID);
-gint32               _gimp_layer_copy                (gint32                layer_ID,
-                                                      gboolean              add_alpha) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gint32               _gimp_layer_copy                (gint32                layer_ID,
+                                                      gboolean              add_alpha);
 gboolean             gimp_layer_add_alpha            (gint32                layer_ID);
 gboolean             gimp_layer_scale                (gint32                layer_ID,
                                                       gint                  new_width,
--- gimp-2.3.8/libgimp/gimpplugin_pdb.h.orig	2006-05-31 08:31:34.209408000 +0100
+++ gimp-2.3.8/libgimp/gimpplugin_pdb.h	2006-05-31 08:34:19.674716000 +0100
@@ -37,10 +37,10 @@
                                            const gchar  *menu_path);
 gboolean gimp_plugin_menu_branch_register (const gchar  *menu_path,
                                            const gchar  *menu_name);
-gboolean _gimp_plugin_icon_register       (const gchar  *procedure_name,
+G_GNUC_INTERNAL gboolean _gimp_plugin_icon_register       (const gchar  *procedure_name,
                                            GimpIconType  icon_type,
                                            gint          icon_data_length,
-                                           const guint8 *icon_data) G_GNUC_INTERNAL;
+                                           const guint8 *icon_data);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimp/gimpproceduraldb_pdb.h.orig	2006-05-31 08:31:34.215361000 +0100
+++ gimp-2.3.8/libgimp/gimpproceduraldb_pdb.h	2006-05-31 08:34:43.587002000 +0100
@@ -40,7 +40,7 @@
                                            const gchar       *proc_type,
                                            gint              *num_matches,
                                            gchar           ***procedure_names);
-gboolean _gimp_procedural_db_proc_info    (const gchar       *procedure_name,
+G_GNUC_INTERNAL gboolean _gimp_procedural_db_proc_info    (const gchar       *procedure_name,
                                            gchar            **blurb,
                                            gchar            **help,
                                            gchar            **author,
@@ -48,7 +48,7 @@
                                            gchar            **date,
                                            GimpPDBProcType   *proc_type,
                                            gint              *num_args,
-                                           gint              *num_values) G_GNUC_INTERNAL;
+                                           gint              *num_values);
 gboolean gimp_procedural_db_proc_arg      (const gchar       *procedure_name,
                                            gint               arg_num,
                                            GimpPDBArgType    *arg_type,
@@ -59,13 +59,13 @@
                                            GimpPDBArgType    *val_type,
                                            gchar            **val_name,
                                            gchar            **val_desc);
-gboolean _gimp_procedural_db_get_data     (const gchar       *identifier,
+G_GNUC_INTERNAL gboolean _gimp_procedural_db_get_data     (const gchar       *identifier,
                                            gint              *bytes,
-                                           guint8           **data) G_GNUC_INTERNAL;
+                                           guint8           **data);
 gint     gimp_procedural_db_get_data_size (const gchar       *identifier);
-gboolean _gimp_procedural_db_set_data     (const gchar       *identifier,
+G_GNUC_INTERNAL gboolean _gimp_procedural_db_set_data     (const gchar       *identifier,
                                            gint               bytes,
-                                           const guint8      *data) G_GNUC_INTERNAL;
+                                           const guint8      *data);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimp/gimpprogress_pdb.h.orig	2006-05-31 08:31:34.226253000 +0100
+++ gimp-2.3.8/libgimp/gimpprogress_pdb.h	2006-05-31 08:35:10.993613000 +0100
@@ -29,14 +29,14 @@
 /* For information look into the C source or the html documentation */
 
 
-gboolean _gimp_progress_init             (const gchar *message,
-                                          gint32       gdisplay_ID) G_GNUC_INTERNAL;
-gboolean _gimp_progress_update           (gdouble      percentage) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean _gimp_progress_init             (const gchar *message,
+                                          gint32       gdisplay_ID);
+G_GNUC_INTERNAL gboolean _gimp_progress_update           (gdouble      percentage);
 gboolean gimp_progress_pulse             (void);
 gboolean gimp_progress_set_text          (const gchar *message);
 gint     gimp_progress_get_window_handle (void);
-gboolean _gimp_progress_install          (const gchar *progress_callback) G_GNUC_INTERNAL;
-gboolean _gimp_progress_uninstall        (const gchar *progress_callback) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean _gimp_progress_install          (const gchar *progress_callback);
+G_GNUC_INTERNAL gboolean _gimp_progress_uninstall        (const gchar *progress_callback);
 gboolean gimp_progress_cancel            (const gchar *progress_callback);
 
 
--- gimp-2.3.8/libgimp/gimpselection_pdb.h.orig	2006-05-31 08:31:34.232238000 +0100
+++ gimp-2.3.8/libgimp/gimpselection_pdb.h	2006-05-31 08:35:23.030589000 +0100
@@ -42,9 +42,9 @@
 gboolean gimp_selection_translate   (gint32          image_ID,
                                      gint            offx,
                                      gint            offy);
-gint32   _gimp_selection_float      (gint32          drawable_ID,
+G_GNUC_INTERNAL gint32   _gimp_selection_float      (gint32          drawable_ID,
                                      gint            offx,
-                                     gint            offy) G_GNUC_INTERNAL;
+                                     gint            offy);
 gboolean gimp_selection_invert      (gint32          image_ID);
 gboolean gimp_selection_sharpen     (gint32          image_ID);
 gboolean gimp_selection_all         (gint32          image_ID);
--- gimp-2.3.8/libgimp/gimptile.h.orig	2006-05-31 08:31:34.238191000 +0100
+++ gimp-2.3.8/libgimp/gimptile.h	2006-05-31 08:35:35.246477000 +0100
@@ -53,7 +53,7 @@
 
 /*  private function  */
 
-void    _gimp_tile_cache_flush_drawable (GimpDrawable *drawable) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void    _gimp_tile_cache_flush_drawable (GimpDrawable *drawable);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimp/gimpunit_pdb.h.orig	2006-05-31 08:31:34.244191000 +0100
+++ gimp-2.3.8/libgimp/gimpunit_pdb.h	2006-05-31 08:36:44.514563000 +0100
@@ -29,25 +29,25 @@
 /* For information look into the C source or the html documentation */
 
 
-gint     _gimp_unit_get_number_of_units          (void) G_GNUC_INTERNAL;
-gint     _gimp_unit_get_number_of_built_in_units (void) G_GNUC_INTERNAL;
-GimpUnit _gimp_unit_new                          (const gchar *identifier,
+G_GNUC_INTERNAL gint     _gimp_unit_get_number_of_units          (void);
+G_GNUC_INTERNAL gint     _gimp_unit_get_number_of_built_in_units (void);
+G_GNUC_INTERNAL GimpUnit _gimp_unit_new                          (const gchar *identifier,
                                                   gdouble      factor,
                                                   gint         digits,
                                                   const gchar *symbol,
                                                   const gchar *abbreviation,
                                                   const gchar *singular,
-                                                  const gchar *plural) G_GNUC_INTERNAL;
-gboolean _gimp_unit_get_deletion_flag            (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gboolean _gimp_unit_set_deletion_flag            (GimpUnit     unit_id,
-                                                  gboolean     deletion_flag) G_GNUC_INTERNAL;
-gchar*   _gimp_unit_get_identifier               (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gdouble  _gimp_unit_get_factor                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gint     _gimp_unit_get_digits                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gchar*   _gimp_unit_get_symbol                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gchar*   _gimp_unit_get_abbreviation             (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gchar*   _gimp_unit_get_singular                 (GimpUnit     unit_id) G_GNUC_INTERNAL;
-gchar*   _gimp_unit_get_plural                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
+                                                  const gchar *plural);
+G_GNUC_INTERNAL gboolean _gimp_unit_get_deletion_flag            (GimpUnit     unit_id);
+G_GNUC_INTERNAL gboolean _gimp_unit_set_deletion_flag            (GimpUnit     unit_id,
+                                                  gboolean     deletion_flag);
+G_GNUC_INTERNAL gchar*   _gimp_unit_get_identifier               (GimpUnit     unit_id);
+G_GNUC_INTERNAL gdouble  _gimp_unit_get_factor                   (GimpUnit     unit_id);
+G_GNUC_INTERNAL gint     _gimp_unit_get_digits                   (GimpUnit     unit_id);
+G_GNUC_INTERNAL gchar*   _gimp_unit_get_symbol                   (GimpUnit     unit_id);
+G_GNUC_INTERNAL gchar*   _gimp_unit_get_abbreviation             (GimpUnit     unit_id);
+G_GNUC_INTERNAL gchar*   _gimp_unit_get_singular                 (GimpUnit     unit_id);
+G_GNUC_INTERNAL gchar*   _gimp_unit_get_plural                   (GimpUnit     unit_id);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimp/gimpunitcache.h.orig	2006-05-31 08:31:34.250152000 +0100
+++ gimp-2.3.8/libgimp/gimpunitcache.h	2006-05-31 08:37:52.665126000 +0100
@@ -26,26 +26,26 @@
 G_BEGIN_DECLS
 
 
-gint          _gimp_unit_cache_get_number_of_units          (void) G_GNUC_INTERNAL;
-gint          _gimp_unit_cache_get_number_of_built_in_units (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gint          _gimp_unit_cache_get_number_of_units          (void);
+G_GNUC_INTERNAL gint          _gimp_unit_cache_get_number_of_built_in_units (void);
 
-GimpUnit      _gimp_unit_cache_new               (gchar   *identifier,
+G_GNUC_INTERNAL GimpUnit      _gimp_unit_cache_new               (gchar   *identifier,
                                                   gdouble  factor,
                                                   gint     digits,
                                                   gchar   *symbol,
                                                   gchar   *abbreviation,
                                                   gchar   *singular,
-                                                  gchar   *plural) G_GNUC_INTERNAL;
-gboolean      _gimp_unit_cache_get_deletion_flag (GimpUnit unit) G_GNUC_INTERNAL;
-void          _gimp_unit_cache_set_deletion_flag (GimpUnit unit,
-                                                  gboolean deletion_flag) G_GNUC_INTERNAL;
-gdouble       _gimp_unit_cache_get_factor        (GimpUnit unit) G_GNUC_INTERNAL;
-gint          _gimp_unit_cache_get_digits        (GimpUnit unit) G_GNUC_INTERNAL;
-const gchar * _gimp_unit_cache_get_identifier    (GimpUnit unit) G_GNUC_INTERNAL;
-const gchar * _gimp_unit_cache_get_symbol        (GimpUnit unit) G_GNUC_INTERNAL;
-const gchar * _gimp_unit_cache_get_abbreviation  (GimpUnit unit) G_GNUC_INTERNAL;
-const gchar * _gimp_unit_cache_get_singular      (GimpUnit unit) G_GNUC_INTERNAL;
-const gchar * _gimp_unit_cache_get_plural        (GimpUnit unit) G_GNUC_INTERNAL;
+                                                  gchar   *plural);
+G_GNUC_INTERNAL gboolean      _gimp_unit_cache_get_deletion_flag (GimpUnit unit);
+G_GNUC_INTERNAL void          _gimp_unit_cache_set_deletion_flag (GimpUnit unit,
+                                                  gboolean deletion_flag);
+G_GNUC_INTERNAL gdouble       _gimp_unit_cache_get_factor        (GimpUnit unit);
+G_GNUC_INTERNAL gint          _gimp_unit_cache_get_digits        (GimpUnit unit);
+G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_identifier    (GimpUnit unit);
+G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_symbol        (GimpUnit unit);
+G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_abbreviation  (GimpUnit unit);
+G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_singular      (GimpUnit unit);
+G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_plural        (GimpUnit unit);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimpbase/gimpreloc.h.orig	2006-05-31 08:31:34.256074000 +0100
+++ gimp-2.3.8/libgimpbase/gimpreloc.h	2006-05-31 08:39:05.386427000 +0100
@@ -34,19 +34,19 @@
 } GimpBinrelocInitError;
 
 
-gboolean _gimp_reloc_init            (GError **error) G_GNUC_INTERNAL;
-gboolean _gimp_reloc_init_lib        (GError **error) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean _gimp_reloc_init            (GError **error);
+G_GNUC_INTERNAL gboolean _gimp_reloc_init_lib        (GError **error);
 
-gchar * _gimp_reloc_find_exe         (const gchar *default_exe)         G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_exe_dir     (const gchar *default_dir)         G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_prefix      (const gchar *default_prefix)      G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_bin_dir     (const gchar *default_bin_dir)     G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_data_dir    (const gchar *default_data_dir)    G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_plugin_dir  (const gchar *default_plugin_dir)  G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_locale_dir  (const gchar *default_locale_dir)  G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_lib_dir     (const gchar *default_lib_dir)     G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_libexec_dir (const gchar *default_libexec_dir) G_GNUC_INTERNAL;
-gchar * _gimp_reloc_find_etc_dir     (const gchar *default_etc_dir)     G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_exe         (const gchar *default_exe);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_exe_dir     (const gchar *default_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_prefix      (const gchar *default_prefix);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_bin_dir     (const gchar *default_bin_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_data_dir    (const gchar *default_data_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_plugin_dir  (const gchar *default_plugin_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_locale_dir  (const gchar *default_locale_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_lib_dir     (const gchar *default_lib_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_libexec_dir (const gchar *default_libexec_dir);
+G_GNUC_INTERNAL gchar * _gimp_reloc_find_etc_dir     (const gchar *default_etc_dir);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimpbase/gimpwire.h.orig	2006-05-31 08:31:34.262011000 +0100
+++ gimp-2.3.8/libgimpbase/gimpwire.h	2006-05-31 08:40:14.697618000 +0100
@@ -81,54 +81,54 @@
 
 void      gimp_wire_destroy       (GimpWireMessage *msg);
 
-gboolean  _gimp_wire_read_int32   (GIOChannel      *channel,
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_int32   (GIOChannel      *channel,
                                    guint32         *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_read_int16   (GIOChannel           *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_int16   (GIOChannel           *channel,
                                    guint16         *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_read_int8    (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_int8    (GIOChannel      *channel,
                                    guint8          *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_read_double  (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_double  (GIOChannel      *channel,
                                    gdouble         *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_read_string  (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_string  (GIOChannel      *channel,
                                    gchar          **data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_read_color   (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_read_color   (GIOChannel      *channel,
                                    GimpRGB         *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_int32  (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_int32  (GIOChannel      *channel,
                                    const guint32   *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_int16  (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_int16  (GIOChannel      *channel,
                                    const guint16   *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_int8   (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_int8   (GIOChannel      *channel,
                                    const guint8    *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_double (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_double (GIOChannel      *channel,
                                    const gdouble   *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_string (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_string (GIOChannel      *channel,
                                    gchar          **data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
-gboolean  _gimp_wire_write_color  (GIOChannel      *channel,
+                                   gpointer         user_data);
+G_GNUC_INTERNAL gboolean  _gimp_wire_write_color  (GIOChannel      *channel,
                                    const GimpRGB   *data,
                                    gint             count,
-                                   gpointer         user_data) G_GNUC_INTERNAL;
+                                   gpointer         user_data);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimpthumb/gimpthumb-utils.h.orig	2006-05-31 08:31:34.267937000 +0100
+++ gimp-2.3.8/libgimpthumb/gimpthumb-utils.h	2006-05-31 08:40:30.265090000 +0100
@@ -58,9 +58,9 @@
 
 
 /*  for internal use only   */
-void                _gimp_thumbs_delete_others        (const gchar    *uri,
-                                                       GimpThumbSize   size) G_GNUC_INTERNAL;
-gchar *             _gimp_thumb_filename_from_uri     (const gchar    *uri) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void                _gimp_thumbs_delete_others        (const gchar    *uri,
+                                                       GimpThumbSize   size);
+G_GNUC_INTERNAL gchar *             _gimp_thumb_filename_from_uri     (const gchar    *uri);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimpwidgets/gimpcolorarea.h.orig	2006-05-31 08:31:34.273879000 +0100
+++ gimp-2.3.8/libgimpwidgets/gimpcolorarea.h	2006-05-31 08:40:44.903501000 +0100
@@ -90,14 +90,14 @@
                                              gboolean           draw_border);
 
 /*  only for private use in libgimpwidgets  */
-void        _gimp_color_area_render_buf     (GtkWidget         *widget,
+G_GNUC_INTERNAL void        _gimp_color_area_render_buf     (GtkWidget         *widget,
                                              gboolean           insensitive,
                                              GimpColorAreaType  type,
                                              guchar            *buf,
                                              guint              width,
                                              guint              height,
                                              guint              rowstride,
-                                             GimpRGB           *color) G_GNUC_INTERNAL;
+                                             GimpRGB           *color);
 
 
 G_END_DECLS
--- gimp-2.3.8/libgimpwidgets/gimphelpui.h.orig	2006-05-31 08:31:34.279797000 +0100
+++ gimp-2.3.8/libgimpwidgets/gimphelpui.h	2006-05-31 08:40:56.321738000 +0100
@@ -28,7 +28,7 @@
 /* For information look into the C source or the html documentation */
 
 
-void  _gimp_help_init              (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void  _gimp_help_init              (void);
 
 void  gimp_help_enable_tooltips    (void);
 void  gimp_help_disable_tooltips   (void);
