diff --git a/Utilities/Thread.h b/Utilities/Thread.h
index fdc2ae9d63..97063fc7ca 100644
--- a/Utilities/Thread.h
+++ b/Utilities/Thread.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "types.h"
 #include "util/atomic.hpp"
diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index 5603b069f4..3d10c782ca 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -4,6 +4,7 @@
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Io/interception.h"
 #include "Emu/RSX/Overlays/overlay_osk.h"
+#include "Emu/IdManager.h"
 
 #include "cellSysutil.h"
 #include "cellOskDialog.h"
@@ -11,6 +12,8 @@
 
 #include "util/init_mutex.hpp"
 
+#include <thread>
+
 LOG_CHANNEL(cellOskDialog);
 
 template<>
diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
index 6317be606d..c8fb2b3eaf 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
+++ b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "rsx_replay.h"
 
+#include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/lv2/sys_rsx.h"
 #include "Emu/Cell/lv2/sys_memory.h"
 #include "Emu/RSX/RSXThread.h"
diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.h b/rpcs3/Emu/RSX/Capture/rsx_replay.h
index 19985615fb..4858cd4a38 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_replay.h
+++ b/rpcs3/Emu/RSX/Capture/rsx_replay.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "Emu/CPU/CPUThread.h"
-#include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/RSX/rsx_methods.h"
 
 #include <cereal/types/vector.hpp>
diff --git a/rpcs3/Emu/RSX/Common/ShaderInterpreter.h b/rpcs3/Emu/RSX/Common/ShaderInterpreter.h
index f93a8a8f57..2f23d85d64 100644
--- a/rpcs3/Emu/RSX/Common/ShaderInterpreter.h
+++ b/rpcs3/Emu/RSX/Common/ShaderInterpreter.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "Utilities/StrFmt.h"
 
 namespace program_common
 {
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 363ff481da..9bf1f0f60f 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "Emu/Memory/vm.h"
 #include "surface_utils.h"
-#include "../GCM.h"
+#include "../gcm_enums.h"
 #include "../rsx_utils.h"
-#include "Utilities/span.h"
 #include <list>
 
 namespace rsx
diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h
index 7608c03e42..28f756d6b9 100644
--- a/rpcs3/Emu/RSX/Common/surface_utils.h
+++ b/rpcs3/Emu/RSX/Common/surface_utils.h
@@ -5,6 +5,7 @@
 #include "Utilities/address_range.h"
 #include "TextureUtils.h"
 #include "../rsx_utils.h"
+#include "Emu/Memory/vm.h"
 
 #define ENABLE_SURFACE_CACHE_DEBUG 0
 
diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h
index 7ba11e5413..90cefc0b45 100644
--- a/rpcs3/Emu/RSX/GCM.h
+++ b/rpcs3/Emu/RSX/GCM.h
@@ -1,8 +1,7 @@
-#pragma once
+#pragma once
 
 #include "Emu/Memory/vm_ptr.h"
 #include "gcm_enums.h"
-#include "gcm_printing.h"
 #include "util/atomic.hpp"
 
 
diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
index b932f0b99f..f7b03f770f 100644
--- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
+++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
@@ -2,6 +2,7 @@
 #include "shader_loading_dialog_native.h"
 #include "../overlay_message_dialog.h"
 #include "../../GSRender.h"
+#include "Emu/Cell/ErrorCodes.h"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index 6a32f0393f..1b496dccd7 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -3,6 +3,10 @@
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include "Emu/IdManager.h"
+#include "Utilities/Thread.h"
+
+#include <thread>
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
index ab7b5aca21..a65244b1a7 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "overlay_trophy_notification.h"
+#include "Emu/Cell/ErrorCodes.h"
 #include "Emu/RSX/RSXThread.h"
 
 namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
index 82b840e266..248eb811c7 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.h
+++ b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -2,14 +2,13 @@
 #include "overlay_animation.h"
 #include "overlay_controls.h"
 
-#include "../../../Utilities/Thread.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
 
+#include "Utilities/mutex.h"
 #include "Utilities/Timer.h"
 
 #include <list>
-#include <thread>
+#include <mutex>
 
 // Utils
 extern u64 get_system_time();
diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp
index 6ca36f661d..9e8c743bb6 100644
--- a/rpcs3/Emu/RSX/RSXFIFO.cpp
+++ b/rpcs3/Emu/RSX/RSXFIFO.cpp
@@ -3,6 +3,7 @@
 #include "RSXFIFO.h"
 #include "RSXThread.h"
 #include "Capture/rsx_capture.h"
+#include "Emu/Cell/lv2/sys_rsx.h"
 
 namespace rsx
 {
@@ -14,6 +15,11 @@ namespace rsx
 			m_iotable = &pctrl->iomap_table;
 		}
 
+		void FIFO_control::sync_get()
+		{
+			m_ctrl->get.release(m_internal_get);
+		}
+
 		void FIFO_control::inc_get(bool wait)
 		{
 			m_internal_get += 4;
diff --git a/rpcs3/Emu/RSX/RSXFIFO.h b/rpcs3/Emu/RSX/RSXFIFO.h
index 80571b9d38..6403a5796a 100644
--- a/rpcs3/Emu/RSX/RSXFIFO.h
+++ b/rpcs3/Emu/RSX/RSXFIFO.h
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "Utilities/types.h"
-#include "util/atomic.hpp"
+#include "Emu/RSX/gcm_enums.h"
 
-#include "rsx_utils.h"
-#include "Emu/Cell/lv2/sys_rsx.h"
+struct RsxDmaControl;
 
 namespace rsx
 {
@@ -131,7 +130,7 @@ namespace rsx
 
 			u32 get_pos() const { return m_internal_get; }
 			u32 last_cmd() const { return m_cmd; }
-			void sync_get() { m_ctrl->get.release(m_internal_get); }
+			void sync_get();
 			u32 get_current_arg_ptr() const { return m_args_ptr; };
 			u32 get_remaining_args_count() const { return m_remaining_commands; }
 			void inc_get(bool wait);
diff --git a/rpcs3/Emu/RSX/RSXOffload.h b/rpcs3/Emu/RSX/RSXOffload.h
index b1e52275d7..3508fbfd9c 100644
--- a/rpcs3/Emu/RSX/RSXOffload.h
+++ b/rpcs3/Emu/RSX/RSXOffload.h
@@ -1,13 +1,9 @@
 #pragma once
 
 #include "Utilities/types.h"
-#include "Utilities/lockless.h"
-#include "Utilities/Thread.h"
 #include "Utilities/address_range.h"
-#include "gcm_enums.h"
 
 #include <vector>
-#include <thread>
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h
index 67bf61871c..ff32813ea8 100644
--- a/rpcs3/Emu/RSX/VK/VKOverlays.h
+++ b/rpcs3/Emu/RSX/VK/VKOverlays.h
@@ -9,6 +9,8 @@
 
 #include "../Overlays/overlays.h"
 
+#include "Utilities/hash.h"
+
 #define VK_OVERLAY_MAX_DRAW_CALLS 1024
 
 namespace vk
diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h
index 4556228422..832792ebde 100644
--- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h
+++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h
@@ -3,10 +3,7 @@
 #include "stdafx.h"
 #include "VKHelpers.h"
 #include "VKFormats.h"
-#include "../GCM.h"
 #include "../Common/surface_store.h"
-#include "../Common/TextureUtils.h"
-#include "../Common/texture_cache_utils.h"
 
 namespace vk
 {
diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp
index f7e904b79c..29a41d5170 100644
--- a/rpcs3/Emu/RSX/VK/VKTexture.cpp
+++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp
@@ -1,8 +1,6 @@
 #include "stdafx.h"
 #include "VKHelpers.h"
 #include "../GCM.h"
-#include "../RSXThread.h"
-#include "../RSXTexture.h"
 #include "../rsx_utils.h"
 #include "VKFormats.h"
 #include "VKCompute.h"
diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h
index d474cc485e..d49f44af87 100644
--- a/rpcs3/Emu/RSX/rsx_vertex_data.h
+++ b/rpcs3/Emu/RSX/rsx_vertex_data.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "rsx_decode.h"
 
 #include "Utilities/types.h"
 #include "rsx_utils.h"
diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp
index d65390d574..379db4f5ef 100644
--- a/rpcs3/rpcs3qt/render_creator.cpp
+++ b/rpcs3/rpcs3qt/render_creator.cpp
@@ -2,7 +2,6 @@
 
 #include <QMessageBox>
 
-#include "Utilities/Config.h"
 #include "Utilities/Thread.h"
 
 #if defined(_WIN32) || defined(HAVE_VULKAN)
diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp
index 9eea59b24b..e4c4db2847 100644
--- a/rpcs3/rpcs3qt/rsx_debugger.cpp
+++ b/rpcs3/rpcs3qt/rsx_debugger.cpp
@@ -4,6 +4,7 @@
 #include "memory_viewer_panel.h"
 #include "table_item_delegate.h"
 #include "Emu/RSX/RSXThread.h"
+#include "Emu/RSX/gcm_printing.h"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp
index 7bae2aaa74..bfea6d2826 100644
--- a/rpcs3/rpcs3qt/save_data_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_dialog.cpp
@@ -1,10 +1,12 @@
 #include "save_data_dialog.h"
 #include "save_data_list_dialog.h"
 
-#include <Emu/System.h>
-#include <Emu/IdManager.h>
+#include "Emu/System.h"
+#include "Emu/IdManager.h"
 #include "Emu/Io/interception.h"
-#include <Emu/RSX/Overlays/overlay_save_dialog.h>
+#include "Emu/RSX/Overlays/overlay_save_dialog.h"
+
+#include "Utilities/Thread.h"
 
 s32 save_data_dialog::ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet)
 {
diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.cpp b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
index f2005b7ed9..c3f3716036 100644
--- a/rpcs3/rpcs3qt/trophy_notification_helper.cpp
+++ b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
@@ -1,6 +1,7 @@
 #include "trophy_notification_helper.h"
 #include "trophy_notification_frame.h"
 
+#include "../Emu/IdManager.h"
 #include "../Emu/System.h"
 #include "../Emu/RSX/Overlays/overlay_trophy_notification.h"
 
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
index 635c98387d..60662785a1 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
@@ -1,4 +1,5 @@
 #include "vfs_dialog_tab.h"
+#include "Utilities/Config.h"
 
 #include <QFileDialog>
 #include <QCoreApplication>
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h
index be5be38b84..09d048d46a 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.h
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "stdafx.h"
-#include "Utilities/Config.h"
 
 #include "gui_settings.h"
 #include "emu_settings.h"
@@ -10,6 +9,11 @@
 #include <QListWidget>
 #include <QLabel>
 
+namespace cfg
+{
+	class string;
+}
+
 struct vfs_settings_info
 {
 	QString name; // name of tab