diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c
index 85f30ebb38..0d83acf0c2 100644
--- a/audio/audio_resampler_driver.c
+++ b/audio/audio_resampler_driver.c
@@ -25,9 +25,7 @@
 
 #include "audio_resampler_driver.h"
 #include "../config_file_userdata.h"
-#ifdef RARCH_INTERNAL
 #include "../performance_counters.h"
-#endif
 #include "../list_special.h"
 
 static const rarch_resampler_t *resampler_drivers[] = {
diff --git a/command.c b/command.c
index d8060b43ff..65690cae50 100644
--- a/command.c
+++ b/command.c
@@ -39,6 +39,26 @@
 #include <string/stdstring.h>
 #endif
 
+#ifdef HAVE_CHEEVOS
+#include "cheevos.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "menu/menu_driver.h"
+#include "menu/menu_content.h"
+#include "menu/menu_display.h"
+#include "menu/menu_shader.h"
+#include "menu/menu_popup.h"
+#endif
+
+#ifdef HAVE_NETPLAY
+#include "network/netplay/netplay.h"
+#endif
+
+#ifdef HAVE_NETWORKING
+#include <net/net_compat.h>
+#endif
+
 #include "command.h"
 
 #include "defaults.h"
@@ -61,26 +81,6 @@
 #include "tasks/tasks_internal.h"
 #include "list_special.h"
 
-#ifdef HAVE_CHEEVOS
-#include "cheevos.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#include "menu/menu_content.h"
-#include "menu/menu_display.h"
-#include "menu/menu_shader.h"
-#include "menu/menu_popup.h"
-#endif
-
-#ifdef HAVE_NETPLAY
-#include "network/netplay/netplay.h"
-#endif
-
-#ifdef HAVE_NETWORKING
-#include <net/net_compat.h>
-#endif
-
 #include "core.h"
 #include "verbosity.h"
 #include "runloop.h"
diff --git a/input/input_driver.c b/input/input_driver.c
index a247d95459..8f27a5d6c3 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -20,14 +20,14 @@
 #include "../config.h"
 #endif
 
-#include "input_driver.h"
-#include "input_keyboard.h"
-#include "input_remapping.h"
-
 #ifdef HAVE_NETWORKGAMEPAD
 #include "input_remote.h"
 #endif
 
+#include "input_driver.h"
+#include "input_keyboard.h"
+#include "input_remapping.h"
+
 #include "../configuration.h"
 #include "../driver.h"
 #include "../retroarch.h"
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 0749ee05e5..dce43d7db5 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -19,15 +19,14 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <compat/strl.h>
+#include <retro_assert.h>
+#include <retro_miscellaneous.h>
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
-#include <compat/strl.h>
-
-#include <retro_assert.h>
-#include <retro_miscellaneous.h>
-
 #ifdef ANDROID
 #include <android/keycodes.h>
 #include "drivers_keyboard/keyboard_event_android.h"
diff --git a/input/input_overlay.c b/input/input_overlay.c
index d1a1680cb5..57c3b95e43 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -28,16 +28,20 @@
 #include <clamping.h>
 #include <rhash.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#endif
+
 #include "input_overlay.h"
 #include "input_keyboard.h"
 
 #include "../configuration.h"
 #include "../verbosity.h"
 
-#ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
-#endif
-
 #define OVERLAY_GET_KEY(state, key) (((state)->keys[(key) / 32] >> ((key) % 32)) & 1)
 #define OVERLAY_SET_KEY(state, key) (state)->keys[(key) / 32] |= 1 << ((key) % 32)
 
diff --git a/input/input_remote.c b/input/input_remote.c
index 6d546e1de7..b7610a3e59 100644
--- a/input/input_remote.c
+++ b/input/input_remote.c
@@ -18,7 +18,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <direct.h>
+#else
 #include <unistd.h>
 #endif
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index f91c6dac4c..130b230c64 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -25,12 +25,6 @@
 #include <string/stdstring.h>
 #include <features/features_cpu.h>
 
-#include "menu_content.h"
-#include "menu_driver.h"
-#include "menu_navigation.h"
-#include "menu_popup.h"
-#include "menu_cbs.h"
-
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
@@ -39,6 +33,20 @@
 #include "../database_info.h"
 #endif
 
+#ifdef HAVE_CHEEVOS
+#include "../cheevos.h"
+#endif
+
+#ifdef __linux__
+#include "../frontend/drivers/platform_linux.h"
+#endif
+
+#include "menu_content.h"
+#include "menu_driver.h"
+#include "menu_navigation.h"
+#include "menu_popup.h"
+#include "menu_cbs.h"
+
 #include "../configuration.h"
 #include "../file_path_special.h"
 #include "../defaults.h"
@@ -57,14 +65,6 @@
 #include "../performance_counters.h"
 #include "../core_info.h"
 
-#ifdef HAVE_CHEEVOS
-#include "../cheevos.h"
-#endif
-
-#ifdef __linux__
-#include "../frontend/drivers/platform_linux.h"
-#endif
-
 #ifdef HAVE_NETWORKING
 static void print_buf_lines(file_list_t *list, char *buf,
       const char *label, int buf_size,