diff --git a/Source/Core/Config/ResourceTextureSet.cs b/Source/Core/Config/ResourceTextureSet.cs
index 5dc3f7c..5e26c05 100644
--- a/Source/Core/Config/ResourceTextureSet.cs
+++ b/Source/Core/Config/ResourceTextureSet.cs
@@ -18,7 +18,6 @@
 
 using System.Collections.Generic;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
 
 #endregion
 
diff --git a/Source/Core/Controls/ArgumentBox.cs b/Source/Core/Controls/ArgumentBox.cs
index c4a771f..9a7bac1 100644
--- a/Source/Core/Controls/ArgumentBox.cs
+++ b/Source/Core/Controls/ArgumentBox.cs
@@ -17,15 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Types;
 using System.Globalization;
-using CodeImp.DoomBuilder.Controls;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Controls/FieldsEditorControl.cs b/Source/Core/Controls/FieldsEditorControl.cs
index 6901af3..9ff66ce 100644
--- a/Source/Core/Controls/FieldsEditorControl.cs
+++ b/Source/Core/Controls/FieldsEditorControl.cs
@@ -23,7 +23,6 @@ using System.Drawing;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Map;
-using System.Globalization;
 using CodeImp.DoomBuilder.Types;
 
 #endregion
diff --git a/Source/Core/Controls/MultiSelectTreeview.cs b/Source/Core/Controls/MultiSelectTreeview.cs
index e419bbb..9d5bab9 100644
--- a/Source/Core/Controls/MultiSelectTreeview.cs
+++ b/Source/Core/Controls/MultiSelectTreeview.cs
@@ -72,7 +72,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Controls/ThingBrowserControl.cs b/Source/Core/Controls/ThingBrowserControl.cs
index 59b34bb..b2e855e 100644
--- a/Source/Core/Controls/ThingBrowserControl.cs
+++ b/Source/Core/Controls/ThingBrowserControl.cs
@@ -23,9 +23,6 @@ using System.Globalization;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Controls;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-
 
 #endregion
 
diff --git a/Source/Core/GZBuilder/Data/BoundingBox.cs b/Source/Core/GZBuilder/Data/BoundingBox.cs
index b8a1537..212b087 100644
--- a/Source/Core/GZBuilder/Data/BoundingBox.cs
+++ b/Source/Core/GZBuilder/Data/BoundingBox.cs
@@ -1,6 +1,5 @@
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
-using SlimDX;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data
 {
diff --git a/Source/Core/Geometry/Line3D.cs b/Source/Core/Geometry/Line3D.cs
index 76b6ce4..3276782 100644
--- a/Source/Core/Geometry/Line3D.cs
+++ b/Source/Core/Geometry/Line3D.cs
@@ -1,5 +1,4 @@
 using System;
-using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
 
 namespace CodeImp.DoomBuilder.Geometry 
diff --git a/Source/Core/Geometry/Tools.cs b/Source/Core/Geometry/Tools.cs
index 7ee2baa..4f8a2b2 100644
--- a/Source/Core/Geometry/Tools.cs
+++ b/Source/Core/Geometry/Tools.cs
@@ -22,8 +22,6 @@ using System.Drawing;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Types;
diff --git a/Source/Core/Plugins/Plug.cs b/Source/Core/Plugins/Plug.cs
index 36fd798..34866e7 100644
--- a/Source/Core/Plugins/Plug.cs
+++ b/Source/Core/Plugins/Plug.cs
@@ -1,7 +1,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Editing;
diff --git a/Source/Core/Rendering/Renderer.cs b/Source/Core/Rendering/Renderer.cs
index d013f98..61a59b2 100644
--- a/Source/Core/Rendering/Renderer.cs
+++ b/Source/Core/Rendering/Renderer.cs
@@ -17,7 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
 
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
index 4fc58e4..1a538d2 100644
--- a/Source/Core/Rendering/Renderer2D.cs
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -27,8 +27,6 @@ using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 using CodeImp.DoomBuilder.Config; //mxd
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
 
 #endregion
 
diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs
index 0182a52..677bb89 100644
--- a/Source/Core/Rendering/Renderer3D.cs
+++ b/Source/Core/Rendering/Renderer3D.cs
@@ -24,7 +24,6 @@ using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.GZBuilder.MD3;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.VisualModes;
 using SlimDX;
diff --git a/Source/Core/Rendering/ShaderManager.cs b/Source/Core/Rendering/ShaderManager.cs
index f28054a..7d37b2a 100644
--- a/Source/Core/Rendering/ShaderManager.cs
+++ b/Source/Core/Rendering/ShaderManager.cs
@@ -17,7 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using SlimDX.Direct3D9;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceManager.cs b/Source/Core/Rendering/SurfaceManager.cs
index 1195272..de817ce 100644
--- a/Source/Core/Rendering/SurfaceManager.cs
+++ b/Source/Core/Rendering/SurfaceManager.cs
@@ -18,13 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Drawing;
-using CodeImp.DoomBuilder.IO;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Data;
 
 #endregion
 
diff --git a/Source/Core/Rendering/VisualVertexHandle.cs b/Source/Core/Rendering/VisualVertexHandle.cs
index 4df8176..e5323cd 100644
--- a/Source/Core/Rendering/VisualVertexHandle.cs
+++ b/Source/Core/Rendering/VisualVertexHandle.cs
@@ -3,7 +3,6 @@
 using System;
 using CodeImp.DoomBuilder.VisualModes;
 using SlimDX.Direct3D9;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
index 4b23347..77104c5 100644
--- a/Source/Core/Windows/MainForm.cs
+++ b/Source/Core/Windows/MainForm.cs
@@ -35,7 +35,6 @@ using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Plugins;
diff --git a/Source/Core/Windows/TagStatisticsForm.cs b/Source/Core/Windows/TagStatisticsForm.cs
index 73fd4aa..5018503 100644
--- a/Source/Core/Windows/TagStatisticsForm.cs
+++ b/Source/Core/Windows/TagStatisticsForm.cs
@@ -8,7 +8,6 @@ using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Windows;
 
 #endregion
 
diff --git a/Source/Core/Windows/ThingStatisticsForm.cs b/Source/Core/Windows/ThingStatisticsForm.cs
index 965c978..b07fa01 100644
--- a/Source/Core/Windows/ThingStatisticsForm.cs
+++ b/Source/Core/Windows/ThingStatisticsForm.cs
@@ -7,7 +7,6 @@ using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Windows;
 
 namespace CodeImp.DoomBuilder.Windows
 {
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
index 475a2ac..72eefe5 100644
--- a/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
@@ -1,7 +1,6 @@
 #region ================== Namespaces
 
 using System;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
index 9476d73..b8f3708 100644
--- a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
@@ -17,7 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
index bdcfd8f..76240f4 100644
--- a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
@@ -17,7 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
index 3441518..1868987 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.BuilderModes.Interface;
@@ -33,7 +32,6 @@ using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.Types;
 using CodeImp.DoomBuilder.Data;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Plugins/NodesViewer/BuilderPlug.cs b/Source/Plugins/NodesViewer/BuilderPlug.cs
index 5baff07..adfdd8c 100644
--- a/Source/Plugins/NodesViewer/BuilderPlug.cs
+++ b/Source/Plugins/NodesViewer/BuilderPlug.cs
@@ -16,9 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.IO;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Plugins.NodesViewer
diff --git a/Source/Plugins/TagRange/BuilderPlug.cs b/Source/Plugins/TagRange/BuilderPlug.cs
index 27e2c0b..2764a69 100644
--- a/Source/Plugins/TagRange/BuilderPlug.cs
+++ b/Source/Plugins/TagRange/BuilderPlug.cs
@@ -16,7 +16,6 @@
 
 #region ================== Namespaces
 
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Plugins;