Don't include those classes on the initial compilation as Mono.Security.dll isn't yet available.

svn path=/trunk/mcs/; revision=50774

33 files changed, 37 insertions, 64 deletions

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/OpenFlags.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/OpenFlags.cs
index 56793279aad..de7787a4abc 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/OpenFlags.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/OpenFlags.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs
index c8108cf776b..1f4f840f5f4 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs
@@ -30,9 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreLocation.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreLocation.cs
index 565ba11caef..8ab376a0d4f 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreLocation.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreLocation.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreName.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreName.cs
index 6e621ff3ea9..81ec9286215 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreName.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/StoreName.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs
index d72e47f9160..0b2369471a4 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs
@@ -26,9 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
-using System;
 using System.Text;
 
 using MX = Mono.Security.X509;
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs
index 7361b9d8ccd..c0b5af1d57d 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs
index b342bb04d07..86068df9e01 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
index 59753e8defe..005e54ce6c2 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
@@ -27,9 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
-using System;
 using System.IO;
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
index e247fdf2313..d4c7bc73ecd 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Collections;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs
index 343ee097bec..c22f45bdb33 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Collections;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
index 88e67e5c1e6..22438744cc9 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElement.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
index 0d067ce2170..086ce7c8a6c 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
index 3fafdb8a62d..12f904ba502 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
@@ -28,9 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography.X509Certificates {
@@ -91,4 +90,4 @@ namespace System.Security.Cryptography.X509Certificates {
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs
index ca4a636b83b..6d23c1e7a39 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs
@@ -28,9 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography.X509Certificates {
@@ -70,4 +69,4 @@ namespace System.Security.Cryptography.X509Certificates {
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
index bfd74c181ee..5bd0b10a883 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs
index 982e50f0289..7f4d6701300 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs
@@ -28,9 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
@@ -55,4 +53,4 @@ namespace System.Security.Cryptography.X509Certificates {
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs
index 41cbbccc6f8..2e1d5a1369b 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
index c867d3548e5..e9e48d3003f 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Extension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Extension.cs
index 311690968fa..175e7caa2c9 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Extension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Extension.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
index 68de493d1c7..41819c712ab 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Collections;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs
index 9dc652d04ed..c60ab436f68 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs
@@ -28,9 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography.X509Certificates {
@@ -70,4 +69,4 @@ namespace System.Security.Cryptography.X509Certificates {
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509FindType.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509FindType.cs
index 7ebc8b72880..28f40417cb0 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509FindType.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509FindType.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs
index 0699eac0a1a..78b3b5c3dcf 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
index dc13d962df7..d252dded577 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs
index a8f8cec6a32..c279c2a6428 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509NameType.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509NameType.cs
index a370ac05104..2f68f6e9d69 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509NameType.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509NameType.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs
index 94fe8f21aa3..92d934f1dbe 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs
index fa7fa4f3432..64da78a5c88 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs
index 75381deaa99..955ca074f81 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs
index 4021dd3876f..385002ebd99 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using Mono.Security.X509;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs
index fa212b03c23..93df883ee2b 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 using System.Text;
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs
index 5b57ad0f320..46717264c0f 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {
 
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
index 713c15a5bc0..b2e38a12ebd 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
@@ -27,9 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System;
+#if NET_2_0 && SECURITY_DEP
 
 namespace System.Security.Cryptography.X509Certificates {