--- gtk-engines-2.7.5/engines/support/cairo-support.h.orig	2006-07-21 17:29:09.824703000 +0100
+++ gtk-engines-2.7.5/engines/support/cairo-support.h	2006-07-21 17:30:50.072089000 +0100
@@ -44,25 +44,25 @@
 	CR_MIRROR_VERTICAL   = 1 << 1,
 } CairoMirror;
 
-void ge_hsb_from_color (const CairoColor *color, gdouble *hue, gdouble *saturation, gdouble *brightness) G_GNUC_INTERNAL;
-void ge_color_from_hsb (gdouble hue, gdouble saturation, gdouble brightness, CairoColor *color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_hsb_from_color (const CairoColor *color, gdouble *hue, gdouble *saturation, gdouble *brightness);
+G_GNUC_INTERNAL void ge_color_from_hsb (gdouble hue, gdouble saturation, gdouble brightness, CairoColor *color);
 
-void ge_gdk_color_to_cairo (GdkColor * gc, CairoColor * cc) G_GNUC_INTERNAL;
-void ge_cairo_color_to_gtk (CairoColor *cc, GdkColor *c) G_GNUC_INTERNAL;
-void ge_gtk_style_to_cairo_color_cube (GtkStyle * style, CairoColorCube *cube) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_gdk_color_to_cairo (GdkColor * gc, CairoColor * cc);
+G_GNUC_INTERNAL void ge_cairo_color_to_gtk (CairoColor *cc, GdkColor *c);
+G_GNUC_INTERNAL void ge_gtk_style_to_cairo_color_cube (GtkStyle * style, CairoColorCube *cube);
 
-void ge_shade_color(const CairoColor *base, gdouble shade_ratio, CairoColor *composite) G_GNUC_INTERNAL;
-void ge_saturate_color (const CairoColor * base, gdouble saturate_level, CairoColor *composite) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_shade_color(const CairoColor *base, gdouble shade_ratio, CairoColor *composite);
+G_GNUC_INTERNAL void ge_saturate_color (const CairoColor * base, gdouble saturate_level, CairoColor *composite);
 
-cairo_t * ge_gdk_drawable_to_cairo (GdkDrawable  *window, GdkRectangle *area) G_GNUC_INTERNAL;
-void ge_cairo_set_color (cairo_t *cr, CairoColor *color) G_GNUC_INTERNAL;
-void ge_cairo_pattern_add_color_stop_color (cairo_pattern_t *pattern, gfloat offset, CairoColor *color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL cairo_t * ge_gdk_drawable_to_cairo (GdkDrawable  *window, GdkRectangle *area);
+G_GNUC_INTERNAL void ge_cairo_set_color (cairo_t *cr, CairoColor *color);
+G_GNUC_INTERNAL void ge_cairo_pattern_add_color_stop_color (cairo_pattern_t *pattern, gfloat offset, CairoColor *color);
 
-void ge_cairo_rounded_rectangle (cairo_t *cr, double x, double y, double w, double h, double radius, CairoCorners corners) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_cairo_rounded_rectangle (cairo_t *cr, double x, double y, double w, double h, double radius, CairoCorners corners);
 
-void ge_cairo_simple_border (cairo_t *cr, CairoColor * tl, CairoColor * br, gint x, gint y, gint width, gint height, gboolean topleft_overlap) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_cairo_simple_border (cairo_t *cr, CairoColor * tl, CairoColor * br, gint x, gint y, gint width, gint height, gboolean topleft_overlap);
 
-void ge_cairo_line (cairo_t *cr, CairoColor *color, gint x1, gint y1, gint x2, gint y2) G_GNUC_INTERNAL;
-void ge_cairo_polygon (cairo_t *cr, CairoColor *color, GdkPoint *points, gint npoints) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_cairo_line (cairo_t *cr, CairoColor *color, gint x1, gint y1, gint x2, gint y2);
+G_GNUC_INTERNAL void ge_cairo_polygon (cairo_t *cr, CairoColor *color, GdkPoint *points, gint npoints);
 
-void ge_cairo_mirror (cairo_t *cr, CairoMirror mirror, gint *x, gint *y, gint *width, gint *height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_cairo_mirror (cairo_t *cr, CairoMirror mirror, gint *x, gint *y, gint *width, gint *height);
--- gtk-engines-2.7.5/engines/support/widget-information.h.orig	2006-07-21 17:29:09.827087000 +0100
+++ gtk-engines-2.7.5/engines/support/widget-information.h	2006-07-21 17:32:08.998948000 +0100
@@ -66,28 +66,28 @@
  
 #define TOGGLE_BUTTON(object) (IS_TOGGLE_BUTTON(object)?(GtkToggleButton *)object:NULL)
  
-gboolean ge_object_is_a (const GtkWidget * widget, const gchar * type_name) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_object_is_a (const GtkWidget * widget, const gchar * type_name);
  
-gboolean ge_combo_box_is_using_list (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_combo_box_is_using_list (GtkWidget * widget);
 
-gboolean ge_is_combo_box_entry (GtkWidget * widget) G_GNUC_INTERNAL;
-gboolean ge_is_combo_box (GtkWidget * widget, gboolean as_list) G_GNUC_INTERNAL;
-gboolean ge_is_combo (GtkWidget * widget) G_GNUC_INTERNAL;
-gboolean ge_is_in_combo_box (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_is_combo_box_entry (GtkWidget * widget);
+G_GNUC_INTERNAL gboolean ge_is_combo_box (GtkWidget * widget, gboolean as_list);
+G_GNUC_INTERNAL gboolean ge_is_combo (GtkWidget * widget);
+G_GNUC_INTERNAL gboolean ge_is_in_combo_box (GtkWidget * widget);
   
-gboolean ge_is_toolbar_item (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_is_toolbar_item (GtkWidget * widget);
   
-gboolean ge_is_panel_widget_item (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_is_panel_widget_item (GtkWidget * widget);
  
-gboolean ge_is_bonobo_dock_item (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_is_bonobo_dock_item (GtkWidget * widget);
 
-GtkWidget *ge_find_combo_box_widget_parent (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GtkWidget *ge_find_combo_box_widget_parent (GtkWidget * widget);
 
-gboolean ge_cell_renderer_toggle_get_inconsistent (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_cell_renderer_toggle_get_inconsistent (GtkWidget * widget);
 
-void ge_option_menu_get_props (GtkWidget * widget, 
+G_GNUC_INTERNAL void ge_option_menu_get_props (GtkWidget * widget, 
                             GtkRequisition * indicator_size, 
-                            GtkBorder * indicator_spacing) G_GNUC_INTERNAL;
+                            GtkBorder * indicator_spacing);
 
-gboolean ge_widget_is_ltr (GtkWidget *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean ge_widget_is_ltr (GtkWidget *widget);
 
--- gtk-engines-2.7.6/engines/hc/src/hc_gtk2_support.h.orig	2006-07-27 08:48:21.242752000 +0100
+++ gtk-engines-2.7.6/engines/hc/src/hc_gtk2_support.h	2006-07-27 08:49:08.889062000 +0100
@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-void 
+G_GNUC_INTERNAL void 
 hc_simple_border_gap_clip(cairo_t *canvas,
 				gint border_thickness,
 
@@ -32,31 +32,31 @@
 
 				GtkPositionType gap_side,
 				gint gap_pos,
-				gint gap_size) G_GNUC_INTERNAL;
+				gint gap_size);
 
-void do_hc_draw_arrow (cairo_t *cr,
+G_GNUC_INTERNAL void do_hc_draw_arrow (cairo_t *cr,
                             CairoColor *color,
                             GtkArrowType arrow_type, 
                             gboolean fill,
                             gint x, 
                             gint y, 
                             gint width, 
-                            gint height) G_GNUC_INTERNAL;
+                            gint height);
                             
-void do_hc_draw_line (cairo_t *cr,
+G_GNUC_INTERNAL void do_hc_draw_line (cairo_t *cr,
 			CairoColor *color,
 			gdouble thickness,
 			gdouble x1,
 			gdouble y1,
 			gdouble x2,
-			gdouble y2) G_GNUC_INTERNAL;
+			gdouble y2);
  
-void do_hc_draw_dot (cairo_t *canvas,
+G_GNUC_INTERNAL void do_hc_draw_dot (cairo_t *canvas,
 			CairoColor * light,
 			CairoColor * dark,
 			gint x,
-			gint y) G_GNUC_INTERNAL;
+			gint y);
 
  
-void hc_gtk2_engine_hack_menu_shell_setup_signals(GtkWidget *widget) G_GNUC_INTERNAL;
-void hc_gtk2_engine_hack_menu_shell_cleanup_signals(GtkWidget *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void hc_gtk2_engine_hack_menu_shell_setup_signals(GtkWidget *widget);
+G_GNUC_INTERNAL void hc_gtk2_engine_hack_menu_shell_cleanup_signals(GtkWidget *widget);
--- gtk-engines-2.7.6/engines/hc/src/hc_gtk2_drawing.h.orig	2006-07-27 08:50:24.030471000 +0100
+++ gtk-engines-2.7.6/engines/hc/src/hc_gtk2_drawing.h	2006-07-27 08:53:02.765091000 +0100
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-void
+G_GNUC_INTERNAL void
 hc_draw_shadow_gap (GtkStyle * style, 
                  GdkWindow * window, 
 		 GtkStateType state_type, 
@@ -33,9 +33,9 @@
 		 gint height, 
 		 GtkPositionType gap_side, 
 		 gint gap_pos, 
-		 gint gap_size) G_GNUC_INTERNAL;
+		 gint gap_size);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_box_gap (GtkStyle * style, 
                  GdkWindow * window, 
 		 GtkStateType state_type, 
@@ -49,9 +49,9 @@
 		 gint height, 
 		 GtkPositionType gap_side, 
 		 gint gap_pos, 
-		 gint gap_size) G_GNUC_INTERNAL;
+		 gint gap_size);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_hline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -60,9 +60,9 @@
 	    const gchar * detail, 
             gint x1,
             gint x2, 
-            gint y) G_GNUC_INTERNAL;
+            gint y);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_vline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -71,9 +71,9 @@
 	    const gchar * detail, 
             gint y1, 
             gint y2, 
-            gint x) G_GNUC_INTERNAL;
+            gint x);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_check (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -84,9 +84,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_option (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state,
@@ -97,9 +97,9 @@
              gint x,
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_arrow (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -112,9 +112,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_shadow (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -125,9 +125,9 @@
              gint x, 
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_box (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state_type,
@@ -138,9 +138,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_flat_box (GtkStyle	*style,
                   GdkWindow	*window,
                   GtkStateType	 state_type,
@@ -151,9 +151,9 @@
                   gint		 x,
                   gint		 y,
                   gint		 width,
-                  gint		 height) G_GNUC_INTERNAL;
+                  gint		 height);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_tab (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state,
@@ -164,9 +164,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_slider (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -178,9 +178,9 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
  
-void
+G_GNUC_INTERNAL void
 hc_draw_extension (GtkStyle * style,
 		GdkWindow * window,
 		GtkStateType state_type,
@@ -192,9 +192,9 @@
 		gint y, 
                 gint width, 
                 gint height, 
-                GtkPositionType gap_side) G_GNUC_INTERNAL;
+                GtkPositionType gap_side);
                 
-void
+G_GNUC_INTERNAL void
 hc_draw_handle (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -206,10 +206,10 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
 
 
-void
+G_GNUC_INTERNAL void
 hc_draw_focus(GtkStyle *style,
            GdkWindow *window,
            GtkStateType state_type,
@@ -219,9 +219,9 @@
            gint x,
            gint y,
            gint width,
-           gint height) G_GNUC_INTERNAL;
+           gint height);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_layout (GtkStyle        *style,
 	     GdkWindow       *window,
 	     GtkStateType     state_type,
@@ -231,9 +231,9 @@
 	     const char      *detail,
 	     int              x,
 	     int              y,
-	     PangoLayout      *layout) G_GNUC_INTERNAL;
+	     PangoLayout      *layout);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_diamond (GtkStyle      *style,
 		 GdkWindow     *window,
 		 GtkStateType   state_type,
@@ -244,9 +244,9 @@
 		 gint           x,
 		 gint           y,
 		 gint           width,
-		 gint           height) G_GNUC_INTERNAL;
+		 gint           height);
 
-void
+G_GNUC_INTERNAL void
 hc_draw_polygon (GtkStyle      *style,
 		 GdkWindow     *window,
 		 GtkStateType   state_type,
@@ -256,5 +256,5 @@
 		 const gchar   *detail,
 		 GdkPoint      *points,
 		 gint           npoints,
-		 gboolean       fill) G_GNUC_INTERNAL;
+		 gboolean       fill);
 
--- gtk-engines-2.7.6/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.h.orig	2006-07-27 09:44:00.105485000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.h	2006-07-27 09:53:24.336716000 +0100
@@ -319,188 +319,188 @@
     TOKEN_LAST = TOKEN_DEPRECATED_GRADIENT
   };
 
-extern ThemeSymbols smooth_theme_symbols[] G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern ThemeSymbols smooth_theme_symbols[];
 
 /* fill part */
-gint smooth_fill_style(GtkStyle * style, void *part) G_GNUC_INTERNAL;
-gint smooth_fill_gradient_direction(GtkStyle * style, void *part, gboolean horizontal) G_GNUC_INTERNAL;
-gboolean smooth_fill_quadratic_gradient(GtkStyle * style, void *part) G_GNUC_INTERNAL;
-gdouble smooth_fill_shade1_value(GtkStyle * style, void *part) G_GNUC_INTERNAL;
-gdouble smooth_fill_shade2_value(GtkStyle * style, void *part) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gint smooth_fill_style(GtkStyle * style, void *part);
+G_GNUC_INTERNAL gint smooth_fill_gradient_direction(GtkStyle * style, void *part, gboolean horizontal);
+G_GNUC_INTERNAL gboolean smooth_fill_quadratic_gradient(GtkStyle * style, void *part);
+G_GNUC_INTERNAL gdouble smooth_fill_shade1_value(GtkStyle * style, void *part);
+G_GNUC_INTERNAL gdouble smooth_fill_shade2_value(GtkStyle * style, void *part);
 
-SmoothColor smooth_fill_color1(GtkStyle * style, void *part, GtkStateType state) G_GNUC_INTERNAL;
-SmoothColor smooth_fill_color2(GtkStyle * style, void *part, GtkStateType state) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothColor smooth_fill_color1(GtkStyle * style, void *part, GtkStateType state);
+G_GNUC_INTERNAL SmoothColor smooth_fill_color2(GtkStyle * style, void *part, GtkStateType state);
 
-GString *smooth_fill_file_name(GtkStyle * style, void *part, GtkStateType state) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GString *smooth_fill_file_name(GtkStyle * style, void *part, GtkStateType state);
 
 /* tab part styles*/
-smooth_part_style *smooth_tab_part(GtkStyle * style, gboolean for_active_tab) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL smooth_part_style *smooth_tab_part(GtkStyle * style, gboolean for_active_tab);
 
-gint smooth_tab_get_style(GtkStyle * style, gboolean for_active_tab) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gint smooth_tab_get_style(GtkStyle * style, gboolean for_active_tab);
 
-SmoothFillPart *smooth_tab_fill(GtkStyle * style, gboolean for_active_tab) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothFillPart *smooth_tab_fill(GtkStyle * style, gboolean for_active_tab);
 
-SmoothBevelStyle smooth_tab_edge_line_style(GtkStyle * style, gboolean for_active_tab) G_GNUC_INTERNAL;
-gint smooth_tab_edge_line_thickness(GtkStyle * style, gboolean for_active_tab) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBevelStyle smooth_tab_edge_line_style(GtkStyle * style, gboolean for_active_tab);
+G_GNUC_INTERNAL gint smooth_tab_edge_line_thickness(GtkStyle * style, gboolean for_active_tab);
 
 /* button part styles*/
-smooth_part_style *smooth_button_part(GtkStyle * style, gboolean for_default_button) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL smooth_part_style *smooth_button_part(GtkStyle * style, gboolean for_default_button);
 
-gint smooth_button_get_style(GtkStyle * style, gboolean for_default_button) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gint smooth_button_get_style(GtkStyle * style, gboolean for_default_button);
 
-gboolean smooth_button_default_triangle(GtkStyle * style) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean smooth_button_default_triangle(GtkStyle * style);
 
-SmoothFillPart *smooth_button_fill(GtkStyle * style, gboolean for_default_button) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothFillPart *smooth_button_fill(GtkStyle * style, gboolean for_default_button);
 
-SmoothBevelStyle smooth_button_edge_line_style(GtkStyle * style, gboolean for_default_button) G_GNUC_INTERNAL;
-gint smooth_button_edge_line_thickness(GtkStyle * style, gboolean for_default_button) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBevelStyle smooth_button_edge_line_style(GtkStyle * style, gboolean for_default_button);
+G_GNUC_INTERNAL gint smooth_button_edge_line_thickness(GtkStyle * style, gboolean for_default_button);
 
 /* Custom Enum Translators */
-gboolean SmoothTranslateFillStyleName (gchar * str, SmoothFillStyle *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateGradientDirectionName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateLineStyleName (gchar * str, SmoothBevelStyle *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateButtonDefaultStyleName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateTabStyleName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateGripStyleName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateCheckStyleName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateEdgeStyleName (gchar * str, gint *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateArrowStyleName (gchar * str, SmoothArrowStyle *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateArrowTypeName (gchar * str, SmoothArrowStyle *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateStateName (gchar * str, int *retval) G_GNUC_INTERNAL;
-gboolean SmoothTranslateBooleanName (gchar * str, gint *retval) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean SmoothTranslateFillStyleName (gchar * str, SmoothFillStyle *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateGradientDirectionName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateLineStyleName (gchar * str, SmoothBevelStyle *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateButtonDefaultStyleName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateTabStyleName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateGripStyleName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateCheckStyleName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateEdgeStyleName (gchar * str, gint *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateArrowStyleName (gchar * str, SmoothArrowStyle *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateArrowTypeName (gchar * str, SmoothArrowStyle *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateStateName (gchar * str, int *retval);
+G_GNUC_INTERNAL gboolean SmoothTranslateBooleanName (gchar * str, gint *retval);
 
 /* General Parsing Functions */
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_int (GScanner *scanner, 
                  GTokenType wanted_token, 
 		 guint return_default,
 		 gint *retval, 
 		 gint lower_limit, 
-		 gint upper_limit) G_GNUC_INTERNAL;
+		 gint upper_limit);
 		 
-guint  
+G_GNUC_INTERNAL guint  
 smooth_rc_parse_float (GScanner *scanner, 
                  GTokenType wanted_token, 
 		 gdouble return_default, 
 		 gdouble *retval, 
 		 gdouble lower_limit, 
-		 gdouble upper_limit) G_GNUC_INTERNAL;
+		 gdouble upper_limit);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_custom_enum (GScanner *scanner, 
                          GTokenType wanted_token, 
 			 SmoothSmoothTranslateEnumFunc translate_enum,
 			 guint return_default,
-			 guint *retval) G_GNUC_INTERNAL;
+			 guint *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_boolean(GScanner *scanner,  
                     GTokenType wanted_token, 
 		    gboolean return_default, 
-		    guint *retval) G_GNUC_INTERNAL;
+		    guint *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_line (GScanner *scanner, 
                   GTokenType wanted_token, 
-                  SmoothLinePart *retval) G_GNUC_INTERNAL;
+                  SmoothLinePart *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_focus(GScanner *scanner, 
                   GTokenType wanted_token, 
-                  smooth_focus_style *retval) G_GNUC_INTERNAL;
+                  smooth_focus_style *retval);
                   
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_arrow_part(GScanner *scanner, 
                        GTokenType wanted_token, 
-                       SmoothArrowPart *retval) G_GNUC_INTERNAL;
+                       SmoothArrowPart *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_fill(GScanner *scanner, 
                  GTokenType wanted_token, 
-                 SmoothFillPart *retval) G_GNUC_INTERNAL;
+                 SmoothFillPart *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_edge(GScanner *scanner, 
                  GTokenType wanted_token, 
-                 smooth_edge_style *retval) G_GNUC_INTERNAL;
+                 smooth_edge_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_button_default(GScanner *scanner, 
                            GTokenType wanted_token, 
-                           smooth_part_style *retval) G_GNUC_INTERNAL;
+                           smooth_part_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_button(GScanner *scanner, 
                    GTokenType wanted_token, 
-                   smooth_button_style *retval) G_GNUC_INTERNAL;
+                   smooth_button_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_active_tab(GScanner *scanner, 
                        GTokenType wanted_token, 
-                       smooth_part_style *retval) G_GNUC_INTERNAL;
+                       smooth_part_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_tab(GScanner *scanner, 
                 GTokenType wanted_token, 
-                smooth_tab_style *retval) G_GNUC_INTERNAL;
+                smooth_tab_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_option(GScanner *scanner, 
                    GTokenType wanted_token, 
-                   smooth_check_style *retval) G_GNUC_INTERNAL;
+                   smooth_check_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_grip(GScanner *scanner, 
                  GTokenType wanted_token, 
-                 smooth_grip_style *retval) G_GNUC_INTERNAL;
+                 smooth_grip_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_stepper(GScanner *scanner, 
                  GTokenType wanted_token, 
-                 SmoothStepperStyle *retval) G_GNUC_INTERNAL;
+                 SmoothStepperStyle *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_check(GScanner *scanner, 
                   GTokenType wanted_token,
-                  smooth_check_style *retval) G_GNUC_INTERNAL;
+                  smooth_check_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_generic_part(GScanner *scanner, 
                          GTokenType wanted_token, 
-                         smooth_part_style *retval) G_GNUC_INTERNAL;
+                         smooth_part_style *retval);
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_trough_part(GScanner *scanner, 
                         GTokenType wanted_token, 
-                        smooth_trough_style *retval) G_GNUC_INTERNAL;
+                        smooth_trough_style *retval);
 
-void 
+G_GNUC_INTERNAL void 
 part_init(smooth_part_style *part, 
-          gint partstyle) G_GNUC_INTERNAL;
-void 
+          gint partstyle);
+G_GNUC_INTERNAL void 
 part_merge (smooth_part_style *dest_part, 
-            smooth_part_style *src_part) G_GNUC_INTERNAL;
+            smooth_part_style *src_part);
 
-void
+G_GNUC_INTERNAL void
 smooth_arrow_merge (SmoothArrowPart *dest_arrow,
-             SmoothArrowPart *src_arrow) G_GNUC_INTERNAL;
+             SmoothArrowPart *src_arrow);
 
-void
+G_GNUC_INTERNAL void
 smooth_style_get_border(GtkStyle * style,
                             GtkStateType state_type,
 	  		    GtkShadowType shadow_type,
 			    const gchar * detail,
 			    void * part,
 			    gdouble CornerRoundness,
-			    SmoothBorder *Border) G_GNUC_INTERNAL;
+			    SmoothBorder *Border);
 
-void
+G_GNUC_INTERNAL void
 smooth_style_get_arrow(SmoothArrowPart *Part,
 				GtkStateType State,
 				GtkArrowType ArrowType,
-				SmoothArrow *Arrow) G_GNUC_INTERNAL;
+				SmoothArrow *Arrow);
 
-void
-smooth_gtkrc_ensure_arrows(SmoothArrowPart *Part) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void
+smooth_gtkrc_ensure_arrows(SmoothArrowPart *Part);
 
 #endif /*SMOOTH_GTK_RC*/
--- gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_misc.h.orig	2006-07-27 09:07:01.054103000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_misc.h	2006-07-27 09:07:54.181662000 +0100
@@ -80,30 +80,30 @@
 
 #define FUZZY_COMPARE(i, j, fudge) ((i>j)?(i - j <= fudge):(j - i <= fudge))
 
-GdkBitmap * smooth_arc_clip_mask(gint width, gint height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GdkBitmap * smooth_arc_clip_mask(gint width, gint height);
 #define clip_mask_unref g_object_unref
 
-gboolean sanitize_parameters(GtkStyle * style, GdkWindow * window, gint * width, gint * height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean sanitize_parameters(GtkStyle * style, GdkWindow * window, gint * width, gint * height);
 
-GtkWidget* get_combo_box_widget_parent (GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GtkWidget* get_combo_box_widget_parent (GtkWidget * widget);
 
 /* Notebook Tab Info */
 
 /*
-GtkWidget * get_notebook_page(GtkWidget * widget) G_GNUC_INTERNAL;
-GtkWidget * get_tab_label(GtkWidget *page, GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GtkWidget * get_notebook_page(GtkWidget * widget);
+G_GNUC_INTERNAL GtkWidget * get_tab_label(GtkWidget *page, GtkWidget * widget);
 
-gboolean widget_is_tab_label(GtkWidget *page, GtkWidget * widget) G_GNUC_INTERNAL;
-gboolean tab_label_is_current_page(GtkWidget *page, GtkWidget * widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean widget_is_tab_label(GtkWidget *page, GtkWidget * widget);
+G_GNUC_INTERNAL gboolean tab_label_is_current_page(GtkWidget *page, GtkWidget * widget);
 */
 /* Arrow Sizing Workarounds */
-void smooth_reverse_engineer_stepper_box(GtkWidget *range, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height) G_GNUC_INTERNAL;
-void smooth_reverse_engineer_spin_button(GtkWidget *widget, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void smooth_reverse_engineer_stepper_box(GtkWidget *range, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height);
+G_GNUC_INTERNAL void smooth_reverse_engineer_spin_button(GtkWidget *widget, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height);
 
-void smooth_reverse_engineer_arrow_box(GtkWidget *widget, const gchar * detail, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void smooth_reverse_engineer_arrow_box(GtkWidget *widget, const gchar * detail, GtkArrowType arrow_type, gint *x, gint *y, gint *width, gint *height);
 
-void smooth_gtk_button_get_props (GtkWidget *widget, GtkBorder *default_border, GtkBorder *default_outside_border, gboolean  *interior_focus) G_GNUC_INTERNAL;
-void smooth_gtk_widget_get_focus_props (GtkWidget *widget, gint *focus_line_width, gint *focus_padding, gboolean  *interior_focus) G_GNUC_INTERNAL;
-gboolean smooth_cell_renderer_toggle_get_inconsistent (GtkWidget *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void smooth_gtk_button_get_props (GtkWidget *widget, GtkBorder *default_border, GtkBorder *default_outside_border, gboolean  *interior_focus);
+G_GNUC_INTERNAL void smooth_gtk_widget_get_focus_props (GtkWidget *widget, gint *focus_line_width, gint *focus_padding, gboolean  *interior_focus);
+G_GNUC_INTERNAL gboolean smooth_cell_renderer_toggle_get_inconsistent (GtkWidget *widget);
 
 #endif /* SMOOTH_GTK2_MISC_H */
--- gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_rc.h.orig	2006-07-27 09:07:54.892556000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_rc.h	2006-07-27 09:13:46.560638000 +0100
@@ -82,24 +82,24 @@
   guint quit_handler_id;
 } SmoothRcStyle;
 
-void smooth_rc_style_init (SmoothRcStyle *style) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void smooth_rc_style_init (SmoothRcStyle *style);
 
-void
+G_GNUC_INTERNAL void
 smooth_gtkrc_style_merge (SmoothRcStyleData *dest_data,
-                          SmoothRcStyleData *src_data) G_GNUC_INTERNAL;
+                          SmoothRcStyleData *src_data);
 
-guint
+G_GNUC_INTERNAL guint
 smooth_gtkrc_parse(GScanner   *Scanner,
 			GtkSettings  *Settings,
 			SmoothRcStyle *Style,
-			guint Token) G_GNUC_INTERNAL;
+			guint Token);
 
 #define is_enum(str, value)  (g_ascii_strncasecmp(str, value, strlen(value)) == 0)
 
-guint 
+G_GNUC_INTERNAL guint 
 smooth_rc_parse_pixmap(GScanner *scanner, 
                    GTokenType wanted_token, 
                    gchar *default_value,
-                   GString **retval) G_GNUC_INTERNAL;
+                   GString **retval);
 
 #endif /*SMOOTH_GTK2_RC*/
--- gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_drawing.h.orig	2006-07-27 09:13:48.373460000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_drawing.h	2006-07-27 09:17:04.813692000 +0100
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <string.h>
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_shadow(GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -40,9 +40,9 @@
 	    gint x,
 	    gint y,
 	    gint width,
-	    gint height) G_GNUC_INTERNAL;
+	    gint height);
 	    
-void
+G_GNUC_INTERNAL void
 smooth_draw_hline(GtkStyle * style,
 	   GdkWindow * window,
 	   GtkStateType state_type,
@@ -51,9 +51,9 @@
 	   const gchar * detail,
 	   gint x1,
 	   gint x2,
-	   gint y) G_GNUC_INTERNAL;
+	   gint y);
 	   
-void
+G_GNUC_INTERNAL void
 smooth_draw_vline(GtkStyle * style,
 	   GdkWindow * window,
 	   GtkStateType state_type,
@@ -62,9 +62,9 @@
 	   const gchar * detail,
 	   gint y1,
 	   gint y2,
-	   gint x) G_GNUC_INTERNAL;
+	   gint x);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_polygon(GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -74,9 +74,9 @@
 	     const gchar * detail,
 	     GdkPoint * points,
 	     gint npoints,
-	     gint fill) G_GNUC_INTERNAL;
+	     gint fill);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_arrow(GtkStyle * style,
 	   GdkWindow * window,
 	   GtkStateType state_type,
@@ -89,9 +89,9 @@
 	   gint x,
 	   gint y,
 	   gint width,
-	   gint height) G_GNUC_INTERNAL;
+	   gint height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_focus(GtkStyle *style,
            GdkWindow *window,
            GtkStateType state_type,
@@ -101,9 +101,9 @@
            gint x,
            gint y,
            gint width,
-           gint height) G_GNUC_INTERNAL;
+           gint height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_slider(GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -115,9 +115,9 @@
 	    gint y,
 	    gint width,
 	    gint height,
-	    GtkOrientation orientation) G_GNUC_INTERNAL;
+	    GtkOrientation orientation);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_extension(GtkStyle * style,
 	       GdkWindow * window,
 	       GtkStateType state_type,
@@ -129,9 +129,9 @@
 	       gint y,
 	       gint width,
 	       gint height,
-	       GtkPositionType gap_side) G_GNUC_INTERNAL;
+	       GtkPositionType gap_side);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_box(GtkStyle * style,
 	 GdkWindow * window,
 	 GtkStateType state_type,
@@ -142,9 +142,9 @@
 	 gint x,
 	 gint y,
 	 gint width,
-	 gint height) G_GNUC_INTERNAL;
+	 gint height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_box_gap (GtkStyle * style, 
               GdkWindow * window, 
 	      GtkStateType state_type, 
@@ -158,9 +158,9 @@
 	      gint height, 
 	      GtkPositionType gap_side, 
 	      gint gap_pos, 
-	      gint gap_width) G_GNUC_INTERNAL;
+	      gint gap_width);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_shadow_gap (GtkStyle * style, 
                  GdkWindow * window, 
 		 GtkStateType state_type, 
@@ -174,9 +174,9 @@
 		 gint height, 
 		 GtkPositionType gap_side, 
 		 gint gap_pos, 
-		 gint gap_width) G_GNUC_INTERNAL;
+		 gint gap_width);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_option(GtkStyle * style,
             GdkWindow * window,
             GtkStateType state_type,
@@ -187,9 +187,9 @@
             gint X,
             gint Y,
             gint Width,
-            gint Height) G_GNUC_INTERNAL;
+            gint Height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_check(GtkStyle * style,
 	   GdkWindow * window,
 	   GtkStateType state_type,
@@ -200,9 +200,9 @@
 	   gint x,
 	   gint y,
 	   gint width,
-	   gint height) G_GNUC_INTERNAL;
+	   gint height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_diamond(GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -213,9 +213,9 @@
 	     gint x,
 	     gint y,
 	     gint width,
-	     gint height) G_GNUC_INTERNAL;
+	     gint height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_handle(GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -227,9 +227,9 @@
 	    gint y,
 	    gint width,
 	    gint height,
-	    GtkOrientation orientation) G_GNUC_INTERNAL;
+	    GtkOrientation orientation);
    
-void
+G_GNUC_INTERNAL void
 smooth_draw_resize_grip (GtkStyle       *style,
                               GdkWindow      *window,
                               GtkStateType    state_type,
@@ -240,9 +240,9 @@
                               gint            x,
                               gint            y,
                               gint            width,
-                              gint            height) G_GNUC_INTERNAL;
+                              gint            height);
 
-void
+G_GNUC_INTERNAL void
 smooth_draw_tab (GtkStyle      *style,
 		      GdkWindow     *window,
 		      GtkStateType   state_type,
@@ -253,9 +253,9 @@
 		      gint           x,
 		      gint           y,
 		      gint           width,
-		      gint           height) G_GNUC_INTERNAL;
+		      gint           height);
 
-void 
+G_GNUC_INTERNAL void 
 smooth_draw_flat_box (GtkStyle * style,
                GdkWindow * window,
 	       GtkStateType state_type,
@@ -263,4 +263,4 @@
 	       GdkRectangle * area,
 	       GtkWidget * widget,
 	       const gchar * detail,
-	       gint x, gint y, gint width, gint height) G_GNUC_INTERNAL;                                        
+	       gint x, gint y, gint width, gint height);                                        
--- gtk-engines-2.7.6/engines/smooth/src/interfaces/abstract/abstract_drawing_interface.h.orig	2006-07-27 09:17:59.520019000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/interfaces/abstract/abstract_drawing_interface.h	2006-07-27 09:19:53.142919000 +0100
@@ -23,7 +23,7 @@
 #ifndef ABSTRACT_DRAWING_INTERFACE_H
 #define ABSTRACT_DRAWING_INTERFACE_H
 
-SmoothBool SmoothAbstractDrawingInterfaceInitialize(DrawingInterfaceClass *_SmoothDrawingInterface) G_GNUC_INTERNAL;
-SmoothBool SmoothAbstractDrawingInterfaceFinalize(DrawingInterfaceClass *_SmoothDrawingInterface) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool SmoothAbstractDrawingInterfaceInitialize(DrawingInterfaceClass *_SmoothDrawingInterface);
+G_GNUC_INTERNAL SmoothBool SmoothAbstractDrawingInterfaceFinalize(DrawingInterfaceClass *_SmoothDrawingInterface);
 
 #endif /* ABSTRACT_DRAWING_INTERFACE_H */
--- gtk-engines-2.7.6/engines/smooth/src/interfaces/shared/gdk/gdk_private_drawing_interface.h.orig	2006-07-27 09:54:02.402861000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/interfaces/shared/gdk/gdk_private_drawing_interface.h	2006-07-27 09:54:34.788448000 +0100
@@ -175,9 +175,9 @@
 	/************************************************/
 } SmoothGDKPrivateCanvas;
 
-GdkGC * smooth_internal_drawing_area_use_brush_gc(SmoothGDKPrivateCanvas *Canvas, SmoothBool RequireValidColor) G_GNUC_INTERNAL;
-void smooth_internal_drawing_area_unuse_brush_gc(SmoothGDKPrivateCanvas *Canvas, GdkGC * GC) G_GNUC_INTERNAL;
-void smooth_internal_drawing_area_unuse_pen_gc(SmoothGDKPrivateCanvas *Canvas, GdkGC * GC) G_GNUC_INTERNAL;
-GdkGC * smooth_internal_drawing_area_use_pen_gc(SmoothGDKPrivateCanvas *Canvas, SmoothBool RequireValidColor) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GdkGC * smooth_internal_drawing_area_use_brush_gc(SmoothGDKPrivateCanvas *Canvas, SmoothBool RequireValidColor);
+G_GNUC_INTERNAL void smooth_internal_drawing_area_unuse_brush_gc(SmoothGDKPrivateCanvas *Canvas, GdkGC * GC);
+G_GNUC_INTERNAL void smooth_internal_drawing_area_unuse_pen_gc(SmoothGDKPrivateCanvas *Canvas, GdkGC * GC);
+G_GNUC_INTERNAL GdkGC * smooth_internal_drawing_area_use_pen_gc(SmoothGDKPrivateCanvas *Canvas, SmoothBool RequireValidColor);
 
 #endif /* GDK_PRIVATE_DRAWING_INTERFACE_H */
--- gtk-engines-2.7.6/engines/smooth/src/interfaces/drawing_interface.h.orig	2006-07-27 09:20:15.791652000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/interfaces/drawing_interface.h	2006-07-27 09:39:22.630792000 +0100
@@ -454,359 +454,359 @@
 /* ABSTRACT MUST BE DECLARED BY     */
 /* Specific Drawing Interface       */
 /************************************/
-void SmoothDrawingInterfaceInitialize() G_GNUC_INTERNAL;
-void SmoothDrawingInterfaceFinalize() G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothDrawingInterfaceInitialize();
+G_GNUC_INTERNAL void SmoothDrawingInterfaceFinalize();
 
 
 /**********************************************/
 /* Hooks For Interface Specific Setup/Cleanup */
 /**********************************************/
-void 			SmoothDrawingInterfaceSetup		(
+G_GNUC_INTERNAL void 			SmoothDrawingInterfaceSetup		(
 										SmoothBool(* InitializeInterface)(DrawingInterfaceClass *SmoothDrawingInterface),
 										SmoothBool(* FinalizeInterface)(DrawingInterfaceClass *SmoothDrawingInterface)
-									) G_GNUC_INTERNAL;
+									);
 									
-void 			SmoothDrawingInterfaceCleanup			() G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void 			SmoothDrawingInterfaceCleanup			();
 
 /*************************/
 /* Function Declarations */
 /*************************/
 
 /* Callback to Initialize Interface if Required - Always First in Struct*/
-SmoothBool 		SmoothInitializeInterface() G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool 		SmoothInitializeInterface();
 
 /* Color Value Getions */
-SmoothBool		SmoothColorGetRedValue				(SmoothColor *Color,
-										SmoothDouble *RedValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorGetGreenValue			(SmoothColor *Color,
-										SmoothDouble *GreenValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorGetBlueValue				(SmoothColor *Color,
-										SmoothDouble *BlueValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorGetAlphaValue			(SmoothColor *Color,
-										SmoothDouble *AlphaValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorGetValues				(SmoothColor *Color, 
+G_GNUC_INTERNAL SmoothBool		SmoothColorGetRedValue				(SmoothColor *Color,
+										SmoothDouble *RedValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorGetGreenValue			(SmoothColor *Color,
+										SmoothDouble *GreenValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorGetBlueValue				(SmoothColor *Color,
+										SmoothDouble *BlueValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorGetAlphaValue			(SmoothColor *Color,
+										SmoothDouble *AlphaValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorGetValues				(SmoothColor *Color, 
 										SmoothDouble *RedValue, 
 										SmoothDouble *GreenValue, 
 										SmoothDouble *BlueValue, 
-										SmoothDouble *AlphaValue) G_GNUC_INTERNAL;
+										SmoothDouble *AlphaValue);
 
 /* Color Value Modifications */
-SmoothBool		SmoothColorSetRedValue				(SmoothColor *Color, 
-										SmoothDouble NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorSetGreenValue			(SmoothColor *Color, 
-										SmoothDouble NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorSetBlueValue				(SmoothColor *Color, 
-										SmoothDouble NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorSetAlphaValue			(SmoothColor *Color, 
-										SmoothDouble NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothColorSetValues				(SmoothColor *Color, 
+G_GNUC_INTERNAL SmoothBool		SmoothColorSetRedValue				(SmoothColor *Color, 
+										SmoothDouble NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorSetGreenValue			(SmoothColor *Color, 
+										SmoothDouble NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorSetBlueValue				(SmoothColor *Color, 
+										SmoothDouble NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorSetAlphaValue			(SmoothColor *Color, 
+										SmoothDouble NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothColorSetValues				(SmoothColor *Color, 
 										SmoothDouble RedValue, 
 										SmoothDouble GreenValue, 
 										SmoothDouble BlueValue, 
-										SmoothDouble AlphaValue) G_GNUC_INTERNAL;
+										SmoothDouble AlphaValue);
 
 /* Rectangle Status Functions */
-SmoothBool		SmoothRectangleCreate				(SmoothRectangle *Rectangle, 
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleCreate				(SmoothRectangle *Rectangle, 
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
-										SmoothInt Height) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleDestroy				(SmoothRectangle *Rectangle) G_GNUC_INTERNAL;
+										SmoothInt Height);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleDestroy				(SmoothRectangle *Rectangle);
 	
-SmoothBool		SmoothRectangleIsValid				(SmoothRectangle *Rectangle) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleIsValid				(SmoothRectangle *Rectangle);
 	
 /* Rectangle Value Getions */
-SmoothBool		SmoothRectangleGetXValue			(SmoothRectangle *Rectangle,
-										SmoothInt *XValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleGetYValue			(SmoothRectangle *Rectangle,
-										SmoothInt *YValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleGetWidthValue			(SmoothRectangle *Rectangle,
-										SmoothInt *WidthValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleGetHeightValue			(SmoothRectangle *Rectangle,
-										SmoothInt *HeightValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleGetValues			(SmoothRectangle *Rectangle, 
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleGetXValue			(SmoothRectangle *Rectangle,
+										SmoothInt *XValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleGetYValue			(SmoothRectangle *Rectangle,
+										SmoothInt *YValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleGetWidthValue			(SmoothRectangle *Rectangle,
+										SmoothInt *WidthValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleGetHeightValue			(SmoothRectangle *Rectangle,
+										SmoothInt *HeightValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleGetValues			(SmoothRectangle *Rectangle, 
 										SmoothInt *XValue, 
 										SmoothInt *YValue, 
 										SmoothInt *WidthValue, 
-										SmoothInt *HeightValue) G_GNUC_INTERNAL;
+										SmoothInt *HeightValue);
 	
 /* Rectangle Value Modifications */
-SmoothBool		SmoothRectangleSetXValue			(SmoothRectangle *Rectangle, 
-										SmoothInt NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleSetYValue			(SmoothRectangle *Rectangle, 
-										SmoothInt NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleSetWidthValue			(SmoothRectangle *Rectangle, 
-										SmoothInt NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothRectangleSetHeightValue			(SmoothRectangle *Rectangle, 
-										SmoothInt NewValue) G_GNUC_INTERNAL;							
-SmoothBool		SmoothRectangleSetValues			(SmoothRectangle *Rectangle, 
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleSetXValue			(SmoothRectangle *Rectangle, 
+										SmoothInt NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleSetYValue			(SmoothRectangle *Rectangle, 
+										SmoothInt NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleSetWidthValue			(SmoothRectangle *Rectangle, 
+										SmoothInt NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleSetHeightValue			(SmoothRectangle *Rectangle, 
+										SmoothInt NewValue);							
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleSetValues			(SmoothRectangle *Rectangle, 
 										SmoothInt XValue, 
 										SmoothInt YValue, 
 										SmoothInt WidthValue, 
-										SmoothInt HeightValue) G_GNUC_INTERNAL;
+										SmoothInt HeightValue);
 
 /* Rectangle Misc Functions */
-SmoothBool		SmoothRectangleFindIntersection			(SmoothRectangle Rectangle1, 
+G_GNUC_INTERNAL SmoothBool		SmoothRectangleFindIntersection			(SmoothRectangle Rectangle1, 
 										SmoothRectangle Rectangle2, 
-										SmoothRectangle *IntersectingRectangle) G_GNUC_INTERNAL;
+										SmoothRectangle *IntersectingRectangle);
 
 /* Point Value Getions */
-SmoothBool		SmoothPointGetXValue				(SmoothPoint *Point,
-										SmoothInt *XValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothPointGetYValue				(SmoothPoint *Point,
-										SmoothInt *YValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothPointGetValues				(SmoothPoint *Point,
+G_GNUC_INTERNAL SmoothBool		SmoothPointGetXValue				(SmoothPoint *Point,
+										SmoothInt *XValue);
+G_GNUC_INTERNAL SmoothBool		SmoothPointGetYValue				(SmoothPoint *Point,
+										SmoothInt *YValue);
+G_GNUC_INTERNAL SmoothBool		SmoothPointGetValues				(SmoothPoint *Point,
 										SmoothInt *XValue, 
-										SmoothInt *YValue) G_GNUC_INTERNAL;
+										SmoothInt *YValue);
 
 /* Point Value Modifications */
-SmoothBool		SmoothPointSetXValue				(SmoothPoint *Point,
-										SmoothInt NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothPointSetYValue				(SmoothPoint *Point,
-										SmoothInt NewValue) G_GNUC_INTERNAL;
-SmoothBool		SmoothPointSetValues				(SmoothPoint *Point, 
+G_GNUC_INTERNAL SmoothBool		SmoothPointSetXValue				(SmoothPoint *Point,
+										SmoothInt NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothPointSetYValue				(SmoothPoint *Point,
+										SmoothInt NewValue);
+G_GNUC_INTERNAL SmoothBool		SmoothPointSetValues				(SmoothPoint *Point, 
 										SmoothInt XValue, 
-										SmoothInt YValue) G_GNUC_INTERNAL;
+										SmoothInt YValue);
 
 /* Image/Buffer By File name (For caching purposes) */
-SmoothBool		SmoothImageBufferLoadByFile			(SmoothString ImageFile,
-										SmoothImageBuffer *ImageBuffer) G_GNUC_INTERNAL;
-SmoothBool		SmoothImageBufferUnLoadByFile			(SmoothString ImageFile) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothImageBufferLoadByFile			(SmoothString ImageFile,
+										SmoothImageBuffer *ImageBuffer);
+G_GNUC_INTERNAL SmoothBool		SmoothImageBufferUnLoadByFile			(SmoothString ImageFile);
 
 /* Canvas Get Image/ImageBuffer Size */
-SmoothBool		SmoothImageBufferGetWidth			(SmoothImageBuffer *ImageBuffer,
-										SmoothInt *Width) G_GNUC_INTERNAL;
-SmoothBool		SmoothImageBufferGetHeight			(SmoothImageBuffer *ImageBuffer,
-										SmoothInt *Height) G_GNUC_INTERNAL;
-
-SmoothBool		SmoothImageGetWidth				(SmoothImage *Image,
-										SmoothInt *Width) G_GNUC_INTERNAL;
-SmoothBool		SmoothImageGetHeight				(SmoothImage *Image,
-										SmoothInt *Height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothImageBufferGetWidth			(SmoothImageBuffer *ImageBuffer,
+										SmoothInt *Width);
+G_GNUC_INTERNAL SmoothBool		SmoothImageBufferGetHeight			(SmoothImageBuffer *ImageBuffer,
+										SmoothInt *Height);
+
+G_GNUC_INTERNAL SmoothBool		SmoothImageGetWidth				(SmoothImage *Image,
+										SmoothInt *Width);
+G_GNUC_INTERNAL SmoothBool		SmoothImageGetHeight				(SmoothImage *Image,
+										SmoothInt *Height);
 
 /* Canvas Map/Free A Color From The Colormap*/
-SmoothBool		SmoothCanvasAllocateColor			(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasDeallocateColor			(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasAllocateColor			(SmoothCanvas Canvas, 
+										SmoothColor *Color);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDeallocateColor			(SmoothCanvas Canvas, 
+										SmoothColor *Color);
 /* Canvas cache/uncache a Color */
-SmoothBool		SmoothCanvasCacheColor				(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasCacheColor				(SmoothCanvas Canvas, 
+										SmoothColor *Color);
 
-SmoothBool		SmoothCanvasUnCacheColor			(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasUnCacheColor			(SmoothCanvas Canvas, 
+										SmoothColor *Color);
 									
 /* Canvas cache/uncache a shaded Color */
-SmoothBool		SmoothCanvasCacheShadedColor			(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasCacheShadedColor			(SmoothCanvas Canvas, 
 										SmoothColor Base,
 										SmoothDouble Shade,
-										SmoothColor *Color) G_GNUC_INTERNAL;
+										SmoothColor *Color);
 
-SmoothBool		SmoothCanvasUnCacheShadedColor			(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasUnCacheShadedColor			(SmoothCanvas Canvas, 
 										SmoothColor Base,
 										SmoothDouble Shade,
-										SmoothColor *Color) G_GNUC_INTERNAL;
+										SmoothColor *Color);
 
 /* Canvas cache/uncache a MidPoint Color */
-SmoothBool		SmoothCanvasCacheMidPointColor			(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasCacheMidPointColor			(SmoothCanvas Canvas, 
 										SmoothColor Point1,
 										SmoothColor Color2,
-										SmoothColor *Color) G_GNUC_INTERNAL;
+										SmoothColor *Color);
 
-SmoothBool		SmoothCanvasUnCacheMidPointColor		(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasUnCacheMidPointColor		(SmoothCanvas Canvas, 
 										SmoothColor Point1,
 										SmoothColor Point2,
-										SmoothColor *Color) G_GNUC_INTERNAL;
+										SmoothColor *Color);
 
 /* Canvas Store/Render */
-SmoothBool		SmoothCanvasStore				(SmoothCanvas Canvas) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasStore				(SmoothCanvas Canvas);
 SmoothBool		SmoothCanvasRender				(SmoothCanvas Canvas,	
-										SmoothBool ClosePathAndFill) G_GNUC_INTERNAL;
+										G_GNUC_INTERNAL SmoothBool ClosePathAndFill);
 
 /* Canvas Get/Set/Clear Clip Rectangle */
-SmoothBool		SmoothCanvasGetClipRectangle			(SmoothCanvas Canvas,
-										SmoothRectangle* Rectangle) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetClipRectangle			(SmoothCanvas Canvas,
+										SmoothRectangle* Rectangle);
 
-SmoothBool		SmoothCanvasSetClipRectangle			(SmoothCanvas Canvas,
-										SmoothRectangle	Rectangle) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetClipRectangle			(SmoothCanvas Canvas,
+										SmoothRectangle	Rectangle);
 
-SmoothBool		SmoothCanvasClearClipRectangle			(SmoothCanvas Canvas) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasClearClipRectangle			(SmoothCanvas Canvas);
 
-SmoothBool		SmoothCanvasClipUseIntersectingRectangle	(SmoothCanvas Canvas,
-										SmoothRectangle	Rectangle) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasClipUseIntersectingRectangle	(SmoothCanvas Canvas,
+										SmoothRectangle	Rectangle);
 
 /* Canvas Get/Set Pen Properties */
-SmoothBool		SmoothCanvasGetPenColor				(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenColor				(SmoothCanvas Canvas, 
-										SmoothColor Color) G_GNUC_INTERNAL;
-
-SmoothBool		SmoothCanvasGetPenThickness			(SmoothCanvas Canvas,
-										SmoothInt *Thickness) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenThickness			(SmoothCanvas Canvas, 
-										SmoothInt Thickness) G_GNUC_INTERNAL;
-
-SmoothBool		SmoothCanvasGetPenStyle				(SmoothCanvas Canvas, 
-										SmoothLineStyle *Style) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenStyle				(SmoothCanvas Canvas, 
-										SmoothLineStyle Style) G_GNUC_INTERNAL;
-
-SmoothBool		SmoothCanvasGetPenJoin				(SmoothCanvas Canvas, 
-										SmoothLineJoin *Join) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenJoin				(SmoothCanvas Canvas, 
-										SmoothLineJoin Join) G_GNUC_INTERNAL;
-
-SmoothBool		SmoothCanvasGetPenCap				(SmoothCanvas Canvas, 
-										SmoothLineCap *Cap) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenCap				(SmoothCanvas Canvas, 
-										SmoothLineCap Cap) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenColor				(SmoothCanvas Canvas, 
+										SmoothColor *Color);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenColor				(SmoothCanvas Canvas, 
+										SmoothColor Color);
+
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenThickness			(SmoothCanvas Canvas,
+										SmoothInt *Thickness);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenThickness			(SmoothCanvas Canvas, 
+										SmoothInt Thickness);
+
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenStyle				(SmoothCanvas Canvas, 
+										SmoothLineStyle *Style);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenStyle				(SmoothCanvas Canvas, 
+										SmoothLineStyle Style);
+
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenJoin				(SmoothCanvas Canvas, 
+										SmoothLineJoin *Join);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenJoin				(SmoothCanvas Canvas, 
+										SmoothLineJoin Join);
+
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenCap				(SmoothCanvas Canvas, 
+										SmoothLineCap *Cap);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenCap				(SmoothCanvas Canvas, 
+										SmoothLineCap Cap);
 
-SmoothBool		SmoothCanvasGetPenValues			(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenValues			(SmoothCanvas Canvas, 
 										SmoothColor *Color,
 										SmoothInt *Thickness,
 										SmoothLineStyle *Style,
 										SmoothLineCap *Cap,
-										SmoothLineJoin *Join) G_GNUC_INTERNAL;
+										SmoothLineJoin *Join);
 
-SmoothBool		SmoothCanvasSetPenValues			(SmoothCanvas Canvas, 
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenValues			(SmoothCanvas Canvas, 
 										SmoothColor Color,
 										SmoothInt Thickness,
 										SmoothLineStyle Style,
 										SmoothLineCap Cap,
-										SmoothLineJoin Join) G_GNUC_INTERNAL;
+										SmoothLineJoin Join);
 
-SmoothBool		SmoothCanvasGetPenPattern			(SmoothCanvas Canvas, 
-										SmoothLinePattern *Pattern) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetPenPattern			(SmoothCanvas Canvas, 
-										SmoothLinePattern Pattern) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetPenPattern			(SmoothCanvas Canvas, 
+										SmoothLinePattern *Pattern);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetPenPattern			(SmoothCanvas Canvas, 
+										SmoothLinePattern Pattern);
 
 
 /* Canvas Get/Set Brush Properties */
-SmoothBool		SmoothCanvasGetBrushColor			(SmoothCanvas Canvas, 
-										SmoothColor *Color) G_GNUC_INTERNAL;
-SmoothBool		SmoothCanvasSetBrushColor			(SmoothCanvas Canvas, 
-										SmoothColor Color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasGetBrushColor			(SmoothCanvas Canvas, 
+										SmoothColor *Color);
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasSetBrushColor			(SmoothCanvas Canvas, 
+										SmoothColor Color);
 
 /* Canvas Create/Destroy Image */
-SmoothBool		SmoothCanvasCreateImage				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasCreateImage				(SmoothCanvas Canvas,
 										SmoothInt Width,
 										SmoothInt Height,
-										SmoothImage *Image) G_GNUC_INTERNAL;
+										SmoothImage *Image);
 										
-SmoothBool 		SmoothCanvasCreateImageFromBuffer		(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool 		SmoothCanvasCreateImageFromBuffer		(SmoothCanvas Canvas,
 										SmoothImageBuffer ImageBuffer,
-										SmoothImage *Image) G_GNUC_INTERNAL;
+										SmoothImage *Image);
 
-SmoothBool 		SmoothCanvasDestroyImage			(SmoothCanvas Canvas,
-										SmoothImage *Image) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool 		SmoothCanvasDestroyImage			(SmoothCanvas Canvas,
+										SmoothImage *Image);
 																				
 /* Canvas Render Image/ImageBuffer */
-SmoothBool		SmoothCanvasRenderImage				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasRenderImage				(SmoothCanvas Canvas,
 										SmoothImage Image,
 										SmoothInt X,
 										SmoothInt Y,
 										SmoothInt Width,
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 										
 
-SmoothBool		SmoothCanvasRenderImageBuffer			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasRenderImageBuffer			(SmoothCanvas Canvas,
 										SmoothImageBuffer ImageBuffer,
 										SmoothInt X,
 										SmoothInt Y,
 										SmoothInt Width,
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 
 /* Canvas Render Tile */
-SmoothBool		SmoothCanvasRenderTile				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasRenderTile				(SmoothCanvas Canvas,
 										SmoothTile Tile,
 										SmoothInt X,
 										SmoothInt Y,
 										SmoothInt Width,
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 
 /* Canvas Render Gradient */
-SmoothBool		SmoothCanvasRenderGradient			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasRenderGradient			(SmoothCanvas Canvas,
 										SmoothGradient Gradient,
 										SmoothInt X,
 										SmoothInt Y,
 										SmoothInt Width,
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 
 /* Canvas Draw Point(s) */
-SmoothBool		SmoothCanvasDrawPoint				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawPoint				(SmoothCanvas Canvas,
 										SmoothInt X, 
-										SmoothInt Y) G_GNUC_INTERNAL;
+										SmoothInt Y);
 
-SmoothBool		SmoothCanvasDrawPoints				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawPoints				(SmoothCanvas Canvas,
 										SmoothPoint *Points, 
-										SmoothInt NumberOfPoints) G_GNUC_INTERNAL;
+										SmoothInt NumberOfPoints);
 
 /* Canvas Draw Line(s) */
-SmoothBool		SmoothCanvasDrawLine				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawLine				(SmoothCanvas Canvas,
 										SmoothInt X1, 
 										SmoothInt Y1, 
 										SmoothInt X2, 
-										SmoothInt Y2) G_GNUC_INTERNAL;
+										SmoothInt Y2);
 	
-SmoothBool		SmoothCanvasDrawSegment				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawSegment				(SmoothCanvas Canvas,
 										SmoothPoint Point1, 
-										SmoothPoint Point2) G_GNUC_INTERNAL;
+										SmoothPoint Point2);
 	
-SmoothBool		SmoothCanvasDrawLines				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawLines				(SmoothCanvas Canvas,
 										SmoothPoint *Points, 
-										SmoothInt NumberOfPoints) G_GNUC_INTERNAL;
+										SmoothInt NumberOfPoints);
 
-SmoothBool		SmoothCanvasDrawSegments			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawSegments			(SmoothCanvas Canvas,
 										SmoothPoint *Points, 
-										SmoothInt NumberOfPoints) G_GNUC_INTERNAL;
+										SmoothInt NumberOfPoints);
 
 /* Canvas Draw Arc(s)/Curve(s) */
-SmoothBool		SmoothCanvasDrawArc				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasDrawArc				(SmoothCanvas Canvas,
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
 										SmoothInt Height,
 										SmoothDouble AnglePosition,
-										SmoothDouble AngleLength) G_GNUC_INTERNAL;
+										SmoothDouble AngleLength);
 
 /* Canvas Frame Shaped Areas */
-SmoothBool		SmoothCanvasFrameRectangle			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFrameRectangle			(SmoothCanvas Canvas,
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 
-SmoothBool		SmoothCanvasFramePolygon			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFramePolygon			(SmoothCanvas Canvas,
 										SmoothPoint *Points, 
-										SmoothInt NumberOfPoints) G_GNUC_INTERNAL;
+										SmoothInt NumberOfPoints);
 
-SmoothBool		SmoothCanvasFrameChord				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFrameChord				(SmoothCanvas Canvas,
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
 										SmoothInt Height,
 										SmoothDouble AnglePosition,
-										SmoothDouble AngleLength) G_GNUC_INTERNAL;
+										SmoothDouble AngleLength);
 /* Canvas Fill Shaped Areas */
-SmoothBool		SmoothCanvasFillRectangle			(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFillRectangle			(SmoothCanvas Canvas,
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
-										SmoothInt Height) G_GNUC_INTERNAL;
+										SmoothInt Height);
 
-SmoothBool		SmoothCanvasFillPolygon				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFillPolygon				(SmoothCanvas Canvas,
 										SmoothPoint *Points, 
-										SmoothInt NumberOfPoints) G_GNUC_INTERNAL;
+										SmoothInt NumberOfPoints);
 
-SmoothBool		SmoothCanvasFillChord				(SmoothCanvas Canvas,
+G_GNUC_INTERNAL SmoothBool		SmoothCanvasFillChord				(SmoothCanvas Canvas,
 										SmoothInt X, 
 										SmoothInt Y, 
 										SmoothInt Width, 
 										SmoothInt Height,
 										SmoothDouble AnglePosition,
-										SmoothDouble AngleLength) G_GNUC_INTERNAL;
+										SmoothDouble AngleLength);
 
 /* Callback to Finalize Interface if Required - Always Last in Struct*/
-SmoothBool		SmoothFinalizeInterface() G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool		SmoothFinalizeInterface();
 
 #endif /* DRAWING_INTERFACE_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/calc_colors.h.orig	2006-07-27 09:56:05.345001000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/calc_colors.h	2006-07-27 09:56:23.392386000 +0100
@@ -28,9 +28,9 @@
 #ifndef CALC_COLORS_H
 #define CALC_COLORS_H
 
-void
+G_GNUC_INTERNAL void
 SmoothCompositeColorShade(SmoothColor *Original, 
 			  SmoothDouble ShadeRatio,
-			  SmoothColor *Composite) G_GNUC_INTERNAL;
+			  SmoothColor *Composite);
 
 #endif /* CALC_COLORS_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/draw_fill.h.orig	2006-07-27 09:56:55.054328000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/draw_fill.h	2006-07-27 09:58:20.061081000 +0100
@@ -51,11 +51,11 @@
 #define GRADIENT(horizontal) (horizontal ? SMOOTH_GRADIENT_HORIZONTAL : SMOOTH_GRADIENT_VERTICAL)
 #define DIAGONALGRADIENT(northern) (northern ? SMOOTH_GRADIENT_NORTHERN_DIAGONAL : SMOOTH_GRADIENT_SOUTHERN_DIAGONAL)
 
-void	SmoothDrawFill(SmoothFill *Fill,
+G_GNUC_INTERNAL void	SmoothDrawFill(SmoothFill *Fill,
 			SmoothCanvas *Canvas,
 			SmoothInt X,
 			SmoothInt Y,
 			SmoothInt Width,
-			SmoothInt Height) G_GNUC_INTERNAL;
+			SmoothInt Height);
 		      
 #endif /* DRAW_FILL_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/draw_border.h.orig	2006-07-27 09:58:42.250819000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/draw_border.h	2006-07-27 09:59:55.356779000 +0100
@@ -80,7 +80,7 @@
 	SmoothFloat Thickness;
 } SmoothLineBevel;
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawShadowWithGap(SmoothCanvas *Canvas,
 			SmoothColor TopLeftColor,
 			SmoothColor BottomRightColor,
@@ -88,9 +88,9 @@
 			SmoothPositionSide GapSide, 
 			SmoothInt GapPos,
 			SmoothInt GapSize,
-			SmoothBool TopLeftOverlap) G_GNUC_INTERNAL;
+			SmoothBool TopLeftOverlap);
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawBevelWithGap(SmoothCanvas *Canvas,
 			SmoothColor TopLeftColor,
 			SmoothColor BottomRightColor,
@@ -98,23 +98,23 @@
 			SmoothInt BevelThickness,
 			SmoothPositionSide GapSide, 
 			SmoothInt GapPos,
-			SmoothInt GapSize) G_GNUC_INTERNAL;
+			SmoothInt GapSize);
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawCirclularShadow(SmoothCanvas *Canvas,
 				SmoothColor TopLeftColor,
 				SmoothColor BottomRightColor,
-				SmoothRectangle Target) G_GNUC_INTERNAL;
+				SmoothRectangle Target);
 	       
-void
+G_GNUC_INTERNAL void
 SmoothDrawCirclularBevel(SmoothCanvas *Canvas,
 				SmoothColor TopLeftColor,
 				SmoothColor BottomRightColor,
 				SmoothRectangle Target,
-				SmoothInt BevelThickness) G_GNUC_INTERNAL;
+				SmoothInt BevelThickness);
 
 
-SmoothBool
+G_GNUC_INTERNAL SmoothBool
 SmoothDrawBorderWithGap(SmoothBorder *Border,
 				SmoothCanvas *Canvas,
 				SmoothColor BaseColor,
@@ -124,16 +124,16 @@
 				SmoothInt Height,
 				SmoothPositionSide GapSide, 
 				SmoothInt GapPos,
-				SmoothInt GapSize) G_GNUC_INTERNAL;
+				SmoothInt GapSize);
 
-SmoothBool
+G_GNUC_INTERNAL SmoothBool
 SmoothDrawPolygonBorder(SmoothBorder *Border,
 				SmoothCanvas *Canvas,
 				SmoothColor BaseColor,
 				SmoothPoint *Points,
-				SmoothInt Count) G_GNUC_INTERNAL;
+				SmoothInt Count);
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawLineBevel(SmoothLineBevel LineBevel,
 			SmoothCanvas Canvas,
 			SmoothColor BaseColor,
@@ -141,6 +141,6 @@
 			SmoothInt Start,
 			SmoothInt End,
 			SmoothInt Base,
-			SmoothBool Horizontal) G_GNUC_INTERNAL;			
+			SmoothBool Horizontal);			
 
 #endif /* DRAW_BORDER_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/draw_grips.h.orig	2006-07-27 10:00:31.990836000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/draw_grips.h	2006-07-27 10:01:04.879383000 +0100
@@ -70,7 +70,7 @@
 	SmoothInt CutOff;
 } SmoothGripObjects;
 
-void 
+G_GNUC_INTERNAL void 
 do_smooth_draw_broken_bars(SmoothCanvas *Canvas,
 
 			SmoothColor Highlight,
@@ -82,9 +82,9 @@
 			SmoothInt Width, 
 			SmoothInt Height, 
 
-			SmoothBool Horizontal) G_GNUC_INTERNAL;
+			SmoothBool Horizontal);
 
-void
+G_GNUC_INTERNAL void
 do_smooth_draw_lines(SmoothGripObjects *GripObjects,
 		SmoothCanvas *Canvas,
 		SmoothColor Highlight,
@@ -93,9 +93,9 @@
 		SmoothInt Y, 
 		SmoothInt Width, 
 		SmoothInt Height, 
-		SmoothBool Horizontal) G_GNUC_INTERNAL;
+		SmoothBool Horizontal);
 
-void
+G_GNUC_INTERNAL void
 do_smooth_draw_dots(SmoothGripObjects *GripObjects,
 		SmoothCanvas *Canvas,
 		SmoothColor Highlight,
@@ -105,9 +105,9 @@
 		SmoothInt Y, 
 		SmoothInt Width, 
 		SmoothInt Height, 
-		SmoothBool Horizontal) G_GNUC_INTERNAL;
+		SmoothBool Horizontal);
 
-void 
+G_GNUC_INTERNAL void 
 do_smooth_draw_buds(SmoothCanvas *Canvas,
 		SmoothColor Highlight,
 		SmoothColor Shadow,
@@ -118,6 +118,6 @@
 		SmoothInt Height, 
 		SmoothInt ClipOffset,
 		SmoothBool Horizontal,
-		SmoothBool Alternating) G_GNUC_INTERNAL;
+		SmoothBool Alternating);
 		
 #endif /* DRAW_GRIPS_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/draw_arrows.h.orig	2006-07-27 10:01:23.555951000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/draw_arrows.h	2006-07-27 10:01:39.252515000 +0100
@@ -100,7 +100,7 @@
 	SmoothBool CompositeArrowsSet[5][SMOOTH_ARROW_TYPE_COUNT];
 };
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawArrow(SmoothCanvas *Canvas,
 			SmoothArrow Arrow,
 			SmoothInt X,
@@ -108,9 +108,9 @@
 			SmoothInt Width,
 			SmoothInt Height,
 			SmoothColor Background,
-			SmoothColor Foreground) G_GNUC_INTERNAL;
+			SmoothColor Foreground);
 
-void 
-SmoothFreeArrowStyles(SmoothArrowPart *arrow) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void 
+SmoothFreeArrowStyles(SmoothArrowPart *arrow);
 
 #endif /* DRAW_ARROWS_H */
--- gtk-engines-2.7.6/engines/smooth/src/utils/draw_checkmark.h.orig	2006-07-27 10:02:19.082396000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/utils/draw_checkmark.h	2006-07-27 10:02:32.136805000 +0100
@@ -57,7 +57,7 @@
 	SmoothBool Shadow;
 } SmoothCheckMark;
 
-void
+G_GNUC_INTERNAL void
 SmoothDrawCheckMark(SmoothCanvas Canvas,
 			SmoothCheckMark CheckMark,
 			SmoothInt X,
@@ -65,7 +65,7 @@
 			SmoothInt Width,
 			SmoothInt Height,
 			SmoothColor Background,
-			SmoothColor Foreground) G_GNUC_INTERNAL;
+			SmoothColor Foreground);
 
 
 #endif /* DRAW_CHECKMARK_H */
--- gtk-engines-2.7.6/engines/mist/src/mist-rc-style.h.orig	2006-07-27 08:54:59.133208000 +0100
+++ gtk-engines-2.7.6/engines/mist/src/mist-rc-style.h	2006-07-27 08:55:14.500363000 +0100
@@ -20,4 +20,4 @@
 	GtkRcStyleClass parent_class;
 };
 
-void mist_rc_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void mist_rc_style_register_type (GTypeModule *module);
--- gtk-engines-2.7.6/engines/mist/src/mist-style.h.orig	2006-07-27 08:55:45.626789000 +0100
+++ gtk-engines-2.7.6/engines/mist/src/mist-style.h	2006-07-27 08:56:06.570221000 +0100
@@ -25,5 +25,5 @@
   GtkStyleClass parent_class;
 };
 
-void mist_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void mist_style_register_type (GTypeModule *module);
 
--- gtk-engines-2.7.6/engines/redmond/src/redmond_gtk2_drawing.h.orig	2006-07-27 08:56:47.505217000 +0100
+++ gtk-engines-2.7.6/engines/redmond/src/redmond_gtk2_drawing.h	2006-07-27 08:59:59.612889000 +0100
@@ -24,7 +24,7 @@
  
 #include <cairo.h>
 
-void
+G_GNUC_INTERNAL void
 redmond_draw_hline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -33,9 +33,9 @@
 	    const gchar * detail, 
             gint x1,
             gint x2, 
-            gint y) G_GNUC_INTERNAL;
+            gint y);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_vline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -44,9 +44,9 @@
 	    const gchar * detail, 
             gint y1, 
             gint y2, 
-            gint x) G_GNUC_INTERNAL;
+            gint x);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_check (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -57,9 +57,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_option (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state,
@@ -70,9 +70,9 @@
              gint x,
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_arrow (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -85,9 +85,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_shadow (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -98,9 +98,9 @@
              gint x, 
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_box (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state_type,
@@ -111,9 +111,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_tab (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state,
@@ -124,9 +124,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_slider (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -138,9 +138,9 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
  
-void
+G_GNUC_INTERNAL void
 redmond_draw_extension (GtkStyle * style,
 		GdkWindow * window,
 		GtkStateType state_type,
@@ -152,9 +152,9 @@
 		gint y, 
                 gint width, 
                 gint height, 
-                GtkPositionType gap_side) G_GNUC_INTERNAL;
+                GtkPositionType gap_side);
                 
-void
+G_GNUC_INTERNAL void
 redmond_draw_handle (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -166,4 +166,4 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
--- gtk-engines-2.7.6/engines/redmond/src/redmond_gtk2_misc.h.orig	2006-07-27 08:58:43.150904000 +0100
+++ gtk-engines-2.7.6/engines/redmond/src/redmond_gtk2_misc.h	2006-07-27 08:59:36.409895000 +0100
@@ -21,15 +21,15 @@
  */  
   
 /* Misc Drawing/Colour Functions */  
-void
+G_GNUC_INTERNAL void
 do_redmond_draw_pattern_fill (cairo_t * cr,
                                   CairoPattern *pattern,
                                   gint x,
                                   gint y, 
                                   gint width, 
-                                  gint height) G_GNUC_INTERNAL;
+                                  gint height);
                                    
-void
+G_GNUC_INTERNAL void
 do_redmond_draw_masked_fill (cairo_t * cr,
                                   CairoPattern *mask,
                                   CairoColor * background,
@@ -37,40 +37,40 @@
                                   gint x,
                                   gint y, 
                                   gint width, 
-                                  gint height) G_GNUC_INTERNAL;
+                                  gint height);
 
-void do_redmond_draw_check (cairo_t *cr,
+G_GNUC_INTERNAL void do_redmond_draw_check (cairo_t *cr,
                             CairoColor *color, 
                             gint x, 
                             gint y, 
                             gint width, 
-                            gint height) G_GNUC_INTERNAL;
+                            gint height);
                             
-void do_redmond_draw_arrow (cairo_t *canvas,
+G_GNUC_INTERNAL void do_redmond_draw_arrow (cairo_t *canvas,
                             CairoColor *color,
                             GtkArrowType arrow_type, 
                             gboolean fill,
                             gint x, 
                             gint y, 
                             gint width, 
-                            gint height) G_GNUC_INTERNAL;
+                            gint height);
 
-void
+G_GNUC_INTERNAL void
 do_redmond_draw_simple_circle (cairo_t *canvas,
                      	  		CairoColor * tl,
                        			CairoColor * br,
 					gint center_x, 
 					gint center_y, 
-					gint radius) G_GNUC_INTERNAL;
+					gint radius);
                             
-void do_redmond_draw_line(cairo_t *cr, 
+G_GNUC_INTERNAL void do_redmond_draw_line(cairo_t *cr, 
                           CairoColor * dark, 
                           CairoColor * light, 
                           GdkRectangle * area, 
                           gint start, 
                           gint end, 
                           gint base, 
-                          gboolean horizontal) G_GNUC_INTERNAL;
+                          gboolean horizontal);
  
-void redmond_gtk2_engine_hack_menu_shell_setup_signals(GtkWidget *widget) G_GNUC_INTERNAL;
-void redmond_gtk2_engine_hack_menu_shell_cleanup_signals(GtkWidget *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void redmond_gtk2_engine_hack_menu_shell_setup_signals(GtkWidget *widget);
+G_GNUC_INTERNAL void redmond_gtk2_engine_hack_menu_shell_cleanup_signals(GtkWidget *widget);
--- gtk-engines-2.7.6/engines/glide/src/glide_gtk2_drawing.h.orig	2006-07-27 09:00:39.395158000 +0100
+++ gtk-engines-2.7.6/engines/glide/src/glide_gtk2_drawing.h	2006-07-27 09:05:16.048047000 +0100
@@ -19,7 +19,7 @@
  * Written by Andrew Johnson <acjgenius@earthlink.net>
  */ 
 
-void
+G_GNUC_INTERNAL void
 glide_draw_shadow_gap (GtkStyle * style, 
                  GdkWindow * window, 
 		 GtkStateType state_type, 
@@ -33,9 +33,9 @@
 		 gint height, 
 		 GtkPositionType gap_side, 
 		 gint gap_pos, 
-		 gint gap_size) G_GNUC_INTERNAL;
+		 gint gap_size);
 
-void
+G_GNUC_INTERNAL void
 glide_draw_box_gap (GtkStyle * style, 
                  GdkWindow * window, 
 		 GtkStateType state_type, 
@@ -49,9 +49,9 @@
 		 gint height, 
 		 GtkPositionType gap_side, 
 		 gint gap_pos, 
-		 gint gap_size) G_GNUC_INTERNAL;
+		 gint gap_size);
 
-void
+G_GNUC_INTERNAL void
 glide_draw_hline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -60,9 +60,9 @@
 	    const gchar * detail, 
             gint x1,
             gint x2, 
-            gint y) G_GNUC_INTERNAL;
+            gint y);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_vline (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state_type,
@@ -71,9 +71,9 @@
 	    const gchar * detail, 
             gint y1, 
             gint y2, 
-            gint x) G_GNUC_INTERNAL;
+            gint x);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_check (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -84,9 +84,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_option (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state,
@@ -97,9 +97,9 @@
              gint x,
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_arrow (GtkStyle * style,
 	    GdkWindow * window,
 	    GtkStateType state,
@@ -112,9 +112,9 @@
             gint x, 
             gint y, 
             gint width, 
-            gint height) G_GNUC_INTERNAL;
+            gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_shadow (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -125,9 +125,9 @@
              gint x, 
              gint y, 
              gint width, 
-             gint height) G_GNUC_INTERNAL;
+             gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_box (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state_type,
@@ -138,9 +138,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_tab (GtkStyle * style,
 	  GdkWindow * window,
 	  GtkStateType state,
@@ -151,9 +151,9 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_slider (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -165,9 +165,9 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
  
-void
+G_GNUC_INTERNAL void
 glide_draw_extension (GtkStyle * style,
 		GdkWindow * window,
 		GtkStateType state_type,
@@ -179,9 +179,9 @@
 		gint y, 
                 gint width, 
                 gint height, 
-                GtkPositionType gap_side) G_GNUC_INTERNAL;
+                GtkPositionType gap_side);
                 
-void
+G_GNUC_INTERNAL void
 glide_draw_handle (GtkStyle * style,
 	     GdkWindow * window,
 	     GtkStateType state_type,
@@ -193,10 +193,10 @@
 	     gint y, 
              gint width, 
              gint height, 
-             GtkOrientation orientation) G_GNUC_INTERNAL;
+             GtkOrientation orientation);
 
 
-void
+G_GNUC_INTERNAL void
 glide_draw_focus(GtkStyle *style,
            GdkWindow *window,
            GtkStateType state_type,
@@ -206,9 +206,9 @@
            gint x,
            gint y,
            gint width,
-           gint height) G_GNUC_INTERNAL;
+           gint height);
 
-void
+G_GNUC_INTERNAL void
 glide_draw_layout (GtkStyle        *style,
 	     GdkWindow       *window,
 	     GtkStateType     state_type,
@@ -218,4 +218,4 @@
 	     const char      *detail,
 	     int              x,
 	     int              y,
-	     PangoLayout      *layout) G_GNUC_INTERNAL;
+	     PangoLayout      *layout);
--- gtk-engines-2.7.6/engines/glide/src/glide_gtk2_support.h.orig	2006-07-27 09:02:13.342910000 +0100
+++ gtk-engines-2.7.6/engines/glide/src/glide_gtk2_support.h	2006-07-27 09:03:27.032904000 +0100
@@ -21,18 +21,18 @@
 
 #include <math.h>
 
-void
-ge_blend_color(const CairoColor *color1, const CairoColor *color2, CairoColor *composite) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void
+ge_blend_color(const CairoColor *color1, const CairoColor *color2, CairoColor *composite);
 
-void ge_cairo_pattern_add_shade_color_stop(cairo_pattern_t *pattern, gdouble offset, CairoColor *color, gdouble shade) G_GNUC_INTERNAL;
-void ge_cairo_pattern_add_color_stop(cairo_pattern_t *pattern, gdouble offset, CairoColor *color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void ge_cairo_pattern_add_shade_color_stop(cairo_pattern_t *pattern, gdouble offset, CairoColor *color, gdouble shade);
+G_GNUC_INTERNAL void ge_cairo_pattern_add_color_stop(cairo_pattern_t *pattern, gdouble offset, CairoColor *color);
 
-void glide_draw_pattern_fill(cairo_t *canvas,
+G_GNUC_INTERNAL void glide_draw_pattern_fill(cairo_t *canvas,
 					CairoPattern *pattern,
 					gint x,
 					gint y,
 					gint width,
-					gint height) G_GNUC_INTERNAL;
+					gint height);
 
 typedef enum {
 	GLIDE_BEVEL_STYLE_SMOOTH = 1,
@@ -67,7 +67,7 @@
 	GLIDE_SIDE_NONE
 } GlideSide;
 
-void do_glide_draw_border_with_gap(cairo_t *canvas,
+G_GNUC_INTERNAL void do_glide_draw_border_with_gap(cairo_t *canvas,
 					CairoColor *base,
 					GlideBevelStyle bevel_style,
 					GlideBorderType border_type,
@@ -77,16 +77,16 @@
 					gint height,
 					GlideSide gap_side,
 					gint gap_pos,
-					gint gap_size) G_GNUC_INTERNAL;
+					gint gap_size);
 
-void do_glide_draw_border(cairo_t *canvas,
+G_GNUC_INTERNAL void do_glide_draw_border(cairo_t *canvas,
                               CairoColor *base,
                               GlideBevelStyle bevel_style,
                               GlideBorderType border_type,
                               gint x,
                               gint y,
                               gint width,
-                              gint height) G_GNUC_INTERNAL;
+                              gint height);
 
 typedef enum {
 	GLIDE_CHECK_INCONSISTENT, 
@@ -94,14 +94,14 @@
 	GLIDE_CHECK_OFF 
 } GlideCheckState;
 
-void do_glide_draw_check (cairo_t *cr,
+G_GNUC_INTERNAL void do_glide_draw_check (cairo_t *cr,
                             CairoColor *color, 
                             gint x, 
                             gint y, 
                             gint width, 
-                            gint height) G_GNUC_INTERNAL;
+                            gint height);
                 
-void 
+G_GNUC_INTERNAL void 
 do_glide_draw_round_option(cairo_t *canvas,
 				CairoColor *base,
 				CairoColor *fill_color,
@@ -112,35 +112,35 @@
 				gint x,
 				gint y,
 				gint width,
-				gint height) G_GNUC_INTERNAL;
+				gint height);
 
-void
+G_GNUC_INTERNAL void
 do_glide_draw_simple_circle (cairo_t *canvas,
                      	  		CairoColor * tl,
                        			CairoColor * br,
 					gint center_x, 
 					gint center_y, 
-					gint radius) G_GNUC_INTERNAL;
+					gint radius);
             
-void do_glide_draw_arrow (cairo_t *cr,
+G_GNUC_INTERNAL void do_glide_draw_arrow (cairo_t *cr,
                             CairoColor *color,
                             GtkArrowType arrow_type, 
                             gboolean fill,
                             gint x, 
                             gint y, 
                             gint width, 
-                            gint height) G_GNUC_INTERNAL;
+                            gint height);
                             
-void do_glide_draw_line(cairo_t *cr, 
+G_GNUC_INTERNAL void do_glide_draw_line(cairo_t *cr, 
                           CairoColor * dark, 
                           CairoColor * light, 
                           GdkRectangle * area, 
                           gint start, 
                           gint end, 
                           gint base, 
-                          gboolean horizontal) G_GNUC_INTERNAL;
+                          gboolean horizontal);
  
-void
+G_GNUC_INTERNAL void
 do_glide_draw_grip (cairo_t *canvas,
 			CairoColor * light,
 			CairoColor * dark,
@@ -148,6 +148,6 @@
 			gint y,
 			gint width,
 			gint height,
-			gboolean vertical) G_GNUC_INTERNAL;
+			gboolean vertical);
 
-void glide_gtk2_engine_hack_menu_shell_setup(GtkWidget *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void glide_gtk2_engine_hack_menu_shell_setup(GtkWidget *widget);
--- gtk-engines-2.7.6/engines/smooth/src/interfaces/shared/gdk/gdk_drawing_interface.h.orig	2006-07-27 10:12:34.463892000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/interfaces/shared/gdk/gdk_drawing_interface.h	2006-07-27 10:14:48.676029000 +0100
@@ -23,32 +23,32 @@
 #ifndef GDK_DRAWING_INTERFACE_H
 #define GDK_DRAWING_INTERFACE_H
 
-SmoothBool SmoothGDKDrawingInterfaceInitialize(DrawingInterfaceClass *_SmoothDrawingInterface) G_GNUC_INTERNAL;
-SmoothBool SmoothGDKDrawingInterfaceFinalize(DrawingInterfaceClass *_SmoothDrawingInterface) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothBool SmoothGDKDrawingInterfaceInitialize(DrawingInterfaceClass *_SmoothDrawingInterface);
+G_GNUC_INTERNAL SmoothBool SmoothGDKDrawingInterfaceFinalize(DrawingInterfaceClass *_SmoothDrawingInterface);
 
-void SmoothGDKModifyCanvasClipArea(SmoothCanvas *Canvas,
-				GdkRectangle * _Rectangle) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKModifyCanvasClipArea(SmoothCanvas *Canvas,
+				GdkRectangle * _Rectangle);
 				
-void SmoothGDKModifyCanvasClipRegion(SmoothCanvas *Canvas,
-				GdkRegion * _Region) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKModifyCanvasClipRegion(SmoothCanvas *Canvas,
+				GdkRegion * _Region);
 				
-void SmoothGDKModifyCanvasClipMask(SmoothCanvas *Canvas,
-				GdkBitmap *ClipMask) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKModifyCanvasClipMask(SmoothCanvas *Canvas,
+				GdkBitmap *ClipMask);
 				
-void SmoothGDKModifyCanvasClipOffset(SmoothCanvas *Canvas,
+G_GNUC_INTERNAL void SmoothGDKModifyCanvasClipOffset(SmoothCanvas *Canvas,
 				SmoothInt XOffset,
-				SmoothInt YOffset) G_GNUC_INTERNAL;
+				SmoothInt YOffset);
 				
-void SmoothGDKModifyCanvasDitherDepth(SmoothCanvas *Canvas,
-				SmoothInt DitherDepth) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKModifyCanvasDitherDepth(SmoothCanvas *Canvas,
+				SmoothInt DitherDepth);
 
-void SmoothColorAssignGdkColor(SmoothColor *DestinationColor, GdkColor SourceColor, gint SourceAlpha) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothColorAssignGdkColor(SmoothColor *DestinationColor, GdkColor SourceColor, gint SourceAlpha);
 
-void SmoothGDKInitializeColorCube(SmoothCanvas Canvas, GtkStyle * style, SmoothColorCube *ColorCube) G_GNUC_INTERNAL;
-void  SmoothGDKFinalizeColorCube(SmoothColorCube *ColorCube) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKInitializeColorCube(SmoothCanvas Canvas, GtkStyle * style, SmoothColorCube *ColorCube);
+G_GNUC_INTERNAL void  SmoothGDKFinalizeColorCube(SmoothColorCube *ColorCube);
 
-SmoothWidgetState SmoothGtkWidgetState(GtkStateType State) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothWidgetState SmoothGtkWidgetState(GtkStateType State);
 
-void SmoothGDKFinalizeColorCache(GHashTable **ColorCache) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKFinalizeColorCache(GHashTable **ColorCache);
 
 #endif /* GDK_DRAWING_INTERFACE_H */
--- gtk-engines-2.7.6/engines/smooth/src/interfaces/gdk2/gdk2_drawing_interface.h.orig	2006-07-27 10:15:50.701213000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/interfaces/gdk2/gdk2_drawing_interface.h	2006-07-27 10:16:18.758209000 +0100
@@ -26,7 +26,7 @@
 #include <interfaces/drawing_interface.h>
 #include <interfaces/shared/gdk/gdk_drawing_interface.h>
 
-void SmoothGDKInitializeCanvas(SmoothCanvas *Canvas,
+G_GNUC_INTERNAL void SmoothGDKInitializeCanvas(SmoothCanvas *Canvas,
 				GtkStyle * Style,
 				GdkWindow * _Window,
 				GdkRectangle * Area,
@@ -36,8 +36,8 @@
 				SmoothInt Height,				
 				SmoothInt XOffset,
 				SmoothInt YOffset,
-				SmoothColorCube *ColorCube) G_GNUC_INTERNAL;
+				SmoothColorCube *ColorCube);
 
-void SmoothGDKFinalizeCanvas(SmoothCanvas *Canvas) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void SmoothGDKFinalizeCanvas(SmoothCanvas *Canvas);
 
 #endif /* GDK2_DRAWING_INTERFACE_H */
--- gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_engine.h.orig	2006-07-27 10:17:28.281170000 +0100
+++ gtk-engines-2.7.6/engines/smooth/src/engine/smooth_gtk2_engine.h	2006-07-27 10:17:41.013817000 +0100
@@ -75,6 +75,6 @@
 
 extern gint smooth_rc_references;
 
-gboolean smooth_rc_data_unref(GObject *rc_style) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean smooth_rc_data_unref(GObject *rc_style);
 
 #endif /* SMOOTH_GTK_ENGINE_H */
--- gtk-engines-2.7.6/engines/thinice/src/thinice_rc_style.h.orig	2006-07-27 10:19:06.995574000 +0100
+++ gtk-engines-2.7.6/engines/thinice/src/thinice_rc_style.h	2006-07-27 10:19:24.667251000 +0100
@@ -30,7 +30,7 @@
   GtkRcStyleClass parent_class;
 };
 
-void thinice_rc_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void thinice_rc_style_register_type (GTypeModule *module);
 
 /* Default stuff */
 #define DEFAULT_SCROLLSHAPE       SCROLL_SHAPED
--- gtk-engines-2.7.6/engines/thinice/src/thinice_style.h.orig	2006-07-27 10:20:20.724258000 +0100
+++ gtk-engines-2.7.6/engines/thinice/src/thinice_style.h	2006-07-27 10:20:34.739029000 +0100
@@ -24,6 +24,6 @@
   GtkStyleClass parent_class;
 };
 
-void thinice_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void thinice_style_register_type (GTypeModule *module);
 
 
--- gtk-engines-2.7.6/engines/thinice/src/thinice_misc.h.orig	2006-07-27 10:22:06.328075000 +0100
+++ gtk-engines-2.7.6/engines/thinice/src/thinice_misc.h	2006-07-27 10:22:51.562280000 +0100
@@ -1,39 +1,39 @@
 GtkShadowType
-thinice_shadow_type (GtkStyle *style, const char *detail, GtkShadowType requested) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL thinice_shadow_type (GtkStyle *style, const char *detail, GtkShadowType requested);
 
-void
+G_GNUC_INTERNAL void
 thinice_slash_two(cairo_t *cr,
                   CairoColor *color1,
                   CairoColor *color2,
                   gint x,
                   gint y,
                   gint width,
-                  gint height) G_GNUC_INTERNAL;
+                  gint height);
 
-void
+G_GNUC_INTERNAL void
 thinice_slash_one(cairo_t *cr,
                   CairoColor *color1,
                   CairoColor *color2,
                   gint x,
                   gint y,
                   gint width,
-                  gint height) G_GNUC_INTERNAL;
+                  gint height);
 
-void
+G_GNUC_INTERNAL void
 thinice_dot(cairo_t *cr,
             CairoColor *color1,
             CairoColor *color2,
             gint x,
-            gint y) G_GNUC_INTERNAL;
+            gint y);
 
-void thinice_arrow (cairo_t *canvas,
+G_GNUC_INTERNAL void thinice_arrow (cairo_t *canvas,
 			CairoColor *color,
 			GtkArrowType arrow_type, 
                         gboolean fill,
 			gint x, 
 			gint y, 
 			gint width, 
-			gint height) G_GNUC_INTERNAL;
+			gint height);
 
-void thinice_draw_separator(cairo_t *cr, gboolean horizontal,
-                           int x, int y, int width, int height) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void thinice_draw_separator(cairo_t *cr, gboolean horizontal,
+                           int x, int y, int width, int height);
--- gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_draw.h.orig	2006-08-09 10:58:39.803885000 +0100
+++ gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_draw.h	2006-08-09 11:00:55.735393000 +0100
@@ -8,146 +8,146 @@
 
 #include <cairo.h>
 
-void clearlooks_draw_button           (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_button           (cairo_t *cr,
                                        const ClearlooksColors      *colors,
                                        const WidgetParameters      *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_scale_trough     (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_scale_trough     (cairo_t *cr,
                                        const ClearlooksColors      *colors,
                                        const WidgetParameters      *widget,
                                        const SliderParameters      *slider,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_progressbar_trough (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_progressbar_trough (cairo_t *cr,
                                        const ClearlooksColors      *colors,
                                        const WidgetParameters      *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
 
-void clearlooks_draw_progressbar_fill (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_progressbar_fill (cairo_t *cr,
                                        const ClearlooksColors      *colors,
                                        const WidgetParameters      *widget,
                                        const ProgressBarParameters *progressbar,
-                                       int x, int y, int width, int height, gint offset) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height, gint offset);
 
-void clearlooks_draw_slider_button    (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_slider_button    (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const SliderParameters     *slider,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_entry            (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_entry            (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_spinbutton       (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_spinbutton       (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_spinbutton_down  (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_spinbutton_down  (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_optionmenu       (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_optionmenu       (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const OptionMenuParameters *optionmenu,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 								   
-void clearlooks_draw_inset            (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_inset            (cairo_t *cr,
                                        int width, int height,
-                                       double radius, uint8 corners) G_GNUC_INTERNAL;
+                                       double radius, uint8 corners);
 
-void clearlooks_draw_menubar          (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_menubar          (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const MenuBarParameters    *menubar,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_tab              (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_tab              (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const TabParameters        *tab,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_frame            (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_frame            (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const FrameParameters      *frame,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_separator        (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_separator        (cairo_t *cr,
                                        const ClearlooksColors     *colors,
                                        const WidgetParameters     *widget,
                                        const SeparatorParameters  *separator,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_list_view_header (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_list_view_header (cairo_t *cr,
                                        const ClearlooksColors         *colors,
                                        const WidgetParameters         *widget,
                                        const ListViewHeaderParameters *header,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_toolbar          (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_toolbar          (cairo_t *cr,
                                        const ClearlooksColors         *colors,
                                        const WidgetParameters         *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_menuitem         (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_menuitem         (cairo_t *cr,
                                        const ClearlooksColors         *colors,
                                        const WidgetParameters         *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_scrollbar_stepper (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_scrollbar_stepper (cairo_t *cr,
                                         const ClearlooksColors           *colors,
                                         const WidgetParameters           *widget,
                                         const ScrollBarParameters        *scrollbar,
                                         const ScrollBarStepperParameters *stepper,
-                                        int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                        int x, int y, int width, int height);
 
-void clearlooks_draw_scrollbar_slider (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_scrollbar_slider (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
                                        const ScrollBarParameters       *scrollbar,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_scrollbar_trough (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_scrollbar_trough (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
                                        const ScrollBarParameters       *scrollbar,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_statusbar        (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_statusbar        (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_menu_frame       (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_menu_frame       (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_handle           (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_handle           (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
                                        const HandleParameters          *handle,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_arrow            (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_arrow            (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
                                        const ArrowParameters           *arrow,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
-void clearlooks_draw_resize_grip      (cairo_t *cr,
+G_GNUC_INTERNAL void clearlooks_draw_resize_grip      (cairo_t *cr,
                                        const ClearlooksColors          *colors,
                                        const WidgetParameters          *widget,
                                        const ResizeGripParameters      *grip,
-                                       int x, int y, int width, int height) G_GNUC_INTERNAL;
+                                       int x, int y, int width, int height);
 
 /* Function Pointers */
 typedef void (*menubar_draw_proto) (cairo_t *cr,
--- gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_style.h.orig	2006-08-09 10:48:44.825088000 +0100
+++ gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_style.h	2006-08-09 10:49:34.947922000 +0100
@@ -28,7 +28,7 @@
 typedef struct _ClearlooksStyle ClearlooksStyle;
 typedef struct _ClearlooksStyleClass ClearlooksStyleClass;
 
-extern GType clearlooks_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType clearlooks_type_style;
 
 #define CLEARLOOKS_TYPE_STYLE              clearlooks_type_style
 #define CLEARLOOKS_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CLEARLOOKS_TYPE_STYLE, ClearlooksStyle))
@@ -58,4 +58,4 @@
 };
 
 
-void clearlooks_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void clearlooks_style_register_type (GTypeModule *module);
--- gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_rc_style.h.orig	2006-08-09 10:49:43.574925000 +0100
+++ gtk-engines-2.7.7/engines/clearlooks/src/clearlooks_rc_style.h	2006-08-09 10:49:57.806114000 +0100
@@ -27,7 +27,7 @@
 typedef struct _ClearlooksRcStyle ClearlooksRcStyle;
 typedef struct _ClearlooksRcStyleClass ClearlooksRcStyleClass;
 
-extern GType clearlooks_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType clearlooks_type_rc_style;
 
 #define CLEARLOOKS_TYPE_RC_STYLE              clearlooks_type_rc_style
 #define CLEARLOOKS_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CLEARLOOKS_TYPE_RC_STYLE, ClearlooksRcStyle))
@@ -57,4 +57,4 @@
   GtkRcStyleClass parent_class;
 };
 
-void clearlooks_rc_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void clearlooks_rc_style_register_type (GTypeModule *module);
--- gtk-engines-2.7.7/engines/clearlooks/src/support.h.orig	2006-08-09 10:50:02.617507000 +0100
+++ gtk-engines-2.7.7/engines/clearlooks/src/support.h	2006-08-09 10:53:51.584750000 +0100
@@ -10,24 +10,24 @@
 #define RADIO_SIZE 13
 #define CHECK_SIZE 13
 
-void              clearlooks_treeview_get_header_index (GtkTreeView  *tv,
+G_GNUC_INTERNAL void              clearlooks_treeview_get_header_index (GtkTreeView  *tv,
                                                  GtkWidget    *header,
                                                  gint         *column_index,
                                                  gint         *columns,
-                                                 gboolean     *resizable) G_GNUC_INTERNAL;
+                                                 gboolean     *resizable);
 
-void              clearlooks_clist_get_header_index    (GtkCList     *clist,
+G_GNUC_INTERNAL void              clearlooks_clist_get_header_index    (GtkCList     *clist,
                                                  GtkWidget    *button,
                                                  gint         *column_index,
-                                                 gint         *columns) G_GNUC_INTERNAL;
+                                                 gint         *columns);
 
 #warning clearlooks_get_parent_bg is a bad hack - find out why its needed, and figure out a better way.
-void              clearlooks_get_parent_bg      (const GtkWidget *widget,
-                                                 CairoColor      *color) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void              clearlooks_get_parent_bg      (const GtkWidget *widget,
+                                                 CairoColor      *color);
 
-ClearlooksStepper clearlooks_scrollbar_get_stepper         (GtkWidget       *widget,
-                                                 GdkRectangle    *stepper) G_GNUC_INTERNAL;
-ClearlooksStepper clearlooks_scrollbar_visible_steppers    (GtkWidget       *widget) G_GNUC_INTERNAL;
-ClearlooksJunction clearlooks_scrollbar_get_junction       (GtkWidget    *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL ClearlooksStepper clearlooks_scrollbar_get_stepper         (GtkWidget       *widget,
+                                                 GdkRectangle    *stepper);
+G_GNUC_INTERNAL ClearlooksStepper clearlooks_scrollbar_visible_steppers    (GtkWidget       *widget);
+G_GNUC_INTERNAL ClearlooksJunction clearlooks_scrollbar_get_junction       (GtkWidget    *widget);
 
 #endif /* SUPPORT_H */
--- gtk-engines-2.7.7/engines/crux/src/crux-draw.h.orig	2006-08-09 11:02:56.392129000 +0100
+++ gtk-engines-2.7.7/engines/crux/src/crux-draw.h	2006-08-09 11:03:44.731095000 +0100
@@ -3,6 +3,6 @@
 
 #include <gtk/gtk.h>
 
-void crux_draw_style_class_init (GtkStyleClass *style_class) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void crux_draw_style_class_init (GtkStyleClass *style_class);
 
 #endif
--- gtk-engines-2.7.7/engines/crux/src/crux-rc-style.h.orig	2006-08-09 11:03:08.098051000 +0100
+++ gtk-engines-2.7.7/engines/crux/src/crux-rc-style.h	2006-08-09 11:03:57.028521000 +0100
@@ -5,7 +5,7 @@
 
 G_BEGIN_DECLS
 
-extern GType crux_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType crux_type_rc_style;
 
 #define CRUX_TYPE_RC_STYLE              crux_type_rc_style
 #define CRUX_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CRUX_TYPE_RC_STYLE, CruxRcStyle))
@@ -27,7 +27,7 @@
   GtkRcStyleClass parent_class;
 };
 
-void crux_rc_style_register_type (GTypeModule *engine) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void crux_rc_style_register_type (GTypeModule *engine);
 
 
 G_END_DECLS
--- gtk-engines-2.7.7/engines/crux/src/crux-style.h.orig	2006-08-09 11:03:18.443016000 +0100
+++ gtk-engines-2.7.7/engines/crux/src/crux-style.h	2006-08-09 11:04:08.741390000 +0100
@@ -8,7 +8,7 @@
 
 G_BEGIN_DECLS
 
-extern GType crux_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType crux_type_style;
 
 #define CRUX_TYPE_STYLE              crux_type_style
 #define CRUX_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CRUX_TYPE_STYLE, CruxStyle))
@@ -31,7 +31,7 @@
 
 };
 
-void crux_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void crux_style_register_type (GTypeModule *module);
 
 G_END_DECLS
 
--- gtk-engines-2.7.7/engines/hc/src/hc_gtk2_engine.h.orig	2006-08-09 11:06:31.224401000 +0100
+++ gtk-engines-2.7.7/engines/hc/src/hc_gtk2_engine.h	2006-08-09 11:06:55.608814000 +0100
@@ -27,8 +27,8 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-extern GType hc_type_rc_style G_GNUC_INTERNAL;
-extern GtkStyleClass *hc_parent_class G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType hc_type_rc_style;
+G_GNUC_INTERNAL extern GtkStyleClass *hc_parent_class;
  
 #define HC_TYPE_RC_STYLE              hc_type_rc_style
 #define HC_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), HC_TYPE_RC_STYLE, HcRcStyle))
@@ -50,7 +50,7 @@
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-extern GType hc_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType hc_type_style;
  
 #define HC_TYPE_STYLE              hc_type_style
 #define HC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), HC_TYPE_STYLE, HcStyle))
--- gtk-engines-2.7.7/engines/industrial/src/industrial_rc_style.h.orig	2006-08-09 11:08:29.245779000 +0100
+++ gtk-engines-2.7.7/engines/industrial/src/industrial_rc_style.h	2006-08-09 11:08:54.038690000 +0100
@@ -27,7 +27,7 @@
 typedef struct _IndustrialRcStyle IndustrialRcStyle;
 typedef struct _IndustrialRcStyleClass IndustrialRcStyleClass;
 
-extern GType industrial_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType industrial_type_rc_style;
 
 #define INDUSTRIAL_TYPE_RC_STYLE              industrial_type_rc_style
 #define INDUSTRIAL_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), INDUSTRIAL_TYPE_RC_STYLE, IndustrialRcStyle))
@@ -58,4 +58,4 @@
 	GtkRcStyleClass parent_class;
 };
 
-void industrial_rc_style_register_type (GTypeModule * module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void industrial_rc_style_register_type (GTypeModule * module);
--- gtk-engines-2.7.7/engines/industrial/src/industrial_style.h.orig	2006-08-09 11:08:37.574573000 +0100
+++ gtk-engines-2.7.7/engines/industrial/src/industrial_style.h	2006-08-09 11:09:04.375399000 +0100
@@ -26,7 +26,7 @@
 typedef struct _IndustrialStyle IndustrialStyle;
 typedef struct _IndustrialStyleClass IndustrialStyleClass;
 
-extern GType industrial_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType industrial_type_style;
 
 #define INDUSTRIAL_TYPE_STYLE              industrial_type_style
 #define INDUSTRIAL_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), INDUSTRIAL_TYPE_STYLE, IndustrialStyle))
@@ -47,4 +47,4 @@
 	GtkStyleClass parent_class;
 };
 
-void industrial_style_register_type (GTypeModule * module) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void industrial_style_register_type (GTypeModule * module);
--- gtk-engines-2.7.7/engines/mist/src/mist-rc-style.h.orig	2006-08-09 11:12:01.341871000 +0100
+++ gtk-engines-2.7.7/engines/mist/src/mist-rc-style.h	2006-08-09 11:15:32.378952000 +0100
@@ -3,7 +3,7 @@
 typedef struct _MistRcStyle MistRcStyle;
 typedef struct _MistRcStyleClass MistRcStyleClass;
 
-extern GType mist_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType mist_type_rc_style;
 
 #define MIST_TYPE_RC_STYLE              mist_type_rc_style
 #define MIST_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MIST_TYPE_RC_STYLE, MistRcStyle))
--- gtk-engines-2.7.7/engines/mist/src/mist-style.h.orig	2006-08-09 11:15:16.900471000 +0100
+++ gtk-engines-2.7.7/engines/mist/src/mist-style.h	2006-08-09 11:15:44.179937000 +0100
@@ -4,7 +4,7 @@
 typedef struct _MistStyle MistStyle;
 typedef struct _MistStyleClass MistStyleClass;
 
-extern GType mist_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType mist_type_style;
 
 #define MIST_TYPE_STYLE              mist_type_style
 #define MIST_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MIST_TYPE_STYLE, MistStyle))
--- gtk-engines-2.7.7/engines/redmond/src/redmond_gtk2_engine.h.orig	2006-08-09 11:17:41.283893000 +0100
+++ gtk-engines-2.7.7/engines/redmond/src/redmond_gtk2_engine.h	2006-08-09 11:17:58.295628000 +0100
@@ -45,7 +45,7 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-extern GType redmond_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType redmond_type_rc_style;
  
 #define REDMOND_TYPE_RC_STYLE              redmond_type_rc_style
 #define REDMOND_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), REDMOND_TYPE_RC_STYLE, RedmondRcStyle))
@@ -67,7 +67,7 @@
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-extern GType redmond_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType redmond_type_style;
  
 #define REDMOND_TYPE_STYLE              redmond_type_style
 #define REDMOND_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), REDMOND_TYPE_STYLE, RedmondStyle))
--- gtk-engines-2.7.7/engines/glide/src/glide_gtk2_engine.h.orig	2006-08-09 11:19:27.343708000 +0100
+++ gtk-engines-2.7.7/engines/glide/src/glide_gtk2_engine.h	2006-08-09 11:19:44.957351000 +0100
@@ -69,7 +69,7 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-extern GType glide_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType glide_type_rc_style;
  
 #define GLIDE_TYPE_RC_STYLE              glide_type_rc_style
 #define GLIDE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GLIDE_TYPE_RC_STYLE, GlideRcStyle))
@@ -91,8 +91,8 @@
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-extern GType glide_type_style G_GNUC_INTERNAL;
-extern GtkStyleClass *glide_parent_class G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType glide_type_style;
+G_GNUC_INTERNAL extern GtkStyleClass *glide_parent_class;
  
 #define GLIDE_TYPE_STYLE              glide_type_style
 #define GLIDE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GLIDE_TYPE_STYLE, GlideStyle))
--- gtk-engines-2.7.7/engines/glide/src/glide_gtk2_drawing.h.orig	2006-08-09 11:20:13.061231000 +0100
+++ gtk-engines-2.7.7/engines/glide/src/glide_gtk2_drawing.h	2006-08-09 11:20:38.020903000 +0100
@@ -138,7 +138,7 @@
           gint x, 
           gint y, 
           gint width, 
-          gint height) G_GNUC_INTERNAL;
+          gint height);
 
 void
 glide_draw_flat_box (GtkStyle * style,
--- gtk-engines-2.7.7/engines/smooth/src/engine/smooth_gtk2_engine.h.orig	2006-08-09 11:24:26.553428000 +0100
+++ gtk-engines-2.7.7/engines/smooth/src/engine/smooth_gtk2_engine.h	2006-08-09 11:25:04.299487000 +0100
@@ -37,9 +37,9 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-extern GType smooth_type_style G_GNUC_INTERNAL;
-extern GtkStyleClass *smooth_theme_parent_class G_GNUC_INTERNAL;
-extern GType smooth_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType smooth_type_style;
+G_GNUC_INTERNAL extern GtkStyleClass *smooth_theme_parent_class;
+G_GNUC_INTERNAL extern GType smooth_type_rc_style;
 
 #define SMOOTH_TYPE_STYLE              smooth_type_style
 #define SMOOTH_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), SMOOTH_TYPE_STYLE, SmoothStyle))
@@ -73,7 +73,7 @@
   GtkRcStyleClass parent_class;
 } SmoothRcStyleClass;
 
-extern gint smooth_rc_references G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern gint smooth_rc_references;
 
 G_GNUC_INTERNAL gboolean smooth_rc_data_unref(GObject *rc_style);
 
--- gtk-engines-2.7.7/engines/thinice/src/thinice_rc_style.h.orig	2006-08-09 11:29:09.969603000 +0100
+++ gtk-engines-2.7.7/engines/thinice/src/thinice_rc_style.h	2006-08-09 11:29:40.042405000 +0100
@@ -3,7 +3,7 @@
 typedef struct _ThiniceRcStyle ThiniceRcStyle;
 typedef struct _ThiniceRcStyleClass ThiniceRcStyleClass;
 
-extern GType thinice_type_rc_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType thinice_type_rc_style;
 
 #define THINICE_TYPE_RC_STYLE              thinice_type_rc_style
 #define THINICE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), THINICE_TYPE_RC_STYLE, ThiniceRcStyle))
--- gtk-engines-2.7.7/engines/thinice/src/thinice_style.h.orig	2006-08-09 11:29:19.186529000 +0100
+++ gtk-engines-2.7.7/engines/thinice/src/thinice_style.h	2006-08-09 11:30:00.164220000 +0100
@@ -4,7 +4,7 @@
 typedef struct _ThiniceStyle ThiniceStyle;
 typedef struct _ThiniceStyleClass ThiniceStyleClass;
 
-extern GType thinice_type_style G_GNUC_INTERNAL;
+G_GNUC_INTERNAL extern GType thinice_type_style;
 
 #define THINICE_TYPE_STYLE              thinice_type_style
 #define THINICE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), THINICE_TYPE_STYLE, ThiniceStyle))
