diff --git a/borrowed/goffice/go-charmap-sel.c b/borrowed/goffice/go-charmap-sel.c
index d94fc918cb..1c60787abb 100644
--- a/borrowed/goffice/go-charmap-sel.c
+++ b/borrowed/goffice/go-charmap-sel.c
@@ -261,15 +261,6 @@ struct _GOCharmapSel
     GOCharmapSelTestDirection test;
 };
 
-typedef struct
-{
-    GtkBoxClass parent_class;
-
-    gboolean (*charmap_changed)(GOCharmapSel *cs, char const *new_charmap);
-} GOCharmapSelClass;
-
-typedef GOCharmapSel Cs;
-typedef GOCharmapSelClass CsClass;
 
 /* Signals we emit */
 enum
@@ -471,7 +462,7 @@ static void go_charmap_sel_class_init(GOCharmapSelClass *klass)
 
     cs_signals[CHARMAP_CHANGED] = g_signal_new("charmap_changed",
     GO_TYPE_CHARMAP_SEL, G_SIGNAL_RUN_LAST,
-            G_STRUCT_OFFSET(GOCharmapSelClass, charmap_changed),
+            0,
             NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
             G_TYPE_POINTER);
 
diff --git a/borrowed/goffice/go-charmap-sel.h b/borrowed/goffice/go-charmap-sel.h
index e9b931a4ad..6c25cea681 100644
--- a/borrowed/goffice/go-charmap-sel.h
+++ b/borrowed/goffice/go-charmap-sel.h
@@ -30,10 +30,7 @@
 G_BEGIN_DECLS
 
 #define GO_TYPE_CHARMAP_SEL        (go_charmap_sel_get_type ())
-#define GO_CHARMAP_SEL(obj)        (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_CHARMAP_SEL, GOCharmapSel))
-#define GO_IS_CHARMAP_SEL(obj)     (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_CHARMAP_SEL))
-
-typedef struct _GOCharmapSel GOCharmapSel;
+G_DECLARE_FINAL_TYPE (GOCharmapSel, go_charmap_sel, GO, CHARMAP_SEL, GtkBox);
 
 typedef enum
 {
@@ -41,7 +38,6 @@ typedef enum
     GO_CHARMAP_SEL_FROM_UTF8
 } GOCharmapSelTestDirection;
 
-GType go_charmap_sel_get_type(void);
 GtkWidget * go_charmap_sel_new(GOCharmapSelTestDirection test);
 
 gchar const *go_charmap_sel_get_encoding(GOCharmapSel *cs);
diff --git a/borrowed/goffice/go-optionmenu.c b/borrowed/goffice/go-optionmenu.c
index af65b1ab1e..fc2c3c7986 100644
--- a/borrowed/goffice/go-optionmenu.c
+++ b/borrowed/goffice/go-optionmenu.c
@@ -50,6 +50,15 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
+struct _GOOptionMenu
+{
+    GtkButton button;
+
+    GtkMenuShell *menu;
+    GtkMenuItem *selected;
+    GtkLabel *button_label;
+};
+
 G_DEFINE_TYPE (GOOptionMenu, go_option_menu, GTK_TYPE_BUTTON)
 
 GtkWidget*
@@ -325,7 +334,7 @@ static void go_option_menu_class_init(GOOptionMenuClass *class)
     GtkWidgetClass *widget_class = (GtkWidgetClass*) class;
 
     signals[CHANGED] = g_signal_new("changed", G_OBJECT_CLASS_TYPE(class),
-            G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GOOptionMenuClass, changed),
+            G_SIGNAL_RUN_LAST, 0,
             NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
     gobject_class->set_property = go_option_menu_set_property;
diff --git a/borrowed/goffice/go-optionmenu.h b/borrowed/goffice/go-optionmenu.h
index 6582c9c7a3..f492b0a04d 100644
--- a/borrowed/goffice/go-optionmenu.h
+++ b/borrowed/goffice/go-optionmenu.h
@@ -38,41 +38,8 @@
 G_BEGIN_DECLS
 
 #define GO_TYPE_OPTION_MENU              (go_option_menu_get_type ())
-#define GO_OPTION_MENU(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_OPTION_MENU, GOOptionMenu))
-#define GO_OPTION_MENU_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_OPTION_MENU, GOOptionMenuClass))
-#define GO_IS_OPTION_MENU(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_OPTION_MENU))
-#define GO_IS_OPTION_MENU_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GO_TYPE_OPTION_MENU))
-#define GO_OPTION_MENU_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GO_TYPE_OPTION_MENU, GOOptionMenuClass))
+G_DECLARE_FINAL_TYPE (GOOptionMenu, go_option_menu, GO, OPTION_MENU, GtkButton)
 
-typedef struct _GOOptionMenu GOOptionMenu;
-typedef struct _GOOptionMenuClass GOOptionMenuClass;
-
-struct _GOOptionMenu
-{
-    GtkButton button;
-
-    /*< private >*/
-
-    GtkMenuShell *menu;
-    GtkMenuItem *selected;
-    GtkLabel *button_label;
-};
-
-struct _GOOptionMenuClass
-{
-    GtkButtonClass parent_class;
-
-    void (*changed)(GOOptionMenu *option_menu);
-
-    /* Padding for future expansion */
-    void (*_gtk_reserved1)(void);
-    void (*_gtk_reserved2)(void);
-    void (*_gtk_reserved3)(void);
-    void (*_gtk_reserved4)(void);
-};
-
-GType go_option_menu_get_type(void)
-G_GNUC_CONST;
 GtkWidget* go_option_menu_new(void);
 void go_option_menu_set_menu(GOOptionMenu *option_menu, GtkWidget *menu);
 void go_option_menu_set_history(GOOptionMenu *option_menu, GSList *selection);