diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index aea360ca68..810cd2d88d 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -255,9 +255,6 @@
-
-
-
diff --git a/OpenRA.Game/FileFormats/LCWCompression.cs b/OpenRA.Mods.Common/FileFormats/LCWCompression.cs
similarity index 99%
rename from OpenRA.Game/FileFormats/LCWCompression.cs
rename to OpenRA.Mods.Common/FileFormats/LCWCompression.cs
index 36b8542f79..4f7517d817 100644
--- a/OpenRA.Game/FileFormats/LCWCompression.cs
+++ b/OpenRA.Mods.Common/FileFormats/LCWCompression.cs
@@ -11,7 +11,7 @@
using System;
using System.IO;
-namespace OpenRA.FileFormats
+namespace OpenRA.Mods.Common.FileFormats
{
class FastByteReader
{
diff --git a/OpenRA.Game/FileFormats/RLEZerosCompression.cs b/OpenRA.Mods.Common/FileFormats/RLEZerosCompression.cs
similarity index 95%
rename from OpenRA.Game/FileFormats/RLEZerosCompression.cs
rename to OpenRA.Mods.Common/FileFormats/RLEZerosCompression.cs
index cd135a4df6..40c67762da 100644
--- a/OpenRA.Game/FileFormats/RLEZerosCompression.cs
+++ b/OpenRA.Mods.Common/FileFormats/RLEZerosCompression.cs
@@ -8,7 +8,7 @@
*/
#endregion
-namespace OpenRA.FileFormats
+namespace OpenRA.Mods.Common.FileFormats
{
// Run length encoded sequences of zeros (aka Format2)
public static class RLEZerosCompression
diff --git a/OpenRA.Game/FileFormats/XORDeltaCompression.cs b/OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs
similarity index 97%
rename from OpenRA.Game/FileFormats/XORDeltaCompression.cs
rename to OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs
index a76c78026b..995bcfc2ef 100644
--- a/OpenRA.Game/FileFormats/XORDeltaCompression.cs
+++ b/OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs
@@ -8,7 +8,7 @@
*/
#endregion
-namespace OpenRA.FileFormats
+namespace OpenRA.Mods.Common.FileFormats
{
// Data that is to be XORed against another set of data (aka Format40)
public static class XORDeltaCompression
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index d0cca4071d..5512e774ef 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -720,6 +720,9 @@
+
+
+
diff --git a/OpenRA.Mods.Common/SpriteLoaders/ShpD2Loader.cs b/OpenRA.Mods.Common/SpriteLoaders/ShpD2Loader.cs
index 4415dd35f8..01732868b4 100644
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpD2Loader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/ShpD2Loader.cs
@@ -11,8 +11,8 @@
using System;
using System.Drawing;
using System.IO;
-using OpenRA.FileFormats;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.FileFormats;
namespace OpenRA.Mods.Common.SpriteLoaders
{
diff --git a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs b/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
index 3e9a295323..34b0009e26 100644
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
@@ -13,8 +13,8 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
-using OpenRA.FileFormats;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.FileFormats;
namespace OpenRA.Mods.Common.SpriteLoaders
{
diff --git a/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs b/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
index eb893e43d6..3e8ba08711 100644
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
@@ -10,8 +10,8 @@
using System.Drawing;
using System.IO;
-using OpenRA.FileFormats;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.FileFormats;
namespace OpenRA.Mods.Common.SpriteLoaders
{
diff --git a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
index c5bca83334..6b12e6dc59 100644
--- a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
@@ -15,6 +15,7 @@ using System.Linq;
using System.Text;
using OpenRA.FileFormats;
using OpenRA.Graphics;
+using OpenRA.Mods.Common.FileFormats;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;