diff --git a/ChangeLog b/ChangeLog
index 13f55b725..50d21d0a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-04  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/gtk-api.raw : regen'd.
+	* sources/gtk-sharp-sources.xml : exclude file system backend source.
+	[Fixes #70904, #70897, and #70900]
+
 2005-01-04  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Gtk.metadata : mark out params for IMContext.GetSurrounding
diff --git a/doc/en/Gtk/FileFolder.xml b/doc/en/Gtk/FileFolder.xml
deleted file mode 100644
index e56ce7ead..000000000
--- a/doc/en/Gtk/FileFolder.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<Type Name="FileFolder" FullName="Gtk.FileFolder">
-  <TypeSignature Language="C#" Value="public abstract interface FileFolder" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Interface to represent a folder in a filesystem.</summary>
-    <remarks>See also <see cref="T:Gtk.FileSystem"/>, <see cref="T:Gtk.FileSystemUnix"/>, <see cref="T:Gtk.FileSystemWin32"/>. </remarks>
-  </Docs>
-  <Base />
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="GetInfo">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileInfo GetInfo (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfo</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Gets information about the file at <paramref name="path"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:Gtk.FileInfo" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListChildren">
-      <MemberSignature Language="C#" Value="public virtual bool ListChildren (GLib.SList children);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="children" Type="GLib.SList" />
-      </Parameters>
-      <Docs>
-        <summary>Lists the child files of this folder by placing them in <paramref name="children"/>. </summary>
-        <param name="children">a <see cref="T:GLib.SList" /></param>
-        <returns>a <see cref="T:System.Boolean" />, false if there are no children.</returns>
-        <remarks>XXX: shouldn't "children" be an "out" parameter?</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsFinishedLoading">
-      <MemberSignature Language="C#" Value="public virtual bool IsFinishedLoading { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Whether this folder's information is fully loaded or not.</summary>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Deleted">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler Deleted;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired when this folder is deleted.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilesAdded">
-      <MemberSignature Language="C#" Value="public virtual event Gtk.FilesAddedHandler FilesAdded;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilesAddedHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired when files are added to this folder.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilesRemoved">
-      <MemberSignature Language="C#" Value="public virtual event Gtk.FilesRemovedHandler FilesRemoved;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilesRemovedHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired when files are removed from this folder.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilesChanged">
-      <MemberSignature Language="C#" Value="public virtual event Gtk.FilesChangedHandler FilesChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilesChangedHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired when files are changed in this folder.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FinishedLoading">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler FinishedLoading;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>
-	  Event fired when this folder's information is finished loading.
-	</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileInfo.xml b/doc/en/Gtk/FileInfo.xml
deleted file mode 100644
index e35d75515..000000000
--- a/doc/en/Gtk/FileInfo.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<Type Name="FileInfo" FullName="Gtk.FileInfo">
-  <TypeSignature Language="C#" Value="public class FileInfo : GLib.Opaque, IWrapper" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>
-      A class for handling information about files.
-    </summary>
-    <remarks>
-      For use with <see cref="T:Gtk.FileSystem"/> classes.
-    </remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Opaque</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Free">
-      <MemberSignature Language="C#" Value="public void Free ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Frees memory associated with this data structure.</summary>
-        <remarks>Subject to change in the future.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Copy">
-      <MemberSignature Language="C#" Value="public Gtk.FileInfo Copy ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfo</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Returns a new object that's a copy of this object.</summary>
-        <returns>a <see cref="T:Gtk.FileInfo" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileInfo (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Public constructor for internal use only.</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" />, the underlying C object.</param>
-        <returns>a <see cref="T:Gtk.FileInfo" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileInfo ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>Public constructor.</summary>
-        <returns>a <see cref="T:Gtk.FileInfo" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>When making a derived class, override this method to change
-	that class's <see cref="T:GLib.GType" />.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="DisplayName">
-      <MemberSignature Language="C#" Value="public string DisplayName { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>The file's name.</summary>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MimeType">
-      <MemberSignature Language="C#" Value="public string MimeType { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>The file's MIME type.</summary>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ModificationTime">
-      <MemberSignature Language="C#" Value="public long ModificationTime { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>The file's last-modified time.</summary>
-        <returns>a <see cref="T:System.Int64" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Size">
-      <MemberSignature Language="C#" Value="public long Size { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>The file's size.</summary>
-        <returns>a <see cref="T:System.Int64" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsHidden">
-      <MemberSignature Language="C#" Value="public bool IsHidden { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Whether the file is hidden or not.</summary>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="DisplayKey">
-      <MemberSignature Language="C#" Value="public string DisplayKey { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Generates a collation key on the display name for faster sorting.</summary>
-        <returns>a <see cref="T:System.String" />, 
-	  the collate key for the display name, or <see langword="null"/>
-	  if the display name hasn't been set.</returns>
-        <remarks>
-	  The collate key is a string that can be usefully compared with
-	  others using the C method strcmp().
-	  This is useful when sorting a bunch of <see cref="T:Gtk.FileInfo"/>
-	  objects since the collate key will be only computed once.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsFolder">
-      <MemberSignature Language="C#" Value="public bool IsFolder { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Whether the file is actually a folder or not.</summary>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileInfoType.xml b/doc/en/Gtk/FileInfoType.xml
deleted file mode 100644
index 999e6aa70..000000000
--- a/doc/en/Gtk/FileInfoType.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<Type Name="FileInfoType" FullName="Gtk.FileInfoType">
-  <TypeSignature Language="C#" Value="public enum FileInfoType" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>
-      Mask of information about a file for use with
-      <see cref="M:Gtk.FileSystem.GetFolder"/>.
-    </summary>
-    <remarks>
-</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IComparable</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IConvertible</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IFormattable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes>
-    <Attribute>
-      <AttributeName>System.FlagsAttribute</AttributeName>
-    </Attribute>
-  </Attributes>
-  <Members>
-    <Member MemberName="DisplayName">
-      <MemberSignature Language="C#" Value="DisplayName" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>A file's display name.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsFolder">
-      <MemberSignature Language="C#" Value="IsFolder" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>Whether a file is actually a folder.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsHidden">
-      <MemberSignature Language="C#" Value="IsHidden" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>Whether a file is hidden.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MimeType">
-      <MemberSignature Language="C#" Value="MimeType" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>A file's MIME type.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ModificationTime">
-      <MemberSignature Language="C#" Value="ModificationTime" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>A file's modification time.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Size">
-      <MemberSignature Language="C#" Value="Size" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>A file's size.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="All">
-      <MemberSignature Language="C#" Value="All" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileInfoType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>All the information about a file.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="value__">
-      <MemberSignature Language="C#" Value="value__" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>Internal field.</summary>
-        <remarks>Do not use.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FilePath.xml b/doc/en/Gtk/FilePath.xml
deleted file mode 100644
index 01cf6e0ac..000000000
--- a/doc/en/Gtk/FilePath.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<Type Name="FilePath" FullName="Gtk.FilePath">
-  <TypeSignature Language="C#" Value="public class FilePath : GLib.Object, IWrapper, IDisposable" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Class for basic information about a file.</summary>
-    <remarks>See also <see cref="T:Gtk.FileFolder"/>, which uses this class.</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Finalize">
-      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Disposes the resources associated with this <see cref="T:Gtk.FilePath" /> object.</summary>
-        <remarks>
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected FilePath (GLib.GType gtype);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>Protected Constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks>Chain to this constructor if you have manually registered a native <see cref="T:GLib.GType" /> value for your subclass.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FilePath (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Internal constructor</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks>This is not typically used by C# code.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected FilePath ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>Protected constructor.</summary>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gtk.FilePath" />.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileSystem.xml b/doc/en/Gtk/FileSystem.xml
deleted file mode 100644
index d0de87f31..000000000
--- a/doc/en/Gtk/FileSystem.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<Type Name="FileSystem" FullName="Gtk.FileSystem">
-  <TypeSignature Language="C#" Value="public abstract interface FileSystem" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Interface class for representing filesystems.</summary>
-    <remarks>For more concrete implementations, see 
-      <see cref="T:Gtk.FileSystem.Win32"/> and  
-      <see cref="T:Gtk.FileSystem.Unix"/>.</remarks>
-  </Docs>
-  <Base />
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="ListBookmarks">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListBookmarks ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Queries the list of bookmarks in the file system.</summary>
-        <returns>a <see cref="T:GLib.SList" />, a list of 
-	  <see cref="T:Gtk.FilePath"/> objects, or 
-	  <see langword="null"/> if there are no configured bookmarks.</returns>
-        <remarks>
-	  See also <see cref="M:Gtk.FileSystem.RemoveBookmark"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RemoveBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool RemoveBookmark (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Removes a bookmark folder from the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the operation succeeds, the 
-	  <see cref="E:Gtk.FileSystem.BookmarksChanged"/> 
-	  signal will be emitted.  If you try to remove
-	  a <paramref name="path"/> which does not exist in the bookmarks 
-	  list, the operation will fail and an exception will be thrown.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetParent">
-      <MemberSignature Language="C#" Value="public virtual bool GetParent (Gtk.FilePath path, Gtk.FilePath parent);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="parent" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Gets the name of the parent folder of a path. 
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="parent">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the path has no parent, as when you request the parent of a file system root, 
-	  then <paramref name="parent"/> will be set to <see langword="null"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MakePath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath MakePath (Gtk.FilePath base_path, string display_name);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="display_name" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Makes a new path called <paramref name="display_name"/>
-	  starting from path <paramref name="base_path"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="display_name">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetFolder">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileFolder GetFolder (Gtk.FilePath path, Gtk.FileInfoType types);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileFolder</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="types" Type="Gtk.FileInfoType" />
-      </Parameters>
-      <Docs>
-        <summary>Gets an object to represent the folder at path <paramref name="path"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="types">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gtk.FileFolder" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToFilename">
-      <MemberSignature Language="C#" Value="public virtual string PathToFilename (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a filename string.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" />, or <see langword="null"/>
-	if the path is not local.</returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="UriToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath UriToPath (string uri);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="uri" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts a URI to a <see cref="T:Gtk.FilePath" /> object.</summary>
-        <param name="uri">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToUri">
-      <MemberSignature Language="C#" Value="public virtual string PathToUri (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a URI.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetVolumeForPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileSystemVolume GetVolumeForPath (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemVolume</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Determines what volume of the filesystem 
-	  <paramref name="path"/> is located on.
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemVolume" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilenameToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath FilenameToPath (string filename);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="filename" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="filename"/> into a <see cref="T:Gtk.FilePath" />.</summary>
-        <param name="filename">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RenderIcon">
-      <MemberSignature Language="C#" Value="public virtual Gdk.Pixbuf RenderIcon (Gtk.FilePath path, Gtk.Widget widget, int pixel_size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gdk.Pixbuf</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="widget" Type="Gtk.Widget" />
-        <Parameter Name="pixel_size" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>Returns an icon to represent this filesystem.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="widget">a <see cref="T:Gtk.Widget" /></param>
-        <param name="pixel_size">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gdk.Pixbuf" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="InsertBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool InsertBookmark (Gtk.FilePath path, int position);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="position" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Adds a path for a folder to the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="position">a <see cref="T:System.Int32" />, index in 
-	  the bookmarks list at which the <paramref name="path"/> should 
-	  be inserted; use 0 for the beginning, and -1 or the number of 
-	  bookmarks itself for the end of the list.</param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>If the operation
-	    succeeds, the <see cref="E:Gtk.FileSystem.BookmarksChanged"/>
-	    signal will be emitted.  Bookmark paths are
-	    unique; if you try to insert a <paramref name="path"/> that 
-	    already exists, the operation will fail and an exception will 
-	    be thrown.</para>
-	  <para>To reorder the list of bookmarks, use
-	    <see cref="M:Gtk.FileSystem.RemoveBookmark"/> to
-	    remove the path in question, and call 
-	    <see cref="M:Gtk.FileSystem.InsertBookmark"/> with
-	    the new position for the path.</para>
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathIsLocal">
-      <MemberSignature Language="C#" Value="public virtual bool PathIsLocal (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Checks to see whether a path is local; that is,
-	whether <see cref="M:Gtk.FileSystem.PathToFilename"/> would
-	return non-<see langword="null"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListVolumes">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListVolumes ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Gets a list of all the <see cref="T:Gtk.FileSystemVolume"/>s
-	on the system.</summary>
-        <returns>a <see cref="T:GLib.SList" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Parse">
-      <MemberSignature Language="C#" Value="public virtual bool Parse (Gtk.FilePath base_path, string str, Gtk.FilePath folder, string file_part);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="str" Type="System.String" />
-        <Parameter Name="folder" Type="Gtk.FilePath" />
-        <Parameter Name="file_part" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Given a string entered by a user, parse it (possibly using
-	  heuristics) into a folder path and a UTF-8 encoded
-	  filename part suitable for passing to 
-	  <see cref="M:Gtk.FileSystem.MakePath"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" />, reference folder with respect to which relative paths should be interpreted.</param>
-        <param name="str">a <see cref="T:System.String" />, the string to parse</param>
-        <param name="folder">a <see cref="T:Gtk.FilePath" />, a location to store folder portion of result, or <see langword="null"/></param>
-        <param name="file_part">a <see cref="T:System.String" />, location to store file portion of result, or <see langword="null"/></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>
-	    Note that the returned filename point may point to a subfolder
-	    of the returned folder. Adding a trailing path separator is needed
-	    to enforce the interpretation as a folder name.
-	  </para>
-	  <para>
-	    If parsing fails because the syntax of <paramref name="str"/> is not understood,
-	    an exception <see cref="Gtk.FileSystemError.BadFilename"/> will
-	    be thrown and <see langword="false"/> returned.
-	  </para>
-	  <para>
-	    If parsing fails because a path was encountered that doesn't
-	    exist on the filesystem, then an exception
-	    <see cref="Gtk.FileSystemError.Nonexistent"/> will be thrown
-	    and <see langword="false"/> returned. 
-	    (This only applies to parsing relative paths,
-	    not to interpretation of <paramref name="file_part"/>. No check is made as
-	    to whether <paramref name="file_part"/> exists.)
-	  </para>	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateFolder">
-      <MemberSignature Language="C#" Value="public virtual bool CreateFolder (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Makes a new folder at <paramref name="path"/></summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VolumesChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler VolumesChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Emitted when a related <see cref="M:Gtk.FileSystemVolume"/>
-	is mounted.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BookmarksChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler BookmarksChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired whenever the bookmarks to particular locations change.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileSystemError.xml b/doc/en/Gtk/FileSystemError.xml
deleted file mode 100644
index 6323857be..000000000
--- a/doc/en/Gtk/FileSystemError.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<Type Name="FileSystemError" FullName="Gtk.FileSystemError">
-  <TypeSignature Language="C#" Value="public enum FileSystemError" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Types of errors that can be encountered by <see cref="T:Gtk.FileSystem"/> classes.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IComparable</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IConvertible</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IFormattable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Nonexistent">
-      <MemberSignature Language="C#" Value="Nonexistent" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The path referred to does not exist.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NotFolder">
-      <MemberSignature Language="C#" Value="NotFolder" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The path referred to is not a folder.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="InvalidUri">
-      <MemberSignature Language="C#" Value="InvalidUri" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The given URI is not valid.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BadFilename">
-      <MemberSignature Language="C#" Value="BadFilename" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The given filename is not valid.</summary>
-        <remarks>This may mean that an illegal character has been specified
-	as part of the filename.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Failed">
-      <MemberSignature Language="C#" Value="Failed" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>A general failure error, used for errors not otherwise covered.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="AlreadyExists">
-      <MemberSignature Language="C#" Value="AlreadyExists" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>There was an attempt to create a file or folder that already exists.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="value__">
-      <MemberSignature Language="C#" Value="value__" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>Internal field.</summary>
-        <remarks>Do not use.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileSystemUnix.xml b/doc/en/Gtk/FileSystemUnix.xml
deleted file mode 100644
index ab1ab213c..000000000
--- a/doc/en/Gtk/FileSystemUnix.xml
+++ /dev/null
@@ -1,482 +0,0 @@
-<Type Name="FileSystemUnix" FullName="Gtk.FileSystemUnix">
-  <TypeSignature Language="C#" Value="public class FileSystemUnix : GLib.Object, FileSystem, IWrapper, IDisposable" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Filesystem interface layer for Unix-style systems.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>Gtk.FileSystem</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Finalize">
-      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Disposes the resources associated with this <see cref="T:Gtk.FileSystemUnix" /> object.</summary>
-        <remarks>
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListBookmarks">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListBookmarks ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Queries the list of bookmarks in the file system.</summary>
-        <returns>a <see cref="T:GLib.SList" />, a list of 
-	  <see cref="T:Gtk.FilePath"/> objects, or 
-	  <see langword="null"/> if there are no configured bookmarks.</returns>
-        <remarks>
-	  See also <see cref="M:Gtk.FileSystem.RemoveBookmark"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RemoveBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool RemoveBookmark (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Removes a bookmark folder from the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the operation succeeds, the 
-	  <see cref="E:Gtk.FileSystem.BookmarksChanged"/> 
-	  signal will be emitted.  If you try to remove
-	  a <paramref name="path"/> which does not exist in the bookmarks 
-	  list, the operation will fail and an exception will be thrown.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetParent">
-      <MemberSignature Language="C#" Value="public virtual bool GetParent (Gtk.FilePath path, Gtk.FilePath parent);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="parent" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Gets the name of the parent folder of a path. 
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="parent">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the path has no parent, as when you request the parent of a file system root, 
-	  then <paramref name="parent"/> will be set to <see langword="null"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MakePath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath MakePath (Gtk.FilePath base_path, string display_name);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="display_name" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Makes a new path called <paramref name="display_name"/>
-	  starting from path <paramref name="base_path"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="display_name">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetFolder">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileFolder GetFolder (Gtk.FilePath path, Gtk.FileInfoType types);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileFolder</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="types" Type="Gtk.FileInfoType" />
-      </Parameters>
-      <Docs>
-        <summary>Gets an object to represent the folder at path <paramref name="path"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="types">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gtk.FileFolder" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToFilename">
-      <MemberSignature Language="C#" Value="public virtual string PathToFilename (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a filename string.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" />, or <see langword="null"/>
-	if the path is not local.</returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="UriToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath UriToPath (string uri);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="uri" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts a URI to a <see cref="T:Gtk.FilePath" /> object.</summary>
-        <param name="uri">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToUri">
-      <MemberSignature Language="C#" Value="public virtual string PathToUri (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a URI.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetVolumeForPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileSystemVolume GetVolumeForPath (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemVolume</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Determines what volume of the filesystem 
-	  <paramref name="path"/> is located on.
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemVolume" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilenameToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath FilenameToPath (string filename);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="filename" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="filename"/> into a <see cref="T:Gtk.FilePath" />.</summary>
-        <param name="filename">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RenderIcon">
-      <MemberSignature Language="C#" Value="public virtual Gdk.Pixbuf RenderIcon (Gtk.FilePath path, Gtk.Widget widget, int pixel_size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gdk.Pixbuf</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="widget" Type="Gtk.Widget" />
-        <Parameter Name="pixel_size" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>Returns an icon to represent this filesystem.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="widget">a <see cref="T:Gtk.Widget" /></param>
-        <param name="pixel_size">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gdk.Pixbuf" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="InsertBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool InsertBookmark (Gtk.FilePath path, int position);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="position" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Adds a path for a folder to the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="position">a <see cref="T:System.Int32" />, index in 
-	  the bookmarks list at which the <paramref name="path"/> should 
-	  be inserted; use 0 for the beginning, and -1 or the number of 
-	  bookmarks itself for the end of the list.</param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>If the operation
-	    succeeds, the <see cref="E:Gtk.FileSystem.BookmarksChanged"/>
-	    signal will be emitted.  Bookmark paths are
-	    unique; if you try to insert a <paramref name="path"/> that 
-	    already exists, the operation will fail and an exception will 
-	    be thrown.</para>
-	  <para>To reorder the list of bookmarks, use
-	    <see cref="M:Gtk.FileSystem.RemoveBookmark"/> to
-	    remove the path in question, and call 
-	    <see cref="M:Gtk.FileSystem.InsertBookmark"/> with
-	    the new position for the path.</para>
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathIsLocal">
-      <MemberSignature Language="C#" Value="public virtual bool PathIsLocal (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Checks to see whether a path is local; that is,
-	whether <see cref="M:Gtk.FileSystem.PathToFilename"/> would
-	return non-<see langword="null"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListVolumes">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListVolumes ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Gets a list of all the <see cref="T:Gtk.FileSystemVolume"/>s
-	on the system.</summary>
-        <returns>a <see cref="T:GLib.SList" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Parse">
-      <MemberSignature Language="C#" Value="public virtual bool Parse (Gtk.FilePath base_path, string str, Gtk.FilePath folder, string file_part);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="str" Type="System.String" />
-        <Parameter Name="folder" Type="Gtk.FilePath" />
-        <Parameter Name="file_part" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Given a string entered by a user, parse it (possibly using
-	  heuristics) into a folder path and a UTF-8 encoded
-	  filename part suitable for passing to 
-	  <see cref="M:Gtk.FileSystem.MakePath"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" />, reference folder with respect to which relative paths should be interpreted.</param>
-        <param name="str">a <see cref="T:System.String" />, the string to parse</param>
-        <param name="folder">a <see cref="T:Gtk.FilePath" />, a location to store folder portion of result, or <see langword="null"/></param>
-        <param name="file_part">a <see cref="T:System.String" />, location to store file portion of result, or <see langword="null"/></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>
-	    Note that the returned filename point may point to a subfolder
-	    of the returned folder. Adding a trailing path separator is needed
-	    to enforce the interpretation as a folder name.
-	  </para>
-	  <para>
-	    If parsing fails because the syntax of <paramref name="str"/> is not understood,
-	    an exception <see cref="Gtk.FileSystemError.BadFilename"/> will
-	    be thrown and <see langword="false"/> returned.
-	  </para>
-	  <para>
-	    If parsing fails because a path was encountered that doesn't
-	    exist on the filesystem, then an exception
-	    <see cref="Gtk.FileSystemError.Nonexistent"/> will be thrown
-	    and <see langword="false"/> returned. 
-	    (This only applies to parsing relative paths,
-	    not to interpretation of <paramref name="file_part"/>. No check is made as
-	    to whether <paramref name="file_part"/> exists.)
-	  </para>	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateFolder">
-      <MemberSignature Language="C#" Value="public virtual bool CreateFolder (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Makes a new folder at <paramref name="path"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OnVolumesChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnVolumesChanged ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gtk.FileSystemUnix.VolumesChanged" /> event.</summary>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gtk.FileSystemUnix.VolumesChanged" /> event.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OnBookmarksChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnBookmarksChanged ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gtk.FileSystemUnix.BookmarksChanged" /> event.</summary>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gtk.FileSystemUnix.BookmarksChanged" /> event.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected FileSystemUnix (GLib.GType gtype);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>Protected Constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemUnix" /></returns>
-        <remarks>Chain to this constructor if you have manually registered a native <see cref="T:GLib.GType" /> value for your subclass.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileSystemUnix (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Internal constructor</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemUnix" /></returns>
-        <remarks>This is not typically used by C# code.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileSystemUnix ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>Public constructor.</summary>
-        <returns>a <see cref="T:Gtk.FileSystemUnix" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gtk.FileSystemUnix" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VolumesChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler VolumesChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Emitted when a related <see cref="M:Gtk.FileSystemVolume"/>
-	is mounted.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BookmarksChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler BookmarksChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired whenever the bookmarks to particular locations change.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileSystemVolume.xml b/doc/en/Gtk/FileSystemVolume.xml
deleted file mode 100644
index 13e3a17d5..000000000
--- a/doc/en/Gtk/FileSystemVolume.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<Type Name="FileSystemVolume" FullName="Gtk.FileSystemVolume">
-  <TypeSignature Language="C#" Value="public class FileSystemVolume : GLib.Opaque, IWrapper" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Represents a volume of a filesystem; typically, this corresponds to one physical or logical hard drive.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Opaque</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="GetDisplayName">
-      <MemberSignature Language="C#" Value="public static string GetDisplayName (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-      </Parameters>
-      <Docs>
-        <summary>Queries the human-readable name for a volume.  
-	</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks>
-	  This string can be displayed
-	  in a list of volumes that can be accessed, for example.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetBasePath">
-      <MemberSignature Language="C#" Value="public static Gtk.FilePath GetBasePath (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-      </Parameters>
-      <Docs>
-        <summary>Returns the base path of this volume.</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks> For example, a CD-ROM device may yield a path of "/mnt/cdrom"
-	  on Linux.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Free">
-      <MemberSignature Language="C#" Value="public static void Free (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-      </Parameters>
-      <Docs>
-        <summary>Frees memory used by this data structure.</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <remarks>XXX: should this even exist?</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RenderIcon">
-      <MemberSignature Language="C#" Value="public static Gdk.Pixbuf RenderIcon (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume, Gtk.Widget widget, int pixel_size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gdk.Pixbuf</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-        <Parameter Name="widget" Type="Gtk.Widget" />
-        <Parameter Name="pixel_size" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>Returns an icon to represent this volume.</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <param name="widget">a <see cref="T:Gtk.Widget" /></param>
-        <param name="pixel_size">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gdk.Pixbuf" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Mount">
-      <MemberSignature Language="C#" Value="public static bool Mount (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Tries to mount an unmounted volume.  
-	</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <returns>a <see cref="T:System.Boolean" />, true if the volume was mounted successfully, false otherwise.</returns>
-        <remarks>
-	  This may cause the <see cref="M:Gtk.FileSystem.VolumesChanged"/> signal in the 
-	  <paramref name="file_system"/> to be emitted.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetIsMounted">
-      <MemberSignature Language="C#" Value="public static bool GetIsMounted (Gtk.FileSystem file_system, Gtk.FileSystemVolume volume);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="file_system" Type="Gtk.FileSystem" />
-        <Parameter Name="volume" Type="Gtk.FileSystemVolume" />
-      </Parameters>
-      <Docs>
-        <summary>Queries whether a volume is mounted or not.</summary>
-        <param name="file_system">a <see cref="T:Gtk.FileSystem" /></param>
-        <param name="volume">a <see cref="T:Gtk.FileSystemVolume" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>If the volume is not mounted, it can be mounted with
-	<see cref="M:Gtk.FileSystemVolume.Mount"/>.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileSystemVolume (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Public constructor. For internal use; do not use.</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" />, pointer to the underlying C object.</param>
-        <returns>a <see cref="T:Gtk.FileSystemVolume" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/FileSystemWin32.xml b/doc/en/Gtk/FileSystemWin32.xml
deleted file mode 100644
index 1c26540af..000000000
--- a/doc/en/Gtk/FileSystemWin32.xml
+++ /dev/null
@@ -1,482 +0,0 @@
-<Type Name="FileSystemWin32" FullName="Gtk.FileSystemWin32">
-  <TypeSignature Language="C#" Value="public class FileSystemWin32 : GLib.Object, FileSystem, IWrapper, IDisposable" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>A class for representing filesystem interactions on Win32.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Object</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>Gtk.FileSystem</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IDisposable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Finalize">
-      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Disposes the resources associated with this <see cref="T:Gtk.FileSystemWin32" /> object.</summary>
-        <remarks>
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListBookmarks">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListBookmarks ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Queries the list of bookmarks in the file system.</summary>
-        <returns>a <see cref="T:GLib.SList" />, a list of 
-	  <see cref="T:Gtk.FilePath"/> objects, or 
-	  <see langword="null"/> if there are no configured bookmarks.</returns>
-        <remarks>
-	  See also <see cref="M:Gtk.FileSystem.RemoveBookmark"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RemoveBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool RemoveBookmark (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Removes a bookmark folder from the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the operation succeeds, the 
-	  <see cref="E:Gtk.FileSystem.BookmarksChanged"/> 
-	  signal will be emitted.  If you try to remove
-	  a <paramref name="path"/> which does not exist in the bookmarks 
-	  list, the operation will fail and an exception will be thrown.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetParent">
-      <MemberSignature Language="C#" Value="public virtual bool GetParent (Gtk.FilePath path, Gtk.FilePath parent);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="parent" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Gets the name of the parent folder of a path. 
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="parent">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  If the path has no parent, as when you request the parent of a file system root, 
-	  then <paramref name="parent"/> will be set to <see langword="null"/>.
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="MakePath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath MakePath (Gtk.FilePath base_path, string display_name);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="display_name" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Makes a new path called <paramref name="display_name"/>
-	  starting from path <paramref name="base_path"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="display_name">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetFolder">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileFolder GetFolder (Gtk.FilePath path, Gtk.FileInfoType types);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileFolder</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="types" Type="Gtk.FileInfoType" />
-      </Parameters>
-      <Docs>
-        <summary>Gets an object to represent the folder at path <paramref name="path"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="types">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gtk.FileFolder" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToFilename">
-      <MemberSignature Language="C#" Value="public virtual string PathToFilename (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a filename string.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" />, or <see langword="null"/>
-	if the path is not local.</returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="UriToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath UriToPath (string uri);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="uri" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts a URI to a <see cref="T:Gtk.FilePath" /> object.</summary>
-        <param name="uri">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathToUri">
-      <MemberSignature Language="C#" Value="public virtual string PathToUri (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="path"/> to a URI.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GetVolumeForPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FileSystemVolume GetVolumeForPath (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FileSystemVolume</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Determines what volume of the filesystem 
-	  <paramref name="path"/> is located on.
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemVolume" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilenameToPath">
-      <MemberSignature Language="C#" Value="public virtual Gtk.FilePath FilenameToPath (string filename);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.FilePath</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="filename" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>Converts <paramref name="filename"/> into a <see cref="T:Gtk.FilePath" />.</summary>
-        <param name="filename">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gtk.FilePath" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RenderIcon">
-      <MemberSignature Language="C#" Value="public virtual Gdk.Pixbuf RenderIcon (Gtk.FilePath path, Gtk.Widget widget, int pixel_size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gdk.Pixbuf</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="widget" Type="Gtk.Widget" />
-        <Parameter Name="pixel_size" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>Returns an icon to represent this filesystem.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="widget">a <see cref="T:Gtk.Widget" /></param>
-        <param name="pixel_size">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gdk.Pixbuf" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="InsertBookmark">
-      <MemberSignature Language="C#" Value="public virtual bool InsertBookmark (Gtk.FilePath path, int position);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-        <Parameter Name="position" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Adds a path for a folder to the user's bookmarks list.  
-	</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <param name="position">a <see cref="T:System.Int32" />, index in 
-	  the bookmarks list at which the <paramref name="path"/> should 
-	  be inserted; use 0 for the beginning, and -1 or the number of 
-	  bookmarks itself for the end of the list.</param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>If the operation
-	    succeeds, the <see cref="E:Gtk.FileSystem.BookmarksChanged"/>
-	    signal will be emitted.  Bookmark paths are
-	    unique; if you try to insert a <paramref name="path"/> that 
-	    already exists, the operation will fail and an exception will 
-	    be thrown.</para>
-	  <para>To reorder the list of bookmarks, use
-	    <see cref="M:Gtk.FileSystem.RemoveBookmark"/> to
-	    remove the path in question, and call 
-	    <see cref="M:Gtk.FileSystem.InsertBookmark"/> with
-	    the new position for the path.</para>
-	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PathIsLocal">
-      <MemberSignature Language="C#" Value="public virtual bool PathIsLocal (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Checks to see whether a path is local; that is,
-	whether <see cref="M:Gtk.FileSystem.PathToFilename"/> would
-	return non-<see langword="null"/>.</summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ListVolumes">
-      <MemberSignature Language="C#" Value="public virtual GLib.SList ListVolumes ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.SList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Gets a list of all the <see cref="T:Gtk.FileSystemVolume"/>s
-	on the system.</summary>
-        <returns>a <see cref="T:GLib.SList" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Parse">
-      <MemberSignature Language="C#" Value="public virtual bool Parse (Gtk.FilePath base_path, string str, Gtk.FilePath folder, string file_part);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="base_path" Type="Gtk.FilePath" />
-        <Parameter Name="str" Type="System.String" />
-        <Parameter Name="folder" Type="Gtk.FilePath" />
-        <Parameter Name="file_part" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>
-	  Given a string entered by a user, parse it (possibly using
-	  heuristics) into a folder path and a UTF-8 encoded
-	  filename part suitable for passing to 
-	  <see cref="M:Gtk.FileSystem.MakePath"/>.
-	</summary>
-        <param name="base_path">a <see cref="T:Gtk.FilePath" />, reference folder with respect to which relative paths should be interpreted.</param>
-        <param name="str">a <see cref="T:System.String" />, the string to parse</param>
-        <param name="folder">a <see cref="T:Gtk.FilePath" />, a location to store folder portion of result, or <see langword="null"/></param>
-        <param name="file_part">a <see cref="T:System.String" />, location to store file portion of result, or <see langword="null"/></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>
-	  <para>
-	    Note that the returned filename point may point to a subfolder
-	    of the returned folder. Adding a trailing path separator is needed
-	    to enforce the interpretation as a folder name.
-	  </para>
-	  <para>
-	    If parsing fails because the syntax of <paramref name="str"/> is not understood,
-	    an exception <see cref="Gtk.FileSystemError.BadFilename"/> will
-	    be thrown and <see langword="false"/> returned.
-	  </para>
-	  <para>
-	    If parsing fails because a path was encountered that doesn't
-	    exist on the filesystem, then an exception
-	    <see cref="Gtk.FileSystemError.Nonexistent"/> will be thrown
-	    and <see langword="false"/> returned. 
-	    (This only applies to parsing relative paths,
-	    not to interpretation of <paramref name="file_part"/>. No check is made as
-	    to whether <paramref name="file_part"/> exists.)
-	  </para>	</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="CreateFolder">
-      <MemberSignature Language="C#" Value="public virtual bool CreateFolder (Gtk.FilePath path);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="path" Type="Gtk.FilePath" />
-      </Parameters>
-      <Docs>
-        <summary>Makes a new folder at <paramref name="path"/></summary>
-        <param name="path">a <see cref="T:Gtk.FilePath" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OnVolumesChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnVolumesChanged ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gtk.FileSystemWin32.VolumesChanged" /> event.</summary>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gtk.FileSystemWin32.VolumesChanged" /> event.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OnBookmarksChanged">
-      <MemberSignature Language="C#" Value="protected virtual void OnBookmarksChanged ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gtk.FileSystemWin32.BookmarksChanged" /> event.</summary>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gtk.FileSystemWin32.BookmarksChanged" /> event.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected FileSystemWin32 (GLib.GType gtype);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>Protected Constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemWin32" /></returns>
-        <remarks>Chain to this constructor if you have manually registered a native <see cref="T:GLib.GType" /> value for your subclass.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileSystemWin32 (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Internal constructor</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gtk.FileSystemWin32" /></returns>
-        <remarks>This is not typically used by C# code.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public FileSystemWin32 ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>Public constructor.</summary>
-        <returns>a <see cref="T:Gtk.FileSystemWin32" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gtk.FileSystemWin32" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VolumesChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler VolumesChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Emitted when a related <see cref="M:Gtk.FileSystemVolume"/>
-	is mounted.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BookmarksChanged">
-      <MemberSignature Language="C#" Value="public virtual event EventHandler BookmarksChanged;" />
-      <MemberType>Event</MemberType>
-      <ReturnValue>
-        <ReturnType>System.EventHandler</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Event fired whenever the bookmarks to particular locations change.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index a639bdf87..15659e3be 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -145,23 +145,6 @@
       <member cname="GTK_FILE_FILTER_DISPLAY_NAME" name="DisplayName" value="1 &lt;&lt; 2"/>
       <member cname="GTK_FILE_FILTER_MIME_TYPE" name="MimeType" value="1 &lt;&lt; 3"/>
     </enum>
-    <enum name="FileInfoType" cname="GtkFileInfoType" type="flags">
-      <member cname="GTK_FILE_INFO_DISPLAY_NAME" name="DisplayName" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_FILE_INFO_IS_FOLDER" name="IsFolder" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_FILE_INFO_IS_HIDDEN" name="IsHidden" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_FILE_INFO_MIME_TYPE" name="MimeType" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_FILE_INFO_MODIFICATION_TIME" name="ModificationTime" value="1 &lt;&lt; 4"/>
-      <member cname="GTK_FILE_INFO_SIZE" name="Size" value="1 &lt;&lt; 5"/>
-      <member cname="GTK_FILE_INFO_ALL" name="All"/>
-    </enum>
-    <enum name="FileSystemError" cname="GtkFileSystemError" type="enum">
-      <member cname="GTK_FILE_SYSTEM_ERROR_NONEXISTENT" name="Nonexistent"/>
-      <member cname="GTK_FILE_SYSTEM_ERROR_NOT_FOLDER" name="NotFolder"/>
-      <member cname="GTK_FILE_SYSTEM_ERROR_INVALID_URI" name="InvalidUri"/>
-      <member cname="GTK_FILE_SYSTEM_ERROR_BAD_FILENAME" name="BadFilename"/>
-      <member cname="GTK_FILE_SYSTEM_ERROR_FAILED" name="Failed"/>
-      <member cname="GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS" name="AlreadyExists"/>
-    </enum>
     <enum name="IMPreeditStyle" cname="GtkIMPreeditStyle" type="enum">
       <member cname="GTK_IM_PREEDIT_NOTHING" name="Nothing"/>
       <member cname="GTK_IM_PREEDIT_CALLBACK" name="Callback"/>
@@ -1643,376 +1626,6 @@
         </parameters>
       </virtual_method>
     </interface>
-    <interface name="FileFolder" cname="GtkFileFolder">
-      <signal name="Deleted" cname="deleted" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="monitor"/>
-        </parameters>
-      </signal>
-      <signal name="FilesAdded" cname="files-added" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="monitor"/>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </signal>
-      <signal name="FilesChanged" cname="files-changed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="monitor"/>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </signal>
-      <signal name="FilesRemoved" cname="files-removed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="monitor"/>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </signal>
-      <signal name="FinishedLoading" cname="finished-loading" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="folder"/>
-        </parameters>
-      </signal>
-      <virtual_method name="GetInfo" cname="get_info">
-        <return-type type="GtkFileInfo*"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="folder"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="ListChildren" cname="list_children">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="folder"/>
-          <parameter type="GSList**" name="children"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="IsFinishedLoading" cname="is_finished_loading">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileFolder*" name="folder"/>
-        </parameters>
-      </virtual_method>
-      <method name="GetInfo" cname="gtk_file_folder_get_info">
-        <return-type type="GtkFileInfo*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="GetType" cname="gtk_file_folder_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <method name="IsFinishedLoading" cname="gtk_file_folder_is_finished_loading">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="ListChildren" cname="gtk_file_folder_list_children">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GSList**" name="children"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-    </interface>
-    <interface name="FileSystem" cname="GtkFileSystem">
-      <signal name="VolumesChanged" cname="volumes-changed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-        </parameters>
-      </signal>
-      <signal name="BookmarksChanged" cname="bookmarks-changed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-        </parameters>
-      </signal>
-      <virtual_method name="ListVolumes" cname="list_volumes">
-        <return-type type="GSList*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="GetVolumeForPath" cname="get_volume_for_path">
-        <return-type type="GtkFileSystemVolume*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="GetFolder" cname="get_folder">
-        <return-type type="GtkFileFolder*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkFileInfoType" name="types"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="CreateFolder" cname="create_folder">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeFree" cname="volume_free">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeGetBasePath" cname="volume_get_base_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeGetIsMounted" cname="volume_get_is_mounted">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeMount" cname="volume_mount">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeGetDisplayName" cname="volume_get_display_name">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="VolumeRenderIcon" cname="volume_render_icon">
-        <return-type type="GdkPixbuf*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="pixel_size"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="GetParent" cname="get_parent">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkFilePath**" name="parent"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="MakePath" cname="make_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="base_path"/>
-          <parameter type="const-gchar*" name="display_name"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="Parse" cname="parse">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="base_path"/>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkFilePath**" name="folder"/>
-          <parameter type="gchar**" name="file_part"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="PathToUri" cname="path_to_uri">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="PathToFilename" cname="path_to_filename">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="UriToPath" cname="uri_to_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-gchar*" name="uri"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="FilenameToPath" cname="filename_to_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-gchar*" name="path"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="RenderIcon" cname="render_icon">
-        <return-type type="GdkPixbuf*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="pixel_size"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="InsertBookmark" cname="insert_bookmark">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="gint" name="position"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="RemoveBookmark" cname="remove_bookmark">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="ListBookmarks" cname="list_bookmarks">
-        <return-type type="GSList*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-        </parameters>
-      </virtual_method>
-      <method name="CreateFolder" cname="gtk_file_system_create_folder">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="ErrorQuark" cname="gtk_file_system_error_quark" shared="true">
-        <return-type type="GQuark"/>
-      </method>
-      <method name="FilenameToPath" cname="gtk_file_system_filename_to_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="filename"/>
-        </parameters>
-      </method>
-      <method name="GetFolder" cname="gtk_file_system_get_folder">
-        <return-type type="GtkFileFolder*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkFileInfoType" name="types"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="GetParent" cname="gtk_file_system_get_parent">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkFilePath**" name="parent"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="GetType" cname="gtk_file_system_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <method name="GetVolumeForPath" cname="gtk_file_system_get_volume_for_path">
-        <return-type type="GtkFileSystemVolume*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="InsertBookmark" cname="gtk_file_system_insert_bookmark">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="gint" name="position"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="ListBookmarks" cname="gtk_file_system_list_bookmarks">
-        <return-type type="GSList*"/>
-      </method>
-      <method name="ListVolumes" cname="gtk_file_system_list_volumes">
-        <return-type type="GSList*"/>
-      </method>
-      <method name="MakePath" cname="gtk_file_system_make_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="base_path"/>
-          <parameter type="const-gchar*" name="display_name"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="Parse" cname="gtk_file_system_parse">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="base_path"/>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkFilePath**" name="folder"/>
-          <parameter type="gchar**" name="file_part"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="PathIsLocal" cname="gtk_file_system_path_is_local">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="PathToFilename" cname="gtk_file_system_path_to_filename">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="PathToUri" cname="gtk_file_system_path_to_uri">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="RemoveBookmark" cname="gtk_file_system_remove_bookmark">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="RenderIcon" cname="gtk_file_system_render_icon">
-        <return-type type="GdkPixbuf*"/>
-        <parameters>
-          <parameter type="const-GtkFilePath*" name="path"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="pixel_size"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="UriToPath" cname="gtk_file_system_uri_to_path">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="uri"/>
-        </parameters>
-      </method>
-    </interface>
     <interface name="TreeDragDest" cname="GtkTreeDragDest">
       <virtual_method name="DragDataReceived" cname="drag_data_received">
         <return-type type="gboolean"/>
@@ -5606,11 +5219,6 @@
         </parameters>
       </method>
     </object>
-    <object name="FilePath" cname="GtkFilePath">
-      <method name="GetType" cname="gtk_file_path_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-    </object>
     <object name="FileSelection" cname="GtkFileSelection" parent="GtkDialog">
       <field name="DirList" cname="dir_list" type="GtkWidget*" access="public"/>
       <field name="FileList" cname="file_list" type="GtkWidget*" access="public"/>
@@ -5679,24 +5287,6 @@
         <return-type type="void"/>
       </method>
     </object>
-    <object name="FileSystemUnix" cname="GtkFileSystemUnix" parent="GObject">
-      <implements>
-        <interface cname="GtkFileSystem"/>
-      </implements>
-      <method name="GetType" cname="gtk_file_system_unix_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gtk_file_system_unix_new"/>
-    </object>
-    <object name="FileSystemWin32" cname="GtkFileSystemWin32" parent="GObject">
-      <implements>
-        <interface cname="GtkFileSystem"/>
-      </implements>
-      <method name="GetType" cname="gtk_file_system_win32_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gtk_file_system_win32_new"/>
-    </object>
     <object name="Fixed" cname="GtkFixed" parent="GtkContainer">
       <field name="Children" cname="children" type="GList*"/>
       <childprop name="X" cname="x" type="gint" readable="true" writeable="true"/>
@@ -15393,124 +14983,6 @@
       <field name="DisplayName" cname="display_name" type="const-gchar*"/>
       <field name="MimeType" cname="mime_type" type="const-gchar*"/>
     </struct>
-    <boxed name="FileInfo" cname="GtkFileInfo" opaque="true">
-      <method name="Copy" cname="gtk_file_info_copy">
-        <return-type type="GtkFileInfo*"/>
-      </method>
-      <method name="Free" cname="gtk_file_info_free">
-        <return-type type="void"/>
-      </method>
-      <method name="GetDisplayKey" cname="gtk_file_info_get_display_key">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="GetDisplayName" cname="gtk_file_info_get_display_name">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="GetIsFolder" cname="gtk_file_info_get_is_folder">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetIsHidden" cname="gtk_file_info_get_is_hidden">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetMimeType" cname="gtk_file_info_get_mime_type">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="GetModificationTime" cname="gtk_file_info_get_modification_time">
-        <return-type type="GtkFileTime"/>
-      </method>
-      <method name="GetSize" cname="gtk_file_info_get_size">
-        <return-type type="gint64"/>
-      </method>
-      <method name="GetType" cname="gtk_file_info_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gtk_file_info_new"/>
-      <method name="SetDisplayName" cname="gtk_file_info_set_display_name">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="display_name"/>
-        </parameters>
-      </method>
-      <method name="SetIsFolder" cname="gtk_file_info_set_is_folder">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="is_folder"/>
-        </parameters>
-      </method>
-      <method name="SetIsHidden" cname="gtk_file_info_set_is_hidden">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="is_hidden"/>
-        </parameters>
-      </method>
-      <method name="SetMimeType" cname="gtk_file_info_set_mime_type">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="mime_type"/>
-        </parameters>
-      </method>
-      <method name="SetModificationTime" cname="gtk_file_info_set_modification_time">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileTime" name="modification_time"/>
-        </parameters>
-      </method>
-      <method name="SetSize" cname="gtk_file_info_set_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint64" name="size"/>
-        </parameters>
-      </method>
-    </boxed>
-    <struct name="FileSystemVolume" cname="GtkFileSystemVolume" opaque="true">
-      <method name="Free" cname="gtk_file_system_volume_free" shared="true">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </method>
-      <method name="GetBasePath" cname="gtk_file_system_volume_get_base_path" shared="true">
-        <return-type type="GtkFilePath*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </method>
-      <method name="GetDisplayName" cname="gtk_file_system_volume_get_display_name" shared="true">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </method>
-      <method name="GetIsMounted" cname="gtk_file_system_volume_get_is_mounted" shared="true">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-        </parameters>
-      </method>
-      <method name="Mount" cname="gtk_file_system_volume_mount" shared="true">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="RenderIcon" cname="gtk_file_system_volume_render_icon" shared="true">
-        <return-type type="GdkPixbuf*"/>
-        <parameters>
-          <parameter type="GtkFileSystem*" name="file_system"/>
-          <parameter type="GtkFileSystemVolume*" name="volume"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="pixel_size"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-    </struct>
-    <alias name="FileTime" cname="GtkFileTime" type="gint64"/>
     <struct name="FixedChild" cname="GtkFixedChild">
       <field name="Widget" cname="widget" type="GtkWidget*"/>
       <field name="X" cname="x" type="gint"/>
@@ -17671,26 +17143,6 @@
         </parameters>
       </method>
     </class>
-    <class name="File" cname="GtkFile_">
-      <method name="PathsCopy" cname="gtk_file_paths_copy" shared="true">
-        <return-type type="GSList*"/>
-        <parameters>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </method>
-      <method name="PathsFree" cname="gtk_file_paths_free" shared="true">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </method>
-      <method name="PathsSort" cname="gtk_file_paths_sort" shared="true">
-        <return-type type="GSList*"/>
-        <parameters>
-          <parameter type="GSList*" name="paths"/>
-        </parameters>
-      </method>
-    </class>
     <class name="Gc" cname="GtkGc_">
       <method name="Get" cname="gtk_gc_get" shared="true">
         <return-type type="GdkGC*"/>
diff --git a/sources/gtk-sharp-sources.xml b/sources/gtk-sharp-sources.xml
index 3c4851807..5b94aea2f 100644
--- a/sources/gtk-sharp-sources.xml
+++ b/sources/gtk-sharp-sources.xml
@@ -47,8 +47,14 @@
         <exclude>gtk+-2.4.1/gtk/gtkfilechooserentry.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkfilechooserutils.c</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkfilechooserutils.h</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystem.c</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystem.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkfilesystemmodel.c</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkfilesystemmodel.h</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystemunix.c</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystemunix.h</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystemwin32.c</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkfilesystemwin32.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkiconcache.c</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkiconcache.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkpathbar.c</exclude>