Move common items to the Fs class

src/LibHac/Common/Id128.cs

@@ -35,7 +35,7 @@ namespace LibHac.Common
 
         public override bool Equals(object obj)
         {
-            return obj is FsSystem.UserId other && Equals(other);
+            return obj is Id128 other && Equals(other);
         }
 
         public override int GetHashCode()

src/LibHac/Fs/Accessors/MountTable.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using LibHac.FsSystem;
 
 namespace LibHac.Fs.Accessors
 {

src/LibHac/Fs/ContentStorage.cs

@@ -1,6 +1,5 @@
 using System;
 using LibHac.Common;
-using LibHac.FsSystem;
 using LibHac.FsService;
 
 namespace LibHac.Fs

src/LibHac/Fs/DirectoryEntry.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Runtime.InteropServices;
 using LibHac.Common;
+using LibHac.FsSystem;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public class DirectoryEntryEx
     {

src/LibHac/Fs/FileSystemClient.Directory.cs

@@ -1,5 +1,4 @@
 using System;
-using LibHac.FsSystem;
 
 namespace LibHac.Fs
 {

src/LibHac/Fs/FileSystemClient.Mount.cs

@@ -1,5 +1,4 @@
 using LibHac.Common;
-using LibHac.FsSystem;
 using LibHac.FsService;
 
 namespace LibHac.Fs

src/LibHac/Fs/FileSystemClient.cs

@@ -1,5 +1,4 @@
 using LibHac.Common;
-using LibHac.FsSystem;
 using LibHac.FsService;
 
 namespace LibHac.Fs

src/LibHac/Fs/FileTimeStamp.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public struct FileTimeStampRaw
     {

src/LibHac/Fs/FsEnums.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public enum BisPartitionId
     {

src/LibHac/Fs/IAttributeFileSystem.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public interface IAttributeFileSystem : IFileSystem
     {

src/LibHac/Fs/IDirectory.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     /// <summary>
     /// Provides an interface for enumerating the child entries of a directory.

src/LibHac/Fs/IFile.cs

@@ -1,6 +1,7 @@
 using System;
+using LibHac.FsSystem;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     /// <summary>
     /// Provides an interface for reading and writing a sequence of bytes.

src/LibHac/Fs/IFileSystem.cs

@@ -1,6 +1,7 @@
 using System;
+using LibHac.FsSystem;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     /// <summary>
     /// Provides an interface for accessing a file system. <c>/</c> is used as the path delimiter.

src/LibHac/Fs/IStorage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     /// <summary>
     /// Provides an interface for reading and writing a sequence of bytes.

src/LibHac/Fs/MountHelpers.cs

@@ -1,5 +1,4 @@
 using LibHac.Common;
-using LibHac.FsSystem;
 
 namespace LibHac.Fs
 {
@@ -24,6 +23,7 @@ namespace LibHac.Fs
             return Result.Success;
         }
 
+        // ReSharper disable once UnusedParameter.Local
         private static bool CheckMountNameImpl(U8Span name)
         {
             // Todo

src/LibHac/Fs/ResultFs.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public class ResultFs
     {

src/LibHac/Fs/ResultRangeFs.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public static class ResultRangeFs
     {

src/LibHac/Fs/RightsId.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10)]
     public struct RightsId : IEquatable<RightsId>, IComparable<RightsId>, IComparable

src/LibHac/Fs/SaveDataAttribute.cs

@@ -3,7 +3,7 @@ using System.Buffers.Binary;
 using LibHac.FsSystem.Save;
 using LibHac.Kvdb;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     public class SaveDataAttribute : IComparable<SaveDataAttribute>, IComparable, IEquatable<SaveDataAttribute>, IExportable
     {

src/LibHac/Fs/SaveDataStructs.cs

@@ -4,7 +4,7 @@ using LibHac.Common;
 using LibHac.FsSystem.Save;
 using LibHac.Ncm;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x40)]
     public struct SaveDataAttribute2
@@ -67,4 +67,17 @@ namespace LibHac.FsSystem
 
         public Span<byte> Hash => SpanHelpers.CreateSpan(ref _hashStart, HashLength);
     }
+
+    [StructLayout(LayoutKind.Explicit, Size = 0x10)]
+    public struct SaveMetaCreateInfo
+    {
+        [FieldOffset(0)] public int Size;
+        [FieldOffset(4)] public SaveMetaType Type;
+    }
+
+    [StructLayout(LayoutKind.Explicit, Size = 0x40)]
+    public struct SaveDataCreateInfo
+    {
+        // Todo
+    }
 }

src/LibHac/Fs/UserId.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
-namespace LibHac.FsSystem
+namespace LibHac.Fs
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10)]
     public struct UserId : IEquatable<UserId>, IComparable<UserId>, IComparable

src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators

src/LibHac/FsService/Creators/FileSystemCreators.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IFatFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IGameCardStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IHostFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IMemoryStorageCreator.cs

@@ -1,5 +1,5 @@
 using System;
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IRomFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs

@@ -1,5 +1,6 @@
 using System;
 using LibHac.Common;
+using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Save;
 

src/LibHac/FsService/Creators/ISdFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ISdStorageCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 using LibHac.FsSystem.NcaUtils;
 
 namespace LibHac.FsService.Creators

src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs

@@ -1,4 +1,4 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs

@@ -1,4 +1,5 @@
-using LibHac.FsSystem;
+using LibHac.Fs;
+using LibHac.FsSystem;
 
 namespace LibHac.FsService.Creators
 {

src/LibHac/FsService/FileSystemProxy.cs

@@ -10,6 +10,7 @@ namespace LibHac.FsService
         private FileSystemProxyCore FsProxyCore { get; }
 
         /// <summary>The client instance to be used for internal operations like save indexer access.</summary>
+        // ReSharper disable once UnusedAutoPropertyAccessor.Local
         private FileSystemClient FsClient { get; }
 
         public long CurrentProcess { get; private set; }
@@ -110,7 +111,7 @@ namespace LibHac.FsService
 
             if (!IsSystemSaveDataId(attribute.SaveId)) return ResultFs.InvalidArgument.Log();
 
-            Result rc = OpenSaveDataFileSystemImpl(out IFileSystem saveFs, out ulong saveDataId, spaceId,
+            Result rc = OpenSaveDataFileSystemImpl(out IFileSystem saveFs, out _, spaceId,
                 attribute, false, true);
             if (rc.IsFailure()) return rc;
 
@@ -159,6 +160,7 @@ namespace LibHac.FsService
 
             if (saveDataId != SaveIndexerId)
             {
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 if (hasFixedId)
                 {
                     // todo: remove save indexer entry

src/LibHac/FsService/FileSystemProxyCore.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.FsSystem.Save;
 using LibHac.FsService.Creators;
@@ -157,9 +158,8 @@ namespace LibHac.FsService
 
             // Missing save FS cache lookup
 
-            rc = FsCreators.SaveDataFileSystemCreator.Create(out IFileSystem saveFs,
+            rc = FsCreators.SaveDataFileSystemCreator.Create(out IFileSystem saveFs, out _, saveDirFs, saveDataId,
-                out ISaveDataExtraDataAccessor extraDataAccessor, saveDirFs, saveDataId, allowDirectorySaveData,
+                allowDirectorySaveData, useDeviceUniqueMac, type, null);
-                useDeviceUniqueMac, type, null);
 
             if (rc.IsFailure()) return rc;
 

src/LibHac/FsService/IFileSystemProxy.cs

@@ -1,5 +1,6 @@
 using System;
 using LibHac.Common;
+using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Ncm;
 using LibHac.Spl;

src/LibHac/FsService/SaveIndexerStruct.cs

@@ -2,7 +2,7 @@
 using System.Buffers.Binary;
 using LibHac.Kvdb;
 
-namespace LibHac.FsSystem
+namespace LibHac.FsService
 {
     public class SaveIndexerStruct : IExportable
     {

src/LibHac/FsService/Util.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 using LibHac.FsSystem;
 
 namespace LibHac.FsService

src/LibHac/FsSystem/Aes128CtrExStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/Aes128CtrStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers;
 using System.Buffers.Binary;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/Aes128XtsStorage.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/AesXtsDirectory.cs

@@ -1,5 +1,6 @@
 using System;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/AesXtsFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/AesXtsFileHeader.cs

@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/AesXtsFileSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/BucketTree.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/CachedStorage.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/ConcatenationDirectory.cs

@@ -1,6 +1,6 @@
 using System;
 using LibHac.Common;
-
+using LibHac.Fs;
 #if CROSS_PLATFORM
 using System.Runtime.InteropServices;
 #endif

src/LibHac/FsSystem/ConcatenationFile.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/ConcatenationFileSystem.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using LibHac.Fs;
 #if CROSS_PLATFORM
 using System.Runtime.InteropServices;
 #endif

src/LibHac/FsSystem/ConcatenationStorage.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/ConcatenationStorageBuilder.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/Delta.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/DirectorySaveDataFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/DirectoryUtils.cs

@@ -1,5 +1,6 @@
 using System;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/FileBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/FileReader.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/FileStorage.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/FileSystemExtensions.cs

@@ -3,6 +3,7 @@ using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/IndirectStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/IntegrityVerificationStorage.cs

@@ -2,6 +2,7 @@
 using System.Buffers;
 using System.IO;
 using System.Security.Cryptography;
+using LibHac.Fs;
 using LibHac.FsSystem.Save;
 
 namespace LibHac.FsSystem

src/LibHac/FsSystem/LayeredFileSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/LayeredFileSystemDirectory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/LocalDirectory.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/LocalFile.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/LocalFileSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Security;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/MemoryStorage.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/NcaUtils/Nca.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using LibHac.Fs;
 using LibHac.FsSystem.RomFs;
 
 namespace LibHac.FsSystem.NcaUtils

src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers.Binary;
 using System.Diagnostics;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.NcaUtils
 {

src/LibHac/FsSystem/NcaUtils/NcaHeader.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.NcaUtils
 {

src/LibHac/FsSystem/NullFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/NullStorage.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/NxFileStream.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/PartitionDirectory.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Text;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/PartitionFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/PartitionFileSystem.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/PartitionFileSystemBuilder.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/PathTools.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using LibHac.Fs;
 
 #if HAS_FILE_SYSTEM_NAME
 using System.IO.Enumeration;

src/LibHac/FsSystem/ReadOnlyFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/ReadOnlyFileSystem.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem
 {

src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/RomFs/RomFsBuilder.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/RomFs/RomFsDictionary.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/RomFs/RomFsDirectory.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using LibHac.Common;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/RomFs/RomFsFile.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs

@@ -1,4 +1,5 @@
 using System;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.RomFs
 {

src/LibHac/FsSystem/Save/AllocationTable.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.Save
 {

src/LibHac/FsSystem/Save/AllocationTableStorage.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using LibHac.Fs;
 
 namespace LibHac.FsSystem.Save
 {