diff --git a/OpenRA.Game/Traits/Health.cs b/OpenRA.Game/Traits/Health.cs
index 9016815c7c..b0ed272441 100755
--- a/OpenRA.Game/Traits/Health.cs
+++ b/OpenRA.Game/Traits/Health.cs
@@ -6,16 +6,11 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Effects;
-using OpenRA.Traits.Activities;
+#endregion
+
+using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.GameRules;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
diff --git a/OpenRA.Mods.RA/ActorLostNotification.cs b/OpenRA.Mods.RA/ActorLostNotification.cs
index 704ab5cae1..4f62c744dd 100644
--- a/OpenRA.Mods.RA/ActorLostNotification.cs
+++ b/OpenRA.Mods.RA/ActorLostNotification.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+
 namespace OpenRA.Mods.RA
 {
 	class ActorLostNotificationInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs
index 0aa602372d..42c5dd0c5d 100755
--- a/OpenRA.Mods.RA/Air/Aircraft.cs
+++ b/OpenRA.Mods.RA/Air/Aircraft.cs
@@ -8,10 +8,10 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
-using System;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs
index 02a0dea764..e10046f4da 100644
--- a/OpenRA.Mods.RA/AttackBase.cs
+++ b/OpenRA.Mods.RA/AttackBase.cs
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
-using OpenRA.GameRules;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/AttackLeap.cs b/OpenRA.Mods.RA/AttackLeap.cs
index e864e8a1bd..3eeeac80ea 100644
--- a/OpenRA.Mods.RA/AttackLeap.cs
+++ b/OpenRA.Mods.RA/AttackLeap.cs
@@ -8,8 +8,8 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Activities;
 using System;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/AttackMove.cs b/OpenRA.Mods.RA/AttackMove.cs
index 1fb140a071..adbb82026c 100644
--- a/OpenRA.Mods.RA/AttackMove.cs
+++ b/OpenRA.Mods.RA/AttackMove.cs
@@ -8,11 +8,10 @@
  */
 #endregion
 
-using System;
 using System.Drawing;
 using OpenRA.Effects;
-using OpenRA.Traits;
 using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/AttackOmni.cs b/OpenRA.Mods.RA/AttackOmni.cs
index b895194c9f..7a7aa3c443 100644
--- a/OpenRA.Mods.RA/AttackOmni.cs
+++ b/OpenRA.Mods.RA/AttackOmni.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/AttackTesla.cs b/OpenRA.Mods.RA/AttackTesla.cs
index e173d8b28d..4244c8d933 100644
--- a/OpenRA.Mods.RA/AttackTesla.cs
+++ b/OpenRA.Mods.RA/AttackTesla.cs
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using System;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs
index 68c14ba0bd..da1a0d8b02 100644
--- a/OpenRA.Mods.RA/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
diff --git a/OpenRA.Mods.RA/BuildingCaptureNotification.cs b/OpenRA.Mods.RA/BuildingCaptureNotification.cs
index 48f6f6387a..267b811fa2 100644
--- a/OpenRA.Mods.RA/BuildingCaptureNotification.cs
+++ b/OpenRA.Mods.RA/BuildingCaptureNotification.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Traits;
+
 namespace OpenRA.Mods.RA
 {
 	class CaptureNotificationInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/ChronoshiftDeploy.cs b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
index 62e0d45cd2..931a5baefa 100644
--- a/OpenRA.Mods.RA/ChronoshiftDeploy.cs
+++ b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
@@ -10,8 +10,8 @@
 
 using System.Collections.Generic;
 using OpenRA.Effects;
-using OpenRA.Mods.RA.Orders;
 using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Orders;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
index 631f8bfe62..ac093d644a 100644
--- a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
+++ b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
@@ -10,9 +10,9 @@
 
 using System.Collections.Generic;
 using OpenRA.FileFormats;
+using OpenRA.Graphics;
 using OpenRA.Traits;
-using OpenRA.Widgets.Delegates;
-using OpenRA.Graphics;
+using OpenRA.Widgets.Delegates;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/CrateDrop.cs b/OpenRA.Mods.RA/CrateDrop.cs
index 9304c9ae63..4a4636b942 100644
--- a/OpenRA.Mods.RA/CrateDrop.cs
+++ b/OpenRA.Mods.RA/CrateDrop.cs
@@ -12,10 +12,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Air;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Air;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/DefaultShellmapScript.cs b/OpenRA.Mods.RA/DefaultShellmapScript.cs
index a748563eed..6c826305f3 100755
--- a/OpenRA.Mods.RA/DefaultShellmapScript.cs
+++ b/OpenRA.Mods.RA/DefaultShellmapScript.cs
@@ -6,13 +6,12 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
+#endregion
+
 using System;
-using OpenRA.Mods.RA.Air;
+using System.Collections.Generic;
+using OpenRA.Mods.RA.Air;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/DemoTruck.cs b/OpenRA.Mods.RA/DemoTruck.cs
index 6ec8589ddc..bdac2df8ef 100644
--- a/OpenRA.Mods.RA/DemoTruck.cs
+++ b/OpenRA.Mods.RA/DemoTruck.cs
@@ -8,7 +8,6 @@
  */
 #endregion
 
-using OpenRA.Mods.RA;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/DetectCloaked.cs b/OpenRA.Mods.RA/DetectCloaked.cs
index f247638be8..75abb6ab5b 100644
--- a/OpenRA.Mods.RA/DetectCloaked.cs
+++ b/OpenRA.Mods.RA/DetectCloaked.cs
@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Linq;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Effects/Contrail.cs b/OpenRA.Mods.RA/Effects/Contrail.cs
index 1de6e55df3..b79ae3d6cf 100755
--- a/OpenRA.Mods.RA/Effects/Contrail.cs
+++ b/OpenRA.Mods.RA/Effects/Contrail.cs
@@ -9,10 +9,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.Graphics;
-using OpenRA.Traits;
 using System.Drawing;
 using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/FreeActor.cs b/OpenRA.Mods.RA/FreeActor.cs
index fc3e818588..c1a78da3d1 100644
--- a/OpenRA.Mods.RA/FreeActor.cs
+++ b/OpenRA.Mods.RA/FreeActor.cs
@@ -8,9 +8,8 @@
  */
 #endregion
 
-using System.Linq;
-using OpenRA.Traits;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs
index ab8acb7567..aacf358f4b 100644
--- a/OpenRA.Mods.RA/Harvester.cs
+++ b/OpenRA.Mods.RA/Harvester.cs
@@ -13,10 +13,9 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/IdleAnimation.cs b/OpenRA.Mods.RA/IdleAnimation.cs
index 0909d1297a..d17c8227e6 100644
--- a/OpenRA.Mods.RA/IdleAnimation.cs
+++ b/OpenRA.Mods.RA/IdleAnimation.cs
@@ -6,9 +6,8 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using OpenRA.GameRules;
+#endregion
+
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs
index f43260da9e..bd97f48a89 100644
--- a/OpenRA.Mods.RA/Mine.cs
+++ b/OpenRA.Mods.RA/Mine.cs
@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/NukePaletteEffect.cs b/OpenRA.Mods.RA/NukePaletteEffect.cs
index 4552ec55bc..2b109fc1b2 100644
--- a/OpenRA.Mods.RA/NukePaletteEffect.cs
+++ b/OpenRA.Mods.RA/NukePaletteEffect.cs
@@ -6,12 +6,12 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System.Drawing;
-using OpenRA.Traits;
+#endregion
+
 using System.Collections.Generic;
+using System.Drawing;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs b/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
index 03ceaecd29..da251d0221 100644
--- a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
+++ b/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
@@ -8,9 +8,8 @@
  */
 #endregion
 
-using System;
-using OpenRA.Traits;
 using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {