diff --git a/menu/menu.h b/menu/menu.h
index 4be29ee518..0557603f59 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include <boolean.h>
 #include "../../general.h"
-#include "menu_navigation.h"
 #include "menu_input.h"
 
 #ifndef GFX_MAX_SHADERS
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 3ba7533da3..6cec1126b7 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -16,6 +16,7 @@
 
 #include "menu_entries.h"
 #include "menu_action.h"
+#include "menu_navigation.h"
 #include <file/file_list.h>
 #include <file/file_path.h>
 #include "../file_extract.h"
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 72b580aa61..ea4f779856 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -20,6 +20,7 @@
 #include "menu_input.h"
 #include "menu_entries.h"
 #include "menu_shader.h"
+#include "menu_navigation.h"
 
 #include "../file_ext.h"
 #include "../file_extract.h"
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 2c1af75020..94abbdc3ed 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -26,6 +26,7 @@
 #include "menu.h"
 #include "menu_action.h"
 #include "menu_shader.h"
+#include "menu_navigation.h"
 #include "../cheats.h"
 #include "../performance.h"
 #include "../settings_data.h"