diff --git a/gdk/Colormap.custom b/gdk/Colormap.custom
deleted file mode 100644
index 5029db880..000000000
--- a/gdk/Colormap.custom
+++ /dev/null
@@ -1,30 +0,0 @@
-// Gdk.Colormap.custom - Colormap customizations
-//
-// Copyright (c) 2009 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-		public int AllocColors (Gdk.Color[] colors, int n_colors, bool writeable, bool best_match, bool[] success)
-		{
-			return gdk_colormap_alloc_colors (Handle, colors, n_colors, writeable, best_match, success);
-		}
-
-		public void FreeColors (Gdk.Color[] colors, int n_colors)
-		{
-			gdk_colormap_free_colors (Handle, colors, n_colors);
-		}
diff --git a/gdk/DeviceAxis.custom b/gdk/DeviceAxis.custom
deleted file mode 100644
index 923f9fdbe..000000000
--- a/gdk/DeviceAxis.custom
+++ /dev/null
@@ -1,38 +0,0 @@
-// Gdk.Point.DeviceAxis - Gdk DeviceAxis class customizations
-//
-// Author: Jasper van Putten <Jaspervp@gmx.net>
-//
-// Copyright (c) 2002 Jasper van Putten
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-/// <summary>
-/// ToString method
-/// </summary>
-///
-/// <remarks>
-/// returns a string representation of this DeviceAxis
-///
-/// </remarks>
-
-public override string ToString ()
-{
-	return "Gdk.DeviceAxis, max:" + this.Max + ",min:" + this.Min + ",use:" + this.Use;
-}
-
-
diff --git a/gdk/EdgeTable.custom b/gdk/EdgeTable.custom
deleted file mode 100644
index 3e2910dec..000000000
--- a/gdk/EdgeTable.custom
+++ /dev/null
@@ -1,33 +0,0 @@
-// Gdk.EdgeTable.custom - Gdk EdgeTable class customizations
-//
-// Author:   Mike Kestner <mkestner@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-		[Obsolete ("Replaced by Scanlines property.")]
-		public Gdk.ScanLineList scanlines {
-			get { 
-				Gdk.ScanLineList ret = new Gdk.ScanLineList(_scanlines);
-				if (ret == null) ret = new Gdk.ScanLineList(_scanlines);
-				return ret;
-			}
-			set { _scanlines = value.Handle; }
-		}
-
diff --git a/gdk/Event.cs b/gdk/Event.cs
index 48d5489ef..9b9561135 100644
--- a/gdk/Event.cs
+++ b/gdk/Event.cs
@@ -131,8 +131,6 @@ namespace Gdk {
 			case EventType.DropStart:
 			case EventType.DropFinished:
 				return new EventDND (raw);
-			case EventType.ClientEvent:
-				return new EventClient (raw);
 			case EventType.VisibilityNotify:
 				return new EventVisibility (raw);
 			case EventType.Scroll:
diff --git a/gdk/EventClient.cs b/gdk/EventClient.cs
deleted file mode 100644
index 134be6e5c..000000000
--- a/gdk/EventClient.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Gdk.EventClient.cs - Custom client event wrapper 
-//
-// Author:  Mike Kestner <mkestner@novell.com>
-//
-// Copyright (c) 2004-2009 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace Gdk {
-
-	using System;
-	using System.Runtime.InteropServices;
-
-	public class EventClient : Event {
-
-		public EventClient (IntPtr raw) : base (raw) {} 
-
-		struct NativeStruct {
-			EventType type;
-			IntPtr window;
-			sbyte send_event;
-			public IntPtr message_type;
-			public ushort data_format;
-			public IntPtr data_as_long0;
-			public IntPtr data_as_long1;
-			public IntPtr data_as_long2;
-			public IntPtr data_as_long3;
-			public IntPtr data_as_long4;
-		}
-
-		NativeStruct Native {
-			get { return (NativeStruct) Marshal.PtrToStructure (Handle, typeof (NativeStruct)); }
-		}
-
-		public ushort DataFormat {
-			get { return Native.data_format; }
-			set {
-				NativeStruct native = Native;
-				native.data_format = value;
-				Marshal.StructureToPtr (native, Handle, false);
-			}
-		}
-
-		public Atom MessageType {
-			get { 
-				IntPtr msg_type = Native.message_type;
-				return msg_type == IntPtr.Zero ? null : (Atom) GLib.Opaque.GetOpaque (msg_type, typeof (Atom), false);
-			}
-			set {
-				NativeStruct native = Native;
-				native.message_type = value == null ? IntPtr.Zero : value.Handle;
-				Marshal.StructureToPtr (native, Handle, false);
-			}
-		}
-
-		IntPtr DataPointer {
-			get {
-				int offset = Marshal.SizeOf (typeof (NativeStruct)) - 5 * IntPtr.Size;
-				return new IntPtr (Handle.ToInt64 () + offset);
-			}
-		}
-
-		public Array Data {
-			get {
-				switch (DataFormat) {
-				case 8:
-					byte[] b = new byte [20];
-					Marshal.Copy (b, 0, DataPointer, 20);
-					return b;
-				case 16:
-					short[] s = new short [10];
-					Marshal.Copy (s, 0, DataPointer, 10);
-					return s;
-				case 32:
-					IntPtr data_ptr = DataPointer;
-					long[] l = new long [5];
-					for (int i = 0; i < 5; i++)
-						l [i] = (long) Marshal.ReadIntPtr (data_ptr, i * IntPtr.Size);
-					return l;
-				default:
-					throw new Exception ("Invalid Data Format: " + DataFormat);
-				}
-			}
-		}
-	}
-}
-
diff --git a/gdk/GCValues.custom b/gdk/GCValues.custom
deleted file mode 100644
index 9073a38cb..000000000
--- a/gdk/GCValues.custom
+++ /dev/null
@@ -1,50 +0,0 @@
-// Gdk.GCValues.custom - Gdk GCValues class customizations
-//
-// Author:   Mike Kestner <mkestner@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-		[Obsolete ("Replaced by Tile property.")]
-		public Gdk.Pixmap tile {
-			get { 
-				Gdk.Pixmap ret = (Gdk.Pixmap) GLib.Object.GetObject(_tile);
-				return ret;
-			}
-			set { _tile = value.Handle; }
-		}
-
-		[Obsolete ("Replaced by Stipple property.")]
-		public Gdk.Pixmap stipple {
-			get { 
-				Gdk.Pixmap ret = (Gdk.Pixmap) GLib.Object.GetObject(_stipple);
-				return ret;
-			}
-			set { _stipple = value.Handle; }
-		}
-
-		[Obsolete ("Replaced by ClipMask property.")]
-		public Gdk.Pixmap clip_mask {
-			get { 
-				Gdk.Pixmap ret = (Gdk.Pixmap) GLib.Object.GetObject(_clip_mask);
-				return ret;
-			}
-			set { _clip_mask = value.Handle; }
-		}
-
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index d60253769..80ae9141a 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -6,33 +6,20 @@
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Parse']/return-type" name="type">gboolean</attr>
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Parse']/*/*[@type='GdkColor*']" name="pass_as">ref</attr>
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='ToString']" name="hidden">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkCursor']/constructor[@cname='gdk_cursor_new_from_name']" name="shared">true</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkCursor']/field[@name='RefCount']" name="hidden">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkCursor']/method[@name='Ref']" name="deprecated">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkCursor']/method[@name='Unref']" name="deprecated">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkFont']" name="opaque">false</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkRectangle']/method[@name='Intersect']/*/*[@name='dest']" name="pass_as">out</attr>
-  <attr path="/api/namespace/boxed[@cname='GdkRectangle']/method[@name='Union']/*/*[@name='dest']" name="pass_as">out</attr>
+  <attr path="/api/namespace/boxed[@cname='GdkPixbufFormat']/method[@cname='gdk_pixbuf_format_is_disabled']" name="name">GetDisabled</attr> 
+  <attr path="/api/namespace/boxed[@cname='GdkPixbufFormat']/method[@name='GetExtensions']/return-type" name="null_term_array">1</attr> 
+  <attr path="/api/namespace/boxed[@cname='GdkPixbufFormat']/method[@name='GetMimeTypes']/return-type" name="null_term_array">1</attr> 
   <attr path="/api/namespace/callback[@cname='GdkPixbufDestroyNotify']/*/*[@type='guchar*']" name="array">1</attr>
   <attr path="/api/namespace/class[@cname='GdkCairo_']" name="name">CairoHelper</attr>
-  <attr path="/api/namespace/class[@cname='GdkColors_']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkDrag_']/method[@name='Begin']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkDrag_']/method[@name='FindWindow']/*/*[@name='dest_window']" name="pass_as">out</attr>
   <attr path="/api/namespace/class[@cname='GdkDrag_']/method[@name='FindWindowForScreen']/*/*[@name='dest_window']" name="pass_as">out</attr>
   <attr path="/api/namespace/class[@cname='GdkEvent_']/method[@name='HandlerSet']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkEvent_']" name="name">EventHelper</attr>
-  <attr path="/api/namespace/class[@cname='GdkInput_']/method[@name='Add']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkInput_']/method[@name='AddFull']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkKeyval_']/method[@name='Name']/return-type" name="type">const-gchar*</attr>
   <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='AddOptionEntriesLibgtkOnly']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='DevicesList']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='FreeTextList']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='InitCheck']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='ListVisuals']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='ParseArgs']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='AddClientMessageFilter']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='StringToCompoundText']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkGlobal']/method[@name='StringToCompoundTextForDisplay']" name="hidden">1</attr>
   <move-node path="/api/namespace/class[@cname='GdkNotify_']/method">/api/namespace/class[@cname='GdkGlobal']</move-node>
   <attr path="/api/namespace/class[@cname='GdkNotify_']" name="hidden">1</attr>
   <attr path="/api/namespace/class/method[@cname='gdk_notify_startup_complete']" name="name">NotifyStartupComplete</attr>
@@ -41,66 +28,29 @@
   <attr path="/api/namespace/class[@cname='GdkProperty_']/method[@name='Get']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkProperty_']/method[@name='Change']/*/*[@name='data']" name="array">1</attr>
   <attr path="/api/namespace/class[@cname='GdkQuery_']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkRgb_']/method[@name='FindColor']/*/*[@name='color']" name="pass_as">ref</attr>
   <attr path="/api/namespace/class[@cname='GdkSelection_']/method[@name='PropertyGet']" name="hidden">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkSpawn_']/method/parameters/parameter[@name='argv']" name="null_term_array">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkSpawn_']/method/parameters/parameter[@name='envp']" name="null_term_array">1</attr>
-  <attr path="/api/namespace/class[@cname='GdkSpawn_']/method/parameters/parameter[@name='child_setup']" name="scope">async</attr>
-  <attr path="/api/namespace/class[@cname='GdkText_']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_idle']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_idle_full']" name="name">AddIdle</attr>
   <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_timeout']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_timeout_full']" name="name">AddTimeout</attr>
+  <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_timeout_seconds']" name="hidden">1</attr>
+  <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_add_timeout_seconds_full']" name="name">AddTimeoutSeconds</attr>
   <attr path="/api/namespace/class[@cname='GdkThreads_']/method[@cname='gdk_threads_set_lock_functions']" name="hidden">1</attr>
   <add-node path="/api/namespace/enum[@cname='GdkModifierType']"><member name="None" value="0" /></add-node>
   <attr path="/api/namespace/enum[@cname='GdkModifierType']/member[@name='ModifierMask']" name="value">ReleaseMask | 0x1fff</attr>
-  <attr path="/api/namespace/enum[@cname='GdkWindowClass']/member[@name='Output']" name="name">InputOutput</attr>
-  <attr path="/api/namespace/enum[@cname='GdkWindowClass']/member[@name='Only']" name="name">InputOnly</attr>
-  <attr path="/api/namespace/object[@cname='GdkBitmap']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkBitmap']/method[@name='CreateFromData']" name="name">CreateBitmapFromData</attr>
-  <move-node path="/api/namespace/object[@cname='GdkBitmap']/method[@name='CreateBitmapFromData']">/api/namespace/object[@cname='GdkPixmap']</move-node>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/field[@name='Colors']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColor']/*/*[@type='GdkColor*']" name="pass_as">ref</attr>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@type='GdkColor*']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@name='success']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='QueryColor']/*/*[@type='GdkColor*']" name="pass_as">ref</attr>
-  <attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='FreeColors']/*/*[@type='const-GdkColor*']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Name']" name="access">public</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Source']" name="access">public</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Mode']" name="access">public</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='HasCursor']" name="access">public</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='NumAxes']" name="access">public</attr>
-  <attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='NumKeys']" name="access">public</attr>
   <attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetAxis']/*/*[@name='axes']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='FreeHistory']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetHistory']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetState']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='AddClientMessageFilter']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='GetPointer']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='ListDevices']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='SupportsComposite']" name="name">GetSupportsComposite</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='SupportsInputShapes']" name="name">GetSupportsInputShapes</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='SupportsShapes']" name="name">GetSupportsShapes</attr>
   <attr path="/api/namespace/object[@cname='GdkDisplayManager']/method[@name='ListDisplays']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDragContext']/field[@cname='protocol']" name="name">DragProtocol</attr>
-  <attr path="/api/namespace/object[@cname='GdkDragContext']/field[@cname='targets']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkDragContext']/method[@name='ListTargets']/return-type" name="element_type">GdkAtom*</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawGrayImage']/*/*[@name='buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawIndexedImage']/*/*[@name='buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgbImage']/*/*[@name='rgb_buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgbImageDithalign']/*/*[@name='rgb_buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgb32Image']/*/*[@name='buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgb32ImageDithalign']/*/*[@name='buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawLines']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPoints']/*/*[@name='points']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPolygon']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='SetData']/*/*[@name='destroy_func']" name="type">gpointer</attr>
-  <attr path="/api/namespace/object[@cname='GdkImage']/field[@name='Mem']" name="access">private</attr>
-  <attr path="/api/namespace/object[@cname='GdkImage']/field[@name='WindowingData']" name="access">private</attr>
   <attr path="/api/namespace/object[@cname='GdkKeymap']/method[@name='GetEntriesForKeycode']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkKeymap']/method[@name='GetEntriesForKeyval']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkPangoRenderer']/method[@name='GetDefault']/return-type" name="type">GdkPangoRenderer*</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_data']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_file']" name="preferred">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_inline']/*/*[@name='data']" name="array">1</attr>
@@ -124,13 +74,6 @@
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/property" name="construct-only">true</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='GetPixbuf']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='Write']/*/*[@name='buf']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']" name="parent">GdkDrawable</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpm']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@name='data']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpm']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='data']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetFontOptions']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetMonitorGeometry']/*/*[@type='GdkRectangle*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetToplevelWindows']" name="hidden">1</attr>
@@ -149,12 +92,9 @@
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='FreezeToplevelUpdatesLibgtkOnly']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetChildren']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetFrameExtents']/*/*[@name='rect']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetInternalPaintInfo']/*/*[@type='gint*']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetInternalPaintInfo']/*/*[@type='GdkDrawable**']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetOrigin']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetPointer']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetPointer']/*/*[@type='GdkModifierType*']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetToplevels']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='InvalidateMaybeRecurse']/*/*[@name='child_func']" name="scope">call</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='PeekChildren']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='RemoveFilter']" name="hidden">1</attr>
@@ -166,7 +106,6 @@
   <attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='InternStaticString']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventAny']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventButton']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkEventClient']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventConfigure']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventCrossing']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventDND']" name="hidden">1</attr>
@@ -175,7 +114,6 @@
   <attr path="/api/namespace/struct[@cname='GdkEventGrabBroken']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventKey']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventMotion']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkEventNoExpose']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventOwnerChange']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventProperty']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventProximity']" name="hidden">1</attr>
@@ -184,26 +122,12 @@
   <attr path="/api/namespace/struct[@cname='GdkEventSetting']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventVisibility']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventWindowState']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkPixbufFormat']/method[@cname='gdk_pixbuf_format_is_disabled']" name="name">GetDisabled</attr> 
-  <attr path="/api/namespace/struct[@cname='GdkPixbufFormat']/method[@name='GetExtensions']/return-type" name="null_term_array">1</attr> 
-  <attr path="/api/namespace/struct[@cname='GdkPixbufFormat']/method[@name='GetMimeTypes']/return-type" name="null_term_array">1</attr> 
   <attr path="/api/namespace/struct[@cname='GdkPixdata']/method[@name='Deserialize']/*/*[@name='stream']" name="array">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkPixdata']/method[@name='Serialize']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkPixdata']/method[@name='ToCsource']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkPixmapObject']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkPangoAttrEmbossed']/field[@name='Attr']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkPangoAttrEmbossColor']/field[@name='Attr']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkPangoAttrStipple']/field[@name='Attr']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/field" name="access">private</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Destroy']" name="deprecated">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetClipbox']/*/*[@name='rectangle']" name="pass_as">out</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetRectangles']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Polygon']/*/*[@name='points']" name="array">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='SpansIntersectForeach']/*/*[@name='function']" name="scope">call</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRgbCmap']/constructor/*/*[@name='colors']" name="array">1</attr>
-  <attr path="/api/namespace/struct[@cname='GdkRgbCmap']/field[@name='NColors']" name="writeable">false</attr>
   <attr path="/api/namespace/struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr>
-  <attr path="/api/namespace/struct[@cname='GdkWindowObject']" name="hidden">1</attr>
+  <remove-node path="/api/namespace/object[@cname='GdkCursor']/method[@name='Ref']" />
+  <remove-node path="/api/namespace/object[@cname='GdkCursor']/method[@name='Unref']" />
   <remove-node path="/api/namespace/object[@name='Pixbuf']/method[@name='Gettext']" />
   <remove-node path="/api/namespace/alias[@name='Rectangle']" />
   <remove-node path="/api/namespace/class[@cname='GdkRectangle_']" />
diff --git a/gdk/Input.custom b/gdk/Input.custom
deleted file mode 100644
index 91f17c990..000000000
--- a/gdk/Input.custom
+++ /dev/null
@@ -1,40 +0,0 @@
-// Gdk.Input.custom - Gdk Input class customizations
-//
-// Author: Mike Kestner <mkestner@ximian.com> 
-//
-// Copyright (C) 2005, 2007 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-		[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern int gdk_input_add_full (int source, int condition, GdkSharp.InputFunctionNative function, IntPtr data, GLib.DestroyNotify destroy);
-
-		[Obsolete]
-		public static int AddFull (int source, Gdk.InputCondition condition, Gdk.InputFunction function, IntPtr data, Gdk.DestroyNotify destroy) 
-		{
-			GdkSharp.InputFunctionWrapper function_wrapper = new GdkSharp.InputFunctionWrapper (function);
-			GCHandle gch = GCHandle.Alloc (function_wrapper);
-			return gdk_input_add_full (source, (int) condition, function_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);
-		}
-
-		[Obsolete]
-		public static int Add (int source, Gdk.InputCondition condition, Gdk.InputFunction function) 
-		{
-			GdkSharp.InputFunctionWrapper function_wrapper = new GdkSharp.InputFunctionWrapper (function);
-			GCHandle gch = GCHandle.Alloc (function_wrapper);
-			return gdk_input_add_full (source, (int) condition, function_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);
-		}
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 5eb880491..c26ed2d82 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -7,7 +7,6 @@ glue_includes = gdk/gdk.h
 
 sources = 			\
 	EventButton.cs		\
-	EventClient.cs		\
 	EventConfigure.cs	\
 	EventCrossing.cs	\
 	Event.cs		\
@@ -33,19 +32,11 @@ sources = 			\
 customs = 			\
 	Atom.custom		\
 	Color.custom		\
-	Colormap.custom		\
 	Device.custom		\
-	DeviceAxis.custom	\
 	Display.custom		\
 	DisplayManager.custom	\
-	EdgeTable.custom	\
-	GCValues.custom		\
 	Global.custom		\
-	Input.custom		\
 	Keymap.custom		\
-	PangoAttrEmbossed.custom\
-	PangoAttrEmbossColor.custom	\
-	PangoAttrStipple.custom \
 	Pixbuf.custom		\
 	PixbufAnimation.custom	\
 	PixbufFrame.custom	\
@@ -53,8 +44,6 @@ customs = 			\
 	Pixdata.custom		\
 	Point.custom		\
 	Property.custom		\
-	Region.custom		\
-	RgbCmap.custom		\
 	Screen.custom		\
 	Selection.custom	\
 	WindowAttr.custom	\
diff --git a/gdk/PangoAttrEmbossColor.custom b/gdk/PangoAttrEmbossColor.custom
deleted file mode 100644
index dff1c62c7..000000000
--- a/gdk/PangoAttrEmbossColor.custom
+++ /dev/null
@@ -1,29 +0,0 @@
-// Gdk.PangoAttrEmbossColor.custom - Gdk PangoAttrEmbossColor class customizations
-//
-// Copyright (c) 2007 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-		public static explicit operator Pango.Attribute (PangoAttrEmbossColor attr)
-		{
-			return Pango.Attribute.GetAttribute (attr.Handle);
-		}
-
-		public static explicit operator PangoAttrEmbossColor (Pango.Attribute attr)
-		{
-			return new PangoAttrEmbossColor (attr.Handle);
-		}
diff --git a/gdk/PangoAttrEmbossed.custom b/gdk/PangoAttrEmbossed.custom
deleted file mode 100644
index e5a8a56f2..000000000
--- a/gdk/PangoAttrEmbossed.custom
+++ /dev/null
@@ -1,51 +0,0 @@
-// Gdk.PangoAttrEmbossed.custom - Gdk PangoAttrEmbossed class customizations
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-		[Obsolete("Gdk.PangoAttrEmbossed is a reference type now, use null")]
-		public static PangoAttrEmbossed Zero = null;
-
-		[Obsolete("Replaced by PangoAttrEmbossed(IntPtr) constructor")]
-		public static PangoAttrEmbossed New (IntPtr raw)
-		{
-			return new PangoAttrEmbossed (raw);
-		}
-
-		[Obsolete("Replaced by PangoAttrEmbossed(bool) constructor")]
-		public static PangoAttrEmbossed New (bool embossed)
-		{
-			return new PangoAttrEmbossed (embossed);
-		}
-
-		[Obsolete("Replaced by explicit Pango.Attribute cast")]
-		public Pango.Attribute Attr {
-			get {
-				return (Pango.Attribute)this;
-			}
-		}
-
-		public static explicit operator Pango.Attribute (PangoAttrEmbossed attr_embossed)
-		{
-			return Pango.Attribute.GetAttribute (attr_embossed.Handle);
-		}
-
-		public static explicit operator PangoAttrEmbossed (Pango.Attribute attr)
-		{
-			return new PangoAttrEmbossed (attr.Handle);
-		}
diff --git a/gdk/PangoAttrStipple.custom b/gdk/PangoAttrStipple.custom
deleted file mode 100644
index 9c21c8ba2..000000000
--- a/gdk/PangoAttrStipple.custom
+++ /dev/null
@@ -1,59 +0,0 @@
-// Gdk.PangoAttrStipple.custom - Gdk PangoAttrStipple class customizations
-//
-// Author:   Mike Kestner <mkestner@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-		[Obsolete("Gdk.PangoAttrStipple is a reference type now, use null")]
-		public static PangoAttrStipple Zero = null;
-
-		[Obsolete("Replaced by PangoAttrStipple(IntPtr) constructor")]
-		public static PangoAttrStipple New (IntPtr raw)
-		{
-			return new PangoAttrStipple (raw);
-		}
-
-		[Obsolete("Replaced by PangoAttrStipple(Gdk.Pixmap) constructor")]
-		public static PangoAttrStipple New (Gdk.Pixmap stipple)
-		{
-			return new PangoAttrStipple (stipple);
-		}
-
-		[Obsolete("Replaced by explicit Pango.Attribute cast")]
-		public Pango.Attribute Attr {
-			get {
-				return (Pango.Attribute)this;
-			}
-		}
-
-		[Obsolete ("Replaced by Stipple property.")]
-		public Gdk.Pixmap stipple {
-			get { return Stipple; }
-			set { Stipple = value; }
-		}
-
-		public static explicit operator Pango.Attribute (PangoAttrStipple attr_stipple)
-		{
-			return Pango.Attribute.GetAttribute (attr_stipple.Handle);
-		}
-
-		public static explicit operator PangoAttrStipple (Pango.Attribute attr)
-		{
-			return new PangoAttrStipple (attr.Handle);
-		}
diff --git a/gdk/Region.custom b/gdk/Region.custom
deleted file mode 100644
index a08d64d17..000000000
--- a/gdk/Region.custom
+++ /dev/null
@@ -1,47 +0,0 @@
-// Gdk.Region.custom - Gdk Region class customizations
-//
-// Author: Joshua Tauberer <tauberer@for.net>
-//
-// Copyright (c) 2004 Joshua Tauberer
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-[DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-static extern void g_free (IntPtr mem);
-
-[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-static extern void gdk_region_get_rectangles(IntPtr raw, out IntPtr rectangles, out int n_rectangles);
-
-public Rectangle[] GetRectangles ()
-{
-	int n;
-	IntPtr rectangles;
-	gdk_region_get_rectangles(Handle, out rectangles, out n);
-
-	Rectangle[] ret = new Rectangle[n];
-	int step = Marshal.SizeOf(typeof(Rectangle));
-	long ptr = (long)rectangles;
-	for (int i = 0; i < n; i++) {
-		ret[i] = (Rectangle)Marshal.PtrToStructure((IntPtr)ptr, typeof(Rectangle));
-		ptr += step;
-	}
-		
-	g_free(rectangles);
-		
-	return ret;
-}
-
diff --git a/gdk/RgbCmap.custom b/gdk/RgbCmap.custom
deleted file mode 100644
index 184c40e5c..000000000
--- a/gdk/RgbCmap.custom
+++ /dev/null
@@ -1,28 +0,0 @@
-// Gdk.RgbCmap.custom - Gdk RgbCmap class customizations
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-		[Obsolete("Gdk.RgbCmap is a reference type now, use null")]
-		public static RgbCmap Zero = null;
-
-		[Obsolete("Replaced by RgbCmap(IntPtr) constructor")]
-		public static RgbCmap New (IntPtr raw)
-		{
-			return new RgbCmap (raw);
-		}
diff --git a/gdk/Window.custom b/gdk/Window.custom
index 5d9a3a89b..520ca4a41 100644
--- a/gdk/Window.custom
+++ b/gdk/Window.custom
@@ -52,22 +52,6 @@
 		}
 	}
 
-	[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-	static extern IntPtr gdk_window_get_toplevels();
-
-	public static Window[] Toplevels {
-		get {
-			IntPtr raw_ret = gdk_window_get_toplevels();
-			if (raw_ret == IntPtr.Zero)
-				return new Window [0];
-			GLib.List list = new GLib.List(raw_ret);
-			Window[] result = new Window [list.Count];
-			for (int i = 0; i < list.Count; i++)
-				result [i] = list [i] as Window;
-			return result;
-		}
-	}
-
 	[DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 	static extern IntPtr g_object_ref (IntPtr raw);