diff --git a/menu/cbs/menu_entries_cbs_cancel.c b/menu/cbs/menu_entries_cbs_cancel.c
index 2a29fd9580..a1cb9a9b55 100644
--- a/menu/cbs/menu_entries_cbs_cancel.c
+++ b/menu/cbs/menu_entries_cbs_cancel.c
@@ -15,9 +15,7 @@
 
 #include <file/file_path.h>
 #include "../menu.h"
-#include "../menu_entries.h"
 #include "../menu_entry.h"
-#include "../menu_setting.h"
 
 static int action_cancel_pop_default(const char *path,
       const char *label, unsigned type, size_t idx)
diff --git a/menu/cbs/menu_entries_cbs_deferred_push.c b/menu/cbs/menu_entries_cbs_deferred_push.c
index d3869228a0..7eae686f7f 100644
--- a/menu/cbs/menu_entries_cbs_deferred_push.c
+++ b/menu/cbs/menu_entries_cbs_deferred_push.c
@@ -17,8 +17,6 @@
 
 #include "../menu.h"
 #include "../menu_displaylist.h"
-#include "../menu_entries.h"
-#include "../menu_setting.h"
 
 #include "../../file_ext.h"
 
diff --git a/menu/cbs/menu_entries_cbs_down.c b/menu/cbs/menu_entries_cbs_down.c
index f2a3cd9f4e..fa4b604571 100644
--- a/menu/cbs/menu_entries_cbs_down.c
+++ b/menu/cbs/menu_entries_cbs_down.c
@@ -21,15 +21,16 @@ static int action_bind_down_generic(unsigned type, const char *label)
 {
    unsigned scroll_speed  = 0;
    menu_handle_t *menu    = menu_driver_get_ptr();
-   if (!menu)
+   menu_navigation_t *nav = menu_navigation_get_ptr();
+   if (!menu || !nav)
       return -1;
 
-   scroll_speed = (max(menu->navigation.scroll.acceleration, 2) - 2) / 4 + 1;
+   scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
 
    if (menu_list_get_size(menu->menu_list) <= 0)
       return 0;
 
-   menu_navigation_increment(&menu->navigation, scroll_speed);
+   menu_navigation_increment(nav, scroll_speed);
 
    return 0;
 }
diff --git a/menu/cbs/menu_entries_cbs_get_value.c b/menu/cbs/menu_entries_cbs_get_value.c
index 528803108f..fe0cf39e86 100644
--- a/menu/cbs/menu_entries_cbs_get_value.c
+++ b/menu/cbs/menu_entries_cbs_get_value.c
@@ -19,7 +19,6 @@
 #include "../menu.h"
 #include "../menu_entries.h"
 #include "../menu_shader.h"
-#include "../menu_setting.h"
 
 #include "../../performance.h"
 #include "../../intl/intl.h"
diff --git a/menu/cbs/menu_entries_cbs_info.c b/menu/cbs/menu_entries_cbs_info.c
index e65dca0739..4d7196decd 100644
--- a/menu/cbs/menu_entries_cbs_info.c
+++ b/menu/cbs/menu_entries_cbs_info.c
@@ -14,7 +14,6 @@
  */
 
 #include "../menu.h"
-#include "../menu_entries.h"
 
 static int action_info_default(unsigned type, const char *label)
 {
diff --git a/menu/cbs/menu_entries_cbs_iterate.c b/menu/cbs/menu_entries_cbs_iterate.c
index 401fc3296b..8430f32e02 100644
--- a/menu/cbs/menu_entries_cbs_iterate.c
+++ b/menu/cbs/menu_entries_cbs_iterate.c
@@ -20,7 +20,6 @@
 #include "../menu.h"
 #include "../menu_display.h"
 #include "../menu_entry.h"
-#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_input.h"
 #include "../menu_shader.h"
diff --git a/menu/cbs/menu_entries_cbs_left.c b/menu/cbs/menu_entries_cbs_left.c
index a02f08feb2..b9f88875e1 100644
--- a/menu/cbs/menu_entries_cbs_left.c
+++ b/menu/cbs/menu_entries_cbs_left.c
@@ -16,7 +16,6 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
@@ -136,6 +135,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
    unsigned        push_list = 0;
    menu_list_t    *menu_list = menu_list_get_ptr();
    menu_handle_t       *menu = menu_driver_get_ptr();
+   menu_navigation_t   *nav  = menu_navigation_get_ptr();
    unsigned           action = MENU_ACTION_LEFT;
    size_t          list_size = menu_driver_list_get_size(MENU_LIST_PLAIN);
    if (!menu)
@@ -143,7 +143,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
 
    if (list_size == 1)
    {
-      menu->navigation.selection_ptr = 0;
+      nav->selection_ptr = 0;
       if (menu->categories.selection_ptr != 0)
          push_list = 1;
    }
@@ -151,7 +151,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
       push_list = 2;
 
    cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf,
-         menu->navigation.selection_ptr);
+         nav->selection_ptr);
 
    switch (push_list)
    {
diff --git a/menu/cbs/menu_entries_cbs_ok.c b/menu/cbs/menu_entries_cbs_ok.c
index 4f80c67f34..83ec33a880 100644
--- a/menu/cbs/menu_entries_cbs_ok.c
+++ b/menu/cbs/menu_entries_cbs_ok.c
@@ -18,7 +18,6 @@
 
 #include "../menu.h"
 #include "../menu_display.h"
-#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_entry.h"
 #include "../menu_shader.h"
diff --git a/menu/cbs/menu_entries_cbs_refresh.c b/menu/cbs/menu_entries_cbs_refresh.c
index 42828c0509..bbc1f93ab3 100644
--- a/menu/cbs/menu_entries_cbs_refresh.c
+++ b/menu/cbs/menu_entries_cbs_refresh.c
@@ -15,7 +15,6 @@
 
 #include "../menu.h"
 #include "../menu_displaylist.h"
-#include "../menu_entries.h"
 
 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 {
diff --git a/menu/cbs/menu_entries_cbs_right.c b/menu/cbs/menu_entries_cbs_right.c
index d4ccc80a6b..dde4f394a8 100644
--- a/menu/cbs/menu_entries_cbs_right.c
+++ b/menu/cbs/menu_entries_cbs_right.c
@@ -16,7 +16,6 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
diff --git a/menu/cbs/menu_entries_cbs_scan.c b/menu/cbs/menu_entries_cbs_scan.c
index 089c8da8f1..5db4fc8914 100644
--- a/menu/cbs/menu_entries_cbs_scan.c
+++ b/menu/cbs/menu_entries_cbs_scan.c
@@ -15,7 +15,6 @@
 
 #include <file/file_path.h>
 #include "../menu.h"
-#include "../menu_entries.h"
 #include "../menu_entry.h"
 #include "../menu_setting.h"
 
diff --git a/menu/cbs/menu_entries_cbs_title.c b/menu/cbs/menu_entries_cbs_title.c
index 9a03b7c600..9bfbffe66e 100644
--- a/menu/cbs/menu_entries_cbs_title.c
+++ b/menu/cbs/menu_entries_cbs_title.c
@@ -18,7 +18,6 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries.h"
 
 static INLINE void replace_chars(char *str, char c1, char c2)
 {
diff --git a/menu/cbs/menu_entries_cbs_up.c b/menu/cbs/menu_entries_cbs_up.c
index 652a10ac9c..13f75c4492 100644
--- a/menu/cbs/menu_entries_cbs_up.c
+++ b/menu/cbs/menu_entries_cbs_up.c
@@ -15,21 +15,21 @@
 
 #include "../menu.h"
 #include "../menu_navigation.h"
-#include "../menu_entries.h"
 
 static int action_bind_up_generic(unsigned type, const char *label)
 {
    unsigned scroll_speed  = 0;
    menu_handle_t *menu    = menu_driver_get_ptr();
+   menu_navigation_t *nav = menu_navigation_get_ptr();
    if (!menu)
       return -1;
 
-   scroll_speed = (max(menu->navigation.scroll.acceleration, 2) - 2) / 4 + 1;
+   scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
 
    if (menu_list_get_size(menu->menu_list) <= 0)
       return 0;
 
-   menu_navigation_decrement(&menu->navigation, scroll_speed);
+   menu_navigation_decrement(nav, scroll_speed);
 
    return 0;
 }