diff --git a/Source/Parsing/CommandLine.Formatter.cs b/Source/Parsing/CommandLine.Formatter.cs
index f4cf1e6..3ee2b06 100644
--- a/Source/Parsing/CommandLine.Formatter.cs
+++ b/Source/Parsing/CommandLine.Formatter.cs
@@ -21,6 +21,8 @@ License along with this library
 using System;
 using System.Collections.Generic;
 
+#if ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 namespace Nuclex.Support.Parsing {
 
   partial class CommandLine {
@@ -30,3 +32,5 @@ namespace Nuclex.Support.Parsing {
   }
 
 } // namespace Nuclex.Support.Parsing
+
+#endif // ENABLE_BROKEN_COMMAND_LINE_PARSER
diff --git a/Source/Parsing/CommandLine.Option.cs b/Source/Parsing/CommandLine.Option.cs
index fc5b56d..2ce552b 100644
--- a/Source/Parsing/CommandLine.Option.cs
+++ b/Source/Parsing/CommandLine.Option.cs
@@ -22,6 +22,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
+#if ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 namespace Nuclex.Support.Parsing {
 
   partial class CommandLine {
@@ -133,3 +135,5 @@ namespace Nuclex.Support.Parsing {
   }
 
 } // namespace Nuclex.Support.Parsing
+
+#endif // ENABLE_BROKEN_COMMAND_LINE_PARSER
diff --git a/Source/Parsing/CommandLine.Parser.cs b/Source/Parsing/CommandLine.Parser.cs
index c28ef64..e000447 100644
--- a/Source/Parsing/CommandLine.Parser.cs
+++ b/Source/Parsing/CommandLine.Parser.cs
@@ -23,6 +23,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 
+#if ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 namespace Nuclex.Support.Parsing {
 
   partial class CommandLine {
@@ -378,3 +380,5 @@ namespace Nuclex.Support.Parsing {
   }
 
 } // namespace Nuclex.Support.Parsing
+
+#endif // ENABLE_BROKEN_COMMAND_LINE_PARSER
diff --git a/Source/Parsing/CommandLine.Test.cs b/Source/Parsing/CommandLine.Test.cs
index 6b92da2..85d7b49 100644
--- a/Source/Parsing/CommandLine.Test.cs
+++ b/Source/Parsing/CommandLine.Test.cs
@@ -26,6 +26,8 @@ using System.Text;
 
 using NUnit.Framework;
 
+#if ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 namespace Nuclex.Support.Parsing {
 
   /// <summary>Ensures that the command line parser is working properly</summary>
@@ -361,4 +363,6 @@ namespace Nuclex.Support.Parsing {
 
 } // namespace Nuclex.Support.Parsing
 
+#endif // ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 #endif // UNITTEST
\ No newline at end of file
diff --git a/Source/Parsing/CommandLine.cs b/Source/Parsing/CommandLine.cs
index bdb4aa6..9de769e 100644
--- a/Source/Parsing/CommandLine.cs
+++ b/Source/Parsing/CommandLine.cs
@@ -24,6 +24,8 @@ using System.IO;
 
 using Nuclex.Support.Collections;
 
+#if ENABLE_BROKEN_COMMAND_LINE_PARSER
+
 namespace Nuclex.Support.Parsing {
 
   /// <summary>
@@ -152,3 +154,5 @@ namespace Nuclex.Support.Parsing {
   }
 
 } // namespace Nuclex.Support.Parsing
+
+#endif // ENABLE_BROKEN_COMMAND_LINE_PARSER