diff --git a/ChangeLog b/ChangeLog
index 3306e9a8b..c11de22a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-11  Todd Berman  <tberman@sevenl.net>
+
+	* gtk/Container.custom:
+	* gtk/CellRenderer.custom:
+	* gnome/CanvasItem.custom: mark Override* private.
+	* doc/en/*/*.xml: update to remove Override* methods.
+
 2004-06-11  Mike Kestner  <mkestner@ximian.com>
 
 	* doc/en/*/*.xml : update to remove Override* methods.
diff --git a/doc/en/Gnome/CanvasItem.xml b/doc/en/Gnome/CanvasItem.xml
index f9e1093de..26ad0a0c6 100644
--- a/doc/en/Gnome/CanvasItem.xml
+++ b/doc/en/Gnome/CanvasItem.xml
@@ -622,81 +622,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OverrideRealize">
-      <MemberSignature Language="C#" Value="protected static void OverrideRealize (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OverridePoint">
-      <MemberSignature Language="C#" Value="protected static void OverridePoint (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OverrideDraw">
-      <MemberSignature Language="C#" Value="protected static void OverrideDraw (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OverrideRender">
-      <MemberSignature Language="C#" Value="protected static void OverrideRender (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OverrideUpdate">
-      <MemberSignature Language="C#" Value="protected static void OverrideUpdate (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="protected CanvasItem ();" />
       <MemberType>Constructor</MemberType>
diff --git a/doc/en/Gtk/CellRenderer.xml b/doc/en/Gtk/CellRenderer.xml
index a24f3fe2e..f77c89c76 100644
--- a/doc/en/Gtk/CellRenderer.xml
+++ b/doc/en/Gtk/CellRenderer.xml
@@ -370,36 +370,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OverrideGetSize">
-      <MemberSignature Language="C#" Value="protected static void OverrideGetSize (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="OverrideRender">
-      <MemberSignature Language="C#" Value="protected static void OverrideRender (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="protected CellRenderer ();" />
       <MemberType>Constructor</MemberType>
@@ -411,21 +381,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OverrideStartEditing">
-      <MemberSignature Language="C#" Value="protected static void OverrideStartEditing (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="GetSize">
       <MemberSignature Language="C#" Value="public virtual void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);" />
       <MemberType>Method</MemberType>
diff --git a/doc/en/Gtk/Container.xml b/doc/en/Gtk/Container.xml
index dcde340a3..a373bb7d9 100644
--- a/doc/en/Gtk/Container.xml
+++ b/doc/en/Gtk/Container.xml
@@ -555,21 +555,6 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="OverrideForall">
-      <MemberSignature Language="C#" Value="protected static void OverrideForall (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="protected Container ();" />
       <MemberType>Constructor</MemberType>
@@ -598,21 +583,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OverrideChildType">
-      <MemberSignature Language="C#" Value="protected static void OverrideChildType (GLib.GType gtype);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="gtype" Type="GLib.GType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="ChildType">
       <MemberSignature Language="C#" Value="public virtual GLib.GType ChildType ();" />
       <MemberType>Method</MemberType>
diff --git a/gnome/CanvasItem.custom b/gnome/CanvasItem.custom
index 60bab70fb..72c262e22 100644
--- a/gnome/CanvasItem.custom
+++ b/gnome/CanvasItem.custom
@@ -73,7 +73,7 @@
                         obj.Realize ();
                 }
 
-                protected static void OverrideRealize (GLib.GType gtype)
+                static void OverrideRealize (GLib.GType gtype)
                 {
                         if (RealizeCallback == null)
                                 RealizeCallback = new RealizeDelegate (Realize_cb);
@@ -105,7 +105,7 @@
 			return result;
                 }
 
-                protected static void OverridePoint (GLib.GType gtype)
+                static void OverridePoint (GLib.GType gtype)
                 {
                         if (PointCallback == null)
                                 PointCallback = new PointDelegate (Point_cb);
@@ -138,7 +138,7 @@
                         obj.Draw (drawable, x, y, width, height);
                 }
 
-                protected static void OverrideDraw (GLib.GType gtype)
+                static void OverrideDraw (GLib.GType gtype)
                 {
                         if (DrawCallback == null)
                                 DrawCallback = new DrawDelegate (Draw_cb);
@@ -168,7 +168,7 @@
                 }
 
 		[GLib.DefaultSignalHandler (Type=typeof(Gnome.CanvasItem), ConnectionMethod="OverrideRender")]
-                protected static void OverrideRender (GLib.GType gtype)
+                static void OverrideRender (GLib.GType gtype)
                 {
                         if (RenderCallback == null)
                                 RenderCallback = new RenderDelegate (Render_cb);
@@ -203,7 +203,7 @@
                         obj.Update (affine, ref clip_path, flags);
                 }
 
-                protected static void OverrideUpdate (GLib.GType gtype)
+                static void OverrideUpdate (GLib.GType gtype)
                 {
                         if (UpdateCallback == null)
                                 UpdateCallback = new UpdateDelegate (Update_cb);
diff --git a/gtk/CellRenderer.custom b/gtk/CellRenderer.custom
index 3e70aebf4..21432011a 100644
--- a/gtk/CellRenderer.custom
+++ b/gtk/CellRenderer.custom
@@ -36,7 +36,7 @@
 				Marshal.WriteInt32 (height, d);
 		}
 
-		protected static void OverrideGetSize (GLib.GType gtype)
+		static void OverrideGetSize (GLib.GType gtype)
 		{
 			if (GetSizeCallback == null)
 				GetSizeCallback = new GetSizeDelegate (GetSize_cb);
@@ -67,7 +67,7 @@
 			obj.Render (wind, widg, background_area, cell_area, expose_area, flags);
 		}
 
-		protected static void OverrideRender (GLib.GType gtype)
+		static void OverrideRender (GLib.GType gtype)
 		{
 			if (RenderCallback == null)
 				RenderCallback = new RenderDelegate (Render_cb);
@@ -98,7 +98,7 @@
 			return retval.Handle;
 		}
 
-		protected static void OverrideStartEditing (GLib.GType gtype)
+		static void OverrideStartEditing (GLib.GType gtype)
 		{
 			if (StartEditingCallback == null)
 				StartEditingCallback = new StartEditingDelegate (StartEditing_cb);
diff --git a/gtk/Container.custom b/gtk/Container.custom
index 3ed64b7d4..06aba7b4d 100644
--- a/gtk/Container.custom
+++ b/gtk/Container.custom
@@ -97,7 +97,7 @@ static void Forall_cb (IntPtr container, bool include_internals, IntPtr cb, IntP
 	obj.ForAll (include_internals, invoker);
 }
 
-protected static void OverrideForall (GLib.GType gtype)
+static void OverrideForall (GLib.GType gtype)
 {
 	if (ForallCallback == null)
 		ForallCallback = new ForallDelegate (Forall_cb);
@@ -127,7 +127,7 @@ static IntPtr ChildType_cb (IntPtr raw)
 	return gtype.Val;
 }
 
-protected static void OverrideChildType (GLib.GType gtype)
+static void OverrideChildType (GLib.GType gtype)
 {
 	if (ChildTypeCallback == null)
 		ChildTypeCallback = new ChildTypeDelegate (ChildType_cb);