diff --git a/cheevos.c b/cheevos.c
index 712a116a3f..d53c45ba93 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -25,6 +25,11 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_MENU
+#include "menu/menu_driver.h"
+#include "menu/menu_entries.h"
+#endif
+
 #include "cheevos.h"
 #include "command.h"
 #include "dynamic.h"
@@ -36,11 +41,6 @@
 #include "runloop.h"
 #include "core.h"
 
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#include "menu/menu_entries.h"
-#endif
-
 #include "verbosity.h"
 
 /* Define this macro to prevent cheevos from being deactivated. */
diff --git a/command.c b/command.c
index fa91034a67..d8060b43ff 100644
--- a/command.c
+++ b/command.c
@@ -29,6 +29,10 @@
 #include <lists/dir_list.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_COMMAND
 #include <net/net_compat.h>
 #include <net/net_socket.h>
@@ -61,12 +65,6 @@
 #include "cheevos.h"
 #endif
 
-#include "core.h"
-#include "verbosity.h"
-#include "runloop.h"
-#include "configuration.h"
-#include "input/input_remapping.h"
-
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #include "menu/menu_content.h"
@@ -83,6 +81,12 @@
 #include <net/net_compat.h>
 #endif
 
+#include "core.h"
+#include "verbosity.h"
+#include "runloop.h"
+#include "configuration.h"
+#include "input/input_remapping.h"
+
 #define DEFAULT_NETWORK_CMD_PORT 55355
 #define STDIN_BUF_SIZE           4096
 
diff --git a/core_impl.c b/core_impl.c
index ddf1ef687c..d019d0c2df 100644
--- a/core_impl.c
+++ b/core_impl.c
@@ -30,6 +30,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_NETPLAY
+#include "network/netplay/netplay.h"
+#endif
+
 #include "configuration.h"
 #include "dynamic.h"
 #include "core.h"
@@ -40,10 +44,6 @@
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"
 
-#ifdef HAVE_NETPLAY
-#include "network/netplay/netplay.h"
-#endif
-
 static struct retro_core_t core;
 static bool                core_inited;
 static bool                core_symbols_inited;
diff --git a/core_info.c b/core_info.c
index 689a712d1b..e8ced4a08f 100644
--- a/core_info.c
+++ b/core_info.c
@@ -15,23 +15,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+#include <string/stdstring.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <file/archive_file.h>
-#include <compat/strl.h>
-
-#include <string/stdstring.h>
-
-#include "core_info.h"
-#include "configuration.h"
-#include "file_path_special.h"
-#include "list_special.h"
-#include "config.def.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "config.def.h"
+#include "core_info.h"
+#include "configuration.h"
+#include "file_path_special.h"
+#include "list_special.h"
+
 static const char *core_info_tmp_path               = NULL;
 static const struct string_list *core_info_tmp_list = NULL;
 static core_info_t *core_info_current               = NULL;
diff --git a/msg_hash.c b/msg_hash.c
index 33ee767c0b..b9de0ef781 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -18,6 +18,10 @@
 #include <rhash.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "msg_hash.h"
 
 #include "configuration.h"
diff --git a/retroarch.c b/retroarch.c
index 10639ce59b..e5fb2ae207 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -29,13 +29,8 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-
 #include <setjmp.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <boolean.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
@@ -49,6 +44,19 @@
 
 #include <features/features_cpu.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_COMMAND
+#include "command.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "menu/menu_driver.h"
+#endif
+
+#include "config.features.h"
 #include "content.h"
 #include "core_type.h"
 #include "core_info.h"
@@ -72,15 +80,6 @@
 
 #include "retroarch.h"
 
-#ifdef HAVE_COMMAND
-#include "command.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#endif
-
-#include "config.features.h"
 #include "command.h"
 
 /* Descriptive names for options without short variant.
diff --git a/runloop.c b/runloop.c
index 3bcb032ae0..c324ddc262 100644
--- a/runloop.c
+++ b/runloop.c
@@ -19,27 +19,42 @@
 #include <stdarg.h>
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <lists/dir_list.h>
-#include <file/file_path.h>
+#include <compat/strl.h>
 #include <retro_inline.h>
 #include <retro_assert.h>
+#include <lists/dir_list.h>
+#include <file/file_path.h>
 #include <queues/message_queue.h>
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#endif
 #include <queues/task_queue.h>
 #include <string/stdstring.h>
 #include <features/features_cpu.h>
 
-#include <compat/strl.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#endif
 
 #ifdef HAVE_CHEEVOS
 #include "cheevos.h"
 #endif
+
+#ifdef HAVE_MENU
+#include "menu/menu_display.h"
+#include "menu/menu_driver.h"
+#include "menu/menu_popup.h"
+#endif
+
+#ifdef HAVE_NETPLAY
+#include "network/netplay/netplay.h"
+#endif
+
+#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
+#include "httpserver/httpserver.h"
+#endif
+
 #include "autosave.h"
 #include "core_info.h"
 #include "configuration.h"
@@ -62,21 +77,6 @@
 
 #include "input/input_keyboard.h"
 #include "tasks/tasks_internal.h"
-
-#ifdef HAVE_MENU
-#include "menu/menu_display.h"
-#include "menu/menu_driver.h"
-#include "menu/menu_popup.h"
-#endif
-
-#ifdef HAVE_NETPLAY
-#include "network/netplay/netplay.h"
-#endif
-
-#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
-#include "httpserver/httpserver.h"
-#endif
-
 #include "verbosity.h"
 
 #ifdef HAVE_ZLIB
diff --git a/setting_list.c b/setting_list.c
index 0652008aa8..b8e59b680f 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -19,16 +19,20 @@
 #include <string/stdstring.h>
 #include <compat/strl.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "menu/menu_driver.h"
+#endif
+
 #include "configuration.h"
 #include "config.def.h"
 #include "input/input_config.h"
 #include "input/input_autodetect.h"
 #include "setting_list.h"
 
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#endif
-
 rarch_setting_t setting_terminator_setting(void)
 {
    rarch_setting_t result;