From 9c2c3f1bb834b4793b58368fc4c6c0aec2df858b Mon Sep 17 00:00:00 2001
From: engineer124 <engineer124engineer124@gmail.com>
Date: Sun, 22 Oct 2023 03:35:44 +1100
Subject: [PATCH] cleanup

---
 include/macros.h       | 3 ---
 include/variables.h    | 2 +-
 src/libultra/gu/cosf.c | 3 ++-
 src/libultra/gu/sinf.c | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/macros.h b/include/macros.h
index bc7439394..9513893bb 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -87,9 +87,6 @@
 #define VTX_T(x, y, z, s, t, cr, cg, cb, a) \
     { { x, y, z }, 0, { s, t }, { cr, cg, cb, a }, }
 
-#define SQ(x) ((x) * (x))
-#define ABS(x) ((x) >= 0 ? (x) : -(x))
-#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 #define DECR(x) ((x) == 0 ? 0 : --(x))
 
 #define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x))
diff --git a/include/variables.h b/include/variables.h
index 236fe92de..946fc2c06 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -1459,7 +1459,7 @@ extern f32 D_801E0134;
 extern f32 D_801E0138;
 extern f32 D_801E013C;
 extern f32 D_801E0140;
-extern f32 Math3D_CosOut_min_length;
+extern f32 Math3D_AngleBetweenVectors_min_length;
 extern f32 D_801E0148;
 extern f32 D_801E014C;
 extern f32 Math3D_UnitNormalVector_min_length;
diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c
index 65330e9a6..a738e8b7a 100644
--- a/src/libultra/gu/cosf.c
+++ b/src/libultra/gu/cosf.c
@@ -1,5 +1,6 @@
 #include "libc/math.h"
-#include "macros.h"
+#include "ultra64.h"
+#include "z64math.h"
 
 #pragma weak cosf = __cosf
 
diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c
index 963bc2022..c18971706 100644
--- a/src/libultra/gu/sinf.c
+++ b/src/libultra/gu/sinf.c
@@ -1,5 +1,6 @@
 #include "libc/math.h"
-#include "macros.h"
+#include "ultra64.h"
+#include "z64math.h"
 
 #pragma weak sinf = __sinf