diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index d5639ae715..abffd99729 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -24,6 +24,7 @@
 #include <queues/message_queue.h>
 #include "menu_animation.h"
 #include "menu_list.h"
+#include "menu_navigation.h"
 #include "menu_database.h"
 #include "../settings_list.h"
 #include "../playlist.h"
@@ -79,22 +80,6 @@ typedef struct menu_framebuf
    size_t pitch;
 } menu_framebuf_t;
 
-typedef struct menu_navigation
-{
-   struct
-   {
-      /* Quick jumping indices with L/R.
-       * Rebuilt when parsing directory. */
-      struct
-      {
-         size_t list[2 * (26 + 2) + 1];
-         unsigned size;
-      } indices;
-      unsigned acceleration;
-   } scroll;
-   size_t selection_ptr;
-} menu_navigation_t;
-
 typedef struct
 {
    void *userdata;
diff --git a/menu/menu_list.c b/menu/menu_list.c
index 060af51ce4..90a860f424 100644
--- a/menu/menu_list.c
+++ b/menu/menu_list.c
@@ -19,6 +19,7 @@
 #include <retro_inline.h>
 
 #include "../driver.h"
+#include "menu.h"
 #include "menu_common_list.h"
 #include "menu_list.h"
 #include "menu_navigation.h"
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
index 19f048b60e..7d976a4821 100644
--- a/menu/menu_navigation.c
+++ b/menu/menu_navigation.c
@@ -20,7 +20,12 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+
+#include <boolean.h>
+
 #include "menu_navigation.h"
+#include "menu_driver.h"
+#include "menu_setting.h"
 
 menu_navigation_t *menu_navigation_get_ptr(void)
 {
diff --git a/menu/menu_navigation.h b/menu/menu_navigation.h
index a19807ce14..af5a103992 100644
--- a/menu/menu_navigation.h
+++ b/menu/menu_navigation.h
@@ -17,12 +17,26 @@
 #ifndef _MENU_NAVIGATION_H
 #define _MENU_NAVIGATION_H
 
-#include "menu.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef struct menu_navigation
+{
+   struct
+   {
+      /* Quick jumping indices with L/R.
+       * Rebuilt when parsing directory. */
+      struct
+      {
+         size_t list[2 * (26 + 2) + 1];
+         unsigned size;
+      } indices;
+      unsigned acceleration;
+   } scroll;
+   size_t selection_ptr;
+} menu_navigation_t;
+
 menu_navigation_t *menu_navigation_get_ptr(void);
 
 /**
diff --git a/runloop_data.h b/runloop_data.h
index 494fefddf3..04cc5b3aad 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-typedef int (*transfer_cb_t               )(void *data, size_t len);
+typedef int (*transfer_cb_t)(void *data, size_t len);
 
 enum runloop_data_type
 {