diff --git a/include/attributes.h b/include/attributes.h
index 3276c84325..acfaf3edc0 100644
--- a/include/attributes.h
+++ b/include/attributes.h
@@ -1,8 +1,6 @@
 #ifndef ATTRIBUTES_H
 #define ATTRIBUTES_H
 
-#include "versions.h"
-
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
 #endif
diff --git a/include/audio/soundfont_file.h b/include/audio/soundfont_file.h
index 3f320a6e56..9456429774 100644
--- a/include/audio/soundfont_file.h
+++ b/include/audio/soundfont_file.h
@@ -1,7 +1,7 @@
 #ifndef SOUNDFONT_FILE_H
 #define SOUNDFONT_FILE_H
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
 #include "z64audio.h"
diff --git a/include/face_change.h b/include/face_change.h
index 5a0c8d8566..b612641813 100644
--- a/include/face_change.h
+++ b/include/face_change.h
@@ -1,6 +1,8 @@
 #ifndef FACE_CHANGE_H
 #define FACE_CHANGE_H
 
+#include "ultra64.h"
+
 typedef struct FaceChange {
     /* 0x00 */ s16 face;
     /* 0x02 */ s16 timer;
diff --git a/include/gfx.h b/include/gfx.h
index e534655964..6e1fcabe17 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -3,6 +3,7 @@
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
+#include "alignment.h"
 #include "sched.h"
 #include "thga.h"
 #include "versions.h"
diff --git a/include/inflate.h b/include/inflate.h
index f26f7e496b..6da7255f55 100644
--- a/include/inflate.h
+++ b/include/inflate.h
@@ -1,8 +1,8 @@
 #ifndef INFLATE_H
 #define INFLATE_H
 
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64.h"
 
 void gzip_decompress(uintptr_t romStart, u8* dst, size_t size);
diff --git a/include/is_debug.h b/include/is_debug.h
index e5f03bb784..18125dc16c 100644
--- a/include/is_debug.h
+++ b/include/is_debug.h
@@ -1,7 +1,7 @@
 #ifndef IS_DEBUG_H
 #define IS_DEBUG_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "attributes.h"
 
 #if DEBUG_FEATURES
diff --git a/include/libc64/sprintf.h b/include/libc64/sprintf.h
index 485f938f58..55e10045ea 100644
--- a/include/libc64/sprintf.h
+++ b/include/libc64/sprintf.h
@@ -1,8 +1,6 @@
 #ifndef LIBC64_SPRINTF_H
 #define LIBC64_SPRINTF_H
 
-#include "ultra64.h"
-
 #include "stdarg.h"
 
 int vsprintf(char* dst, const char* fmt, va_list args);
diff --git a/include/padmgr.h b/include/padmgr.h
index 4b9e6890cd..9859b501a6 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "libu64/pad.h"
 #include "irqmgr.h"
-#include "versions.h"
 
 typedef enum ControllerPakType {
     CONT_PAK_NONE,
diff --git a/include/romfile.h b/include/romfile.h
index 49b5f202dc..31edd72f33 100644
--- a/include/romfile.h
+++ b/include/romfile.h
@@ -1,7 +1,7 @@
 #ifndef ROMFILE_H
 #define ROMFILE_H
 
-#include "ultra64.h"
+#include "stdint.h"
 
 typedef struct RomFile {
     /* 0x00 */ uintptr_t vromStart;
diff --git a/include/sfx.h b/include/sfx.h
index 4dfb96f9b4..f7d86d87ac 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "versions.h"
 #include "z64math.h"
-#include "libc/assert.h"
+#include "assert.h"
 
 #define MAX_CHANNELS_PER_BANK 3
 
diff --git a/include/tha.h b/include/tha.h
index 941321b820..6a40db54cd 100644
--- a/include/tha.h
+++ b/include/tha.h
@@ -2,7 +2,6 @@
 #define THA_H
 
 #include "ultra64.h"
-#include "alignment.h"
 
 typedef struct TwoHeadArena {
     /* 0x00 */ size_t size;
diff --git a/include/ultra64.h b/include/ultra64.h
index 4a8696a841..c7607ac921 100644
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -1,14 +1,14 @@
 #ifndef ULTRA64_H
 #define ULTRA64_H
 
-#include "libc/assert.h"
-#include "libc/math.h"
-#include "libc/stdarg.h"
-#include "libc/stdbool.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
-#include "libc/stdlib.h"
-#include "libc/string.h"
+#include "assert.h"
+#include "math.h"
+#include "stdarg.h"
+#include "stdbool.h"
+#include "stddef.h"
+#include "stdint.h"
+#include "stdlib.h"
+#include "string.h"
 
 #include "ultra64/ultratypes.h"
 #include "unk.h"
diff --git a/include/yaz0.h b/include/yaz0.h
index 52f5ba951e..b42c8e3ff8 100644
--- a/include/yaz0.h
+++ b/include/yaz0.h
@@ -1,8 +1,8 @@
 #ifndef YAZ0_H
 #define YAZ0_H
 
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64.h"
 
 void Yaz0_Decompress(uintptr_t romStart, u8* dst, size_t size);
diff --git a/include/z64actor.h b/include/z64actor.h
index 1a8b503297..30869fde47 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -2,7 +2,6 @@
 #define Z64ACTOR_H
 
 #include "color.h"
-#include "romfile.h"
 #include "z64actor_profile.h"
 #include "z64animation.h"
 #include "z64math.h"
diff --git a/include/z64curve.h b/include/z64curve.h
index 8fb83242ba..3ca0eac132 100644
--- a/include/z64curve.h
+++ b/include/z64curve.h
@@ -1,8 +1,7 @@
 #ifndef Z64_CURVE_H
 #define Z64_CURVE_H
 
-#include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "ultra64.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64game.h b/include/z64game.h
index fe683777b7..aaf70be321 100644
--- a/include/z64game.h
+++ b/include/z64game.h
@@ -5,7 +5,6 @@
 #include "ultra64/ultratypes.h"
 #include "libu64/pad.h"
 #include "gamealloc.h"
-#include "romfile.h"
 #include "tha.h"
 
 struct GraphicsContext;
diff --git a/include/z64light.h b/include/z64light.h
index cb666ff752..ff6f732e12 100644
--- a/include/z64light.h
+++ b/include/z64light.h
@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "ultra64/gbi.h"
 #include "z64math.h"
-#include "color.h"
 
 struct GraphicsContext;
 struct PlayState;
diff --git a/include/z64skybox.h b/include/z64skybox.h
index e0ebcf0c03..60b3bbb7d3 100644
--- a/include/z64skybox.h
+++ b/include/z64skybox.h
@@ -4,8 +4,8 @@
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
+#include "romfile.h"
 #include "z64math.h"
-#include "z64dma.h" // for RomFile
 
 struct GameState;
 struct GraphicsContext;
diff --git a/include/z64ss_sram.h b/include/z64ss_sram.h
index ffd628239d..4168446263 100644
--- a/include/z64ss_sram.h
+++ b/include/z64ss_sram.h
@@ -1,7 +1,7 @@
 #ifndef Z64SS_SRAM_H
 #define Z64SS_SRAM_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "ultra64/ultratypes.h"
 
 void SsSram_Init(s32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration,
diff --git a/include/z64transition.h b/include/z64transition.h
index d46683d2b3..f867aed09a 100644
--- a/include/z64transition.h
+++ b/include/z64transition.h
@@ -2,7 +2,7 @@
 #define Z64TRANSITION_H
 
 #include "ultra64/ultratypes.h"
-#include "ultra64/gbi.h" // for Gfx
+#include "ultra64/gbi.h"
 #include "transition_circle.h"
 #include "transition_fade.h"
 #include "transition_triforce.h"
diff --git a/include/z_lib.h b/include/z_lib.h
index 1e9052f93b..24fa806914 100644
--- a/include/z_lib.h
+++ b/include/z_lib.h
@@ -1,7 +1,7 @@
 #ifndef Z_LIB_H
 #define Z_LIB_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "libu64/pad.h"
 #include "z64math.h"
 #include "color.h"
diff --git a/include/z_locale.h b/include/z_locale.h
index 7afcb33db4..5be416e823 100644
--- a/include/z_locale.h
+++ b/include/z_locale.h
@@ -2,7 +2,6 @@
 #define Z_LOCALE_H
 
 #include "ultra64/ultratypes.h"
-#include "region.h"
 
 extern s32 gCurrentRegion;
 
diff --git a/src/audio/game/session_init.c b/src/audio/game/session_init.c
index 3c3d9c4aeb..b8bc1924c2 100644
--- a/src/audio/game/session_init.c
+++ b/src/audio/game/session_init.c
@@ -1,3 +1,4 @@
+#include "alignment.h"
 #include "array_count.h"
 #include "buffers.h"
 #include "z64audio.h"
diff --git a/src/audio/internal/load.c b/src/audio/internal/load.c
index f723e5b836..91c25fabf7 100644
--- a/src/audio/internal/load.c
+++ b/src/audio/internal/load.c
@@ -2,6 +2,7 @@
  * Original Filename: system.c
  */
 
+#include "alignment.h"
 #include "array_count.h"
 #include "attributes.h"
 #include "buffers.h"
diff --git a/src/boot/inflate.c b/src/boot/inflate.c
index 391ce0368f..d9fc7c3f8d 100644
--- a/src/boot/inflate.c
+++ b/src/boot/inflate.c
@@ -98,8 +98,8 @@
 #include "inflate.h"
 
 #include "ultra64/ultratypes.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "alignment.h"
 #include "attributes.h"
 #include "z64dma.h"
diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c
index 6d63118853..185ee77c62 100644
--- a/src/boot/is_debug.c
+++ b/src/boot/is_debug.c
@@ -1,6 +1,7 @@
 #include "is_debug.h"
 
 #include "ultra64.h"
+#include "versions.h"
 
 typedef struct ISVDbg {
     /* 0x00 */ u32 magic; // "IS64"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index de2a19e57c..f38edf74a4 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -45,8 +45,8 @@
 #include "z64dma.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:66" \
-                               "pal-1.0:64 pal-1.1:64"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:86" \
+                               "pal-1.0:84 pal-1.1:84"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;
diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c
index 490304a472..23ef69a910 100644
--- a/src/code/TwoHeadArena.c
+++ b/src/code/TwoHeadArena.c
@@ -10,6 +10,7 @@
  * with identical lifetime.
  */
 #include "tha.h"
+#include "alignment.h"
 
 void* THA_GetHead(TwoHeadArena* tha) {
     return tha->head;
diff --git a/src/code/gfxalloc.c b/src/code/gfxalloc.c
index 9e2fe9bb99..3b4d72f057 100644
--- a/src/code/gfxalloc.c
+++ b/src/code/gfxalloc.c
@@ -1,4 +1,5 @@
-#include "gfx.h"
+#include "gfxalloc.h"
+#include "alignment.h"
 
 Gfx* Gfx_Open(Gfx* gfx) {
     return gfx + 1;
diff --git a/src/code/main.c b/src/code/main.c
index cb936b2176..9bd722f9ce 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -44,7 +44,7 @@ extern struct IrqMgr gIrqMgr;
 #include "z64thread.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:0 ntsc-1.0:34 ntsc-1.1:34 ntsc-1.2:34 pal-1.0:32 pal-1.1:32"
+                               "ique-cn:0 ntsc-1.0:54 ntsc-1.1:54 ntsc-1.2:54 pal-1.0:52 pal-1.1:52"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 97cb44a4f0..18bfafbc3a 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -7,7 +7,7 @@
 #include "z64save.h"
 #include "z64transition.h"
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 ALIGNED(16) SaveContext gSaveContext;
diff --git a/src/libleo/api/cacreateleomanager.c b/src/libleo/api/cacreateleomanager.c
index d4f6f5100b..4ae1c7bd9e 100644
--- a/src/libleo/api/cacreateleomanager.c
+++ b/src/libleo/api/cacreateleomanager.c
@@ -2,7 +2,7 @@
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "attributes.h"
 
 #include "ultra64.h"
diff --git a/src/libleo/api/cjcreateleomanager.c b/src/libleo/api/cjcreateleomanager.c
index 23f9da8226..1daf54ca12 100644
--- a/src/libleo/api/cjcreateleomanager.c
+++ b/src/libleo/api/cjcreateleomanager.c
@@ -2,7 +2,7 @@
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "attributes.h"
 
 #include "ultra64.h"
diff --git a/src/libultra/audio/drvrnew.c b/src/libultra/audio/drvrnew.c
index 6b10e66b72..e549347e0f 100644
--- a/src/libultra/audio/drvrnew.c
+++ b/src/libultra/audio/drvrnew.c
@@ -1,5 +1,7 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stdbool.h"
+#include "stddef.h"
 
 // WARNING: THE FOLLOWING CONSTANT MUST BE KEPT IN SYNC WITH SCALING IN MICROCODE!!!
 #define SCALE 16384
diff --git a/src/libultra/audio/env.c b/src/libultra/audio/env.c
index 2d0027ba7d..654c682ab3 100644
--- a/src/libultra/audio/env.c
+++ b/src/libultra/audio/env.c
@@ -1,6 +1,7 @@
 #include "libaudio.h"
 #include "synthInternals.h"
-#include "libc/math.h"
+#include "stdbool.h"
+#include "stddef.h"
 #include "ultra64/convert.h"
 
 #define EQPOWER_LENGTH 128
diff --git a/src/libultra/audio/filter.c b/src/libultra/audio/filter.c
index 937ffd04c5..20e5d7e606 100644
--- a/src/libultra/audio/filter.c
+++ b/src/libultra/audio/filter.c
@@ -1,5 +1,6 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 void alFilterNew(ALFilter* f, ALCmdHandler h, ALSetParam s, s32 type) {
     f->source = NULL;
diff --git a/src/libultra/audio/heapalloc.c b/src/libultra/audio/heapalloc.c
index 52c3605c51..708134ec2b 100644
--- a/src/libultra/audio/heapalloc.c
+++ b/src/libultra/audio/heapalloc.c
@@ -1,5 +1,6 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 void* alHeapDBAlloc(u8* file, s32 line, ALHeap* hp, s32 num, s32 size) {
     s32 bytes;
diff --git a/src/libultra/audio/libaudio.h b/src/libultra/audio/libaudio.h
index 67f04567bf..4d30b0161e 100644
--- a/src/libultra/audio/libaudio.h
+++ b/src/libultra/audio/libaudio.h
@@ -1,9 +1,6 @@
 #ifndef __LIB_AUDIO__
 #define __LIB_AUDIO__
 
-#include "libc/stdbool.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
 #include "ultra64/ultratypes.h"
 
 #include "libaudio_abi.h"
diff --git a/src/libultra/audio/load.c b/src/libultra/audio/load.c
index 86486ce3a7..02be1f47cd 100644
--- a/src/libultra/audio/load.c
+++ b/src/libultra/audio/load.c
@@ -1,5 +1,8 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stdbool.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64/R4300.h"
 
 #ifndef MIN
diff --git a/src/libultra/audio/resample.c b/src/libultra/audio/resample.c
index 8301d22a1a..8001eb151b 100644
--- a/src/libultra/audio/resample.c
+++ b/src/libultra/audio/resample.c
@@ -1,5 +1,7 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stdbool.h"
+#include "stddef.h"
 #include "ultra64/convert.h"
 
 Acmd* alResamplePull(void* filter, s16* outp, s32 outCnt, s32 sampleOffset, Acmd* p) {
diff --git a/src/libultra/audio/reverb.c b/src/libultra/audio/reverb.c
index 453147f125..9edf3ab9a6 100644
--- a/src/libultra/audio/reverb.c
+++ b/src/libultra/audio/reverb.c
@@ -1,5 +1,8 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stdbool.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64/convert.h"
 
 #define RANGE 2.0
diff --git a/src/libultra/audio/sl.c b/src/libultra/audio/sl.c
index 7f2ebe28b8..ad9949d114 100644
--- a/src/libultra/audio/sl.c
+++ b/src/libultra/audio/sl.c
@@ -1,4 +1,5 @@
 #include "libaudio.h"
+#include "stddef.h"
 
 ALGlobals* alGlobals = NULL;
 
diff --git a/src/libultra/audio/synallocfx.c b/src/libultra/audio/synallocfx.c
index 8c530fc19d..55c8267e14 100644
--- a/src/libultra/audio/synallocfx.c
+++ b/src/libultra/audio/synallocfx.c
@@ -1,3 +1,4 @@
+#include "libaudio.h"
 #include "synthInternals.h"
 
 ALFxRef* alSynAllocFX(ALSynth* s, s16 bus, ALSynConfig* c, ALHeap* hp) {
diff --git a/src/libultra/audio/syndelete.c b/src/libultra/audio/syndelete.c
index 7af0d50090..96299af32f 100644
--- a/src/libultra/audio/syndelete.c
+++ b/src/libultra/audio/syndelete.c
@@ -1,4 +1,5 @@
-#include "synthInternals.h"
+#include "libaudio.h"
+#include "stddef.h"
 
 void alSynDelete(ALSynth* drvr) {
     drvr->head = NULL;
diff --git a/src/libultra/audio/synthesizer.c b/src/libultra/audio/synthesizer.c
index 62d5677ecd..62c07582ed 100644
--- a/src/libultra/audio/synthesizer.c
+++ b/src/libultra/audio/synthesizer.c
@@ -1,4 +1,6 @@
+#include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
diff --git a/src/libultra/bb/sa/common.c b/src/libultra/bb/sa/common.c
index 667af02b7f..a18735f4a5 100644
--- a/src/libultra/bb/sa/common.c
+++ b/src/libultra/bb/sa/common.c
@@ -1,4 +1,4 @@
-#include "libc/stddef.h"
+#include "stddef.h"
 
 int strcmp(const char* s, const char* t) {
     while (*s == *t) {
diff --git a/src/n64dd/n64dd_801CA0B0.c b/src/n64dd/n64dd_801CA0B0.c
index e3ba1be18d..8252def9e5 100644
--- a/src/n64dd/n64dd_801CA0B0.c
+++ b/src/n64dd/n64dd_801CA0B0.c
@@ -3,6 +3,7 @@
 #include "libc64/aprintf.h"
 #include "attributes.h"
 #include "array_count.h"
+#include "color.h"
 
 // Draws text to framebuffer
 typedef struct struct_801CA704 {
diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c
index a8ce0674c7..4b750514df 100644
--- a/src/n64dd/z_n64dd.c
+++ b/src/n64dd/z_n64dd.c
@@ -16,7 +16,7 @@
 #include "z64audio.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
 typedef struct struct_801D9C30 {
     /* 0x000 */ s32 unk_000;       // disk start
diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h
index ae41c4dced..69d71f71d5 100644
--- a/src/overlays/gamestates/ovl_file_choose/file_select.h
+++ b/src/overlays/gamestates/ovl_file_choose/file_select.h
@@ -1,7 +1,7 @@
 #ifndef FILE_SELECT_H
 #define FILE_SELECT_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "ultra64.h"
 #include "gfx.h"
 #include "versions.h"