diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 21d51bd481..da5bbff285 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -80,15 +80,11 @@
     <Compile Include="Widgets\Logic\CncIngameChromeLogic.cs" />
     <Compile Include="Widgets\Logic\CncIngameMenuLogic.cs" />
     <Compile Include="Widgets\Logic\CncMainMenuLogic.cs" />
-    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
-    <Compile Include="Widgets\ProductionPaletteWidget.cs" />
-    <Compile Include="Widgets\ProductionTabsWidget.cs" />
     <Compile Include="Widgets\SupportPowersWidget.cs" />
     <Compile Include="WithFire.cs" />
     <Compile Include="WithRoof.cs" />
     <Compile Include="Widgets\Logic\ProductionTabsLogic.cs" />
-    <Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
     <Compile Include="WithDeliveryAnimation.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
index 345092e233..aa4cdd1279 100644
--- a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
+++ b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Linq;
 using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
index 40111c3520..1744623471 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Mods.RA.Widgets;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Cnc.Widgets.Logic
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 42e4037688..710b5fb3a9 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -531,6 +531,10 @@
     <Compile Include="Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
     <Compile Include="Graphics\RangeCircleRenderable.cs" />
+    <Compile Include="Widgets\ProductionPaletteWidget.cs" />
+    <Compile Include="Widgets\ProductionTabsWidget.cs" />
+    <Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
+    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTooltipLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
similarity index 99%
rename from OpenRA.Mods.Cnc/Widgets/Logic/ProductionTooltipLogic.cs
rename to OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
index fc430a883e..ad5efca263 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTooltipLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
@@ -16,7 +16,7 @@ using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Cnc.Widgets.Logic
+namespace OpenRA.Mods.RA.Widgets.Logic
 {
 	public class ProductionTooltipLogic
 	{
diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
similarity index 99%
rename from OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs
rename to OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
index b2118fd4af..a5d37053f2 100644
--- a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
@@ -21,7 +21,7 @@ using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Cnc.Widgets
+namespace OpenRA.Mods.RA.Widgets
 {
 	public class ProductionIcon
 	{
diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
similarity index 99%
rename from OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
rename to OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
index a7c7a19fd1..a605db5f90 100644
--- a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
@@ -16,7 +16,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.RA;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Cnc.Widgets
+namespace OpenRA.Mods.RA.Widgets
 {
 	public class ProductionTab
 	{
@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 		}
 	}
 
-	class ProductionTabsWidget : Widget
+	public class ProductionTabsWidget : Widget
 	{
 		readonly World world;
 
diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionTypeButtonWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs
similarity index 95%
rename from OpenRA.Mods.Cnc/Widgets/ProductionTypeButtonWidget.cs
rename to OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs
index 9599ce75b3..ef2de799bf 100644
--- a/OpenRA.Mods.Cnc/Widgets/ProductionTypeButtonWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Cnc.Widgets
+namespace OpenRA.Mods.RA.Widgets
 {
 	public class ProductionTypeButtonWidget : ButtonWidget
 	{