diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 386ac78a2b..6bd3623249 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -16,6 +16,7 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
+#include "../menu_animation.h"
 #include "../menu_cbs.h"
 #include "../menu_shader.h"
 #include "../menu_hash.h"
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 3d827f526f..9efbd1d48a 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -27,6 +27,7 @@
 
 #include "../menu.h"
 #include "../menu_driver.h"
+#include "../menu_animation.h"
 #include "../menu_hash.h"
 #include "../menu_display.h"
 #include "../menu_video.h"
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 1a81b2fd75..07bff113e6 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -27,7 +27,9 @@
 #include <retro_inline.h>
 
 #include "../../general.h"
+
 #include "../menu.h"
+#include "../menu_animation.h"
 #include "../menu_display.h"
 #include "../menu_hash.h"
 #include "../menu_video.h"
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 225feb1150..8b90a4530a 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -19,7 +19,7 @@
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 
-#include "menu_display.h"
+#include "menu_animation.h"
 #include "../configuration.h"
 #include "../performance.h"
 
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 3ad29b86d0..a681794af6 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -23,6 +23,7 @@
 #include "../gfx/video_thread_wrapper.h"
 
 #include "menu.h"
+#include "menu_animation.h"
 #include "menu_display.h"
 
 typedef struct menu_framebuf
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 53261945c9..c1c2916048 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <boolean.h>
 #include <retro_miscellaneous.h>
-#include "menu_animation.h"
 #include "menu_displaylist.h"
 #include "menu_entries.h"
 #include "menu_list.h"
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 65276d73a4..dc92a6019a 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -25,6 +25,7 @@
 
 #include "menu_input.h"
 #include "menu.h"
+#include "menu_animation.h"
 #include "menu_display.h"
 #include "menu_entry.h"
 #include "menu_setting.h"
diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c
index 79adfa86a3..36dbf55499 100644
--- a/menu/menu_iterate.c
+++ b/menu/menu_iterate.c
@@ -18,6 +18,7 @@
 #include <retro_inline.h>
 
 #include "menu.h"
+#include "menu_animation.h"
 #include "menu_display.h"
 #include "menu_hash.h"
 #include "menu_setting.h"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 5daa832b56..ee9facb17e 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -29,6 +29,7 @@
 #include "menu_setting.h"
 
 #include "menu.h"
+#include "menu_animation.h"
 #include "menu_display.h"
 #include "menu_input.h"
 #include "menu_hash.h"