diff --git a/autosave.c b/autosave.c
index a1d4d8058d..1abb23c927 100644
--- a/autosave.c
+++ b/autosave.c
@@ -14,13 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "autosave.h"
-#include <rthreads/rthreads.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
-#include <stdio.h>
+
+#include <rthreads/rthreads.h>
+
 #include "general.h"
+#include "autosave.h"
 
 struct autosave
 {
diff --git a/cheats.c b/cheats.c
index e34f360fa0..569dd8f43e 100644
--- a/cheats.c
+++ b/cheats.c
@@ -14,22 +14,24 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cheats.h"
-#include "general.h"
-#include "runloop.h"
-#include "dynamic.h"
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 
+#include "cheats.h"
+#include "general.h"
+#include "runloop.h"
+#include "dynamic.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
 
 void cheat_manager_apply_cheats(cheat_manager_t *handle)
 {
diff --git a/core_info.c b/core_info.c
index 5734936ff6..c778687469 100644
--- a/core_info.c
+++ b/core_info.c
@@ -15,11 +15,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core_info.h"
-#include "general.h"
 #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/driver.c b/driver.c
index 2ac4829fc2..d94e6c3e2f 100644
--- a/driver.c
+++ b/driver.c
@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/posix_string.h>
+
 #include "driver.h"
 #include "general.h"
-#include "retroarch.h"
 #include "msg_hash.h"
-#include "compat/posix_string.h"
 #include "gfx/video_monitor.h"
 #include "audio/audio_monitor.h"
 
diff --git a/netplay.c b/netplay.c
index 4983cc1ad2..d6de891f73 100644
--- a/netplay.c
+++ b/netplay.c
@@ -20,7 +20,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include <net/net_compat.h>
+
 #include "netplay.h"
 #include "general.h"
 #include "autosave.h"
diff --git a/rewind.c b/rewind.c
index 83bff0121e..2719ce4cbd 100644
--- a/rewind.c
+++ b/rewind.c
@@ -16,14 +16,16 @@
  */
 
 #define __STDC_LIMIT_MACROS
-#include "rewind.h"
-#include "performance.h"
 #include <stdlib.h>
 #include <string.h>
+
 #include <retro_inline.h>
+
 #include "dynamic.h"
 #include "general.h"
 #include "msg_hash.h"
+#include "rewind.h"
+#include "performance.h"
 
 #ifndef UINT16_MAX
 #define UINT16_MAX 0xffff