diff --git a/menu/menu.c b/menu/menu.c
index 33705a92d0..d1862777ee 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -22,12 +22,8 @@
 #include "menu_entry.h"
 #include "menu_shader.h"
 
-#include "../dynamic.h"
 #include "../general.h"
 #include "../frontend/frontend.h"
-#include "../retroarch.h"
-#include "../performance.h"
-#include "../runloop_data.h"
 
 static void menu_environment_get(int *argc, char *argv[],
       void *args, void *params_data)
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 609c5188b4..346b1ce674 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -22,7 +22,6 @@
 #include "menu_display.h"
 #include "menu_animation.h"
 #include "../configuration.h"
-#include "../runloop.h"
 #include "../performance.h"
 
 menu_animation_t *menu_animation_get_ptr(void)
diff --git a/menu/menu_display.c b/menu/menu_display.c
index af3d4348c4..581cf2eceb 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -17,13 +17,9 @@
 
 #include "menu.h"
 #include "menu_display.h"
-#include "menu_animation.h"
-#include "../dynamic.h"
-#include "../../retroarch.h"
 #include "../../config.def.h"
 #include "../gfx/video_context_driver.h"
 #include "../gfx/video_thread_wrapper.h"
-#include "menu_list.h"
 
 menu_display_t *menu_display_get_ptr(void)
 {
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 6995a0eb38..4f5264940f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -24,7 +24,6 @@
 #include "menu_hash.h"
 #include "menu_display.h"
 #include "menu_displaylist.h"
-#include "menu_navigation.h"
 #include "menu_setting.h"
 
 #ifdef HAVE_LIBRETRODB
@@ -32,11 +31,9 @@
 #endif
 
 #include "../general.h"
-#include "../retroarch.h"
 #include "../gfx/video_shader_driver.h"
 #include "../config.features.h"
 #include "../git_version.h"
-#include "../performance.h"
 
 #ifdef ANDROID
 #include "../frontend/drivers/platform_android.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 301a7b8853..d3744d61f4 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -23,7 +23,6 @@
 #include "menu_displaylist.h"
 #include "menu_video.h"
 #include "../driver.h"
-#include "../general.h"
 
 static bool menu_alive = false;
 
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index a3980d35be..292cea5d14 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -17,12 +17,7 @@
 #include <string/string_list.h>
 
 #include "menu.h"
-#include "menu_display.h"
 #include "menu_entry.h"
-#include "menu_navigation.h"
-#include "menu_setting.h"
-#include "menu_input.h"
-#include "../runloop_data.h"
 
 /* This file provides an abstraction of the currently displayed
  * menu.
diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c
index f75b93507d..3813b33e86 100644
--- a/menu/menu_iterate.c
+++ b/menu/menu_iterate.c
@@ -18,18 +18,11 @@
 #include <retro_inline.h>
 
 #include "menu.h"
-#include "menu_cbs.h"
-#include "menu_display.h"
 #include "menu_hash.h"
-#include "menu_entry.h"
 #include "menu_setting.h"
-#include "menu_input.h"
-#include "menu_shader.h"
 #include "menu_navigation.h"
 
 #include "../general.h"
-#include "../performance.h"
-#include "../retroarch.h"
 #include "../input/input_common.h"
 #include "../input/input_autodetect.h"
 
diff --git a/menu/menu_list.c b/menu/menu_list.c
index 47dd088fc0..7c70bee9a9 100644
--- a/menu/menu_list.c
+++ b/menu/menu_list.c
@@ -18,12 +18,9 @@
 
 #include <retro_inline.h>
 
-#include "../driver.h"
 #include "menu.h"
 #include "menu_cbs.h"
-#include "menu_hash.h"
 #include "menu_list.h"
-#include "menu_navigation.h"
 
 size_t menu_list_get_size(menu_list_t *list)
 {
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
index b3ff0dbafa..0fc36bc491 100644
--- a/menu/menu_navigation.c
+++ b/menu/menu_navigation.c
@@ -25,7 +25,6 @@
 
 #include "menu_displaylist.h"
 #include "menu_navigation.h"
-#include "menu_entries.h"
 
 #include "../configuration.h"
 
diff --git a/menu/menu_video.c b/menu/menu_video.c
index 65195e4a95..f10069e685 100644
--- a/menu/menu_video.c
+++ b/menu/menu_video.c
@@ -15,12 +15,8 @@
 
 #include <retro_miscellaneous.h>
 
-#include "menu_display.h"
-#include "menu_hash.h"
-#include "menu_setting.h"
 #include "menu_video.h"
 
-#include "../gfx/video_common.h"
 #ifdef HAVE_THREADS
 #include "../gfx/video_thread_wrapper.h"
 #endif