diff --git a/ChangeLog b/ChangeLog
index dd291423c..8251accef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-07-13  Dan Winship  <danw@novell.com>
+
+	* sources/gtk-sharp-2.4-sources.xml: 
+	* sources/gtk-sharp-2.6-sources.xml: remove some gnome-vfs files:
+	gnome-vfs-method and gnome-vfs-transform, because they're
+	internal/part of the module API, and gnome-vfs-file-size.h,
+	because it's generated and shouldn't be in the source tarball (and
+	we don't parse it right anyway).
+
+	* gnomevfs/gnome-vfs-api.raw: Regen
+
+	* gnomevfs/gnomevfs-symbols.xml: add GnomeVFSFileOffset
+
+	* gnomevfs/Gnomevfs.metadata: remove a whole bunch of callback
+	types that are only used from methods and structs that we hide.
+	
 2005-07-08  Mike Kestner  <mkestner@novell.com>
 
 	* */*.raw : regen.
diff --git a/doc/en/Gnome.Vfs/AsyncFileControlCallback.xml b/doc/en/Gnome.Vfs/AsyncFileControlCallback.xml
deleted file mode 100644
index 014d4a6fd..000000000
--- a/doc/en/Gnome.Vfs/AsyncFileControlCallback.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Type Name="AsyncFileControlCallback" FullName="Gnome.Vfs.AsyncFileControlCallback">
-  <TypeSignature Language="C#" Value="public delegate void AsyncFileControlCallback(Gnome.Vfs.AsyncHandle handle, Gnome.Vfs.Result result, IntPtr operation_data);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
-    <Parameter Name="result" Type="Gnome.Vfs.Result" />
-    <Parameter Name="operation_data" Type="System.IntPtr" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="handle">To be added.</param>
-    <param name="result">To be added.</param>
-    <param name="operation_data">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/AsyncGetFileInfoCallback.xml b/doc/en/Gnome.Vfs/AsyncGetFileInfoCallback.xml
deleted file mode 100644
index b5f5e6c4c..000000000
--- a/doc/en/Gnome.Vfs/AsyncGetFileInfoCallback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Type Name="AsyncGetFileInfoCallback" FullName="Gnome.Vfs.AsyncGetFileInfoCallback">
-  <TypeSignature Language="C#" Value="public delegate void AsyncGetFileInfoCallback(Gnome.Vfs.AsyncHandle handle, GLib.List results);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
-    <Parameter Name="results" Type="GLib.List" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="handle">To be added.</param>
-    <param name="results">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/AsyncModuleCallback.xml b/doc/en/Gnome.Vfs/AsyncModuleCallback.xml
deleted file mode 100644
index e04c44ed6..000000000
--- a/doc/en/Gnome.Vfs/AsyncModuleCallback.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Type Name="AsyncModuleCallback" FullName="Gnome.Vfs.AsyncModuleCallback">
-  <TypeSignature Language="C#" Value="public delegate void AsyncModuleCallback(IntPtr in_param, ulong in_size, IntPtr out_param, ulong out_size, IntPtr callback_data, Gnome.Vfs.ModuleCallbackResponse response);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="in_param" Type="System.IntPtr" />
-    <Parameter Name="in_size" Type="System.UInt64" />
-    <Parameter Name="out_param" Type="System.IntPtr" />
-    <Parameter Name="out_size" Type="System.UInt64" />
-    <Parameter Name="callback_data" Type="System.IntPtr" />
-    <Parameter Name="response" Type="Gnome.Vfs.ModuleCallbackResponse" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="in_param">To be added.</param>
-    <param name="in_size">To be added.</param>
-    <param name="out_param">To be added.</param>
-    <param name="out_size">To be added.</param>
-    <param name="callback_data">To be added.</param>
-    <param name="response">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/AsyncOpenAsChannelCallback.xml b/doc/en/Gnome.Vfs/AsyncOpenAsChannelCallback.xml
deleted file mode 100644
index d81634224..000000000
--- a/doc/en/Gnome.Vfs/AsyncOpenAsChannelCallback.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Type Name="AsyncOpenAsChannelCallback" FullName="Gnome.Vfs.AsyncOpenAsChannelCallback">
-  <TypeSignature Language="C#" Value="public delegate void AsyncOpenAsChannelCallback(Gnome.Vfs.AsyncHandle handle, IntPtr channel, Gnome.Vfs.Result result);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
-    <Parameter Name="channel" Type="System.IntPtr" />
-    <Parameter Name="result" Type="Gnome.Vfs.Result" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="handle">To be added.</param>
-    <param name="channel">To be added.</param>
-    <param name="result">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/AsyncSetFileInfoCallback.xml b/doc/en/Gnome.Vfs/AsyncSetFileInfoCallback.xml
deleted file mode 100644
index 8c5b93804..000000000
--- a/doc/en/Gnome.Vfs/AsyncSetFileInfoCallback.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Type Name="AsyncSetFileInfoCallback" FullName="Gnome.Vfs.AsyncSetFileInfoCallback">
-  <TypeSignature Language="C#" Value="public delegate void AsyncSetFileInfoCallback(Gnome.Vfs.AsyncHandle handle, Gnome.Vfs.Result result, Gnome.Vfs.FileInfo file_info);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
-    <Parameter Name="result" Type="Gnome.Vfs.Result" />
-    <Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="handle">To be added.</param>
-    <param name="result">To be added.</param>
-    <param name="file_info">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/AsyncXferProgressCallback.xml b/doc/en/Gnome.Vfs/AsyncXferProgressCallback.xml
deleted file mode 100644
index e42961050..000000000
--- a/doc/en/Gnome.Vfs/AsyncXferProgressCallback.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Type Name="AsyncXferProgressCallback" FullName="Gnome.Vfs.AsyncXferProgressCallback">
-  <TypeSignature Language="C#" Value="public delegate int AsyncXferProgressCallback(Gnome.Vfs.AsyncHandle handle, Gnome.Vfs.XferProgressInfo info);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
-    <Parameter Name="info" Type="Gnome.Vfs.XferProgressInfo" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Int32</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="handle">To be added.</param>
-    <param name="info">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/DirectoryVisitFunc.xml b/doc/en/Gnome.Vfs/DirectoryVisitFunc.xml
deleted file mode 100644
index d778f657a..000000000
--- a/doc/en/Gnome.Vfs/DirectoryVisitFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="DirectoryVisitFunc" FullName="Gnome.Vfs.DirectoryVisitFunc">
-  <TypeSignature Language="C#" Value="public delegate bool DirectoryVisitFunc(string rel_path, Gnome.Vfs.FileInfo info, bool recursing_will_loop, IntPtr data, out bool recurse);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="rel_path" Type="System.String" />
-    <Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
-    <Parameter Name="recursing_will_loop" Type="System.Boolean" />
-    <Parameter Name="data" Type="System.IntPtr" />
-    <Parameter Name="recurse" Type="System.Boolean&amp;" RefType="out" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Boolean</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="rel_path">To be added.</param>
-    <param name="info">To be added.</param>
-    <param name="recursing_will_loop">To be added.</param>
-    <param name="data">To be added.</param>
-    <param name="recurse">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/Global.xml b/doc/en/Gnome.Vfs/Global.xml
index 55b02ca42..828a86365 100644
--- a/doc/en/Gnome.Vfs/Global.xml
+++ b/doc/en/Gnome.Vfs/Global.xml
@@ -662,6 +662,28 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+  <Member MemberName="SeekCancellable">
+      <MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SeekCancellable (Gnome.Vfs.Handle handle, Gnome.Vfs.SeekPosition whence, ulong offset, Gnome.Vfs.Context context);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>Gnome.Vfs.Result</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="handle" Type="Gnome.Vfs.Handle" />
+        <Parameter Name="whence" Type="Gnome.Vfs.SeekPosition" />
+        <Parameter Name="offset" Type="System.UInt64" />
+        <Parameter Name="context" Type="Gnome.Vfs.Context" />
+      </Parameters>
+      <Docs>
+        <param name="handle">To be added.</param>
+        <param name="whence">To be added.</param>
+        <param name="offset">To be added.</param>
+        <param name="context">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/doc/en/Gnome.Vfs/Method.xml b/doc/en/Gnome.Vfs/Method.xml
deleted file mode 100644
index 2e1d2ea34..000000000
--- a/doc/en/Gnome.Vfs/Method.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Type Name="Method" FullName="Gnome.Vfs.Method">
-  <TypeSignature Language="C#" Value="public class Method : GLib.Opaque" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>GLib.Opaque</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Method (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <param name="raw">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Get">
-      <MemberSignature Language="C#" Value="public static Gnome.Vfs.Method Get (string name);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gnome.Vfs.Method</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="name" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <param name="name">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Init">
-      <MemberSignature Language="C#" Value="public static bool Init ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodCheckSameFSFunc.xml b/doc/en/Gnome.Vfs/MethodCheckSameFSFunc.xml
deleted file mode 100644
index 4d8d15ce4..000000000
--- a/doc/en/Gnome.Vfs/MethodCheckSameFSFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodCheckSameFSFunc" FullName="Gnome.Vfs.MethodCheckSameFSFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodCheckSameFSFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri a, Gnome.Vfs.Uri b, out bool same_fs_return, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="a" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="b" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="same_fs_return" Type="System.Boolean&amp;" RefType="out" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="a">To be added.</param>
-    <param name="b">To be added.</param>
-    <param name="same_fs_return">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodCloseDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodCloseDirectoryFunc.xml
deleted file mode 100644
index 9b2eaa08b..000000000
--- a/doc/en/Gnome.Vfs/MethodCloseDirectoryFunc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Type Name="MethodCloseDirectoryFunc" FullName="Gnome.Vfs.MethodCloseDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodCloseDirectoryFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodCloseFunc.xml b/doc/en/Gnome.Vfs/MethodCloseFunc.xml
deleted file mode 100644
index 4e91880c2..000000000
--- a/doc/en/Gnome.Vfs/MethodCloseFunc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Type Name="MethodCloseFunc" FullName="Gnome.Vfs.MethodCloseFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodCloseFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodCreateSymbolicLinkFunc.xml b/doc/en/Gnome.Vfs/MethodCreateSymbolicLinkFunc.xml
deleted file mode 100644
index eebe10179..000000000
--- a/doc/en/Gnome.Vfs/MethodCreateSymbolicLinkFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodCreateSymbolicLinkFunc" FullName="Gnome.Vfs.MethodCreateSymbolicLinkFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodCreateSymbolicLinkFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, string target_reference, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="target_reference" Type="System.String" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="target_reference">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodFileControlFunc.xml b/doc/en/Gnome.Vfs/MethodFileControlFunc.xml
deleted file mode 100644
index 12a52f834..000000000
--- a/doc/en/Gnome.Vfs/MethodFileControlFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodFileControlFunc" FullName="Gnome.Vfs.MethodFileControlFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodFileControlFunc(Gnome.Vfs.Method method, IntPtr method_handle, string operation, IntPtr operation_data, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="operation" Type="System.String" />
-    <Parameter Name="operation_data" Type="System.IntPtr" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="operation">To be added.</param>
-    <param name="operation_data">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodFindDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodFindDirectoryFunc.xml
deleted file mode 100644
index 911eca550..000000000
--- a/doc/en/Gnome.Vfs/MethodFindDirectoryFunc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Type Name="MethodFindDirectoryFunc" FullName="Gnome.Vfs.MethodFindDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodFindDirectoryFunc();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodGetFileInfoFromHandleFunc.xml b/doc/en/Gnome.Vfs/MethodGetFileInfoFromHandleFunc.xml
deleted file mode 100644
index e2e843cc7..000000000
--- a/doc/en/Gnome.Vfs/MethodGetFileInfoFromHandleFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodGetFileInfoFromHandleFunc" FullName="Gnome.Vfs.MethodGetFileInfoFromHandleFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFromHandleFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
-    <Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="file_info">To be added.</param>
-    <param name="options">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodGetFileInfoFunc.xml b/doc/en/Gnome.Vfs/MethodGetFileInfoFunc.xml
deleted file mode 100644
index 187ef29fa..000000000
--- a/doc/en/Gnome.Vfs/MethodGetFileInfoFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodGetFileInfoFunc" FullName="Gnome.Vfs.MethodGetFileInfoFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
-    <Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="file_info">To be added.</param>
-    <param name="options">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodInitFunc.xml b/doc/en/Gnome.Vfs/MethodInitFunc.xml
deleted file mode 100644
index 54a94d32e..000000000
--- a/doc/en/Gnome.Vfs/MethodInitFunc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Type Name="MethodInitFunc" FullName="Gnome.Vfs.MethodInitFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Method MethodInitFunc(string method_name, string config_args);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method_name" Type="System.String" />
-    <Parameter Name="config_args" Type="System.String" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Method</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method_name">To be added.</param>
-    <param name="config_args">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodIsLocalFunc.xml b/doc/en/Gnome.Vfs/MethodIsLocalFunc.xml
deleted file mode 100644
index 6d6f0d4d3..000000000
--- a/doc/en/Gnome.Vfs/MethodIsLocalFunc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Type Name="MethodIsLocalFunc" FullName="Gnome.Vfs.MethodIsLocalFunc">
-  <TypeSignature Language="C#" Value="public delegate bool MethodIsLocalFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Boolean</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodMakeDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodMakeDirectoryFunc.xml
deleted file mode 100644
index 7437ab397..000000000
--- a/doc/en/Gnome.Vfs/MethodMakeDirectoryFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodMakeDirectoryFunc" FullName="Gnome.Vfs.MethodMakeDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodMakeDirectoryFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, uint perm, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="perm" Type="System.UInt32" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="perm">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodMonitorAddFunc.xml b/doc/en/Gnome.Vfs/MethodMonitorAddFunc.xml
deleted file mode 100644
index 96ecceb46..000000000
--- a/doc/en/Gnome.Vfs/MethodMonitorAddFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodMonitorAddFunc" FullName="Gnome.Vfs.MethodMonitorAddFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodMonitorAddFunc(Gnome.Vfs.Method method, IntPtr method_handle_return, Gnome.Vfs.Uri uri, Gnome.Vfs.MonitorType monitor_type);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle_return" Type="System.IntPtr" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="monitor_type" Type="Gnome.Vfs.MonitorType" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle_return">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="monitor_type">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodMonitorCancelFunc.xml b/doc/en/Gnome.Vfs/MethodMonitorCancelFunc.xml
deleted file mode 100644
index 5af6e2e40..000000000
--- a/doc/en/Gnome.Vfs/MethodMonitorCancelFunc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Type Name="MethodMonitorCancelFunc" FullName="Gnome.Vfs.MethodMonitorCancelFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodMonitorCancelFunc(Gnome.Vfs.Method method, IntPtr handle);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="handle" Type="System.IntPtr" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="handle">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodMoveFunc.xml b/doc/en/Gnome.Vfs/MethodMoveFunc.xml
deleted file mode 100644
index 7c0857f82..000000000
--- a/doc/en/Gnome.Vfs/MethodMoveFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodMoveFunc" FullName="Gnome.Vfs.MethodMoveFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodMoveFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri old_uri, Gnome.Vfs.Uri new_uri, bool force_replace, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="old_uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="new_uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="force_replace" Type="System.Boolean" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="old_uri">To be added.</param>
-    <param name="new_uri">To be added.</param>
-    <param name="force_replace">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodOpenDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodOpenDirectoryFunc.xml
deleted file mode 100644
index 978c2a607..000000000
--- a/doc/en/Gnome.Vfs/MethodOpenDirectoryFunc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodOpenDirectoryFunc" FullName="Gnome.Vfs.MethodOpenDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodOpenDirectoryFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="options">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodReadDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodReadDirectoryFunc.xml
deleted file mode 100644
index 280a63b55..000000000
--- a/doc/en/Gnome.Vfs/MethodReadDirectoryFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodReadDirectoryFunc" FullName="Gnome.Vfs.MethodReadDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodReadDirectoryFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="file_info">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodReadFunc.xml b/doc/en/Gnome.Vfs/MethodReadFunc.xml
deleted file mode 100644
index e16b96755..000000000
--- a/doc/en/Gnome.Vfs/MethodReadFunc.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Type Name="MethodReadFunc" FullName="Gnome.Vfs.MethodReadFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodReadFunc(Gnome.Vfs.Method method, IntPtr method_handle, IntPtr buffer, long num_bytes, out long bytes_read_return, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="buffer" Type="System.IntPtr" />
-    <Parameter Name="num_bytes" Type="System.Int64" />
-    <Parameter Name="bytes_read_return" Type="System.Int64&amp;" RefType="out" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="buffer">To be added.</param>
-    <param name="num_bytes">To be added.</param>
-    <param name="bytes_read_return">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodRemoveDirectoryFunc.xml b/doc/en/Gnome.Vfs/MethodRemoveDirectoryFunc.xml
deleted file mode 100644
index 656f87060..000000000
--- a/doc/en/Gnome.Vfs/MethodRemoveDirectoryFunc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Type Name="MethodRemoveDirectoryFunc" FullName="Gnome.Vfs.MethodRemoveDirectoryFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodRemoveDirectoryFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodSeekFunc.xml b/doc/en/Gnome.Vfs/MethodSeekFunc.xml
deleted file mode 100644
index 07c411286..000000000
--- a/doc/en/Gnome.Vfs/MethodSeekFunc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Type Name="MethodSeekFunc" FullName="Gnome.Vfs.MethodSeekFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodSeekFunc();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodSetFileInfo.xml b/doc/en/Gnome.Vfs/MethodSetFileInfo.xml
deleted file mode 100644
index fba2961d8..000000000
--- a/doc/en/Gnome.Vfs/MethodSetFileInfo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Type Name="MethodSetFileInfo" FullName="Gnome.Vfs.MethodSetFileInfo">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodSetFileInfo(Gnome.Vfs.Method method, Gnome.Vfs.Uri a, Gnome.Vfs.FileInfo info, Gnome.Vfs.SetFileInfoMask mask, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="a" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
-    <Parameter Name="mask" Type="Gnome.Vfs.SetFileInfoMask" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="a">To be added.</param>
-    <param name="info">To be added.</param>
-    <param name="mask">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodShutdownFunc.xml b/doc/en/Gnome.Vfs/MethodShutdownFunc.xml
deleted file mode 100644
index 085b39394..000000000
--- a/doc/en/Gnome.Vfs/MethodShutdownFunc.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Type Name="MethodShutdownFunc" FullName="Gnome.Vfs.MethodShutdownFunc">
-  <TypeSignature Language="C#" Value="public delegate void MethodShutdownFunc(Gnome.Vfs.Method method);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodTellFunc.xml b/doc/en/Gnome.Vfs/MethodTellFunc.xml
deleted file mode 100644
index fa514bb8c..000000000
--- a/doc/en/Gnome.Vfs/MethodTellFunc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Type Name="MethodTellFunc" FullName="Gnome.Vfs.MethodTellFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodTellFunc();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodTruncateFunc.xml b/doc/en/Gnome.Vfs/MethodTruncateFunc.xml
deleted file mode 100644
index 5dec385bd..000000000
--- a/doc/en/Gnome.Vfs/MethodTruncateFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodTruncateFunc" FullName="Gnome.Vfs.MethodTruncateFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodTruncateFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, long length, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="length" Type="System.Int64" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="length">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodTruncateHandleFunc.xml b/doc/en/Gnome.Vfs/MethodTruncateHandleFunc.xml
deleted file mode 100644
index e31b8bf83..000000000
--- a/doc/en/Gnome.Vfs/MethodTruncateHandleFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="MethodTruncateHandleFunc" FullName="Gnome.Vfs.MethodTruncateHandleFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodTruncateHandleFunc(Gnome.Vfs.Method method, IntPtr handle, long length, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="handle" Type="System.IntPtr" />
-    <Parameter Name="length" Type="System.Int64" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="handle">To be added.</param>
-    <param name="length">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodUnlinkFunc.xml b/doc/en/Gnome.Vfs/MethodUnlinkFunc.xml
deleted file mode 100644
index b08fce32a..000000000
--- a/doc/en/Gnome.Vfs/MethodUnlinkFunc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Type Name="MethodUnlinkFunc" FullName="Gnome.Vfs.MethodUnlinkFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodUnlinkFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="uri" Type="Gnome.Vfs.Uri" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="uri">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/MethodWriteFunc.xml b/doc/en/Gnome.Vfs/MethodWriteFunc.xml
deleted file mode 100644
index c6981cd9e..000000000
--- a/doc/en/Gnome.Vfs/MethodWriteFunc.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Type Name="MethodWriteFunc" FullName="Gnome.Vfs.MethodWriteFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodWriteFunc(Gnome.Vfs.Method method, IntPtr method_handle, IntPtr buffer, long num_bytes, out long bytes_written_return, Gnome.Vfs.Context context);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="method" Type="Gnome.Vfs.Method" />
-    <Parameter Name="method_handle" Type="System.IntPtr" />
-    <Parameter Name="buffer" Type="System.IntPtr" />
-    <Parameter Name="num_bytes" Type="System.Int64" />
-    <Parameter Name="bytes_written_return" Type="System.Int64&amp;" RefType="out" />
-    <Parameter Name="context" Type="Gnome.Vfs.Context" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="method">To be added.</param>
-    <param name="method_handle">To be added.</param>
-    <param name="buffer">To be added.</param>
-    <param name="num_bytes">To be added.</param>
-    <param name="bytes_written_return">To be added.</param>
-    <param name="context">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/ModuleCallbackResponse.xml b/doc/en/Gnome.Vfs/ModuleCallbackResponse.xml
deleted file mode 100644
index 2d8b7fcf1..000000000
--- a/doc/en/Gnome.Vfs/ModuleCallbackResponse.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Type Name="ModuleCallbackResponse" FullName="Gnome.Vfs.ModuleCallbackResponse">
-  <TypeSignature Language="C#" Value="public delegate void ModuleCallbackResponse();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/ProcessCallback.xml b/doc/en/Gnome.Vfs/ProcessCallback.xml
deleted file mode 100644
index be4e194b8..000000000
--- a/doc/en/Gnome.Vfs/ProcessCallback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Type Name="ProcessCallback" FullName="Gnome.Vfs.ProcessCallback">
-  <TypeSignature Language="C#" Value="public delegate void ProcessCallback();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/ProcessInitFunc.xml b/doc/en/Gnome.Vfs/ProcessInitFunc.xml
deleted file mode 100644
index a5f64d8bc..000000000
--- a/doc/en/Gnome.Vfs/ProcessInitFunc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Type Name="ProcessInitFunc" FullName="Gnome.Vfs.ProcessInitFunc">
-  <TypeSignature Language="C#" Value="public delegate void ProcessInitFunc();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/SniffBufferReadCall.xml b/doc/en/Gnome.Vfs/SniffBufferReadCall.xml
deleted file mode 100644
index d2c8d58f8..000000000
--- a/doc/en/Gnome.Vfs/SniffBufferReadCall.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="SniffBufferReadCall" FullName="Gnome.Vfs.SniffBufferReadCall">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result SniffBufferReadCall(IntPtr context, IntPtr buffer, long bytes, out long bytes_read);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="context" Type="System.IntPtr" />
-    <Parameter Name="buffer" Type="System.IntPtr" />
-    <Parameter Name="bytes" Type="System.Int64" />
-    <Parameter Name="bytes_read" Type="System.Int64&amp;" RefType="out" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="context">To be added.</param>
-    <param name="buffer">To be added.</param>
-    <param name="bytes">To be added.</param>
-    <param name="bytes_read">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/SniffBufferSeekCall.xml b/doc/en/Gnome.Vfs/SniffBufferSeekCall.xml
deleted file mode 100644
index 2d0d83522..000000000
--- a/doc/en/Gnome.Vfs/SniffBufferSeekCall.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Type Name="SniffBufferSeekCall" FullName="Gnome.Vfs.SniffBufferSeekCall">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result SniffBufferSeekCall();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/SocketCloseFunc.xml b/doc/en/Gnome.Vfs/SocketCloseFunc.xml
deleted file mode 100644
index aa7886292..000000000
--- a/doc/en/Gnome.Vfs/SocketCloseFunc.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Type Name="SocketCloseFunc" FullName="Gnome.Vfs.SocketCloseFunc">
-  <TypeSignature Language="C#" Value="public delegate void SocketCloseFunc(IntPtr connection);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="connection" Type="System.IntPtr" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="connection">To be added.</param>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/SocketReadFunc.xml b/doc/en/Gnome.Vfs/SocketReadFunc.xml
deleted file mode 100644
index 9bff27563..000000000
--- a/doc/en/Gnome.Vfs/SocketReadFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="SocketReadFunc" FullName="Gnome.Vfs.SocketReadFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result SocketReadFunc(IntPtr connection, IntPtr buffer, long bytes, out long bytes_read);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="connection" Type="System.IntPtr" />
-    <Parameter Name="buffer" Type="System.IntPtr" />
-    <Parameter Name="bytes" Type="System.Int64" />
-    <Parameter Name="bytes_read" Type="System.Int64&amp;" RefType="out" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="connection">To be added.</param>
-    <param name="buffer">To be added.</param>
-    <param name="bytes">To be added.</param>
-    <param name="bytes_read">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/SocketWriteFunc.xml b/doc/en/Gnome.Vfs/SocketWriteFunc.xml
deleted file mode 100644
index 9441b437b..000000000
--- a/doc/en/Gnome.Vfs/SocketWriteFunc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Type Name="SocketWriteFunc" FullName="Gnome.Vfs.SocketWriteFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result SocketWriteFunc(IntPtr connection, IntPtr buffer, long bytes, out long bytes_written);" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters>
-    <Parameter Name="connection" Type="System.IntPtr" />
-    <Parameter Name="buffer" Type="System.IntPtr" />
-    <Parameter Name="bytes" Type="System.Int64" />
-    <Parameter Name="bytes_written" Type="System.Int64&amp;" RefType="out" />
-  </Parameters>
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <param name="connection">To be added.</param>
-    <param name="buffer">To be added.</param>
-    <param name="bytes">To be added.</param>
-    <param name="bytes_written">To be added.</param>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/TransformFunc.xml b/doc/en/Gnome.Vfs/TransformFunc.xml
deleted file mode 100644
index ec29805a1..000000000
--- a/doc/en/Gnome.Vfs/TransformFunc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Type Name="TransformFunc" FullName="Gnome.Vfs.TransformFunc">
-  <TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result TransformFunc();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>Gnome.Vfs.Result</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <returns>To be added.</returns>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/Gnome.Vfs/UnixMountCallback.xml b/doc/en/Gnome.Vfs/UnixMountCallback.xml
deleted file mode 100644
index 0a62db76b..000000000
--- a/doc/en/Gnome.Vfs/UnixMountCallback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Type Name="UnixMountCallback" FullName="Gnome.Vfs.UnixMountCallback">
-  <TypeSignature Language="C#" Value="public delegate void UnixMountCallback();" />
-  <AssemblyInfo>
-    <AssemblyName>gnome-vfs-sharp</AssemblyName>
-    <AssemblyVersion>2.6.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Parameters />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
-  </Docs>
-</Type>
diff --git a/doc/en/index.xml b/doc/en/index.xml
index cb87ffbbf..0b089522b 100644
--- a/doc/en/index.xml
+++ b/doc/en/index.xml
@@ -1200,7 +1200,6 @@
       <Type Name="Global" />
       <Type Name="Is" />
       <Type Name="Make" />
-      <Type Name="Method" />
       <Type Name="Mime" />
       <Type Name="Module" />
       <Type Name="Move" />
@@ -1210,49 +1209,6 @@
       <Type Name="Unescape" />
       <Type Name="Unlink" />
       <Type Name="Url" />
-      <Type Name="AsyncFileControlCallback" />
-      <Type Name="AsyncGetFileInfoCallback" />
-      <Type Name="AsyncModuleCallback" />
-      <Type Name="AsyncOpenAsChannelCallback" />
-      <Type Name="AsyncSetFileInfoCallback" />
-      <Type Name="AsyncXferProgressCallback" />
-      <Type Name="DirectoryVisitFunc" />
-      <Type Name="MethodCheckSameFSFunc" />
-      <Type Name="MethodCloseDirectoryFunc" />
-      <Type Name="MethodCloseFunc" />
-      <Type Name="MethodCreateSymbolicLinkFunc" />
-      <Type Name="MethodFileControlFunc" />
-      <Type Name="MethodFindDirectoryFunc" />
-      <Type Name="MethodGetFileInfoFromHandleFunc" />
-      <Type Name="MethodGetFileInfoFunc" />
-      <Type Name="MethodInitFunc" />
-      <Type Name="MethodIsLocalFunc" />
-      <Type Name="MethodMakeDirectoryFunc" />
-      <Type Name="MethodMonitorAddFunc" />
-      <Type Name="MethodMonitorCancelFunc" />
-      <Type Name="MethodMoveFunc" />
-      <Type Name="MethodOpenDirectoryFunc" />
-      <Type Name="MethodReadDirectoryFunc" />
-      <Type Name="MethodReadFunc" />
-      <Type Name="MethodRemoveDirectoryFunc" />
-      <Type Name="MethodSeekFunc" />
-      <Type Name="MethodSetFileInfo" />
-      <Type Name="MethodShutdownFunc" />
-      <Type Name="MethodTellFunc" />
-      <Type Name="MethodTruncateFunc" />
-      <Type Name="MethodTruncateHandleFunc" />
-      <Type Name="MethodUnlinkFunc" />
-      <Type Name="MethodWriteFunc" />
-      <Type Name="ModuleCallbackResponse" />
-      <Type Name="ProcessCallback" />
-      <Type Name="ProcessInitFunc" />
-      <Type Name="SniffBufferReadCall" />
-      <Type Name="SniffBufferSeekCall" />
-      <Type Name="SocketCloseFunc" />
-      <Type Name="SocketReadFunc" />
-      <Type Name="SocketWriteFunc" />
-      <Type Name="TransformFunc" />
-      <Type Name="UnixMountCallback" />
       <Type Name="VolumeOpCallback" />
       <Type Name="MimeMonitor" />
     </Namespace>
diff --git a/gnomevfs/Gnomevfs.metadata b/gnomevfs/Gnomevfs.metadata
index 61239c5e9..b10dbe8f5 100644
--- a/gnomevfs/Gnomevfs.metadata
+++ b/gnomevfs/Gnomevfs.metadata
@@ -7,12 +7,26 @@
   <attr path="/api/namespace/alias[@cname='XdgUnicharT']" name="hidden">1</attr>
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncCallback']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncDirectoryLoadCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncFileControlCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncGetFileInfoCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncModuleCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncOpenAsChannelCallback']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncReadCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncSetFileInfoCallback']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncWriteCallback']" />
-  <remove-node path="/api/namespace/callback[@cname='GnomeVFSMethodCreateFunc']" />
-  <remove-node path="/api/namespace/callback[@cname='GnomeVFSMethodOpenFunc']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSAsyncXferProgressCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSDirectoryVisitFunc']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSModuleCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSModuleCallbackResponse']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSMonitorCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSProcessCallback']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSProcessInitFunc']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSSniffBufferReadCall']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSSniffBufferSeekCall']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSSocketCloseFunc']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSSocketReadFunc']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSSocketWriteFunc']" />
+  <remove-node path="/api/namespace/callback[@cname='GnomeVFSUnixMountCallback']" />
   <remove-node path="/api/namespace/callback[@cname='GnomeVFSXferProgressCallback']" />
   <remove-node path="/api/namespace/class[@cname='GnomeVfsAsync_']" />
   <remove-node path="/api/namespace/class[@cname='GnomeVfsDirectory_']" />
@@ -68,7 +82,6 @@
   <attr path="/api/namespace/struct[@cname='GnomeVFSGetFileInfoResult']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSHandle']" name="opaque">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSInetConnection']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GnomeVFSMethod']" name="opaque">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSMimeAction']/field[@cname='action']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSMimeSniffBuffer']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSModuleCallbackAdditionalHeadersIn']" name="hidden">1</attr>
@@ -93,7 +106,6 @@
   <attr path="/api/namespace/struct[@cname='GnomeVFSSocketBuffer']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSSocketImpl']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSToplevelURI']" name="hidden">1</attr>
-  <attr path="/api/namespace/struct[@cname='GnomeVFSTransform']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSURI']" name="name">Uri</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSURI']/method[@name='Dup']" name="name">Clone</attr>
   <attr path="/api/namespace/struct[@cname='GnomeVFSURI']/method[@name='Exists']" name="name">GetExists</attr>
diff --git a/gnomevfs/gnome-vfs-api.raw b/gnomevfs/gnome-vfs-api.raw
index 3a1681353..33e771a6f 100644
--- a/gnomevfs/gnome-vfs-api.raw
+++ b/gnomevfs/gnome-vfs-api.raw
@@ -405,262 +405,6 @@
         <parameter type="gboolean*" name="recurse" />
       </parameters>
     </callback>
-    <callback name="MethodCheckSameFSFunc" cname="GnomeVFSMethodCheckSameFSFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="a" />
-        <parameter type="GnomeVFSURI*" name="b" />
-        <parameter type="gboolean*" name="same_fs_return" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodCloseDirectoryFunc" cname="GnomeVFSMethodCloseDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodCloseFunc" cname="GnomeVFSMethodCloseFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodCreateFunc" cname="GnomeVFSMethodCreateFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle" name="GnomeVFSURI*" />
-        <parameter type="GnomeVFSOpenMode" name="mode" />
-        <parameter type="gboolean" name="exclusive" />
-        <parameter type="guint" name="perm" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodCreateSymbolicLinkFunc" cname="GnomeVFSMethodCreateSymbolicLinkFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="const-gchar*" name="target_reference" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodFileControlFunc" cname="GnomeVFSMethodFileControlFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="const-char*" name="operation" />
-        <parameter type="gpointer" name="operation_data" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodFindDirectoryFunc" cname="GnomeVFSMethodFindDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="find_near_uri" />
-        <parameter type="GnomeVFSFindDirectoryKind" name="kind" />
-        <parameter type="GnomeVFSURI**" name="result_uri" />
-        <parameter type="gboolean" name="create_if_needed" />
-        <parameter type="gboolean" name="find_if_needed" />
-        <parameter type="guint" name="perm" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodGetFileInfoFromHandleFunc" cname="GnomeVFSMethodGetFileInfoFromHandleFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSFileInfo*" name="file_info" />
-        <parameter type="GnomeVFSFileInfoOptions" name="options" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodGetFileInfoFunc" cname="GnomeVFSMethodGetFileInfoFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSFileInfo*" name="file_info" />
-        <parameter type="GnomeVFSFileInfoOptions" name="options" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodInitFunc" cname="GnomeVFSMethodInitFunc">
-      <return-type type="GnomeVFSMethod*" />
-      <parameters>
-        <parameter type="const-char*" name="method_name" />
-        <parameter type="const-char*" name="config_args" />
-      </parameters>
-    </callback>
-    <callback name="MethodIsLocalFunc" cname="GnomeVFSMethodIsLocalFunc">
-      <return-type type="gboolean" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="const-GnomeVFSURI*" name="uri" />
-      </parameters>
-    </callback>
-    <callback name="MethodMakeDirectoryFunc" cname="GnomeVFSMethodMakeDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="guint" name="perm" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodMonitorAddFunc" cname="GnomeVFSMethodMonitorAddFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle**" name="method_handle_return" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSMonitorType" name="monitor_type" />
-      </parameters>
-    </callback>
-    <callback name="MethodMonitorCancelFunc" cname="GnomeVFSMethodMonitorCancelFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="handle" />
-      </parameters>
-    </callback>
-    <callback name="MethodMoveFunc" cname="GnomeVFSMethodMoveFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="old_uri" />
-        <parameter type="GnomeVFSURI*" name="new_uri" />
-        <parameter type="gboolean" name="force_replace" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodOpenDirectoryFunc" cname="GnomeVFSMethodOpenDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle**" name="method_handle" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSFileInfoOptions" name="options" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodOpenFunc" cname="GnomeVFSMethodOpenFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle" name="GnomeVFSURI*" />
-        <parameter type="GnomeVFSOpenMode" name="mode" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodReadDirectoryFunc" cname="GnomeVFSMethodReadDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSFileInfo*" name="file_info" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodReadFunc" cname="GnomeVFSMethodReadFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="gpointer" name="buffer" />
-        <parameter type="GnomeVFSFileSize" name="num_bytes" />
-        <parameter type="GnomeVFSFileSize*" name="bytes_read_return" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodRemoveDirectoryFunc" cname="GnomeVFSMethodRemoveDirectoryFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodSeekFunc" cname="GnomeVFSMethodSeekFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSSeekPosition" name="whence" />
-        <parameter type="GnomeVFSFileOffset" name="offset" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodSetFileInfo" cname="GnomeVFSMethodSetFileInfo">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="a" />
-        <parameter type="const-GnomeVFSFileInfo*" name="info" />
-        <parameter type="GnomeVFSSetFileInfoMask" name="mask" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodShutdownFunc" cname="GnomeVFSMethodShutdownFunc">
-      <return-type type="void" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-      </parameters>
-    </callback>
-    <callback name="MethodTellFunc" cname="GnomeVFSMethodTellFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="GnomeVFSFileOffset*" name="offset_return" />
-      </parameters>
-    </callback>
-    <callback name="MethodTruncateFunc" cname="GnomeVFSMethodTruncateFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSFileSize" name="length" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodTruncateHandleFunc" cname="GnomeVFSMethodTruncateHandleFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="handle" />
-        <parameter type="GnomeVFSFileSize" name="length" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodUnlinkFunc" cname="GnomeVFSMethodUnlinkFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSURI*" name="uri" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="MethodWriteFunc" cname="GnomeVFSMethodWriteFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSMethod*" name="method" />
-        <parameter type="GnomeVFSMethodHandle*" name="method_handle" />
-        <parameter type="gconstpointer" name="buffer" />
-        <parameter type="GnomeVFSFileSize" name="num_bytes" />
-        <parameter type="GnomeVFSFileSize*" name="bytes_written_return" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
     <callback name="ModuleCallback" cname="GnomeVFSModuleCallback">
       <return-type type="void" />
       <parameters>
@@ -742,22 +486,6 @@
         <parameter type="GnomeVFSFileSize*" name="bytes_written" />
       </parameters>
     </callback>
-    <callback name="TransformFunc" cname="GnomeVFSTransformFunc">
-      <return-type type="GnomeVFSResult" />
-      <parameters>
-        <parameter type="GnomeVFSTransform*" name="transform" />
-        <parameter type="const-char*" name="old_uri" />
-        <parameter type="char**" name="new_uri" />
-        <parameter type="GnomeVFSContext*" name="context" />
-      </parameters>
-    </callback>
-    <callback name="TransformInitFunc" cname="GnomeVFSTransformInitFunc">
-      <return-type type="GnomeVFSTransform*" />
-      <parameters>
-        <parameter type="const-char*" name="method_name" />
-        <parameter type="const-char*" name="config_args" />
-      </parameters>
-    </callback>
     <callback name="UnixMountCallback" cname="GnomeVFSUnixMountCallback">
       <return-type type="void" />
       <parameters>
@@ -1221,44 +949,6 @@
       </method>
     </struct>
     <alias name="InodeNumber" cname="GnomeVFSInodeNumber" type="GnomeVFSFileSize" />
-    <struct name="Method" cname="GnomeVFSMethod">
-      <field name="MethodTableSize" cname="method_table_size" type="gsize" />
-      <field name="Open" cname="open" type="GnomeVFSMethodOpenFunc" />
-      <field name="Create" cname="create" type="GnomeVFSMethodCreateFunc" />
-      <field name="Close" cname="close" type="GnomeVFSMethodCloseFunc" />
-      <field name="Read" cname="read" type="GnomeVFSMethodReadFunc" />
-      <field name="Write" cname="write" type="GnomeVFSMethodWriteFunc" />
-      <field name="Seek" cname="seek" type="GnomeVFSMethodSeekFunc" />
-      <field name="Tell" cname="tell" type="GnomeVFSMethodTellFunc" />
-      <field name="TruncateHandle" cname="truncate_handle" type="GnomeVFSMethodTruncateHandleFunc" />
-      <field name="OpenDirectory" cname="open_directory" type="GnomeVFSMethodOpenDirectoryFunc" />
-      <field name="CloseDirectory" cname="close_directory" type="GnomeVFSMethodCloseDirectoryFunc" />
-      <field name="ReadDirectory" cname="read_directory" type="GnomeVFSMethodReadDirectoryFunc" />
-      <field name="GetFileInfo" cname="get_file_info" type="GnomeVFSMethodGetFileInfoFunc" />
-      <field name="GetFileInfoFromHandle" cname="get_file_info_from_handle" type="GnomeVFSMethodGetFileInfoFromHandleFunc" />
-      <field name="IsLocal" cname="is_local" type="GnomeVFSMethodIsLocalFunc" />
-      <field name="MakeDirectory" cname="make_directory" type="GnomeVFSMethodMakeDirectoryFunc" />
-      <field name="RemoveDirectory" cname="remove_directory" type="GnomeVFSMethodRemoveDirectoryFunc" />
-      <field name="Move" cname="move" type="GnomeVFSMethodMoveFunc" />
-      <field name="Unlink" cname="unlink" type="GnomeVFSMethodUnlinkFunc" />
-      <field name="CheckSameFs" cname="check_same_fs" type="GnomeVFSMethodCheckSameFSFunc" />
-      <field name="SetFileInfo" cname="set_file_info" type="GnomeVFSMethodSetFileInfo" />
-      <field name="Truncate" cname="truncate" type="GnomeVFSMethodTruncateFunc" />
-      <field name="FindDirectory" cname="find_directory" type="GnomeVFSMethodFindDirectoryFunc" />
-      <field name="CreateSymbolicLink" cname="create_symbolic_link" type="GnomeVFSMethodCreateSymbolicLinkFunc" />
-      <field name="MonitorAdd" cname="monitor_add" type="GnomeVFSMethodMonitorAddFunc" />
-      <field name="MonitorCancel" cname="monitor_cancel" type="GnomeVFSMethodMonitorCancelFunc" />
-      <field name="FileControl" cname="file_control" type="GnomeVFSMethodFileControlFunc" />
-      <method name="Get" cname="gnome_vfs_method_get" shared="true">
-        <return-type type="GnomeVFSMethod*" />
-        <parameters>
-          <parameter type="const-gchar*" name="name" />
-        </parameters>
-      </method>
-      <method name="Init" cname="gnome_vfs_method_init" shared="true">
-        <return-type type="gboolean" />
-      </method>
-    </struct>
     <alias name="MethodHandle" cname="GnomeVFSMethodHandle" type="gpointer" />
     <struct name="MimeAction" cname="GnomeVFSMimeAction">
       <field name="ActionType" cname="action_type" type="GnomeVFSMimeActionType" />
@@ -1570,15 +1260,6 @@
       <field name="Reserved1" cname="reserved1" type="void*" />
       <field name="Reserved2" cname="reserved2" type="void*" />
     </struct>
-    <struct name="Transform" cname="GnomeVFSTransform">
-      <field name="Transform" cname="transform" type="GnomeVFSTransformFunc" />
-      <method name="Get" cname="gnome_vfs_transform_get" shared="true">
-        <return-type type="GnomeVFSTransform*" />
-        <parameters>
-          <parameter type="const-gchar*" name="name" />
-        </parameters>
-      </method>
-    </struct>
     <struct name="URI" cname="GnomeVFSURI" opaque="true">
       <method name="AppendFileName" cname="gnome_vfs_uri_append_file_name">
         <return-type type="GnomeVFSURI*" />
diff --git a/gnomevfs/gnomevfs-symbols.xml b/gnomevfs/gnomevfs-symbols.xml
index 448b33628..efc09fb7f 100644
--- a/gnomevfs/gnomevfs-symbols.xml
+++ b/gnomevfs/gnomevfs-symbols.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <api>
-  <symbol type="alias" cname="GnomeVFSFileSize" name="long long"/>
+  <symbol type="alias" cname="GnomeVFSFileSize" name="gint64"/>
+  <symbol type="alias" cname="GnomeVFSFileOffset" name="guint64"/>
 </api>
 
diff --git a/sources/gtk-sharp-2.4-sources.xml b/sources/gtk-sharp-2.4-sources.xml
index fac75ad6e..c8310f82f 100644
--- a/sources/gtk-sharp-2.4-sources.xml
+++ b/sources/gtk-sharp-2.4-sources.xml
@@ -121,6 +121,9 @@
     <library name="gnomevfs-2">
       <namespace name="GnomeVFS">
         <directory path="gnome-vfs-2.6.0/libgnomevfs">
+          <exclude>gnome-vfs-file-size.h</exclude>
+          <exclude>gnome-vfs-method.h</exclude>
+          <exclude>gnome-vfs-transform.h</exclude>
           <!-- These files break the parser -->
           <exclude>GNOME_VFS_Daemon-common.c</exclude>
           <exclude>GNOME_VFS_Daemon.h</exclude>
diff --git a/sources/gtk-sharp-2.6-sources.xml b/sources/gtk-sharp-2.6-sources.xml
index 4171f4916..34b957fb8 100644
--- a/sources/gtk-sharp-2.6-sources.xml
+++ b/sources/gtk-sharp-2.6-sources.xml
@@ -127,6 +127,9 @@
     <library name="gnomevfs-2">
       <namespace name="GnomeVFS">
         <directory path="gnome-vfs-2.6.0/libgnomevfs">
+          <exclude>gnome-vfs-file-size.h</exclude>
+          <exclude>gnome-vfs-method.h</exclude>
+          <exclude>gnome-vfs-transform.h</exclude>
           <!-- These files break the parser -->
           <exclude>GNOME_VFS_Daemon-common.c</exclude>
           <exclude>GNOME_VFS_Daemon.h</exclude>