diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index 7bd764613a..1ff218791b 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -53,6 +53,7 @@
     <Compile Include="ShpReader.cs" />
     <Compile Include="Terrain.cs" />
     <Compile Include="TileSet.cs" />
+    <Compile Include="TileSheetBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRa.Core\OpenRa.Core.csproj">
diff --git a/OpenRa.Game/TileSheetBuilder.cs b/OpenRa.FileFormats/TileSheetBuilder.cs
similarity index 93%
rename from OpenRa.Game/TileSheetBuilder.cs
rename to OpenRa.FileFormats/TileSheetBuilder.cs
index ae3fd2d9af..3eafc7c8cb 100644
--- a/OpenRa.Game/TileSheetBuilder.cs
+++ b/OpenRa.FileFormats/TileSheetBuilder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 
-namespace OpenRa.Game
+namespace OpenRa.FileFormats
 {
 	// T is probably going to be BluntDirectX.Direct3D.Texture
 	public delegate T Provider<T>();
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index d4946ddac4..31029a5c52 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -44,7 +44,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TileSheetBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">