Get rid of some header dependencies

menu/menu_entries_cbs.c

@@ -19,32 +19,17 @@
 #include "menu_setting.h"
 #include "menu_input.h"
 #include "menu_entries.h"
-#include "menu_shader.h"
 #include "menu_navigation.h"
 
-#include "../file_ext.h"
 #include "../file_extract.h"
 #include "../file_ops.h"
 #include "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
-#include "../performance.h"
 
 #ifdef HAVE_NETWORKING
 #include "../net_http.h"
 #endif
 
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
-
 void menu_entries_common_load_content(bool persist)
 {
    menu_handle_t *menu = menu_driver_resolve();

menu/menu_entries_cbs_cancel.c

@@ -17,33 +17,7 @@
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 static int action_cancel_lookup_setting(const char *path,
       const char *label, unsigned type, size_t idx)

menu/menu_entries_cbs_contentlist_switch.c

@@ -13,37 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/file_path.h>
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 void menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,

menu/menu_entries_cbs_deferred_push.c

@@ -17,16 +17,9 @@
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
 #include "../performance.h"
 
@@ -40,11 +33,6 @@
 
 #include "menu_database.h"
 
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
-
 #ifdef HAVE_LIBRETRODB
 static int create_string_list_rdb_entry_string(const char *desc, const char *label,
       const char *actual_string, const char *path, file_list_t *list)

menu/menu_entries_cbs_iterate.c

@@ -22,28 +22,9 @@
 #include "menu_shader.h"
 #include "menu_navigation.h"
 
-#include "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
 
 #include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 static int archive_open(void)
 {

menu/menu_entries_cbs_ok.c

@@ -17,27 +17,16 @@
 #include "menu.h"
 #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 "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
-#include "../performance.h"
 
 #ifdef HAVE_NETWORKING
 #include "../net_http.h"
 #endif
 
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
 #include "../input/input_remapping.h"
 
 /* FIXME - Global variables, refactor */

menu/menu_entries_cbs_refresh.c

@@ -13,37 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/file_path.h>
 #include "menu.h"
-#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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 {

menu/menu_entries_cbs_representation.c

@@ -16,35 +16,11 @@
 #include <file/file_path.h>
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
 #include "../performance.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
-
 static void menu_action_setting_disp_set_label_cheat_num_passes(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,

menu/menu_entries_cbs_select.c

@@ -13,37 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/file_path.h>
 #include "menu.h"
-#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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 static int action_select_default(unsigned type, const char *label,
       unsigned action)

menu/menu_entries_cbs_start.c

@@ -13,38 +13,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/file_path.h>
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
 #include "../performance.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
 #include "../input/input_remapping.h"
 
-#include "../gfx/video_viewport.h"
-
 static int action_start_remap_file_load(unsigned type, const char *label,
       unsigned action)
 {

menu/menu_entries_cbs_toggle.c

@@ -17,33 +17,11 @@
 #include "menu.h"
 #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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
 #include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
 
 static int shader_action_parameter_toggle(unsigned type, const char *label,
       unsigned action)

menu/menu_entries_cbs_up_or_down.c

@@ -13,38 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <file/file_path.h>
 #include "menu.h"
-#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 "../file_ext.h"
-#include "../file_extract.h"
-#include "../file_ops.h"
-#include "../config.def.h"
-#include "../cheats.h"
-#include "../retroarch.h"
-#include "../performance.h"
-
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
-#ifdef HAVE_LIBRETRODB
-#include "../database_info.h"
-#endif
-
-#include "menu_database.h"
-
-#include "../input/input_autodetect.h"
-#include "../input/input_remapping.h"
-
-#include "../gfx/video_viewport.h"
-
 static int action_bind_up_or_down_generic(unsigned type, const char *label,
       unsigned action)
 {