Index: src/users/users-tool.h
===================================================================
--- src/users/users-tool.h	(revision 4295)
+++ src/users/users-tool.h	(working copy)
@@ -30,10 +30,10 @@
 #include "user-profiles.h"
 
 #define GST_TYPE_USERS_TOOL            (gst_users_tool_get_type ())
-#define GST_USERS_TOOL(obj)            (GTK_CHECK_CAST ((obj), GST_TYPE_USERS_TOOL, GstUsersTool))
-#define GST_USERS_TOOL_CLASS(class)    (GTK_CHECK_CLASS_CAST ((class), GST_TYPE_USERS_TOOL, GstUsersToolClass))
-#define GST_IS_USERS_TOOL(obj)         (GTK_CHECK_TYPE ((obj), GST_TYPE_USERS_TOOL))
-#define GST_IS_USERS_TOOL_CLASS(class) (GTK_CHECK_CLASS_TYPE ((class), GST_TYPE_USERS_TOOL))
+#define GST_USERS_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_USERS_TOOL, GstUsersTool))
+#define GST_USERS_TOOL_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), GST_TYPE_USERS_TOOL, GstUsersToolClass))
+#define GST_IS_USERS_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_USERS_TOOL))
+#define GST_IS_USERS_TOOL_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GST_TYPE_USERS_TOOL))
 
 typedef struct _GstUsersTool      GstUsersTool;
 typedef struct _GstUsersToolClass GstUsersToolClass;
Index: src/users/search-bar/search-bar.h
===================================================================
--- src/users/search-bar/search-bar.h	(revision 4295)
+++ src/users/search-bar/search-bar.h	(working copy)
@@ -30,10 +30,10 @@
 #include <gtk/gtk.h>
 
 #define SEARCH_BAR_TYPE			(search_bar_get_type ())
-#define SEARCH_BAR(obj)			(GTK_CHECK_CAST ((obj), SEARCH_BAR_TYPE, SearchBar))
-#define SEARCH_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), SEARCH_BAR_TYPE, SearchBarClass))
-#define IS_SEARCH_BAR(obj)		(GTK_CHECK_TYPE ((obj), SEARCH_BAR_TYPE))
-#define IS_SEARCH_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), SEARCH_BAR_TYPE))
+#define SEARCH_BAR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCH_BAR_TYPE, SearchBar))
+#define SEARCH_BAR_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), SEARCH_BAR_TYPE, SearchBarClass))
+#define IS_SEARCH_BAR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCH_BAR_TYPE))
+#define IS_SEARCH_BAR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), SEARCH_BAR_TYPE))
 
 typedef struct {
 	char *text;
Index: src/boot/boot-druid.h
===================================================================
--- src/boot/boot-druid.h	(revision 4295)
+++ src/boot/boot-druid.h	(working copy)
@@ -32,10 +32,10 @@
 G_BEGIN_DECLS
 
 #define BOOT_DRUID_TYPE        (boot_druid_get_type ())
-#define BOOT_DRUID(o)          (GTK_CHECK_CAST ((o), BOOT_DRUID_TYPE, BootDruid))
-#define BOOT_DRUID_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BOOT_DRUID_TYPE, BootDruidClass))
-#define BOOT_IS_DRUID(o)       (GTK_CHECK_TYPE ((o), BOOT_DRUID_TYPE))
-#define BOOT_IS_DRUID_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BOOT_DRUID_TYPE))
+#define BOOT_DRUID(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), BOOT_DRUID_TYPE, BootDruid))
+#define BOOT_DRUID_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), BOOT_DRUID_TYPE, BootDruidClass))
+#define BOOT_IS_DRUID(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), BOOT_DRUID_TYPE))
+#define BOOT_IS_DRUID_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BOOT_DRUID_TYPE))
 
 typedef struct {
 	GtkWindow parent;
Index: src/services/services-tool.h
===================================================================
--- src/services/services-tool.h	(revision 4295)
+++ src/services/services-tool.h	(working copy)
@@ -27,10 +27,10 @@
 #include "gst-tool.h"
 
 #define GST_TYPE_SERVICES_TOOL            (gst_services_tool_get_type ())
-#define GST_SERVICES_TOOL(obj)            (GTK_CHECK_CAST ((obj), GST_TYPE_SERVICES_TOOL, GstServicesTool))
-#define GST_SERVICES_TOOL_CLASS(class)    (GTK_CHECK_CLASS_CAST ((class), GST_TYPE_SERVICES_TOOL, GstServicesToolClass))
-#define GST_IS_SERVICES_TOOL(obj)         (GTK_CHECK_TYPE ((obj), GST_TYPE_SERVICES_TOOL))
-#define GST_IS_SERVICES_TOOL_CLASS(class) (GTK_CHECK_CLASS_TYPE ((class), GST_TYPE_SERVICES_TOOL))
+#define GST_SERVICES_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SERVICES_TOOL, GstServicesTool))
+#define GST_SERVICES_TOOL_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), GST_TYPE_SERVICES_TOOL, GstServicesToolClass))
+#define GST_IS_SERVICES_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SERVICES_TOOL))
+#define GST_IS_SERVICES_TOOL_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GST_TYPE_SERVICES_TOOL))
 
 typedef struct _GstServicesTool      GstServicesTool;
 typedef struct _GstServicesToolClass GstServicesToolClass;
Index: src/time/e-map/e-map.h
===================================================================
--- src/time/e-map/e-map.h	(revision 4295)
+++ src/time/e-map/e-map.h	(working copy)
@@ -26,10 +26,10 @@
 #include <gtk/gtkwidget.h>
 
 #define TYPE_E_MAP            (e_map_get_type ())
-#define E_MAP(obj)            (GTK_CHECK_CAST ((obj), TYPE_E_MAP, EMap))
-#define E_MAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_E_MAP, EMapClass))
-#define IS_E_MAP(obj)         (GTK_CHECK_TYPE ((obj), TYPE_E_MAP))
-#define IS_E_MAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_E_MAP))
+#define E_MAP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_E_MAP, EMap))
+#define E_MAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_E_MAP, EMapClass))
+#define IS_E_MAP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_E_MAP))
+#define IS_E_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_E_MAP))
 
 typedef struct _EMap EMap;
 typedef struct _EMapClass EMapClass;
Index: src/time/time-tool.h
===================================================================
--- src/time/time-tool.h	(revision 4295)
+++ src/time/time-tool.h	(working copy)
@@ -11,10 +11,10 @@
 #include "tz-map.h"
 
 #define GST_TYPE_TIME_TOOL            (gst_time_tool_get_type ())
-#define GST_TIME_TOOL(obj)            (GTK_CHECK_CAST ((obj), GST_TYPE_TIME_TOOL, GstTimeTool))
-#define GST_TIME_TOOL_CLASS(class)    (GTK_CHECK_CLASS_CAST ((class), GST_TYPE_TIME_TOOL, GstTimeToolClass))
-#define GST_IS_TIME_TOOL(obj)         (GTK_CHECK_TYPE ((obj), GST_TYPE_TIME_TOOL))
-#define GST_IS_TIME_TOOL_CLASS(class) (GTK_CHECK_CLASS_TYPE ((class), GST_TYPE_TIME_TOOL))
+#define GST_TIME_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TIME_TOOL, GstTimeTool))
+#define GST_TIME_TOOL_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), GST_TYPE_TIME_TOOL, GstTimeToolClass))
+#define GST_IS_TIME_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TIME_TOOL))
+#define GST_IS_TIME_TOOL_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), GST_TYPE_TIME_TOOL))
 
 typedef struct _GstTimeTool      GstTimeTool;
 typedef struct _GstTimeToolClass GstTimeToolClass;
