From c1c4d5fd74bc1ca4a50b8eaef95f3f14294242c0 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya0@users.noreply.github.com>
Date: Fri, 10 Oct 2025 05:21:57 -0400
Subject: [PATCH] clean up includes (#932)

---
 .github/workflows/tidy-format-validation.yml |  2 +-
 include/fast/interpreter.h                   |  2 +-
 include/fast/resource/type/Matrix.h          |  2 +-
 include/fast/types.h                         | 25 ++++++++++++++++++++
 include/libultraship/libultra/types.h        | 25 +-------------------
 src/fast/backends/gfx_metal.cpp              |  2 +-
 src/fast/interpreter.cpp                     |  2 +-
 7 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 include/fast/types.h

diff --git a/.github/workflows/tidy-format-validation.yml b/.github/workflows/tidy-format-validation.yml
index 9c1eb16..bfb5c19 100644
--- a/.github/workflows/tidy-format-validation.yml
+++ b/.github/workflows/tidy-format-validation.yml
@@ -50,7 +50,7 @@ jobs:
           mkdir clang-tidy-result
       - name: Analyze
         run: |
-          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
+          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!include/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
       - name: Save PR metadata
         run: |
           echo ${{ github.event.number }} > clang-tidy-result/pr-id.txt
diff --git a/include/fast/interpreter.h b/include/fast/interpreter.h
index 2df3e4f..5b5bf0e 100644
--- a/include/fast/interpreter.h
+++ b/include/fast/interpreter.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "fast/lus_gbi.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 #include "fast/ucodehandlers.h"
 #include "backends/gfx_rendering_api.h"
 
diff --git a/include/fast/resource/type/Matrix.h b/include/fast/resource/type/Matrix.h
index c4b9371..a820351 100644
--- a/include/fast/resource/type/Matrix.h
+++ b/include/fast/resource/type/Matrix.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ship/resource/Resource.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 
 namespace Fast {
 class Matrix final : public Ship::Resource<Mtx> {
diff --git a/include/fast/types.h b/include/fast/types.h
new file mode 100644
index 0000000..a60cca0
--- /dev/null
+++ b/include/fast/types.h
@@ -0,0 +1,25 @@
+#pragma once
+
+typedef int Mtx_t[4][4];
+typedef union {
+    Mtx_t m;
+    struct {
+        unsigned short int intPart[4][4];
+        unsigned short int fracPart[4][4];
+    };
+    long long int forc_structure_alignment;
+} MtxS;
+
+typedef float MtxF_t[4][4];
+typedef union {
+    MtxF_t mf;
+    struct {
+        float xx, yx, zx, wx, xy, yy, zy, wy, xz, yz, zz, wz, xw, yw, zw, ww;
+    };
+} MtxF;
+
+#ifndef GBI_FLOATS
+typedef MtxS Mtx;
+#else
+typedef MtxF Mtx;
+#endif
diff --git a/include/libultraship/libultra/types.h b/include/libultraship/libultra/types.h
index 0ed49c9..3bdb4d3 100644
--- a/include/libultraship/libultra/types.h
+++ b/include/libultraship/libultra/types.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <fast/types.h>
 
 typedef signed char s8;
 typedef unsigned char u8;
@@ -30,27 +31,3 @@ typedef s32 ptrdiff_t;
 typedef s32 intptr_t;
 typedef u32 uintptr_t;
 #endif
-
-typedef int Mtx_t[4][4];
-typedef union {
-    Mtx_t m;
-    struct {
-        u16 intPart[4][4];
-        u16 fracPart[4][4];
-    };
-    long long int forc_structure_alignment;
-} MtxS;
-
-typedef float MtxF_t[4][4];
-typedef union {
-    MtxF_t mf;
-    struct {
-        float xx, yx, zx, wx, xy, yy, zy, wy, xz, yz, zz, wz, xw, yw, zw, ww;
-    };
-} MtxF;
-
-#ifndef GBI_FLOATS
-typedef MtxS Mtx;
-#else
-typedef MtxF Mtx;
-#endif
diff --git a/src/fast/backends/gfx_metal.cpp b/src/fast/backends/gfx_metal.cpp
index 27540d2..ad7cc49 100644
--- a/src/fast/backends/gfx_metal.cpp
+++ b/src/fast/backends/gfx_metal.cpp
@@ -38,7 +38,7 @@
 #include "ship/Context.h"
 #include "ship/config/ConsoleVariable.h"
 
-#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
+#define ARRAY_COUNT(arr) (int32_t)(sizeof(arr) / sizeof(arr[0]))
 
 // MARK: - Helpers
 namespace Fast {
diff --git a/src/fast/interpreter.cpp b/src/fast/interpreter.cpp
index e13ccea..9076d6f 100644
--- a/src/fast/interpreter.cpp
+++ b/src/fast/interpreter.cpp
@@ -21,7 +21,7 @@
 #define _LANGUAGE_C
 #endif
 #include "fast/debug/GfxDebugger.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 #include <string>
 
 #include "fast/interpreter.h"