[System.Web] Public interfaces from reference source

58 files changed, 60 insertions, 2395 deletions

diff --git a/mcs/class/System.Web/System.Web.Caching/IOutputCacheEntry.cs b/mcs/class/System.Web/System.Web.Caching/IOutputCacheEntry.cs
deleted file mode 100644
index 1f788edc024..00000000000
--- a/mcs/class/System.Web/System.Web.Caching/IOutputCacheEntry.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Authors:
-//   Marek Habersack <mhabersack@novell.com>
-//
-// (C) 2010 Novell, Inc (http://novell.com/)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections.Generic;
-
-namespace System.Web.Caching
-{
-	public interface IOutputCacheEntry
-	{
-		List<HeaderElement> HeaderElements { get; set; }
-		List<ResponseElement> ResponseElements { get; set; }
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPath.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPath.cs
deleted file mode 100644
index e81a4e5b170..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPath.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.IConfigMapPath
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2007 Novell, Inc
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-
-namespace System.Web.Configuration
-{
-	public interface IConfigMapPath
-	{
-		string GetAppPathForPath (string siteID, string path);
-		void GetDefaultSiteNameAndID (out string siteName, out string siteID);
-		string GetMachineConfigFilename ();
-		void GetPathConfigFilename (string siteID, string path, out string directory, out string baseName);
-		string GetRootWebConfigFilename ();
-		string MapPath (string siteID, string path);
-		void ResolveSiteArgument (string siteArgument, out string siteName, out string siteID);
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPathFactory.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPathFactory.cs
deleted file mode 100644
index 3220f0aab2b..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/IConfigMapPathFactory.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.HttpCacheVaryByContentEncodings
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2007 Novell, Inc
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections.Generic;
-using System.Security.Permissions;
-
-namespace System.Web.Configuration
-{
-	public interface IConfigMapPathFactory
-	{
-		IConfigMapPath Create (string virtualPath, string physicalPath);
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/IRemoteWebConfigurationHostServer.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/IRemoteWebConfigurationHostServer.cs
deleted file mode 100644
index f47b0fd0186..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/IRemoteWebConfigurationHostServer.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// System.Web.Configuration.IRemoteWebConfigurationHostServer.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-using System.Runtime.InteropServices;
-
-namespace System.Web.Configuration
-{
-	[ComVisibleAttribute (true)]
-	[GuidAttribute ("A99B591A-23C6-4238-8452-C7B0E895063D")]
-	public interface IRemoteWebConfigurationHostServer
-	{
-		string DoEncryptOrDecrypt (
-		    bool do_encrypt, string xml_string, string protection_provider_name,
-		    string protection_provider_type, string [] params_keys, string [] param_values);
-
-		byte [] GetData (string filename, bool getReadTimeOnly, out long readTime);
-
-		void GetFileDetails (string name, out bool exists, out long size, out long create_data, out long last_write_date);
-
-		string GetFilePaths (int webLevel, string path, string site, string locationSubPath);
-
-		void WriteData (string fileName, string templateFileName, byte [] data, ref long readTime);
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs
deleted file mode 100644
index ae6eb685c99..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// System.Web.IConfigMapPath
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2009 Novell, Inc
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Security.Permissions;
-using System.Web.Configuration;
-
-namespace System.Web.Hosting
-{
-	[AspNetHostingPermissionAttribute(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermissionAttribute(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public interface IApplicationHost
-	{
-		IConfigMapPathFactory GetConfigMapPathFactory ();
-		IntPtr GetConfigToken ();
-		string GetPhysicalPath ();
-		string GetSiteID ();
-		string GetSiteName ();
-		string GetVirtualPath ();
-		void MessageReceived ();
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.Hosting/IRegisteredObject.cs b/mcs/class/System.Web/System.Web.Hosting/IRegisteredObject.cs
deleted file mode 100644
index 4a309494b98..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/IRegisteredObject.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.Hosting.IRegisteredObject.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace System.Web.Hosting
-{
-        public interface IRegisteredObject
-        {
-                void Stop (bool immediate);
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/IReadOnlySessionState.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/IReadOnlySessionState.cs
deleted file mode 100644
index 5d71a0d86b6..00000000000
--- a/mcs/class/System.Web/System.Web.SessionState_2.0/IReadOnlySessionState.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.SessionState.IReadOnlySessionState
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2002 Ximian, Inc (http://www.ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.SessionState {
-public interface IReadOnlySessionState : IRequiresSessionState
-{
-}
-}
-
diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/IRequiresSessionState.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/IRequiresSessionState.cs
deleted file mode 100644
index 4d0264d1982..00000000000
--- a/mcs/class/System.Web/System.Web.SessionState_2.0/IRequiresSessionState.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.SessionState.IRequiresSessionState
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2002 Ximian, Inc (http://www.ximian.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.SessionState {
-public interface IRequiresSessionState
-{
-}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs
deleted file mode 100644
index bbb78fa03a3..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.ITrackingPersonalizable.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System.Collections.Specialized;
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface ITrackingPersonalizable
-	{
-		void BeginLoad ();
-		void BeginSave ();
-		void EndLoad ();
-		void EndSave ();
-		
-		bool TracksChanges { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs
deleted file mode 100644
index bae77eff996..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.ITransformerConfigurationControl.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface ITransformerConfigurationControl
-	{
-		event EventHandler Cancelled;
-		event EventHandler Succeeded;
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs
deleted file mode 100644
index 861d633cad6..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IVersioningPersonalizable.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System.Collections;
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface IVersioningPersonalizable
-	{
-		void Load (IDictionary unknownProperties);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebEditable.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebEditable.cs
deleted file mode 100644
index f0c2f51dd4c..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebEditable.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebEditable.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface IWebEditable
-	{
-		EditorPartCollection CreateEditorParts ();
-		
-		object WebBrowsableObject { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPart.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPart.cs
deleted file mode 100644
index 5ccf191cf9b..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPart.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPart.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface IWebPart
-	{
-		string CatalogIconImageUrl { get; set; }
-		string Description { get; set; }
-		string Subtitle { get; }
-		string Title { get; set; }
-		string TitleIconImageUrl { get; set; }
-		string TitleUrl { get; set; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs
deleted file mode 100644
index d9b7ca9fe52..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPartHttpHandler.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface IWebPartHttpHandler
-	{
-		PersonalizationScope DesiredScope { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartParameters.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartParameters.cs
deleted file mode 100644
index 739c9751c93..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartParameters.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPartParameters.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System.ComponentModel;
-using System.Collections;
-
-namespace System.Web.UI.WebControls.WebParts
-{
-	public interface IWebPartParameters
-	{
-		void SetConsumerSchema (PropertyDescriptorCollection schema);
-		
-		void GetParametersData (ParametersCallback callback);
-		PropertyDescriptorCollection Schema { get; }
-	}
-
-	public delegate void ParametersCallback (IDictionary parametersData);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IButtonControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IButtonControl.cs
deleted file mode 100644
index 6d591af1929..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/IButtonControl.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// System.Web.UI.WebControls.IButtonControl.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI.WebControls
-{
-	public interface IButtonControl
-	{
-		bool CausesValidation { get; set; }
-		string CommandArgument { get; set; }
-		string CommandName { get; set; }
-		string PostBackUrl { get; set; }
-		string Text { get; set; }
-		string ValidationGroup { get; set; }
-
-		event EventHandler Click;
-		event CommandEventHandler Command;
-	}
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ICallbackContainer.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ICallbackContainer.cs
deleted file mode 100644
index ea46c05957c..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ICallbackContainer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.ICallbackContainer.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI.WebControls
-{
-	public interface ICallbackContainer
-	{
-		string GetCallbackScript (IButtonControl control, string argument);
-	}
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ICompositeControlDesignerAccessor.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ICompositeControlDesignerAccessor.cs
deleted file mode 100644
index a8317edb0ed..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ICompositeControlDesignerAccessor.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls. ICompositeControlDesignerAccessor.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace System.Web.UI.WebControls
-{
-	public interface ICompositeControlDesignerAccessor
-	{
-		void RecreateChildControls ();
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundControl.cs
deleted file mode 100644
index 2504d41ee18..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundControl.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.IDataBoundControl
-//
-// Authors:
-// 	Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.ComponentModel;
-using System.Collections;
-using System.Security.Permissions;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI.WebControls
-{
-	public interface IDataBoundControl
-	{
-		string[] DataKeyNames { get; set; }
-		string DataMember { get; set; }
-		object DataSource { get; set; }
-		string DataSourceID { get; set; }
-		IDataSource DataSourceObject { get; }
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundListControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundListControl.cs
deleted file mode 100644
index 4982e2da294..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundListControl.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.IDataBoundListControl
-//
-// Authors:
-// 	Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2009 Novell, Inc (http://novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.ComponentModel;
-using System.Collections;
-using System.Security.Permissions;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI.WebControls
-{
-	public interface IDataBoundListControl : IDataBoundControl
-	{
-		string[] ClientIDRowSuffix { get; set; }
-		DataKeyArray DataKeys { get; }
-		bool EnablePersistedSelection { get; set; }
-		DataKey SelectedDataKey { get; }
-		int SelectedIndex { get; set; }
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs
deleted file mode 100644
index 3348d9ad637..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 
-// System.Web.UI.WebControls.IRepeatInfoUser
-//
-// Author:
-//        Ben Maurer <bmaurer@novell.com>
-//
-// (c) 2005 Novell
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.UI.WebControls {
-	
-	public interface IRepeatInfoUser {
-	
-		Style GetItemStyle (ListItemType itemType, int repeatIndex);
-		void RenderItem (WebControls.ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer);
-	
-		bool HasFooter {
-			get;
-		}
-		bool HasHeader {
-			get;
-		}
-		bool HasSeparators {
-			get;
-		}
-		int RepeatedItemCount {
-			get;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs b/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs
deleted file mode 100644
index 1b67f20f9b4..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.IAttributeAccessor.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface IAttributeAccessor
-        {
-                string GetAttribute(string key);
-                void SetAttribute(string key, string value);
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IAutoFieldGenerator.cs b/mcs/class/System.Web/System.Web.UI/IAutoFieldGenerator.cs
deleted file mode 100644
index 22708f4e668..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IAutoFieldGenerator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.IPersistedSelector.cs
-//
-// Author:
-//      Atsushi Enomoto  <atsushi@ximian.com>
-//
-// (C) 2008-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Security.Permissions;
-using System.Web;
-
-namespace System.Web.UI
-{
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public interface IAutoFieldGenerator
-	{
-		ICollection GenerateFields (Control control);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IBindableControl.cs b/mcs/class/System.Web/System.Web.UI/IBindableControl.cs
deleted file mode 100644
index 6135da9ca4d..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IBindableControl.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.IBindableControl.cs
-//
-// Authors:
-//      Atsushi Enomoto  <atsushi@ximian.com>
-//
-// (C) 2008-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Specialized;
-using System.Security.Permissions;
-using System.Web;
-
-namespace System.Web.UI
-{
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public interface IBindableControl
-	{
-		void ExtractValues (IOrderedDictionary dictionary);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IBindableTemplate.cs b/mcs/class/System.Web/System.Web.UI/IBindableTemplate.cs
deleted file mode 100644
index 0fbb1fc6b1f..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IBindableTemplate.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IBindableTemplate.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Specialized;
-
-namespace System.Web.UI
-{
-	public interface IBindableTemplate: ITemplate
-	{
-		IOrderedDictionary ExtractValues (Control control);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs b/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs
deleted file mode 100644
index cfd9a1dd534..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.IControlBuilderAccessor.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IControlBuilderAccessor
-	{
-		ControlBuilder ControlBuilder { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IControlDesignerAccessor.cs b/mcs/class/System.Web/System.Web.UI/IControlDesignerAccessor.cs
deleted file mode 100644
index 51f1152594a..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IControlDesignerAccessor.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.IControlDesignerAccessor.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace System.Web.UI
-{
-	public interface IControlDesignerAccessor
-	{
-
-		IDictionary GetDesignModeState ();
-		void SetDesignModeState (IDictionary designData);
-		void SetOwnerControl (Control control);
-		
-		IDictionary UserData { get; }
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs b/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs
deleted file mode 100644
index 83cb04739ad..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.IDataBindingsAccessor.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface IDataBindingsAccessor
-        {
-                DataBindingCollection DataBindings {get;}
-                bool HasDataBindings {get;}
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IDataItemContainer.cs b/mcs/class/System.Web/System.Web.UI/IDataItemContainer.cs
deleted file mode 100644
index ba9e3abd62d..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IDataItemContainer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.IDataItemContainer.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IDataItemContainer: INamingContainer
-	{
-		object DataItem { get; }
-		int DataItemIndex { get; }
-		int DisplayIndex { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IDataKeysControl.cs b/mcs/class/System.Web/System.Web.UI/IDataKeysControl.cs
deleted file mode 100644
index d819c5279d1..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IDataKeysControl.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Authors:
-//   Marek Habersack <mhabersack@novell.com>
-//
-// (C) 2010 Novell, Inc. (http://novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI
-{
-	public interface IDataKeysControl
-	{
-		string[] ClientIDRowSuffix { get; }
-		DataKeyArray ClientIDRowSuffixDataKeys { get; }
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IDataSource.cs b/mcs/class/System.Web/System.Web.UI/IDataSource.cs
deleted file mode 100644
index 33a21d318fc..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IDataSource.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.IDataSource
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text;
-
-namespace System.Web.UI {
-	public interface IDataSource {
-		event EventHandler DataSourceChanged;
-		DataSourceView GetView (string viewName);
-		ICollection GetViewNames ();
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IDataSourceViewSchemaAccessor.cs b/mcs/class/System.Web/System.Web.UI/IDataSourceViewSchemaAccessor.cs
deleted file mode 100644
index 63d4f2ea6ee..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IDataSourceViewSchemaAccessor.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.IDataSourceViewSchemaAccessor.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IDataSourceViewSchemaAccessor
-	{
-		object DataSourceViewSchema { get; set; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IExpressionsAccessor.cs b/mcs/class/System.Web/System.Web.UI/IExpressionsAccessor.cs
deleted file mode 100644
index 22f497d7a30..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IExpressionsAccessor.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IExpressionsAccessor.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IExpressionsAccessor
-	{
-		ExpressionBindingCollection Expressions { get; }
-		bool HasExpressions { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IFilterResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IFilterResolutionService.cs
deleted file mode 100644
index a6111e5a3ea..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IFilterResolutionService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IFilterResolutionService.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IFilterResolutionService
-	{
-		int CompareFilters (string filter1, string filter2);
-		bool EvaluateFilter (string filterName);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs b/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs
deleted file mode 100644
index 5416a4cb5fb..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.IHierarchicalDataSource
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text;
-
-namespace System.Web.UI {
-	public interface IHierarchicalDataSource {
-		event EventHandler DataSourceChanged;
-		HierarchicalDataSourceView GetHierarchicalView (string viewPath);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs b/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs
deleted file mode 100644
index ca3f1a53413..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.IHierarchicalEnumerable
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-
-namespace System.Web.UI {
-	public interface IHierarchicalEnumerable : IEnumerable {
-		IHierarchyData GetHierarchyData (object enumeratedItem);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs b/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs
deleted file mode 100644
index 800e7324684..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.IHierarchyData
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.UI {
-	public interface IHierarchyData {
-		IHierarchicalEnumerable GetChildren ();
-		IHierarchyData GetParent ();
-		bool HasChildren { get; }
-		object Item { get; }
-		string Path { get; }
-		string Type { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/INamingContainer.cs b/mcs/class/System.Web/System.Web.UI/INamingContainer.cs
deleted file mode 100644
index 62cf0654e63..00000000000
--- a/mcs/class/System.Web/System.Web.UI/INamingContainer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.INamingContainer.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface INamingContainer
-        {
-		}
-}
diff --git a/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs b/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs
deleted file mode 100644
index d48d5952084..00000000000
--- a/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.INavigateUIData
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.UI 
-{
-	public interface INavigateUIData {
-		string Name { get; }
-		string NavigateUrl { get; }
-		string Value { get; }	 
-		string Description { get; }
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/INonBindingContainer.cs b/mcs/class/System.Web/System.Web.UI/INonBindingContainer.cs
deleted file mode 100644
index 5f428e58c6a..00000000000
--- a/mcs/class/System.Web/System.Web.UI/INonBindingContainer.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// System.Web.UI.INonBindingContainer
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2008-2010 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Web.UI 
-{
-	// Apparently this attribute is used in place of our BINDING_CONTAINER control mask bit,
-	// which makes sense as in certain scenarios (e.g. TemplateControlAttribute naming a
-	// container type which cannot be used for two-way binding) the check must be made on type,
-	// not on object.
-	//
-	// This interface is briefly mentioned in:
-	//  http://www.developmentnow.com/g/10_2006_6_0_0_776419/DataBinding-to-SubProperties.htm
-	//
-	// For a sample of why this is needed, see:
-	//
-	//  http://msdn.microsoft.com/en-us/library/system.web.ui.webcontrols.templatepagerfield.pagertemplate.aspx
-	//  The C# code on the above page won't work without this interface being implemented and
-	//  used in ControlBuilder.BindingContainerType. The reason why the sample wouldn't work is
-	//  that the TemplatePagerField.PagerTemplate property carries a custom TemplateContainer
-	//  (typeof (DataPagerFieldItem)) attribute and, without INonBindingContainer interface
-	//  attached to DataPagerFieldItem, mono would generate code with the Container and
-	//  BindingContainer referring to DataPagerFieldItem. In such case, attempting to access
-	//  DataPager properties would obviously fail. Looking at the MS.NET generated code,
-	//  Container and BindingContainer are of the DataPager type in this instance.
-	//
-	internal interface INonBindingContainer
-	{
-	}
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs b/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs
deleted file mode 100644
index f49d8338393..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IParserAccessor.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface IParserAccessor
-        {
-                void AddParsedSubObject(object obj);
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs b/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs
deleted file mode 100644
index 4b3ff911600..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.IPostBackDataHandler.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Collections.Specialized;
-
-namespace System.Web.UI
-{
-        public interface IPostBackDataHandler
-        {
-                bool LoadPostData(string postDataKey, NameValueCollection postCollection);
-                void RaisePostDataChangedEvent();
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IResourceUrlGenerator.cs b/mcs/class/System.Web/System.Web.UI/IResourceUrlGenerator.cs
deleted file mode 100644
index 496cc9992b5..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IResourceUrlGenerator.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.IResourceUrlGenerator.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IResourceUrlGenerator
-	{
-		string GetResourceUrl (Type type, string resource);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IStateFormatter.cs b/mcs/class/System.Web/System.Web.UI/IStateFormatter.cs
deleted file mode 100644
index 10378d34b8e..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IStateFormatter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.IStateFormatter.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace System.Web.UI
-{
-	public interface IStateFormatter
-	{
-		object Deserialize (string serializationState);
-		string Serialize (object state);
-	}
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI/IStateManager.cs b/mcs/class/System.Web/System.Web.UI/IStateManager.cs
deleted file mode 100644
index 64a189428d4..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IStateManager.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.UI.IStateManager.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface IStateManager
-        {
-                void LoadViewState(object state);
-                object SaveViewState();
-                void TrackViewState();
-        	    bool IsTrackingViewState { get; }
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IStyleSheet.cs b/mcs/class/System.Web/System.Web.UI/IStyleSheet.cs
deleted file mode 100644
index dc1256c9595..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IStyleSheet.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.IStyleSheet.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI
-{
-	public interface IStyleSheet
-	{
-		void CreateStyleRule (Style style, IUrlResolutionService urlResolver, string selection);
-		void RegisterStyle (Style style, IUrlResolutionService urlResolver);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/ITemplate.cs b/mcs/class/System.Web/System.Web.UI/ITemplate.cs
deleted file mode 100644
index 9ebb6a470ee..00000000000
--- a/mcs/class/System.Web/System.Web.UI/ITemplate.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.ITemplate.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface ITemplate
-        {
-                void InstantiateIn(Control container);
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IUrlResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IUrlResolutionService.cs
deleted file mode 100644
index 8b01605206b..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IUrlResolutionService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IUrlResolutionService.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace System.Web.UI
-{
-	public interface IUrlResolutionService
-	{
-		string ResolveClientUrl (string url);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IUserControlDesignerAccessor.cs b/mcs/class/System.Web/System.Web.UI/IUserControlDesignerAccessor.cs
deleted file mode 100644
index 064d994dd0f..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IUserControlDesignerAccessor.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.IUserControlDesignerAccessor.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-// (C) 2003 Andreas Nahr
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.UI
-{
-	public interface IUserControlDesignerAccessor
-        {
-                string InnerText { get; set; }
-		string TagName { get; set; }
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IUserControlTypeResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IUserControlTypeResolutionService.cs
deleted file mode 100644
index 3629bde724b..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IUserControlTypeResolutionService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IUserControlTypeResolutionService.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace System.Web.UI
-{
-	public interface IUserControlTypeResolutionService
-	{
-		Type GetType (string prefixTag, string tagName);
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IValidator.cs b/mcs/class/System.Web/System.Web.UI/IValidator.cs
deleted file mode 100644
index 60aed884c7c..00000000000
--- a/mcs/class/System.Web/System.Web.UI/IValidator.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.IValidator.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-
-namespace System.Web.UI
-{
-        public interface IValidator
-        {
-                void Validate();
-                string ErrorMessage {get; set;}
-                bool IsValid {get; set;}
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Util/IWebObjectFactory.cs b/mcs/class/System.Web/System.Web.Util/IWebObjectFactory.cs
deleted file mode 100644
index 890d1d5d404..00000000000
--- a/mcs/class/System.Web/System.Web.Util/IWebObjectFactory.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Util.IWebObjectFactory interface
-//
-// Author:
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-namespace System.Web.Util {
-
-	public interface IWebObjectFactory {
-
-		object CreateInstance ();
-	}
-}
-
diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index f3fcb143d94..92993794032 100644
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -195,9 +195,9 @@ System.Web.Configuration_2.0/HttpModuleActionCollection.cs
 System.Web.Configuration_2.0/HttpModulesSection.cs
 System.Web.Configuration_2.0/HttpRuntimeSection.cs
 System.Web.Configuration_2.0/IdentitySection.cs
-System.Web.Configuration_2.0/IConfigMapPath.cs
-System.Web.Configuration_2.0/IConfigMapPathFactory.cs
-System.Web.Configuration_2.0/IRemoteWebConfigurationHostServer.cs
+../../../external/referencesource/System.Web/Configuration/IConfigMapPath.cs
+../../../external/referencesource/System.Web/Configuration/IConfigMapPathFactory.cs
+../../../external/referencesource/System.Web/Configuration/IRemoteWebConfigurationHostServer.cs
 System.Web.Configuration_2.0/LowerCaseStringConverter.cs
 System.Web.Configuration_2.0/LruCache.cs
 System.Web.Configuration_2.0/MachineKeyRegistryStorage.cs
@@ -295,10 +295,10 @@ System.Web.Hosting/DefaultVirtualFile.cs
 System.Web.Hosting/DefaultVirtualPathProvider.cs
 System.Web.Hosting/HostingEnvironment.cs
 System.Web.Hosting/IAppDomainFactory.cs
-System.Web.Hosting/IApplicationHost.cs
+../../../external/referencesource/System.Web/Hosting/IApplicationHost.cs
 System.Web.Hosting/IAppManagerAppDomainFactory.cs
 System.Web.Hosting/IISAPIRuntime.cs
-System.Web.Hosting/IRegisteredObject.cs
+../../../external/referencesource/System.Web/Hosting/IRegisteredObject.cs
 System.Web.Hosting/ISAPIRuntime.cs
 System.Web.Hosting/SimpleWorkerRequest.cs
 System.Web.Hosting/VirtualDirectory.cs
@@ -351,11 +351,11 @@ System.Web/HttpValidationStatus.cs
 System.Web/HttpWorkerRequest.cs
 System.Web/HttpWriter.cs
 System.Web/IntPtrStream.cs
-System.Web/IHttpAsyncHandler.cs
-System.Web/IHttpHandler.cs
-System.Web/IHttpHandlerFactory.cs
+../../../external/referencesource/System.Web/IHttpAsyncHandler.cs
+../../../external/referencesource/System.Web/IHttpHandler.cs
+../../../external/referencesource/System.Web/IHttpHandlerFactory.cs
 System.Web/IHttpMapPath.cs
-System.Web/IHttpModule.cs
+../../../external/referencesource/System.Web/IHttpModule.cs
 System.Web/IisTraceListener.cs
 System.Web/IPartitionResolver.cs
 System.Web/InputFilterStream.cs
@@ -465,8 +465,8 @@ System.Web/ServerVariablesCollection.cs
 System.Web.SessionState_2.0/HttpSessionStateContainer.cs
 System.Web.SessionState_2.0/HttpSessionState.cs
 System.Web.SessionState_2.0/IHttpSessionState.cs
-System.Web.SessionState_2.0/IReadOnlySessionState.cs
-System.Web.SessionState_2.0/IRequiresSessionState.cs
+../../../external/referencesource/System.Web/State/IReadOnlySessionState.cs
+../../../external/referencesource/System.Web/State/IRequiresSessionState.cs
 System.Web.SessionState_2.0/ISessionIDManager.cs
 System.Web.SessionState_2.0/ISessionStateItemCollection.cs
 System.Web.SessionState_2.0/IStateRuntime.cs
@@ -606,48 +606,50 @@ System.Web.UI.HtmlControls/HtmlTitle.cs
 System.Web.UI/HtmlTextWriter.cs
 ../../../external/referencesource/System.Web/UI/HtmlTextWriterStyle.cs
 ../../../external/referencesource/System.Web/UI/HtmlTextWriterTag.cs
-System.Web.UI/IAttributeAccessor.cs
-System.Web.UI/IAutoFieldGenerator.cs
-System.Web.UI/IBindableControl.cs
-System.Web.UI/IBindableTemplate.cs
+../../../external/referencesource/System.Web/UI/IAttributeAccessor.cs
+../../../external/referencesource/System.Web/UI/IAutoFieldGenerator.cs
+../../../external/referencesource/System.Web/UI/IBindableControl.cs
+../../../external/referencesource/System.Web/UI/IBindableTemplate.cs
 ../../../external/referencesource/System.Web/UI/ICallbackEventHandler.cs
 System.Web.UI/ICheckBoxControl.cs
-System.Web.UI/IControlBuilderAccessor.cs
-System.Web.UI/IControlDesignerAccessor.cs
-System.Web.UI/IDataBindingsAccessor.cs
-System.Web.UI/IDataItemContainer.cs
-System.Web.UI/IDataSource.cs
-System.Web.UI/IDataSourceViewSchemaAccessor.cs
+../../../external/referencesource/System.Web/UI/IControlBuilderAccessor.cs
+../../../external/referencesource/System.Web/UI/IControlDesignerAccessor.cs
+../../../external/referencesource/System.Web/UI/IDataBindingsAccessor.cs
+../../../external/referencesource/System.Web/UI/IDataItemContainer.cs
+../../../external/referencesource/System.Web/UI/IDataSource.cs
+../../../external/referencesource/System.Web/UI/IDataSourceViewSchemaAccessor.cs
 System.Web.UI/IDReferencePropertyAttribute.cs
 System.Web.UI/IEditableTextControl.cs
-System.Web.UI/IExpressionsAccessor.cs
-System.Web.UI/IFilterResolutionService.cs
+../../../external/referencesource/System.Web/UI/IExpressionsAccessor.cs
+../../../external/referencesource/System.Web/UI/IFilterResolutionService.cs
 System.Web.UI/IgnoreUnknownContentAttribute.cs
-System.Web.UI/IHierarchicalDataSource.cs
-System.Web.UI/IHierarchicalEnumerable.cs
-System.Web.UI/IHierarchyData.cs
+../../../external/referencesource/System.Web/UI/IHierarchicalDataSource.cs
+../../../external/referencesource/System.Web/UI/IHierarchicalEnumerable.cs
+../../../external/referencesource/System.Web/UI/IHierarchyData.cs
 System.Web.UI/ImageClickEventArgs.cs
 ../../../external/referencesource/System.Web/UI/ImageClickEventHandler.cs
 System.Web.UI/IndexedString.cs
-System.Web.UI/INamingContainer.cs
-System.Web.UI/INonBindingContainer.cs
-System.Web.UI/INavigateUIData.cs
-System.Web.UI/IParserAccessor.cs
-System.Web.UI/IPostBackDataHandler.cs
+../../../external/referencesource/System.Web/UI/INamingContainer.cs
+../../../external/referencesource/System.Web/UI/INonBindingContainer.cs
+../../../external/referencesource/System.Web/UI/INavigateUIData.cs
+../../../external/referencesource/System.Web/UI/IParserAccessor.cs
+../../../external/referencesource/System.Web/UI/IPostBackDataHandler.cs
 ../../../external/referencesource/System.Web/UI/IPostBackEventHandler.cs
-System.Web.UI/IResourceUrlGenerator.cs
-System.Web.UI/IStateFormatter.cs
-System.Web.UI/IStateManager.cs
+../../../external/referencesource/System.Web/UI/IResourceUrlGenerator.cs
+../../../external/referencesource/System.Web/UI/IStateFormatter.cs
+../../../external/referencesource/System.Web/UI/IStateManager.cs
 System.Web.UI/IScriptManager.cs
-System.Web.UI/IStyleSheet.cs
+../../../external/referencesource/System.Web/UI/IStyleSheet.cs
+../../../external/referencesource/System.Web/UI/IScriptResourceDefinition.cs
+../../../external/referencesource/System.Web/UI/IScriptResourceMapping.cs
 System.Web.UI/ITagNameToTypeMapper.cs
-System.Web.UI/ITemplate.cs
+../../../external/referencesource/System.Web/UI/ITemplate.cs
 System.Web.UI/ITextControl.cs
 ../../../external/referencesource/System.Web/UI/IThemeResolutionService.cs
-System.Web.UI/IUrlResolutionService.cs
-System.Web.UI/IUserControlDesignerAccessor.cs
-System.Web.UI/IUserControlTypeResolutionService.cs
-System.Web.UI/IValidator.cs
+../../../external/referencesource/System.Web/UI/IUrlResolutionService.cs
+../../../external/referencesource/System.Web/UI/IUserControlDesignerAccessor.cs
+../../../external/referencesource/System.Web/UI/IUserControlTypeResolutionService.cs
+../../../external/referencesource/System.Web/UI/IValidator.cs
 System.Web.UI/ListSourceHelper.cs
 System.Web.UI/LiteralControl.cs
 System.Web.UI/LosFormatter.cs
@@ -930,9 +932,9 @@ System.Web.UI.WebControls/HyperLinkColumn.cs
 System.Web.UI.WebControls/HyperLinkControlBuilder.cs
 System.Web.UI.WebControls/HyperLink.cs
 System.Web.UI.WebControls/HyperLinkField.cs
-System.Web.UI.WebControls/IButtonControl.cs
-System.Web.UI.WebControls/ICallbackContainer.cs
-System.Web.UI.WebControls/ICompositeControlDesignerAccessor.cs
+../../../external/referencesource/System.Web/UI/WebControls/IButtonControl.cs
+../../../external/referencesource/System.Web/UI/WebControls/ICallbackContainer.cs
+../../../external/referencesource/System.Web/UI/WebControls/ICompositeControlDesignerAccessor.cs
 ../../../external/referencesource/System.Web/UI/WebControls/ImageAlign.cs
 System.Web.UI.WebControls/ImageButton.cs
 System.Web.UI.WebControls/Image.cs
@@ -943,7 +945,7 @@ System.Web.UI.WebControls/ImageMap.cs
 System.Web.UI.WebControls/IMenuRenderer.cs
 ../../../external/referencesource/System.Web/UI/WebControls/IPersistedSelector.cs
 System.Web.UI.WebControls/IPostBackContainer.cs
-System.Web.UI.WebControls/IRepeatInfoUser.cs
+../../../external/referencesource/System.Web/UI/WebControls/IRepeatInfoUser.cs
 System.Web.UI.WebControls/LabelControlBuilder.cs
 System.Web.UI.WebControls/Label.cs
 System.Web.UI.WebControls/LinkButtonControlBuilder.cs
@@ -1131,18 +1133,19 @@ System.Web.UI.WebControls.WebParts/ConsumerConnectionPoint.cs
 System.Web.UI.WebControls.WebParts/EditorPart.cs
 System.Web.UI.WebControls.WebParts/EditorPartCollection.cs
 System.Web.UI.WebControls.WebParts/IPersonalizable.cs
-System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs
-System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs
-System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs
+../../../external/referencesource/System.Web/UI/WebParts/ITrackingPersonalizable.cs
+../../../external/referencesource/System.Web/UI/WebParts/ITransformerConfigurationControl.cs
+../../../external/referencesource/System.Web/UI/WebParts/IVersioningPersonalizable.cs
 ../../../external/referencesource/System.Web/UI/WebParts/IWebActionable.cs
-System.Web.UI.WebControls.WebParts/IWebEditable.cs
-System.Web.UI.WebControls.WebParts/IWebPart.cs
-System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebEditable.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPart.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPartHttpHandler.cs
 ../../../external/referencesource/System.Web/UI/WebParts/IWebPartField.cs
-System.Web.UI.WebControls.WebParts/IWebPartParameters.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPartParameters.cs
 ../../../external/referencesource/System.Web/UI/WebParts/IWebPartRow.cs
 ../../../external/referencesource/System.Web/UI/WebParts/IWebPartTable.cs
 System.Web.UI.WebControls.WebParts/Part.cs
+../../../external/referencesource/System.Web/UI/WebParts/ParametersCallback.cs
 ../../../external/referencesource/System.Web/UI/WebParts/PartChromeState.cs
 ../../../external/referencesource/System.Web/UI/WebParts/PartChromeType.cs
 System.Web.UI.WebControls.WebParts/PersonalizableAttribute.cs
@@ -1193,7 +1196,7 @@ System.Web.Util/FileUtils.cs
 System.Web.Util/Helpers.cs
 System.Web.Util/HttpEncoder.cs
 System.Web.Util/ICalls.cs
-System.Web.Util/IWebObjectFactory.cs
+../../../external/referencesource/System.Web/Util/IObjectFactory.cs
 System.Web.Util/IWebPropertyAccessor.cs
 System.Web.Util/MachineKeySectionUtils.cs
 System.Web.Util/RuntimeHelpers.cs
@@ -1217,13 +1220,13 @@ System.Web/WebROCollection.cs
 System.Web/WebSysDescriptionAttribute.cs
 System.Web/XmlSiteMapProvider.cs
 
-System.Web/IHtmlString.cs
+../../../external/referencesource/System.Web/IHtmlString.cs
 System.Web/HtmlString.cs
 System.Web/PreApplicationStartMethodAttribute.cs
 
 System.Web.Caching/FileResponseElement.cs
 System.Web.Caching/HeaderElement.cs
-System.Web.Caching/IOutputCacheEntry.cs
+../../../external/referencesource/System.Web/Cache/IOutputCacheEntry.cs
 System.Web.Caching/MemoryResponseElement.cs
 System.Web.Caching/OutputCache.cs
 System.Web.Caching/OutputCacheProviderCollection.cs
@@ -1244,13 +1247,13 @@ System.Web.Routing/PageRouteHandler.cs
 ../../../external/referencesource/System.Web/UI/ClientIDMode.cs
 System.Web.UI/DataKeyPropertyAttribute.cs
 System.Web.UI/FileLevelMasterPageControlBuilder.cs
-System.Web.UI/IDataKeysControl.cs
+../../../external/referencesource/System.Web/UI/IDataKeysControl.cs
 ../../../external/referencesource/System.Web/UI/ViewStateMode.cs
-System.Web.UI.WebControls/IDataBoundControl.cs
+../../../external/referencesource/System.Web/UI/WebControls/IDataBoundControl.cs
 ../../../external/referencesource/System.Web/UI/WebControls/CallingDataMethodsEventHandler.cs
 ../../../external/referencesource/System.Web/UI/WebControls/CallingDataMethodsEventArgs.cs
 ../../../external/referencesource/System.Web/UI/WebControls/IDataBoundItemControl.cs
-System.Web.UI.WebControls/IDataBoundListControl.cs
+../../../external/referencesource/System.Web/UI/WebControls/IDataBoundListControl.cs
 ../../../external/referencesource/System.Web/UI/WebControls/IFieldControl.cs
 System.Web.UI.WebControls/IRenderOuterTable.cs
 System.Web.UI.WebControls/MenuListRenderer.cs
diff --git a/mcs/class/System.Web/System.Web/IHtmlString.cs b/mcs/class/System.Web/System.Web/IHtmlString.cs
deleted file mode 100644
index b8ee7abc557..00000000000
--- a/mcs/class/System.Web/System.Web/IHtmlString.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// System.Web.IHtmlString.cs 
-//
-// Copyright (C) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-namespace System.Web {
-	public interface IHtmlString {
-		string ToHtmlString ();
-	}
-}
-	
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs b/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs
deleted file mode 100644
index de69220196a..00000000000
--- a/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.IHttpAsyncHandler.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Web
-{
-   public interface IHttpAsyncHandler : IHttpHandler
-   {
-      IAsyncResult BeginProcessRequest(HttpContext context,
-                                       AsyncCallback cb,
-                                       object extraData);
-      void EndProcessRequest(IAsyncResult result);
-   }
-}
diff --git a/mcs/class/System.Web/System.Web/IHttpHandler.cs b/mcs/class/System.Web/System.Web/IHttpHandler.cs
deleted file mode 100644
index ea0535ed63a..00000000000
--- a/mcs/class/System.Web/System.Web/IHttpHandler.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.IHttpHandler.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Web
-{
-   public interface IHttpHandler
-   {
-      bool IsReusable { get; }
-      void ProcessRequest(HttpContext context);
-   }
-}
diff --git a/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs b/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs
deleted file mode 100644
index d136cae3a3c..00000000000
--- a/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.IHttpHandlerFactory.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Web
-{
-   public interface IHttpHandlerFactory
-   {
-      IHttpHandler GetHandler(HttpContext context,
-                              string requestType,
-                              string url,
-                              string pathTranslated);
-      void ReleaseHandler(IHttpHandler handler);
-   }
-}
diff --git a/mcs/class/System.Web/System.Web/IHttpModule.cs b/mcs/class/System.Web/System.Web/IHttpModule.cs
deleted file mode 100644
index 84654fcd0a3..00000000000
--- a/mcs/class/System.Web/System.Web/IHttpModule.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.IHttpModule.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-namespace System.Web {
-   public interface IHttpModule {
-      void Dispose();
-      void Init(HttpApplication context);
-   }
-}