diff --git a/menu/menu_display.c b/menu/menu_display.c
index a1bd8a92e9..bbb718749a 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -25,6 +25,7 @@
 #include "../retroarch.h"
 #include "../configuration.h"
 #include "../runloop.h"
+#include "../libretro_version_1.h"
 #include "../gfx/video_thread_wrapper.h"
 #include "../verbosity.h"
 
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 573f33b681..9be503933b 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -23,9 +23,7 @@
 #include <gfx/math/matrix_4x4.h>
 
 #include "../gfx/video_context_driver.h"
-#include "../gfx/font_driver.h"
 #include "../gfx/video_coord_array.h"
-#include "../libretro_version_1.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f6b316aaac..c57720f970 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -42,6 +42,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../system.h"
+#include "../libretro_version_1.h"
 #include "../dynamic.h"
 #include "../camera/camera_driver.h"
 #include "../location/location_driver.h"