diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 052a9b8306..19c9fbf60e 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -27,6 +27,7 @@
 #include "menu_shader.h"
 
 #include "../content.h"
+#include "../configuration.h"
 #include "../dynamic.h"
 #include "../core_info.h"
 #include "../retroarch.h"
@@ -36,6 +37,7 @@
 #include "../list_special.h"
 #include "../tasks/tasks_internal.h"
 #include "../ui/ui_companion_driver.h"
+#include "../runloop.h"
 #include "../verbosity.h"
 
 static const menu_ctx_driver_t *menu_ctx_drivers[] = {
diff --git a/runloop.h b/runloop.h
index 9ab66a5549..c4cfc07143 100644
--- a/runloop.h
+++ b/runloop.h
@@ -127,8 +127,6 @@ enum runloop_ctl_state
    RUNLOOP_CTL_SYSTEM_INFO_FREE
 };
 
-typedef int (*transfer_cb_t)(void *data, size_t len);
-
 typedef struct rarch_dir_list rarch_dir_list_t;
 
 typedef struct rarch_dir
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 67524c80b0..b878760fa1 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -31,6 +31,7 @@
 #include "../list_special.h"
 #include "../msg_hash.h"
 #include "../playlist.h"
+#include "../runloop.h"
 #include "../verbosity.h"
 
 #define CB_DB_SCAN_FILE                0x70ce56d2U
diff --git a/tasks/task_save_state.c b/tasks/task_save_state.c
index 73f47e941f..b94fddadb7 100644
--- a/tasks/task_save_state.c
+++ b/tasks/task_save_state.c
@@ -31,7 +31,9 @@
 #include <file/file_path.h>
 
 #include "../core.h"
+#include "../configuration.h"
 #include "../msg_hash.h"
+#include "../runloop.h"
 #include "../verbosity.h"
 #include "tasks_internal.h"
 
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 4f4d3a9adc..15a458e0c1 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -23,13 +23,15 @@
 
 #include <queues/message_queue.h>
 #include <queues/task_queue.h>
+#include <formats/image.h>
 
 #include "../content.h"
 #include "../core_type.h"
-#include "../runloop.h"
 
 RETRO_BEGIN_DECLS
 
+typedef int (*transfer_cb_t)(void *data, size_t len);
+
 enum content_mode_load
 {
    CONTENT_MODE_LOAD_NONE = 0,
@@ -75,6 +77,7 @@ typedef struct nbio_handle
    unsigned status;
 } nbio_handle_t;
 
+
 #ifdef HAVE_NETWORKING
 void *task_push_http_transfer(const char *url, bool mute, const char *type,
       retro_task_callback_t cb, void *userdata);