From b9618a40e4bedac971488153a73154ea1eb865d7 Mon Sep 17 00:00:00 2001
From: asrael <asrael@pxl8.org>
Date: Thu, 13 Nov 2025 07:15:41 -0600
Subject: [PATCH] fixup header include ordering

---
 src/pxl8.c           | 3 ++-
 src/pxl8_ase.c       | 3 ++-
 src/pxl8_atlas.c     | 3 ++-
 src/pxl8_bsp.c       | 4 ++--
 src/pxl8_cart.c      | 6 ++++--
 src/pxl8_font.c      | 4 ++--
 src/pxl8_gfx.c       | 4 ++--
 src/pxl8_io.c        | 3 ++-
 src/pxl8_math.c      | 2 --
 src/pxl8_math.h      | 2 ++
 src/pxl8_procgen.c   | 5 ++---
 src/pxl8_script.c    | 6 ++++--
 src/pxl8_sdl3.c      | 7 ++++---
 src/pxl8_tilemap.c   | 3 ++-
 src/pxl8_tilesheet.c | 3 ++-
 src/pxl8_ui.c        | 6 ++++--
 src/pxl8_vfx.c       | 5 ++---
 src/pxl8_world.c     | 4 ++--
 18 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/pxl8.c b/src/pxl8.c
index 5907bbb..c14de3d 100644
--- a/src/pxl8.c
+++ b/src/pxl8.c
@@ -2,9 +2,10 @@
 #define PXL8_COPYRIGHT "Copyright (c) 2024-2025 pxl8.org"
 #define PXL8_VERSION "0.1.0"
 
-#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <pthread.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/pxl8_ase.c b/src/pxl8_ase.c
index fef5a47..4d6a224 100644
--- a/src/pxl8_ase.c
+++ b/src/pxl8_ase.c
@@ -1,3 +1,5 @@
+#include "pxl8_ase.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -9,7 +11,6 @@
 
 #include <miniz.h>
 
-#include "pxl8_ase.h"
 #include "pxl8_io.h"
 #include "pxl8_macros.h"
 
diff --git a/src/pxl8_atlas.c b/src/pxl8_atlas.c
index 96b28a2..f88bea5 100644
--- a/src/pxl8_atlas.c
+++ b/src/pxl8_atlas.c
@@ -1,11 +1,12 @@
 #include "pxl8_atlas.h"
-#include "pxl8_macros.h"
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "pxl8_macros.h"
+
 typedef struct pxl8_skyline_fit {
     bool found;
     u32 node_idx;
diff --git a/src/pxl8_bsp.c b/src/pxl8_bsp.c
index 83f5620..2ad26e5 100644
--- a/src/pxl8_bsp.c
+++ b/src/pxl8_bsp.c
@@ -1,9 +1,9 @@
-#include <math.h>
+#include "pxl8_bsp.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "pxl8_bsp.h"
 #include "pxl8_gfx.h"
 #include "pxl8_io.h"
 #include "pxl8_macros.h"
diff --git a/src/pxl8_cart.c b/src/pxl8_cart.c
index 1d3defa..ed7d957 100644
--- a/src/pxl8_cart.c
+++ b/src/pxl8_cart.c
@@ -1,13 +1,15 @@
-#include <dirent.h>
+#include "pxl8_cart.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <miniz.h>
 
-#include "pxl8_cart.h"
 #include "pxl8_macros.h"
 
 struct pxl8_cart {
diff --git a/src/pxl8_font.c b/src/pxl8_font.c
index f2b56ac..445ec67 100644
--- a/src/pxl8_font.c
+++ b/src/pxl8_font.c
@@ -1,8 +1,8 @@
+#include "pxl8_font.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "pxl8_font.h"
-
 pxl8_result pxl8_font_create_atlas(const pxl8_font* font, u8** atlas_data, i32* atlas_width, i32* atlas_height) {
     if (!font || !atlas_data || !atlas_width || !atlas_height) {
         return PXL8_ERROR_NULL_POINTER;
diff --git a/src/pxl8_gfx.c b/src/pxl8_gfx.c
index 4695fdd..2b7b6b0 100644
--- a/src/pxl8_gfx.c
+++ b/src/pxl8_gfx.c
@@ -1,4 +1,5 @@
-#include <math.h>
+#include "pxl8_gfx.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -6,7 +7,6 @@
 #include "pxl8_atlas.h"
 #include "pxl8_blit.h"
 #include "pxl8_font.h"
-#include "pxl8_gfx.h"
 #include "pxl8_hal.h"
 #include "pxl8_macros.h"
 #include "pxl8_math.h"
diff --git a/src/pxl8_io.c b/src/pxl8_io.c
index 2eacef1..79baec6 100644
--- a/src/pxl8_io.c
+++ b/src/pxl8_io.c
@@ -1,7 +1,8 @@
+#include "pxl8_io.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "pxl8_io.h"
 #include "pxl8_types.h"
 
 static inline char pxl8_to_lower(char c) {
diff --git a/src/pxl8_math.c b/src/pxl8_math.c
index 5247eac..56f423c 100644
--- a/src/pxl8_math.c
+++ b/src/pxl8_math.c
@@ -1,5 +1,3 @@
-#include <math.h>
-
 #include "pxl8_math.h"
 
 pxl8_vec2 pxl8_vec2_add(pxl8_vec2 a, pxl8_vec2 b) {
diff --git a/src/pxl8_math.h b/src/pxl8_math.h
index 773cb9a..956f3df 100644
--- a/src/pxl8_math.h
+++ b/src/pxl8_math.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <math.h>
+
 #include "pxl8_types.h"
 
 typedef struct pxl8_vec2 {
diff --git a/src/pxl8_procgen.c b/src/pxl8_procgen.c
index 1144458..137a246 100644
--- a/src/pxl8_procgen.c
+++ b/src/pxl8_procgen.c
@@ -1,11 +1,10 @@
 #include "pxl8_procgen.h"
 
-#include "pxl8_macros.h"
-
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "pxl8_macros.h"
+
 typedef struct cave_grid {
     u8* cells;
     i32 width;
diff --git a/src/pxl8_script.c b/src/pxl8_script.c
index c97e18d..87c1bf4 100644
--- a/src/pxl8_script.c
+++ b/src/pxl8_script.c
@@ -1,7 +1,10 @@
-#include <dirent.h>
+#include "pxl8_script.h"
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -10,7 +13,6 @@
 #include <lualib.h>
 
 #include "pxl8_macros.h"
-#include "pxl8_script.h"
 #include "pxl8_ui.h"
 
 struct pxl8_script {
diff --git a/src/pxl8_sdl3.c b/src/pxl8_sdl3.c
index 78ab630..1735b82 100644
--- a/src/pxl8_sdl3.c
+++ b/src/pxl8_sdl3.c
@@ -1,12 +1,13 @@
 #include "pxl8_sdl3.h"
-#include "pxl8_atlas.h"
-#include "pxl8_game.h"
-#include "pxl8_macros.h"
 
 #define SDL_MAIN_USE_CALLBACKS
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
 
+#include "pxl8_atlas.h"
+#include "pxl8_game.h"
+#include "pxl8_macros.h"
+
 typedef struct pxl8_sdl3_context {
     SDL_Texture* atlas_texture;
     SDL_Texture* framebuffer_texture;
diff --git a/src/pxl8_tilemap.c b/src/pxl8_tilemap.c
index 0cdc76d..ac56a91 100644
--- a/src/pxl8_tilemap.c
+++ b/src/pxl8_tilemap.c
@@ -1,9 +1,10 @@
+#include "pxl8_tilemap.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "pxl8_ase.h"
 #include "pxl8_macros.h"
-#include "pxl8_tilemap.h"
 #include "pxl8_tilesheet.h"
 
 struct pxl8_tilesheet {
diff --git a/src/pxl8_tilesheet.c b/src/pxl8_tilesheet.c
index 87b4abb..fc29618 100644
--- a/src/pxl8_tilesheet.c
+++ b/src/pxl8_tilesheet.c
@@ -1,9 +1,10 @@
+#include "pxl8_tilesheet.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "pxl8_ase.h"
 #include "pxl8_macros.h"
-#include "pxl8_tilesheet.h"
 #include "pxl8_tilemap.h"
 
 struct pxl8_tilesheet {
diff --git a/src/pxl8_ui.c b/src/pxl8_ui.c
index cbac4a7..77ab29a 100644
--- a/src/pxl8_ui.c
+++ b/src/pxl8_ui.c
@@ -1,10 +1,12 @@
 #include "pxl8_ui.h"
-#include "../lib/microui/src/microui.h"
-#include "pxl8_font.h"
 
 #include <stdlib.h>
 #include <string.h>
 
+#include <microui.h>
+
+#include "pxl8_font.h"
+
 struct pxl8_ui {
     pxl8_gfx* gfx;
     mu_Context mu_ctx;
diff --git a/src/pxl8_vfx.c b/src/pxl8_vfx.c
index 5605cb3..430da50 100644
--- a/src/pxl8_vfx.c
+++ b/src/pxl8_vfx.c
@@ -1,9 +1,8 @@
-#include <math.h>
+#include "pxl8_vfx.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "pxl8_vfx.h"
-
 struct pxl8_particles {
     pxl8_particle* particles;
     u32 alive_count;
diff --git a/src/pxl8_world.c b/src/pxl8_world.c
index 942974a..23a610f 100644
--- a/src/pxl8_world.c
+++ b/src/pxl8_world.c
@@ -1,11 +1,11 @@
-#include <math.h>
+#include "pxl8_world.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "pxl8_bsp.h"
 #include "pxl8_macros.h"
 #include "pxl8_procgen.h"
-#include "pxl8_world.h"
 
 struct pxl8_world {
     pxl8_bsp bsp;