Cleanup headers

command_event.c

@@ -1219,7 +1219,8 @@ bool event_command(enum event_command cmd)
          global->rewind.state = NULL;
          break;
       case EVENT_CMD_REWIND_INIT:
-         init_rewind();
+         if (!driver->netplay_data)
+            init_rewind();
          break;
       case EVENT_CMD_REWIND_TOGGLE:
          if (settings->rewind_enable)

configuration.c

@@ -25,7 +25,6 @@
 #include "input/input_common.h"
 #include "input/input_keymaps.h"
 #include "input/input_remapping.h"
-#include "configuration.h"
 #include "general.h"
 #include "system.h"
 

core_info.c

@@ -16,10 +16,8 @@
  */
 
 #include <file/file_path.h>
-#include "file_ext.h"
 #include <file/file_extract.h>
 
-#include "core_info.h"
 #include "general.h"
 #include "dir_list_special.h"
 #include "config.def.h"

core_options.c

@@ -14,14 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core_options.h"
 #include <string.h>
+
 #include <file/config_file.h>
 #include <file/dir_list.h>
 #include <compat/posix_string.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 
+#include "core_options.h"
+
 struct core_option
 {
    char *desc;

database_info.c

@@ -15,23 +15,19 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
 #include <file/file_extract.h>
 
-#include "file_ext.h"
 #include "dir_list_special.h"
-
 #include "database_info.h"
-#include "file_ops.h"
 #include "msg_hash.h"
 #include "general.h"
-#include "runloop.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <stdint.h>
-
 #define DB_QUERY_ENTRY                          0x1c310956U
 #define DB_QUERY_ENTRY_PUBLISHER                0x125e594dU
 #define DB_QUERY_ENTRY_DEVELOPER                0xcbd89be5U

driver.c

@@ -16,7 +16,6 @@
 
 #include <compat/posix_string.h>
 
-#include "driver.h"
 #include "general.h"
 #include "msg_hash.h"
 #include "gfx/video_monitor.h"

libretro_version_1.c

@@ -25,18 +25,13 @@
 #include <retro_log.h>
 #include <boolean.h>
 
-#include "libretro_version_1.h"
 #include "libretro.h"
-#include "dynamic.h"
 #include "general.h"
 #include "runloop.h"
 #include "runloop_data.h"
 #include "retroarch.h"
 #include "performance.h"
-#include "input/keyboard_line.h"
 #include "input/input_remapping.h"
-#include "audio/audio_driver.h"
-#include "audio/audio_utils.h"
 #include "record/record_driver.h"
 #include "gfx/video_pixel_converter.h"
 

retroarch.c

@@ -39,10 +39,8 @@
 #include "msg_hash.h"
 
 #include "libretro_version_1.h"
-#include "dynamic.h"
 #include "configuration.h"
 #include "general.h"
-#include "retroarch.h"
 #include "runloop_data.h"
 #include "performance.h"
 #include "cheats.h"
@@ -53,10 +51,6 @@
 #ifdef HAVE_MENU
 #include "menu/menu.h"
 #include "menu/menu_hash.h"
-#include "menu/menu_entries.h"
-#include "menu/menu_setting.h"
-#include "menu/menu_shader.h"
-#include "menu/menu_input.h"
 #endif
 
 char orig_savestate_dir[PATH_MAX_LENGTH];

rewind.c

@@ -21,7 +21,6 @@
 
 #include <retro_inline.h>
 
-#include "dynamic.h"
 #include "general.h"
 #include "msg_hash.h"
 #include "rewind.h"
@@ -554,17 +553,9 @@ void state_manager_capacity(state_manager_t *state,
 void init_rewind(void)
 {
    void *state          = NULL;
-   driver_t *driver     = driver_get_ptr();
    settings_t *settings = config_get_ptr();
    global_t *global     = global_get_ptr();
 
-   (void)driver;
-
-#ifdef HAVE_NETPLAY
-   if (driver->netplay_data)
-      return;
-#endif
-
    if (!settings->rewind_enable || global->rewind.state)
       return;
 

runloop.c

@@ -23,7 +23,6 @@
 #include <compat/strl.h>
 
 #include "configuration.h"
-#include "dynamic.h"
 #include "performance.h"
 #include "retroarch.h"
 #include "runloop.h"
@@ -36,7 +35,6 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
-#include "menu/menu_input.h"
 #endif
 
 #ifdef HAVE_NETPLAY

runloop_data.c

@@ -21,14 +21,11 @@
 
 #include "general.h"
 
-#include "runloop_data.h"
 #include "tasks/tasks.h"
 #include "input/input_overlay.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
-#include "menu/menu_entries.h"
-#include "menu/menu_input.h"
 #endif
 
 enum