diff --git a/driver.h b/driver.h
index 60c9b1aa53..a35182fa42 100644
--- a/driver.h
+++ b/driver.h
@@ -31,6 +31,7 @@
 #include "input/overlay.h"
 #include "frontend/frontend_context.h"
 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 36e8f261af..45cc5ecd74 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -14,24 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
 #include "menu_common.h"
-#include "menu_navigation.h"
-
-#include "../../gfx/gfx_common.h"
-#include "../../performance.h"
-#include "../../driver.h"
-#include "../../file.h"
-#include "../../file_ext.h"
-#include "../../input/input_common.h"
-#include "../../input/keyboard_line.h"
-
-#include "../../compat/posix_string.h"
 
 void menu_update_system_info(void *data, bool *load_no_rom)
 {
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 14ebdf87b7..308b9af7f6 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -17,29 +17,30 @@
 #ifndef MENU_COMMON_H__
 #define MENU_COMMON_H__
 
-#include "../../general.h"
-#include "../info/core_info.h"
-
-#ifdef HAVE_RGUI
-#define MENU_TEXTURE_FULLSCREEN false
-#else
-#define MENU_TEXTURE_FULLSCREEN true
-#endif
-
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 #include "../../boolean.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include "../../general.h"
+#include "menu_navigation.h"
+#include "../info/core_info.h"
 #include "file_list.h"
+#include "history.h"
+#include "../../input/input_common.h"
+#include "../../input/keyboard_line.h"
 
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
 #define HAVE_SHADER_MANAGER
 #include "../../gfx/shader_parse.h"
 #endif
 
-#include "history.h"
+#ifdef HAVE_RGUI
+#define MENU_TEXTURE_FULLSCREEN false
+#else
+#define MENU_TEXTURE_FULLSCREEN true
+#endif
 
 #ifndef GFX_MAX_SHADERS
 #define GFX_MAX_SHADERS 16
@@ -49,6 +50,16 @@ extern "C" {
 #define RGUI_SETTINGS_CORE_OPTION_NONE  0xffff
 #define RGUI_SETTINGS_CORE_OPTION_START 0x10000
 
+#define RGUI_MAX_BUTTONS 32
+#define RGUI_MAX_AXES 32
+#define RGUI_MAX_HATS 4
+
+#define RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS 5
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum
 {
    RGUI_FILE_PLAIN,
@@ -79,9 +90,6 @@ typedef enum
    RGUI_ACTION_NOOP
 } rgui_action_t;
 
-#define RGUI_MAX_BUTTONS 32
-#define RGUI_MAX_AXES 32
-#define RGUI_MAX_HATS 4
 struct rgui_bind_state_port
 {
    bool buttons[RGUI_MAX_BUTTONS];
@@ -97,7 +105,6 @@ struct rgui_bind_axis_state
    int16_t locked_axes[RGUI_MAX_AXES];
 };
 
-#define RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS 5
 struct rgui_bind_state
 {
    struct retro_keybind *target;