diff --git a/Makefile.common b/Makefile.common
index 670b99243e..b50813c6f0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -342,7 +342,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_setting.o \
 			 menu/menu_database.o \
 			 menu/menu_shader.o \
-			 menu/menu_entries.o \
 			 menu/menu_entries_cbs_ok.o \
 			 menu/menu_entries_cbs_cancel.o \
 			 menu/menu_entries_cbs_start.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index fb00fb7ce2..84924f6599 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -716,7 +716,6 @@ MENU
 #include "../menu/menu_common_list.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_list.c"
-#include "../menu/menu_entries.c"
 #include "../menu/menu_entries_cbs_ok.c"
 #include "../menu/menu_entries_cbs_cancel.c"
 #include "../menu/menu_entries_cbs_start.c"
diff --git a/menu/menu.c b/menu/menu.c
index 822694147a..2fefde709d 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -17,7 +17,6 @@
 #include "menu.h"
 #include "menu_display.h"
 #include "menu_entry.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
 #include "../dynamic.h"
 #include "../frontend/frontend.h"
diff --git a/menu/menu_database.c b/menu/menu_database.c
index 9387ef26ab..0e89a28944 100644
--- a/menu/menu_database.c
+++ b/menu/menu_database.c
@@ -16,7 +16,6 @@
 #include "menu.h"
 #include "menu_database.h"
 #include "menu_list.h"
-#include "menu_entries.h"
 #include "../playlist.h"
 #include <string.h>
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index dfdc50c52c..eb2056308d 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -22,10 +22,11 @@
 
 #include "menu.h"
 #include "menu_display.h"
-#include "menu_entries.h"
 #include "menu_displaylist.h"
 #include "menu_navigation.h"
+
 #include "../performance.h"
+#include "../settings.h"
 
 static void menu_displaylist_push_perfcounter(
       menu_displaylist_info_t *info,
@@ -346,7 +347,7 @@ static int menu_entries_push_list(menu_handle_t *menu,
          continue;
 
       menu_list_push(list, setting->short_description,
-            setting->name, menu_entries_setting_set_flags(setting), 0);
+            setting->name, menu_setting_set_flags(setting), 0);
    }
 
    menu_driver_populate_entries(path, label, type);
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
deleted file mode 100644
index f8279f0e98..0000000000
--- a/menu/menu_entries.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "menu_displaylist.h"
-#include "menu_entries.h"
-#include "menu_setting.h"
-#include "menu_navigation.h"
-
-int menu_entries_setting_set_flags(rarch_setting_t *setting)
-{
-   if (!setting)
-      return 0;
-
-   if (setting->flags & SD_FLAG_IS_DRIVER)
-      return MENU_SETTING_DRIVER;
-
-   switch (setting->type)
-   {
-      case ST_ACTION:
-         return MENU_SETTING_ACTION;
-      case ST_PATH:
-         return MENU_FILE_PATH;
-      case ST_GROUP:
-         return MENU_SETTING_GROUP;
-      case ST_SUB_GROUP:
-         return MENU_SETTING_SUBGROUP;
-      default:
-         break;
-   }
-
-   return 0;
-}
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
deleted file mode 100644
index f4a41eedc2..0000000000
--- a/menu/menu_entries.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MENU_ENTRIES_H__
-#define MENU_ENTRIES_H__
-
-#include <stdlib.h>
-#include "menu.h"
-#include <file/file_list.h>
-#include "../settings.h"
-#ifdef HAVE_LIBRETRODB
-#include "menu_database.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int menu_entries_setting_set_flags(rarch_setting_t *setting);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 2a76d12d65..e59d6843d0 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -18,7 +18,6 @@
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
 #include "menu_input.h"
-#include "menu_entries.h"
 #include "menu_navigation.h"
 
 #include <file/file_extract.h>
diff --git a/menu/menu_entries_cbs_cancel.c b/menu/menu_entries_cbs_cancel.c
index 552782bb88..af5da0b8cd 100644
--- a/menu/menu_entries_cbs_cancel.c
+++ b/menu/menu_entries_cbs_cancel.c
@@ -18,7 +18,6 @@
 #include "menu_entries_cbs.h"
 #include "menu_list.h"
 #include "menu_setting.h"
-#include "menu_entries.h"
 
 static int action_cancel_lookup_setting(const char *path,
       const char *label, unsigned type, size_t idx)
diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c
index 58860b74ef..d08a8b40fc 100644
--- a/menu/menu_entries_cbs_deferred_push.c
+++ b/menu/menu_entries_cbs_deferred_push.c
@@ -18,10 +18,10 @@
 #include "menu_displaylist.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
-#include "menu_entries.h"
 
 #include "../file_ext.h"
 #include "../retroarch.h"
+#include "../settings.h"
 #include "../performance.h"
 
 #ifdef HAVE_LIBRETRODB
@@ -1287,7 +1287,7 @@ static int deferred_push_settings(void *data, void *userdata,
       {
          if (setting->type == ST_GROUP)
             menu_list_push(list, setting->short_description,
-                  setting->name, menu_entries_setting_set_flags(setting), 0);
+                  setting->name, menu_setting_set_flags(setting), 0);
       }
    }
    else
@@ -1387,7 +1387,7 @@ static int deferred_push_settings_subgroup(void *data, void *userdata,
 
       strlcpy(group_label, setting->name, sizeof(group_label));
       menu_list_push(list, setting->short_description,
-            group_label, menu_entries_setting_set_flags(setting), 0);
+            group_label, menu_setting_set_flags(setting), 0);
    }
 
    menu_driver_populate_entries(path, label, type);
diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c
index 50adbfb3cd..9bd77d73eb 100644
--- a/menu/menu_entries_cbs_iterate.c
+++ b/menu/menu_entries_cbs_iterate.c
@@ -20,11 +20,11 @@
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
 #include "menu_input.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
 #include "menu_navigation.h"
 
 #include "../retroarch.h"
+#include "../settings.h"
 
 #include "../input/input_autodetect.h"
 
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index 7e3e89d9af..85c533d459 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -17,7 +17,6 @@
 #include "menu.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
 #include "menu_navigation.h"
 
diff --git a/menu/menu_entries_cbs_refresh.c b/menu/menu_entries_cbs_refresh.c
index 9ed44aceb7..b4aeabb48d 100644
--- a/menu/menu_entries_cbs_refresh.c
+++ b/menu/menu_entries_cbs_refresh.c
@@ -15,7 +15,6 @@
 
 #include "menu.h"
 #include "menu_displaylist.h"
-#include "menu_entries.h"
 #include "menu_entries_cbs.h"
 
 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
diff --git a/menu/menu_entries_cbs_representation.c b/menu/menu_entries_cbs_representation.c
index ee7eb25683..35da1f8164 100644
--- a/menu/menu_entries_cbs_representation.c
+++ b/menu/menu_entries_cbs_representation.c
@@ -16,10 +16,11 @@
 #include <file/file_path.h>
 #include "menu.h"
 #include "menu_entries_cbs.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
+#include "menu_setting.h"
 
 #include "../performance.h"
+#include "../settings.h"
 
 static void menu_action_setting_disp_set_label_cheat_num_passes(
       file_list_t* list,
diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c
index 4d3b0a41d6..7e7f7a14a2 100644
--- a/menu/menu_entries_cbs_select.c
+++ b/menu/menu_entries_cbs_select.c
@@ -14,7 +14,6 @@
  */
 
 #include "menu.h"
-#include "menu_entries.h"
 #include "menu_entries_cbs.h"
 
 static int action_select_default(unsigned type, const char *label,
diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c
index 3c4b193b71..21c90ab88b 100644
--- a/menu/menu_entries_cbs_start.c
+++ b/menu/menu_entries_cbs_start.c
@@ -16,7 +16,6 @@
 #include "menu.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
 
 #include "../retroarch.h"
diff --git a/menu/menu_entries_cbs_toggle.c b/menu/menu_entries_cbs_toggle.c
index 2a8993a66e..76c14ee9c2 100644
--- a/menu/menu_entries_cbs_toggle.c
+++ b/menu/menu_entries_cbs_toggle.c
@@ -17,7 +17,6 @@
 #include "menu.h"
 #include "menu_entries_cbs.h"
 #include "menu_setting.h"
-#include "menu_entries.h"
 #include "menu_shader.h"
 #include "menu_navigation.h"
 
diff --git a/menu/menu_entries_cbs_up_or_down.c b/menu/menu_entries_cbs_up_or_down.c
index 9b87661292..2f5846bd20 100644
--- a/menu/menu_entries_cbs_up_or_down.c
+++ b/menu/menu_entries_cbs_up_or_down.c
@@ -14,7 +14,6 @@
  */
 
 #include "menu.h"
-#include "menu_entries.h"
 #include "menu_navigation.h"
 #include "menu_entries_cbs.h"
 
diff --git a/menu/menu_list.c b/menu/menu_list.c
index 77f102613f..060af51ce4 100644
--- a/menu/menu_list.c
+++ b/menu/menu_list.c
@@ -14,13 +14,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
+
+#include <retro_inline.h>
+
 #include "../driver.h"
 #include "menu_common_list.h"
 #include "menu_list.h"
 #include "menu_navigation.h"
-#include "menu_entries.h"
-#include <string.h>
-#include <retro_inline.h>
 
 menu_list_t *menu_list_get_ptr(void)
 {
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index bcf4bb422f..bffc3cc7ef 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -15,8 +15,33 @@
  */
 
 #include "menu_setting.h"
-#include "menu_entries.h"
 #include "../retroarch.h"
+#include "../settings.h"
+
+int menu_setting_set_flags(rarch_setting_t *setting)
+{
+   if (!setting)
+      return 0;
+
+   if (setting->flags & SD_FLAG_IS_DRIVER)
+      return MENU_SETTING_DRIVER;
+
+   switch (setting->type)
+   {
+      case ST_ACTION:
+         return MENU_SETTING_ACTION;
+      case ST_PATH:
+         return MENU_FILE_PATH;
+      case ST_GROUP:
+         return MENU_SETTING_GROUP;
+      case ST_SUB_GROUP:
+         return MENU_SETTING_SUBGROUP;
+      default:
+         break;
+   }
+
+   return 0;
+}
 
 int menu_setting_generic(rarch_setting_t *setting)
 {
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 6848acc598..06a07f0e93 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -17,12 +17,15 @@
 #ifndef _MENU_SETTING_H
 #define _MENU_SETTING_H
 
+#include "menu.h"
 #include "../settings_list.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+int menu_setting_set_flags(rarch_setting_t *setting);
+
 int menu_setting_generic(rarch_setting_t *setting);
 
 int menu_setting_handler(rarch_setting_t *setting, unsigned action);
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 01900b5a52..fb1f1bb0db 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -14,10 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "menu_shader.h"
-#include "menu_entries.h"
+#include <string.h>
+
+#include <compat/strl.h>
 #include <file/file_path.h>
 
+#include "menu_shader.h"
+#include "../configuration.h"
+#include "../runloop.h"
+#include "../settings.h"
 
 /**
  * menu_shader_manager_init:
diff --git a/settings.c b/settings.c
index 645fdb1fd6..0ca56eaaca 100644
--- a/settings.c
+++ b/settings.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef HAVE_MENU
-#include "menu/menu_entries.h"
+#include "menu/menu_setting.h"
 #endif
 
 /**