diff --git a/gfx/drivers/gl_common.h b/gfx/drivers/gl_common.h
index 5abeb62705..455be16c81 100644
--- a/gfx/drivers/gl_common.h
+++ b/gfx/drivers/gl_common.h
@@ -17,22 +17,12 @@
 #ifndef __GL_COMMON_H
 #define __GL_COMMON_H
 
-#include "../../general.h"
-#include "../font_renderer_driver.h"
-#include <gfx/math/matrix_4x4.h>
-#include <gfx/scaler/scaler.h>
-#include <formats/image.h>
-#include "../video_context_driver.h"
-#include "../video_shader_driver.h"
-#include "../video_shader_parse.h"
-#include <retro_inline.h>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
-#include <string.h>
-
 #ifdef HAVE_EGL
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -40,6 +30,16 @@
 
 #include <glsym/glsym.h>
 
+#include <retro_inline.h>
+#include <gfx/math/matrix_4x4.h>
+#include <gfx/scaler/scaler.h>
+#include <formats/image.h>
+
+#include "../../general.h"
+#include "../font_renderer_driver.h"
+#include "../video_context_driver.h"
+#include "../video_shader_driver.h"
+#include "../video_shader_parse.h"
 
 #if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3))
 #ifdef GL_PIXEL_PACK_BUFFER
@@ -177,7 +177,6 @@
 #endif
 #endif
 
-
 struct gfx_fbo_rect
 {
    unsigned img_width;