diff --git a/runloop.c b/runloop.c
index 85b06dc982..323d80b68a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -56,7 +56,6 @@
 #endif
 
 #include "autosave.h"
-#include "core_info.h"
 #include "configuration.h"
 #include "driver.h"
 #include "movie.h"
@@ -134,34 +133,6 @@ global_t *global_get_ptr(void)
    return &g_extern;
 }
 
-void update_firmware_status(void)
-{
-   char s[PATH_MAX_LENGTH];
-   core_info_ctx_firmware_t firmware_info;
-
-   core_info_t *core_info     = NULL;
-   settings_t *settings       = config_get_ptr();
-
-   core_info_get_current_core(&core_info);
-
-   if (!core_info || !settings)
-      return;
-
-   firmware_info.path         = core_info->path;
-   if (!string_is_empty(settings->directory.system))
-      firmware_info.directory.system = settings->directory.system;
-   else
-   {
-      strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
-      path_basedir(s);
-      firmware_info.directory.system = s;
-   }
-
-   RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path, 
-         firmware_info.directory.system);
-   core_info_list_update_missing_firmware(&firmware_info);
-}
-
 void runloop_msg_queue_push(const char *msg,
       unsigned prio, unsigned duration,
       bool flush)
diff --git a/runloop.h b/runloop.h
index 393e56c610..50bb57b4b8 100644
--- a/runloop.h
+++ b/runloop.h
@@ -223,8 +223,6 @@ char* runloop_msg_queue_pull(void);
 
 bool runloop_ctl(enum runloop_ctl_state state, void *data);
 
-void update_firmware_status();
-
 RETRO_END_DECLS
 
 #endif
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 9dad03364d..94e31c3db7 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -73,6 +73,7 @@
 #include "tasks_internal.h"
 
 #include "../command.h"
+#include "../core_info.h"
 #include "../content.h"
 #include "../configuration.h"
 #include "../defaults.h"
@@ -1027,6 +1028,34 @@ static bool command_event_cmd_exec(const char *data,
    return true;
 }
 
+static void update_firmware_status(void)
+{
+   char s[PATH_MAX_LENGTH];
+   core_info_ctx_firmware_t firmware_info;
+
+   core_info_t *core_info     = NULL;
+   settings_t *settings       = config_get_ptr();
+
+   core_info_get_current_core(&core_info);
+
+   if (!core_info || !settings)
+      return;
+
+   firmware_info.path         = core_info->path;
+   if (!string_is_empty(settings->directory.system))
+      firmware_info.directory.system = settings->directory.system;
+   else
+   {
+      strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
+      path_basedir(s);
+      firmware_info.directory.system = s;
+   }
+
+   RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path, 
+         firmware_info.directory.system);
+   core_info_list_update_missing_firmware(&firmware_info);
+}
+
 bool task_push_content_load_default(
       const char *core_path,
       const char *fullpath,