diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index dc415f52bc..1c17649d34 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -13,13 +13,14 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <3ds.h>
-
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
 
+#include <boolean.h>
+
+#include <3ds.h>
+
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <file/file_list.h>
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 764f2ba715..8c4b1f7860 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -16,8 +16,10 @@
  */
 
 #include <emscripten/emscripten.h>
-#include "../../general.h"
+
 #include <file/config_file.h>
+
+#include "../../general.h"
 #include "../../content.h"
 #include "../frontend.h"
 #include "../../retroarch.h"
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 6f8188c332..3b76acfc8d 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -16,16 +16,16 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 
+#include <boolean.h>
+#include <retro_dirent.h>
 #include <compat/strl.h>
 #include <rhash.h>
 
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 45eb218cb9..ee0ccb8dc8 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
 
@@ -32,6 +31,7 @@ int scePowerSetArmClockFrequency(int freq);
 #include <pspsdk.h>
 #endif
 
+#include <boolean.h>
 #include <retro_log.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
diff --git a/frontend/drivers/platform_qnx.c b/frontend/drivers/platform_qnx.c
index fe48376906..b0ce0e00f7 100644
--- a/frontend/drivers/platform_qnx.c
+++ b/frontend/drivers/platform_qnx.c
@@ -14,12 +14,14 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <bps/bps.h>
-
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
+
+#include <bps/bps.h>
+
+#include <boolean.h>
+
 #include "../../dynamic.h"
 #include "../../libretro_private.h"
 
diff --git a/frontend/drivers/platform_wii.c b/frontend/drivers/platform_wii.c
index 609b6279ad..9c3ce4bc3f 100644
--- a/frontend/drivers/platform_wii.c
+++ b/frontend/drivers/platform_wii.c
@@ -18,10 +18,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <fat.h>
 #include <gctypes.h>
 #include <ogc/cache.h>
-#include "../../gfx/drivers/ppc_asm.h"
 #include <ogc/system.h>
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>
@@ -30,6 +30,8 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
+#include "../../gfx/drivers/ppc_asm.h"
+
 #define EXECUTE_ADDR ((uint8_t *) 0x91800000)
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
 #define ARGS_ADDR    ((uint8_t *) 0x93200000)
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index c25459ae08..0d05c3aa4a 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -13,12 +13,12 @@
  */
 
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
 
 #include <windows.h>
 
+#include <boolean.h>
 #include <retro_miscellaneous.h>
 #include <dynamic/dylib.h>
 #include <file/file_list.h>
diff --git a/frontend/drivers/platform_xenon.c b/frontend/drivers/platform_xenon.c
index 21337841b6..678116d522 100644
--- a/frontend/drivers/platform_xenon.c
+++ b/frontend/drivers/platform_xenon.c
@@ -15,21 +15,23 @@
  */
 
 #include <stdint.h>
-#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
 
+#include <time/time.h>
+
 #include <debug.h>
 #include <xenos/xenos.h>
 #include <diskio/ata.h>
 #include <input/input.h>
 #include <console/console.h>
 #include <usb/usbmain.h>
-#include <time/time.h>
 #include <ppc/timebase.h>
 #include <xenon_soc/xenon_power.h>
 #include <elf/elf.h>
 
+#include <boolean.h>
+
 #include "../../dynamic.h"
 #include "../../libretro_private.h"