diff --git a/gfx/drivers_font_renderer/bitmapfont.c b/gfx/drivers_font_renderer/bitmapfont.c
index 75cb15e60d..9ecad09f78 100644
--- a/gfx/drivers_font_renderer/bitmapfont.c
+++ b/gfx/drivers_font_renderer/bitmapfont.c
@@ -14,12 +14,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <boolean.h>
+
 #include "../font_renderer_driver.h"
 #include "bitmap.h"
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <boolean.h>
 
 #define BMP_ATLAS_COLS 16
 #define BMP_ATLAS_ROWS 16
diff --git a/gfx/drivers_font_renderer/coretext.c b/gfx/drivers_font_renderer/coretext.c
index e648953caf..9eb9878dd5 100644
--- a/gfx/drivers_font_renderer/coretext.c
+++ b/gfx/drivers_font_renderer/coretext.c
@@ -13,11 +13,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../font_renderer_driver.h"
-#include "../../general.h"
-#include <string.h>
-#include <stddef.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
 
 #include <CoreFoundation/CFString.h>
 #ifdef IOS
@@ -27,6 +25,9 @@
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
+#include "../font_renderer_driver.h"
+#include "../../general.h"
+
 #define CT_ATLAS_ROWS 16
 #define CT_ATLAS_COLS 16
 #define CT_ATLAS_SIZE (CT_ATLAS_ROWS * CT_ATLAS_COLS)
diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index 9416b17c9e..e73bfff900 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -14,16 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../font_renderer_driver.h"
-#include <file/file_path.h>
-#include "../../general.h"
-#include <string.h>
-#include <stddef.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#include "../font_renderer_driver.h"
+#include <file/file_path.h>
+#include "../../general.h"
+
 #define FT_ATLAS_ROWS 16
 #define FT_ATLAS_COLS 16
 #define FT_ATLAS_SIZE (FT_ATLAS_ROWS * FT_ATLAS_COLS)
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 48e72e93c4..4bedfc22fe 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -14,11 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../font_renderer_driver.h"
+#include <ctype.h>
+
 #include <file/file_path.h>
+
+#include "../font_renderer_driver.h"
 #include "../../general.h"
 #include "../../file_ops.h"
-#include <ctype.h>
 
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STB_RECT_PACK_IMPLEMENTATION