diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
index df8433dd56..1938404c36 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "overlay_home_menu.h"
 #include "../overlay_manager.h"
-#include "Emu/RSX/RSXThread.h"
+#include "Emu/system_config.h"
 #include "Utilities/date_time.h"
 
 namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
index 82643818f6..5724050808 100644
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "../overlay_manager.h"
 #include "overlay_recvmessage_dialog.h"
-#include "Emu/RSX/RSXThread.h"
+#include "Emu/System.h"
 #include "Emu/NP/rpcn_client.h"
 #include "Utilities/Thread.h"
 
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
index 781f7fc0b9..ce40b71a67 100644
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "../overlay_manager.h"
 #include "overlay_sendmessage_dialog.h"
-#include "Emu/RSX/RSXThread.h"
+#include "Emu/System.h"
 #include "Emu/NP/rpcn_client.h"
 #include "Utilities/Thread.h"
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp b/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp
index 5be81508d0..e4860ec9c4 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp
@@ -2,8 +2,6 @@
 #include "overlay_cursor.h"
 #include "overlay_manager.h"
 
-#include "Emu/RSX/RSXThread.h"
-
 namespace rsx
 {
 	namespace overlays
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp
index 99357c4421..a9d0af6c9f 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "overlay_message.h"
-#include "Emu/RSX/RSXThread.h"
+#include "Emu/RSX/Common/time.hpp"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index eccd3b1ed1..6b4f2c1fc6 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -6,7 +6,6 @@
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/IdManager.h"
 #include "Utilities/Thread.h"
-#include "Emu/RSX/RSXThread.h"
 
 #include <thread>
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
index fe04881d22..884ef433dc 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
@@ -1,10 +1,11 @@
 #include "stdafx.h"
 #include "overlay_manager.h"
 #include "overlay_osk.h"
-#include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/Modules/cellSysutil.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 #include "Emu/Cell/Modules/cellKb.h"
+#include "Emu/System.h"
+#include "Emu/system_config.h"
 
 LOG_CHANNEL(osk, "OSK");
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
index 2c4c488dad..afeca45e97 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
@@ -2,7 +2,6 @@
 #include "overlay_save_dialog.h"
 #include "Utilities/date_time.h"
 #include "Emu/System.h"
-#include "Emu/RSX/RSXThread.h"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
index ee592cc8e4..664187ab55 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "overlay_trophy_notification.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/RSX/RSXThread.h"
+#include "Emu/System.h"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
index e31fdd210f..b65f2bdb9b 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
@@ -4,7 +4,6 @@
 #include "Emu/vfs_config.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/System.h"
-#include "Emu/RSX/RSXThread.h"
 #include "Utilities/StrUtil.h"
 #include "Utilities/Thread.h"