diff --git a/src/Generator.Bind/BindStreamWriter.cs b/src/Generator.Bind/BindStreamWriter.cs
index 52718d73..d279f145 100644
--- a/src/Generator.Bind/BindStreamWriter.cs
+++ b/src/Generator.Bind/BindStreamWriter.cs
@@ -25,9 +25,6 @@
 
 using System;
 using System.IO;
-using System.Text.RegularExpressions;
-using Bind.Structures;
-using Enum=Bind.Structures.Enum;
 
 namespace Bind
 {
diff --git a/src/Generator.Bind/CL/CLGenerator.cs b/src/Generator.Bind/CL/CLGenerator.cs
index eb7fbc68..79679da5 100644
--- a/src/Generator.Bind/CL/CLGenerator.cs
+++ b/src/Generator.Bind/CL/CLGenerator.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.XPath;
-using Bind.GL2;
-using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
-
 namespace Bind.CL
 {
     internal class CLGenerator : ES.ESGenerator
diff --git a/src/Generator.Bind/DocProcessor.cs b/src/Generator.Bind/DocProcessor.cs
index d5899d40..cb11a802 100644
--- a/src/Generator.Bind/DocProcessor.cs
+++ b/src/Generator.Bind/DocProcessor.cs
@@ -3,9 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
diff --git a/src/Generator.Bind/ES/ES2Generator.cs b/src/Generator.Bind/ES/ES2Generator.cs
index 7de24fb8..6df56130 100644
--- a/src/Generator.Bind/ES/ES2Generator.cs
+++ b/src/Generator.Bind/ES/ES2Generator.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.XPath;
+using System.IO;
 using Bind.GL2;
-using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
 
 namespace Bind.ES
 {
diff --git a/src/Generator.Bind/ES/ES31Generator.cs b/src/Generator.Bind/ES/ES31Generator.cs
index 82222003..1b1bb725 100644
--- a/src/Generator.Bind/ES/ES31Generator.cs
+++ b/src/Generator.Bind/ES/ES31Generator.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.XPath;
+using System.IO;
 using Bind.GL2;
-using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
 
 namespace Bind.ES
 {
diff --git a/src/Generator.Bind/ES/ES3Generator.cs b/src/Generator.Bind/ES/ES3Generator.cs
index e8bc2158..95f3ff19 100644
--- a/src/Generator.Bind/ES/ES3Generator.cs
+++ b/src/Generator.Bind/ES/ES3Generator.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.XPath;
+using System.IO;
 using Bind.GL2;
-using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
 
 namespace Bind.ES
 {
diff --git a/src/Generator.Bind/ES/ESGenerator.cs b/src/Generator.Bind/ES/ESGenerator.cs
index 57982218..2b15e6a0 100644
--- a/src/Generator.Bind/ES/ESGenerator.cs
+++ b/src/Generator.Bind/ES/ESGenerator.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.XPath;
+using System.IO;
 using Bind.GL2;
-using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
 
 namespace Bind.ES
 {
diff --git a/src/Generator.Bind/EnumProcessor.cs b/src/Generator.Bind/EnumProcessor.cs
index 221e2218..0fcf6a92 100644
--- a/src/Generator.Bind/EnumProcessor.cs
+++ b/src/Generator.Bind/EnumProcessor.cs
@@ -26,7 +26,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml.XPath;
diff --git a/src/Generator.Bind/FuncProcessor.cs b/src/Generator.Bind/FuncProcessor.cs
index 87806992..6a0a6642 100644
--- a/src/Generator.Bind/FuncProcessor.cs
+++ b/src/Generator.Bind/FuncProcessor.cs
@@ -26,7 +26,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -36,7 +35,6 @@ using Delegate = Bind.Structures.Delegate;
 
 namespace Bind
 {
-    using Enum = Bind.Structures.Enum;
     using Type = Bind.Structures.Type;
 
     internal class FuncProcessor
diff --git a/src/Generator.Bind/GL2/GL2Generator.cs b/src/Generator.Bind/GL2/GL2Generator.cs
index 60d085f1..8682ae48 100644
--- a/src/Generator.Bind/GL2/GL2Generator.cs
+++ b/src/Generator.Bind/GL2/GL2Generator.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.IO;
 
 namespace Bind.GL2
diff --git a/src/Generator.Bind/GL2/GL4Generator.cs b/src/Generator.Bind/GL2/GL4Generator.cs
index e6d828a3..51c2a683 100644
--- a/src/Generator.Bind/GL2/GL4Generator.cs
+++ b/src/Generator.Bind/GL2/GL4Generator.cs
@@ -23,11 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace Bind.GL2
 {
diff --git a/src/Generator.Bind/GL2/Generator.cs b/src/Generator.Bind/GL2/Generator.cs
index 47451145..a4a7f03a 100644
--- a/src/Generator.Bind/GL2/Generator.cs
+++ b/src/Generator.Bind/GL2/Generator.cs
@@ -4,15 +4,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Xml.XPath;
 using Bind.Structures;
-using Delegate=Bind.Structures.Delegate;
-using Enum=Bind.Structures.Enum;
-using Type=Bind.Structures.Type;
 
 namespace Bind.GL2
 {
diff --git a/src/Generator.Bind/ISpecReader.cs b/src/Generator.Bind/ISpecReader.cs
index 92e27c72..6437f3c6 100644
--- a/src/Generator.Bind/ISpecReader.cs
+++ b/src/Generator.Bind/ISpecReader.cs
@@ -3,7 +3,6 @@
  */
 
 using System.Collections.Generic;
-using System.IO;
 using Bind.Structures;
 
 namespace Bind
diff --git a/src/Generator.Bind/Main.cs b/src/Generator.Bind/Main.cs
index 0c821e78..df8cba25 100644
--- a/src/Generator.Bind/Main.cs
+++ b/src/Generator.Bind/Main.cs
@@ -5,8 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Text.RegularExpressions;
diff --git a/src/Generator.Bind/Structures/Constant.cs b/src/Generator.Bind/Structures/Constant.cs
index 25e176a9..68f4ec9a 100644
--- a/src/Generator.Bind/Structures/Constant.cs
+++ b/src/Generator.Bind/Structures/Constant.cs
@@ -6,7 +6,6 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 
 namespace Bind.Structures
 {
diff --git a/src/Generator.Bind/Structures/Delegate.cs b/src/Generator.Bind/Structures/Delegate.cs
index 038f1f66..af3d2873 100644
--- a/src/Generator.Bind/Structures/Delegate.cs
+++ b/src/Generator.Bind/Structures/Delegate.cs
@@ -4,12 +4,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml.XPath;
 
 namespace Bind.Structures
 {
diff --git a/src/Generator.Bind/Structures/Documentation.cs b/src/Generator.Bind/Structures/Documentation.cs
index ea1bfca6..6c9b26dd 100644
--- a/src/Generator.Bind/Structures/Documentation.cs
+++ b/src/Generator.Bind/Structures/Documentation.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 
 namespace Bind.Structures
diff --git a/src/Generator.Bind/Structures/Enum.cs b/src/Generator.Bind/Structures/Enum.cs
index e7003d0b..b8632e86 100644
--- a/src/Generator.Bind/Structures/Enum.cs
+++ b/src/Generator.Bind/Structures/Enum.cs
@@ -4,10 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Xml.XPath;
 
 namespace Bind.Structures
 {
diff --git a/src/Generator.Bind/Structures/Parameter.cs b/src/Generator.Bind/Structures/Parameter.cs
index f1a37fdc..626c4280 100644
--- a/src/Generator.Bind/Structures/Parameter.cs
+++ b/src/Generator.Bind/Structures/Parameter.cs
@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Xml.XPath;
 
 namespace Bind.Structures
 {
diff --git a/src/Generator.Bind/Structures/Type.cs b/src/Generator.Bind/Structures/Type.cs
index 1e82c948..cfe909be 100644
--- a/src/Generator.Bind/Structures/Type.cs
+++ b/src/Generator.Bind/Structures/Type.cs
@@ -3,10 +3,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml.XPath;
 
 namespace Bind.Structures
 {
diff --git a/src/Generator.Bind/XmlSpecReader.cs b/src/Generator.Bind/XmlSpecReader.cs
index 35db7b40..7a5c1255 100644
--- a/src/Generator.Bind/XmlSpecReader.cs
+++ b/src/Generator.Bind/XmlSpecReader.cs
@@ -26,9 +26,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 using System.Xml.XPath;
 using Bind.Structures;
 
diff --git a/src/OpenTK.GLControl/AglContext.cs b/src/OpenTK.GLControl/AglContext.cs
index 823efdd0..e54662c9 100644
--- a/src/OpenTK.GLControl/AglContext.cs
+++ b/src/OpenTK.GLControl/AglContext.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK.GLControl/AglGraphicsMode.cs b/src/OpenTK.GLControl/AglGraphicsMode.cs
index 5c9a020f..bc24674b 100644
--- a/src/OpenTK.GLControl/AglGraphicsMode.cs
+++ b/src/OpenTK.GLControl/AglGraphicsMode.cs
@@ -26,7 +26,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using OpenTK.Graphics;
 
 namespace OpenTK.Platform.MacOS
diff --git a/src/OpenTK.GLControl/CarbonGLControl.cs b/src/OpenTK.GLControl/CarbonGLControl.cs
index cb341ad4..11ce6809 100644
--- a/src/OpenTK.GLControl/CarbonGLControl.cs
+++ b/src/OpenTK.GLControl/CarbonGLControl.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 
 using OpenTK.Graphics;
diff --git a/src/OpenTK.GLControl/GLControl.cs b/src/OpenTK.GLControl/GLControl.cs
index 7b3969cd..69e58bfd 100644
--- a/src/OpenTK.GLControl/GLControl.cs
+++ b/src/OpenTK.GLControl/GLControl.cs
@@ -24,17 +24,12 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 
 using OpenTK.Platform;
 using OpenTK.Graphics;
-using OpenTK.Graphics.OpenGL;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK.GLControl/GLControlFactory.cs b/src/OpenTK.GLControl/GLControlFactory.cs
index b62393b4..690cde23 100644
--- a/src/OpenTK.GLControl/GLControlFactory.cs
+++ b/src/OpenTK.GLControl/GLControlFactory.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 using OpenTK.Graphics;
 
diff --git a/src/OpenTK.GLControl/IGLControl.cs b/src/OpenTK.GLControl/IGLControl.cs
index 6556eb0a..c45c3095 100644
--- a/src/OpenTK.GLControl/IGLControl.cs
+++ b/src/OpenTK.GLControl/IGLControl.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenTK.Graphics;
 using OpenTK.Platform;
 
diff --git a/src/OpenTK.GLControl/Sdl2GLControl.cs b/src/OpenTK.GLControl/Sdl2GLControl.cs
index 1b150b33..6bb3c163 100644
--- a/src/OpenTK.GLControl/Sdl2GLControl.cs
+++ b/src/OpenTK.GLControl/Sdl2GLControl.cs
@@ -23,10 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Windows.Forms;
 using OpenTK.Graphics;
 using OpenTK.Platform;
diff --git a/src/OpenTK.GLControl/WinGLControl.cs b/src/OpenTK.GLControl/WinGLControl.cs
index cd4b681e..6141e407 100644
--- a/src/OpenTK.GLControl/WinGLControl.cs
+++ b/src/OpenTK.GLControl/WinGLControl.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 
 using OpenTK.Graphics;
diff --git a/src/OpenTK.GLControl/X11GLControl.cs b/src/OpenTK.GLControl/X11GLControl.cs
index ed1553a2..cf925511 100644
--- a/src/OpenTK.GLControl/X11GLControl.cs
+++ b/src/OpenTK.GLControl/X11GLControl.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
 
diff --git a/src/OpenTK/Audio/AudioContext.cs b/src/OpenTK/Audio/AudioContext.cs
index 44fbbb42..282b7561 100644
--- a/src/OpenTK/Audio/AudioContext.cs
+++ b/src/OpenTK/Audio/AudioContext.cs
@@ -26,9 +26,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-
 using OpenTK.Audio.OpenAL;
 
 namespace OpenTK.Audio
diff --git a/src/OpenTK/Audio/AudioContextException.cs b/src/OpenTK/Audio/AudioContextException.cs
index a33aa5c6..151850f6 100644
--- a/src/OpenTK/Audio/AudioContextException.cs
+++ b/src/OpenTK/Audio/AudioContextException.cs
@@ -24,10 +24,6 @@
 //
 
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Audio
 {
     /// <summary>Represents exceptions related to an OpenTK.Audio.AudioContext.</summary>
diff --git a/src/OpenTK/Audio/AudioDeviceEnumerator.cs b/src/OpenTK/Audio/AudioDeviceEnumerator.cs
index f063663c..3fb3f336 100644
--- a/src/OpenTK/Audio/AudioDeviceEnumerator.cs
+++ b/src/OpenTK/Audio/AudioDeviceEnumerator.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 
 using OpenTK.Audio.OpenAL;
diff --git a/src/OpenTK/Audio/AudioDeviceErrorChecker.cs b/src/OpenTK/Audio/AudioDeviceErrorChecker.cs
index 5237e5d7..c633989e 100644
--- a/src/OpenTK/Audio/AudioDeviceErrorChecker.cs
+++ b/src/OpenTK/Audio/AudioDeviceErrorChecker.cs
@@ -24,9 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenTK.Audio.OpenAL;
 
 namespace OpenTK.Audio
diff --git a/src/OpenTK/Audio/AudioDeviceException.cs b/src/OpenTK/Audio/AudioDeviceException.cs
index 927ea559..6bdc6dd9 100644
--- a/src/OpenTK/Audio/AudioDeviceException.cs
+++ b/src/OpenTK/Audio/AudioDeviceException.cs
@@ -24,10 +24,6 @@
 //
 
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Audio
 {
     /// <summary>Represents exceptions related to an OpenTK.Audio device.</summary>
diff --git a/src/OpenTK/Audio/AudioException.cs b/src/OpenTK/Audio/AudioException.cs
index 546a671f..fa18a961 100644
--- a/src/OpenTK/Audio/AudioException.cs
+++ b/src/OpenTK/Audio/AudioException.cs
@@ -25,8 +25,6 @@
 
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Audio
 {
diff --git a/src/OpenTK/Audio/AudioValueException.cs b/src/OpenTK/Audio/AudioValueException.cs
index 2d6e48d4..c93eb197 100644
--- a/src/OpenTK/Audio/AudioValueException.cs
+++ b/src/OpenTK/Audio/AudioValueException.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Audio
 {
     /// <summary>Represents exceptions related to invalid values.</summary>
diff --git a/src/OpenTK/Audio/OpenAL/AL/AL.cs b/src/OpenTK/Audio/OpenAL/AL/AL.cs
index 0c319e1f..b00dc2c5 100644
--- a/src/OpenTK/Audio/OpenAL/AL/AL.cs
+++ b/src/OpenTK/Audio/OpenAL/AL/AL.cs
@@ -9,8 +9,6 @@ using System;
 using System.Runtime.InteropServices;
 using System.Security;
 
-using OpenTK;
-
 /* Type Mapping
 // 8-bit boolean
 typedef char ALboolean;
diff --git a/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs b/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs
index c5659e06..40114ac0 100644
--- a/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs
+++ b/src/OpenTK/Audio/OpenAL/AL/ALEnums.cs
@@ -5,8 +5,6 @@
  * See license.txt for license details
  * http://www.OpenTK.net */
 
-using System;
-
 namespace OpenTK.Audio.OpenAL
 {
 
diff --git a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs
index db977d98..bf86e4b4 100644
--- a/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs
+++ b/src/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs
@@ -5,8 +5,6 @@
  * See license.txt for license details
  * http://www.OpenTK.net */
 
-using System;
-
 namespace OpenTK.Audio.OpenAL
 {
     ///<summary>A list of valid 32-bit Float Effect/GetEffect parameters</summary>
diff --git a/src/OpenTK/AutoGeneratedAttribute.cs b/src/OpenTK/AutoGeneratedAttribute.cs
index dc3c8104..26107e11 100644
--- a/src/OpenTK/AutoGeneratedAttribute.cs
+++ b/src/OpenTK/AutoGeneratedAttribute.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/BindingsBase.cs b/src/OpenTK/BindingsBase.cs
index 8997ab52..5f22735b 100644
--- a/src/OpenTK/BindingsBase.cs
+++ b/src/OpenTK/BindingsBase.cs
@@ -24,11 +24,8 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Text;
-using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Diagnostics;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/BlittableValueType.cs b/src/OpenTK/BlittableValueType.cs
index 74f7c2a0..2c1a362f 100644
--- a/src/OpenTK/BlittableValueType.cs
+++ b/src/OpenTK/BlittableValueType.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 using System.Reflection;
diff --git a/src/OpenTK/Compute/CLHelper.cs b/src/OpenTK/Compute/CLHelper.cs
index 0f477891..87dc5204 100644
--- a/src/OpenTK/Compute/CLHelper.cs
+++ b/src/OpenTK/Compute/CLHelper.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/CommandQueue.cs b/src/OpenTK/Compute/CommandQueue.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/CommandQueue.cs
+++ b/src/OpenTK/Compute/CommandQueue.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/ComputeContext.cs b/src/OpenTK/Compute/ComputeContext.cs
index 59cc7a9e..87dc5204 100644
--- a/src/OpenTK/Compute/ComputeContext.cs
+++ b/src/OpenTK/Compute/ComputeContext.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Configuration.cs b/src/OpenTK/Compute/Configuration.cs
index 8c54c6d5..87dc5204 100644
--- a/src/OpenTK/Compute/Configuration.cs
+++ b/src/OpenTK/Compute/Configuration.cs
@@ -23,8 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Device.cs b/src/OpenTK/Compute/Device.cs
index a56a1b5c..87dc5204 100644
--- a/src/OpenTK/Compute/Device.cs
+++ b/src/OpenTK/Compute/Device.cs
@@ -23,12 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Security;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Enums.cs b/src/OpenTK/Compute/Enums.cs
index 0f477891..87dc5204 100644
--- a/src/OpenTK/Compute/Enums.cs
+++ b/src/OpenTK/Compute/Enums.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Event.cs b/src/OpenTK/Compute/Event.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Event.cs
+++ b/src/OpenTK/Compute/Event.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Kernel.cs b/src/OpenTK/Compute/Kernel.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Kernel.cs
+++ b/src/OpenTK/Compute/Kernel.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Memory.cs b/src/OpenTK/Compute/Memory.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Memory.cs
+++ b/src/OpenTK/Compute/Memory.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Platform.cs b/src/OpenTK/Compute/Platform.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Platform.cs
+++ b/src/OpenTK/Compute/Platform.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Profiler.cs b/src/OpenTK/Compute/Profiler.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Profiler.cs
+++ b/src/OpenTK/Compute/Profiler.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Program.cs b/src/OpenTK/Compute/Program.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Program.cs
+++ b/src/OpenTK/Compute/Program.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Compute/Sampler.cs b/src/OpenTK/Compute/Sampler.cs
index 4b0c9402..87dc5204 100644
--- a/src/OpenTK/Compute/Sampler.cs
+++ b/src/OpenTK/Compute/Sampler.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace OpenTK.Compute
 {
 
diff --git a/src/OpenTK/Configuration.cs b/src/OpenTK/Configuration.cs
index 6c3a9a57..2a669620 100644
--- a/src/OpenTK/Configuration.cs
+++ b/src/OpenTK/Configuration.cs
@@ -24,12 +24,8 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
-using System.Reflection;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/ContextHandle.cs b/src/OpenTK/ContextHandle.cs
index fc1e7bc3..fd10e321 100644
--- a/src/OpenTK/ContextHandle.cs
+++ b/src/OpenTK/ContextHandle.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/DisplayDevice.cs b/src/OpenTK/DisplayDevice.cs
index 971747fa..ab929952 100644
--- a/src/OpenTK/DisplayDevice.cs
+++ b/src/OpenTK/DisplayDevice.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/DisplayIndex.cs b/src/OpenTK/DisplayIndex.cs
index 7dda3018..27805dd7 100644
--- a/src/OpenTK/DisplayIndex.cs
+++ b/src/OpenTK/DisplayIndex.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
     /// <summary>
diff --git a/src/OpenTK/DisplayResolution.cs b/src/OpenTK/DisplayResolution.cs
index 986da61a..77e0ec42 100644
--- a/src/OpenTK/DisplayResolution.cs
+++ b/src/OpenTK/DisplayResolution.cs
@@ -5,9 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/GameWindow.cs b/src/OpenTK/GameWindow.cs
index 6dc2961e..8145c63b 100644
--- a/src/OpenTK/GameWindow.cs
+++ b/src/OpenTK/GameWindow.cs
@@ -24,15 +24,10 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics;
 #if !MINIMAL
-using System.Drawing;
 #endif
-using System.Threading;
 using OpenTK.Graphics;
-using OpenTK.Input;
 using OpenTK.Platform;
 
 namespace OpenTK
diff --git a/src/OpenTK/Graphics/Color4.cs b/src/OpenTK/Graphics/Color4.cs
index 1d2756e8..d5c16bed 100644
--- a/src/OpenTK/Graphics/Color4.cs
+++ b/src/OpenTK/Graphics/Color4.cs
@@ -24,12 +24,9 @@
 //
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
-using System.Text;
-using System.Xml.Serialization;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/ColorFormat.cs b/src/OpenTK/Graphics/ColorFormat.cs
index 531d804a..f983b273 100644
--- a/src/OpenTK/Graphics/ColorFormat.cs
+++ b/src/OpenTK/Graphics/ColorFormat.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/ES10/Core.cs b/src/OpenTK/Graphics/ES10/Core.cs
index 009b3ea4..77fa9048 100644
--- a/src/OpenTK/Graphics/ES10/Core.cs
+++ b/src/OpenTK/Graphics/ES10/Core.cs
@@ -26,9 +26,8 @@
 namespace OpenTK.Graphics.ES10
 {
     using System;
-    using System.Text;
-    using System.Runtime.InteropServices;
-    #pragma warning disable 3019
+
+#pragma warning disable 3019
     #pragma warning disable 1591
 
     partial class GL
diff --git a/src/OpenTK/Graphics/ES10/ES.cs b/src/OpenTK/Graphics/ES10/ES.cs
index 7e1165fe..8a1e61e2 100644
--- a/src/OpenTK/Graphics/ES10/ES.cs
+++ b/src/OpenTK/Graphics/ES10/ES.cs
@@ -26,7 +26,6 @@
 namespace OpenTK.Graphics.ES10
 {
     using System;
-    using System.Text;
     using System.Runtime.InteropServices;
     #pragma warning disable 3019
     #pragma warning disable 1591
diff --git a/src/OpenTK/Graphics/ES10/Helper.cs b/src/OpenTK/Graphics/ES10/Helper.cs
index b8c16e66..f835da90 100644
--- a/src/OpenTK/Graphics/ES10/Helper.cs
+++ b/src/OpenTK/Graphics/ES10/Helper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenTK.Graphics.ES10
+namespace OpenTK.Graphics.ES10
 {
     /// <summary>
     /// Provides access to OpenGL ES 1.0 methods.
diff --git a/src/OpenTK/Graphics/ES11/Helper.cs b/src/OpenTK/Graphics/ES11/Helper.cs
index e7c895d8..c4884ead 100644
--- a/src/OpenTK/Graphics/ES11/Helper.cs
+++ b/src/OpenTK/Graphics/ES11/Helper.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.Runtime.InteropServices;
 
 namespace OpenTK.Graphics.ES11
 {
diff --git a/src/OpenTK/Graphics/ES20/Helper.cs b/src/OpenTK/Graphics/ES20/Helper.cs
index 76fba838..21aefd7a 100644
--- a/src/OpenTK/Graphics/ES20/Helper.cs
+++ b/src/OpenTK/Graphics/ES20/Helper.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/Graphics/ES30/Helper.cs b/src/OpenTK/Graphics/ES30/Helper.cs
index c0838c06..a5f98010 100644
--- a/src/OpenTK/Graphics/ES30/Helper.cs
+++ b/src/OpenTK/Graphics/ES30/Helper.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/Graphics/GraphicsBindingsBase.cs b/src/OpenTK/Graphics/GraphicsBindingsBase.cs
index 8f5a26a2..fa303d2f 100644
--- a/src/OpenTK/Graphics/GraphicsBindingsBase.cs
+++ b/src/OpenTK/Graphics/GraphicsBindingsBase.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsContext.cs b/src/OpenTK/Graphics/GraphicsContext.cs
index 5172d3fc..b718488a 100644
--- a/src/OpenTK/Graphics/GraphicsContext.cs
+++ b/src/OpenTK/Graphics/GraphicsContext.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 
 using OpenTK.Platform;
diff --git a/src/OpenTK/Graphics/GraphicsContextBase.cs b/src/OpenTK/Graphics/GraphicsContextBase.cs
index 49691fca..936221e8 100644
--- a/src/OpenTK/Graphics/GraphicsContextBase.cs
+++ b/src/OpenTK/Graphics/GraphicsContextBase.cs
@@ -26,9 +26,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using OpenTK.Platform;
 
 namespace OpenTK.Graphics
diff --git a/src/OpenTK/Graphics/GraphicsContextException.cs b/src/OpenTK/Graphics/GraphicsContextException.cs
index c44d5cf9..27237200 100644
--- a/src/OpenTK/Graphics/GraphicsContextException.cs
+++ b/src/OpenTK/Graphics/GraphicsContextException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsContextFlags.cs b/src/OpenTK/Graphics/GraphicsContextFlags.cs
index 024ec4e6..80bf86d1 100644
--- a/src/OpenTK/Graphics/GraphicsContextFlags.cs
+++ b/src/OpenTK/Graphics/GraphicsContextFlags.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsContextMissingException.cs b/src/OpenTK/Graphics/GraphicsContextMissingException.cs
index 8d2102ed..bcf43ee5 100644
--- a/src/OpenTK/Graphics/GraphicsContextMissingException.cs
+++ b/src/OpenTK/Graphics/GraphicsContextMissingException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsContextVersion.cs b/src/OpenTK/Graphics/GraphicsContextVersion.cs
index 9d2aea31..109850f7 100644
--- a/src/OpenTK/Graphics/GraphicsContextVersion.cs
+++ b/src/OpenTK/Graphics/GraphicsContextVersion.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsErrorException.cs b/src/OpenTK/Graphics/GraphicsErrorException.cs
index f3eb81ad..c2f774ab 100644
--- a/src/OpenTK/Graphics/GraphicsErrorException.cs
+++ b/src/OpenTK/Graphics/GraphicsErrorException.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenTK.Graphics
+namespace OpenTK.Graphics
 {
     /// <summary>
     /// Identifies a specific OpenGL or OpenGL|ES error. Such exceptions are only thrown
diff --git a/src/OpenTK/Graphics/GraphicsExceptions.cs b/src/OpenTK/Graphics/GraphicsExceptions.cs
index 4436e6c4..aee32a74 100644
--- a/src/OpenTK/Graphics/GraphicsExceptions.cs
+++ b/src/OpenTK/Graphics/GraphicsExceptions.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Graphics/GraphicsMode.cs b/src/OpenTK/Graphics/GraphicsMode.cs
index f61fd44e..487c406c 100644
--- a/src/OpenTK/Graphics/GraphicsMode.cs
+++ b/src/OpenTK/Graphics/GraphicsMode.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 
 namespace OpenTK.Graphics
diff --git a/src/OpenTK/Graphics/GraphicsModeComparer.cs b/src/OpenTK/Graphics/GraphicsModeComparer.cs
index d6961cfb..2cd610fd 100644
--- a/src/OpenTK/Graphics/GraphicsModeComparer.cs
+++ b/src/OpenTK/Graphics/GraphicsModeComparer.cs
@@ -23,9 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/GraphicsModeException.cs b/src/OpenTK/Graphics/GraphicsModeException.cs
index d0132453..97f92d3e 100644
--- a/src/OpenTK/Graphics/GraphicsModeException.cs
+++ b/src/OpenTK/Graphics/GraphicsModeException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Graphics
 {
diff --git a/src/OpenTK/Graphics/IGraphicsContext.cs b/src/OpenTK/Graphics/IGraphicsContext.cs
index d9ca505b..eafd5173 100644
--- a/src/OpenTK/Graphics/IGraphicsContext.cs
+++ b/src/OpenTK/Graphics/IGraphicsContext.cs
@@ -5,9 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenTK.Platform;
 
 namespace OpenTK.Graphics
diff --git a/src/OpenTK/Graphics/IGraphicsMode.cs b/src/OpenTK/Graphics/IGraphicsMode.cs
index 318905e4..5f476811 100644
--- a/src/OpenTK/Graphics/IGraphicsMode.cs
+++ b/src/OpenTK/Graphics/IGraphicsMode.cs
@@ -4,10 +4,6 @@
  * See license.txt for licensing detailed licensing details.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Graphics
 {
     internal interface IGraphicsMode
diff --git a/src/OpenTK/Graphics/OpenGL/GLHelper.cs b/src/OpenTK/Graphics/OpenGL/GLHelper.cs
index 83c0481a..18cd4ba6 100644
--- a/src/OpenTK/Graphics/OpenGL/GLHelper.cs
+++ b/src/OpenTK/Graphics/OpenGL/GLHelper.cs
@@ -25,15 +25,11 @@
 
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
 using System.Text;
 using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Diagnostics;
-using System.Reflection.Emit;
 
 
 namespace OpenTK.Graphics.OpenGL
diff --git a/src/OpenTK/Graphics/OpenGL4/Helper.cs b/src/OpenTK/Graphics/OpenGL4/Helper.cs
index d2d5a9b0..87a50d62 100644
--- a/src/OpenTK/Graphics/OpenGL4/Helper.cs
+++ b/src/OpenTK/Graphics/OpenGL4/Helper.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/IGameWindow.cs b/src/OpenTK/IGameWindow.cs
index 247318f0..77c045b8 100644
--- a/src/OpenTK/IGameWindow.cs
+++ b/src/OpenTK/IGameWindow.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Platform
 {
diff --git a/src/OpenTK/INativeWindow.cs b/src/OpenTK/INativeWindow.cs
index 2fdfd6e7..f831899a 100644
--- a/src/OpenTK/INativeWindow.cs
+++ b/src/OpenTK/INativeWindow.cs
@@ -24,12 +24,10 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 #if !MINIMAL
 using System.Drawing;
 #endif
-using System.Text;
 using OpenTK.Platform;
 
 namespace OpenTK
diff --git a/src/OpenTK/Input/ConfigurationType.cs b/src/OpenTK/Input/ConfigurationType.cs
index bdf989f0..e7e4c4d5 100644
--- a/src/OpenTK/Input/ConfigurationType.cs
+++ b/src/OpenTK/Input/ConfigurationType.cs
@@ -25,8 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Input
 {
     internal enum ConfigurationType
diff --git a/src/OpenTK/Input/GamePadConfigurationItem.cs b/src/OpenTK/Input/GamePadConfigurationItem.cs
index 18aa4c41..a62d7e8c 100644
--- a/src/OpenTK/Input/GamePadConfigurationItem.cs
+++ b/src/OpenTK/Input/GamePadConfigurationItem.cs
@@ -25,8 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Input
 {
     internal class GamePadConfigurationItem
diff --git a/src/OpenTK/Input/HatPosition.cs b/src/OpenTK/Input/HatPosition.cs
index 3218604b..f961a24c 100644
--- a/src/OpenTK/Input/HatPosition.cs
+++ b/src/OpenTK/Input/HatPosition.cs
@@ -25,8 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Input
 {
     /// <summary>
diff --git a/src/OpenTK/Input/IGamePadDriver.cs b/src/OpenTK/Input/IGamePadDriver.cs
index 5b21aa73..8f0ed6a6 100644
--- a/src/OpenTK/Input/IGamePadDriver.cs
+++ b/src/OpenTK/Input/IGamePadDriver.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenTK.Input
+namespace OpenTK.Input
 {
     internal interface IGamePadDriver
     {
diff --git a/src/OpenTK/Input/IInputDevice.cs b/src/OpenTK/Input/IInputDevice.cs
index e6cf5c0a..f667756d 100644
--- a/src/OpenTK/Input/IInputDevice.cs
+++ b/src/OpenTK/Input/IInputDevice.cs
@@ -2,10 +2,6 @@
  * See license.txt for license info
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Input
 {
     /// <summary>
diff --git a/src/OpenTK/Input/IInputDriver2.cs b/src/OpenTK/Input/IInputDriver2.cs
index bdfa2015..1f0d160f 100644
--- a/src/OpenTK/Input/IInputDriver2.cs
+++ b/src/OpenTK/Input/IInputDriver2.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/IJoystickDriver2.cs b/src/OpenTK/Input/IJoystickDriver2.cs
index d631edb4..a7795055 100644
--- a/src/OpenTK/Input/IJoystickDriver2.cs
+++ b/src/OpenTK/Input/IJoystickDriver2.cs
@@ -26,8 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/IKeyboardDriver2.cs b/src/OpenTK/Input/IKeyboardDriver2.cs
index 9f40e76e..50f6b026 100644
--- a/src/OpenTK/Input/IKeyboardDriver2.cs
+++ b/src/OpenTK/Input/IKeyboardDriver2.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenTK.Input
+namespace OpenTK.Input
 {
     internal interface IKeyboardDriver2
     {
diff --git a/src/OpenTK/Input/IMouseDriver2.cs b/src/OpenTK/Input/IMouseDriver2.cs
index 3b775c35..00e5694d 100644
--- a/src/OpenTK/Input/IMouseDriver2.cs
+++ b/src/OpenTK/Input/IMouseDriver2.cs
@@ -23,10 +23,6 @@
  // OTHER DEALINGS IN THE SOFTWARE.
  //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Input
 {
     internal interface IMouseDriver2
diff --git a/src/OpenTK/Input/Joystick.cs b/src/OpenTK/Input/Joystick.cs
index 37b7119b..08a48079 100644
--- a/src/OpenTK/Input/Joystick.cs
+++ b/src/OpenTK/Input/Joystick.cs
@@ -26,8 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/JoystickCapabilities.cs b/src/OpenTK/Input/JoystickCapabilities.cs
index 2d5e9457..dae25672 100644
--- a/src/OpenTK/Input/JoystickCapabilities.cs
+++ b/src/OpenTK/Input/JoystickCapabilities.cs
@@ -26,9 +26,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/JoystickDevice.cs b/src/OpenTK/Input/JoystickDevice.cs
index 077e4aa0..0a50d1f8 100644
--- a/src/OpenTK/Input/JoystickDevice.cs
+++ b/src/OpenTK/Input/JoystickDevice.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/JoystickHat.cs b/src/OpenTK/Input/JoystickHat.cs
index 483565f8..150838de 100644
--- a/src/OpenTK/Input/JoystickHat.cs
+++ b/src/OpenTK/Input/JoystickHat.cs
@@ -25,8 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Input
 {
     /// <summary>
diff --git a/src/OpenTK/Input/KeyModifiers.cs b/src/OpenTK/Input/KeyModifiers.cs
index 0b58c3db..3134aa98 100644
--- a/src/OpenTK/Input/KeyModifiers.cs
+++ b/src/OpenTK/Input/KeyModifiers.cs
@@ -26,8 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/Keyboard.cs b/src/OpenTK/Input/Keyboard.cs
index 08e8a4da..f9ee713a 100644
--- a/src/OpenTK/Input/Keyboard.cs
+++ b/src/OpenTK/Input/Keyboard.cs
@@ -24,8 +24,6 @@
  //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/KeyboardDevice.cs b/src/OpenTK/Input/KeyboardDevice.cs
index 056452d0..f914a903 100644
--- a/src/OpenTK/Input/KeyboardDevice.cs
+++ b/src/OpenTK/Input/KeyboardDevice.cs
@@ -4,9 +4,6 @@
 
 using System;
 
-using OpenTK.Input;
-using System.Diagnostics;
-
 namespace OpenTK.Input
 {
     /// <summary>
diff --git a/src/OpenTK/Input/KeyboardKeyEventArgs.cs b/src/OpenTK/Input/KeyboardKeyEventArgs.cs
index 4426d5a4..3e78bded 100644
--- a/src/OpenTK/Input/KeyboardKeyEventArgs.cs
+++ b/src/OpenTK/Input/KeyboardKeyEventArgs.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/KeyboardState.cs b/src/OpenTK/Input/KeyboardState.cs
index 33f75dcb..9e93ad1c 100644
--- a/src/OpenTK/Input/KeyboardState.cs
+++ b/src/OpenTK/Input/KeyboardState.cs
@@ -24,8 +24,6 @@
  //
 
 using System;
-using System.Collections.Specialized;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/Mouse.cs b/src/OpenTK/Input/Mouse.cs
index 4a3f0696..30d8409c 100644
--- a/src/OpenTK/Input/Mouse.cs
+++ b/src/OpenTK/Input/Mouse.cs
@@ -24,8 +24,6 @@
  //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/Input/MouseButton.cs b/src/OpenTK/Input/MouseButton.cs
index a51250d2..3e2418ea 100644
--- a/src/OpenTK/Input/MouseButton.cs
+++ b/src/OpenTK/Input/MouseButton.cs
@@ -23,10 +23,6 @@
  // OTHER DEALINGS IN THE SOFTWARE.
  //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Input
 {
     /// <summary>
diff --git a/src/OpenTK/Input/MouseDevice.cs b/src/OpenTK/Input/MouseDevice.cs
index 36784001..5824b9d0 100644
--- a/src/OpenTK/Input/MouseDevice.cs
+++ b/src/OpenTK/Input/MouseDevice.cs
@@ -25,12 +25,9 @@
  //
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 #if !MINIMAL
 using System.Drawing;
 #endif
-using System.Text;
 
 
 namespace OpenTK.Input
diff --git a/src/OpenTK/Input/MouseState.cs b/src/OpenTK/Input/MouseState.cs
index 65447010..3bb14d49 100644
--- a/src/OpenTK/Input/MouseState.cs
+++ b/src/OpenTK/Input/MouseState.cs
@@ -24,8 +24,6 @@
  //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Input
 {
diff --git a/src/OpenTK/InteropHelper.cs b/src/OpenTK/InteropHelper.cs
index 26def4e3..b61bf0e1 100644
--- a/src/OpenTK/InteropHelper.cs
+++ b/src/OpenTK/InteropHelper.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/BezierCurve.cs b/src/OpenTK/Math/BezierCurve.cs
index 2425f589..894f7a50 100644
--- a/src/OpenTK/Math/BezierCurve.cs
+++ b/src/OpenTK/Math/BezierCurve.cs
@@ -8,7 +8,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/BezierCurveCubic.cs b/src/OpenTK/Math/BezierCurveCubic.cs
index 67425843..b6da2c70 100644
--- a/src/OpenTK/Math/BezierCurveCubic.cs
+++ b/src/OpenTK/Math/BezierCurveCubic.cs
@@ -7,8 +7,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/BezierCurveQuadric.cs b/src/OpenTK/Math/BezierCurveQuadric.cs
index ec5f265b..0da5f18e 100644
--- a/src/OpenTK/Math/BezierCurveQuadric.cs
+++ b/src/OpenTK/Math/BezierCurveQuadric.cs
@@ -7,8 +7,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/MathHelper.cs b/src/OpenTK/Math/MathHelper.cs
index 48e31226..f5fac0ad 100644
--- a/src/OpenTK/Math/MathHelper.cs
+++ b/src/OpenTK/Math/MathHelper.cs
@@ -7,9 +7,7 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2.cs b/src/OpenTK/Math/Matrix2.cs
index a7621bb5..f9b93981 100644
--- a/src/OpenTK/Math/Matrix2.cs
+++ b/src/OpenTK/Math/Matrix2.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2d.cs b/src/OpenTK/Math/Matrix2d.cs
index 45e13360..c62c008f 100644
--- a/src/OpenTK/Math/Matrix2d.cs
+++ b/src/OpenTK/Math/Matrix2d.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2x3.cs b/src/OpenTK/Math/Matrix2x3.cs
index cd9b1c61..63b408fe 100644
--- a/src/OpenTK/Math/Matrix2x3.cs
+++ b/src/OpenTK/Math/Matrix2x3.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Collections.Generic;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2x3d.cs b/src/OpenTK/Math/Matrix2x3d.cs
index eacb772b..d470800c 100644
--- a/src/OpenTK/Math/Matrix2x3d.cs
+++ b/src/OpenTK/Math/Matrix2x3d.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Collections.Generic;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2x4.cs b/src/OpenTK/Math/Matrix2x4.cs
index d8e28c78..a162ce7f 100644
--- a/src/OpenTK/Math/Matrix2x4.cs
+++ b/src/OpenTK/Math/Matrix2x4.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix2x4d.cs b/src/OpenTK/Math/Matrix2x4d.cs
index 5b0772c8..883fa415 100644
--- a/src/OpenTK/Math/Matrix2x4d.cs
+++ b/src/OpenTK/Math/Matrix2x4d.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix3x2.cs b/src/OpenTK/Math/Matrix3x2.cs
index 7a401faf..27cfc5f8 100644
--- a/src/OpenTK/Math/Matrix3x2.cs
+++ b/src/OpenTK/Math/Matrix3x2.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix3x2d.cs b/src/OpenTK/Math/Matrix3x2d.cs
index 7f8c83cd..ba588577 100644
--- a/src/OpenTK/Math/Matrix3x2d.cs
+++ b/src/OpenTK/Math/Matrix3x2d.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix4x2.cs b/src/OpenTK/Math/Matrix4x2.cs
index 03585e28..98cad2e3 100644
--- a/src/OpenTK/Math/Matrix4x2.cs
+++ b/src/OpenTK/Math/Matrix4x2.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Matrix4x2d.cs b/src/OpenTK/Math/Matrix4x2d.cs
index ace28367..f87e2384 100644
--- a/src/OpenTK/Math/Matrix4x2d.cs
+++ b/src/OpenTK/Math/Matrix4x2d.cs
@@ -21,7 +21,6 @@ SOFTWARE.
  */
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace OpenTK
 {
diff --git a/src/OpenTK/Math/Point.cs b/src/OpenTK/Math/Point.cs
index b86fa64c..0ce27db4 100644
--- a/src/OpenTK/Math/Point.cs
+++ b/src/OpenTK/Math/Point.cs
@@ -23,10 +23,6 @@
  // OTHER DEALINGS IN THE SOFTWARE.
  //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
 #if MINIMAL
diff --git a/src/OpenTK/Math/Quaternion.cs b/src/OpenTK/Math/Quaternion.cs
index 386dcc5b..317742d5 100644
--- a/src/OpenTK/Math/Quaternion.cs
+++ b/src/OpenTK/Math/Quaternion.cs
@@ -22,7 +22,6 @@ SOFTWARE.
 
 using System;
 using System.Runtime.InteropServices;
-using System.ComponentModel;
 using System.Xml.Serialization;
 
 namespace OpenTK
diff --git a/src/OpenTK/Math/Quaterniond.cs b/src/OpenTK/Math/Quaterniond.cs
index 0e8802e5..851bb316 100644
--- a/src/OpenTK/Math/Quaterniond.cs
+++ b/src/OpenTK/Math/Quaterniond.cs
@@ -22,7 +22,6 @@ SOFTWARE.
 
 using System;
 using System.Runtime.InteropServices;
-using System.ComponentModel;
 using System.Xml.Serialization;
 
 namespace OpenTK
diff --git a/src/OpenTK/Math/Rectangle.cs b/src/OpenTK/Math/Rectangle.cs
index e4b5c535..20ccae27 100644
--- a/src/OpenTK/Math/Rectangle.cs
+++ b/src/OpenTK/Math/Rectangle.cs
@@ -23,10 +23,6 @@
  // OTHER DEALINGS IN THE SOFTWARE.
  //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
     #if MINIMAL
diff --git a/src/OpenTK/Math/Size.cs b/src/OpenTK/Math/Size.cs
index dc014801..3d49c078 100644
--- a/src/OpenTK/Math/Size.cs
+++ b/src/OpenTK/Math/Size.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
 #if MINIMAL
diff --git a/src/OpenTK/Minimal.cs b/src/OpenTK/Minimal.cs
index b2bafe8b..5cd83855 100644
--- a/src/OpenTK/Minimal.cs
+++ b/src/OpenTK/Minimal.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-#if !MINIMAL
-using System.Drawing;
+#if !MINIMAL
 #endif
-using System.Text;
 
 #if ANDROID || IPHONE || MINIMAL
 
diff --git a/src/OpenTK/Platform/Common/Hid.cs b/src/OpenTK/Platform/Common/Hid.cs
index 31940311..27815575 100644
--- a/src/OpenTK/Platform/Common/Hid.cs
+++ b/src/OpenTK/Platform/Common/Hid.cs
@@ -26,10 +26,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
-using OpenTK.Input;
 
 namespace OpenTK.Platform.Common
 {
diff --git a/src/OpenTK/Platform/DesktopGraphicsContext.cs b/src/OpenTK/Platform/DesktopGraphicsContext.cs
index b388c157..9c5e2d0c 100644
--- a/src/OpenTK/Platform/DesktopGraphicsContext.cs
+++ b/src/OpenTK/Platform/DesktopGraphicsContext.cs
@@ -23,7 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Diagnostics;
 using OpenTK.Graphics;
 
diff --git a/src/OpenTK/Platform/DeviceCollection.cs b/src/OpenTK/Platform/DeviceCollection.cs
index 0b6b5a2c..76bada03 100644
--- a/src/OpenTK/Platform/DeviceCollection.cs
+++ b/src/OpenTK/Platform/DeviceCollection.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
diff --git a/src/OpenTK/Platform/DisplayDeviceBase.cs b/src/OpenTK/Platform/DisplayDeviceBase.cs
index 65f82daf..fd501901 100644
--- a/src/OpenTK/Platform/DisplayDeviceBase.cs
+++ b/src/OpenTK/Platform/DisplayDeviceBase.cs
@@ -23,9 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Platform
 {
diff --git a/src/OpenTK/Platform/Dummy/DummyGLContext.cs b/src/OpenTK/Platform/Dummy/DummyGLContext.cs
index 38849d3a..6190e682 100644
--- a/src/OpenTK/Platform/Dummy/DummyGLContext.cs
+++ b/src/OpenTK/Platform/Dummy/DummyGLContext.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 
 using OpenTK.Graphics;
diff --git a/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs b/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs
index cb186a1d..95dafb34 100644
--- a/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs
+++ b/src/OpenTK/Platform/Dummy/DummyWindowInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Platform.Dummy
 {
diff --git a/src/OpenTK/Platform/Egl/Egl.cs b/src/OpenTK/Platform/Egl/Egl.cs
index 285de5b2..7e31380d 100644
--- a/src/OpenTK/Platform/Egl/Egl.cs
+++ b/src/OpenTK/Platform/Egl/Egl.cs
@@ -25,8 +25,6 @@
 
 using System;
 using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Text;
 using OpenTK.Graphics;
 
 // ReSharper disable InconsistentNaming
diff --git a/src/OpenTK/Platform/Egl/EglContext.cs b/src/OpenTK/Platform/Egl/EglContext.cs
index 991df579..5e123328 100644
--- a/src/OpenTK/Platform/Egl/EglContext.cs
+++ b/src/OpenTK/Platform/Egl/EglContext.cs
@@ -26,7 +26,6 @@
 using System;
 using System.Diagnostics;
 using OpenTK.Graphics;
-using OpenTK.Graphics.ES20;
 
 namespace OpenTK.Platform.Egl
 {
diff --git a/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs b/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs
index 315e38b6..a0e793fe 100644
--- a/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs
+++ b/src/OpenTK/Platform/Egl/EglMacPlatformFactory.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenTK.Graphics;
 using OpenTK.Platform.MacOS;
 
diff --git a/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs b/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs
index 3dbefe2f..1c21d19b 100644
--- a/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs
+++ b/src/OpenTK/Platform/Egl/EglSdl2PlatformFactory.cs
@@ -23,7 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using OpenTK.Graphics;
 using OpenTK.Platform.SDL2;
 
diff --git a/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs b/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs
index eaa9e6ec..115f95f6 100644
--- a/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs
+++ b/src/OpenTK/Platform/Egl/EglWinPlatformFactory.cs
@@ -24,9 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenTK.Graphics;
 using OpenTK.Platform.Windows;
 
diff --git a/src/OpenTK/Platform/Egl/EglWindowInfo.cs b/src/OpenTK/Platform/Egl/EglWindowInfo.cs
index 48331e96..dd00ced0 100644
--- a/src/OpenTK/Platform/Egl/EglWindowInfo.cs
+++ b/src/OpenTK/Platform/Egl/EglWindowInfo.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 using OpenTK.Graphics;
 
diff --git a/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs b/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs
index 1d9026aa..3e024b88 100644
--- a/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs
+++ b/src/OpenTK/Platform/Egl/EglX11PlatformFactory.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenTK.Graphics;
 using OpenTK.Platform.X11;
 
diff --git a/src/OpenTK/Platform/EmbeddedGraphicsContext.cs b/src/OpenTK/Platform/EmbeddedGraphicsContext.cs
index 4944c3d0..5959d8e1 100644
--- a/src/OpenTK/Platform/EmbeddedGraphicsContext.cs
+++ b/src/OpenTK/Platform/EmbeddedGraphicsContext.cs
@@ -23,7 +23,6 @@
  // OTHER DEALINGS IN THE SOFTWARE.
  //
 
-using System;
 using System.Diagnostics;
 using OpenTK.Graphics;
 
diff --git a/src/OpenTK/Platform/IDisplayDeviceDriver.cs b/src/OpenTK/Platform/IDisplayDeviceDriver.cs
index fa54186e..8ae9c37f 100644
--- a/src/OpenTK/Platform/IDisplayDeviceDriver.cs
+++ b/src/OpenTK/Platform/IDisplayDeviceDriver.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Platform
 {
     internal interface IDisplayDeviceDriver
diff --git a/src/OpenTK/Platform/IPlatformFactory.cs b/src/OpenTK/Platform/IPlatformFactory.cs
index 14818993..19be8b73 100644
--- a/src/OpenTK/Platform/IPlatformFactory.cs
+++ b/src/OpenTK/Platform/IPlatformFactory.cs
@@ -24,9 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenTK.Graphics;
 
 namespace OpenTK.Platform
diff --git a/src/OpenTK/Platform/IWindowInfo.cs b/src/OpenTK/Platform/IWindowInfo.cs
index e04de676..ced32cd1 100644
--- a/src/OpenTK/Platform/IWindowInfo.cs
+++ b/src/OpenTK/Platform/IWindowInfo.cs
@@ -5,8 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Platform
 {
diff --git a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs
index 60f4eaba..e8594f54 100644
--- a/src/OpenTK/Platform/Linux/Bindings/LibInput.cs
+++ b/src/OpenTK/Platform/Linux/Bindings/LibInput.cs
@@ -28,7 +28,6 @@
 #pragma warning disable 0169, 0219
 
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace OpenTK.Platform.Linux
diff --git a/src/OpenTK/Platform/Linux/DefaultCursor.cs b/src/OpenTK/Platform/Linux/DefaultCursor.cs
index a469e5d1..46a6b4a8 100644
--- a/src/OpenTK/Platform/Linux/DefaultCursor.cs
+++ b/src/OpenTK/Platform/Linux/DefaultCursor.cs
@@ -25,8 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-
 namespace OpenTK.Platform.Linux
 {
     internal static class Cursors
diff --git a/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs b/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs
index 7be6bbca..cae7b299 100644
--- a/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs
+++ b/src/OpenTK/Platform/Linux/LinuxDisplayDriver.cs
@@ -28,8 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using OpenTK;
-using OpenTK.Graphics;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/Platform/Linux/LinuxFactory.cs b/src/OpenTK/Platform/Linux/LinuxFactory.cs
index 6e180615..558e6dd0 100644
--- a/src/OpenTK/Platform/Linux/LinuxFactory.cs
+++ b/src/OpenTK/Platform/Linux/LinuxFactory.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
 using OpenTK.Graphics;
 using OpenTK.Input;
 using OpenTK.Platform.Egl;
diff --git a/src/OpenTK/Platform/Linux/LinuxInput.cs b/src/OpenTK/Platform/Linux/LinuxInput.cs
index f3e076dd..07b36665 100644
--- a/src/OpenTK/Platform/Linux/LinuxInput.cs
+++ b/src/OpenTK/Platform/Linux/LinuxInput.cs
@@ -26,7 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 #if !MINIMAL
 using System.Drawing;
diff --git a/src/OpenTK/Platform/Linux/LinuxJoystick.cs b/src/OpenTK/Platform/Linux/LinuxJoystick.cs
index 1979c90f..baa9229f 100644
--- a/src/OpenTK/Platform/Linux/LinuxJoystick.cs
+++ b/src/OpenTK/Platform/Linux/LinuxJoystick.cs
@@ -27,8 +27,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.Linux
diff --git a/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs b/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs
index 45407d50..2146d745 100644
--- a/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs
+++ b/src/OpenTK/Platform/Linux/LinuxKeyboardTTY.cs
@@ -25,12 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using OpenTK.Input;
-
 namespace OpenTK.Platform.Linux
 {
     // Todo: this has terrible side-effects on process exit
diff --git a/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs b/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
index a8cc8d40..b9c88608 100644
--- a/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
+++ b/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
@@ -30,7 +30,6 @@ using System.Diagnostics;
 #if !MINIMAL
 using System.Drawing;
 #endif
-using System.Runtime.InteropServices;
 using OpenTK.Graphics;
 using OpenTK.Input;
 using OpenTK.Platform.Egl;
diff --git a/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs b/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs
index 60a8605a..dcacc8c6 100644
--- a/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs
+++ b/src/OpenTK/Platform/Linux/LinuxWindowInfo.cs
@@ -26,7 +26,6 @@
 //
 
 using System;
-using System.Diagnostics;
 using OpenTK.Platform.Egl;
 
 namespace OpenTK.Platform.Linux
diff --git a/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs b/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs
index 757a0339..ed15c9d0 100644
--- a/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs
+++ b/src/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
index ea9ca562..406a5609 100644
--- a/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
+++ b/src/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
@@ -24,9 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MacOS/Cocoa/Class.cs b/src/OpenTK/Platform/MacOS/Cocoa/Class.cs
index a4241218..f292dc73 100644
--- a/src/OpenTK/Platform/MacOS/Cocoa/Class.cs
+++ b/src/OpenTK/Platform/MacOS/Cocoa/Class.cs
@@ -27,7 +27,6 @@
 
 using System.Runtime.InteropServices;
 using System;
-using System.Collections.Generic;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs b/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs
index 08cad1eb..6f4bbf01 100644
--- a/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs
+++ b/src/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs
@@ -30,7 +30,6 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
-using OpenTK.Platform.MacOS;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs b/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs
index f36dd1fe..bfef467d 100644
--- a/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs
+++ b/src/OpenTK/Platform/MacOS/CocoaWindowInfo.cs
@@ -26,9 +26,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MacOS/MacOSFactory.cs b/src/OpenTK/Platform/MacOS/MacOSFactory.cs
index 317e9b3d..9bd253ac 100644
--- a/src/OpenTK/Platform/MacOS/MacOSFactory.cs
+++ b/src/OpenTK/Platform/MacOS/MacOSFactory.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.MacOS
diff --git a/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs b/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs
index acd81ddb..29ca8390 100644
--- a/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs
+++ b/src/OpenTK/Platform/MacOS/MacOSKeyMap.cs
@@ -25,13 +25,8 @@
 
 //  Created by Erik Ylvisaker on 3/17/08.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK.Platform.MacOS
 {
-    using Carbon;
     using Input;
 
     internal static class MacOSKeyMap
diff --git a/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs b/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs
index a429042e..22837e7e 100644
--- a/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs
+++ b/src/OpenTK/Platform/MacOS/Quartz/CoreFoundation.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
diff --git a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
index 006373f5..f05e0082 100644
--- a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
+++ b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
@@ -25,8 +25,6 @@
 
 using System;
 using System.Runtime.InteropServices;
-using System.Diagnostics;
-using OpenTK.Platform.MacOS.Carbon;
 
 namespace OpenTK.Platform.MacOS
 {
diff --git a/src/OpenTK/Platform/MappedGamePadDriver.cs b/src/OpenTK/Platform/MappedGamePadDriver.cs
index af47c55c..83ff588d 100644
--- a/src/OpenTK/Platform/MappedGamePadDriver.cs
+++ b/src/OpenTK/Platform/MappedGamePadDriver.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenTK.Input;
 
 namespace OpenTK.Platform
diff --git a/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs b/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs
index 303f489f..d726f331 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2DisplayDeviceDriver.cs
@@ -23,9 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/Platform/SDL2/Sdl2Factory.cs b/src/OpenTK/Platform/SDL2/Sdl2Factory.cs
index f1c06b97..1011f084 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2Factory.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2Factory.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Diagnostics;
 using OpenTK.Graphics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs b/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs
index 7c653d2b..6b7de94d 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2GraphicsContext.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Diagnostics;
-using OpenTK;
 using OpenTK.Graphics;
 
 namespace OpenTK.Platform.SDL2
diff --git a/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs b/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs
index ef3ae523..ce1a4058 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2InputDriver.cs
@@ -27,7 +27,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Threading;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.SDL2
diff --git a/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs b/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs
index 628c78d0..63f3070e 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2KeyMap.cs
@@ -23,8 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.SDL2
diff --git a/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs b/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
index d1ddeca6..d1cecb87 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
@@ -23,8 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.SDL2
diff --git a/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs b/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs
index 90cb6f5d..894bb09a 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2Mouse.cs
@@ -24,10 +24,8 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 #if !MINIMAL
-using System.Drawing;
 #endif
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
index 146cf8e5..a04effce 100644
--- a/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
@@ -35,7 +35,6 @@ using OpenTK.Minimal;
 using System.Drawing.Imaging;
 #endif
 using System.Runtime.InteropServices;
-using OpenTK;
 using OpenTK.Input;
 using System.Text;
 
diff --git a/src/OpenTK/Platform/Utilities.cs b/src/OpenTK/Platform/Utilities.cs
index 5a85fa84..a1065bd9 100644
--- a/src/OpenTK/Platform/Utilities.cs
+++ b/src/OpenTK/Platform/Utilities.cs
@@ -3,9 +3,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Diagnostics;
 using OpenTK.Graphics;
diff --git a/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs b/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs
index abf4ea3f..6ac13ea1 100644
--- a/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs
+++ b/src/OpenTK/Platform/Windows/Bindings/HidProtocol.cs
@@ -26,10 +26,8 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.Text;
 using OpenTK.Platform.Common;
 
 namespace OpenTK.Platform.Windows
diff --git a/src/OpenTK/Platform/Windows/WglHelper.cs b/src/OpenTK/Platform/Windows/WglHelper.cs
index d3fdbedb..226e8430 100644
--- a/src/OpenTK/Platform/Windows/WglHelper.cs
+++ b/src/OpenTK/Platform/Windows/WglHelper.cs
@@ -7,9 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using OpenTK.Graphics;
 
 namespace OpenTK.Platform.Windows
 {
diff --git a/src/OpenTK/Platform/Windows/WinFactory.cs b/src/OpenTK/Platform/Windows/WinFactory.cs
index e778d0ff..d432c16a 100644
--- a/src/OpenTK/Platform/Windows/WinFactory.cs
+++ b/src/OpenTK/Platform/Windows/WinFactory.cs
@@ -24,11 +24,8 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Text;
-
 using OpenTK.Graphics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/Windows/WinGLContext.cs b/src/OpenTK/Platform/Windows/WinGLContext.cs
index 071e4cb2..37e062c6 100644
--- a/src/OpenTK/Platform/Windows/WinGLContext.cs
+++ b/src/OpenTK/Platform/Windows/WinGLContext.cs
@@ -5,12 +5,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
 using OpenTK.Graphics;
-using OpenTK.Graphics.OpenGL;
 
 namespace OpenTK.Platform.Windows
 {
diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs
index 896501fd..af9aa37f 100644
--- a/src/OpenTK/Platform/Windows/WinGLNative.cs
+++ b/src/OpenTK/Platform/Windows/WinGLNative.cs
@@ -27,10 +27,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
-using OpenTK.Graphics;
 using OpenTK.Input;
-using System.Collections.Generic;
-using System.IO;
 #if !MINIMAL
 using System.Drawing;
 using System.Drawing.Imaging;
diff --git a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
index c59c0805..c0633f3c 100644
--- a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
+++ b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
diff --git a/src/OpenTK/Platform/Windows/WinKeyMap.cs b/src/OpenTK/Platform/Windows/WinKeyMap.cs
index b667ffa2..8af4d5b5 100644
--- a/src/OpenTK/Platform/Windows/WinKeyMap.cs
+++ b/src/OpenTK/Platform/Windows/WinKeyMap.cs
@@ -23,9 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.Windows
diff --git a/src/OpenTK/Platform/Windows/WinRawInput.cs b/src/OpenTK/Platform/Windows/WinRawInput.cs
index 6909e0ee..18f18176 100644
--- a/src/OpenTK/Platform/Windows/WinRawInput.cs
+++ b/src/OpenTK/Platform/Windows/WinRawInput.cs
@@ -26,7 +26,6 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Threading;
 using OpenTK.Input;
 
 namespace OpenTK.Platform.Windows
diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
index 90112e99..38290b8c 100644
--- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Text;
 using OpenTK.Input;
 using OpenTK.Platform.Common;
 
diff --git a/src/OpenTK/Platform/Windows/WinWindowInfo.cs b/src/OpenTK/Platform/Windows/WinWindowInfo.cs
index 33269ad7..f23f2380 100644
--- a/src/OpenTK/Platform/Windows/WinWindowInfo.cs
+++ b/src/OpenTK/Platform/Windows/WinWindowInfo.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
diff --git a/src/OpenTK/Platform/Windows/XInputJoystick.cs b/src/OpenTK/Platform/Windows/XInputJoystick.cs
index 13ea46e6..8aa6823b 100644
--- a/src/OpenTK/Platform/Windows/XInputJoystick.cs
+++ b/src/OpenTK/Platform/Windows/XInputJoystick.cs
@@ -26,8 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenTK.Input;
 using System.Runtime.InteropServices;
 using System.Security;
diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs
index 25f73a67..6135aae2 100644
--- a/src/OpenTK/Platform/X11/API.cs
+++ b/src/OpenTK/Platform/X11/API.cs
@@ -4,8 +4,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
diff --git a/src/OpenTK/Platform/X11/Bindings/DL.cs b/src/OpenTK/Platform/X11/Bindings/DL.cs
index 5a698566..839e6b89 100644
--- a/src/OpenTK/Platform/X11/Bindings/DL.cs
+++ b/src/OpenTK/Platform/X11/Bindings/DL.cs
@@ -26,9 +26,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace OpenTK.Platform.X11
 {
diff --git a/src/OpenTK/Platform/X11/Bindings/Glx.cs b/src/OpenTK/Platform/X11/Bindings/Glx.cs
index 0df2e53d..9cb3e8b3 100644
--- a/src/OpenTK/Platform/X11/Bindings/Glx.cs
+++ b/src/OpenTK/Platform/X11/Bindings/Glx.cs
@@ -4,10 +4,7 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
-using System.Security;
 
 #pragma warning disable 1591
 
diff --git a/src/OpenTK/Platform/X11/Bindings/INotify.cs b/src/OpenTK/Platform/X11/Bindings/INotify.cs
index 662b12ab..d4a1afc8 100644
--- a/src/OpenTK/Platform/X11/Bindings/INotify.cs
+++ b/src/OpenTK/Platform/X11/Bindings/INotify.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenTK.Platform.X11.Bindings
+namespace OpenTK.Platform.X11.Bindings
 {
     // Fully implemented but not currently used by OpenTK
     // See System.IO.FileSystemWatcher for a cross-platform alternative
diff --git a/src/OpenTK/Platform/X11/Bindings/XI.cs b/src/OpenTK/Platform/X11/Bindings/XI.cs
index 5d169408..3f491aad 100644
--- a/src/OpenTK/Platform/X11/Bindings/XI.cs
+++ b/src/OpenTK/Platform/X11/Bindings/XI.cs
@@ -24,9 +24,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace OpenTK.Platform.X11
 {
diff --git a/src/OpenTK/Platform/X11/Functions.cs b/src/OpenTK/Platform/X11/Functions.cs
index 352f9c14..672b74bd 100644
--- a/src/OpenTK/Platform/X11/Functions.cs
+++ b/src/OpenTK/Platform/X11/Functions.cs
@@ -5,7 +5,6 @@
  */
 
 using System;
-using System.Collections.Generic;
 #if !MINIMAL
 using System.Drawing;
 #endif
diff --git a/src/OpenTK/Platform/X11/Structs.cs b/src/OpenTK/Platform/X11/Structs.cs
index 5961c643..25efd813 100644
--- a/src/OpenTK/Platform/X11/Structs.cs
+++ b/src/OpenTK/Platform/X11/Structs.cs
@@ -27,12 +27,8 @@
 // NOT COMPLETE
 
 using System;
-using System.ComponentModel;
-using System.Collections;
 #if !MINIMAL
-using System.Drawing;
 #endif
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 // Disable unused field warnings. This is interop, we don't use everything
diff --git a/src/OpenTK/Platform/X11/X11GLContext.cs b/src/OpenTK/Platform/X11/X11GLContext.cs
index 8a78cc4d..f661ee4d 100644
--- a/src/OpenTK/Platform/X11/X11GLContext.cs
+++ b/src/OpenTK/Platform/X11/X11GLContext.cs
@@ -4,8 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Diagnostics;
 
 using OpenTK.Graphics;
diff --git a/src/OpenTK/Platform/X11/X11GLNative.cs b/src/OpenTK/Platform/X11/X11GLNative.cs
index cd2c30ff..df838a44 100644
--- a/src/OpenTK/Platform/X11/X11GLNative.cs
+++ b/src/OpenTK/Platform/X11/X11GLNative.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 #if !MINIMAL
diff --git a/src/OpenTK/Platform/X11/X11GraphicsMode.cs b/src/OpenTK/Platform/X11/X11GraphicsMode.cs
index 1bf9ec0d..a5163b17 100644
--- a/src/OpenTK/Platform/X11/X11GraphicsMode.cs
+++ b/src/OpenTK/Platform/X11/X11GraphicsMode.cs
@@ -6,7 +6,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 
diff --git a/src/OpenTK/Platform/X11/X11Input.cs b/src/OpenTK/Platform/X11/X11Input.cs
index 63ac1196..e20966bc 100644
--- a/src/OpenTK/Platform/X11/X11Input.cs
+++ b/src/OpenTK/Platform/X11/X11Input.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.Diagnostics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/X11/X11KeyMap.cs b/src/OpenTK/Platform/X11/X11KeyMap.cs
index b126b104..cb8d2c8e 100644
--- a/src/OpenTK/Platform/X11/X11KeyMap.cs
+++ b/src/OpenTK/Platform/X11/X11KeyMap.cs
@@ -26,8 +26,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/X11/X11Keyboard.cs b/src/OpenTK/Platform/X11/X11Keyboard.cs
index 8f5e7132..b7913c6b 100644
--- a/src/OpenTK/Platform/X11/X11Keyboard.cs
+++ b/src/OpenTK/Platform/X11/X11Keyboard.cs
@@ -24,7 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/X11/X11Mouse.cs b/src/OpenTK/Platform/X11/X11Mouse.cs
index 1979176c..cc0a59db 100644
--- a/src/OpenTK/Platform/X11/X11Mouse.cs
+++ b/src/OpenTK/Platform/X11/X11Mouse.cs
@@ -24,7 +24,6 @@
  //
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Platform/X11/X11WindowInfo.cs b/src/OpenTK/Platform/X11/X11WindowInfo.cs
index f3eb3abe..56687636 100644
--- a/src/OpenTK/Platform/X11/X11WindowInfo.cs
+++ b/src/OpenTK/Platform/X11/X11WindowInfo.cs
@@ -24,9 +24,7 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace OpenTK.Platform.X11
 {
diff --git a/src/OpenTK/Platform/X11/XI2Input.cs b/src/OpenTK/Platform/X11/XI2Input.cs
index a5bd5b57..0ebe418e 100644
--- a/src/OpenTK/Platform/X11/XI2Input.cs
+++ b/src/OpenTK/Platform/X11/XI2Input.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 //
 
-using System;
 using System.Diagnostics;
 using OpenTK.Input;
 
diff --git a/src/OpenTK/Toolkit.cs b/src/OpenTK/Toolkit.cs
index dc7c8fec..f8bfd4a4 100644
--- a/src/OpenTK/Toolkit.cs
+++ b/src/OpenTK/Toolkit.cs
@@ -24,8 +24,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenTK.Platform;
 using System.Diagnostics;
 
diff --git a/src/OpenTK/ToolkitOptions.cs b/src/OpenTK/ToolkitOptions.cs
index 02bf3521..47fb3ba4 100644
--- a/src/OpenTK/ToolkitOptions.cs
+++ b/src/OpenTK/ToolkitOptions.cs
@@ -23,10 +23,6 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
     /// <summary>
diff --git a/src/OpenTK/WindowBorder.cs b/src/OpenTK/WindowBorder.cs
index 2d94de03..1f6aa7bd 100644
--- a/src/OpenTK/WindowBorder.cs
+++ b/src/OpenTK/WindowBorder.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenTK
+namespace OpenTK
 {
     /// <summary>
     /// Enumerates available window borders.
diff --git a/src/OpenTK/WindowState.cs b/src/OpenTK/WindowState.cs
index 24045808..84473628 100644
--- a/src/OpenTK/WindowState.cs
+++ b/src/OpenTK/WindowState.cs
@@ -4,10 +4,6 @@
  * See license.txt for licensing details.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenTK
 {
     /// <summary>