Index: capplets/keyboard/gnome-keyboard-properties-xkbot.c
===================================================================
--- capplets/keyboard/gnome-keyboard-properties-xkbot.c	(revision 9276)
+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	(working copy)
@@ -348,7 +348,7 @@
 			  (GCompareFunc) xkb_option_checks_compare);
 	while (option_checks_list) {
 		option_check = GTK_WIDGET (option_checks_list->data);
-		gtk_box_pack_start_defaults (GTK_BOX (vbox), option_check);
+		gtk_box_pack_start (GTK_BOX (vbox), option_check, TRUE, TRUE, 0);
 		option_checks_list = option_checks_list->next;
 	}
 	/* free it */
Index: capplets/keybindings/gnome-keybinding-properties.c
===================================================================
--- capplets/keybindings/gnome-keybinding-properties.c	(revision 9276)
+++ capplets/keybindings/gnome-keybinding-properties.c	(working copy)
@@ -395,7 +395,7 @@
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (WID ("actions_swindow")),
 				  GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-  gtk_widget_set_usize (WID ("actions_swindow"), -1, -1);
+  gtk_widget_set_size_request (WID ("actions_swindow"), -1, -1);
 }
 
 typedef struct {
Index: capplets/keybindings/eggcellrendererkeys.h
===================================================================
--- capplets/keybindings/eggcellrendererkeys.h	(revision 9276)
+++ capplets/keybindings/eggcellrendererkeys.h	(working copy)
@@ -26,11 +26,11 @@
 G_BEGIN_DECLS
 
 #define EGG_TYPE_CELL_RENDERER_KEYS		(egg_cell_renderer_keys_get_type ())
-#define EGG_CELL_RENDERER_KEYS(obj)		(GTK_CHECK_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys))
-#define EGG_CELL_RENDERER_KEYS_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
-#define EGG_IS_CELL_RENDERER_KEYS(obj)		(GTK_CHECK_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS))
-#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS))
-#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
+#define EGG_CELL_RENDERER_KEYS(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys))
+#define EGG_CELL_RENDERER_KEYS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
+#define EGG_IS_CELL_RENDERER_KEYS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS))
+#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS))
+#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
 
 typedef struct _EggCellRendererKeys      EggCellRendererKeys;
 typedef struct _EggCellRendererKeysClass EggCellRendererKeysClass;
Index: capplets/about-me/eel-gtk-macros.h
===================================================================
--- capplets/about-me/eel-gtk-macros.h	(revision 9276)
+++ capplets/about-me/eel-gtk-macros.h	(working copy)
@@ -49,11 +49,11 @@
                                                                               \
 static gpointer parent_class;                                                 \
                                                                               \
-GtkType                                                                       \
+GType                                                                         \
 prefix##_get_type (void)                                                      \
 {                                                                             \
-	GtkType parent_type;                                                  \
-	static GtkType type;                                                  \
+	GType parent_type;                                                    \
+	static GType type;                                                    \
                                                                               \
 	if (type == 0) {                                                      \
 		static GTypeInfo info = {                                     \
