Merge pull request #876 from linkmauve/include-cleanups

Cleanup includes, mostly in common
author: Yuri Kunde Schlesner 2015-07-10 16:36:12 -0700
committer: Yuri Kunde Schlesner 2015-07-10 16:36:12 -0700
commit: 867c28ae03b3b2883713896765f3ff76eaf90a19 (patch)
tree: 8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/core/file_sys
parent: Merge pull request #906 from aroulin/loader-format-specifier-warning (diff)
parent: Core: Cleanup hw includes. (diff)
download: yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.gz
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.xz
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.zip
18 files changed, 59 insertions, 30 deletions
diff --git a/src/core/file_sys/archive_backend.cpp b/src/core/file_sys/archive_backend.cpp
index 45a559ce8..3f81447df 100644
--- a/src/core/file_sys/archive_backend.cpp
+++ b/src/core/file_sys/archive_backend.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <cstddef>
+#include <iomanip>
 #include <sstream>
 #include "common/logging/log.h"
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp
index e50c58a52..92dad8e6f 100644
--- a/src/core/file_sys/archive_extsavedata.cpp
+++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -2,17 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <sys/stat.h>
+#include <algorithm>
+#include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
+#include "common/string_util.h"
 #include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/settings.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h
index ef0b27bde..ec8d770fc 100644
--- a/src/core/file_sys/archive_extsavedata.h
+++ b/src/core/file_sys/archive_extsavedata.h
@@ -4,10 +4,13 @@
 #pragma once
+#include <memory>
+#include <string>
 #include "common/common_types.h"
-#include "core/file_sys/disk_archive.h"
+#include "core/file_sys/archive_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp
index d4a12ed10..c1e45dfeb 100644
--- a/src/core/file_sys/archive_romfs.cpp
+++ b/src/core/file_sys/archive_romfs.cpp
@@ -2,14 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <algorithm>
 #include <memory>
 #include "common/common_types.h"
-#include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
 #include "core/file_sys/archive_romfs.h"
+#include "core/file_sys/ivfc_archive.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h
index 409bc670a..c69ff91c3 100644
--- a/src/core/file_sys/archive_romfs.h
+++ b/src/core/file_sys/archive_romfs.h
@@ -5,11 +5,13 @@
 #pragma once
 #include <memory>
+#include <string>
 #include <vector>
 #include "common/common_types.h"
-#include "core/file_sys/ivfc_archive.h"
+#include "core/file_sys/archive_backend.h"
+#include "core/hle/result.h"
 #include "core/loader/loader.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index a92309377..98823aec3 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -2,18 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <sys/stat.h>
+#include <algorithm>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
+#include "common/string_util.h"
 #include "core/file_sys/archive_savedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/settings.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_savedata.h b/src/core/file_sys/archive_savedata.h
index db17afc92..1f65297dd 100644
--- a/src/core/file_sys/archive_savedata.h
+++ b/src/core/file_sys/archive_savedata.h
@@ -4,10 +4,11 @@
 #pragma once
-#include "common/common_types.h"
+#include <memory>
+#include <string>
-#include "core/file_sys/disk_archive.h"
+#include "core/file_sys/archive_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp
index e7e4fbf1d..dec838cae 100644
--- a/src/core/file_sys/archive_savedatacheck.cpp
+++ b/src/core/file_sys/archive_savedatacheck.cpp
@@ -2,11 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <algorithm>
+#include <vector>
+#include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
+#include "common/string_util.h"
 #include "core/file_sys/archive_savedatacheck.h"
+#include "core/file_sys/ivfc_archive.h"
 #include "core/hle/service/fs/archive.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/file_sys/archive_savedatacheck.h b/src/core/file_sys/archive_savedatacheck.h
index f78a6f02e..b14aefe8b 100644
--- a/src/core/file_sys/archive_savedatacheck.h
+++ b/src/core/file_sys/archive_savedatacheck.h
@@ -4,12 +4,11 @@
 #pragma once
-#include <vector>
+#include <memory>
+#include <string>
-#include "common/common_types.h"
+#include "core/file_sys/archive_backend.h"
+#include "core/hle/result.h"
-#include "core/file_sys/ivfc_archive.h"
-#include "core/loader/loader.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index c1234a186..5c825f429 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -2,9 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <sys/stat.h>
+#include <algorithm>
-#include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 1becf6c0f..10b273bdb 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -4,10 +4,11 @@
 #pragma once
-#include "common/common_types.h"
+#include <memory>
+#include <string>
-#include "core/file_sys/disk_archive.h"
+#include "core/file_sys/archive_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 4fe785c97..896f89529 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -2,15 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <sys/stat.h>
+#include <algorithm>
+#include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/make_unique.h"
+#include "common/string_util.h"
 #include "core/file_sys/archive_systemsavedata.h"
+#include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/settings.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index 3431fed88..afc689848 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -4,10 +4,13 @@
 #pragma once
+#include <memory>
+#include <string>
 #include "common/common_types.h"
-#include "core/file_sys/disk_archive.h"
+#include "core/file_sys/archive_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp
index 9980cced1..85151a311 100644
--- a/src/core/file_sys/disk_archive.cpp
+++ b/src/core/file_sys/disk_archive.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
-#include <sys/stat.h>
+#include <algorithm>
+#include <cstdio>
 #include "common/common_types.h"
 #include "common/file_util.h"
@@ -10,7 +11,6 @@
 #include "common/make_unique.h"
 #include "core/file_sys/disk_archive.h"
-#include "core/settings.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index a22d3837a..5cfcddf6c 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -4,13 +4,18 @@
 #pragma once
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index 0fcff1845..f5f72c722 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -4,6 +4,8 @@
 #pragma once
+#include <cstddef>
 #include "common/common_types.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp
index 2d2509d16..c88b39bcd 100644
--- a/src/core/file_sys/ivfc_archive.cpp
+++ b/src/core/file_sys/ivfc_archive.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
+#include <cstring>
 #include <memory>
 #include "common/common_types.h"
-#include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/make_unique.h"
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index 10415798d..1850b3b17 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -4,7 +4,9 @@
 #pragma once
+#include <cstddef>
 #include <memory>
+#include <string>
 #include <vector>
 #include "common/common_types.h"
@@ -12,7 +14,7 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"
-#include "core/loader/loader.h"
+#include "core/hle/result.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
author	Yuri Kunde Schlesner	2015-07-10 16:36:12 -0700
committer	Yuri Kunde Schlesner	2015-07-10 16:36:12 -0700
commit	867c28ae03b3b2883713896765f3ff76eaf90a19 (patch)
tree	8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/core/file_sys
parent	Merge pull request #906 from aroulin/loader-format-specifier-warning (diff)
parent	Core: Cleanup hw includes. (diff)
download	yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.gz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.xz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.zip

diff --git a/src/core/file_sys/archive_backend.cpp b/src/core/file_sys/archive_backend.cpp index 45a559ce8..3f81447df 100644 --- a/src/core/file_sys/archive_backend.cpp +++ b/src/core/file_sys/archive_backend.cpp
@@ -2,6 +2,8 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
		5	#include <cstddef>
		6	#include <iomanip>
5	#include <sstream>	7	#include <sstream>
6		8
7	#include "common/logging/log.h"	9	#include "common/logging/log.h"


diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index e50c58a52..92dad8e6f 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -2,17 +2,18 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <sys/stat.h>	5	#include <algorithm>
		6	#include <vector>
6		7
7	#include "common/common_types.h"	8	#include "common/common_types.h"
8	#include "common/file_util.h"	9	#include "common/file_util.h"
9	#include "common/logging/log.h"	10	#include "common/logging/log.h"
10	#include "common/make_unique.h"	11	#include "common/make_unique.h"
		12	#include "common/string_util.h"
11		13
12	#include "core/file_sys/archive_extsavedata.h"	14	#include "core/file_sys/archive_extsavedata.h"
13	#include "core/file_sys/disk_archive.h"	15	#include "core/file_sys/disk_archive.h"
14	#include "core/hle/service/fs/archive.h"	16	#include "core/hle/service/fs/archive.h"
15	#include "core/settings.h"
16		17
17	////////////////////////////////////////////////////////////////////////////////////////////////////	18	////////////////////////////////////////////////////////////////////////////////////////////////////
18	// FileSys namespace	19	// FileSys namespace


diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h index ef0b27bde..ec8d770fc 100644 --- a/src/core/file_sys/archive_extsavedata.h +++ b/src/core/file_sys/archive_extsavedata.h
@@ -4,10 +4,13 @@
4		4
5	#pragma once	5	#pragma once
6		6
		7	#include <memory>
		8	#include <string>
		9
7	#include "common/common_types.h"	10	#include "common/common_types.h"
8		11
9	#include "core/file_sys/disk_archive.h"	12	#include "core/file_sys/archive_backend.h"
10	#include "core/loader/loader.h"	13	#include "core/hle/result.h"
11		14
12	////////////////////////////////////////////////////////////////////////////////////////////////////	15	////////////////////////////////////////////////////////////////////////////////////////////////////
13	// FileSys namespace	16	// FileSys namespace


diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index d4a12ed10..c1e45dfeb 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp
@@ -2,14 +2,15 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
		5	#include <algorithm>
5	#include <memory>	6	#include <memory>
6		7
7	#include "common/common_types.h"	8	#include "common/common_types.h"
8	#include "common/file_util.h"
9	#include "common/logging/log.h"	9	#include "common/logging/log.h"
10	#include "common/make_unique.h"	10	#include "common/make_unique.h"
11		11
12	#include "core/file_sys/archive_romfs.h"	12	#include "core/file_sys/archive_romfs.h"
		13	#include "core/file_sys/ivfc_archive.h"
13		14
14	////////////////////////////////////////////////////////////////////////////////////////////////////	15	////////////////////////////////////////////////////////////////////////////////////////////////////
15	// FileSys namespace	16	// FileSys namespace


diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index 409bc670a..c69ff91c3 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h
@@ -5,11 +5,13 @@
5	#pragma once	5	#pragma once
6		6
7	#include <memory>	7	#include <memory>
		8	#include <string>
8	#include <vector>	9	#include <vector>
9		10
10	#include "common/common_types.h"	11	#include "common/common_types.h"
11		12
12	#include "core/file_sys/ivfc_archive.h"	13	#include "core/file_sys/archive_backend.h"
		14	#include "core/hle/result.h"
13	#include "core/loader/loader.h"	15	#include "core/loader/loader.h"
14		16
15	////////////////////////////////////////////////////////////////////////////////////////////////////	17	////////////////////////////////////////////////////////////////////////////////////////////////////


diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index a92309377..98823aec3 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp
@@ -2,18 +2,18 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <sys/stat.h>	5	#include <algorithm>
6		6
7	#include "common/common_types.h"	7	#include "common/common_types.h"
8	#include "common/file_util.h"	8	#include "common/file_util.h"
9	#include "common/logging/log.h"	9	#include "common/logging/log.h"
10	#include "common/make_unique.h"	10	#include "common/make_unique.h"
		11	#include "common/string_util.h"
11		12
12	#include "core/file_sys/archive_savedata.h"	13	#include "core/file_sys/archive_savedata.h"
13	#include "core/file_sys/disk_archive.h"	14	#include "core/file_sys/disk_archive.h"
14	#include "core/hle/kernel/process.h"	15	#include "core/hle/kernel/process.h"
15	#include "core/hle/service/fs/archive.h"	16	#include "core/hle/service/fs/archive.h"
16	#include "core/settings.h"
17		17
18	////////////////////////////////////////////////////////////////////////////////////////////////////	18	////////////////////////////////////////////////////////////////////////////////////////////////////
19	// FileSys namespace	19	// FileSys namespace


diff --git a/src/core/file_sys/archive_savedata.h b/src/core/file_sys/archive_savedata.h index db17afc92..1f65297dd 100644 --- a/src/core/file_sys/archive_savedata.h +++ b/src/core/file_sys/archive_savedata.h
@@ -4,10 +4,11 @@
4		4
5	#pragma once	5	#pragma once
6		6
7	#include "common/common_types.h"	7	#include <memory>
		8	#include <string>
8		9
9	#include "core/file_sys/disk_archive.h"	10	#include "core/file_sys/archive_backend.h"
10	#include "core/loader/loader.h"	11	#include "core/hle/result.h"
11		12
12	////////////////////////////////////////////////////////////////////////////////////////////////////	13	////////////////////////////////////////////////////////////////////////////////////////////////////
13	// FileSys namespace	14	// FileSys namespace


diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index e7e4fbf1d..dec838cae 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp
@@ -2,11 +2,17 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
		5	#include <algorithm>
		6	#include <vector>
		7
		8	#include "common/common_types.h"
5	#include "common/file_util.h"	9	#include "common/file_util.h"
6	#include "common/logging/log.h"	10	#include "common/logging/log.h"
7	#include "common/make_unique.h"	11	#include "common/make_unique.h"
		12	#include "common/string_util.h"
8		13
9	#include "core/file_sys/archive_savedatacheck.h"	14	#include "core/file_sys/archive_savedatacheck.h"
		15	#include "core/file_sys/ivfc_archive.h"
10	#include "core/hle/service/fs/archive.h"	16	#include "core/hle/service/fs/archive.h"
11		17
12	////////////////////////////////////////////////////////////////////////////////////////////////////	18	////////////////////////////////////////////////////////////////////////////////////////////////////


diff --git a/src/core/file_sys/archive_savedatacheck.h b/src/core/file_sys/archive_savedatacheck.h index f78a6f02e..b14aefe8b 100644 --- a/src/core/file_sys/archive_savedatacheck.h +++ b/src/core/file_sys/archive_savedatacheck.h
@@ -4,12 +4,11 @@
4		4
5	#pragma once	5	#pragma once
6		6
7	#include <vector>	7	#include <memory>
		8	#include <string>
8		9
9	#include "common/common_types.h"	10	#include "core/file_sys/archive_backend.h"
10		11	#include "core/hle/result.h"
11	#include "core/file_sys/ivfc_archive.h"
12	#include "core/loader/loader.h"
13		12
14	////////////////////////////////////////////////////////////////////////////////////////////////////	13	////////////////////////////////////////////////////////////////////////////////////////////////////
15	// FileSys namespace	14	// FileSys namespace


diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index c1234a186..5c825f429 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp
@@ -2,9 +2,8 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <sys/stat.h>	5	#include <algorithm>
6		6
7	#include "common/common_types.h"
8	#include "common/file_util.h"	7	#include "common/file_util.h"
9	#include "common/logging/log.h"	8	#include "common/logging/log.h"
10	#include "common/make_unique.h"	9	#include "common/make_unique.h"


diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h index 1becf6c0f..10b273bdb 100644 --- a/src/core/file_sys/archive_sdmc.h +++ b/src/core/file_sys/archive_sdmc.h
@@ -4,10 +4,11 @@
4		4
5	#pragma once	5	#pragma once
6		6
7	#include "common/common_types.h"	7	#include <memory>
		8	#include <string>
8		9
9	#include "core/file_sys/disk_archive.h"	10	#include "core/file_sys/archive_backend.h"
10	#include "core/loader/loader.h"	11	#include "core/hle/result.h"
11		12
12	////////////////////////////////////////////////////////////////////////////////////////////////////	13	////////////////////////////////////////////////////////////////////////////////////////////////////
13	// FileSys namespace	14	// FileSys namespace


diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 4fe785c97..896f89529 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -2,15 +2,17 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <sys/stat.h>	5	#include <algorithm>
		6	#include <vector>
6		7
7	#include "common/common_types.h"	8	#include "common/common_types.h"
8	#include "common/file_util.h"	9	#include "common/file_util.h"
9	#include "common/make_unique.h"	10	#include "common/make_unique.h"
		11	#include "common/string_util.h"
10		12
11	#include "core/file_sys/archive_systemsavedata.h"	13	#include "core/file_sys/archive_systemsavedata.h"
		14	#include "core/file_sys/disk_archive.h"
12	#include "core/hle/service/fs/archive.h"	15	#include "core/hle/service/fs/archive.h"
13	#include "core/settings.h"
14		16
15	////////////////////////////////////////////////////////////////////////////////////////////////////	17	////////////////////////////////////////////////////////////////////////////////////////////////////
16	// FileSys namespace	18	// FileSys namespace


diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h index 3431fed88..afc689848 100644 --- a/src/core/file_sys/archive_systemsavedata.h +++ b/src/core/file_sys/archive_systemsavedata.h
@@ -4,10 +4,13 @@
4		4
5	#pragma once	5	#pragma once
6		6
		7	#include <memory>
		8	#include <string>
		9
7	#include "common/common_types.h"	10	#include "common/common_types.h"
8		11
9	#include "core/file_sys/disk_archive.h"	12	#include "core/file_sys/archive_backend.h"
10	#include "core/loader/loader.h"	13	#include "core/hle/result.h"
11		14
12	////////////////////////////////////////////////////////////////////////////////////////////////////	15	////////////////////////////////////////////////////////////////////////////////////////////////////
13	// FileSys namespace	16	// FileSys namespace


diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp index 9980cced1..85151a311 100644 --- a/src/core/file_sys/disk_archive.cpp +++ b/src/core/file_sys/disk_archive.cpp
@@ -2,7 +2,8 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
5	#include <sys/stat.h>	5	#include <algorithm>
		6	#include <cstdio>
6		7
7	#include "common/common_types.h"	8	#include "common/common_types.h"
8	#include "common/file_util.h"	9	#include "common/file_util.h"
@@ -10,7 +11,6 @@
10	#include "common/make_unique.h"	11	#include "common/make_unique.h"
11		12
12	#include "core/file_sys/disk_archive.h"	13	#include "core/file_sys/disk_archive.h"
13	#include "core/settings.h"
14		14
15	////////////////////////////////////////////////////////////////////////////////////////////////////	15	////////////////////////////////////////////////////////////////////////////////////////////////////
16	// FileSys namespace	16	// FileSys namespace


diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h index a22d3837a..5cfcddf6c 100644 --- a/src/core/file_sys/disk_archive.h +++ b/src/core/file_sys/disk_archive.h
@@ -4,13 +4,18 @@
4		4
5	#pragma once	5	#pragma once
6		6
		7	#include <cstddef>
		8	#include <memory>
		9	#include <string>
		10	#include <vector>
		11
7	#include "common/common_types.h"	12	#include "common/common_types.h"
8	#include "common/file_util.h"	13	#include "common/file_util.h"
9		14
10	#include "core/file_sys/archive_backend.h"	15	#include "core/file_sys/archive_backend.h"
11	#include "core/file_sys/directory_backend.h"	16	#include "core/file_sys/directory_backend.h"
12	#include "core/file_sys/file_backend.h"	17	#include "core/file_sys/file_backend.h"
13	#include "core/loader/loader.h"	18	#include "core/hle/result.h"
14		19
15	////////////////////////////////////////////////////////////////////////////////////////////////////	20	////////////////////////////////////////////////////////////////////////////////////////////////////
16	// FileSys namespace	21	// FileSys namespace


diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h index 0fcff1845..f5f72c722 100644 --- a/src/core/file_sys/file_backend.h +++ b/src/core/file_sys/file_backend.h
@@ -4,6 +4,8 @@
4		4
5	#pragma once	5	#pragma once
6		6
		7	#include <cstddef>
		8
7	#include "common/common_types.h"	9	#include "common/common_types.h"
8		10
9	////////////////////////////////////////////////////////////////////////////////////////////////////	11	////////////////////////////////////////////////////////////////////////////////////////////////////


diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp index 2d2509d16..c88b39bcd 100644 --- a/src/core/file_sys/ivfc_archive.cpp +++ b/src/core/file_sys/ivfc_archive.cpp
@@ -2,10 +2,10 @@
2	// Licensed under GPLv2 or any later version	2	// Licensed under GPLv2 or any later version
3	// Refer to the license.txt file included.	3	// Refer to the license.txt file included.
4		4
		5	#include <cstring>
5	#include <memory>	6	#include <memory>
6		7
7	#include "common/common_types.h"	8	#include "common/common_types.h"
8	#include "common/file_util.h"
9	#include "common/logging/log.h"	9	#include "common/logging/log.h"
10	#include "common/make_unique.h"	10	#include "common/make_unique.h"
11		11


diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h index 10415798d..1850b3b17 100644 --- a/src/core/file_sys/ivfc_archive.h +++ b/src/core/file_sys/ivfc_archive.h
@@ -4,7 +4,9 @@
4		4
5	#pragma once	5	#pragma once
6		6
		7	#include <cstddef>
7	#include <memory>	8	#include <memory>
		9	#include <string>
8	#include <vector>	10	#include <vector>
9		11
10	#include "common/common_types.h"	12	#include "common/common_types.h"
@@ -12,7 +14,7 @@
12	#include "core/file_sys/archive_backend.h"	14	#include "core/file_sys/archive_backend.h"
13	#include "core/file_sys/directory_backend.h"	15	#include "core/file_sys/directory_backend.h"
14	#include "core/file_sys/file_backend.h"	16	#include "core/file_sys/file_backend.h"
15	#include "core/loader/loader.h"	17	#include "core/hle/result.h"
16		18
17	////////////////////////////////////////////////////////////////////////////////////////////////////	19	////////////////////////////////////////////////////////////////////////////////////////////////////
18	// FileSys namespace	20	// FileSys namespace