diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 7ddbcd6b49..16542c956a 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -209,8 +209,6 @@
     <Compile Include="Traits\Attack\AttackInfo.cs" />
     <Compile Include="Traits\Attack\AttackPlane.cs" />
     <Compile Include="Traits\Attack\AttackTurreted.cs" />
-    <Compile Include="Traits\AI\AutoHeal.cs" />
-    <Compile Include="Traits\AI\AutoTarget.cs" />
     <Compile Include="Traits\Modifiers\BelowUnits.cs" />
     <Compile Include="Traits\Buildable.cs" />
     <Compile Include="Traits\Building.cs" />
diff --git a/OpenRA.Game/Traits/Activities/Attack.cs b/OpenRA.Game/Traits/Activities/Attack.cs
index 817dc29c67..b060183329 100644
--- a/OpenRA.Game/Traits/Activities/Attack.cs
+++ b/OpenRA.Game/Traits/Activities/Attack.cs
@@ -21,7 +21,7 @@
 namespace OpenRA.Traits.Activities
 {
 	/* non-turreted attack */
-	class Attack : IActivity
+	public class Attack : IActivity
 	{
 		Actor Target;
 		int Range;
diff --git a/OpenRA.Game/Traits/Cloak.cs b/OpenRA.Game/Traits/Cloak.cs
index 2cc7c9fed8..6a580e58ac 100644
--- a/OpenRA.Game/Traits/Cloak.cs
+++ b/OpenRA.Game/Traits/Cloak.cs
@@ -33,7 +33,7 @@ namespace OpenRA.Traits
 		public object Create(Actor self) { return new Cloak(self); }
 	}
 
-	class Cloak : IRenderModifier, INotifyAttack, ITick, INotifyDamage
+	public class Cloak : IRenderModifier, INotifyAttack, ITick, INotifyDamage
 	{
 		[Sync]
 		int remainingTime;
diff --git a/OpenRA.Game/Traits/AI/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs
similarity index 95%
rename from OpenRA.Game/Traits/AI/AutoHeal.cs
rename to OpenRA.Mods.RA/AutoHeal.cs
index 9f0b4e5500..a55329cacf 100644
--- a/OpenRA.Game/Traits/AI/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -19,9 +19,10 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class AutoHealInfo : TraitInfo<AutoHeal> { }
 
diff --git a/OpenRA.Game/Traits/AI/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
similarity index 95%
rename from OpenRA.Game/Traits/AI/AutoTarget.cs
rename to OpenRA.Mods.RA/AutoTarget.cs
index a3b9cd146e..8b2d3e42b7 100644
--- a/OpenRA.Game/Traits/AI/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using System.Drawing;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class AutoTargetInfo : TraitInfo<AutoTarget>
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 38788356e9..fb64f94dce 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -56,6 +56,8 @@
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="AirstrikePower.cs" />
+    <Compile Include="AutoHeal.cs" />
+    <Compile Include="AutoTarget.cs" />
     <Compile Include="Bridge.cs" />
     <Compile Include="BridgeLayer.cs" />
     <Compile Include="Burns.cs" />