vfs_real: Forward declare IOFile

Eliminates the need to rebuild some source files if the file_util header
ever changes. This also uncovered some indirect inclusions, which have
also been fixed.

5 files changed, 13 insertions, 1 deletions

diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index d15242d59..a3f4d9421 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -16,8 +16,9 @@
 #include <boost/container/flat_map.hpp>
 #include <fmt/format.h>
 #include "common/common_paths.h"
+#include "common/common_types.h"
+#include "common/file_util.h"
 #include "common/logging/log.h"
-#include "common/string_util.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/registered_cache.h"
diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h
index 6a5c2f5f8..84731464a 100644
--- a/src/yuzu/game_list.h
+++ b/src/yuzu/game_list.h
@@ -20,6 +20,8 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
+#include "common/common_types.h"
+
 class GameListWorker;
 class GMainWindow;
 
diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h
index 3624cb21a..4ddd8cd88 100644
--- a/src/yuzu/game_list_p.h
+++ b/src/yuzu/game_list_p.h
@@ -4,18 +4,23 @@
 
 #pragma once
 
+#include <algorithm>
 #include <array>
 #include <atomic>
 #include <map>
 #include <memory>
+#include <string>
 #include <unordered_map>
 #include <utility>
+
 #include <QCoreApplication>
 #include <QImage>
 #include <QObject>
 #include <QRunnable>
 #include <QStandardItem>
 #include <QString>
+
+#include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "yuzu/ui_settings.h"
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index cfc48a416..fd73b8541 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -18,6 +18,7 @@
 #include <QtWidgets>
 #include <fmt/format.h>
 #include "common/common_paths.h"
+#include "common/file_util.h"
 #include "common/logging/backend.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 3d6ebe329..29bc6e004 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -6,8 +6,11 @@
 
 #include <memory>
 #include <unordered_map>
+
 #include <QMainWindow>
 #include <QTimer>
+
+#include "common/common_types.h"
 #include "core/core.h"
 #include "ui_main.h"
 #include "yuzu/hotkeys.h"