diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index dab55da49e..0152700fbf 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -18,6 +18,7 @@
 #include <emscripten/emscripten.h>
 
 #include <file/config_file.h>
+#include <queues/task_queue.h>
 
 #include "../../defaults.h"
 #include "../../general.h"
@@ -34,7 +35,7 @@ static void emscripten_mainloop(void)
    int ret = runloop_iterate(&sleep_ms);
    if (ret == 1 && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   runloop_iterate_data();
+   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
    if (ret != -1)
       return;
 
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index c58810f587..fd1e37552e 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -43,6 +43,7 @@
 #include <file/file_path.h>
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
+#include <queues/task_queue.h>
 
 #include "../frontend.h"
 #include "../frontend_driver.h"
@@ -368,7 +369,7 @@ static void android_app_entry(void *data)
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      runloop_iterate_data();
+      task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
    }while (ret != -1);
 
    main_exit(data);
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 3e15d1ab90..781f3de26b 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -17,6 +17,7 @@
 
 #include <file/file_path.h>
 #include <retro_stat.h>
+#include <queues/task_queue.h>
 
 #ifdef HAVE_THREADS
 #include <rthreads/async_job.h>
@@ -173,7 +174,7 @@ int rarch_main(int argc, char *argv[], void *data)
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      runloop_iterate_data();
+      task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
    }while(ret != -1);
 
    main_exit(args);
diff --git a/libretro-common/include/queues/task_queue.h b/libretro-common/include/queues/task_queue.h
index a265f3d00f..4b438acbb0 100644
--- a/libretro-common/include/queues/task_queue.h
+++ b/libretro-common/include/queues/task_queue.h
@@ -24,8 +24,10 @@
 #define __LIBRETRO_SDK_TASK_QUEUE_H__
 
 #include <stdint.h>
+#include <stddef.h>
 #include <boolean.h>
 
+#include <retro_common.h>
 #include <retro_common_api.h>
 
 RETRO_BEGIN_DECLS
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 9893791782..8d41119d07 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <queues/task_queue.h>
+
 #include "../menu_driver.h"
 #include "../menu_entry.h"
 #include "../menu_cbs.h"
@@ -78,7 +80,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
    if (action != MENU_ACTION_NOOP)
        ret = menu_entry_action(&entry, idx, action);
 
-   runloop_iterate_data();
+   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
     
    return ret;
 }
diff --git a/runloop.c b/runloop.c
index f7decb0e7a..ae60585631 100644
--- a/runloop.c
+++ b/runloop.c
@@ -722,11 +722,6 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader
    return true;
 }
 
-void runloop_iterate_data(void)
-{
-   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
-}
-
 static bool runloop_is_frame_count_end(void)
 {
    uint64_t *frame_count =
diff --git a/runloop.h b/runloop.h
index b9ac9b0c80..fa5021333e 100644
--- a/runloop.h
+++ b/runloop.h
@@ -305,8 +305,6 @@ global_t *global_get_ptr(void);
  **/
 int runloop_iterate(unsigned *sleep_ms);
 
-void runloop_iterate_data(void);
-
 void runloop_msg_queue_push(const char *msg, unsigned prio,
       unsigned duration, bool flush);
 
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index f91ff1872d..c217912c7b 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -21,6 +21,7 @@
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
+#include <queues/task_queue.h>
 
 #include "cocoa_common.h"
 #include "../../../input/input_config.h"
@@ -755,7 +756,7 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 - (void)menuSelect: (uint32_t) i
 {
    menu_entry_select(i);
-   runloop_iterate_data();
+   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
 }
 
 - (void)menuBack
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index dd339a3342..a1ab5c5167 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -23,6 +23,7 @@
 #include <boolean.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
+#include <queues/task_queue.h>
 
 #include "cocoa/cocoa_common.h"
 #include "../ui_companion_driver.h"
@@ -231,7 +232,7 @@ static void poll_iteration(void)
        ret = runloop_iterate(&sleep_ms);
        if (ret == 1 && sleep_ms > 0)
           retro_sleep(sleep_ms);
-       runloop_iterate_data();
+       task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
        while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
     }
     
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index aae07ab0e0..663d63764e 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -21,6 +21,7 @@
 #include <boolean.h>
 
 #include <file/file_path.h>
+#include <queues/task_queue.h>
 
 #include "cocoa/cocoa_common.h"
 #include "../ui_companion_driver.h"
@@ -87,7 +88,7 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
 
    if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   runloop_iterate_data();
+   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
 
    if (ret == -1)
    {