diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs
index e336dca993..d32a4f2121 100644
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -1176,22 +1176,22 @@ namespace OpenRA
 		}
 
 		// Placeholders for future implementation
-		Stream IReadOnlyFileSystem.Open(string filename)
+		public Stream Open(string filename)
 		{
 			return Game.ModData.DefaultFileSystem.Open(filename);
 		}
 
-		bool IReadOnlyFileSystem.TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename)
+		public bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename)
 		{
 			return Game.ModData.DefaultFileSystem.TryGetPackageContaining(path, out package, out filename);
 		}
 
-		bool IReadOnlyFileSystem.TryOpen(string filename, out Stream s)
+		public bool TryOpen(string filename, out Stream s)
 		{
 			return Game.ModData.DefaultFileSystem.TryOpen(filename, out s);
 		}
 
-		bool IReadOnlyFileSystem.Exists(string filename)
+		public bool Exists(string filename)
 		{
 			return Game.ModData.DefaultFileSystem.Exists(filename);
 		}
diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs
index 37c487c0c0..60b34e8962 100644
--- a/OpenRA.Game/Renderer.cs
+++ b/OpenRA.Game/Renderer.cs
@@ -101,7 +101,7 @@ namespace OpenRA
 					fontSheetBuilder.Dispose();
 				fontSheetBuilder = new SheetBuilder(SheetType.BGRA);
 				Fonts = modData.Manifest.Fonts.ToDictionary(x => x.Key,
-					x => new SpriteFont(x.Value.First, modData.ModFiles.Open(x.Value.First).ReadAllBytes(), x.Value.Second, fontSheetBuilder)).AsReadOnly();
+					x => new SpriteFont(x.Value.First, modData.DefaultFileSystem.Open(x.Value.First).ReadAllBytes(), x.Value.Second, fontSheetBuilder)).AsReadOnly();
 			}
 		}
 
diff --git a/OpenRA.Game/Scripting/ScriptContext.cs b/OpenRA.Game/Scripting/ScriptContext.cs
index f030df4dfe..94f27c7b6e 100644
--- a/OpenRA.Game/Scripting/ScriptContext.cs
+++ b/OpenRA.Game/Scripting/ScriptContext.cs
@@ -198,7 +198,7 @@ namespace OpenRA.Scripting
 			using (var loadScript = (LuaFunction)runtime.Globals["ExecuteSandboxedScript"])
 			{
 				foreach (var s in scripts)
-					loadScript.Call(s, Game.ModData.ModFiles.Open(s).ReadAllText()).Dispose();
+					loadScript.Call(s, world.Map.Open(s).ReadAllText()).Dispose();
 			}
 		}
 
diff --git a/OpenRA.Mods.Common/Lint/CheckSequences.cs b/OpenRA.Mods.Common/Lint/CheckSequences.cs
index ec1e122338..8aa6d12776 100644
--- a/OpenRA.Mods.Common/Lint/CheckSequences.cs
+++ b/OpenRA.Mods.Common/Lint/CheckSequences.cs
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Lint
 			this.emitError = emitError;
 
 			var sequenceSource = map != null ? map.SequenceDefinitions : new List<MiniYamlNode>();
-			sequenceDefinitions = MiniYaml.Merge(modData.Manifest.Sequences.Select(s => MiniYaml.FromStream(modData.ModFiles.Open(s))).Append(sequenceSource));
+			sequenceDefinitions = MiniYaml.Merge(modData.Manifest.Sequences.Select(s => MiniYaml.FromStream(map.Open(s))).Append(sequenceSource));
 
 			var rules = map == null ? modData.DefaultRules : map.Rules;
 			var factions = rules.Actors["world"].TraitInfos<FactionInfo>().Select(f => f.InternalName).ToArray();
diff --git a/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
index a11e7e5f5f..bc3b336539 100644
--- a/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
+++ b/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
@@ -13,6 +13,7 @@ using System.Drawing;
 using System.IO;
 using Eluant;
 using OpenRA.Effects;
+using OpenRA.FileSystem;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Effects;
@@ -165,7 +166,7 @@ namespace OpenRA.Mods.Common.Scripting
 			Stream s;
 			try
 			{
-				s = Game.ModData.ModFiles.Open(movie);
+				s = world.Map.Open(movie);
 			}
 			catch (FileNotFoundException e)
 			{
diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
index ede922fefe..fabb2d0384 100644
--- a/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
+++ b/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public void LoadPalettes(WorldRenderer wr)
 		{
-			wr.AddPalette(info.Name, new ImmutablePalette(Game.ModData.ModFiles.Open(world.TileSet.Palette), info.ShadowIndex), info.AllowModifiers);
+			wr.AddPalette(info.Name, new ImmutablePalette(wr.World.Map.Open(world.TileSet.Palette), info.ShadowIndex), info.AllowModifiers);
 		}
 
 		public IEnumerable<string> PaletteNames { get { yield return info.Name; } }
diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
index 152f029a37..8d44fe5fed 100644
--- a/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
+++ b/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits
 		public void LoadPalettes(WorldRenderer wr)
 		{
 			if (info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant())
-				wr.AddPalette(info.Name, new ImmutablePalette(Game.ModData.ModFiles.Open(info.Filename), info.ShadowIndex), info.AllowModifiers);
+				wr.AddPalette(info.Name, new ImmutablePalette(world.Map.Open(info.Filename), info.ShadowIndex), info.AllowModifiers);
 		}
 
 		public IEnumerable<string> PaletteNames
diff --git a/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs
index 4e3dbdc6d9..d8b30e2ae8 100644
--- a/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs
+++ b/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
 		public void LoadPalettes(WorldRenderer wr)
 		{
 			var filename = world.TileSet.PlayerPalette ?? world.TileSet.Palette;
-			wr.AddPalette(info.Name, new ImmutablePalette(Game.ModData.ModFiles.Open(filename), info.ShadowIndex), info.AllowModifiers);
+			wr.AddPalette(info.Name, new ImmutablePalette(wr.World.Map.Open(filename), info.ShadowIndex), info.AllowModifiers);
 		}
 	}
 }
diff --git a/OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs b/OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs
index e5c3ddae44..b0cee4e7e7 100644
--- a/OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs
+++ b/OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.D2k.Traits
 		public void LoadPalettes(WorldRenderer wr)
 		{
 			var colors = new uint[Palette.Size];
-			using (var s = Game.ModData.ModFiles.Open(info.Filename))
+			using (var s = wr.World.Map.Open(info.Filename))
 			{
 				s.Seek(info.Offset, SeekOrigin.Begin);
 
diff --git a/OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs b/OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs
index 4eb8488168..0d6eabdde9 100644
--- a/OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs
+++ b/OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.D2k.Traits
 		public void LoadPalettes(WorldRenderer wr)
 		{
 			var colors = new uint[Palette.Size];
-			using (var s = Game.ModData.ModFiles.Open(info.Filename))
+			using (var s = wr.World.Map.Open(info.Filename))
 			{
 				s.Seek(info.Offset, SeekOrigin.Begin);