diff --git a/Source/Core/Config/ResourceTextureSet.cs b/Source/Core/Config/ResourceTextureSet.cs
index 5dc3f7c06529f020bf2d6f36f60638a3f5547df1..5e26c05c4f813f1fa10384fb3e6000652ce5f1e4 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 c4a771f658cc3c6ccf10bdf0e5eb1c85925083a8..9a7bac15a0ddb8eec8943d8b76842186c5bf9282 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 6901af33002c1228752829c6bd53b6a722ebe2ec..9ff66cecc9cdc942c2245bc9ddf431db0627e4ef 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 e419bbb266e3af23f0c820a8f6c27c89fff24d93..9d5bab9473111537518ec3f67bffddf7fab4db78 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 59b34bb155c5a087c2012c289526070794022f9b..b2e855e3567d0fce8bf32986f1c89ea72d2097e8 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 b8a153775394203629741c599cdcaaf065c884c2..212b08751fc2959b4a628d06ef509ca7e2648435 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 76b6ce4500c37731231f4ed671bd82f7af894c62..327678271ff0b0ba5733570691c2c5653fbb5581 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 7ee2baa1c9fca0190f517b51b83be55dadbafdc3..4f8a2b2ea373c24f0045c0b56bb8247d84187c01 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 36fd798028a3b36404c4892957b57a45ba28db8e..34866e70b8a8e82397bb46aba45ee7a4c14f2080 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 d013f9849391d26d73cb264ac21f4a1102da4105..61a59b27b48f33083a3b7f326052a609a6ed56d6 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 4fc58e4e2d7696b64dadcae714c5259d741d58b3..1a538d239b138c5f7a39a4e4fc232df2a2700752 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 0182a529094c7e7c70290db5c3767b71baec96c2..677bb89e1f53791b8359e2419c7917d214ecdffa 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 f28054a443237a9e8e0aaa96d7a3849a5d4fd475..7d37b2aef7ac11f89542caaf68fa1b9f72da2801 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 11952726213e16ca20d941c625976f16a60069dc..de817ce0268919c1ee39f3aecc6c6643ec33a146 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 4df81761e4d21204a798b9aea1d4681f33c349da..e5323cd898d9c5bb57aff109ee410d57bd0dd01e 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 4b233476dd5d064660fc06e794bf3a3ab8f1c7a8..77104c548def349d71f379f3aeb40a67a5b7443a 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 73fd4aa8cbeab169405d612a3caf64d2a019d71c..50185032953a1f849c3728a67711d89717991c9d 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 965c978e53a79d7ecd77c9be917c0b33a2f3d97c..b07fa01939e45ae50f4c2b97ec7f00088f3eed83 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 475a2acce65b1b27216ade72469f7b75a74246ee..72eefe5fd67b593cb37241dd89a5adbf9b7f5b5c 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 9476d73c8acaf31383c40e5eb1e365a5e7108720..b8f370813398cb895e36c23a1e76a6ce4a5e39ce 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 bdcfd8f6b2d00ecee49a59b8638119df47e4fa1a..76240f4e49882b0af6ed050685b7c70785461bfb 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 3441518fc825e933e9f30e85420ea8afdd6f9f06..186898736e13c558c0e7e8b32f2f68d38d059d4d 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 5baff071e3922983c91020adaa2d40f10a30cdf8..adfdd8cf09c714631a1bf2a49c1306d3e15669ab 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 27e2c0b01796b7b61a20788f567bfde1541db2e5..2764a69b50c29ec77c6b7d298e497f4db1a9b0f9 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;