diff -u /tmp/GTK2.orig/source/global.pre source/global.pre
--- /tmp/GTK2.orig/source/global.pre	2005-06-28 09:48:40.000000000 -0400
+++ source/global.pre	2005-06-28 15:01:33.513671404 -0400
@@ -424,6 +424,7 @@
 
 endrequire; /* x11 */
 
+require gtk22;
 array(mapping(string:mixed)) get_formats()
 //! Get information about the image formats supported.
 {
@@ -571,6 +572,7 @@
 
   f_aggregate_mapping(k*2);
 }
+endrequire;
 
 require gtk24;
 void set_default_icon(GDK.Pixbuf icon)
diff -u /tmp/GTK2.orig/source/gtkactiongroup.pre source/gtkactiongroup.pre
--- /tmp/GTK2.orig/source/gtkactiongroup.pre	2005-06-23 15:36:28.000000000 -0400
+++ source/gtkactiongroup.pre	2005-06-28 14:26:39.262851628 -0400
@@ -1,5 +1,6 @@
 class GTK.ActionGroup;
 inherit G.Object;
+require gtk24;
 
 //! Properties:
 //! string name
diff -u /tmp/GTK2.orig/source/gtkentry.pre source/gtkentry.pre
--- /tmp/GTK2.orig/source/gtkentry.pre	2005-06-22 17:53:18.000000000 -0400
+++ source/gtkentry.pre	2005-06-28 14:55:36.854005239 -0400
@@ -114,6 +114,7 @@
 int get_visibility();
 //! Retrieves whether the text is visible.
 
+require gtk24;
 void set_completion(GTK.EntryCompletion completion);
 //! Sets completion to be the auxiliary completion object to use.  All further
 //! configuration of the completion mechanism is done on completion using
@@ -121,5 +122,5 @@
 
 GTK.EntryCompletion get_completion();
 //! Returns the completion object.
-
+endrequire;
 
diff -u /tmp/GTK2.orig/source/gtkfilefilter.pre source/gtkfilefilter.pre
--- /tmp/GTK2.orig/source/gtkfilefilter.pre	2005-06-23 10:47:27.000000000 -0400
+++ source/gtkfilefilter.pre	2005-06-28 14:24:51.842315364 -0400
@@ -1,5 +1,6 @@
 class GTK.FileFilter;
 inherit GTK.Data;
+require gtk24;
 
 void create();
 //! Creates a new W(FileFilter) with no rules added to it.  Such a filter

diff -u /tmp/GTK2.orig/source/gtkuimanager.pre source/gtkuimanager.pre
--- /tmp/GTK2.orig/source/gtkuimanager.pre	2005-06-23 15:15:37.000000000 -0400
+++ source/gtkuimanager.pre	2005-06-28 14:57:14.016121390 -0400
@@ -1,5 +1,6 @@
 class GTK.UiManager;
 inherit G.Object;
+require gtk24;
 
 //! Properties:
 //! int add-tearoffs