From 115d0484a65dfed9663dc601d80078edc5576fe2 Mon Sep 17 00:00:00 2001
From: crueter <crueter@crueter.xyz>
Date: Wed, 23 Jul 2025 01:21:18 -0400
Subject: [PATCH] thank you Qt Creator, very cool

Signed-off-by: crueter <crueter@crueter.xyz>
---
 src/qt_common/qt_common.cpp    |  7 ++-----
 src/qt_common/qt_game_util.cpp | 10 +++++++---
 src/yuzu/main.cpp              |  3 ---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/qt_common/qt_common.cpp b/src/qt_common/qt_common.cpp
index 0cd4c86b4a..54c79c93e1 100644
--- a/src/qt_common/qt_common.cpp
+++ b/src/qt_common/qt_common.cpp
@@ -9,17 +9,14 @@
 
 #include <QGuiApplication>
 #include <QStringLiteral>
-#include <QWindow>
 #include "common/logging/log.h"
 #include "core/frontend/emu_window.h"
 
-#if !defined(WIN32) && !defined(__APPLE__)
-#include <qpa/qplatformnativeinterface.h>
-
 #include <QFile>
-
 #include <JlCompress.h>
 
+#if !defined(WIN32) && !defined(__APPLE__)
+#include <qpa/qplatformnativeinterface.h>
 #elif defined(__APPLE__)
 #include <objc/message.h>
 #endif
diff --git a/src/qt_common/qt_game_util.cpp b/src/qt_common/qt_game_util.cpp
index 9264c782d1..add9d46a39 100644
--- a/src/qt_common/qt_game_util.cpp
+++ b/src/qt_common/qt_game_util.cpp
@@ -7,11 +7,15 @@
 
 #include <QDesktopServices>
 #include <QUrl>
-#include "fmt/ostream.h"
-#include <fstream>
 
 #ifdef _WIN32
-#include <windows.h>
+    #include <shlobj.h>
+    #include <windows.h>
+    #include "common/scope_exit.h"
+    #include "common/string_util.h"
+#else
+    #include "fmt/ostream.h"
+    #include <fstream>
 #endif
 
 namespace QtCommon {
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 88f3a3d743..86e0755ce8 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -15,8 +15,6 @@
 #include "qt_common/qt_game_util.h"
 #include "qt_common/qt_path_util.h"
 
-#include <JlCompress.h>
-
 #ifdef __APPLE__
 #include <unistd.h> // for chdir
 #endif
@@ -121,7 +119,6 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
 #ifdef _WIN32
-#include <shlobj.h>
 #include "common/windows/timer_resolution.h"
 #endif
 #ifdef ARCHITECTURE_x86_64