diff --git a/dynamic.c b/dynamic.c
index 58acbe649a..b5d43fff5f 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -50,8 +50,8 @@
 #include "cheevos.h"
 #endif
 #include "retroarch.h"
+#include "runloop.h"
 #include "configuration.h"
-#include "general.h"
 #include "msg_hash.h"
 #include "verbosity.h"
 
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index dd2927e8b5..b5d231cc37 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -50,7 +50,6 @@
 #include "../frontend.h"
 #include "../frontend_driver.h"
 #include "../../defaults.h"
-#include "../../general.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "platform_linux.h"
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index a3fa2b4f58..3004bfbf9a 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -14,7 +14,6 @@
  */
 
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../runloop.h"
 #include "../../frontend/frontend_driver.h"
 #include "../common/vulkan_common.h"
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 6209162a95..3d5ee9cf68 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -25,7 +25,6 @@
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 
-#include "../general.h"
 #include "../msg_hash.h"
 #include "../verbosity.h"
 #include "video_shader_parse.h"
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 432128a9b7..b30823c948 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -28,7 +28,7 @@
 #include "../../cores/internal_cores.h"
 
 #include "../../core_info.h"
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../../system.h"
 #include "../../verbosity.h"
 
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 917be53776..b627bdbeba 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -14,6 +14,7 @@
  */
 
 #include <file/file_path.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
 
@@ -27,11 +28,12 @@
 #include "../../input/input_config.h"
 
 #include "../../core_info.h"
+#include "../../configuration.h"
 #include "../../file_path_special.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
-#include "../../general.h"
 #include "../../performance_counters.h"
+#include "../../runloop.h"
 #include "../../system.h"
 #include "../../intl/intl.h"
 
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 8ae664ade7..f23360ced1 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
@@ -28,8 +29,8 @@
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../system.h"
 
 #ifndef BIND_ACTION_LEFT
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 8d39517483..dd4caa6b9c 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <retro_assert.h>
 #include <retro_stat.h>
@@ -28,15 +29,17 @@
 #include "../menu_navigation.h"
 #include "../menu_content.h"
 
+#include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../defaults.h"
 #include "../../managers/cheat_manager.h"
-#include "../../general.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../input/input_remapping.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../system.h"
+#include "../../verbosity.h"
 #include "../../lakka.h"
 
 typedef struct
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index de64d0a140..71d4dbb884 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <lists/string_list.h>
 #include <string/stdstring.h>
@@ -25,11 +26,12 @@
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
 
+#include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../system.h"
 #include "../../ui/ui_companion_driver.h"
 
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 89580b7d69..c09e2fb84d 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/file_path.h>
 #include <lists/string_list.h>
 
@@ -26,8 +27,8 @@
 #include "../../core_info.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../system.h"
 #include "../../performance_counters.h"
 
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 054bf4ed14..8ed867aed5 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -22,8 +22,6 @@
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
 
-#include "../../general.h"
-
 #ifndef BIND_ACTION_GET_TITLE
 #define BIND_ACTION_GET_TITLE(cbs, name) \
    cbs->action_get_title = name; \
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 46943c8717..f17dcd6c75 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <compat/strl.h>
 #include <features/features_cpu.h>
 #include <string/stdstring.h>
 
@@ -39,9 +40,9 @@
 #include "menu_shader.h"
 #include "menu_navigation.h"
 
-#include "../general.h"
 #include "../managers/cheat_manager.h"
 #include "../performance_counters.h"
+#include "../configuration.h"
 #include "../core.h"
 #include "../input/input_joypad_driver.h"
 #include "../input/input_remapping.h"
diff --git a/performance_counters.c b/performance_counters.c
index a589a45411..dda97c3f09 100644
--- a/performance_counters.c
+++ b/performance_counters.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #endif
 
+#include <compat/strl.h>
 #include <features/features_cpu.h>
 
 #include "performance_counters.h"
 
-#include "general.h"
-#include "compat/strl.h"
+#include "runloop.h"
 #include "verbosity.h"
 
 #ifdef _WIN32