diff --git a/libraries/libstratosphere/include/stratosphere/fs.hpp b/libraries/libstratosphere/include/stratosphere/fs.hpp
index 176588fe7..413d23b28 100644
--- a/libraries/libstratosphere/include/stratosphere/fs.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs.hpp
@@ -35,7 +35,7 @@
 #include <stratosphere/fs/fs_substorage.hpp>
 #include <stratosphere/fs/fs_memory_storage.hpp>
 #include <stratosphere/fs/fs_remote_storage.hpp>
-#include <stratosphere/fs/fs_file_storage.hpp>
+#include <stratosphere/fs/common/fs_file_storage.hpp>
 #include <stratosphere/fs/fs_query_range.hpp>
 #include <stratosphere/fs/fs_speed_emulation.hpp>
 #include <stratosphere/fs/impl/fs_common_mount_name.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_file_storage.hpp b/libraries/libstratosphere/include/stratosphere/fs/common/fs_file_storage.hpp
similarity index 100%
rename from libraries/libstratosphere/include/stratosphere/fs/fs_file_storage.hpp
rename to libraries/libstratosphere/include/stratosphere/fs/common/fs_file_storage.hpp
diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_submission_package_install_task.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_submission_package_install_task.hpp
index 91f8b2001..790590c23 100644
--- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_submission_package_install_task.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_submission_package_install_task.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <stratosphere/fs/fs_file_storage.hpp>
+#include <stratosphere/fs/common/fs_file_storage.hpp>
 #include <stratosphere/ncm/ncm_package_install_task.hpp>
 
 namespace ams::ncm {
diff --git a/libraries/libstratosphere/source/fs/fs_file_storage.cpp b/libraries/libstratosphere/source/fs/common/fs_file_storage.cpp
similarity index 97%
rename from libraries/libstratosphere/source/fs/fs_file_storage.cpp
rename to libraries/libstratosphere/source/fs/common/fs_file_storage.cpp
index d0401bb3d..1d6bdfd13 100644
--- a/libraries/libstratosphere/source/fs/fs_file_storage.cpp
+++ b/libraries/libstratosphere/source/fs/common/fs_file_storage.cpp
@@ -19,7 +19,7 @@ namespace ams::fs {
 
     Result FileStorage::UpdateSize() {
         R_SUCCEED_IF(this->size != InvalidSize);
-        return this->base_file->GetSize(&this->size);
+        return this->base_file->GetSize(std::addressof(this->size));
     }
 
     Result FileStorage::Read(s64 offset, void *buffer, size_t size) {
@@ -36,7 +36,7 @@ namespace ams::fs {
         R_UNLESS(IStorage::CheckAccessRange(offset, size, this->size), fs::ResultOutOfRange());
 
         size_t read_size;
-        return this->base_file->Read(&read_size, offset, buffer, size);
+        return this->base_file->Read(std::addressof(read_size), offset, buffer, size);
     }
 
     Result FileStorage::Write(s64 offset, const void *buffer, size_t size) {