diff --git a/ChangeLog b/ChangeLog
index 634aef7c39..009cfe7a71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkbindings.c (gtk_binding_entry_add_signal):
+	* gtk/gtktoolbutton.c (gtk_tool_button_get_type): 
+	* examples/gtkdial/gtkdial.h (gtk_dial_get_type): 
+	s/GtkType/GType/
+
 2008-06-17  Tor Lillqvist  <tml@novell.com>
 
 	* gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
diff --git a/examples/gtkdial/gtkdial.h b/examples/gtkdial/gtkdial.h
index 7f9096df9b..c156c9a148 100644
--- a/examples/gtkdial/gtkdial.h
+++ b/examples/gtkdial/gtkdial.h
@@ -74,7 +74,7 @@ struct _GtkDialClass
 
 
 GtkWidget*     gtk_dial_new                    (GtkAdjustment *adjustment);
-GtkType        gtk_dial_get_type               (void);
+GType          gtk_dial_get_type               (void);
 GtkAdjustment* gtk_dial_get_adjustment         (GtkDial      *dial);
 void           gtk_dial_set_update_policy      (GtkDial      *dial,
 						GtkUpdateType  policy);
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 472c8a4dc9..b338d4d683 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -911,7 +911,7 @@ gtk_binding_entry_add_signal (GtkBindingSet  *binding_set,
       arg = g_slice_new0 (GtkBindingArg);
       slist = g_slist_prepend (slist, arg);
 
-      arg->arg_type = va_arg (args, GtkType);
+      arg->arg_type = va_arg (args, GType);
       switch (G_TYPE_FUNDAMENTAL (arg->arg_type))
 	{
 	case G_TYPE_CHAR:
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 21d6011880..ac2094bd97 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -100,7 +100,7 @@ struct _GtkToolButtonPrivate
 GType
 gtk_tool_button_get_type (void)
 {
-  static GtkType type = 0;
+  static GType type = 0;
 
   if (!type)
     type = g_type_register_static_simple (GTK_TYPE_TOOL_ITEM,