Index: Src/Gtk2/game_mode_helper.h
===================================================================
--- Src/Gtk2/game_mode_helper.h	(revision 3615)
+++ Src/Gtk2/game_mode_helper.h	(working copy)
@@ -11,10 +11,10 @@
 
 G_BEGIN_DECLS
 #define TYPE_GAME_MODE_HELPER         (game_mode_helper_get_type())
-#define GAME_MODE_HELPER(obj)         (GTK_CHECK_CAST((obj), TYPE_GAME_MODE_HELPER, GameModeHelper ))
-#define GAME_MODE_HELPER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), TYPE_GAME_MODE_HELPER, GameModeHelper ))
-#define IS_GAME_MODE_HELPER(obj)		(GTK_CHECK_TYPE ((obj), TYPE_GAME_MODE_HELPER))
-#define IS_GAME_MODE_HELPER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), TYPE_GAME_MODE_HELPER))
+#define GAME_MODE_HELPER(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_GAME_MODE_HELPER, GameModeHelper ))
+#define GAME_MODE_HELPER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GAME_MODE_HELPER, GameModeHelper ))
+#define IS_GAME_MODE_HELPER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GAME_MODE_HELPER))
+#define IS_GAME_MODE_HELPER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GAME_MODE_HELPER))
 
 typedef struct _GameModeHelper GameModeHelper;
 typedef struct _GameModeHelperClass GameModeHelperClass;
Index: Src/Gtk2/GtkDasherControl.h
===================================================================
--- Src/Gtk2/GtkDasherControl.h	(revision 3615)
+++ Src/Gtk2/GtkDasherControl.h	(working copy)
@@ -25,10 +25,10 @@
 
 G_BEGIN_DECLS
 #define TYPE_GTK_DASHER_CONTROL         (gtk_dasher_control_get_type())
-#define GTK_DASHER_CONTROL(obj)         (GTK_CHECK_CAST((obj), TYPE_GTK_DASHER_CONTROL, GtkDasherControl ))
-#define GTK_DASHER_CONTROL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), TYPE_GTK_DASHER_CONTROL, GtkDasherControlClass ))
-#define IS_GTK_DASHER_CONTROL(obj)		(GTK_CHECK_TYPE ((obj), TYPE_GTK_DASHER_CONTROL))
-#define IS_GTK_DASHER_CONTROL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), TYPE_GTK_DASHER_CONTROL))
+#define GTK_DASHER_CONTROL(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_GTK_DASHER_CONTROL, GtkDasherControl ))
+#define GTK_DASHER_CONTROL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_DASHER_CONTROL, GtkDasherControlClass ))
+#define IS_GTK_DASHER_CONTROL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_DASHER_CONTROL))
+#define IS_GTK_DASHER_CONTROL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_DASHER_CONTROL))
 
 typedef struct _GtkDasherControl GtkDasherControl;
 typedef struct _GtkDasherControlClass GtkDasherControlClass;
Index: Src/Gtk2/module_settings_window.h
===================================================================
--- Src/Gtk2/module_settings_window.h	(revision 3615)
+++ Src/Gtk2/module_settings_window.h	(working copy)
@@ -30,10 +30,10 @@
 
 G_BEGIN_DECLS
 #define TYPE_MODULE_SETTINGS_WINDOW         (module_settings_window_get_type())
-#define MODULE_SETTINGS_WINDOW(obj)         (GTK_CHECK_CAST((obj), TYPE_MODULE_SETTINGS_WINDOW, ModuleSettingsWindow ))
-#define MODULE_SETTINGS_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), TYPE_MODULE_SETTINGS_WINDOW, ModuleSettingsWindow ))
-#define IS_MODULE_SETTINGS_WINDOW(obj)		(GTK_CHECK_TYPE ((obj), TYPE_MODULE_SETTINGS_WINDOW))
-#define IS_MODULE_SETTINGS_WINDOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), TYPE_MODULE_SETTINGS_WINDOW))
+#define MODULE_SETTINGS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_MODULE_SETTINGS_WINDOW, ModuleSettingsWindow ))
+#define MODULE_SETTINGS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MODULE_SETTINGS_WINDOW, ModuleSettingsWindow ))
+#define IS_MODULE_SETTINGS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MODULE_SETTINGS_WINDOW))
+#define IS_MODULE_SETTINGS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MODULE_SETTINGS_WINDOW))
 
 typedef struct _ModuleSettingsWindow ModuleSettingsWindow;
 typedef struct _ModuleSettingsWindowClass ModuleSettingsWindowClass;
