diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 78a608460d..2fd42e3e0c 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -28,12 +28,13 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <encodings/utf.h>
+#include <file/config_file.h>
 #include <file/file_path.h>
 #include <formats/image.h>
 
 #include <retro_inline.h>
-#include <string/stdstring.h>
-#include <encodings/utf.h>
+#include <gfx/scaler/scaler.h>
+#include <features/features_cpu.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -43,7 +44,6 @@
 #include "../../gfx/gfx_widgets.h"
 #endif
 
-#include "../../playlist.h"
 #include "../../frontend/frontend_driver.h"
 
 #include "../menu_driver.h"
@@ -54,10 +54,6 @@
 #include "../../configuration.h"
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
-#include <file/config_file.h>
-#include <gfx/scaler/scaler.h>
-#include <features/features_cpu.h>
-
 /* Thumbnail additions */
 #include "../../gfx/gfx_thumbnail_path.h"
 #include "../../tasks/tasks_internal.h"
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ea87a34ddb..58c88ab809 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -41,7 +41,6 @@
 
 #include "../menu_driver.h"
 #include "../menu_entries.h"
-#include "../menu_input.h"
 
 #include "../../gfx/gfx_animation.h"
 #include "../../gfx/gfx_thumbnail_path.h"
@@ -53,9 +52,7 @@
 #include "../../input/input_osk.h"
 
 #include "../../verbosity.h"
-#include "../../dynamic.h"
 #include "../../configuration.h"
-#include "../../playlist.h"
 
 #include "../../tasks/tasks_internal.h"