diff --git a/gfx/drivers_context/bbqnx_ctx.c b/gfx/drivers_context/bbqnx_ctx.c
index 715e4cfe79..dae07e68d1 100644
--- a/gfx/drivers_context/bbqnx_ctx.c
+++ b/gfx/drivers_context/bbqnx_ctx.c
@@ -14,24 +14,25 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+#include <bps/screen.h>
+#include <bps/navigator.h>
+#include <bps/event.h>
+#include <screen/screen.h>
+#include <sys/platform.h>
+
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
 #include "../video_monitor.h"
 #include "../drivers/gl_common.h"
 
-#include <EGL/egl.h>
-#include <bps/screen.h>
-#include <bps/navigator.h>
-#include <bps/event.h>
-#include <screen/screen.h>
-#include <sys/platform.h>
-#include <GLES2/gl2.h>
-
 #include "../image/image.h"
 
-#include <stdint.h>
-
 #ifdef HAVE_GLSL
 #include "../shader_glsl.h"
 #endif
diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c
index a251cc1a38..440607a439 100644
--- a/gfx/drivers_context/cgl_ctx.c
+++ b/gfx/drivers_context/cgl_ctx.c
@@ -18,6 +18,10 @@
    Based on http://fernlightning.com/doku.php?id=randd:xopengl.
  */
 
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <OpenGL/CGLTypes.h>
@@ -25,10 +29,6 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../../configuration.h"
diff --git a/gfx/drivers_context/drm_egl_ctx.c b/gfx/drivers_context/drm_egl_ctx.c
index 1d75843bf0..2a5974511c 100644
--- a/gfx/drivers_context/drm_egl_ctx.c
+++ b/gfx/drivers_context/drm_egl_ctx.c
@@ -18,24 +18,18 @@
  * Based on kmscube example by Rob Clark.
  */
 
-#include "../../driver.h"
-#include "../../runloop.h"
-#include "../drivers/gl_common.h"
-#include "../video_monitor.h"
-#include <file/dir_list.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
+#include <stdint.h>
 #include <errno.h>
 #include <signal.h>
-#include <stdint.h>
-#include <signal.h>
+#include <fcntl.h>
 #include <unistd.h>
+#include <math.h>
+
 #include <sched.h>
 #include <sys/time.h>
-#include <math.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/poll.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -44,10 +38,17 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <gbm.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/poll.h>
-#include <fcntl.h>
+
+#include <file/dir_list.h>
+
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../drivers/gl_common.h"
+#include "../video_monitor.h"
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
 #ifndef EGL_OPENGL_ES3_BIT_KHR
 #define EGL_OPENGL_ES3_BIT_KHR 0x0040
diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
index 4dd574a2c9..c529955799 100644
--- a/gfx/drivers_context/emscriptenegl_ctx.c
+++ b/gfx/drivers_context/emscriptenegl_ctx.c
@@ -14,6 +14,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <unistd.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include <emscripten/emscripten.h>
+
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../video_context_driver.h"
@@ -24,13 +32,6 @@
 #include "../../config.h"
 #endif
 
-#include <stdint.h>
-#include <unistd.h>
-
-#include <emscripten/emscripten.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
 static EGLContext g_egl_ctx;
 static EGLSurface g_egl_surf;
 static EGLDisplay g_egl_dpy;
diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
index 806982f285..6a5a68b574 100644
--- a/gfx/drivers_context/glx_ctx.c
+++ b/gfx/drivers_context/glx_ctx.c
@@ -14,16 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <signal.h>
+
+#include <GL/glx.h>
+
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../drivers/gl_common.h"
 #include "../video_monitor.h"
 #include "../common/x11_common.h"
 
-#include <signal.h>
-#include <stdint.h>
-#include <GL/glx.h>
-
 static int (*g_pglSwapInterval)(int);
 static int (*g_pglSwapIntervalSGI)(int);
 static void (*g_pglSwapIntervalEXT)(Display*, GLXDrawable, int);
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index ac6c0abe99..ccc2fd9126 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -13,22 +13,24 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <signal.h>
+#include <sys/ioctl.h>
+
+#include <EGL/egl.h>
+
+/* Includes and defines for framebuffer size retrieval */
+#include <linux/fb.h>
+#include <linux/vt.h>
+
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
 #include "../video_monitor.h"
 #include "../drivers/gl_common.h"
 
-#include <EGL/egl.h>
-#include <signal.h>
-
-/* Includes and defines for framebuffer size retrieval */
-#include <sys/ioctl.h>
-#include <linux/fb.h>
-#include <linux/vt.h>
-#include <fcntl.h>
-#include <unistd.h>
-
 struct fbdev_window native_window;
 static EGLContext g_egl_ctx;
 static EGLSurface g_egl_surf;
diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
index 88957e7e64..0bcb68268e 100644
--- a/gfx/drivers_context/ps3_ctx.c
+++ b/gfx/drivers_context/ps3_ctx.c
@@ -14,9 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../runloop.h"
-#include "../../defines/ps3_defines.h"
+#include <stdint.h>
+
+#ifndef __PSL1GHT__
+#include <sys/spu_initialize.h>
+#endif
 
 #ifdef HAVE_LIBDBGFONT
 #ifndef __PSL1GHT__
@@ -24,22 +26,17 @@
 #endif
 #endif
 
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../../defines/ps3_defines.h"
+#include "../drivers/gl_common.h"
+#include "../video_context_driver.h"
 #include "../video_monitor.h"
 
-#ifndef __PSL1GHT__
-#include <sys/spu_initialize.h>
-#endif
-
-#include <stdint.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "../drivers/gl_common.h"
-
-#include "../video_context_driver.h"
-
 typedef struct gfx_ctx_ps3_data
 {
 #if defined(HAVE_PSGL)
diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index 004cd0d79c..99673ee28c 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -14,13 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "SDL.h"
+
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../drivers/gl_common.h"
 #include "../video_monitor.h"
 
-#include "SDL.h"
-
 static enum gfx_ctx_api g_api = GFX_CTX_OPENGL_API;
 static unsigned       g_major = 2;
 static unsigned       g_minor = 1;
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index ff719896d1..49153b0a3f 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -14,21 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../runloop.h"
-#include "../video_context_driver.h"
-#include "../drivers/gl_common.h"
-#include "../video_monitor.h"
-#include <retro_inline.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
+#include <stdint.h>
 #include <errno.h>
 #include <signal.h>
-#include <stdint.h>
 #include <unistd.h>
+
 #include <sched.h>
 
 #include <EGL/egl.h>
@@ -37,6 +27,18 @@
 #include <VG/openvg.h>
 #include <bcm_host.h>
 
+#include <retro_inline.h>
+
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../video_context_driver.h"
+#include "../drivers/gl_common.h"
+#include "../video_monitor.h"
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 static bool g_use_hw_ctx;
 static EGLContext g_egl_hw_ctx;
 static EGLContext g_egl_ctx;
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index 81ade0441a..5e76b4e2f1 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -14,15 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <signal.h>
+
+#include <EGL/egl.h>
+
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
 #include "../video_monitor.h"
 #include "../drivers/gl_common.h"
 
-#include <EGL/egl.h>
-#include <signal.h>
-
 static EGLContext g_egl_ctx;
 static EGLSurface g_egl_surf;
 static EGLDisplay g_egl_dpy;
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 5c7028cf20..6fdee08132 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -14,21 +14,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sys/poll.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include <wayland-client.h>
+#include <wayland-egl.h>
+
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
 #include "../video_monitor.h"
 #include "../drivers/gl_common.h"
 
-#include <wayland-client.h>
-#include <wayland-egl.h>
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <signal.h>
-#include <sys/poll.h>
-#include <unistd.h>
-
 typedef struct gfx_ctx_wayland_data
 {
    EGLContext g_egl_ctx;
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index e52367ad06..f9fe5ceb6d 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -18,17 +18,18 @@
 * Should be its own file as it has lots of X11 stuff baked into it as well.
 */
 
+#include <stdint.h>
+#include <signal.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../drivers/gl_common.h"
 #include "../video_monitor.h"
 #include "../common/x11_common.h"
 
-#include <signal.h>
-#include <stdint.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
 #ifndef EGL_OPENGL_ES3_BIT_KHR
 #define EGL_OPENGL_ES3_BIT_KHR 0x0040
 #endif
diff --git a/gfx/drivers_font/ps_libdbgfont.c b/gfx/drivers_font/ps_libdbgfont.c
index d20ffdaf65..1ab82956e5 100644
--- a/gfx/drivers_font/ps_libdbgfont.c
+++ b/gfx/drivers_font/ps_libdbgfont.c
@@ -14,9 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../font_renderer_driver.h"
-#include "../font_driver.h"
-
 #if defined(SN_TARGET_PSP2)
 #include <libdbgfont.h>
 #define DbgFontPrint(x, y, scale, color, msg) sceDbgFontPrint(x, y, color, msg)
@@ -32,6 +29,9 @@
 #define DbgFontExit cellDbgFontExit
 #endif
 
+#include "../font_renderer_driver.h"
+#include "../font_driver.h"
+
 static void *libdbg_font_init_font(void *gl_data, const char *font_path, float font_size)
 {
    unsigned width, height;
diff --git a/gfx/drivers_font/xdk1_xfonts.c b/gfx/drivers_font/xdk1_xfonts.c
index 968e2e2281..e54cb9646c 100644
--- a/gfx/drivers_font/xdk1_xfonts.c
+++ b/gfx/drivers_font/xdk1_xfonts.c
@@ -15,6 +15,7 @@
  */
 
 #include <xtl.h>
+
 #include "../font_driver.h"
 #include "../../general.h"
 
diff --git a/gfx/drivers_font/xdk360_fonts.c b/gfx/drivers_font/xdk360_fonts.c
index 5d8e216a7d..019f43ba63 100644
--- a/gfx/drivers_font/xdk360_fonts.c
+++ b/gfx/drivers_font/xdk360_fonts.c
@@ -15,6 +15,7 @@
  */
 
 #include <xtl.h>
+
 #include "../font_driver.h"
 #include "../d3d/d3d.h"
 #include "../../general.h"