diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3qt/emu_settings_type.h
index 988f8154be..c7012a59d1 100644
--- a/rpcs3/rpcs3qt/emu_settings_type.h
+++ b/rpcs3/rpcs3qt/emu_settings_type.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QMap>
+#include <vector>
 
 // Node location
 using cfg_location = std::vector<const char*>;
diff --git a/rpcs3/rpcs3qt/log_viewer.cpp b/rpcs3/rpcs3qt/log_viewer.cpp
index ca902d3bf1..27f326eb24 100644
--- a/rpcs3/rpcs3qt/log_viewer.cpp
+++ b/rpcs3/rpcs3qt/log_viewer.cpp
@@ -3,9 +3,9 @@
 #include "log_viewer.h"
 #include "gui_settings.h"
 #include "syntax_highlighter.h"
-#include "find_dialog.h"
 #include "config_checker.h"
 
+#include <QActionGroup>
 #include <QApplication>
 #include <QMenu>
 #include <QFile>
diff --git a/rpcs3/rpcs3qt/log_viewer.h b/rpcs3/rpcs3qt/log_viewer.h
index fa2ea71e52..320b2b97c9 100644
--- a/rpcs3/rpcs3qt/log_viewer.h
+++ b/rpcs3/rpcs3qt/log_viewer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "find_dialog.h"
+
 #include <QPlainTextEdit>
 #include <QDropEvent>
 
@@ -8,7 +10,6 @@
 
 class LogHighlighter;
 class gui_settings;
-class find_dialog;
 
 class log_viewer : public QWidget
 {
diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp
index 23ef326692..c4398e5889 100644
--- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp
@@ -288,7 +288,9 @@ void patch_manager_dialog::populate_tree()
 						const QString q_description = QString::fromStdString(description);
 						QString visible_description = q_description;
 
-						const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(description_role, q_description) << QPair(persistance_role, true);
+						const QList<QPair<int, QVariant>> match_criteria = QList<QPair<int, QVariant>>()
+							<< QPair<int, QVariant>(description_role, q_description)
+							<< QPair<int, QVariant>(persistance_role, true);
 
 						// Add counter to leafs if the name already exists due to different hashes of the same game (PPU, SPU, PRX, OVL)
 						if (const auto matches = gui::utils::find_children_by_data(serial_level_item, match_criteria, false); matches.count() > 0)
@@ -322,7 +324,8 @@ void patch_manager_dialog::populate_tree()
 		}
 	}
 
-	const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(persistance_role, true);
+	const QList<QPair<int, QVariant>> match_criteria = QList<QPair<int, QVariant>>()
+		<< QPair<int, QVariant>(persistance_role, true);
 
 	for (int i = ui->patch_tree->topLevelItemCount() - 1; i >= 0; i--)
 	{
diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp
index a0b93b8633..d2890e509f 100644
--- a/rpcs3/rpcs3qt/update_manager.cpp
+++ b/rpcs3/rpcs3qt/update_manager.cpp
@@ -606,7 +606,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 		update_log.error("Failed to create new AppImage file: %s (%s)", replace_path, fs::g_tls_error);
 		return false;
 	}
-	if (new_appimage.write(data.data(), data.size()) != data.size() + 0u)
+	if (new_appimage.write(data.data(), data.size()) != data.size() + 0ull)
 	{
 		update_log.error("Failed to write new AppImage file: %s", replace_path);
 		return false;
diff --git a/rpcs3/util/cpu_stats.hpp b/rpcs3/util/cpu_stats.hpp
index 66759b5261..bc8184a2f1 100644
--- a/rpcs3/util/cpu_stats.hpp
+++ b/rpcs3/util/cpu_stats.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
 #include "util/types.hpp"
+#include <vector>
 
 #ifdef _WIN32
 #include <pdh.h>
 #include <pdhmsg.h>
-#elif __linux__
-#include <vector>
 #endif
 
 namespace utils