diff --git a/command_event.c b/command_event.c
index 43e6b9afc4..5c9efb1337 100644
--- a/command_event.c
+++ b/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)
diff --git a/configuration.c b/configuration.c
index 77e72c1dfb..fe9f3a9ad2 100644
--- a/configuration.c
+++ b/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"
 
diff --git a/core_info.c b/core_info.c
index c778687469..1f748ba46a 100644
--- a/core_info.c
+++ b/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"
diff --git a/core_options.c b/core_options.c
index 8c22d67114..abf3a9c2e9 100644
--- a/core_options.c
+++ b/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;
diff --git a/database_info.c b/database_info.c
index 681de31123..bbd1e94993 100644
--- a/database_info.c
+++ b/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
diff --git a/driver.c b/driver.c
index d94e6c3e2f..27f35a2813 100644
--- a/driver.c
+++ b/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"
diff --git a/libretro_version_1.c b/libretro_version_1.c
index bc8723c7db..6820deb552 100644
--- a/libretro_version_1.c
+++ b/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"
 
diff --git a/retroarch.c b/retroarch.c
index 248cda445e..86d5a077ec 100644
--- a/retroarch.c
+++ b/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];
diff --git a/rewind.c b/rewind.c
index 2719ce4cbd..6cc28bd5b7 100644
--- a/rewind.c
+++ b/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;
 
diff --git a/runloop.c b/runloop.c
index 81cccd11e1..b26da1c412 100644
--- a/runloop.c
+++ b/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
diff --git a/runloop_data.c b/runloop_data.c
index d09f855268..026e465d2b 100644
--- a/runloop_data.c
+++ b/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