diff --git a/gok/gok-sliding-window-word-complete.c b/gok/gok-sliding-window-word-complete.c
index 549101f..d84b80e 100644
--- a/gok/gok-sliding-window-word-complete.c
+++ b/gok/gok-sliding-window-word-complete.c
@@ -20,7 +20,7 @@
 */
 
 #include <string.h>
-#include <libgnome/gnome-macros.h>
+
 #include "gok-log.h"
 #include "gok-sliding-window-word-complete.h"
 
@@ -32,13 +32,12 @@ static const gchar* sw_wordcomplete_get_delimiter (GokWordComplete *complete);
 
 /* 
  * This macro initializes GokUtf8WordComplete with the GType system 
- *   and defines ..._class_init and ..._instance_init functions 
+ *   and defines ..._class_init and ..._init functions and a ..._parent_class pointer.
  */
-GNOME_CLASS_BOILERPLATE (GokSWWordComplete, gok_sw_wordcomplete,
-			 GokUTF8WordComplete, GOK_TYPE_UTF8WORDCOMPLETE)
+G_DEFINE_TYPE (GokSWWordComplete, gok_sw_wordcomplete, GOK_TYPE_UTF8WORDCOMPLETE)
 
 static void
-gok_sw_wordcomplete_instance_init (GokSWWordComplete *complete)
+gok_sw_wordcomplete_init (GokSWWordComplete *complete)
 {
     g_message ("created a sliding window word completion engine.\n");
 }
@@ -46,9 +45,7 @@ gok_sw_wordcomplete_instance_init (GokSWWordComplete *complete)
 static void
 gok_sw_wordcomplete_class_init (GokSWWordCompleteClass *klass)
 {
-    GokWordCompleteClass *word_complete_class = (GokWordCompleteClass *) klass;
-   
-    parent_class = g_type_class_peek_parent (klass);
+    GokWordCompleteClass *word_complete_class = GOK_WORDCOMPLETE_CLASS (klass);
 
     word_complete_class->get_delimiter = sw_wordcomplete_get_delimiter;
     word_complete_class->predict_string = sw_wordcomplete_predict_string;
@@ -62,7 +59,7 @@ static gchar** sw_wordcomplete_predict_string (GokWordComplete *complete, const
 	cp = g_utf8_offset_to_pointer (pWord, len - 1);
     else
 	cp = pWord;
-    return GOK_WORDCOMPLETE_CLASS (parent_class)->predict_string (complete, cp, num_predictions);
+    return GOK_WORDCOMPLETE_CLASS (gok_sw_wordcomplete_parent_class)->predict_string (complete, cp, num_predictions);
 }
 
 static const gchar* sw_wordcomplete_get_delimiter (GokWordComplete *complete)
diff --git a/gok/gok-utf8-word-complete.c b/gok/gok-utf8-word-complete.c
index 46652b4..3a0ceaf 100644
--- a/gok/gok-utf8-word-complete.c
+++ b/gok/gok-utf8-word-complete.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-macros.h>
+
 #include "gok-log.h"
 #include "gok-utf8-word-complete.h"
 
@@ -75,13 +75,12 @@ static void utf8_word_prediction_free (WordPrediction *prediction);
 
 /* 
  * This macro initializes GokUtf8WordComplete with the GType system 
- *   and defines ..._class_init and ..._instance_init functions 
+ *   and defines ..._class_init and ..._init functions and a ..._parent_class pointer
  */
-GNOME_CLASS_BOILERPLATE (GokUTF8WordComplete, gok_utf8_wordcomplete,
-			 GokWordComplete, GOK_TYPE_WORDCOMPLETE)
+G_DEFINE_TYPE (GokUTF8WordComplete, gok_utf8_wordcomplete, GOK_TYPE_WORDCOMPLETE)
 
 static void
-gok_utf8_wordcomplete_instance_init (GokUTF8WordComplete *complete)
+gok_utf8_wordcomplete_init (GokUTF8WordComplete *complete)
 {
 	complete->word_list = NULL;
 	complete->word_list_end = NULL;
@@ -93,7 +92,7 @@ gok_utf8_wordcomplete_instance_init (GokUTF8WordComplete *complete)
 static void
 gok_utf8_wordcomplete_class_init (GokUTF8WordCompleteClass *klass)
 {
-	GokWordCompleteClass *word_complete_class = (GokWordCompleteClass *) klass;
+	GokWordCompleteClass *word_complete_class = GOK_WORDCOMPLETE_CLASS (klass);
 	word_complete_class->open = utf8_wordcomplete_open;
 	word_complete_class->close = utf8_wordcomplete_close;
 	word_complete_class->predict_string = utf8_wordcomplete_predict_string;
diff --git a/gok/gok-word-complete.c b/gok/gok-word-complete.c
index bae3d44..6803980 100644
--- a/gok/gok-word-complete.c
+++ b/gok/gok-word-complete.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <locale.h>
-#include <libgnome/gnome-macros.h>
 
 #include "gok-word-complete.h"
 #include "gok-keyslotter.h"
@@ -72,11 +71,10 @@ struct _GokWordCompletePrivate
 
 static GokWordComplete *default_wordcomplete_engine = NULL;
 
-GNOME_CLASS_BOILERPLATE (GokWordComplete, gok_wordcomplete, 
-			 GObject, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GokWordComplete, gok_wordcomplete, G_TYPE_OBJECT)
 
 static void
-gok_wordcomplete_instance_init (GokWordComplete *complete)
+gok_wordcomplete_init (GokWordComplete *complete)
 {
 	complete->priv = g_new0 (GokWordCompletePrivate, 1);
 	complete->priv->word_part = NULL;
@@ -118,7 +116,7 @@ gok_wordcomplete_finalize (GObject *obj)
 
 	if (complete && complete->priv)
 		g_free (complete->priv);
-	G_OBJECT_CLASS (GOK_WORDCOMPLETE_GET_CLASS (obj))->finalize (obj);
+	G_OBJECT_CLASS (gok_wordcomplete_parent_class)->finalize (obj);
 }
 
 /**
diff --git a/gok/word-complete.c b/gok/word-complete.c
index e90c740..5fd7853 100644
--- a/gok/word-complete.c
+++ b/gok/word-complete.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <libgnome/gnome-macros.h>
+
 #include "word-complete.h"
 #include "gok-log.h"
 
@@ -85,20 +85,19 @@ static gchar *dictionary_full_path;
 
 /* 
  * This macro initializes GokTrieWordComplete with the GType system 
- *   and defines ..._class_init and ..._instance_init functions 
+ *   and defines ..._class_init and ..._init functions and a ..._parent_class pointer
  */
-GNOME_CLASS_BOILERPLATE (GokTrieWordComplete, gok_trie_wordcomplete,
-			 GokWordComplete, GOK_TYPE_WORDCOMPLETE)
+G_DEFINE_TYPE (GokTrieWordComplete, gok_trie_wordcomplete, GOK_TYPE_WORDCOMPLETE)
 
 static void
-gok_trie_wordcomplete_instance_init (GokTrieWordComplete *complete)
+gok_trie_wordcomplete_init (GokTrieWordComplete *complete)
 {
 }
 
 static void
 gok_trie_wordcomplete_class_init (GokTrieWordCompleteClass *klass)
 {
-	GokWordCompleteClass *word_complete_class = (GokWordCompleteClass *) klass;
+	GokWordCompleteClass *word_complete_class = GOK_WORDCOMPLETE_CLASS (klass);
 	word_complete_class->open = WordCompleteOpen;
 	word_complete_class->close = WordCompleteClose;
 	word_complete_class->increment_word_frequency = WordCompleteIncrementFrequency;
