--- gail/gailbutton.c
+++ gail/gailbutton.c
@@ -34,7 +34,7 @@
 static void                  gail_button_notify_label_gtk (GObject         *obj,
                                                            GParamSpec      *pspec,
                                                            gpointer        data);
-static gint                  gail_button_label_map_gtk    (GtkWidget       *widget,
+static void                  gail_button_label_map_gtk    (GtkWidget       *widget,
                                                            gpointer        data);
 
 static void                  gail_button_real_initialize  (AtkObject       *obj,
@@ -333,7 +333,7 @@
 
 }
 
-static gint
+static void
 gail_button_label_map_gtk (GtkWidget *widget,
                            gpointer data)
 {
@@ -1473,7 +1473,7 @@
   return child;
 }
 
-static void*
+static void
 count_labels (GtkContainer *container,
               gint         *n_labels)
 {
--- gail/gailexpander.c
+++ gail/gailexpander.c
@@ -35,7 +35,7 @@
 static AtkStateSet*          gail_expander_ref_state_set    (AtkObject         *obj);
 static void                  gail_expander_real_notify_gtk  (GObject           *obj,
                                                              GParamSpec        *pspec);
-static gint                  gail_expander_map_gtk          (GtkWidget         *widget,
+static void                  gail_expander_map_gtk          (GtkWidget         *widget,
                                                              gpointer          data);
 
 static void                  gail_expander_real_initialize  (AtkObject         *obj,
@@ -269,7 +269,7 @@
   obj->role = ATK_ROLE_TOGGLE_BUTTON;
 }
 
-static gint
+static void
 gail_expander_map_gtk (GtkWidget *widget,
                        gpointer data)
 {
--- gail/gailitem.c
+++ gail/gailitem.c
@@ -188,7 +188,7 @@
   obj->role = ATK_ROLE_LIST_ITEM;
 }
 
-static gint
+static void
 gail_item_label_map_gtk (GtkWidget *widget,
                          gpointer data)
 {
--- gail/gaillabel.c
+++ gail/gaillabel.c
@@ -28,7 +28,7 @@
                                                     gpointer	      data);
 static void	  gail_label_real_notify_gtk	   (GObject	      *obj,
                                                     GParamSpec	      *pspec);
-static gint       gail_label_map_gtk               (GtkWidget         *widget,
+static void       gail_label_map_gtk               (GtkWidget         *widget,
                                                     gpointer          data);
 static void       gail_label_init_text_util        (GailLabel         *gail_label,
                                                     GtkWidget         *widget);
@@ -208,7 +208,7 @@
     obj->role = ATK_ROLE_LABEL;
 }
 
-static gint
+static void
 gail_label_map_gtk (GtkWidget *widget,
                     gpointer data)
 {
--- gail/gailnotebookpage.c
+++ gail/gailnotebookpage.c
@@ -25,7 +25,7 @@
 static void      gail_notebook_page_class_init      (GailNotebookPageClass     *klass);
 
 static void                  gail_notebook_page_finalize       (GObject   *object);
-static gint                  gail_notebook_page_label_map_gtk  (GtkWidget *widget,
+static void                  gail_notebook_page_label_map_gtk  (GtkWidget *widget,
                                                                 gpointer  data);
 
 static G_CONST_RETURN gchar* gail_notebook_page_get_name       (AtkObject *accessible);
@@ -227,7 +227,7 @@
   return atk_object;
 }
 
-static gint
+static void
 gail_notebook_page_label_map_gtk (GtkWidget *widget,
                                   gpointer data)
 {
