diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 932b482215..a3a19cb1b8 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -20,23 +20,23 @@
 #endif
 
 #include <stdint.h>
-#include "../video_shader_driver.h"
+#include <string.h>
 
 #include <Cg/cg.h>
-
 #ifdef HAVE_OPENGL
-#include "../drivers/gl_common.h"
 #include <Cg/cgGL.h>
-
 #endif
 
-#include <string.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <rhash.h>
 
+#ifdef HAVE_OPENGL
+#include "../drivers/gl_common.h"
+#endif
+#include "../video_shader_driver.h"
 #include "../../dynamic.h"
 #include "../../rewind.h"
 #include "../video_state_tracker.h"
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index f05ff44cf7..6fa9a9d518 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -13,12 +13,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
 #include <string.h>
-#include <file/file_path.h>
-#include "../../general.h"
-#include "shader_glsl.h"
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
+#include <file/file_path.h>
+
+#include "../../general.h"
+#include "shader_glsl.h"
 #include "../video_state_tracker.h"
 #include "../../dynamic.h"
 #include "../../file_ops.h"
@@ -27,8 +30,6 @@
 #include "../../config.h"
 #endif
 
-#include <stdlib.h>
-
 #ifdef HAVE_OPENGL
 #include "../drivers/gl_common.h"
 #endif
diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
index 1297b4573e..43142cad84 100644
--- a/gfx/drivers_shader/shader_null.c
+++ b/gfx/drivers_shader/shader_null.c
@@ -14,14 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boolean.h>
+#include <stdlib.h>
 #include <string.h>
-#include "../../general.h"
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
+#include <boolean.h>
+#include <gfx/math/matrix_4x4.h>
+
+#include "../../general.h"
 #include "../video_state_tracker.h"
 #include "../../dynamic.h"
-#include <gfx/math/matrix_4x4.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -32,7 +35,6 @@
 #endif
 
 #include "../video_shader_driver.h"
-#include <stdlib.h>
 
 static void shader_null_deinit(void) { }
 static bool shader_null_init(void *data, const char *path) { return true; }
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 36ed2bd83d..4230196ba1 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -16,6 +16,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
 #include <compat/strl.h>
diff --git a/gfx/video_viewport.h b/gfx/video_viewport.h
index e97cb1d011..2544a30509 100644
--- a/gfx/video_viewport.h
+++ b/gfx/video_viewport.h
@@ -19,6 +19,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <boolean.h>
 
 #ifdef __cplusplus