From 9d09ba938c20d1cd0e45a2d0c99394ba54d0c681 Mon Sep 17 00:00:00 2001
From: SamsonLib <Samson.gw21@gmail.com>
Date: Tue, 17 Jun 2025 15:33:25 +0200
Subject: [PATCH] Still (include) build errors but should be fixed after
 copying assert.h (/src/common/assert.h)

---
 core/fs/fs_filesystem.h     |  4 ++--
 core/fs/fsmitm_romfsbuild.h |  3 ++-
 core/fs/registered_cache.h  |  2 +-
 core/fs/romfs.cpp           | 16 ++++++++--------
 core/fs/romfs.h             |  2 +-
 core/fs/vfs/vfs.h           |  6 +++---
 core/fs/vfs/vfs_cached.h    |  2 +-
 core/fs/vfs/vfs_concat.h    |  2 +-
 core/fs/vfs/vfs_offset.h    |  2 +-
 core/fs/vfs/vfs_vector.h    |  2 +-
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/fs/fs_filesystem.h b/core/fs/fs_filesystem.h
index 329b5ac..6f0e606 100644
--- a/core/fs/fs_filesystem.h
+++ b/core/fs/fs_filesystem.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "common/common_funcs.h"
-#include "common/common_types.h"
+#include "core/fs/common_funcs.h"
+#include "import/common/common_types.h"
 
 namespace FileSys {
 
diff --git a/core/fs/fsmitm_romfsbuild.h b/core/fs/fsmitm_romfsbuild.h
index dd7ed4a..6017288 100644
--- a/core/fs/fsmitm_romfsbuild.h
+++ b/core/fs/fsmitm_romfsbuild.h
@@ -7,7 +7,8 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
+
 
 namespace FileSys {
 
diff --git a/core/fs/registered_cache.h b/core/fs/registered_cache.h
index a7fc556..0a34b4c 100644
--- a/core/fs/registered_cache.h
+++ b/core/fs/registered_cache.h
@@ -11,7 +11,7 @@
 #include <boost/container/flat_map.hpp>
 #include "common/common_types.h"
 #include "core/crypto/key_manager.h"
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {
 class CNMT;
diff --git a/core/fs/romfs.cpp b/core/fs/romfs.cpp
index a2b2809..39bcbf4 100644
--- a/core/fs/romfs.cpp
+++ b/core/fs/romfs.cpp
@@ -5,15 +5,15 @@
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "common/string_util.h"
+#include "core/fs/fs_string_util.h"
 #include "common/swap.h"
-#include "core/file_sys/fsmitm_romfsbuild.h"
-#include "core/file_sys/romfs.h"
-#include "core/file_sys/vfs/vfs.h"
-#include "core/file_sys/vfs/vfs_cached.h"
-#include "core/file_sys/vfs/vfs_concat.h"
-#include "core/file_sys/vfs/vfs_offset.h"
-#include "core/file_sys/vfs/vfs_vector.h"
+#include "core/fs/fsmitm_romfsbuild.h"
+#include "core/fs/romfs.h"
+#include "core/fs/vfs/vfs.h"
+#include "core/fs/vfs/vfs_cached.h"
+#include "core/fs/vfs/vfs_concat.h"
+#include "core/fs/vfs/vfs_offset.h"
+#include "core/fs/vfs/vfs_vector.h"
 
 namespace FileSys {
 namespace {
diff --git a/core/fs/romfs.h b/core/fs/romfs.h
index 3c0aca2..81a82ad 100644
--- a/core/fs/romfs.h
+++ b/core/fs/romfs.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {
 
diff --git a/core/fs/vfs/vfs.h b/core/fs/vfs/vfs.h
index f846a96..e30e310 100644
--- a/core/fs/vfs/vfs.h
+++ b/core/fs/vfs/vfs.h
@@ -11,10 +11,10 @@
 #include <type_traits>
 #include <vector>
 
-#include "common/common_funcs.h"
+#include "core/fs/common_funcs.h"
 #include "common/common_types.h"
-#include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/vfs/vfs_types.h"
+#include "core/fs/fs_filesystem.h"
+#include "core/fs/vfs/vfs_types.h"
 
 namespace FileSys {
 
diff --git a/core/fs/vfs/vfs_cached.h b/core/fs/vfs/vfs_cached.h
index 47dff72..0d951ce 100644
--- a/core/fs/vfs/vfs_cached.h
+++ b/core/fs/vfs/vfs_cached.h
@@ -5,7 +5,7 @@
 
 #include <string_view>
 #include <vector>
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {
 
diff --git a/core/fs/vfs/vfs_concat.h b/core/fs/vfs/vfs_concat.h
index 6d12af7..d8a8c39 100644
--- a/core/fs/vfs/vfs_concat.h
+++ b/core/fs/vfs/vfs_concat.h
@@ -6,7 +6,7 @@
 #include <compare>
 #include <map>
 #include <memory>
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {
 
diff --git a/core/fs/vfs/vfs_offset.h b/core/fs/vfs/vfs_offset.h
index 4abe41d..01ba4a1 100644
--- a/core/fs/vfs/vfs_offset.h
+++ b/core/fs/vfs/vfs_offset.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {
 
diff --git a/core/fs/vfs/vfs_vector.h b/core/fs/vfs/vfs_vector.h
index 587187d..b53caf2 100644
--- a/core/fs/vfs/vfs_vector.h
+++ b/core/fs/vfs/vfs_vector.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "core/file_sys/vfs/vfs.h"
+#include "core/fs/vfs/vfs.h"
 
 namespace FileSys {