7 files changed, 10 insertions, 7 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index 1e81ad6f8..570da1ab0 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -5,7 +5,7 @@
 #include "macros.h"
 #include "sys_math3d.h"
 
-#pragma increment_block_number "gc-eu:105 gc-eu-mq:105 gc-jp:105 gc-jp-ce:105 gc-jp-mq:105 gc-us:105 gc-us-mq:105"
+#pragma increment_block_number "gc-eu:106 gc-eu-mq:106 gc-jp:106 gc-jp-ce:106 gc-jp-mq:106 gc-us:106 gc-us-mq:106"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
                                       Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index c1f93a052..298f151e2 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -1,5 +1,5 @@
 #include "z64math.h"
-#include "fp_math.h"
+#include "libc64/math64.h"
 #include "z_lib.h"
 
 /**
diff --git a/src/libc64/aprintf.c b/src/libc64/aprintf.c
index 3fb8cf367..44cedac97 100644
--- a/src/libc64/aprintf.c
+++ b/src/libc64/aprintf.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "libc64/aprintf.h"
+#include "ultra64.h"
 
 s32 PrintUtils_VPrintf(PrintCallback* pfn, const char* fmt, va_list args) {
     return _Printf(*pfn, pfn, fmt, args);
diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c
index a5bd8032b..57dd88e28 100644
--- a/src/libc64/malloc.c
+++ b/src/libc64/malloc.c
@@ -1,4 +1,6 @@
-#include "global.h"
+#include "libc64/malloc.h"
+#include "ultra64.h"
+#include "macros.h"
 #include "libc64/os_malloc.h"
 
 #define LOG_SEVERITY_NOLOG 0
diff --git a/src/libc64/sprintf.c b/src/libc64/sprintf.c
index d4af36356..12286697c 100644
--- a/src/libc64/sprintf.c
+++ b/src/libc64/sprintf.c
@@ -1,5 +1,5 @@
+#include "libc64/sprintf.h"
 #include "stdarg.h"
-#include "stdio.h"
 #include "string.h"
 #include "ultra64/xstdio.h"
 
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index b8f9cf9d5..0671dfc6f 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -1395,7 +1395,7 @@ void func_80B3F3D8(void) {
     Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
 }
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:64 gc-jp:128 gc-jp-ce:128 gc-jp-mq:64 gc-us:128 gc-us-mq:64"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:128 gc-jp-ce:128 gc-jp-mq:64 gc-us:128 gc-us-mq:64"
 
 void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
     static Vec3f D_80B42DA0;
diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c
index dc3691ef0..087e9dfc2 100644
--- a/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -15,7 +15,7 @@
 #include "cic6105.h"
 #endif
 
-#pragma increment_block_number "gc-eu:139 gc-eu-mq:139 gc-jp:141 gc-jp-ce:141 gc-jp-mq:141 gc-us:141 gc-us-mq:141"
+#pragma increment_block_number "gc-eu:136 gc-eu-mq:136 gc-jp:138 gc-jp-ce:138 gc-jp-mq:138 gc-us:138 gc-us-mq:138"
 
 #define FLAGS ACTOR_FLAG_4