diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c
index a3209a810a..dd6a4d9df9 100644
--- a/menu/widgets/menu_widgets.c
+++ b/menu/widgets/menu_widgets.c
@@ -15,8 +15,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <retro_miscellaneous.h>
+
+#include <lists/file_list.h>
+#include <queues/fifo_queue.h>
+#include <file/file_path.h>
+#include <streams/file_stream.h>
+#include <string/stdstring.h>
+
 #include "menu_widgets.h"
 
+#ifdef HAVE_ACCESSIBILITY
+#include "../../accessibility.h"
+#endif
+
 #include "../../verbosity.h"
 #include "../../retroarch.h"
 #include "../../configuration.h"
@@ -30,14 +42,6 @@
 
 #include "../../gfx/font_driver.h"
 
-#include <lists/file_list.h>
-#include <queues/fifo_queue.h>
-#include <file/file_path.h>
-#include <streams/file_stream.h>
-#include <formats/image.h>
-#include <string/stdstring.h>
-#include <retro_miscellaneous.h>
-
 #ifndef PI
 #define PI 3.14159265359f
 #endif
@@ -1341,14 +1345,14 @@ static void menu_widgets_draw_load_content_animation(video_frame_info_t *video_i
    menu_widgets_draw_backdrop(video_info, load_content_animation_final_fade_alpha);
 }
 
-
-void menu_widgets_frame(video_frame_info_t *video_info)
+void menu_widgets_frame(void *data)
 {
    size_t i;
-   int top_right_x_advance = video_info->width;
-   int scissor_me_timbers  = 0;
-   settings_t *settings    = config_get_ptr();
-   float video_font_size   = settings->floats.video_font_size;
+   video_frame_info_t *video_info = (video_frame_info_t*)data;
+   int top_right_x_advance        = video_info->width;
+   int scissor_me_timbers         = 0;
+   settings_t *settings           = config_get_ptr();
+   float video_font_size          = settings->floats.video_font_size;
 
    menu_widgets_frame_count++;
 
diff --git a/menu/widgets/menu_widgets.h b/menu/widgets/menu_widgets.h
index 453efa100f..287bd21cdc 100644
--- a/menu/widgets/menu_widgets.h
+++ b/menu/widgets/menu_widgets.h
@@ -16,11 +16,10 @@
 #ifndef _MENU_WIDGETS_H
 #define _MENU_WIDGETS_H
 
+#include <formats/image.h>
 #include <queues/task_queue.h>
 #include <queues/message_queue.h>
 
-#include "../../retroarch.h"
-
 #define DEFAULT_BACKDROP               0.75f
 
 #define MSG_QUEUE_PENDING_MAX          32
@@ -60,11 +59,13 @@ int menu_widgets_ai_service_overlay_get_state(void);
 bool menu_widgets_ai_service_overlay_set_state(int state);
 
 bool menu_widgets_ai_service_overlay_load(
-        char* buffer, unsigned buffer_len, enum image_type_enum image_type);
+        char* buffer, unsigned buffer_len,
+        enum image_type_enum image_type);
+
 void menu_widgets_ai_service_overlay_unload(void);
 
-
-void menu_widgets_start_load_content_animation(const char *content_name, bool remove_extension);
+void menu_widgets_start_load_content_animation(
+      const char *content_name, bool remove_extension);
 
 void menu_widgets_cleanup_load_content_animation(void);
 
@@ -84,7 +85,7 @@ void menu_widgets_set_libretro_message(const char *message, unsigned duration);
 /* All the functions below should be called in
  * the video driver - once they are all added, set
  * enable_menu_widgets to true for that driver */
-void menu_widgets_frame(video_frame_info_t *video_info);
+void menu_widgets_frame(void *data);
 
 bool menu_widgets_set_fps_text(const char *new_fps_text);