diff --git a/libgthumb/gthumb-info-bar.h b/libgthumb/gthumb-info-bar.h
index f69ba86..2b8a31f 100644
--- a/libgthumb/gthumb-info-bar.h
+++ b/libgthumb/gthumb-info-bar.h
@@ -49,7 +49,7 @@ struct _GThumbInfoBarClass
 	GtkEventBoxClass __parent;
 };
 
-GtkType        gthumb_info_bar_get_type           (void);
+GType          gthumb_info_bar_get_type           (void);
 
 GtkWidget*     gthumb_info_bar_new                ();
 
diff --git a/src/gtkcellrendererthreestates.c b/src/gtkcellrendererthreestates.c
index fdbda34..68b8d94 100644
--- a/src/gtkcellrendererthreestates.c
+++ b/src/gtkcellrendererthreestates.c
@@ -93,10 +93,10 @@ enum {
 static guint three_states_cell_signals[LAST_SIGNAL] = { 0 };
 
 
-GtkType
+GType
 gtk_cell_renderer_three_states_get_type (void)
 {
-  static GtkType type = 0;
+  static GType type = 0;
 
   if (!type)
     {
diff --git a/src/gtkcellrendererthreestates.h b/src/gtkcellrendererthreestates.h
index 2ef456e..829f8c5 100644
--- a/src/gtkcellrendererthreestates.h
+++ b/src/gtkcellrendererthreestates.h
@@ -48,11 +48,11 @@ extern "C" {
 
 
 #define GTK_TYPE_CELL_RENDERER_THREE_STATES			(gtk_cell_renderer_three_states_get_type ())
-#define GTK_CELL_RENDERER_THREE_STATES(obj)			(GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererThreeStates))
-#define GTK_CELL_RENDERER_THREE_STATES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererthree_statesClass))
-#define GTK_IS_CELL_RENDERER_THREE_STATES(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES))
-#define GTK_IS_CELL_RENDERER_THREE_STATES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_THREE_STATES))
-#define GTK_CELL_RENDERER_THREE_STATES_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererthree_statesClass))
+#define GTK_CELL_RENDERER_THREE_STATES(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererThreeStates))
+#define GTK_CELL_RENDERER_THREE_STATES_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererthree_statesClass))
+#define GTK_IS_CELL_RENDERER_THREE_STATES(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES))
+#define GTK_IS_CELL_RENDERER_THREE_STATES_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_THREE_STATES))
+#define GTK_CELL_RENDERER_THREE_STATES_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_THREE_STATES, GtkCellRendererthree_statesClass))
 
 typedef struct _GtkCellRendererThreeStates GtkCellRendererThreeStates;
 typedef struct _GtkCellRendererThreeStatesClass GtkCellRendererThreeStatesClass;
@@ -82,7 +82,7 @@ struct _GtkCellRendererThreeStatesClass
   void (*_gtk_reserved4) (void);
 };
 
-GtkType          gtk_cell_renderer_three_states_get_type        (void);
+GType          gtk_cell_renderer_three_states_get_type        (void);
 GtkCellRenderer *gtk_cell_renderer_three_states_new             (void);
 
 gboolean         gtk_cell_renderer_three_states_get_radio       (GtkCellRendererThreeStates *three_states);
