diff -aur eel.original.SvnRev2205/eel/eel-background-box.h eel.1/eel/eel-background-box.h
--- eel.original.SvnRev2205/eel/eel-background-box.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-background-box.h	2008-12-18 11:46:26.000000000 +0200
@@ -51,7 +51,7 @@
 	GtkEventBoxClass parent_class;
 };
 
-GtkType    eel_background_box_get_type (void);
+GType    eel_background_box_get_type (void);
 GtkWidget *eel_background_box_new      (void);
 
 G_END_DECLS
diff -aur eel.original.SvnRev2205/eel/eel-background.h eel.1/eel/eel-background.h
--- eel.original.SvnRev2205/eel/eel-background.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-background.h	2008-12-18 11:45:13.000000000 +0200
@@ -67,7 +67,7 @@
 	EEL_BACKGROUND_ZOOM
 } EelBackgroundImagePlacement;
 
-GtkType                     eel_background_get_type                         (void);
+GType                     eel_background_get_type                         (void);
 EelBackground *             eel_background_new                              (void);
 
 
diff -aur eel.original.SvnRev2205/eel/eel-debug-drawing.c eel.1/eel/eel-debug-drawing.c
--- eel.original.SvnRev2205/eel/eel-debug-drawing.c	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-debug-drawing.c	2008-12-18 11:46:11.000000000 +0200
@@ -55,7 +55,7 @@
 typedef struct DebugPixbufViewer DebugPixbufViewer;
 typedef struct DebugPixbufViewerClass DebugPixbufViewerClass;
 
-static GtkType debug_pixbuf_viewer_get_type   (void);
+static GType debug_pixbuf_viewer_get_type   (void);
 static void    debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer,
 					       GdkPixbuf         *pixbuf);
 
diff -aur eel.original.SvnRev2205/eel/eel-gtk-macros.h eel.1/eel/eel-gtk-macros.h
--- eel.original.SvnRev2205/eel/eel-gtk-macros.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-gtk-macros.h	2008-12-18 11:47:00.000000000 +0200
@@ -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 = {                                     \
diff -aur eel.original.SvnRev2205/eel/eel-image-table.c eel.1/eel/eel-image-table.c
--- eel.original.SvnRev2205/eel/eel-image-table.c	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-image-table.c	2008-12-18 11:46:22.000000000 +0200
@@ -76,7 +76,7 @@
 /* GtkContainerClass methods */
 static void    eel_image_table_remove               (GtkContainer       *container,
 						     GtkWidget          *widget);
-static GtkType eel_image_table_child_type           (GtkContainer       *container);
+static GType eel_image_table_child_type           (GtkContainer       *container);
 
 /* Private EelImageTable methods */
 static void    image_table_emit_signal              (EelImageTable      *image_table,
@@ -292,7 +292,7 @@
 	EEL_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child));
 }
 
-static GtkType
+static GType
 eel_image_table_child_type (GtkContainer *container)
 {
 	return EEL_TYPE_LABELED_IMAGE;
diff -aur eel.original.SvnRev2205/eel/eel-image-table.h eel.1/eel/eel-image-table.h
--- eel.original.SvnRev2205/eel/eel-image-table.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-image-table.h	2008-12-18 11:46:46.000000000 +0200
@@ -80,7 +80,7 @@
 };
 
 /* Public GtkImageTable methods */
-GtkType    eel_image_table_get_type         (void);
+GType    eel_image_table_get_type         (void);
 GtkWidget *eel_image_table_new              (gboolean       homogeneous);
 GtkWidget *eel_image_table_add_empty_image  (EelImageTable *image_table);
 
diff -aur eel.original.SvnRev2205/eel/eel-labeled-image.h eel.1/eel/eel-labeled-image.h
--- eel.original.SvnRev2205/eel/eel-labeled-image.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-labeled-image.h	2008-12-18 11:44:44.000000000 +0200
@@ -79,7 +79,7 @@
 };
 
 /* Public GtkLabeledImage methods */
-GtkType         eel_labeled_image_get_type                         (void);
+GType         eel_labeled_image_get_type                         (void);
 GtkWidget *     eel_labeled_image_new                              (const char              *text,
 								    GdkPixbuf               *pixbuf);
 GtkWidget *     eel_labeled_image_new_from_file_name               (const char              *text,
diff -aur eel.original.SvnRev2205/eel/eel-types.c eel.1/eel/eel-types.c
--- eel.original.SvnRev2205/eel/eel-types.c	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-types.c	2008-12-18 11:45:07.000000000 +0200
@@ -35,13 +35,13 @@
 eel_type_init (void)
 {
 	int i;
-	GtkType type_id;
+	GType type_id;
 	static gboolean initialized = FALSE;
 	
 	static struct {
 		const gchar *type_name;
-		GtkType *type_id;
-		GtkType parent;
+		GType *type_id;
+		GType parent;
 		gconstpointer pointer1;
 		gpointer pointer2;
 	} builtin_info[EEL_TYPE_N_BUILTINS] = {
diff -aur eel.original.SvnRev2205/eel/eel-wrap-table.c eel.1/eel/eel-wrap-table.c
--- eel.original.SvnRev2205/eel/eel-wrap-table.c	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-wrap-table.c	2008-12-18 11:46:05.000000000 +0200
@@ -89,7 +89,7 @@
 							  gboolean             include_internals,
 							  GtkCallback          callback,
 							  gpointer             callback_data);
-static GtkType       eel_wrap_table_child_type           (GtkContainer        *container);
+static GType         eel_wrap_table_child_type           (GtkContainer        *container);
 
 
 /* Private EelWrapTable methods */
@@ -477,7 +477,7 @@
 	}
 }
 
-static GtkType
+static GType
 eel_wrap_table_child_type (GtkContainer   *container)
 {
 	return GTK_TYPE_WIDGET;
diff -aur eel.original.SvnRev2205/eel/eel-wrap-table.h eel.1/eel/eel-wrap-table.h
--- eel.original.SvnRev2205/eel/eel-wrap-table.h	2008-12-18 11:39:48.000000000 +0200
+++ eel.1/eel/eel-wrap-table.h	2008-12-18 11:44:51.000000000 +0200
@@ -62,7 +62,7 @@
 } EelJustification;
 
 /* Public GtkWrapTable methods */
-GtkType          eel_wrap_table_get_type                  (void);
+GType          eel_wrap_table_get_type                  (void);
 GtkWidget *      eel_wrap_table_new                       (gboolean            homogeneous);
 void             eel_wrap_table_set_x_spacing             (EelWrapTable       *wrap_table,
 							   guint               x_spacing);

