diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index a54198d055..d852f45845 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -259,7 +259,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\Folder.cs" />
-    <Compile Include="FileSystem\InstallShieldPackage.cs" />
     <Compile Include="FileSystem\ZipFile.cs" />
     <Compile Include="Map\PlayerReference.cs" />
     <Compile Include="Map\TileReference.cs" />
@@ -268,7 +267,6 @@
     <Compile Include="FieldSaver.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="FileFormats\Blast.cs" />
     <Compile Include="FileFormats\HvaReader.cs" />
     <Compile Include="FileFormats\PngLoader.cs" />
     <Compile Include="FileFormats\VxlReader.cs" />
diff --git a/OpenRA.Game/FileFormats/Blast.cs b/OpenRA.Mods.Common/FileFormats/Blast.cs
similarity index 99%
rename from OpenRA.Game/FileFormats/Blast.cs
rename to OpenRA.Mods.Common/FileFormats/Blast.cs
index d63b584565..b0c2b64f63 100644
--- a/OpenRA.Game/FileFormats/Blast.cs
+++ b/OpenRA.Mods.Common/FileFormats/Blast.cs
@@ -15,7 +15,7 @@
 using System;
 using System.IO;
 
-namespace OpenRA.FileFormats
+namespace OpenRA.Mods.Common.FileFormats
 {
 	public static class Blast
 	{
diff --git a/OpenRA.Game/FileSystem/InstallShieldPackage.cs b/OpenRA.Mods.Common/FileSystem/InstallShieldPackage.cs
similarity index 93%
rename from OpenRA.Game/FileSystem/InstallShieldPackage.cs
rename to OpenRA.Mods.Common/FileSystem/InstallShieldPackage.cs
index fbf42ae608..bac6d8f363 100644
--- a/OpenRA.Game/FileSystem/InstallShieldPackage.cs
+++ b/OpenRA.Mods.Common/FileSystem/InstallShieldPackage.cs
@@ -9,12 +9,13 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using OpenRA.FileFormats;
+using OpenRA.FileSystem;
+using OpenRA.Mods.Common.FileFormats;
+using FS = OpenRA.FileSystem.FileSystem;
 
-namespace OpenRA.FileSystem
+namespace OpenRA.Mods.Common.FileSystem
 {
 	public class InstallShieldLoader : IPackageLoader
 	{
@@ -121,7 +122,7 @@ namespace OpenRA.FileSystem
 				return ret;
 			}
 
-			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+			public IReadOnlyPackage OpenPackage(string filename, FS context)
 			{
 				// Not implemented
 				return null;
@@ -140,7 +141,7 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
+		bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
 		{
 			// Take a peek at the file signature
 			var signature = s.ReadUInt32();
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 39d0d7652a..3835365f5c 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -807,6 +807,8 @@
     <Compile Include="Traits\Conditions\LineBuildSegmentExternalCondition.cs" />
     <Compile Include="Traits\EntersTunnels.cs" />
     <Compile Include="Traits\TunnelEntrance.cs" />
+    <Compile Include="FileSystem\InstallShieldPackage.cs" />
+    <Compile Include="FileFormats\Blast.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
diff --git a/OpenRA.Mods.Common/UtilityCommands/ListInstallShieldContentsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ListInstallShieldContentsCommand.cs
index a080ba1bd1..2b65076e9c 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ListInstallShieldContentsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ListInstallShieldContentsCommand.cs
@@ -11,7 +11,7 @@
 
 using System;
 using System.IO;
-using OpenRA.FileSystem;
+using OpenRA.Mods.Common.FileSystem;
 
 namespace OpenRA.Mods.Common.UtilityCommands
 {