diff --git a/src/libultra/flash/osFlash.c b/src/libultra/flash/osFlash.c
index 207b17f870..86765260ae 100644
--- a/src/libultra/flash/osFlash.c
+++ b/src/libultra/flash/osFlash.c
@@ -1,5 +1,4 @@
 #include "ultra64.h"
-#include "global.h"
 #include "PR/os_internal_flash.h"
 #include "alignment.h"
 
diff --git a/src/libultra/gu/coss.c b/src/libultra/gu/coss.c
index ebed284053..cd134d07bc 100644
--- a/src/libultra/gu/coss.c
+++ b/src/libultra/gu/coss.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 /**
  * Compute the sine of a hex angle and return a short, using the formula cos(x) = sin(x+pi).
diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c
index e1c7500cf1..af960eaf0e 100644
--- a/src/libultra/gu/lookat.c
+++ b/src/libultra/gu/lookat.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;
diff --git a/src/libultra/gu/lookathil.c b/src/libultra/gu/lookathil.c
index 22540337cd..cae56b0cf2 100644
--- a/src/libultra/gu/lookathil.c
+++ b/src/libultra/gu/lookathil.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt,
                      f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, /* light 1 direction */
diff --git a/src/libultra/gu/ortho.c b/src/libultra/gu/ortho.c
index 01c09c4669..2a1d785186 100644
--- a/src/libultra/gu/ortho.c
+++ b/src/libultra/gu/ortho.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guOrthoF(float m[4][4], float l, float r, float b, float t, float n, float f, float scale) {
     int i;
diff --git a/src/libultra/gu/perspective.c b/src/libultra/gu/perspective.c
index d112bc7b34..a869e7723d 100644
--- a/src/libultra/gu/perspective.c
+++ b/src/libultra/gu/perspective.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale) {
     float cot;
diff --git a/src/libultra/gu/position.c b/src/libultra/gu/position.c
index 9ba9d35702..17852abc02 100644
--- a/src/libultra/gu/position.c
+++ b/src/libultra/gu/position.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/math.h"
 
 /**
  * guPositionF
diff --git a/src/libultra/gu/rotate.c b/src/libultra/gu/rotate.c
index 2410863e21..b51c35fef6 100644
--- a/src/libultra/gu/rotate.c
+++ b/src/libultra/gu/rotate.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/math.h"
 
 void guRotateF(float m[4][4], float a, float x, float y, float z) {
     static float dtor = M_PI / 180.0f;
diff --git a/src/libultra/gu/sqrtf.c b/src/libultra/gu/sqrtf.c
index 5e5fa233cc..70e59989e8 100644
--- a/src/libultra/gu/sqrtf.c
+++ b/src/libultra/gu/sqrtf.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 #ifndef __GNUC__
 #define __builtin_sqrtf sqrtf
diff --git a/src/libultra/gu/us2dex.c b/src/libultra/gu/us2dex.c
index c87176f490..810a7d3d13 100644
--- a/src/libultra/gu/us2dex.c
+++ b/src/libultra/gu/us2dex.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "PR/gs2dex.h"
 
 void guS2DInitBg(uObjBg* bg) {