From ee8e1f46c1cacfd961c74b4cd58c59c20ad6eee8 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 14 Dec 2014 17:06:29 +0100
Subject: [PATCH] Move 'Activity' into its own namespace in OpenRA.Game.

---
 OpenRA.Game/{Traits => Activities}/Activity.cs             | 3 ++-
 {OpenRA.Mods.Common => OpenRA.Game}/Activities/CallFunc.cs | 3 +--
 OpenRA.Game/Actor.cs                                       | 1 +
 OpenRA.Game/OpenRA.Game.csproj                             | 3 ++-
 OpenRA.Game/Traits/TraitsInterfaces.cs                     | 1 +
 OpenRA.Game/Traits/Util.cs                                 | 1 +
 OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs        | 1 +
 OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs      | 1 +
 OpenRA.Mods.Cnc/Traits/Buildings/TiberiumRefinery.cs       | 1 +
 OpenRA.Mods.Common/Activities/Move/Drag.cs                 | 1 +
 OpenRA.Mods.Common/Activities/RemoveSelf.cs                | 2 +-
 OpenRA.Mods.Common/Activities/SimpleTeleport.cs            | 1 +
 OpenRA.Mods.Common/CommonTraitsInterfaces.cs               | 1 +
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj               | 1 -
 OpenRA.Mods.Common/Scripting/CallLuaFunc.cs                | 1 +
 OpenRA.Mods.D2k/AutoCarryall/CarryUnit.cs                  | 1 +
 OpenRA.Mods.D2k/AutoCarryall/Carryable.cs                  | 1 +
 OpenRA.Mods.D2k/SwallowActor.cs                            | 1 +
 OpenRA.Mods.RA/Activities/Air/FallToEarth.cs               | 1 +
 OpenRA.Mods.RA/Activities/Air/Fly.cs                       | 1 +
 OpenRA.Mods.RA/Activities/Air/FlyAttack.cs                 | 3 ++-
 OpenRA.Mods.RA/Activities/Air/FlyCircle.cs                 | 1 +
 OpenRA.Mods.RA/Activities/Air/FlyFollow.cs                 | 1 +
 OpenRA.Mods.RA/Activities/Air/FlyTimed.cs                  | 1 +
 OpenRA.Mods.RA/Activities/Air/HeliAttack.cs                | 1 +
 OpenRA.Mods.RA/Activities/Air/HeliFly.cs                   | 1 +
 OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs             | 3 ++-
 OpenRA.Mods.RA/Activities/Air/HeliLand.cs                  | 2 +-
 OpenRA.Mods.RA/Activities/Air/HeliReturn.cs                | 1 +
 OpenRA.Mods.RA/Activities/Air/Land.cs                      | 1 +
 OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs          | 1 +
 OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs              | 1 +
 OpenRA.Mods.RA/Activities/Air/TakeOff.cs                   | 1 +
 OpenRA.Mods.RA/Activities/Attack.cs                        | 1 +
 OpenRA.Mods.RA/Activities/AttackMoveActivity.cs            | 1 +
 OpenRA.Mods.RA/Activities/CaptureActor.cs                  | 1 +
 OpenRA.Mods.RA/Activities/DeliverResources.cs              | 1 +
 OpenRA.Mods.RA/Activities/Demolish.cs                      | 1 +
 OpenRA.Mods.RA/Activities/DonateSupplies.cs                | 1 +
 OpenRA.Mods.RA/Activities/Enter.cs                         | 1 +
 OpenRA.Mods.RA/Activities/EnterTransport.cs                | 1 +
 OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs          | 1 +
 OpenRA.Mods.RA/Activities/FindResources.cs                 | 1 +
 OpenRA.Mods.RA/Activities/Follow.cs                        | 1 +
 OpenRA.Mods.RA/Activities/Heal.cs                          | 1 +
 OpenRA.Mods.RA/Activities/Hunt.cs                          | 1 +
 OpenRA.Mods.RA/Activities/Infiltrate.cs                    | 1 +
 OpenRA.Mods.RA/Activities/LayMines.cs                      | 1 +
 OpenRA.Mods.RA/Activities/Leap.cs                          | 1 +
 OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs                | 1 +
 OpenRA.Mods.RA/Activities/MoveWithinRange.cs               | 1 +
 OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs       | 1 +
 OpenRA.Mods.RA/Activities/Rearm.cs                         | 1 +
 OpenRA.Mods.RA/Activities/Repair.cs                        | 1 +
 OpenRA.Mods.RA/Activities/RepairBridge.cs                  | 1 +
 OpenRA.Mods.RA/Activities/RepairBuilding.cs                | 1 +
 OpenRA.Mods.RA/Activities/Sell.cs                          | 1 +
 OpenRA.Mods.RA/Activities/Teleport.cs                      | 1 +
 OpenRA.Mods.RA/Activities/Transform.cs                     | 1 +
 OpenRA.Mods.RA/Activities/Turn.cs                          | 1 +
 OpenRA.Mods.RA/Activities/UnloadCargo.cs                   | 1 +
 OpenRA.Mods.RA/Activities/Wait.cs                          | 1 +
 OpenRA.Mods.RA/Attack/AttackBase.cs                        | 1 +
 OpenRA.Mods.RA/Attack/AttackCharge.cs                      | 1 +
 OpenRA.Mods.RA/Attack/AttackFollow.cs                      | 1 +
 OpenRA.Mods.RA/Attack/AttackFrontal.cs                     | 1 +
 OpenRA.Mods.RA/Attack/AttackGarrisoned.cs                  | 1 +
 OpenRA.Mods.RA/Attack/AttackLeap.cs                        | 1 +
 OpenRA.Mods.RA/Attack/AttackMedic.cs                       | 1 +
 OpenRA.Mods.RA/Attack/AttackOmni.cs                        | 1 +
 OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs               | 1 +
 OpenRA.Mods.RA/Attack/AttackTurreted.cs                    | 1 +
 OpenRA.Mods.RA/Attack/AttackWander.cs                      | 1 +
 OpenRA.Mods.RA/AutoTarget.cs                               | 1 +
 OpenRA.Mods.RA/Move/Mobile.cs                              | 1 +
 OpenRA.Mods.RA/Move/Move.cs                                | 1 +
 OpenRA.Mods.RA/Production.cs                               | 1 +
 OpenRA.Mods.RA/Render/RenderHarvester.cs                   | 3 ++-
 OpenRA.Mods.RA/Render/WithHarvestAnimation.cs              | 1 +
 OpenRA.Mods.RA/Render/WithMakeAnimation.cs                 | 1 +
 OpenRA.Mods.RA/Repairable.cs                               | 1 +
 OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs    | 1 +
 OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs    | 1 +
 OpenRA.Mods.RA/Traits/Air/Aircraft.cs                      | 1 +
 OpenRA.Mods.RA/Traits/Air/AttackBomber.cs                  | 1 +
 OpenRA.Mods.RA/Traits/Air/AttackHeli.cs                    | 1 +
 OpenRA.Mods.RA/Traits/Air/AttackPlane.cs                   | 1 +
 OpenRA.Mods.RA/Traits/Air/Helicopter.cs                    | 1 +
 OpenRA.Mods.RA/Traits/Air/Plane.cs                         | 1 +
 OpenRA.Mods.RA/Traits/Buildings/FreeActor.cs               | 1 +
 OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs             | 1 +
 OpenRA.Mods.RA/Traits/DemoTruck.cs                         | 1 +
 OpenRA.Mods.RA/Traits/Harvester.cs                         | 1 +
 OpenRA.Mods.RA/Traits/MadTank.cs                           | 3 ++-
 OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs    | 1 +
 OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs     | 1 +
 96 files changed, 101 insertions(+), 11 deletions(-)
 rename OpenRA.Game/{Traits => Activities}/Activity.cs (96%)
 rename {OpenRA.Mods.Common => OpenRA.Game}/Activities/CallFunc.cs (92%)

diff --git a/OpenRA.Game/Traits/Activity.cs b/OpenRA.Game/Activities/Activity.cs
similarity index 96%
rename from OpenRA.Game/Traits/Activity.cs
rename to OpenRA.Game/Activities/Activity.cs
index 825947856f..16b2449125 100644
--- a/OpenRA.Game/Traits/Activity.cs
+++ b/OpenRA.Game/Activities/Activity.cs
@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Activities
 {
 	public abstract class Activity
 	{
diff --git a/OpenRA.Mods.Common/Activities/CallFunc.cs b/OpenRA.Game/Activities/CallFunc.cs
similarity index 92%
rename from OpenRA.Mods.Common/Activities/CallFunc.cs
rename to OpenRA.Game/Activities/CallFunc.cs
index 49f460d924..6ec60525db 100644
--- a/OpenRA.Mods.Common/Activities/CallFunc.cs
+++ b/OpenRA.Game/Activities/CallFunc.cs
@@ -9,9 +9,8 @@
 #endregion
 
 using System;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Activities
+namespace OpenRA.Activities
 {
 	public class CallFunc : Activity
 	{
diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index 4015836f49..919cc93ac8 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Scripting;
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index aa50dadabe..3765eefdeb 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -81,6 +81,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Activities\Activity.cs" />
+    <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="GameRules\Warhead.cs" />
     <Compile Include="Graphics\QuadRenderer.cs" />
@@ -146,7 +148,6 @@
     <Compile Include="Support\Program.cs" />
     <Compile Include="Sync.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\Activity.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\CreatesShroud.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 20a5e3446b..8a30198c00 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;
diff --git a/OpenRA.Game/Traits/Util.cs b/OpenRA.Game/Traits/Util.cs
index 0a6a999f82..3171384d36 100644
--- a/OpenRA.Game/Traits/Util.cs
+++ b/OpenRA.Game/Traits/Util.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Support;
 
 namespace OpenRA.Traits
diff --git a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs b/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
index 569039abcf..f9bfebc9cb 100644
--- a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
+++ b/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
index fd0a7a516f..17030c13ec 100644
--- a/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
+++ b/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.Cnc/Traits/Buildings/TiberiumRefinery.cs b/OpenRA.Mods.Cnc/Traits/Buildings/TiberiumRefinery.cs
index 0af8eb9569..34487f2a45 100644
--- a/OpenRA.Mods.Cnc/Traits/Buildings/TiberiumRefinery.cs
+++ b/OpenRA.Mods.Cnc/Traits/Buildings/TiberiumRefinery.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.Cnc.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.Common/Activities/Move/Drag.cs b/OpenRA.Mods.Common/Activities/Move/Drag.cs
index 11cb63fe1c..9bf32fc9f8 100644
--- a/OpenRA.Mods.Common/Activities/Move/Drag.cs
+++ b/OpenRA.Mods.Common/Activities/Move/Drag.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
diff --git a/OpenRA.Mods.Common/Activities/RemoveSelf.cs b/OpenRA.Mods.Common/Activities/RemoveSelf.cs
index 568c4c5cb2..75daabb929 100644
--- a/OpenRA.Mods.Common/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.Common/Activities/RemoveSelf.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Traits;
+using OpenRA.Activities;
 
 namespace OpenRA.Mods.Common.Activities
 {
diff --git a/OpenRA.Mods.Common/Activities/SimpleTeleport.cs b/OpenRA.Mods.Common/Activities/SimpleTeleport.cs
index c0191b956b..14b6a3d2f2 100644
--- a/OpenRA.Mods.Common/Activities/SimpleTeleport.cs
+++ b/OpenRA.Mods.Common/Activities/SimpleTeleport.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
diff --git a/OpenRA.Mods.Common/CommonTraitsInterfaces.cs b/OpenRA.Mods.Common/CommonTraitsInterfaces.cs
index faff0be555..7c2a18dac9 100644
--- a/OpenRA.Mods.Common/CommonTraitsInterfaces.cs
+++ b/OpenRA.Mods.Common/CommonTraitsInterfaces.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index a118cea084..c2626d0116 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -49,7 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\Move\Drag.cs" />
-    <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\SimpleTeleport.cs" />
     <Compile Include="CommonTraitsInterfaces.cs" />
diff --git a/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs b/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs
index 9f4723e717..1245e00406 100644
--- a/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs
+++ b/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs
@@ -10,6 +10,7 @@
 
 using System;
 using Eluant;
+using OpenRA.Activities;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.D2k/AutoCarryall/CarryUnit.cs b/OpenRA.Mods.D2k/AutoCarryall/CarryUnit.cs
index e6e6bb272a..f01193aa85 100644
--- a/OpenRA.Mods.D2k/AutoCarryall/CarryUnit.cs
+++ b/OpenRA.Mods.D2k/AutoCarryall/CarryUnit.cs
@@ -10,6 +10,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.D2k/AutoCarryall/Carryable.cs b/OpenRA.Mods.D2k/AutoCarryall/Carryable.cs
index 5444f8174c..46ed0cb9bf 100644
--- a/OpenRA.Mods.D2k/AutoCarryall/Carryable.cs
+++ b/OpenRA.Mods.D2k/AutoCarryall/Carryable.cs
@@ -9,6 +9,7 @@
 #endregion
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.D2k/SwallowActor.cs b/OpenRA.Mods.D2k/SwallowActor.cs
index e581fbb571..5d6d8c05cd 100644
--- a/OpenRA.Mods.D2k/SwallowActor.cs
+++ b/OpenRA.Mods.D2k/SwallowActor.cs
@@ -10,6 +10,7 @@
 
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Air/FallToEarth.cs b/OpenRA.Mods.RA/Activities/Air/FallToEarth.cs
index 004138ccd8..9a304d9f96 100644
--- a/OpenRA.Mods.RA/Activities/Air/FallToEarth.cs
+++ b/OpenRA.Mods.RA/Activities/Air/FallToEarth.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Air/Fly.cs b/OpenRA.Mods.RA/Activities/Air/Fly.cs
index f246e6c33e..c0a571eda4 100644
--- a/OpenRA.Mods.RA/Activities/Air/Fly.cs
+++ b/OpenRA.Mods.RA/Activities/Air/Fly.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/FlyAttack.cs b/OpenRA.Mods.RA/Activities/Air/FlyAttack.cs
index 9f0185f864..338fe60dfe 100644
--- a/OpenRA.Mods.RA/Activities/Air/FlyAttack.cs
+++ b/OpenRA.Mods.RA/Activities/Air/FlyAttack.cs
@@ -8,9 +8,10 @@
  */
 #endregion
 
+using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
-using System.Linq;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Air/FlyCircle.cs b/OpenRA.Mods.RA/Activities/Air/FlyCircle.cs
index badb3f5878..3ebbe9d9cd 100644
--- a/OpenRA.Mods.RA/Activities/Air/FlyCircle.cs
+++ b/OpenRA.Mods.RA/Activities/Air/FlyCircle.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/FlyFollow.cs b/OpenRA.Mods.RA/Activities/Air/FlyFollow.cs
index f9d005325b..91b02828c5 100644
--- a/OpenRA.Mods.RA/Activities/Air/FlyFollow.cs
+++ b/OpenRA.Mods.RA/Activities/Air/FlyFollow.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/FlyTimed.cs b/OpenRA.Mods.RA/Activities/Air/FlyTimed.cs
index 61442b5c7d..4d95520f2b 100644
--- a/OpenRA.Mods.RA/Activities/Air/FlyTimed.cs
+++ b/OpenRA.Mods.RA/Activities/Air/FlyTimed.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/HeliAttack.cs b/OpenRA.Mods.RA/Activities/Air/HeliAttack.cs
index ec045eb571..89a755b68d 100644
--- a/OpenRA.Mods.RA/Activities/Air/HeliAttack.cs
+++ b/OpenRA.Mods.RA/Activities/Air/HeliAttack.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/HeliFly.cs b/OpenRA.Mods.RA/Activities/Air/HeliFly.cs
index e517cc9281..edeccc0c45 100644
--- a/OpenRA.Mods.RA/Activities/Air/HeliFly.cs
+++ b/OpenRA.Mods.RA/Activities/Air/HeliFly.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs b/OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs
index 5229d18f59..97fcc08fb8 100644
--- a/OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs
+++ b/OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs
@@ -10,9 +10,10 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Traits;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Air/HeliLand.cs b/OpenRA.Mods.RA/Activities/Air/HeliLand.cs
index 8efda467b6..ca002572ad 100644
--- a/OpenRA.Mods.RA/Activities/Air/HeliLand.cs
+++ b/OpenRA.Mods.RA/Activities/Air/HeliLand.cs
@@ -8,8 +8,8 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
-using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Air/HeliReturn.cs b/OpenRA.Mods.RA/Activities/Air/HeliReturn.cs
index 4d9760ee4b..f4860eced2 100644
--- a/OpenRA.Mods.RA/Activities/Air/HeliReturn.cs
+++ b/OpenRA.Mods.RA/Activities/Air/HeliReturn.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/Land.cs b/OpenRA.Mods.RA/Activities/Air/Land.cs
index a313bd3257..1b88dce631 100644
--- a/OpenRA.Mods.RA/Activities/Air/Land.cs
+++ b/OpenRA.Mods.RA/Activities/Air/Land.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs b/OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs
index eff39c53ad..4e6728e26f 100644
--- a/OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs
+++ b/OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs
index 0df3d490e2..cfb1f04227 100644
--- a/OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Air/TakeOff.cs b/OpenRA.Mods.RA/Activities/Air/TakeOff.cs
index 2aa836bbd8..0fb0c19cda 100644
--- a/OpenRA.Mods.RA/Activities/Air/TakeOff.cs
+++ b/OpenRA.Mods.RA/Activities/Air/TakeOff.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs
index 671436eb40..b4ede1f858 100755
--- a/OpenRA.Mods.RA/Activities/Attack.cs
+++ b/OpenRA.Mods.RA/Activities/Attack.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs b/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
index 1fd70bb875..fcaa5a6a78 100644
--- a/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
+++ b/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/CaptureActor.cs b/OpenRA.Mods.RA/Activities/CaptureActor.cs
index e9b0413025..ea9ab6dcc0 100644
--- a/OpenRA.Mods.RA/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/DeliverResources.cs b/OpenRA.Mods.RA/Activities/DeliverResources.cs
index cd5b4e6926..02733b22b6 100755
--- a/OpenRA.Mods.RA/Activities/DeliverResources.cs
+++ b/OpenRA.Mods.RA/Activities/DeliverResources.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Demolish.cs b/OpenRA.Mods.RA/Activities/Demolish.cs
index cdd1a544b9..9f6c34cc54 100644
--- a/OpenRA.Mods.RA/Activities/Demolish.cs
+++ b/OpenRA.Mods.RA/Activities/Demolish.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/DonateSupplies.cs b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
index 64243be5ab..db7b3d6c16 100644
--- a/OpenRA.Mods.RA/Activities/DonateSupplies.cs
+++ b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Enter.cs b/OpenRA.Mods.RA/Activities/Enter.cs
index 86dde98b61..fced8312ee 100755
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.RA/Activities/Enter.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/EnterTransport.cs b/OpenRA.Mods.RA/Activities/EnterTransport.cs
index 8a99bfab5c..e853757e57 100644
--- a/OpenRA.Mods.RA/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
index df55a6c80d..a28f7065f6 100644
--- a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Effects;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs
index 6dff4d5751..c1210da65a 100755
--- a/OpenRA.Mods.RA/Activities/FindResources.cs
+++ b/OpenRA.Mods.RA/Activities/FindResources.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Move;
diff --git a/OpenRA.Mods.RA/Activities/Follow.cs b/OpenRA.Mods.RA/Activities/Follow.cs
index 4cd5b5ce91..f2804a82f0 100644
--- a/OpenRA.Mods.RA/Activities/Follow.cs
+++ b/OpenRA.Mods.RA/Activities/Follow.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Heal.cs b/OpenRA.Mods.RA/Activities/Heal.cs
index 127ed007e5..3e2606084f 100755
--- a/OpenRA.Mods.RA/Activities/Heal.cs
+++ b/OpenRA.Mods.RA/Activities/Heal.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Hunt.cs b/OpenRA.Mods.RA/Activities/Hunt.cs
index f97e48f9fe..71a477dc7c 100644
--- a/OpenRA.Mods.RA/Activities/Hunt.cs
+++ b/OpenRA.Mods.RA/Activities/Hunt.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs
index 6c12797fab..4e769507ea 100644
--- a/OpenRA.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/LayMines.cs b/OpenRA.Mods.RA/Activities/LayMines.cs
index 3aa7cdb581..431321a9af 100644
--- a/OpenRA.Mods.RA/Activities/LayMines.cs
+++ b/OpenRA.Mods.RA/Activities/LayMines.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Leap.cs b/OpenRA.Mods.RA/Activities/Leap.cs
index c2dcd04549..7cdf7fd081 100644
--- a/OpenRA.Mods.RA/Activities/Leap.cs
+++ b/OpenRA.Mods.RA/Activities/Leap.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
diff --git a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
index c879d052a4..17896fc592 100755
--- a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
+++ b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/MoveWithinRange.cs b/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
index 6775fa94ca..df139fa0db 100755
--- a/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
+++ b/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs b/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
index 60b3e96314..c55f2e1595 100644
--- a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
+++ b/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs
index c3bb48aca7..f5fadfd106 100644
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs
index fc02e9cdbd..a6dc33f89a 100644
--- a/OpenRA.Mods.RA/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/RepairBridge.cs b/OpenRA.Mods.RA/Activities/RepairBridge.cs
index 8addd094a6..1c589b52ce 100644
--- a/OpenRA.Mods.RA/Activities/RepairBridge.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBridge.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
index 92a3dec918..d544dc50b9 100644
--- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.RA/Activities/Sell.cs
index 0e74983a9f..fd2a9166b4 100755
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.RA/Activities/Sell.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs
index 7dde377224..cf7e37a44c 100755
--- a/OpenRA.Mods.RA/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs
index cfbe59a43a..94e822673c 100644
--- a/OpenRA.Mods.RA/Activities/Transform.cs
+++ b/OpenRA.Mods.RA/Activities/Transform.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Turn.cs b/OpenRA.Mods.RA/Activities/Turn.cs
index ea428fc1f8..06f9f00818 100755
--- a/OpenRA.Mods.RA/Activities/Turn.cs
+++ b/OpenRA.Mods.RA/Activities/Turn.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/UnloadCargo.cs b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
index 5b87f5c263..a399ecf026 100644
--- a/OpenRA.Mods.RA/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Activities/Wait.cs b/OpenRA.Mods.RA/Activities/Wait.cs
index 2926d7c245..215a057cf0 100644
--- a/OpenRA.Mods.RA/Activities/Wait.cs
+++ b/OpenRA.Mods.RA/Activities/Wait.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs
index a948404b8c..046925c518 100644
--- a/OpenRA.Mods.RA/Attack/AttackBase.cs
+++ b/OpenRA.Mods.RA/Attack/AttackBase.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Attack/AttackCharge.cs b/OpenRA.Mods.RA/Attack/AttackCharge.cs
index 0f251f209b..7118e37ac0 100644
--- a/OpenRA.Mods.RA/Attack/AttackCharge.cs
+++ b/OpenRA.Mods.RA/Attack/AttackCharge.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Attack/AttackFollow.cs b/OpenRA.Mods.RA/Attack/AttackFollow.cs
index 52540372ca..242213f832 100644
--- a/OpenRA.Mods.RA/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.RA/Attack/AttackFollow.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/Attack/AttackFrontal.cs
index ab0c1dd02a..4be58b4508 100644
--- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs
+++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
index 3d7a701a34..f251df8f48 100644
--- a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
+++ b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Render;
diff --git a/OpenRA.Mods.RA/Attack/AttackLeap.cs b/OpenRA.Mods.RA/Attack/AttackLeap.cs
index fdeea713b5..21a5380e47 100644
--- a/OpenRA.Mods.RA/Attack/AttackLeap.cs
+++ b/OpenRA.Mods.RA/Attack/AttackLeap.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Attack/AttackMedic.cs b/OpenRA.Mods.RA/Attack/AttackMedic.cs
index 1bf2b524e6..9641da91de 100644
--- a/OpenRA.Mods.RA/Attack/AttackMedic.cs
+++ b/OpenRA.Mods.RA/Attack/AttackMedic.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Attack/AttackOmni.cs b/OpenRA.Mods.RA/Attack/AttackOmni.cs
index dac8f0df40..50960e0c4d 100644
--- a/OpenRA.Mods.RA/Attack/AttackOmni.cs
+++ b/OpenRA.Mods.RA/Attack/AttackOmni.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
index 87c80e1979..9304ddca13 100644
--- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
index 717257bb62..86ef2b71ce 100644
--- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Attack/AttackWander.cs b/OpenRA.Mods.RA/Attack/AttackWander.cs
index e3c4f4b2ce..1662727c73 100644
--- a/OpenRA.Mods.RA/Attack/AttackWander.cs
+++ b/OpenRA.Mods.RA/Attack/AttackWander.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
index 4b887faec2..c0510222e5 100644
--- a/OpenRA.Mods.RA/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -10,6 +10,7 @@
 
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
index b0533a4300..4a326a6d02 100644
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Move/Move.cs
index 7e0073fb94..9f469b1f93 100644
--- a/OpenRA.Mods.RA/Move/Move.cs
+++ b/OpenRA.Mods.RA/Move/Move.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs
index c914a4f37c..b8e2e2ac39 100755
--- a/OpenRA.Mods.RA/Production.cs
+++ b/OpenRA.Mods.RA/Production.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
diff --git a/OpenRA.Mods.RA/Render/RenderHarvester.cs b/OpenRA.Mods.RA/Render/RenderHarvester.cs
index f76203c659..604b662115 100644
--- a/OpenRA.Mods.RA/Render/RenderHarvester.cs
+++ b/OpenRA.Mods.RA/Render/RenderHarvester.cs
@@ -8,11 +8,12 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
-using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.RA.Render
 {
diff --git a/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs b/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
index c543905717..215ad09b10 100644
--- a/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
+++ b/OpenRA.Mods.RA/Render/WithHarvestAnimation.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
index 230d03ef39..df7c77894a 100644
--- a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
+++ b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs
index 82abeb51b0..df91774e98 100644
--- a/OpenRA.Mods.RA/Repairable.cs
+++ b/OpenRA.Mods.RA/Repairable.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
diff --git a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
index 3f40ae4f06..29b716e75f 100644
--- a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
+++ b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA;
+using OpenRA.Activities;
 using OpenRA.Effects;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
index d346d4653a..47c261cbef 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
@@ -11,6 +11,7 @@
 using Eluant;
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/Aircraft.cs b/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
index e27d7e450a..8b76e72a61 100644
--- a/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA;
diff --git a/OpenRA.Mods.RA/Traits/Air/AttackBomber.cs b/OpenRA.Mods.RA/Traits/Air/AttackBomber.cs
index 8c4c84378c..8ba6b2e211 100644
--- a/OpenRA.Mods.RA/Traits/Air/AttackBomber.cs
+++ b/OpenRA.Mods.RA/Traits/Air/AttackBomber.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/Air/AttackHeli.cs b/OpenRA.Mods.RA/Traits/Air/AttackHeli.cs
index 79bc7c647b..0b91d2d4e1 100644
--- a/OpenRA.Mods.RA/Traits/Air/AttackHeli.cs
+++ b/OpenRA.Mods.RA/Traits/Air/AttackHeli.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/AttackPlane.cs b/OpenRA.Mods.RA/Traits/Air/AttackPlane.cs
index ff1b593f93..f20a58bf72 100644
--- a/OpenRA.Mods.RA/Traits/Air/AttackPlane.cs
+++ b/OpenRA.Mods.RA/Traits/Air/AttackPlane.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/Helicopter.cs b/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
index 54ca81491a..4be0b571ae 100644
--- a/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Traits/Air/Plane.cs b/OpenRA.Mods.RA/Traits/Air/Plane.cs
index f7e95b9352..2e7c7d6313 100644
--- a/OpenRA.Mods.RA/Traits/Air/Plane.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Plane.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Traits/Buildings/FreeActor.cs b/OpenRA.Mods.RA/Traits/Buildings/FreeActor.cs
index 68a36e1dff..c8e12e3936 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/FreeActor.cs
+++ b/OpenRA.Mods.RA/Traits/Buildings/FreeActor.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs b/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
index facf8090ac..dd2320d944 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
+++ b/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Traits/DemoTruck.cs b/OpenRA.Mods.RA/Traits/DemoTruck.cs
index c5c64a1009..437a9deaa8 100644
--- a/OpenRA.Mods.RA/Traits/DemoTruck.cs
+++ b/OpenRA.Mods.RA/Traits/DemoTruck.cs
@@ -10,6 +10,7 @@
 
 using System.Drawing;
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Traits/Harvester.cs b/OpenRA.Mods.RA/Traits/Harvester.cs
index 3955651690..b701eda994 100644
--- a/OpenRA.Mods.RA/Traits/Harvester.cs
+++ b/OpenRA.Mods.RA/Traits/Harvester.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
diff --git a/OpenRA.Mods.RA/Traits/MadTank.cs b/OpenRA.Mods.RA/Traits/MadTank.cs
index e2a4b601e9..d6acb4e2d3 100644
--- a/OpenRA.Mods.RA/Traits/MadTank.cs
+++ b/OpenRA.Mods.RA/Traits/MadTank.cs
@@ -11,13 +11,14 @@
 using System.Linq;
 using System.Drawing;
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Traits;
 using OpenRA.Primitives;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
 {
diff --git a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
index dca5e5b915..a2f7ba1a96 100644
--- a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
+++ b/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.TS.Traits;
diff --git a/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs b/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
index 81ed4d01d0..8f4a82ec38 100644
--- a/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
+++ b/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.TS.Activities;
 using OpenRA.Traits;