Index: libanjuta/anjuta-ui.c
===================================================================
--- libanjuta/anjuta-ui.c	(revision 4017)
+++ libanjuta/anjuta-ui.c	(working copy)
@@ -77,10 +77,9 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcellrendereraccel.h>
 
-#include <libgnome/gnome-macros.h>
-
 #include "resources.h"
 #include "anjuta-ui.h"
+#include "anjuta-utils.h"
 #include "anjuta-debug.h"
 
 struct _AnjutaUIPrivate {
@@ -281,13 +280,9 @@
 		}
 	}
 }
+						 
+G_DEFINE_TYPE(AnjutaUI, anjuta_ui, GTK_TYPE_UI_MANAGER)
 
-static void anjuta_ui_class_init (AnjutaUIClass *class);
-static void anjuta_ui_instance_init (AnjutaUI *ui);
-
-GNOME_CLASS_BOILERPLATE (AnjutaUI, anjuta_ui,
-						 GtkUIManager, GTK_TYPE_UI_MANAGER);
-
 static void
 anjuta_ui_dispose (GObject *obj)
 {
@@ -321,7 +316,7 @@
 		g_object_unref (G_OBJECT (ui->priv->icon_factory));
 		ui->priv->icon_factory = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (anjuta_ui_parent_class)->dispose (obj);
 }
 
 static void
@@ -329,22 +324,20 @@
 {
 	AnjutaUI *ui = ANJUTA_UI (obj);
 	g_free (ui->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (anjuta_ui_parent_class)->finalize (obj);
 }
 
 static void
 anjuta_ui_class_init (AnjutaUIClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	parent_class = g_type_class_peek_parent (class);
 	
 	object_class->dispose = anjuta_ui_dispose;
 	object_class->finalize = anjuta_ui_finalize;
 }
 
 static void
-anjuta_ui_instance_init (AnjutaUI *ui)
+anjuta_ui_init (AnjutaUI *ui)
 {
 	GtkTreeStore *store;
 	
Index: libanjuta/anjuta-launcher.c
===================================================================
--- libanjuta/anjuta-launcher.c	(revision 4017)
+++ libanjuta/anjuta-launcher.c	(working copy)
@@ -54,8 +54,6 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
-#include <libgnome/gnome-macros.h>
-
 #include "anjuta-utils.h"
 #include "anjuta-marshal.h"
 #include "resources.h"
@@ -267,7 +265,7 @@
 		launcher->priv->busy = FALSE;
 		
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -280,7 +278,7 @@
 	g_hash_table_destroy (launcher->priv->env);
 	
 	g_free (launcher->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: libanjuta/e-splash.c
===================================================================
--- libanjuta/e-splash.c	(revision 4017)
+++ libanjuta/e-splash.c	(working copy)
@@ -36,7 +36,6 @@
 
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <libgnomecanvas/libgnomecanvas.h>
-#include <libgnome/gnome-macros.h>
 #include <gtk/gtk.h>
 
 #include "e-splash.h"
@@ -51,7 +50,7 @@
 	gint progressbar_position;
 };
 
-GNOME_CLASS_BOILERPLATE (ESplash, e_splash, GtkWindow, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE(ESplash, e_splash, GTK_TYPE_WINDOW)
 
 /* Layout constants.  These need to be changed if the splash changes.  */
 
@@ -77,18 +76,24 @@
 }
 
 static void
+e_splash_finalize (GObject *obj)
+{	
+	G_OBJECT_CLASS (e_splash_parent_class)->finalize (obj);
+}
+
+static void
 e_splash_class_init (ESplashClass *klass)
 {
-	GtkObjectClass *object_class;
+	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = impl_destroy;
-
-	parent_class = gtk_type_class (gtk_window_get_type ());
+	gtkobject_class->destroy = impl_destroy;
+	
+	object_class->finalize = e_splash_finalize;
 }
 
 static void
-e_splash_instance_init (ESplash *splash)
+e_splash_init (ESplash *splash)
 {
 	ESplashPrivate *priv;
 
Index: libanjuta/cell-renderer-captioned-image.c
===================================================================
--- libanjuta/cell-renderer-captioned-image.c	(revision 4017)
+++ libanjuta/cell-renderer-captioned-image.c	(working copy)
@@ -30,14 +30,8 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 
-#include <libgnome/gnome-macros.h>
-
 #include "cell-renderer-captioned-image.h"
 
-
-static void anjuta_cell_renderer_captioned_image_instance_init (AnjutaCellRendererCaptionedImage      *cell);
-static void anjuta_cell_renderer_captioned_image_class_init    (AnjutaCellRendererCaptionedImageClass *class);
-
 enum {
 	PROP_0,
 	
@@ -47,11 +41,9 @@
 
 #define PAD 3
 #define SPACE 5
+			 
+G_DEFINE_TYPE(AnjutaCellRendererCaptionedImage, anjuta_cell_renderer_captioned_image, GTK_TYPE_CELL_RENDERER)
 
-GNOME_CLASS_BOILERPLATE (AnjutaCellRendererCaptionedImage,
-			 anjuta_cell_renderer_captioned_image,
-			 GtkCellRenderer, GTK_TYPE_CELL_RENDERER);
-
 static void
 anjuta_cell_renderer_captioned_image_get_property (GObject *object,
 						   guint param_id,
@@ -188,10 +180,18 @@
 	
 	g_object_unref (cell->image);
 	g_object_unref (cell->caption);
+	
+	G_OBJECT_CLASS (anjuta_cell_renderer_captioned_image_parent_class)->dispose (obj);
 }
 
 static void
-anjuta_cell_renderer_captioned_image_instance_init (AnjutaCellRendererCaptionedImage *cell)
+anjuta_cell_renderer_captioned_image_finalize (GObject *obj)
+{	
+	G_OBJECT_CLASS (anjuta_cell_renderer_captioned_image_parent_class)->finalize (obj);
+}
+
+static void
+anjuta_cell_renderer_captioned_image_init (AnjutaCellRendererCaptionedImage *cell)
 {
 	cell->image = gtk_cell_renderer_pixbuf_new ();
 	cell->caption = gtk_cell_renderer_text_new ();
@@ -203,9 +203,8 @@
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
 	
-	parent_class = g_type_class_peek_parent (class);
-	
 	object_class->dispose = anjuta_cell_renderer_captioned_image_dispose;
+	object_class->finalize = anjuta_cell_renderer_captioned_image_finalize;
 	
 	object_class->get_property = anjuta_cell_renderer_captioned_image_get_property;
 	object_class->set_property = anjuta_cell_renderer_captioned_image_set_property;
