diff --git a/cores/image_core.c b/cores/image_core.c
index 7fac6ccaa9..cb7ef113b9 100644
--- a/cores/image_core.c
+++ b/cores/image_core.c
@@ -1,8 +1,9 @@
-#include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
+#include <assert.h>
+
 #include <boolean.h>
 
 #define STB_IMAGE_IMPLEMENTATION
diff --git a/cores/libretro-test-gl/libretro-test.c b/cores/libretro-test-gl/libretro-test.c
index b0ee3aea50..1a9b158ff2 100644
--- a/cores/libretro-test-gl/libretro-test.c
+++ b/cores/libretro-test-gl/libretro-test.c
@@ -1,15 +1,16 @@
-#include "../../libretro.h"
+#include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
+
+#include <glsym/glsym.h>
+
+#include "../../libretro.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 static struct retro_hw_render_callback hw_render;
 
-#include <glsym/glsym.h>
-
 #if defined(HAVE_PSGL)
 #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
 #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
diff --git a/cores/libretro-test/libretro-test.c b/cores/libretro-test/libretro-test.c
index d6f619c0a0..1b336a14dd 100644
--- a/cores/libretro-test/libretro-test.c
+++ b/cores/libretro-test/libretro-test.c
@@ -1,10 +1,11 @@
-#include "../../libretro.h"
+#include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
+
+#include "../../libretro.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846