Make DiscIO/ mostly IWYU clean (and fix errors in rest of the project detected by this change).

Source/Core/Core/Boot/Boot_WiiWAD.cpp

@@ -6,6 +6,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
 
 #include "Core/ConfigManager.h"
 #include "Core/PatchEngine.h"

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp

@@ -7,6 +7,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
 #include "Common/SettingsHandler.h"
 #include "Common/StringUtil.h"
 

Source/Core/DiscIO/BannerLoader.cpp

@@ -2,16 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/FileUtil.h"
+#include <cstddef>
 
 #include "DiscIO/BannerLoader.h"
 #include "DiscIO/BannerLoaderGC.h"
 #include "DiscIO/BannerLoaderWii.h"
+#include "DiscIO/Filesystem.h"
 #include "DiscIO/VolumeCreator.h"
 
 namespace DiscIO
 {
 
+class IBannerLoader;
+class IVolume;
+
 IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume)
 {
 	if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume))

Source/Core/DiscIO/BannerLoader.h

@@ -7,10 +7,14 @@
 #include <string>
 #include <vector>
 
-#include "DiscIO/Filesystem.h"
+#include "Common/CommonTypes.h"
 
 namespace DiscIO
 {
+
+class IFileSystem;
+class IVolume;
+
 class IBannerLoader
 {
 	public:
@@ -33,4 +37,5 @@ class IBannerLoader
 };
 
 IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume);
-} // namespace
+
+}  // namespace DiscIO

Source/Core/DiscIO/BannerLoaderGC.cpp

@@ -2,9 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cstddef>
+#include <string>
+#include <vector>
+
 #include "Common/ColorUtil.h"
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
+
 #include "DiscIO/BannerLoaderGC.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
 
 namespace DiscIO
 {

Source/Core/DiscIO/BannerLoaderGC.h

@@ -4,13 +4,21 @@
 
 #pragma once
 
-#include "Common/StringUtil.h"
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
 
 #include "DiscIO/BannerLoader.h"
+#include "DiscIO/Volume.h"
 #include "DiscIO/VolumeGC.h"
 
 namespace DiscIO
 {
+
+class IFileSystem;
+
 class CBannerLoaderGC
 	: public IBannerLoader
 {

Source/Core/DiscIO/BannerLoaderWii.cpp

@@ -3,15 +3,19 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdio>
+#include <string>
+#include <vector>
 
 #include "Common/ColorUtil.h"
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
 
 #include "DiscIO/BannerLoaderWii.h"
-#include "DiscIO/FileHandlerARC.h"
-#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/Volume.h"
 
 namespace DiscIO
 {

Source/Core/DiscIO/BannerLoaderWii.h

@@ -4,10 +4,17 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
 #include "DiscIO/BannerLoader.h"
 
 namespace DiscIO
 {
+
+class IVolume;
+
 class CBannerLoaderWii
 	: public IBannerLoader
 {
@@ -60,4 +67,5 @@ class CBannerLoaderWii
 
 		bool GetStringFromComments(const CommentIndex index, std::string& s);
 };
+
 } // namespace

Source/Core/DiscIO/Blob.cpp

@@ -2,7 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cstddef>
+#include <cstring>
+#include <string>
+
 #include "Common/CDUtils.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #include "DiscIO/Blob.h"

Source/Core/DiscIO/CISOBlob.cpp

@@ -3,9 +3,10 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cmath>
+#include <cstdio>
 
-#include "DiscIO/Blob.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 #include "DiscIO/CISOBlob.h"
 
 namespace DiscIO

Source/Core/DiscIO/CISOBlob.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <cstdio>
+
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "DiscIO/Blob.h"
 

Source/Core/DiscIO/CompressedBlob.cpp

@@ -5,15 +5,19 @@
 #ifdef _WIN32
 #include <io.h>
 #include <windows.h>
-#else
-#include <unistd.h>
 #endif
 
+#include <algorithm>
 #include <cinttypes>
+#include <cstdio>
+#include <cstring>
+#include <string>
 #include <zlib.h>
 
+#include "Common/Common.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
+#include "DiscIO/Blob.h"
 #include "DiscIO/CompressedBlob.h"
 #include "DiscIO/DiscScrubber.h"
 

Source/Core/DiscIO/CompressedBlob.h

@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "DiscIO/Blob.h"
 

Source/Core/DiscIO/DiscScrubber.cpp

@@ -2,11 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <string>
+#include <vector>
 
+#include "Common/Common.h"
 #include "Common/FileUtil.h"
 #include "DiscIO/DiscScrubber.h"
 #include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
 #include "DiscIO/VolumeCreator.h"
 
 namespace DiscIO

Source/Core/DiscIO/DiscScrubber.h

@@ -14,8 +14,8 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "DiscIO/Blob.h"
 
+namespace File { class IOFile; }
 
 namespace DiscIO
 {

Source/Core/DiscIO/DriveBlob.cpp

@@ -2,9 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/StringUtil.h"
+#include <cstdio>
+#include <cstring>
+
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
 #include "DiscIO/DriveBlob.h"
 
+#ifdef _WIN32
+#include "Common/StringUtil.h"
+#endif
+
 namespace DiscIO
 {
 

Source/Core/DiscIO/DriveBlob.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "DiscIO/Blob.h"
 

Source/Core/DiscIO/FileBlob.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <cstdio>
+
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "DiscIO/Blob.h"
 

Source/Core/DiscIO/FileHandlerARC.cpp

@@ -2,10 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <string>
+
+#include "Common/Common.h"
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"
 #include "DiscIO/Blob.h"
 #include "DiscIO/FileHandlerARC.h"
+#include "DiscIO/Filesystem.h"
 
 #define ARC_ID 0x55aa382d
 

Source/Core/DiscIO/FileHandlerARC.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <string>
 #include <vector>