3 files changed, 15 insertions, 9 deletions
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 857cc4b88..67dbb3456 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -42,7 +42,7 @@
  */
 #if PLATFORM_GC
 
-#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-eu-mq-dbg:208 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224" \
+#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-eu-mq-dbg:208 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224" \
                                "gc-us-mq:224"
 
 #include "global.h"
diff --git a/src/code/main.c b/src/code/main.c
index ab274c40e..34b0bfaf1 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -1,3 +1,16 @@
+#include "ultra64.h"
+
+#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80"
+
+struct PreNmiBuff* gAppNmiBufferPtr;
+
+#include "segmented_address.h"
+
+struct Scheduler gScheduler;
+struct PadMgr gPadMgr;
+struct IrqMgr gIrqMgr;
+uintptr_t gSegments[NUM_SEGMENTS];
+
 #include "global.h"
 #include "fault.h"
 #include "stack.h"
@@ -14,13 +27,6 @@ s32 gScreenWidth = SCREEN_WIDTH;
 s32 gScreenHeight = SCREEN_HEIGHT;
 u32 gSystemHeapSize = 0;
 
-#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208"
-
-PreNmiBuff* gAppNmiBufferPtr;
-Scheduler gScheduler;
-PadMgr gPadMgr;
-IrqMgr gIrqMgr;
-uintptr_t gSegments[NUM_SEGMENTS];
 OSThread sGraphThread;
 STACK(sGraphStack, 0x1800);
 STACK(sSchedStack, 0x600);
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index 570da1ab0..1e81ad6f8 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:106 gc-eu-mq:106 gc-jp:106 gc-jp-ce:106 gc-jp-mq:106 gc-us:106 gc-us-mq:106"
+#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"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
                                       Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);