From f7666f44da5408bbfa38eb6a475bb75dfc1eaec8 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Sat, 22 Feb 2020 20:42:49 +0100
Subject: [PATCH] Untangle GUI and input includes

---
 Utilities/rXml.h                              |   3 +-
 rpcs3/Emu/CMakeLists.txt                      |   3 +-
 rpcs3/Emu/Cell/Modules/cellGem.cpp            |   1 +
 rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp      |   2 +
 rpcs3/Emu/Cell/Modules/cellPad.cpp            |   1 +
 rpcs3/Emu/Cell/Modules/cellSaveData.h         |   1 +
 rpcs3/Emu/Cell/Modules/sceNpTrophy.h          |   1 +
 rpcs3/Emu/Io/PadHandler.h                     | 279 +-----------------
 rpcs3/Emu/Io/pad_config.cpp                   |  24 --
 rpcs3/Emu/Io/pad_config.h                     |  17 +-
 rpcs3/Emu/Io/pad_config_types.cpp             |  26 ++
 rpcs3/Emu/Io/pad_config_types.h               |  25 ++
 rpcs3/Emu/Io/pad_types.h                      | 273 +++++++++++++++++
 rpcs3/Emu/Io/usb_device.cpp                   |   2 -
 rpcs3/Emu/Io/usb_device.h                     |   3 +-
 rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h |   1 +
 .../Emu/RSX/Overlays/overlay_save_dialog.cpp  |   1 +
 rpcs3/Emu/RSX/Overlays/overlays.cpp           |   3 +-
 rpcs3/Emu/RSX/Overlays/overlays.h             |   5 +-
 rpcs3/Emu/RSX/RSXThread.cpp                   |   1 +
 rpcs3/Input/basic_keyboard_handler.cpp        |   1 -
 rpcs3/Input/basic_mouse_handler.h             |   2 +-
 rpcs3/Input/ds3_pad_handler.cpp               |   1 +
 rpcs3/Input/ds4_pad_handler.cpp               |   1 +
 rpcs3/Input/evdev_joystick_handler.cpp        |   3 +-
 rpcs3/Input/evdev_joystick_handler.h          |   3 +-
 rpcs3/Input/keyboard_pad_handler.cpp          |   2 +-
 rpcs3/Input/keyboard_pad_handler.h            |   2 +-
 rpcs3/Input/mm_joystick_handler.cpp           |   1 +
 rpcs3/Input/mm_joystick_handler.h             |   2 +-
 rpcs3/Input/pad_thread.cpp                    |   2 +
 rpcs3/Input/pad_thread.h                      |  12 +-
 rpcs3/Input/xinput_pad_handler.cpp            |   1 +
 rpcs3/Input/xinput_pad_handler.h              |   1 -
 rpcs3/display_sleep_control.cpp               |   4 +-
 rpcs3/emucore.vcxproj                         |   5 +-
 rpcs3/emucore.vcxproj.filters                 |  23 +-
 rpcs3/main.cpp                                |   6 +-
 rpcs3/main_application.h                      |   2 +-
 rpcs3/rpcs3qt/_discord_utils.cpp              |   3 +-
 rpcs3/rpcs3qt/_discord_utils.h                |   4 +-
 rpcs3/rpcs3qt/about_dialog.cpp                |   2 +-
 rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp  |   6 +
 rpcs3/rpcs3qt/auto_pause_settings_dialog.h    |   9 -
 rpcs3/rpcs3qt/breakpoint_handler.h            |   3 +-
 rpcs3/rpcs3qt/breakpoint_list.cpp             |   3 +
 rpcs3/rpcs3qt/breakpoint_list.h               |   9 +-
 rpcs3/rpcs3qt/cg_disasm_window.cpp            |   9 +-
 rpcs3/rpcs3qt/cg_disasm_window.h              |   8 +-
 rpcs3/rpcs3qt/debugger_frame.cpp              |  15 +
 rpcs3/rpcs3qt/debugger_frame.h                |  23 +-
 rpcs3/rpcs3qt/debugger_list.cpp               |   6 +-
 rpcs3/rpcs3qt/debugger_list.h                 |  13 +-
 rpcs3/rpcs3qt/emu_settings.cpp                |   1 -
 rpcs3/rpcs3qt/emu_settings.h                  |   6 +-
 rpcs3/rpcs3qt/find_dialog.cpp                 |   6 +-
 rpcs3/rpcs3qt/find_dialog.h                   |   3 +-
 rpcs3/rpcs3qt/game_compatibility.cpp          |   5 +-
 rpcs3/rpcs3qt/game_compatibility.h            |   8 +-
 rpcs3/rpcs3qt/game_list_frame.cpp             |   9 +-
 rpcs3/rpcs3qt/game_list_frame.h               |  16 +-
 rpcs3/rpcs3qt/game_list_grid.cpp              |   1 -
 rpcs3/rpcs3qt/game_list_grid.h                |   6 +-
 rpcs3/rpcs3qt/gl_gs_frame.cpp                 |   1 -
 rpcs3/rpcs3qt/gl_gs_frame.h                   |   2 +-
 rpcs3/rpcs3qt/gs_frame.cpp                    |  12 +-
 rpcs3/rpcs3qt/gs_frame.h                      |  11 +-
 rpcs3/rpcs3qt/gui_application.cpp             |   7 +
 rpcs3/rpcs3qt/gui_application.h               |  16 +-
 rpcs3/rpcs3qt/gui_settings.cpp                |   2 +-
 rpcs3/rpcs3qt/gui_settings.h                  |   1 -
 rpcs3/rpcs3qt/input_dialog.cpp                |   4 +-
 rpcs3/rpcs3qt/input_dialog.h                  |   2 -
 rpcs3/rpcs3qt/instruction_editor_dialog.cpp   |   9 +-
 rpcs3/rpcs3qt/instruction_editor_dialog.h     |  10 +-
 rpcs3/rpcs3qt/kernel_explorer.cpp             |  38 ++-
 rpcs3/rpcs3qt/log_frame.cpp                   |  12 +-
 rpcs3/rpcs3qt/log_frame.h                     |   5 +-
 rpcs3/rpcs3qt/main_window.cpp                 |  19 +-
 rpcs3/rpcs3qt/main_window.h                   |  17 +-
 rpcs3/rpcs3qt/memory_string_searcher.cpp      |   1 +
 rpcs3/rpcs3qt/memory_string_searcher.h        |   1 -
 rpcs3/rpcs3qt/memory_viewer_panel.cpp         |  10 +-
 rpcs3/rpcs3qt/memory_viewer_panel.h           |  13 +-
 rpcs3/rpcs3qt/msg_dialog_frame.cpp            |  17 +-
 rpcs3/rpcs3qt/msg_dialog_frame.h              |  15 +-
 rpcs3/rpcs3qt/osk_dialog_frame.cpp            |   4 +-
 rpcs3/rpcs3qt/osk_dialog_frame.h              |   4 +-
 rpcs3/rpcs3qt/pad_settings_dialog.h           |   5 +-
 rpcs3/rpcs3qt/pkg_install_dialog.cpp          |   2 +-
 rpcs3/rpcs3qt/progress_dialog.cpp             |   8 +
 rpcs3/rpcs3qt/progress_dialog.h               |   7 -
 rpcs3/rpcs3qt/qt_utils.cpp                    |   3 +-
 rpcs3/rpcs3qt/qt_utils.h                      |   2 +-
 rpcs3/rpcs3qt/register_editor_dialog.cpp      |  13 +-
 rpcs3/rpcs3qt/register_editor_dialog.h        |  11 +-
 rpcs3/rpcs3qt/rsx_debugger.cpp                |  13 +-
 rpcs3/rpcs3qt/rsx_debugger.h                  |  16 +-
 rpcs3/rpcs3qt/save_data_dialog.cpp            |   2 +
 rpcs3/rpcs3qt/save_data_info_dialog.cpp       |   1 +
 rpcs3/rpcs3qt/save_data_info_dialog.h         |   4 +-
 rpcs3/rpcs3qt/save_data_list_dialog.cpp       |   5 +-
 rpcs3/rpcs3qt/save_data_list_dialog.h         |   3 +-
 rpcs3/rpcs3qt/save_manager_dialog.cpp         |   8 +-
 rpcs3/rpcs3qt/save_manager_dialog.h           |   5 +-
 rpcs3/rpcs3qt/settings_dialog.cpp             |   8 +-
 rpcs3/rpcs3qt/settings_dialog.h               |   8 +-
 rpcs3/rpcs3qt/skylander_dialog.cpp            |   5 +
 rpcs3/rpcs3qt/skylander_dialog.h              |   5 -
 rpcs3/rpcs3qt/syntax_highlighter.h            |   2 +-
 rpcs3/rpcs3qt/trophy_manager_dialog.cpp       |   9 +-
 rpcs3/rpcs3qt/trophy_manager_dialog.h         |   8 +-
 rpcs3/rpcs3qt/trophy_notification_frame.cpp   |   2 +-
 rpcs3/rpcs3qt/trophy_notification_frame.h     |   4 +-
 rpcs3/rpcs3qt/trophy_notification_helper.cpp  |   1 -
 rpcs3/rpcs3qt/trophy_notification_helper.h    |   1 -
 rpcs3/rpcs3qt/update_manager.cpp              |   3 +-
 rpcs3/rpcs3qt/update_manager.h                |   5 +-
 rpcs3/rpcs3qt/user_manager_dialog.cpp         |  12 +
 rpcs3/rpcs3qt/user_manager_dialog.h           |  15 +-
 rpcs3/rpcs3qt/vfs_dialog.cpp                  |   4 +
 rpcs3/rpcs3qt/vfs_dialog.h                    |   6 +-
 rpcs3/rpcs3qt/vfs_dialog_tab.cpp              |   1 +
 rpcs3/rpcs3qt/vfs_dialog_tab.h                |   1 -
 rpcs3/rpcs3qt/welcome_dialog.cpp              |   3 -
 rpcs3/rpcs3qt/welcome_dialog.h                |   4 +-
 126 files changed, 702 insertions(+), 666 deletions(-)
 create mode 100644 rpcs3/Emu/Io/pad_config_types.cpp
 create mode 100644 rpcs3/Emu/Io/pad_config_types.h
 create mode 100644 rpcs3/Emu/Io/pad_types.h

diff --git a/Utilities/rXml.h b/Utilities/rXml.h
index ab5b2f1cb1..a68069ef57 100644
--- a/Utilities/rXml.h
+++ b/Utilities/rXml.h
@@ -1,6 +1,7 @@
-#pragma once
+#pragma once
 
 #include <pugixml.hpp>
+#include <memory>
 
 struct rXmlNode
 {
diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 6142d581b9..a630e9616c 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -341,8 +341,9 @@ target_link_libraries(rpcs3_emu
 
 # Io
 target_sources(rpcs3_emu PRIVATE
-	Io/pad_config.cpp
 	Io/KeyboardHandler.cpp
+	Io/pad_config.cpp
+	Io/pad_config_types.cpp
 	Io/PadHandler.cpp
 	Io/usb_device.cpp
 	Io/Skylander.cpp
diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp
index 148a6d54c0..4d0235c0f5 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp
@@ -6,6 +6,7 @@
 #include "Emu/Io/MouseHandler.h"
 #include "Emu/RSX/GSRender.h"
 #include "Utilities/Timer.h"
+#include "Input/pad_thread.h"
 
 LOG_CHANNEL(cellGem);
 
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
index 5e10191add..da4c8c5be1 100644
--- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
@@ -4,6 +4,8 @@
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/RSX/Overlays/overlays.h"
 
+#include "Input/pad_thread.h"
+
 #include "cellSysutil.h"
 #include "cellMsgDialog.h"
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp
index fec83fdc42..663235c160 100644
--- a/rpcs3/Emu/Cell/Modules/cellPad.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp
@@ -3,6 +3,7 @@
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_process.h"
 
+#include "Emu/Io/pad_types.h"
 #include "Input/pad_thread.h"
 #include "cellPad.h"
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h
index f502539266..c649ae617a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSaveData.h
+++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "stdafx.h"
 #include <Emu/Memory/vm_ptr.h>
 
 // Return codes
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
index e75dcfdf10..e7b33c54f2 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "stdafx.h"
 #include "Emu/Memory/vm_ptr.h"
 #include <atomic>
 
diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h
index 2cdcce6491..3b3b0027af 100644
--- a/rpcs3/Emu/Io/PadHandler.h
+++ b/rpcs3/Emu/Io/PadHandler.h
@@ -1,285 +1,10 @@
 #pragma once
 
 #include <cmath>
+#include "pad_types.h"
 #include "pad_config.h"
+#include "pad_config_types.h"
 #include "Utilities/types.h"
-#include "Emu/GameInfo.h"
-
-// TODO: HLE info (constants, structs, etc.) should not be available here
-
-enum SystemInfo
-{
-	CELL_PAD_INFO_INTERCEPTED = 0x00000001
-};
-
-enum PortStatus
-{
-	CELL_PAD_STATUS_DISCONNECTED      = 0x00000000,
-	CELL_PAD_STATUS_CONNECTED         = 0x00000001,
-	CELL_PAD_STATUS_ASSIGN_CHANGES    = 0x00000002,
-	CELL_PAD_STATUS_CUSTOM_CONTROLLER = 0x00000004,
-};
-
-enum PortSettings
-{
-	CELL_PAD_SETTING_LDD           = 0x00000001, // Speculative
-	CELL_PAD_SETTING_PRESS_ON      = 0x00000002,
-	CELL_PAD_SETTING_SENSOR_ON     = 0x00000004,
-	CELL_PAD_SETTING_PRESS_OFF     = 0x00000000,
-	CELL_PAD_SETTING_SENSOR_OFF    = 0x00000000,
-};
-
-enum Digital1Flags
-{
-	CELL_PAD_CTRL_LEFT     = 0x00000080,
-	CELL_PAD_CTRL_DOWN     = 0x00000040,
-	CELL_PAD_CTRL_RIGHT    = 0x00000020,
-	CELL_PAD_CTRL_UP       = 0x00000010,
-	CELL_PAD_CTRL_START    = 0x00000008,
-	CELL_PAD_CTRL_R3       = 0x00000004,
-	CELL_PAD_CTRL_L3       = 0x00000002,
-	CELL_PAD_CTRL_SELECT   = 0x00000001,
-};
-
-enum Digital2Flags
-{
-	CELL_PAD_CTRL_SQUARE   = 0x00000080,
-	CELL_PAD_CTRL_CROSS    = 0x00000040,
-	CELL_PAD_CTRL_CIRCLE   = 0x00000020,
-	CELL_PAD_CTRL_TRIANGLE = 0x00000010,
-	CELL_PAD_CTRL_R1       = 0x00000008,
-	CELL_PAD_CTRL_L1       = 0x00000004,
-	CELL_PAD_CTRL_R2       = 0x00000002,
-	CELL_PAD_CTRL_L2       = 0x00000001,
-};
-
-enum DeviceCapability
-{
-	CELL_PAD_CAPABILITY_PS3_CONFORMITY  = 0x00000001, // PS3 Conformity Controller
-	CELL_PAD_CAPABILITY_PRESS_MODE      = 0x00000002, // Press mode supported
-	CELL_PAD_CAPABILITY_SENSOR_MODE     = 0x00000004, // Sensor mode supported
-	CELL_PAD_CAPABILITY_HP_ANALOG_STICK = 0x00000008, // High Precision analog stick
-	CELL_PAD_CAPABILITY_ACTUATOR        = 0x00000010, // Motor supported
-};
-
-enum DeviceType
-{
-	CELL_PAD_DEV_TYPE_STANDARD   = 0,
-	CELL_PAD_DEV_TYPE_BD_REMOCON = 4,
-	CELL_PAD_DEV_TYPE_LDD        = 5,
-};
-
-enum ButtonDataOffset
-{
-	CELL_PAD_BTN_OFFSET_DIGITAL1       = 2,
-	CELL_PAD_BTN_OFFSET_DIGITAL2       = 3,
-	CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X = 4,
-	CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y = 5,
-	CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X  = 6,
-	CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y  = 7,
-	CELL_PAD_BTN_OFFSET_PRESS_RIGHT    = 8,
-	CELL_PAD_BTN_OFFSET_PRESS_LEFT     = 9,
-	CELL_PAD_BTN_OFFSET_PRESS_UP       = 10,
-	CELL_PAD_BTN_OFFSET_PRESS_DOWN     = 11,
-	CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE = 12,
-	CELL_PAD_BTN_OFFSET_PRESS_CIRCLE   = 13,
-	CELL_PAD_BTN_OFFSET_PRESS_CROSS    = 14,
-	CELL_PAD_BTN_OFFSET_PRESS_SQUARE   = 15,
-	CELL_PAD_BTN_OFFSET_PRESS_L1       = 16,
-	CELL_PAD_BTN_OFFSET_PRESS_R1       = 17,
-	CELL_PAD_BTN_OFFSET_PRESS_L2       = 18,
-	CELL_PAD_BTN_OFFSET_PRESS_R2       = 19,
-	CELL_PAD_BTN_OFFSET_SENSOR_X       = 20,
-	CELL_PAD_BTN_OFFSET_SENSOR_Y       = 21,
-	CELL_PAD_BTN_OFFSET_SENSOR_Z       = 22,
-	CELL_PAD_BTN_OFFSET_SENSOR_G       = 23,
-};
-
-enum
-{
-	CELL_PAD_ACTUATOR_MAX        = 2,
-	CELL_PAD_MAX_PORT_NUM        = 7,
-	CELL_PAD_MAX_CAPABILITY_INFO = 32,
-	CELL_PAD_MAX_CODES           = 64,
-	CELL_MAX_PADS                = 127,
-};
-
-struct Button
-{
-	u32 m_offset;
-	u32 m_keyCode;
-	u32 m_outKeyCode;
-	u16 m_value = 0;
-	bool m_pressed = false;
-
-	u16 m_actual_value = 0; // only used in keyboard_pad_handler
-	bool m_analog  = false; // only used in keyboard_pad_handler
-	bool m_trigger = false; // only used in keyboard_pad_handler
-
-	Button(u32 offset, u32 keyCode, u32 outKeyCode)
-		: m_offset(offset)
-		, m_keyCode(keyCode)
-		, m_outKeyCode(outKeyCode)
-	{
-		if (offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
-		{
-			if (outKeyCode == CELL_PAD_CTRL_LEFT || outKeyCode == CELL_PAD_CTRL_RIGHT ||
-				outKeyCode == CELL_PAD_CTRL_UP   || outKeyCode == CELL_PAD_CTRL_DOWN)
-			{
-				m_analog = true;
-			}
-		}
-		else if (offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
-		{
-			if (outKeyCode == CELL_PAD_CTRL_CROSS  || outKeyCode == CELL_PAD_CTRL_CIRCLE ||
-				outKeyCode == CELL_PAD_CTRL_SQUARE || outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
-				outKeyCode == CELL_PAD_CTRL_L1     || outKeyCode == CELL_PAD_CTRL_R1)
-			{
-				m_analog = true;
-			}
-			else if (outKeyCode == CELL_PAD_CTRL_L2 || outKeyCode == CELL_PAD_CTRL_R2)
-			{
-				m_trigger = true;
-			}
-		}
-	}
-};
-
-struct AnalogStick
-{
-	u32 m_offset;
-	u32 m_keyCodeMin;
-	u32 m_keyCodeMax;
-	u16 m_value = 128;
-
-	AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax)
-		: m_offset(offset)
-		, m_keyCodeMin(keyCodeMin)
-		, m_keyCodeMax(keyCodeMax)
-	{
-	}
-};
-
-struct AnalogSensor
-{
-	u32 m_offset;
-	u16 m_value;
-
-	AnalogSensor(u32 offset, u16 value)
-		: m_offset(offset)
-		, m_value(value)
-	{}
-};
-
-struct VibrateMotor
-{
-	bool m_isLargeMotor;
-	u16 m_value;
-
-	VibrateMotor(bool largeMotor, u16 value)
-		: m_isLargeMotor(largeMotor)
-		, m_value(value)
-	{}
-};
-
-struct Pad
-{
-	bool m_buffer_cleared;
-	u32 m_port_status;
-	u32 m_device_capability;
-	u32 m_device_type;
-	u32 m_class_type;
-
-	// Cable State:   0 - 1  plugged in ?
-	u8 m_cable_state;
-
-	// DS4: 0 - 9 while unplugged, 0 - 10 while plugged in, 11 charge complete
-	// XInput: 0 = Empty, 1 = Low, 2 = Medium, 3 = Full
-	u8 m_battery_level;
-
-	std::vector<Button> m_buttons;
-	std::vector<AnalogStick> m_sticks;
-	std::vector<AnalogSensor> m_sensors;
-	std::vector<VibrateMotor> m_vibrateMotors;
-
-	// These hold bits for their respective buttons
-	u16 m_digital_1;
-	u16 m_digital_2;
-
-	// All sensors go from 0-255
-	u16 m_analog_left_x;
-	u16 m_analog_left_y;
-	u16 m_analog_right_x;
-	u16 m_analog_right_y;
-
-	u16 m_press_right;
-	u16 m_press_left;
-	u16 m_press_up;
-	u16 m_press_down;
-	u16 m_press_triangle;
-	u16 m_press_circle;
-	u16 m_press_cross;
-	u16 m_press_square;
-	u16 m_press_L1;
-	u16 m_press_L2;
-	u16 m_press_R1;
-	u16 m_press_R2;
-
-	// Except for these...0-1023
-	// ~399 on sensor y is a level non moving controller
-	u16 m_sensor_x;
-	u16 m_sensor_y;
-	u16 m_sensor_z;
-	u16 m_sensor_g;
-
-	bool ldd = false;
-	u8 ldd_data[132] = {};
-
-	void Init(u32 port_status, u32 device_capability, u32 device_type, u32 class_type)
-	{
-		m_port_status = port_status;
-		m_device_capability = device_capability;
-		m_device_type = device_type;
-		m_class_type = class_type;
-	}
-
-	Pad(u32 port_status, u32 device_capability, u32 device_type)
-		: m_buffer_cleared(true)
-		, m_port_status(port_status)
-		, m_device_capability(device_capability)
-		, m_device_type(device_type)
-		, m_class_type(0)
-		, m_cable_state(0)
-		, m_battery_level(0)
-
-		, m_digital_1(0)
-		, m_digital_2(0)
-
-		, m_analog_left_x(128)
-		, m_analog_left_y(128)
-		, m_analog_right_x(128)
-		, m_analog_right_y(128)
-
-		, m_press_right(0)
-		, m_press_left(0)
-		, m_press_up(0)
-		, m_press_down(0)
-		, m_press_triangle(0)
-		, m_press_circle(0)
-		, m_press_cross(0)
-		, m_press_square(0)
-		, m_press_L1(0)
-		, m_press_L2(0)
-		, m_press_R1(0)
-		, m_press_R2(0)
-
-		, m_sensor_x(512)
-		, m_sensor_y(399)
-		, m_sensor_z(512)
-		, m_sensor_g(512)
-	{
-	}
-};
 
 struct PadDevice
 {
diff --git a/rpcs3/Emu/Io/pad_config.cpp b/rpcs3/Emu/Io/pad_config.cpp
index bbc7788ca6..5c356dedac 100644
--- a/rpcs3/Emu/Io/pad_config.cpp
+++ b/rpcs3/Emu/Io/pad_config.cpp
@@ -2,30 +2,6 @@
 #include "pad_config.h"
 #include "Emu/System.h"
 
-template <>
-void fmt_class_string<pad_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](pad_handler value)
-	{
-		switch (value)
-		{
-		case pad_handler::null: return "Null";
-		case pad_handler::keyboard: return "Keyboard";
-		case pad_handler::ds3: return "DualShock 3";
-		case pad_handler::ds4: return "DualShock 4";
-#ifdef _WIN32
-		case pad_handler::xinput: return "XInput";
-		case pad_handler::mm: return "MMJoystick";
-#endif
-#ifdef HAVE_LIBEVDEV
-		case pad_handler::evdev: return "Evdev";
-#endif
-		}
-
-		return unknown;
-	});
-}
-
 bool cfg_input::load(const std::string& title_id)
 {
 	cfg_name = Emulator::GetCustomInputConfigPath(title_id);
diff --git a/rpcs3/Emu/Io/pad_config.h b/rpcs3/Emu/Io/pad_config.h
index 23dcab66ce..0bfec62e5a 100644
--- a/rpcs3/Emu/Io/pad_config.h
+++ b/rpcs3/Emu/Io/pad_config.h
@@ -1,23 +1,10 @@
 #pragma once
 
+#include "pad_config_types.h"
+
 #include "Utilities/Config.h"
 #include "Utilities/File.h"
 
-enum class pad_handler
-{
-	null,
-	keyboard,
-	ds3,
-	ds4,
-#ifdef _WIN32
-	xinput,
-	mm,
-#endif
-#ifdef HAVE_LIBEVDEV
-	evdev,
-#endif
-};
-
 struct cfg_player final : cfg::node
 {
 	pad_handler def_handler = pad_handler::null;
diff --git a/rpcs3/Emu/Io/pad_config_types.cpp b/rpcs3/Emu/Io/pad_config_types.cpp
new file mode 100644
index 0000000000..75672f8a58
--- /dev/null
+++ b/rpcs3/Emu/Io/pad_config_types.cpp
@@ -0,0 +1,26 @@
+#include "stdafx.h"
+#include "pad_config_types.h"
+
+template <>
+void fmt_class_string<pad_handler>::format(std::string& out, u64 arg)
+{
+	format_enum(out, arg, [](pad_handler value)
+	{
+		switch (value)
+		{
+		case pad_handler::null: return "Null";
+		case pad_handler::keyboard: return "Keyboard";
+		case pad_handler::ds3: return "DualShock 3";
+		case pad_handler::ds4: return "DualShock 4";
+#ifdef _WIN32
+		case pad_handler::xinput: return "XInput";
+		case pad_handler::mm: return "MMJoystick";
+#endif
+#ifdef HAVE_LIBEVDEV
+		case pad_handler::evdev: return "Evdev";
+#endif
+		}
+
+		return unknown;
+	});
+}
diff --git a/rpcs3/Emu/Io/pad_config_types.h b/rpcs3/Emu/Io/pad_config_types.h
new file mode 100644
index 0000000000..dc9c22c148
--- /dev/null
+++ b/rpcs3/Emu/Io/pad_config_types.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Utilities/types.h"
+
+enum class pad_handler
+{
+	null,
+	keyboard,
+	ds3,
+	ds4,
+#ifdef _WIN32
+	xinput,
+	mm,
+#endif
+#ifdef HAVE_LIBEVDEV
+	evdev,
+#endif
+};
+
+struct PadInfo
+{
+	u32 now_connect;
+	u32 system_info;
+	bool ignore_input;
+};
diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/Emu/Io/pad_types.h
new file mode 100644
index 0000000000..17c08b6c7c
--- /dev/null
+++ b/rpcs3/Emu/Io/pad_types.h
@@ -0,0 +1,273 @@
+#pragma once
+
+enum SystemInfo
+{
+	CELL_PAD_INFO_INTERCEPTED = 0x00000001
+};
+
+enum PortStatus
+{
+	CELL_PAD_STATUS_DISCONNECTED = 0x00000000,
+	CELL_PAD_STATUS_CONNECTED = 0x00000001,
+	CELL_PAD_STATUS_ASSIGN_CHANGES = 0x00000002,
+	CELL_PAD_STATUS_CUSTOM_CONTROLLER = 0x00000004,
+};
+
+enum PortSettings
+{
+	CELL_PAD_SETTING_LDD = 0x00000001, // Speculative
+	CELL_PAD_SETTING_PRESS_ON = 0x00000002,
+	CELL_PAD_SETTING_SENSOR_ON = 0x00000004,
+	CELL_PAD_SETTING_PRESS_OFF = 0x00000000,
+	CELL_PAD_SETTING_SENSOR_OFF = 0x00000000,
+};
+
+enum Digital1Flags
+{
+	CELL_PAD_CTRL_LEFT = 0x00000080,
+	CELL_PAD_CTRL_DOWN = 0x00000040,
+	CELL_PAD_CTRL_RIGHT = 0x00000020,
+	CELL_PAD_CTRL_UP = 0x00000010,
+	CELL_PAD_CTRL_START = 0x00000008,
+	CELL_PAD_CTRL_R3 = 0x00000004,
+	CELL_PAD_CTRL_L3 = 0x00000002,
+	CELL_PAD_CTRL_SELECT = 0x00000001,
+};
+
+enum Digital2Flags
+{
+	CELL_PAD_CTRL_SQUARE = 0x00000080,
+	CELL_PAD_CTRL_CROSS = 0x00000040,
+	CELL_PAD_CTRL_CIRCLE = 0x00000020,
+	CELL_PAD_CTRL_TRIANGLE = 0x00000010,
+	CELL_PAD_CTRL_R1 = 0x00000008,
+	CELL_PAD_CTRL_L1 = 0x00000004,
+	CELL_PAD_CTRL_R2 = 0x00000002,
+	CELL_PAD_CTRL_L2 = 0x00000001,
+};
+
+enum DeviceCapability
+{
+	CELL_PAD_CAPABILITY_PS3_CONFORMITY = 0x00000001, // PS3 Conformity Controller
+	CELL_PAD_CAPABILITY_PRESS_MODE = 0x00000002, // Press mode supported
+	CELL_PAD_CAPABILITY_SENSOR_MODE = 0x00000004, // Sensor mode supported
+	CELL_PAD_CAPABILITY_HP_ANALOG_STICK = 0x00000008, // High Precision analog stick
+	CELL_PAD_CAPABILITY_ACTUATOR = 0x00000010, // Motor supported
+};
+
+enum DeviceType
+{
+	CELL_PAD_DEV_TYPE_STANDARD = 0,
+	CELL_PAD_DEV_TYPE_BD_REMOCON = 4,
+	CELL_PAD_DEV_TYPE_LDD = 5,
+};
+
+enum ButtonDataOffset
+{
+	CELL_PAD_BTN_OFFSET_DIGITAL1 = 2,
+	CELL_PAD_BTN_OFFSET_DIGITAL2 = 3,
+	CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X = 4,
+	CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y = 5,
+	CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X = 6,
+	CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y = 7,
+	CELL_PAD_BTN_OFFSET_PRESS_RIGHT = 8,
+	CELL_PAD_BTN_OFFSET_PRESS_LEFT = 9,
+	CELL_PAD_BTN_OFFSET_PRESS_UP = 10,
+	CELL_PAD_BTN_OFFSET_PRESS_DOWN = 11,
+	CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE = 12,
+	CELL_PAD_BTN_OFFSET_PRESS_CIRCLE = 13,
+	CELL_PAD_BTN_OFFSET_PRESS_CROSS = 14,
+	CELL_PAD_BTN_OFFSET_PRESS_SQUARE = 15,
+	CELL_PAD_BTN_OFFSET_PRESS_L1 = 16,
+	CELL_PAD_BTN_OFFSET_PRESS_R1 = 17,
+	CELL_PAD_BTN_OFFSET_PRESS_L2 = 18,
+	CELL_PAD_BTN_OFFSET_PRESS_R2 = 19,
+	CELL_PAD_BTN_OFFSET_SENSOR_X = 20,
+	CELL_PAD_BTN_OFFSET_SENSOR_Y = 21,
+	CELL_PAD_BTN_OFFSET_SENSOR_Z = 22,
+	CELL_PAD_BTN_OFFSET_SENSOR_G = 23,
+};
+
+enum
+{
+	CELL_PAD_ACTUATOR_MAX = 2,
+	CELL_PAD_MAX_PORT_NUM = 7,
+	CELL_PAD_MAX_CAPABILITY_INFO = 32,
+	CELL_PAD_MAX_CODES = 64,
+	CELL_MAX_PADS = 127,
+};
+
+struct Button
+{
+	u32 m_offset;
+	u32 m_keyCode;
+	u32 m_outKeyCode;
+	u16 m_value    = 0;
+	bool m_pressed = false;
+
+	u16 m_actual_value = 0;     // only used in keyboard_pad_handler
+	bool m_analog      = false; // only used in keyboard_pad_handler
+	bool m_trigger     = false; // only used in keyboard_pad_handler
+
+	Button(u32 offset, u32 keyCode, u32 outKeyCode)
+		: m_offset(offset)
+		, m_keyCode(keyCode)
+		, m_outKeyCode(outKeyCode)
+	{
+		if (offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
+		{
+			if (outKeyCode == CELL_PAD_CTRL_LEFT || outKeyCode == CELL_PAD_CTRL_RIGHT || outKeyCode == CELL_PAD_CTRL_UP || outKeyCode == CELL_PAD_CTRL_DOWN)
+			{
+				m_analog = true;
+			}
+		}
+		else if (offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
+		{
+			if (outKeyCode == CELL_PAD_CTRL_CROSS || outKeyCode == CELL_PAD_CTRL_CIRCLE || outKeyCode == CELL_PAD_CTRL_SQUARE || outKeyCode == CELL_PAD_CTRL_TRIANGLE || outKeyCode == CELL_PAD_CTRL_L1 ||
+			    outKeyCode == CELL_PAD_CTRL_R1)
+			{
+				m_analog = true;
+			}
+			else if (outKeyCode == CELL_PAD_CTRL_L2 || outKeyCode == CELL_PAD_CTRL_R2)
+			{
+				m_trigger = true;
+			}
+		}
+	}
+};
+
+struct AnalogStick
+{
+	u32 m_offset;
+	u32 m_keyCodeMin;
+	u32 m_keyCodeMax;
+	u16 m_value = 128;
+
+	AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax)
+		: m_offset(offset)
+		, m_keyCodeMin(keyCodeMin)
+		, m_keyCodeMax(keyCodeMax)
+	{
+	}
+};
+
+struct AnalogSensor
+{
+	u32 m_offset;
+	u16 m_value;
+
+	AnalogSensor(u32 offset, u16 value)
+		: m_offset(offset)
+		, m_value(value)
+	{}
+};
+
+struct VibrateMotor
+{
+	bool m_isLargeMotor;
+	u16 m_value;
+
+	VibrateMotor(bool largeMotor, u16 value)
+		: m_isLargeMotor(largeMotor)
+		, m_value(value)
+	{}
+};
+
+struct Pad
+{
+	bool m_buffer_cleared;
+	u32 m_port_status;
+	u32 m_device_capability;
+	u32 m_device_type;
+	u32 m_class_type;
+
+	// Cable State:   0 - 1  plugged in ?
+	u8 m_cable_state;
+
+	// DS4: 0 - 9 while unplugged, 0 - 10 while plugged in, 11 charge complete
+	// XInput: 0 = Empty, 1 = Low, 2 = Medium, 3 = Full
+	u8 m_battery_level;
+
+	std::vector<Button> m_buttons;
+	std::vector<AnalogStick> m_sticks;
+	std::vector<AnalogSensor> m_sensors;
+	std::vector<VibrateMotor> m_vibrateMotors;
+
+	// These hold bits for their respective buttons
+	u16 m_digital_1;
+	u16 m_digital_2;
+
+	// All sensors go from 0-255
+	u16 m_analog_left_x;
+	u16 m_analog_left_y;
+	u16 m_analog_right_x;
+	u16 m_analog_right_y;
+
+	u16 m_press_right;
+	u16 m_press_left;
+	u16 m_press_up;
+	u16 m_press_down;
+	u16 m_press_triangle;
+	u16 m_press_circle;
+	u16 m_press_cross;
+	u16 m_press_square;
+	u16 m_press_L1;
+	u16 m_press_L2;
+	u16 m_press_R1;
+	u16 m_press_R2;
+
+	// Except for these...0-1023
+	// ~399 on sensor y is a level non moving controller
+	u16 m_sensor_x;
+	u16 m_sensor_y;
+	u16 m_sensor_z;
+	u16 m_sensor_g;
+
+	bool ldd = false;
+	u8 ldd_data[132] = {};
+
+	void Init(u32 port_status, u32 device_capability, u32 device_type, u32 class_type)
+	{
+		m_port_status = port_status;
+		m_device_capability = device_capability;
+		m_device_type = device_type;
+		m_class_type = class_type;
+	}
+
+	Pad(u32 port_status, u32 device_capability, u32 device_type)
+		: m_buffer_cleared(true)
+		, m_port_status(port_status)
+		, m_device_capability(device_capability)
+		, m_device_type(device_type)
+		, m_class_type(0)
+		, m_cable_state(0)
+		, m_battery_level(0)
+
+		, m_digital_1(0)
+		, m_digital_2(0)
+
+		, m_analog_left_x(128)
+		, m_analog_left_y(128)
+		, m_analog_right_x(128)
+		, m_analog_right_y(128)
+
+		, m_press_right(0)
+		, m_press_left(0)
+		, m_press_up(0)
+		, m_press_down(0)
+		, m_press_triangle(0)
+		, m_press_circle(0)
+		, m_press_cross(0)
+		, m_press_square(0)
+		, m_press_L1(0)
+		, m_press_L2(0)
+		, m_press_R1(0)
+		, m_press_R2(0)
+
+		, m_sensor_x(512)
+		, m_sensor_y(399)
+		, m_sensor_z(512)
+		, m_sensor_g(512)
+	{
+	}
+};
diff --git a/rpcs3/Emu/Io/usb_device.cpp b/rpcs3/Emu/Io/usb_device.cpp
index 7aaf2a4a2b..555166d7a2 100644
--- a/rpcs3/Emu/Io/usb_device.cpp
+++ b/rpcs3/Emu/Io/usb_device.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/System.h"
-#include "Emu/Cell/lv2/sys_time.h"
 
 #include "Emu/Cell/lv2/sys_usbd.h"
 #include "Emu/Io/usb_device.h"
diff --git a/rpcs3/Emu/Io/usb_device.h b/rpcs3/Emu/Io/usb_device.h
index 1b5b43eba1..18fbfaa276 100644
--- a/rpcs3/Emu/Io/usb_device.h
+++ b/rpcs3/Emu/Io/usb_device.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -15,7 +15,6 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/lv2/sys_usbd.h"
 
 struct UsbTransfer;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
index 4ebe28f4ea..f69e01bb97 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "overlays.h"
+#include "Utilities/CPUStats.h"
 #include "Emu/system_config_types.h"
 
 namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
index b233d4037f..639ee4a388 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "overlays.h"
+#include "Utilities/date_time.h"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp
index 658bc78bed..9bfb75de70 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "overlays.h"
-#include "../GSRender.h"
+#include "../GSRender.h"
+#include "Input/pad_thread.h"
 
 LOG_CHANNEL(overlays);
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
index b5155abfc8..83ef42d6d4 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.h
+++ b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -2,22 +2,19 @@
 #include "overlay_animation.h"
 #include "overlay_controls.h"
 
-#include "../../../Utilities/date_time.h"
 #include "../../../Utilities/Thread.h"
-#include "../../Io/PadHandler.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
-#include "Input/pad_thread.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 #include "Emu/Cell/Modules/cellOskDialog.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
-#include "Utilities/CPUStats.h"
 #include "Utilities/Timer.h"
 
 #include <list>
+#include <thread>
 
 // Utils
 extern u64 get_system_time();
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 7153a26c7b..c9d6901a8c 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -12,6 +12,7 @@
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/Cell/Modules/cellGcmSys.h"
 #include "Overlays/overlay_perf_metrics.h"
+#include "Utilities/date_time.h"
 
 #include "Utilities/span.h"
 #include "Utilities/StrUtil.h"
diff --git a/rpcs3/Input/basic_keyboard_handler.cpp b/rpcs3/Input/basic_keyboard_handler.cpp
index ad6b873d6e..e9a7e124ed 100644
--- a/rpcs3/Input/basic_keyboard_handler.cpp
+++ b/rpcs3/Input/basic_keyboard_handler.cpp
@@ -1,7 +1,6 @@
 #include "basic_keyboard_handler.h"
 
 #include <QApplication>
-#include <QKeyEvent>
 
 #include "Emu/system_config.h"
 
diff --git a/rpcs3/Input/basic_mouse_handler.h b/rpcs3/Input/basic_mouse_handler.h
index 364346e8d9..f76e520834 100644
--- a/rpcs3/Input/basic_mouse_handler.h
+++ b/rpcs3/Input/basic_mouse_handler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "stdafx.h"
 #include "Emu/Io/MouseHandler.h"
diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp
index 8c67651cd8..7b780bf753 100644
--- a/rpcs3/Input/ds3_pad_handler.cpp
+++ b/rpcs3/Input/ds3_pad_handler.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ds3_pad_handler.h"
+#include "Emu/Io/pad_config.h"
 
 LOG_CHANNEL(ds3_log, "DS3");
 
diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp
index b0cff5460d..a2e965682b 100644
--- a/rpcs3/Input/ds4_pad_handler.cpp
+++ b/rpcs3/Input/ds4_pad_handler.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ds4_pad_handler.h"
+#include "Emu/Io/pad_config.h"
 
 LOG_CHANNEL(ds4_log, "DS4");
 
diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp
index f71ead44a7..7dd9efd8a9 100644
--- a/rpcs3/Input/evdev_joystick_handler.cpp
+++ b/rpcs3/Input/evdev_joystick_handler.cpp
@@ -3,9 +3,8 @@
 
 #ifdef HAVE_LIBEVDEV
 
-#include "rpcs3qt/pad_settings_dialog.h"
+#include "Emu/Io/pad_config.h"
 #include "evdev_joystick_handler.h"
-#include "Utilities/Thread.h"
 #include "Utilities/Log.h"
 
 #include <functional>
diff --git a/rpcs3/Input/evdev_joystick_handler.h b/rpcs3/Input/evdev_joystick_handler.h
index 065b79cb3d..aa9e25a0e9 100644
--- a/rpcs3/Input/evdev_joystick_handler.h
+++ b/rpcs3/Input/evdev_joystick_handler.h
@@ -1,8 +1,7 @@
 #pragma once
 #ifdef HAVE_LIBEVDEV
 
-#include "Utilities/types.h"
-#include "Utilities/Config.h"
+#include "stdafx.h"
 #include "Utilities/File.h"
 #include "Emu/Io/PadHandler.h"
 #include <libevdev/libevdev.h>
diff --git a/rpcs3/Input/keyboard_pad_handler.cpp b/rpcs3/Input/keyboard_pad_handler.cpp
index 0c4bb70c41..e5d3d9dc61 100644
--- a/rpcs3/Input/keyboard_pad_handler.cpp
+++ b/rpcs3/Input/keyboard_pad_handler.cpp
@@ -1,7 +1,7 @@
 #include "keyboard_pad_handler.h"
+#include "Emu/Io/pad_config.h"
 
 #include <QApplication>
-#include <QThread>
 
 LOG_CHANNEL(input_log, "Input");
 
diff --git a/rpcs3/Input/keyboard_pad_handler.h b/rpcs3/Input/keyboard_pad_handler.h
index 21ad893a46..e96d50fc95 100644
--- a/rpcs3/Input/keyboard_pad_handler.h
+++ b/rpcs3/Input/keyboard_pad_handler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/Config.h"
+#include "stdafx.h"
 #include "Emu/Io/PadHandler.h"
 
 #include <QWindow>
diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp
index fd3ece17a6..1f741d38df 100644
--- a/rpcs3/Input/mm_joystick_handler.cpp
+++ b/rpcs3/Input/mm_joystick_handler.cpp
@@ -1,5 +1,6 @@
 #ifdef _WIN32
 #include "mm_joystick_handler.h"
+#include "Emu/Io/pad_config.h"
 
 LOG_CHANNEL(input_log, "Input");
 
diff --git a/rpcs3/Input/mm_joystick_handler.h b/rpcs3/Input/mm_joystick_handler.h
index 83590c354f..5995e6b8dc 100644
--- a/rpcs3/Input/mm_joystick_handler.h
+++ b/rpcs3/Input/mm_joystick_handler.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "stdafx.h"
 #include "Emu/Io/PadHandler.h"
 #include <Windows.h>
 #include <mmsystem.h>
-#include "Utilities/Config.h"
 
 class mm_joystick_handler final : public PadHandlerBase
 {
diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
index 3db3ccc739..675b6dcebd 100644
--- a/rpcs3/Input/pad_thread.cpp
+++ b/rpcs3/Input/pad_thread.cpp
@@ -10,6 +10,8 @@
 #endif
 #include "keyboard_pad_handler.h"
 #include "Emu/Io/Null/NullPadHandler.h"
+#include "Emu/Io/PadHandler.h"
+#include "Emu/Io/pad_config.h"
 
 LOG_CHANNEL(input_log, "Input");
 
diff --git a/rpcs3/Input/pad_thread.h b/rpcs3/Input/pad_thread.h
index aa6750f6ad..b50efa777d 100644
--- a/rpcs3/Input/pad_thread.h
+++ b/rpcs3/Input/pad_thread.h
@@ -4,15 +4,11 @@
 #include <thread>
 #include <mutex>
 
-#include "../Utilities/types.h"
-#include "Emu/Io/PadHandler.h"
+#include "stdafx.h"
+#include "Emu/Io/pad_types.h"
+#include "Emu/Io/pad_config_types.h"
 
-struct PadInfo
-{
-	u32 now_connect;
-	u32 system_info;
-	bool ignore_input;
-};
+class PadHandlerBase;
 
 class pad_thread
 {
diff --git a/rpcs3/Input/xinput_pad_handler.cpp b/rpcs3/Input/xinput_pad_handler.cpp
index 61dfda57eb..a61a6f45bd 100644
--- a/rpcs3/Input/xinput_pad_handler.cpp
+++ b/rpcs3/Input/xinput_pad_handler.cpp
@@ -2,6 +2,7 @@
 #ifdef _WIN32
 #include "stdafx.h"
 #include "xinput_pad_handler.h"
+#include "Emu/Io/pad_config.h"
 
 namespace XINPUT_INFO
 {
diff --git a/rpcs3/Input/xinput_pad_handler.h b/rpcs3/Input/xinput_pad_handler.h
index 55ecee32e1..870c605fd9 100644
--- a/rpcs3/Input/xinput_pad_handler.h
+++ b/rpcs3/Input/xinput_pad_handler.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/Config.h"
 #include "Emu/Io/PadHandler.h"
 #define NOMINMAX
 #include <Windows.h>
diff --git a/rpcs3/display_sleep_control.cpp b/rpcs3/display_sleep_control.cpp
index f6bf8a1305..669094073c 100644
--- a/rpcs3/display_sleep_control.cpp
+++ b/rpcs3/display_sleep_control.cpp
@@ -1,7 +1,5 @@
 #include "display_sleep_control.h"
 
-#include "Utilities/Log.h"
-
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -16,7 +14,7 @@ static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMessage>
 #include <QDBusReply>
-
+#include "Utilities/types.h"
 static u32 s_dbus_cookie = 0;
 #endif
 
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index c9fa8dabb1..db504ce39d 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -72,6 +72,7 @@
     <ClCompile Include="Emu\Audio\AudioBackend.cpp" />
     <ClCompile Include="Emu\Io\KeyboardHandler.cpp" />
     <ClCompile Include="Emu\Io\pad_config.cpp" />
+    <ClCompile Include="Emu\Io\pad_config_types.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog_native.cpp" />
     <ClCompile Include="Emu\system_config_types.cpp" />
@@ -415,8 +416,10 @@
     <ClInclude Include="Emu\Cell\Modules\cellRemotePlay.h" />
     <ClInclude Include="Emu\Cell\Modules\cellSsl.h" />
     <ClInclude Include="Emu\Cell\Modules\cellStorage.h" />
+    <ClInclude Include="Emu\Io\pad_types.h" />
     <ClInclude Include="Emu\Io\Keyboard.h" />
     <ClInclude Include="Emu\Io\pad_config.h" />
+    <ClInclude Include="Emu\Io\pad_config_types.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache_helpers.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_fonts.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_perf_metrics.h" />
@@ -692,4 +695,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index e4dfc96636..280bb27ca1 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -883,7 +883,7 @@
     </ClCompile>
     <ClCompile Include="Emu\title.cpp">
       <Filter>Emu</Filter>
-    </ClCompile>
+    </ClCompile>
     <ClCompile Include="Emu\system_config.cpp">
       <Filter>Emu</Filter>
     </ClCompile>
@@ -895,9 +895,12 @@
     </ClCompile>
     <ClCompile Include="Emu\system_config_types.cpp">
       <Filter>Emu</Filter>
-    </ClCompile>
+    </ClCompile>
     <ClCompile Include="Emu\RSX\Overlays\overlay_fonts.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
+      <Filter>Emu\GPU\RSX\Overlays</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Io\pad_config_types.cpp">
+      <Filter>Emu\Io</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1692,7 +1695,7 @@
     </ClInclude>
     <ClInclude Include="Emu\title.h">
       <Filter>Emu</Filter>
-    </ClInclude>
+    </ClInclude>
     <ClInclude Include="Emu\system_config.h">
       <Filter>Emu</Filter>
     </ClInclude>
@@ -1701,9 +1704,15 @@
     </ClInclude>
     <ClInclude Include="Emu\system_config_types.h">
       <Filter>Emu</Filter>
-    </ClInclude>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\overlay_fonts.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
+      <Filter>Emu\GPU\RSX\Overlays</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\pad_config_types.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Io\pad_types.h">
+      <Filter>Emu\Io</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 9aba2291ed..d9eb203666 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -1,9 +1,12 @@
 // Qt5.10+ frontend implementation for rpcs3. Known to work on Windows, Linux, Mac
 // by Sacha Refshauge, Megamouse and flash-fire
 
+#include <iostream>
+
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QFileInfo>
+#include <QLayout>
 #include <QTimer>
 #include <QObject>
 #include <QMessageBox>
@@ -31,6 +34,7 @@ DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResoluti
 #endif
 
 #include "rpcs3_version.h"
+#include "Emu/System.h"
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
@@ -222,7 +226,7 @@ int main(int argc, char** argv)
 	const bool use_cli_style = find_arg(arg_style, argc, argv) || find_arg(arg_stylesheet, argc, argv);
 
 	QScopedPointer<QCoreApplication> app(createApplication(argc, argv));
-	app->setApplicationVersion(qstr(rpcs3::get_version().to_string()));
+	app->setApplicationVersion(QString::fromStdString(rpcs3::get_version().to_string()));
 	app->setApplicationName("RPCS3");
 
 	// Command line args
diff --git a/rpcs3/main_application.h b/rpcs3/main_application.h
index 6dacc1c95c..3e765fa21d 100644
--- a/rpcs3/main_application.h
+++ b/rpcs3/main_application.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include <string>
 #include <QWindow>
 
 struct EmuCallbacks;
diff --git a/rpcs3/rpcs3qt/_discord_utils.cpp b/rpcs3/rpcs3qt/_discord_utils.cpp
index eb61682aee..fad59dee58 100644
--- a/rpcs3/rpcs3qt/_discord_utils.cpp
+++ b/rpcs3/rpcs3qt/_discord_utils.cpp
@@ -1,4 +1,5 @@
-#ifdef WITH_DISCORD_RPC
+#ifdef WITH_DISCORD_RPC
+#include "stdafx.h"
 #include "_discord_utils.h"
 #include "discord_rpc.h"
 #include "discord_register.h"
diff --git a/rpcs3/rpcs3qt/_discord_utils.h b/rpcs3/rpcs3qt/_discord_utils.h
index d6cbbe268a..b6d77aa98e 100644
--- a/rpcs3/rpcs3qt/_discord_utils.h
+++ b/rpcs3/rpcs3qt/_discord_utils.h
@@ -1,6 +1,6 @@
-#pragma once
+#pragma once
 
-#include "stdafx.h"
+#include <string>
 
 namespace discord
 {
diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp
index 002baf7c60..1338ec9b0c 100644
--- a/rpcs3/rpcs3qt/about_dialog.cpp
+++ b/rpcs3/rpcs3qt/about_dialog.cpp
@@ -1,4 +1,4 @@
-#include "about_dialog.h"
+#include "about_dialog.h"
 #include "ui_about_dialog.h"
 
 #include "rpcs3_version.h"
diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
index e6cbf773ca..5510a4d4b9 100644
--- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
@@ -2,6 +2,12 @@
 #include "table_item_delegate.h"
 #include "Emu/System.h"
 
+#include <QFontDatabase>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QVBoxLayout>
+#include <QPushButton>
+
 LOG_CHANNEL(autopause_log, "AutoPause");
 
 constexpr auto qstr = QString::fromStdString;
diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.h b/rpcs3/rpcs3qt/auto_pause_settings_dialog.h
index b7cdb1c485..717bcfd2ef 100644
--- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.h
+++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.h
@@ -3,18 +3,9 @@
 #include "stdafx.h"
 
 #include <QDialog>
-#include <QVBoxLayout>
-#include <QFormLayout>
-#include <QPushButton>
-#include <QAbstractButton>
 #include <QLabel>
-#include <QString>
 #include <QTableWidget>
-#include <QHeaderView>
-#include <QMouseEvent>
-#include <QMenu>
 #include <QLineEdit>
-#include <QFontDatabase>
 
 class auto_pause_settings_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/breakpoint_handler.h b/rpcs3/rpcs3qt/breakpoint_handler.h
index 351c874ce4..253a981656 100644
--- a/rpcs3/rpcs3qt/breakpoint_handler.h
+++ b/rpcs3/rpcs3qt/breakpoint_handler.h
@@ -1,6 +1,5 @@
-#pragma once
+#pragma once
 #include "stdafx.h"
-#include "Emu/Cell/PPUThread.h"
 #include <set>
 
 enum class breakpoint_types
diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3qt/breakpoint_list.cpp
index 4cd6cf3b7f..46cd08f355 100644
--- a/rpcs3/rpcs3qt/breakpoint_list.cpp
+++ b/rpcs3/rpcs3qt/breakpoint_list.cpp
@@ -1,6 +1,9 @@
 #include "breakpoint_list.h"
+#include "breakpoint_handler.h"
 
+#include "Emu/CPU/CPUDisAsm.h"
 #include "Emu/Cell/SPUThread.h"
+#include "Emu/Cell/PPUThread.h"
 
 #include <QMenu>
 
diff --git a/rpcs3/rpcs3qt/breakpoint_list.h b/rpcs3/rpcs3qt/breakpoint_list.h
index 4d607a6287..77143cbac4 100644
--- a/rpcs3/rpcs3qt/breakpoint_list.h
+++ b/rpcs3/rpcs3qt/breakpoint_list.h
@@ -1,12 +1,13 @@
-#pragma once
+#pragma once
 
 #include "stdafx.h"
-#include "Emu/CPU/CPUDisAsm.h"
-
-#include "breakpoint_handler.h"
 
 #include <QListWidget>
 
+class CPUDisAsm;
+class cpu_thread;
+class breakpoint_handler;
+
 class breakpoint_list : public QListWidget
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3qt/cg_disasm_window.cpp
index 0346f0819b..059f6b6635 100644
--- a/rpcs3/rpcs3qt/cg_disasm_window.cpp
+++ b/rpcs3/rpcs3qt/cg_disasm_window.cpp
@@ -1,16 +1,13 @@
 #include "stdafx.h"
 
 #include "cg_disasm_window.h"
+#include "gui_settings.h"
+#include "syntax_highlighter.h"
 
 #include <QSplitter>
 #include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
 #include <QFileDialog>
-#include <QDialog>
-#include <QVBoxLayout>
-#include <QDockWidget>
-#include <QCoreApplication>
+#include <QHBoxLayout>
 #include <QFontDatabase>
 #include <QMimeData>
 
diff --git a/rpcs3/rpcs3qt/cg_disasm_window.h b/rpcs3/rpcs3qt/cg_disasm_window.h
index c3f4a0304b..a6a6551c67 100644
--- a/rpcs3/rpcs3qt/cg_disasm_window.h
+++ b/rpcs3/rpcs3qt/cg_disasm_window.h
@@ -1,11 +1,13 @@
-#pragma once
+#pragma once
 
 #include <QTextEdit>
 #include <QDropEvent>
 
 #include "stdafx.h"
-#include "gui_settings.h"
-#include "syntax_highlighter.h"
+
+class AsmHighlighter;
+class GlslHighlighter;
+class gui_settings;
 
 class cg_disasm_window : public QWidget
 {
diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp
index 1f3c2fc61b..1f0d33a353 100644
--- a/rpcs3/rpcs3qt/debugger_frame.cpp
+++ b/rpcs3/rpcs3qt/debugger_frame.cpp
@@ -1,7 +1,20 @@
 #include "debugger_frame.h"
+#include "register_editor_dialog.h"
+#include "instruction_editor_dialog.h"
+#include "gui_settings.h"
+#include "debugger_list.h"
+#include "breakpoint_list.h"
+#include "breakpoint_handler.h"
 #include "qt_utils.h"
+
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
+#include "Emu/Cell/PPUDisAsm.h"
+#include "Emu/Cell/PPUThread.h"
+#include "Emu/Cell/SPUDisAsm.h"
+#include "Emu/Cell/SPUThread.h"
+#include "Emu/CPU/CPUThread.h"
+#include "Emu/CPU/CPUDisAsm.h"
 
 #include <QKeyEvent>
 #include <QScrollBar>
@@ -10,6 +23,8 @@
 #include <QCompleter>
 #include <QMenu>
 #include <QJSEngine>
+#include <QVBoxLayout>
+#include <QTimer>
 
 constexpr auto qstr = QString::fromStdString;
 extern bool user_asked_for_frame_capture;
diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h
index d124662d0b..3174157a82 100644
--- a/rpcs3/rpcs3qt/debugger_frame.h
+++ b/rpcs3/rpcs3qt/debugger_frame.h
@@ -1,25 +1,20 @@
 #pragma once
 
 #include "stdafx.h"
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
-#include "Emu/Cell/RawSPUThread.h"
-#include "Emu/Cell/PPUDisAsm.h"
-#include "Emu/Cell/SPUDisAsm.h"
-#include "Emu/Cell/PPUInterpreter.h"
 
-#include "breakpoint_handler.h"
 #include "custom_dock_widget.h"
-#include "instruction_editor_dialog.h"
-#include "register_editor_dialog.h"
-#include "gui_settings.h"
-#include "debugger_list.h"
-#include "breakpoint_list.h"
 
 #include <QSplitter>
 #include <QTextEdit>
+#include <QPushButton>
+#include <QComboBox>
+
+class CPUDisAsm;
+class cpu_thread;
+class gui_settings;
+class debugger_list;
+class breakpoint_list;
+class breakpoint_handler;
 
 class debugger_frame : public custom_dock_widget
 {
diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp
index 0ba192f066..aee3e2b50b 100644
--- a/rpcs3/rpcs3qt/debugger_list.cpp
+++ b/rpcs3/rpcs3qt/debugger_list.cpp
@@ -1,9 +1,13 @@
 #include "debugger_list.h"
+#include "gui_settings.h"
+#include "breakpoint_handler.h"
 
 #include "Emu/Cell/SPUThread.h"
+#include "Emu/Cell/PPUThread.h"
+#include "Emu/CPU/CPUDisAsm.h"
+#include "Emu/CPU/CPUThread.h"
 #include "Emu/System.h"
 
-#include <QApplication>
 #include <QMouseEvent>
 #include <QWheelEvent>
 
diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3qt/debugger_list.h
index 2b75616807..b6e2b16480 100644
--- a/rpcs3/rpcs3qt/debugger_list.h
+++ b/rpcs3/rpcs3qt/debugger_list.h
@@ -1,13 +1,14 @@
-#pragma once
+#pragma once
 
-#include "breakpoint_handler.h"
-#include "gui_settings.h"
-
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
+#include "stdafx.h"
 
 #include <QListWidget>
 
+class breakpoint_handler;
+class CPUDisAsm;
+class cpu_thread;
+class gui_settings;
+
 class debugger_list : public QListWidget
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp
index 0f8729782b..96bdd9f781 100644
--- a/rpcs3/rpcs3qt/emu_settings.cpp
+++ b/rpcs3/rpcs3qt/emu_settings.cpp
@@ -5,7 +5,6 @@
 #include <condition_variable>
 #include <mutex>
 
-#include "stdafx.h"
 #include "Utilities/Config.h"
 #include "Utilities/Thread.h"
 #include "Utilities/StrUtil.h"
diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h
index 5b5346cba8..cd79745e96 100644
--- a/rpcs3/rpcs3qt/emu_settings.h
+++ b/rpcs3/rpcs3qt/emu_settings.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include "Utilities/File.h"
-#include "Utilities/Log.h"
-
 #include "yaml-cpp/yaml.h"
 
+#include "stdafx.h"
+
 #include <QCheckBox>
 #include <QStringList>
 #include <QMap>
-#include <QObject>
 #include <QComboBox>
 #include <QSpinBox>
 
diff --git a/rpcs3/rpcs3qt/find_dialog.cpp b/rpcs3/rpcs3qt/find_dialog.cpp
index bb360484be..1a58fec6c9 100644
--- a/rpcs3/rpcs3qt/find_dialog.cpp
+++ b/rpcs3/rpcs3qt/find_dialog.cpp
@@ -1,4 +1,4 @@
-#include "find_dialog.h"
+#include "find_dialog.h"
 
 #include <QVBoxLayout>
 
@@ -41,10 +41,6 @@ find_dialog::find_dialog(QTextEdit* edit, QWidget *parent, Qt::WindowFlags f) :
 	show();
 }
 
-find_dialog::~find_dialog()
-{
-}
-
 int find_dialog::count_all()
 {
 	m_count_lines = 0;
diff --git a/rpcs3/rpcs3qt/find_dialog.h b/rpcs3/rpcs3qt/find_dialog.h
index 12695223d9..64128e5eb0 100644
--- a/rpcs3/rpcs3qt/find_dialog.h
+++ b/rpcs3/rpcs3qt/find_dialog.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 #include <QTextEdit>
@@ -10,7 +10,6 @@ class find_dialog : public QDialog
 {
 public:
 	find_dialog(QTextEdit* edit, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
-	~find_dialog();
 
 private:
 	int m_count_lines = 0;
diff --git a/rpcs3/rpcs3qt/game_compatibility.cpp b/rpcs3/rpcs3qt/game_compatibility.cpp
index f0cfa8707a..41fb58cdfb 100644
--- a/rpcs3/rpcs3qt/game_compatibility.cpp
+++ b/rpcs3/rpcs3qt/game_compatibility.cpp
@@ -1,7 +1,10 @@
 #include "game_compatibility.h"
+#include "gui_settings.h"
+#include "progress_dialog.h"
 
-#include <QLabel>
 #include <QMessageBox>
+#include <QJsonDocument>
+#include <QNetworkReply>
 
 LOG_CHANNEL(compat_log, "Compat");
 
diff --git a/rpcs3/rpcs3qt/game_compatibility.h b/rpcs3/rpcs3qt/game_compatibility.h
index 0d73eb65ce..1bb2421224 100644
--- a/rpcs3/rpcs3qt/game_compatibility.h
+++ b/rpcs3/rpcs3qt/game_compatibility.h
@@ -3,17 +3,13 @@
 #include <memory>
 
 #include <QPainter>
-#include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QTableWidget>
 #include <QTimer>
 
-#include "gui_settings.h"
-#include "progress_dialog.h"
+class gui_settings;
+class progress_dialog;
 
 struct compat_status
 {
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index be898c85bf..b9ac4fcd97 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -6,6 +6,12 @@
 #include "custom_table_widget_item.h"
 #include "input_dialog.h"
 #include "localized.h"
+#include "progress_dialog.h"
+#include "persistent_settings.h"
+#include "emu_settings.h"
+#include "gui_settings.h"
+#include "game_list.h"
+#include "game_list_grid.h"
 
 #include "Emu/Memory/vm.h"
 #include "Emu/System.h"
@@ -35,12 +41,13 @@ LOG_CHANNEL(sys_log, "SYS");
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
-game_list_frame::game_list_frame(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, std::shared_ptr<persistent_settings> persistent_settings, QWidget *parent)
+game_list_frame::game_list_frame(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, std::shared_ptr<persistent_settings> persistent_settings, QWidget* parent)
 	: custom_dock_widget(tr("Game List"), parent)
 	, m_gui_settings(guiSettings)
 	, m_emu_settings(emuSettings)
 	, m_persistent_settings(persistent_settings)
 {
+	m_Icon_Size       = gui::gl_icon_size_min; // ensure a valid size
 	m_isListLayout    = m_gui_settings->GetValue(gui::gl_listMode).toBool();
 	m_Margin_Factor   = m_gui_settings->GetValue(gui::gl_marginFactor).toReal();
 	m_Text_Factor     = m_gui_settings->GetValue(gui::gl_textFactor).toReal();
diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h
index b7b2558ea7..5706e84aaa 100644
--- a/rpcs3/rpcs3qt/game_list_frame.h
+++ b/rpcs3/rpcs3qt/game_list_frame.h
@@ -1,24 +1,24 @@
 #pragma once
 
-#include "stdafx.h"
 #include "Emu/GameInfo.h"
 
 #include "custom_dock_widget.h"
-#include "game_list.h"
-#include "game_list_grid.h"
-#include "emu_settings.h"
-#include "persistent_settings.h"
 #include "game_compatibility.h"
-#include "category.h"
 
 #include <QMainWindow>
 #include <QToolBar>
-#include <QLineEdit>
 #include <QStackedWidget>
 #include <QSet>
+#include <QTableWidgetItem>
 
 #include <memory>
 
+class game_list;
+class game_list_grid;
+class gui_settings;
+class emu_settings;
+class persistent_settings;
+
 /* Having the icons associated with the game info simplifies logic internally */
 struct gui_game_info
 {
@@ -159,7 +159,7 @@ private:
 
 	// Icons
 	QColor m_Icon_Color;
-	QSize m_Icon_Size = gui::gl_icon_size_min; // ensure a valid size
+	QSize m_Icon_Size;
 	qreal m_Margin_Factor;
 	qreal m_Text_Factor;
 	bool m_drawCompatStatusToGrid = false;
diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp
index df190c2054..7b9deed094 100644
--- a/rpcs3/rpcs3qt/game_list_grid.cpp
+++ b/rpcs3/rpcs3qt/game_list_grid.cpp
@@ -3,7 +3,6 @@
 #include "qt_utils.h"
 
 #include <QHeaderView>
-#include <QLabel>
 #include <QScrollBar>
 
 game_list_grid::game_list_grid(const QSize& icon_size, const QColor& icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3qt/game_list_grid.h
index 4d1aeb6f9b..a26c587e91 100644
--- a/rpcs3/rpcs3qt/game_list_grid.h
+++ b/rpcs3/rpcs3qt/game_list_grid.h
@@ -1,10 +1,8 @@
-#pragma once
+#pragma once
 
 #include "game_list.h"
-#include "game_list_grid_delegate.h"
 
-#include <QHBoxLayout>
-#include <QScrollArea>
+class game_list_grid_delegate;
 
 class game_list_grid : public game_list
 {
diff --git a/rpcs3/rpcs3qt/gl_gs_frame.cpp b/rpcs3/rpcs3qt/gl_gs_frame.cpp
index 3eca482cfb..7ffb995dd0 100644
--- a/rpcs3/rpcs3qt/gl_gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gl_gs_frame.cpp
@@ -3,7 +3,6 @@
 
 #include <QOpenGLContext>
 #include <QOffscreenSurface>
-#include <QWindow>
 
 gl_gs_frame::gl_gs_frame(const QRect& geometry, const QIcon& appIcon, const std::shared_ptr<gui_settings>& gui_settings)
 	: gs_frame(geometry, appIcon, gui_settings)
diff --git a/rpcs3/rpcs3qt/gl_gs_frame.h b/rpcs3/rpcs3qt/gl_gs_frame.h
index b02174032d..be0529b7a3 100644
--- a/rpcs3/rpcs3qt/gl_gs_frame.h
+++ b/rpcs3/rpcs3qt/gl_gs_frame.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "stdafx.h"
 #include "gs_frame.h"
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index 5679ea2311..b576e22d5e 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -1,4 +1,5 @@
 #include "gs_frame.h"
+#include "gui_settings.h"
 
 #include "Utilities/Config.h"
 #include "Utilities/Timer.h"
@@ -7,9 +8,6 @@
 #include "Emu/Cell/Modules/cellScreenshot.h"
 
 #include <QKeyEvent>
-#include <QTimer>
-#include <QThread>
-#include <QLibraryInfo>
 #include <QMessageBox>
 #include <string>
 
@@ -29,6 +27,14 @@
 #endif
 #endif
 
+#ifdef _WIN32
+#include <QWinTHumbnailToolbar>
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
+
 LOG_CHANNEL(screenshot);
 
 constexpr auto qstr = QString::fromStdString;
diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h
index 90e764fee0..f09eeb9868 100644
--- a/rpcs3/rpcs3qt/gs_frame.h
+++ b/rpcs3/rpcs3qt/gs_frame.h
@@ -3,21 +3,16 @@
 #include "stdafx.h"
 #include "Emu/RSX/GSRender.h"
 
-#include "gui_settings.h"
-
-#include <QWidget>
 #include <QWindow>
+#include <QPaintEvent>
 
 #ifdef _WIN32
 #include <QWinTaskbarProgress>
 #include <QWinTaskbarButton>
-#include <QWinTHumbnailToolbar>
-#include <QWinTHumbnailToolbutton>
-#elif HAVE_QTDBUS
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusConnection>
 #endif
 
+class gui_settings;
+
 class gs_frame : public QWindow, public GSFrameBase
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index 4c381538cf..9da1e4efa0 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -2,6 +2,12 @@
 
 #include "qt_utils.h"
 #include "welcome_dialog.h"
+#include "main_window.h"
+#include "emu_settings.h"
+#include "gui_settings.h"
+#include "persistent_settings.h"
+#include "gs_frame.h"
+#include "gl_gs_frame.h"
 
 #ifdef WITH_DISCORD_RPC
 #include "_discord_utils.h"
@@ -15,6 +21,7 @@
 #include "stylesheets.h"
 
 #include <QScreen>
+#include <QFontDatabase>
 
 #include <clocale>
 
diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3qt/gui_application.h
index eb0584cf73..88438d08e1 100644
--- a/rpcs3/rpcs3qt/gui_application.h
+++ b/rpcs3/rpcs3qt/gui_application.h
@@ -3,16 +3,16 @@
 #include "stdafx.h"
 
 #include <QApplication>
-#include <QFontDatabase>
-#include <QIcon>
+#include <QElapsedTimer>
+#include <QTranslator>
 
-#include "main_window.h"
 #include "main_application.h"
-#include "emu_settings.h"
-#include "gui_settings.h"
-#include "persistent_settings.h"
-#include "gs_frame.h"
-#include "gl_gs_frame.h"
+
+class gs_frame;
+class main_window;
+class gui_settings;
+class emu_settings;
+class persistent_settings;
 
 /** RPCS3 GUI Application Class
  * The main point of this class is to do application initialization, to hold the main and game windows and to initialize callbacks.
diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp
index ca40b4a3cd..9f5834e9bd 100644
--- a/rpcs3/rpcs3qt/gui_settings.cpp
+++ b/rpcs3/rpcs3qt/gui_settings.cpp
@@ -1,9 +1,9 @@
 #include "gui_settings.h"
 
-#include "game_list_frame.h"
 #include "qt_utils.h"
 #include "localized.h"
 
+#include <QCheckBox>
 #include <QCoreApplication>
 #include <QMessageBox>
 
diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h
index d2474b679d..31e83544ca 100644
--- a/rpcs3/rpcs3qt/gui_settings.h
+++ b/rpcs3/rpcs3qt/gui_settings.h
@@ -3,7 +3,6 @@
 #include "settings.h"
 #include "Utilities/Log.h"
 
-#include <QDir>
 #include <QVariant>
 #include <QSize>
 #include <QColor>
diff --git a/rpcs3/rpcs3qt/input_dialog.cpp b/rpcs3/rpcs3qt/input_dialog.cpp
index 41ec1e0eed..3d180e7f1d 100644
--- a/rpcs3/rpcs3qt/input_dialog.cpp
+++ b/rpcs3/rpcs3qt/input_dialog.cpp
@@ -1,7 +1,9 @@
 #include "input_dialog.h"
 
-#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QLineEdit>
+#include <QPushButton>
 
 input_dialog::input_dialog(int max_length, const QString& text, const QString& title, const QString& label, const QString& placeholder, QWidget *parent, Qt::WindowFlags f)
 	: QDialog(parent, f)
diff --git a/rpcs3/rpcs3qt/input_dialog.h b/rpcs3/rpcs3qt/input_dialog.h
index c10a91c347..0cdc5b592c 100644
--- a/rpcs3/rpcs3qt/input_dialog.h
+++ b/rpcs3/rpcs3qt/input_dialog.h
@@ -2,8 +2,6 @@
 
 #include <QDialog>
 #include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
 
 class input_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
index d4bc257c34..7c97de997d 100644
--- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
+++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
@@ -1,6 +1,13 @@
+#include "instruction_editor_dialog.h"
+
+#include "Emu/Cell/SPUThread.h"
+#include "Emu/CPU/CPUThread.h"
+#include "Emu/CPU/CPUDisAsm.h"
 
-#include "instruction_editor_dialog.h"
 #include <QFontDatabase>
+#include <QVBoxLayout>
+#include <QMessageBox>
+#include <QPushButton>
 
 constexpr auto qstr = QString::fromStdString;
 
diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.h b/rpcs3/rpcs3qt/instruction_editor_dialog.h
index 66afe9f84f..3ba3567044 100644
--- a/rpcs3/rpcs3qt/instruction_editor_dialog.h
+++ b/rpcs3/rpcs3qt/instruction_editor_dialog.h
@@ -1,17 +1,13 @@
 #pragma once
 
 #include "stdafx.h"
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
 
 #include <QDialog>
 #include <QLineEdit>
 #include <QLabel>
-#include <QVBoxLayout>
-#include <QMessageBox>
-#include <QPushButton>
+
+class CPUDisAsm;
+class cpu_thread;
 
 class instruction_editor_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp
index dd56ad2fa1..0e884e6a63 100644
--- a/rpcs3/rpcs3qt/kernel_explorer.cpp
+++ b/rpcs3/rpcs3qt/kernel_explorer.cpp
@@ -9,16 +9,12 @@
 #include "Emu/Cell/lv2/sys_mutex.h"
 #include "Emu/Cell/lv2/sys_cond.h"
 #include "Emu/Cell/lv2/sys_semaphore.h"
-#include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/Cell/lv2/sys_event_flag.h"
 #include "Emu/Cell/lv2/sys_rwlock.h"
 #include "Emu/Cell/lv2/sys_prx.h"
 #include "Emu/Cell/lv2/sys_overlay.h"
 #include "Emu/Cell/lv2/sys_memory.h"
-#include "Emu/Cell/lv2/sys_mmapper.h"
 #include "Emu/Cell/lv2/sys_spu.h"
-#include "Emu/Cell/lv2/sys_interrupt.h"
-#include "Emu/Cell/lv2/sys_timer.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_fs.h"
 
@@ -119,24 +115,24 @@ void kernel_explorer::Update()
 	};
 
 	std::vector<lv2_obj_rec> lv2_types(256);
-	lv2_types[SYS_MEM_OBJECT] =									l_addTreeChild(root, "Memory");
-	lv2_types[SYS_MUTEX_OBJECT] =								l_addTreeChild(root, "Mutexes");
-	lv2_types[SYS_COND_OBJECT] =								l_addTreeChild(root, "Condition Variables");
-	lv2_types[SYS_RWLOCK_OBJECT] =							l_addTreeChild(root, "Reader Writer Locks");
-	lv2_types[SYS_INTR_TAG_OBJECT] =						l_addTreeChild(root, "Interrupt Tags");
+	lv2_types[SYS_MEM_OBJECT] =                 l_addTreeChild(root, "Memory");
+	lv2_types[SYS_MUTEX_OBJECT] =               l_addTreeChild(root, "Mutexes");
+	lv2_types[SYS_COND_OBJECT] =                l_addTreeChild(root, "Condition Variables");
+	lv2_types[SYS_RWLOCK_OBJECT] =              l_addTreeChild(root, "Reader Writer Locks");
+	lv2_types[SYS_INTR_TAG_OBJECT] =            l_addTreeChild(root, "Interrupt Tags");
 	lv2_types[SYS_INTR_SERVICE_HANDLE_OBJECT] = l_addTreeChild(root, "Interrupt Service Handles");
-	lv2_types[SYS_EVENT_QUEUE_OBJECT] =					l_addTreeChild(root, "Event Queues");
-	lv2_types[SYS_EVENT_PORT_OBJECT] =					l_addTreeChild(root, "Event Ports");
-	lv2_types[SYS_TRACE_OBJECT] =								l_addTreeChild(root, "Traces");
-	lv2_types[SYS_SPUIMAGE_OBJECT] =						l_addTreeChild(root, "SPU Images");
-	lv2_types[SYS_PRX_OBJECT] =									l_addTreeChild(root, "PRX Modules");
-	lv2_types[SYS_SPUPORT_OBJECT] =							l_addTreeChild(root, "SPU Ports");
-	lv2_types[SYS_OVERLAY_OBJECT] =						 l_addTreeChild(root, "Overlay Modules");
-	lv2_types[SYS_LWMUTEX_OBJECT] =							l_addTreeChild(root, "Light Weight Mutexes");
-	lv2_types[SYS_TIMER_OBJECT] =								l_addTreeChild(root, "Timers");
-	lv2_types[SYS_SEMAPHORE_OBJECT] =						l_addTreeChild(root, "Semaphores");
-	lv2_types[SYS_LWCOND_OBJECT] =							l_addTreeChild(root, "Light Weight Condition Variables");
-	lv2_types[SYS_EVENT_FLAG_OBJECT] =					l_addTreeChild(root, "Event Flags");
+	lv2_types[SYS_EVENT_QUEUE_OBJECT] =         l_addTreeChild(root, "Event Queues");
+	lv2_types[SYS_EVENT_PORT_OBJECT] =          l_addTreeChild(root, "Event Ports");
+	lv2_types[SYS_TRACE_OBJECT] =               l_addTreeChild(root, "Traces");
+	lv2_types[SYS_SPUIMAGE_OBJECT] =            l_addTreeChild(root, "SPU Images");
+	lv2_types[SYS_PRX_OBJECT] =                 l_addTreeChild(root, "PRX Modules");
+	lv2_types[SYS_SPUPORT_OBJECT] =             l_addTreeChild(root, "SPU Ports");
+	lv2_types[SYS_OVERLAY_OBJECT] =             l_addTreeChild(root, "Overlay Modules");
+	lv2_types[SYS_LWMUTEX_OBJECT] =             l_addTreeChild(root, "Light Weight Mutexes");
+	lv2_types[SYS_TIMER_OBJECT] =               l_addTreeChild(root, "Timers");
+	lv2_types[SYS_SEMAPHORE_OBJECT] =           l_addTreeChild(root, "Semaphores");
+	lv2_types[SYS_LWCOND_OBJECT] =              l_addTreeChild(root, "Light Weight Condition Variables");
+	lv2_types[SYS_EVENT_FLAG_OBJECT] =          l_addTreeChild(root, "Event Flags");
 
 	idm::select<lv2_obj>([&](u32 id, lv2_obj& obj)
 	{
diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp
index 46bc6eb616..ab6f6e74b1 100644
--- a/rpcs3/rpcs3qt/log_frame.cpp
+++ b/rpcs3/rpcs3qt/log_frame.cpp
@@ -1,19 +1,23 @@
 #include "log_frame.h"
 #include "qt_utils.h"
+#include "gui_settings.h"
+
 #include "stdafx.h"
 #include "rpcs3_version.h"
 #include "Utilities/sysinfo.h"
+#include "Utilities/mutex.h"
+#include "Utilities/lockless.h"
 
 #include <QMenu>
 #include <QActionGroup>
 #include <QScrollBar>
-#include <QTabBar>
 #include <QVBoxLayout>
+#include <QTimer>
+#include <QStringBuilder>
+
 #include <sstream>
 #include <deque>
 #include <mutex>
-#include "Utilities/mutex.h"
-#include "Utilities/lockless.h"
 
 extern fs::file g_tty;
 extern atomic_t<s64> g_tty_size;
@@ -627,7 +631,7 @@ bool log_frame::eventFilter(QObject* object, QEvent* event)
 			if (m_find_dialog && m_find_dialog->isVisible())
 				m_find_dialog->close();
 
-			m_find_dialog = std::make_unique<find_dialog>(static_cast<QTextEdit*>(object), this);
+			m_find_dialog.reset(new find_dialog(static_cast<QTextEdit*>(object), this));
 		}
 	}
 
diff --git a/rpcs3/rpcs3qt/log_frame.h b/rpcs3/rpcs3qt/log_frame.h
index 0d5719afaa..5e652e454b 100644
--- a/rpcs3/rpcs3qt/log_frame.h
+++ b/rpcs3/rpcs3qt/log_frame.h
@@ -4,7 +4,6 @@
 #include "Utilities/Log.h"
 
 #include "custom_dock_widget.h"
-#include "gui_settings.h"
 #include "find_dialog.h"
 
 #include <memory>
@@ -12,8 +11,8 @@
 #include <QTabWidget>
 #include <QPlainTextEdit>
 #include <QActionGroup>
-#include <QTimer>
-#include <QKeyEvent>
+
+class gui_settings;
 
 class log_frame : public custom_dock_widget
 {
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index bc49c44537..dcb95ec19b 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -1,12 +1,5 @@
-
-#include <QApplication>
-#include <QMenuBar>
-#include <QMessageBox>
+#include <QMessageBox>
 #include <QFileDialog>
-#include <QVBoxLayout>
-#include <QDockWidget>
-#include <QDesktopWidget>
-#include <QMimeData>
 
 #include "qt_utils.h"
 #include "vfs_dialog.h"
@@ -24,35 +17,31 @@
 #include "memory_viewer_panel.h"
 #include "rsx_debugger.h"
 #include "main_window.h"
-#include "emu_settings.h"
 #include "about_dialog.h"
 #include "pad_settings_dialog.h"
 #include "progress_dialog.h"
 #include "skylander_dialog.h"
 #include "cheat_manager.h"
 #include "pkg_install_dialog.h"
+#include "category.h"
+#include "gui_settings.h"
 
 #include <thread>
 
 #include <QScreen>
 
 #include "stdafx.h"
+#include "rpcs3_version.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
-#include "Emu/Memory/vm.h"
 
 #include "Crypto/unpkg.h"
 #include "Crypto/unself.h"
 
 #include "Loader/PUP.h"
 #include "Loader/TAR.h"
-#include "Loader/PSF.h"
 
 #include "Utilities/Thread.h"
-#include "Utilities/StrUtil.h"
-
-#include "rpcs3_version.h"
-#include "Utilities/sysinfo.h"
 
 #include "ui_main_window.h"
 
diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h
index 7de0f20d34..f6aefb33c1 100644
--- a/rpcs3/rpcs3qt/main_window.h
+++ b/rpcs3/rpcs3qt/main_window.h
@@ -1,25 +1,26 @@
 #pragma once
 
 #ifdef _WIN32
-#include <QWinTaskbarProgress>
-#include <QWinTaskbarButton>
 #include <QWinTHumbnailToolbar>
 #include <QWinTHumbnailToolbutton>
 #endif
 
+#include <QActionGroup>
 #include <QMainWindow>
-#include <QPushButton>
 #include <QIcon>
 
-#include "log_frame.h"
-#include "debugger_frame.h"
-#include "game_list_frame.h"
-#include "gui_settings.h"
-#include "persistent_settings.h"
 #include "update_manager.h"
+#include "settings.h"
 
 #include <memory>
 
+class log_frame;
+class debugger_frame;
+class game_list_frame;
+class gui_settings;
+class emu_settings;
+class persistent_settings;
+
 namespace Ui
 {
 	class main_window;
diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp
index 2241b9fab7..99a8a126b1 100644
--- a/rpcs3/rpcs3qt/memory_string_searcher.cpp
+++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp
@@ -4,6 +4,7 @@
 
 #include <QLabel>
 #include <QPushButton>
+#include <QHBoxLayout>
 
 LOG_CHANNEL(gui_log, "GUI");
 
diff --git a/rpcs3/rpcs3qt/memory_string_searcher.h b/rpcs3/rpcs3qt/memory_string_searcher.h
index 61e48619cb..61d7415c50 100644
--- a/rpcs3/rpcs3qt/memory_string_searcher.h
+++ b/rpcs3/rpcs3qt/memory_string_searcher.h
@@ -2,7 +2,6 @@
 
 #include <QDialog>
 #include <QLineEdit>
-#include <QHBoxLayout>
 
 class memory_string_searcher : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
index 766500244a..ff41ca24c7 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
@@ -1,8 +1,16 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/Memory/vm.h"
 
 #include "memory_viewer_panel.h"
 
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QGroupBox>
+#include <QTextEdit>
+#include <QComboBox>
+#include <QWheelEvent>
+
 constexpr auto qstr = QString::fromStdString;
 
 memory_viewer_panel::memory_viewer_panel(QWidget* parent)
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.h b/rpcs3/rpcs3qt/memory_viewer_panel.h
index 044e8d6690..74a3d54768 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.h
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.h
@@ -1,19 +1,10 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 #include <QLineEdit>
-#include <QTextEdit>
-#include <QComboBox>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QFontDatabase>
 #include <QLabel>
 #include <QFont>
-#include <QScrollBar>
-#include <QPainter>
-#include <QMouseEvent>
+#include <QFontDatabase>
 
 class memory_viewer_panel : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.cpp b/rpcs3/rpcs3qt/msg_dialog_frame.cpp
index 866517020a..c71a77e910 100644
--- a/rpcs3/rpcs3qt/msg_dialog_frame.cpp
+++ b/rpcs3/rpcs3qt/msg_dialog_frame.cpp
@@ -1,9 +1,16 @@
-
-#include "msg_dialog_frame.h"
+#include "msg_dialog_frame.h"
+#include "custom_dialog.h"
 
-#include <QApplication>
-#include <QScreen>
-#include <QThread>
+#include <QPushButton>
+#include <QFormLayout>
+
+#ifdef _WIN32
+#include <QWinTHumbnailToolbar>
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
 
 constexpr auto qstr = QString::fromStdString;
 
diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.h b/rpcs3/rpcs3qt/msg_dialog_frame.h
index 30279d5e63..2d8ed66a51 100644
--- a/rpcs3/rpcs3qt/msg_dialog_frame.h
+++ b/rpcs3/rpcs3qt/msg_dialog_frame.h
@@ -3,27 +3,16 @@
 #include "stdafx.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 
-#include "custom_dialog.h"
-
-#include <QPushButton>
-#include <QStaticText>
-#include <QInputDialog>
-#include <QFormLayout>
 #include <QProgressBar>
 #include <QLabel>
-#include <QButtonGroup>
-#include <QKeyEvent>
 
 #ifdef _WIN32
 #include <QWinTaskbarProgress>
 #include <QWinTaskbarButton>
-#include <QWinTHumbnailToolbar>
-#include <QWinTHumbnailToolbutton>
-#elif HAVE_QTDBUS
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusConnection>
 #endif
 
+class custom_dialog;
+
 class msg_dialog_frame : public QObject, public MsgDialogBase
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
index ad45a2767a..b6ac37ba94 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.cpp
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
@@ -1,5 +1,5 @@
-
-#include "osk_dialog_frame.h"
+#include "osk_dialog_frame.h"
+#include "custom_dialog.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 
 #include <QLabel>
diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.h b/rpcs3/rpcs3qt/osk_dialog_frame.h
index 6778e79190..c60d1be902 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.h
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.h
@@ -3,7 +3,9 @@
 #include "stdafx.h"
 #include "Emu/Cell/Modules/cellOskDialog.h"
 
-#include "custom_dialog.h"
+#include <QObject>
+
+class custom_dialog;
 
 class osk_dialog_frame : public QObject, public OskDialogBase
 {
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h
index 3ba4cafbe0..1edbdc311f 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.h
@@ -2,14 +2,15 @@
 
 #include <QButtonGroup>
 #include <QDialog>
-#include <QEvent>
 #include <QLabel>
 #include <QTabWidget>
 #include <QTimer>
 
-#include "Emu/Io/PadHandler.h"
+#include "Emu/Io/pad_config.h"
 #include "Emu/GameInfo.h"
 
+class PadHandlerBase;
+
 namespace Ui
 {
 	class pad_settings_dialog;
diff --git a/rpcs3/rpcs3qt/pkg_install_dialog.cpp b/rpcs3/rpcs3qt/pkg_install_dialog.cpp
index 76fe0b044f..5448a126d4 100644
--- a/rpcs3/rpcs3qt/pkg_install_dialog.cpp
+++ b/rpcs3/rpcs3qt/pkg_install_dialog.cpp
@@ -3,7 +3,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QFileInfo>
-#include <QLayout>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QToolButton>
 
diff --git a/rpcs3/rpcs3qt/progress_dialog.cpp b/rpcs3/rpcs3qt/progress_dialog.cpp
index ba28272974..ba2c5d8c1d 100644
--- a/rpcs3/rpcs3qt/progress_dialog.cpp
+++ b/rpcs3/rpcs3qt/progress_dialog.cpp
@@ -2,6 +2,14 @@
 
 #include <QLabel>
 
+#ifdef _WIN32
+#include <QWinTHumbnailToolbar>
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
+
 progress_dialog::progress_dialog(const QString &windowTitle, const QString &labelText, const QString &cancelButtonText, int minimum, int maximum, bool delete_on_close, QWidget *parent, Qt::WindowFlags flags)
 	: QProgressDialog(labelText, cancelButtonText, minimum, maximum, parent, flags)
 {
diff --git a/rpcs3/rpcs3qt/progress_dialog.h b/rpcs3/rpcs3qt/progress_dialog.h
index 72ebbff8db..a766ffc830 100644
--- a/rpcs3/rpcs3qt/progress_dialog.h
+++ b/rpcs3/rpcs3qt/progress_dialog.h
@@ -1,17 +1,10 @@
 #pragma once
 
-#include "stdafx.h"
-
 #include <QProgressDialog>
 
 #ifdef _WIN32
 #include <QWinTaskbarProgress>
 #include <QWinTaskbarButton>
-#include <QWinTHumbnailToolbar>
-#include <QWinTHumbnailToolbutton>
-#elif HAVE_QTDBUS
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusConnection>
 #endif
 
 class progress_dialog : public QProgressDialog
diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp
index d118b1f5d6..f8ada24aba 100644
--- a/rpcs3/rpcs3qt/qt_utils.cpp
+++ b/rpcs3/rpcs3qt/qt_utils.cpp
@@ -1,5 +1,4 @@
-
-#include "qt_utils.h"
+#include "qt_utils.h"
 #include <QApplication>
 #include <QBitmap>
 #include <QFontMetrics>
diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h
index 3513785001..e71fd9ec3a 100644
--- a/rpcs3/rpcs3qt/qt_utils.h
+++ b/rpcs3/rpcs3qt/qt_utils.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "stdafx.h"
-#include <QtCore>
+#include <QDir>
 #include <QComboBox>
 #include <QFont>
 #include <QIcon>
diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3qt/register_editor_dialog.cpp
index eddf2a61d5..88e7e16d86 100644
--- a/rpcs3/rpcs3qt/register_editor_dialog.cpp
+++ b/rpcs3/rpcs3qt/register_editor_dialog.cpp
@@ -1,5 +1,14 @@
-
-#include "register_editor_dialog.h"
+#include "register_editor_dialog.h"
+
+#include "Emu/Cell/PPUThread.h"
+#include "Emu/Cell/SPUThread.h"
+#include "Emu/CPU/CPUThread.h"
+#include "Emu/CPU/CPUDisAsm.h"
+
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QMessageBox>
 
 constexpr auto qstr = QString::fromStdString;
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
diff --git a/rpcs3/rpcs3qt/register_editor_dialog.h b/rpcs3/rpcs3qt/register_editor_dialog.h
index 0490bf58e4..a79274d268 100644
--- a/rpcs3/rpcs3qt/register_editor_dialog.h
+++ b/rpcs3/rpcs3qt/register_editor_dialog.h
@@ -1,18 +1,13 @@
 #pragma once
 
 #include "stdafx.h"
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
 
 #include <QDialog>
 #include <QComboBox>
-#include <QLabel>
-#include <QHBoxLayout>
 #include <QLineEdit>
-#include <QPushButton>
-#include <QMessageBox>
+
+class CPUDisAsm;
+class cpu_thread;
 
 class register_editor_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp
index 46455dfcd4..e2c5d413ab 100644
--- a/rpcs3/rpcs3qt/rsx_debugger.cpp
+++ b/rpcs3/rpcs3qt/rsx_debugger.cpp
@@ -1,9 +1,18 @@
-
-#include "rsx_debugger.h"
+#include "rsx_debugger.h"
+#include "gui_settings.h"
 #include "qt_utils.h"
+#include "memory_viewer_panel.h"
+#include "table_item_delegate.h"
 
 #include "Emu/RSX/GSRender.h"
 
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QFont>
+#include <QPixmap>
+#include <QPushButton>
+#include <QKeyEvent>
+
 enum GCMEnumTypes
 {
 	CELL_GCM_ENUM,
diff --git a/rpcs3/rpcs3qt/rsx_debugger.h b/rpcs3/rpcs3qt/rsx_debugger.h
index bb3ff76aaa..f68dd05b8f 100644
--- a/rpcs3/rpcs3qt/rsx_debugger.h
+++ b/rpcs3/rpcs3qt/rsx_debugger.h
@@ -2,21 +2,17 @@
 
 #include "stdafx.h"
 
-#include "memory_viewer_panel.h"
-#include "table_item_delegate.h"
-#include "gui_settings.h"
-
+#include <QDialog>
+#include <QGroupBox>
+#include <QImage>
 #include <QLabel>
 #include <QLineEdit>
-#include <QHBoxLayout>
 #include <QEvent>
-#include <QTabWidget>
 #include <QListWidget>
 #include <QTableWidget>
-#include <QHeaderView>
-#include <QFont>
-#include <QSignalMapper>
-#include <QPixmap>
+#include <QTabWidget>
+
+class gui_settings;
 
 class Buffer : public QGroupBox
 {
diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp
index 3d57752ac7..9e184469b3 100644
--- a/rpcs3/rpcs3qt/save_data_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_dialog.cpp
@@ -5,6 +5,8 @@
 #include <Emu/IdManager.h>
 #include <Emu/RSX/Overlays/overlays.h>
 
+#include "Input/pad_thread.h"
+
 s32 save_data_dialog::ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet)
 {
 	// TODO: Install native shell as an Emu callback
diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3qt/save_data_info_dialog.cpp
index 851637eebb..485f971727 100644
--- a/rpcs3/rpcs3qt/save_data_info_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_info_dialog.cpp
@@ -1,3 +1,4 @@
+#include "stdafx.h"
 #include "save_data_info_dialog.h"
 
 #include <QPushButton>
diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.h b/rpcs3/rpcs3qt/save_data_info_dialog.h
index 5f72c18bfe..f5dd8c9303 100644
--- a/rpcs3/rpcs3qt/save_data_info_dialog.h
+++ b/rpcs3/rpcs3qt/save_data_info_dialog.h
@@ -1,8 +1,6 @@
-#pragma once
+#pragma once
 
 // I just want the struct for the save data.
-#include "stdafx.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 
 #include <QDialog>
diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp
index 95e2604051..978e6e7272 100644
--- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp
@@ -1,13 +1,12 @@
 #include "stdafx.h"
 #include "save_data_list_dialog.h"
 #include "save_data_info_dialog.h"
+#include "gui_settings.h"
 
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QMenu>
-#include <QDesktopWidget>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QScreen>
 
 constexpr auto qstr = QString::fromStdString;
diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h
index 96c62bada0..4259f03467 100644
--- a/rpcs3/rpcs3qt/save_data_list_dialog.h
+++ b/rpcs3/rpcs3qt/save_data_list_dialog.h
@@ -4,12 +4,13 @@
 #include "stdafx.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
-#include "gui_settings.h"
 
 #include <QTableWidget>
 #include <QDialog>
 #include <QLabel>
 
+class gui_settings;
+
 //Display a list of SaveData. Would need to be initialized.
 //Can also be used as a Save Data Chooser.
 class save_data_list_dialog : public QDialog
diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp
index 304bdeb32a..c1ffd98e83 100644
--- a/rpcs3/rpcs3qt/save_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp
@@ -1,22 +1,20 @@
 #include "save_manager_dialog.h"
 
-#include "save_data_info_dialog.h"
 #include "custom_table_widget_item.h"
 #include "qt_utils.h"
+#include "gui_settings.h"
 
 #include "Emu/System.h"
-#include "Emu/VFS.h"
+#include "Emu/Memory/vm.h"
 #include "Loader/PSF.h"
 
 #include <QtConcurrent>
 #include <QDateTime>
-#include <QIcon>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
-#include <QDesktopWidget>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QUrl>
 #include <QDesktopServices>
 #include <QPainter>
diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h
index bb3bfbc6ec..275daaf10d 100644
--- a/rpcs3/rpcs3qt/save_manager_dialog.h
+++ b/rpcs3/rpcs3qt/save_manager_dialog.h
@@ -1,15 +1,14 @@
 #pragma once
 
-#include "stdafx.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
-#include "gui_settings.h"
 
 #include <QDialog>
 #include <QLabel>
 #include <QPushButton>
 #include <QTableWidget>
 
+class gui_settings;
+
 class save_manager_dialog : public QDialog
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp
index 215fa58d47..e40862233c 100644
--- a/rpcs3/rpcs3qt/settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/settings_dialog.cpp
@@ -1,5 +1,4 @@
-#include <QVBoxLayout>
-#include <QButtonGroup>
+#include <QButtonGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QMessageBox>
@@ -7,11 +6,11 @@
 #include <QDesktopServices>
 #include <QColorDialog>
 #include <QSpinBox>
-#include <QApplication>
-#include <QDesktopWidget>
 #include <QTimer>
 #include <QScreen>
+#include <QUrl>
 
+#include "gui_settings.h"
 #include "display_sleep_control.h"
 #include "qt_utils.h"
 #include "settings_dialog.h"
@@ -20,6 +19,7 @@
 #include "input_dialog.h"
 
 #include "stdafx.h"
+#include "Emu/GameInfo.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/title.h"
diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h
index b61af4604d..cfc69d9c83 100644
--- a/rpcs3/rpcs3qt/settings_dialog.h
+++ b/rpcs3/rpcs3qt/settings_dialog.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "gui_settings.h"
 #include "emu_settings.h"
 
-#include "Emu/GameInfo.h"
-
 #include <QDialog>
 #include <QLabel>
-#include <QTabWidget>
+#include <QSlider>
 
 #include <memory>
 
+class gui_settings;
+struct GameInfo;
+
 namespace Ui
 {
 	class settings_dialog;
diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 4afe5d26a7..19b536666f 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -6,6 +6,11 @@
 #include "Utilities/BEType.h"
 #include "Emu/Io/Skylander.h"
 
+#include <QLabel>
+#include <QGroupBox>
+#include <QFileDialog>
+#include <QVBoxLayout>
+
 skylander_dialog* skylander_dialog::inst = nullptr;
 
 const std::map<const u16, const std::string> list_skylanders = {
diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h
index 9df0e9abd4..cf8bdab2b2 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.h
+++ b/rpcs3/rpcs3qt/skylander_dialog.h
@@ -1,14 +1,9 @@
 #pragma once
 
 #include <QDialog>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QPushButton>
-#include <QGroupBox>
 #include <QComboBox>
 #include <QLineEdit>
-#include <QLabel>
-#include <QFileDialog>
 
 class skylander_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/syntax_highlighter.h b/rpcs3/rpcs3qt/syntax_highlighter.h
index 4cd1d36c9b..565f00607d 100644
--- a/rpcs3/rpcs3qt/syntax_highlighter.h
+++ b/rpcs3/rpcs3qt/syntax_highlighter.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QSyntaxHighlighter>
 #include <QRegularExpression>
diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
index d239e69f95..e40237e927 100644
--- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
@@ -3,18 +3,17 @@
 #include "table_item_delegate.h"
 #include "qt_utils.h"
 #include "game_list.h"
+#include "gui_settings.h"
 
 #include "stdafx.h"
 
 #include "Utilities/Log.h"
 #include "Utilities/StrUtil.h"
-#include "rpcs3/Emu/VFS.h"
+#include "Emu/VFS.h"
 #include "Emu/System.h"
-
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
 
-#include "yaml-cpp/yaml.h"
+#include "Loader/TROPUSR.h"
 
 #include <QtConcurrent>
 #include <QFutureWatcher>
@@ -23,10 +22,8 @@
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QPixmap>
-#include <QDesktopWidget>
 #include <QDir>
 #include <QMenu>
-#include <QDirIterator>
 #include <QDesktopServices>
 #include <QUrl>
 #include <QScrollBar>
diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.h b/rpcs3/rpcs3qt/trophy_manager_dialog.h
index 79b342ca15..af738c94c8 100644
--- a/rpcs3/rpcs3qt/trophy_manager_dialog.h
+++ b/rpcs3/rpcs3qt/trophy_manager_dialog.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include "stdafx.h"
-#include "rpcs3/Loader/TROPUSR.h"
-#include "gui_settings.h"
-
 #include "Utilities/rXml.h"
 
 #include <QWidget>
@@ -13,7 +9,9 @@
 #include <QTableWidget>
 #include <QSlider>
 #include <QSplitter>
-#include <QThread>
+
+class gui_settings;
+class TROPUSRLoader;
 
 struct GameTrophiesData
 {
diff --git a/rpcs3/rpcs3qt/trophy_notification_frame.cpp b/rpcs3/rpcs3qt/trophy_notification_frame.cpp
index 592202e0e6..8c1b9a5193 100644
--- a/rpcs3/rpcs3qt/trophy_notification_frame.cpp
+++ b/rpcs3/rpcs3qt/trophy_notification_frame.cpp
@@ -1,4 +1,4 @@
-#include "trophy_notification_frame.h"
+#include "trophy_notification_frame.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/rpcs3/rpcs3qt/trophy_notification_frame.h b/rpcs3/rpcs3qt/trophy_notification_frame.h
index 31b650e0ed..1b097c8ca9 100644
--- a/rpcs3/rpcs3qt/trophy_notification_frame.h
+++ b/rpcs3/rpcs3qt/trophy_notification_frame.h
@@ -1,7 +1,5 @@
-#pragma once
+#pragma once
 
-#include "stdafx.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
 
 #include <QWidget>
diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.cpp b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
index 8cff4c6dc8..b4c544135f 100644
--- a/rpcs3/rpcs3qt/trophy_notification_helper.cpp
+++ b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
@@ -1,5 +1,4 @@
 #include "trophy_notification_helper.h"
-
 #include "trophy_notification_frame.h"
 
 #include "../Emu/System.h"
diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.h b/rpcs3/rpcs3qt/trophy_notification_helper.h
index b2c7fd7ea9..09e9cfed28 100644
--- a/rpcs3/rpcs3qt/trophy_notification_helper.h
+++ b/rpcs3/rpcs3qt/trophy_notification_helper.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "stdafx.h"
-#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
 
 #include <QWindow>
diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp
index 13c5304592..fd60de58b6 100644
--- a/rpcs3/rpcs3qt/update_manager.cpp
+++ b/rpcs3/rpcs3qt/update_manager.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "update_manager.h"
+#include "progress_dialog.h"
 #include "rpcs3_version.h"
 #include "Utilities/StrUtil.h"
 #include "Crypto/sha256.h"
@@ -26,7 +27,7 @@
 #include <sys/stat.h>
 #endif
 
-LOG_CHANNEL(update_log);
+LOG_CHANNEL(update_log, "UPDATER");
 
 update_manager::update_manager()
 {
diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3qt/update_manager.h
index 0563c3837f..6ee8cd3a52 100644
--- a/rpcs3/rpcs3qt/update_manager.h
+++ b/rpcs3/rpcs3qt/update_manager.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <QtCore>
+#include "stdafx.h"
 #include <QtNetwork>
-#include "progress_dialog.h"
+
+class progress_dialog;
 
 class update_manager : public QObject
 {
diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp
index db19a9afb3..185fbc037e 100644
--- a/rpcs3/rpcs3qt/user_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp
@@ -6,16 +6,28 @@
 #include "user_manager_dialog.h"
 #include "table_item_delegate.h"
 #include "main_application.h"
+#include "gui_settings.h"
 
 #include "Emu/System.h"
 
 #include "Utilities/StrUtil.h"
+#include "Utilities/File.h"
 #include "Utilities/Log.h"
 
 #include <QRegExpValidator>
 #include <QInputDialog>
 #include <QScreen>
 #include <QKeyEvent>
+#include <QHeaderView>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QMenu>
+#include <QDesktopServices>
+#include <QMessageBox>
+#include <QGuiApplication>
+#include <QUrl>
+
+constexpr auto qstr = QString::fromStdString;
 
 LOG_CHANNEL(gui_log, "GUI");
 
diff --git a/rpcs3/rpcs3qt/user_manager_dialog.h b/rpcs3/rpcs3qt/user_manager_dialog.h
index eb4f3f4e5f..35d75f9829 100644
--- a/rpcs3/rpcs3qt/user_manager_dialog.h
+++ b/rpcs3/rpcs3qt/user_manager_dialog.h
@@ -1,23 +1,12 @@
 #pragma once
 
 #include "stdafx.h"
-#include "gui_settings.h"
-#include "emu_settings.h"
-
-#include "Utilities/File.h"
 #include "user_account.h"
 
 #include <QDialog>
 #include <QTableWidget>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QHeaderView>
-#include <QMenu>
-#include <QMessageBox>
-#include <QDesktopWidget>
-#include <QApplication>
-#include <QUrl>
-#include <QDesktopServices>
+
+class gui_settings;
 
 class user_manager_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/vfs_dialog.cpp b/rpcs3/rpcs3qt/vfs_dialog.cpp
index f0093e2f1c..19bfec779d 100644
--- a/rpcs3/rpcs3qt/vfs_dialog.cpp
+++ b/rpcs3/rpcs3qt/vfs_dialog.cpp
@@ -1,8 +1,12 @@
 #include "vfs_dialog.h"
+#include "vfs_dialog_tab.h"
+#include "gui_settings.h"
 
+#include <QTabWidget>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QMessageBox>
+#include <QVBoxLayout>
 
 #include "Emu/System.h"
 #include "Emu/system_config.h"
diff --git a/rpcs3/rpcs3qt/vfs_dialog.h b/rpcs3/rpcs3qt/vfs_dialog.h
index 9e999d3994..7afdc9d515 100644
--- a/rpcs3/rpcs3qt/vfs_dialog.h
+++ b/rpcs3/rpcs3qt/vfs_dialog.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "vfs_dialog_tab.h"
-
-#include <QTabWidget>
 #include <QDialog>
 
+class gui_settings;
+class emu_settings;
+
 class vfs_dialog : public QDialog
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
index 29005965fe..fa55520602 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
@@ -2,6 +2,7 @@
 
 #include <QFileDialog>
 #include <QCoreApplication>
+#include <QHBoxLayout>
 #include <QPushButton>
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h
index 0f851b7b9e..183e001a52 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.h
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h
@@ -6,7 +6,6 @@
 #include "gui_settings.h"
 #include "emu_settings.h"
 
-#include <QHBoxLayout>
 #include <QListWidget>
 #include <QLabel>
 
diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp
index 2471b7b372..908105c752 100644
--- a/rpcs3/rpcs3qt/welcome_dialog.cpp
+++ b/rpcs3/rpcs3qt/welcome_dialog.cpp
@@ -5,9 +5,6 @@
 
 #include <QPushButton>
 #include <QCheckBox>
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 
 welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::welcome_dialog)
 {
diff --git a/rpcs3/rpcs3qt/welcome_dialog.h b/rpcs3/rpcs3qt/welcome_dialog.h
index 839b943ce8..e22b0cbcbe 100644
--- a/rpcs3/rpcs3qt/welcome_dialog.h
+++ b/rpcs3/rpcs3qt/welcome_dialog.h
@@ -1,8 +1,6 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
-#include <QKeyEvent>
-#include <QCloseEvent>
 
 namespace Ui
 {