diff -u ruby-gnome2.orig/gtk/src/init.c ruby-gnome2/gtk/src/init.c
--- ruby-gnome2.orig/gtk/src/init.c	Sun May 19 21:39:07 2002
+++ ruby-gnome2/gtk/src/init.c	Thu May 23 23:52:12 2002
@@ -16,7 +16,7 @@
 EXTERN VALUE rb_argv, rb_progname;
 
 void
-Init_gtk()
+Init_gtk2()
 {
     int argc, i;
     char **argv;
diff -u ruby-gnome2.orig/gtk/src/rbgdkimage.c ruby-gnome2/gtk/src/rbgdkimage.c
--- ruby-gnome2.orig/gtk/src/rbgdkimage.c	Sun May 19 21:39:05 2002
+++ ruby-gnome2/gtk/src/rbgdkimage.c	Thu May 23 23:10:45 2002
@@ -41,6 +41,8 @@
     return gimage;
 }
 
+#ifdef GDK_ENABLE_BROKEN
+
 static VALUE
 gdkimage_s_newbmap(klass, visual, data, w, h)
     VALUE klass, visual, data, w, h;
@@ -56,6 +58,8 @@
                          width, height));
 }
 
+#endif
+
 static VALUE
 gdkimage_s_new(klass, type, visual, w, h)
     VALUE klass, type, visual, w, h;
@@ -138,7 +142,9 @@
 void Init_gtk_gdk_image() {
     gdkImage = rb_define_class_under(mGdk, "Image", rb_cData);
 
+#ifdef GDK_ENABLE_BROKEN
     rb_define_singleton_method(gdkImage, "new_bitmap", gdkimage_s_newbmap, 4);
+#endif
     rb_define_singleton_method(gdkImage, "new", gdkimage_s_new, 4);
     rb_define_singleton_method(gdkImage, "get", gdkimage_s_get, 5);
 
diff -u ruby-gnome2.orig/gtk/src/rbgtk.c ruby-gnome2/gtk/src/rbgtk.c
--- ruby-gnome2.orig/gtk/src/rbgtk.c	Wed May 22 02:32:25 2002
+++ ruby-gnome2/gtk/src/rbgtk.c	Thu May 23 23:42:09 2002
@@ -109,6 +109,7 @@
 #ifndef GTK_DISABLE_DEPRECATED
 VALUE gCList;
 VALUE gCTree;
+VALUE gCTreeNode;
 VALUE gList;
 VALUE gListItem;
 VALUE gPixmap;
diff -u ruby-gnome2.orig/gtk/src/rbgtkcontainer.c ruby-gnome2/gtk/src/rbgtkcontainer.c
--- ruby-gnome2.orig/gtk/src/rbgtkcontainer.c	Mon May 20 00:48:28 2002
+++ ruby-gnome2/gtk/src/rbgtkcontainer.c	Thu May 23 23:57:01 2002
@@ -174,5 +174,7 @@
     Init_gtk_socket();
     Init_gtk_table();
     Init_gtk_toolbar();
+#ifdef GTK_ENABLE_BROKEN
     Init_gtk_tree();
+#endif
 }
diff -u ruby-gnome2.orig/gtk/src/rbgtkeditable.c ruby-gnome2/gtk/src/rbgtkeditable.c
--- ruby-gnome2.orig/gtk/src/rbgtkeditable.c	Mon May 20 00:48:28 2002
+++ ruby-gnome2/gtk/src/rbgtkeditable.c	Thu May 23 23:58:02 2002
@@ -144,5 +144,7 @@
 
     /* child initialization */
     Init_gtk_entry();
+#ifdef GTK_ENABLE_BROKEN
     Init_gtk_text();
+#endif
 }
diff -u ruby-gnome2.orig/gtk/src/rbgtkitem.c ruby-gnome2/gtk/src/rbgtkitem.c
--- ruby-gnome2.orig/gtk/src/rbgtkitem.c	Sun May 19 21:39:04 2002
+++ ruby-gnome2/gtk/src/rbgtkitem.c	Thu May 23 23:54:07 2002
@@ -55,5 +55,7 @@
     /* child initialization */
     Init_gtk_list_item();
     Init_gtk_menu_item();
+#ifdef GTK_ENABLE_BROKEN
     Init_gtk_tree_item();
+#endif
 }
diff -u ruby-gnome2.orig/gtk/src/rbgtkitemfactory.c ruby-gnome2/gtk/src/rbgtkitemfactory.c
--- ruby-gnome2.orig/gtk/src/rbgtkitemfactory.c	Mon May 20 00:48:28 2002
+++ ruby-gnome2/gtk/src/rbgtkitemfactory.c	Thu May 23 22:36:45 2002
@@ -41,8 +41,10 @@
         return rb_obj_alloc(gMenuItem);
     else if (GTK_IS_LIST_ITEM(p_item))
         return rb_obj_alloc(gListItem);
+#ifdef GTK_ENABLE_BROKEN
     else if (GTK_IS_TREE_ITEM(p_item))
         return rb_obj_alloc(gTreeItem);
+#endif
     else
         return rb_obj_alloc(gItem);
 }