diff --git a/OpenRA.Mods.Common/FileFormats/LZOCompression.cs b/OpenRA.Mods.Cnc/FileFormats/LZOCompression.cs
similarity index 99%
rename from OpenRA.Mods.Common/FileFormats/LZOCompression.cs
rename to OpenRA.Mods.Cnc/FileFormats/LZOCompression.cs
index 43082ba37e..69a6bd45f4 100644
--- a/OpenRA.Mods.Common/FileFormats/LZOCompression.cs
+++ b/OpenRA.Mods.Cnc/FileFormats/LZOCompression.cs
@@ -67,7 +67,7 @@
 
 using System;
 
-namespace OpenRA.Mods.Common.FileFormats
+namespace OpenRA.Mods.Cnc.FileFormats
 {
 	public static class LZOCompression
 	{
diff --git a/OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs b/OpenRA.Mods.Cnc/FileFormats/XORDeltaCompression.cs
similarity index 96%
rename from OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs
rename to OpenRA.Mods.Cnc/FileFormats/XORDeltaCompression.cs
index 110290ae4b..ee6738f41c 100644
--- a/OpenRA.Mods.Common/FileFormats/XORDeltaCompression.cs
+++ b/OpenRA.Mods.Cnc/FileFormats/XORDeltaCompression.cs
@@ -9,7 +9,9 @@
  */
 #endregion
 
-namespace OpenRA.Mods.Common.FileFormats
+using OpenRA.Mods.Common.FileFormats;
+
+namespace OpenRA.Mods.Cnc.FileFormats
 {
 	// Data that is to be XORed against another set of data (aka Format40)
 	public static class XORDeltaCompression
diff --git a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs b/OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
similarity index 98%
rename from OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
rename to OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
index 162df83a71..a6992ab691 100644
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
@@ -14,10 +14,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Cnc.FileFormats;
 using OpenRA.Mods.Common.FileFormats;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.Common.SpriteLoaders
+namespace OpenRA.Mods.Cnc.SpriteLoaders
 {
 	public class ShpTDLoader : ISpriteLoader
 	{
diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
index 05198244b4..3cae82515b 100644
--- a/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
+++ b/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Mods.Common.SpriteLoaders;
+using OpenRA.Mods.Cnc.SpriteLoaders;
 using OpenRA.Primitives;
 
 namespace OpenRA.Mods.Cnc.UtilityCommands
diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
index a1bab26785..ddf7a62ebe 100644
--- a/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
+++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OpenRA.FileSystem;
+using OpenRA.Mods.Cnc.FileFormats;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.FileFormats;
 using OpenRA.Mods.Common.Traits;
diff --git a/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs
index a795992edc..786a94ec5e 100644
--- a/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs
+++ b/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.SpriteLoaders;
+using OpenRA.Mods.Cnc.SpriteLoaders;
 using OpenRA.Primitives;
 using OpenRA.Traits;