diff --git a/Makefile b/Makefile
index 33a6434a3b..fc9979a6e3 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ NM      := $(MIPS_BINUTILS_PREFIX)nm
 OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
 OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
 
-IINC := -Iinclude -Isrc -Iassets -I$(BUILD_DIR) -I.
+IINC := -Iinclude -Iinclude/libc -Isrc -Iassets -I$(BUILD_DIR) -I.
 
 ifeq ($(KEEP_MDEBUG),0)
   RM_MDEBUG = $(OBJCOPY) --remove-section .mdebug $@
diff --git a/docs/tutorial/vscode.md b/docs/tutorial/vscode.md
index 473af8a615..63b035ed63 100644
--- a/docs/tutorial/vscode.md
+++ b/docs/tutorial/vscode.md
@@ -47,6 +47,7 @@ You can create a `.vscode/c_cpp_properties.json` file with `C/C++: Edit Configur
             "intelliSenseMode": "${default}", // Shouldn't matter
             "includePath": [ // Matches makefile's includes
                 "include",
+                "include/libc",
                 "src",
                 "assets",
                 "build/n64-us/",
diff --git a/include/PR/controller_voice.h b/include/PR/controller_voice.h
index 022e69c031..84a2d33ba1 100644
--- a/include/PR/controller_voice.h
+++ b/include/PR/controller_voice.h
@@ -4,7 +4,7 @@
 #include "ultratypes.h"
 #include "os_voice.h"
 #include "os_message.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 
 typedef struct {
     /* 0x0 */ u8 dummy;
diff --git a/include/PR/os_cache.h b/include/PR/os_cache.h
index 8a920c728a..a5ecab6edc 100644
--- a/include/PR/os_cache.h
+++ b/include/PR/os_cache.h
@@ -2,7 +2,7 @@
 #define PR_OS_CACHE_H
 
 #include "ultratypes.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 
 void osInvalDCache(void* vaddr, size_t nbytes);
 void osInvalICache(void* vaddr, size_t nbytes);
diff --git a/include/PR/os_convert.h b/include/PR/os_convert.h
index e9d1f68a8c..decb7cfbf7 100644
--- a/include/PR/os_convert.h
+++ b/include/PR/os_convert.h
@@ -1,7 +1,7 @@
 #ifndef PR_CONVERT_H
 #define PR_CONVERT_H
 
-#include "libc/stdint.h"
+#include "stdint.h"
 
 #define OS_CLOCK_RATE           62500000LL
 #define OS_CPU_COUNTER          (OS_CLOCK_RATE*3/4)
diff --git a/include/PR/os_internal_si.h b/include/PR/os_internal_si.h
index e1d88accac..c2a227336d 100644
--- a/include/PR/os_internal_si.h
+++ b/include/PR/os_internal_si.h
@@ -2,7 +2,7 @@
 #define PR_OS_INTERNAL_SI_H
 
 #include "ultratypes.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 
 s32 __osSiRawWriteIo(uintptr_t devAddr, u32 data);
diff --git a/include/PR/os_libc.h b/include/PR/os_libc.h
index d53d871bbb..dfbf6cd43c 100644
--- a/include/PR/os_libc.h
+++ b/include/PR/os_libc.h
@@ -1,7 +1,7 @@
 #ifndef PR_OS_LIBC_H
 #define PR_OS_LIBC_H
 
-#include "libc/stdarg.h"
+#include "stdarg.h"
 
 
 void bcopy(void* __src, void* __dest, int __n);
diff --git a/include/PR/os_pi.h b/include/PR/os_pi.h
index 7959ac7b3b..42a45d2440 100644
--- a/include/PR/os_pi.h
+++ b/include/PR/os_pi.h
@@ -3,8 +3,8 @@
 
 #include "ultratypes.h"
 #include "os_message.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 
 
 typedef struct {
diff --git a/include/PR/piint.h b/include/PR/piint.h
index 8517f9d63b..c599de7902 100644
--- a/include/PR/piint.h
+++ b/include/PR/piint.h
@@ -3,7 +3,7 @@
 
 #include "ultratypes.h"
 #include "os_pi.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 #define LEO_BASE_REG 0x05000000
 
diff --git a/include/PR/xstdio.h b/include/PR/xstdio.h
index 76972871d2..34d02ddeb1 100644
--- a/include/PR/xstdio.h
+++ b/include/PR/xstdio.h
@@ -2,7 +2,7 @@
 #define PR_XSTDIO_H
 
 #include "ultratypes.h"
-#include "libc/stdarg.h"
+#include "stdarg.h"
 
 typedef struct {
     /* 0x0 */ union {
diff --git a/include/audio/heap.h b/include/audio/heap.h
index 2c4147dbc6..e23788231c 100644
--- a/include/audio/heap.h
+++ b/include/audio/heap.h
@@ -2,7 +2,7 @@
 #define AUDIO_HEAP_H
 
 #include "PR/ultratypes.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "unk.h"
 
 typedef struct AudioHeapInitSizes {
diff --git a/include/audio/load.h b/include/audio/load.h
index 2952dee010..5f56757ba3 100644
--- a/include/audio/load.h
+++ b/include/audio/load.h
@@ -5,8 +5,8 @@
 #include "PR/os.h"
 #include "PR/os_message.h"
 #include "PR/ultratypes.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "unk.h"
 
 typedef s32 (*DmaHandler)(OSPiHandle* handle, OSIoMesg* mb, s32 direction);
diff --git a/include/buffers.h b/include/buffers.h
index ed8b2152cb..4159173a9e 100644
--- a/include/buffers.h
+++ b/include/buffers.h
@@ -1,7 +1,7 @@
 #ifndef BUFFERS_H
 #define BUFFERS_H
 
-#include "libc/assert.h"
+#include "assert.h"
 #include "gfx.h"
 #include "macros.h"
 #include "stack.h"
diff --git a/include/fault.h b/include/fault.h
index 2dd4fdaa40..d0ce18b23f 100644
--- a/include/fault.h
+++ b/include/fault.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 
-#include "libc/stdarg.h"
-#include "libc/stdint.h"
+#include "stdarg.h"
+#include "stdint.h"
 #include "PR/controller.h"
 
 #include "padmgr.h"
diff --git a/include/ichain.h b/include/ichain.h
index 591bd8f577..1c7e8f26b1 100644
--- a/include/ichain.h
+++ b/include/ichain.h
@@ -1,7 +1,7 @@
 #ifndef ICHAIN_H
 #define ICHAIN_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 
 typedef struct InitChainEntry {
     u32 cont:   1;
diff --git a/include/libc/stdlib.h b/include/libc/stdlib.h
index ec15b4f6c4..08d313f458 100644
--- a/include/libc/stdlib.h
+++ b/include/libc/stdlib.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STDLIB_H
 #define LIBC_STDLIB_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 
 typedef struct {
     /* 0x0 */ int quot;
diff --git a/include/libc/string.h b/include/libc/string.h
index 4fb99e71ee..8c6139f3cc 100644
--- a/include/libc/string.h
+++ b/include/libc/string.h
@@ -1,7 +1,7 @@
 #ifndef LIBC_STRING_H
 #define LIBC_STRING_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 
 const char* strchr(const char* s, int c);
 size_t strlen(const char* s);
diff --git a/include/libc64/os_malloc.h b/include/libc64/os_malloc.h
index 01711bd7fe..3bbb5c2739 100644
--- a/include/libc64/os_malloc.h
+++ b/include/libc64/os_malloc.h
@@ -2,7 +2,7 @@
 #define LIBC64_OS_MALLOC_H
 
 #include "ultra64.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 
 typedef struct ArenaNode {
     /* 0x0 */ s16 magic; // Should always be 0x7373
diff --git a/include/loadfragment.h b/include/loadfragment.h
index 6e3f083f96..642db25d66 100644
--- a/include/loadfragment.h
+++ b/include/loadfragment.h
@@ -2,8 +2,8 @@
 #define LOADFRAGMENT_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdint.h"
-#include "libc/stddef.h"
+#include "stdint.h"
+#include "stddef.h"
 
 extern s32 gOverlayLogSeverity;
 
diff --git a/include/macros.h b/include/macros.h
index 1038838e49..da5063bcdb 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "PR/os_convert.h"
 
 #define SCREEN_WIDTH  320
diff --git a/include/padmgr.h b/include/padmgr.h
index 59157dd814..68a7a59aa8 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -1,7 +1,7 @@
 #ifndef PADMGR_H
 #define PADMGR_H
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "ultra64.h"
 #include "irqmgr.h"
 #include "padutils.h"
diff --git a/include/romfile.h b/include/romfile.h
index 0ae0fcc68c..7d3ad161f8 100644
--- a/include/romfile.h
+++ b/include/romfile.h
@@ -2,7 +2,7 @@
 #define ROMFILE_H
 
 #include "ultra64.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 typedef struct {
     /* 0x00 */ uintptr_t vromStart;
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 2c53511b97..c0130dd488 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -1,7 +1,7 @@
 #ifndef SEGMENT_SYMBOLS_H
 #define SEGMENT_SYMBOLS_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "PR/ultratypes.h"
 
 #include "romfile.h"
diff --git a/include/sys_cmpdma.h b/include/sys_cmpdma.h
index 8bacf7149a..23a9140148 100644
--- a/include/sys_cmpdma.h
+++ b/include/sys_cmpdma.h
@@ -2,7 +2,7 @@
 #define SYS_CPMDMA_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 void CmpDma_LoadFile(uintptr_t segmentVrom, s32 id, void* dst, size_t size);
 void CmpDma_LoadAllFiles(uintptr_t segmentVrom, void* dst, size_t size);
diff --git a/include/system_heap.h b/include/system_heap.h
index e0864cca6c..df572b82bc 100644
--- a/include/system_heap.h
+++ b/include/system_heap.h
@@ -1,7 +1,7 @@
 #ifndef SYSTEM_HEAP_H
 #define SYSTEM_HEAP_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "PR/ultratypes.h"
 
 void* SystemHeap_Malloc(size_t size);
diff --git a/include/tha.h b/include/tha.h
index 9bf3c85729..93ad4664a9 100644
--- a/include/tha.h
+++ b/include/tha.h
@@ -2,8 +2,8 @@
 #define THA_H
 
 #include "ultra64.h"
-#include "libc/stdint.h"
-#include "libc/stddef.h"
+#include "stdint.h"
+#include "stddef.h"
 
 typedef struct TwoHeadArena {
     /* 0x0 */ size_t size;
diff --git a/include/z64.h b/include/z64.h
index f046e61da5..dab2bc7b32 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -3,12 +3,12 @@
 
 #include "ultra64.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 "math.h"
+#include "stdarg.h"
+#include "stdbool.h"
+#include "stddef.h"
+#include "stdint.h"
+#include "stdlib.h"
 
 #include "libc64/qrand.h"
 
diff --git a/include/z64actor_dlftbls.h b/include/z64actor_dlftbls.h
index 942732576e..ba16fd8036 100644
--- a/include/z64actor_dlftbls.h
+++ b/include/z64actor_dlftbls.h
@@ -2,7 +2,7 @@
 #define Z64ACTOR_DLFTBLS_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "segment_symbols.h"
 
 // This value is hardcoded to be the size of ovl_Arrow_Fire which currently is the biggest actor that uses the AM_FIELD.
diff --git a/include/z64audio.h b/include/z64audio.h
index d7bbb53df7..41ae767751 100644
--- a/include/z64audio.h
+++ b/include/z64audio.h
@@ -4,7 +4,7 @@
 #include "PR/ultratypes.h"
 #include "PR/os_voice.h"
 #include "audiothread_cmd.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "unk.h"
 
 #include "audio/heap.h"
diff --git a/include/z64effect.h b/include/z64effect.h
index 46027ab1f2..d451b050b6 100644
--- a/include/z64effect.h
+++ b/include/z64effect.h
@@ -2,7 +2,7 @@
 #define Z64EFFECT_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "color.h"
 #include "z64light.h"
 #include "z64math.h"
diff --git a/include/z64font.h b/include/z64font.h
index 9d0540048f..481c69d578 100644
--- a/include/z64font.h
+++ b/include/z64font.h
@@ -2,7 +2,7 @@
 #define Z64FONT_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 struct PlayState;
 
diff --git a/include/z64game.h b/include/z64game.h
index 42105de759..c581ec1aca 100644
--- a/include/z64game.h
+++ b/include/z64game.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 
-#include "libc/stdbool.h"
-#include "libc/stdint.h"
+#include "stdbool.h"
+#include "stdint.h"
 #include "gamealloc.h"
 #include "padmgr.h"
 #include "padutils.h"
diff --git a/include/z64math.h b/include/z64math.h
index fb5b467e6c..a55f9bd29f 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -2,7 +2,7 @@
 #define Z64MATH_H
 
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 
 #include "libc64/math64.h"
 
diff --git a/include/z64message.h b/include/z64message.h
index 25bb5242c4..76494b8551 100644
--- a/include/z64message.h
+++ b/include/z64message.h
@@ -2,7 +2,7 @@
 #define Z64MESSAGE_H
 
 #include "PR/ultratypes.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 #include "z64bombers_notebook.h"
 #include "z64font.h"
diff --git a/include/z64object.h b/include/z64object.h
index 0de62d789f..32f57f9564 100644
--- a/include/z64object.h
+++ b/include/z64object.h
@@ -1,7 +1,7 @@
 #ifndef Z64OBJECT_H
 #define Z64OBJECT_H
 
-#include "libc/stdint.h"
+#include "stdint.h"
 
 #define DEFINE_OBJECT(_name, enumValue) enumValue,
 #define DEFINE_OBJECT_UNSET(enumValue) enumValue,
diff --git a/include/z64transition.h b/include/z64transition.h
index 45e92255aa..c280e864fa 100644
--- a/include/z64transition.h
+++ b/include/z64transition.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-#include "libc/stdint.h"
+#include "stdint.h"
 #include "unk.h"
 
 #include "romfile.h"
diff --git a/src/audio/voice_internal.c b/src/audio/voice_internal.c
index 348d2c215d..3bef9b2f7d 100644
--- a/src/audio/voice_internal.c
+++ b/src/audio/voice_internal.c
@@ -1,6 +1,6 @@
 #include "z64voice.h"
-#include "libc/stdbool.h"
-#include "libc/string.h"
+#include "stdbool.h"
+#include "string.h"
 #include "padmgr.h"
 
 // internal voice functions
diff --git a/src/boot/O2/stackcheck.c b/src/boot/O2/stackcheck.c
index edd1e3a30e..d08dbfcb5f 100644
--- a/src/boot/O2/stackcheck.c
+++ b/src/boot/O2/stackcheck.c
@@ -1,6 +1,6 @@
 #include "stackcheck.h"
-#include "libc/stdbool.h"
-#include "libc/stdint.h"
+#include "stdbool.h"
+#include "stdint.h"
 
 StackEntry* sStackInfoListStart = NULL;
 StackEntry* sStackInfoListEnd = NULL;
diff --git a/src/boot/irqmgr.c b/src/boot/irqmgr.c
index a3daeff11f..7311414a67 100644
--- a/src/boot/irqmgr.c
+++ b/src/boot/irqmgr.c
@@ -34,7 +34,7 @@
  */
 #include "irqmgr.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 #include "macros.h"
 #include "scheduler.h"
diff --git a/src/boot/libc/memmove.c b/src/boot/libc/memmove.c
index 720de0facf..21c7256454 100644
--- a/src/boot/libc/memmove.c
+++ b/src/boot/libc/memmove.c
@@ -1,4 +1,4 @@
-#include "libc/string.h"
+#include "string.h"
 
 void* memmove(void* dst, const void* src, size_t size) {
     unsigned char* _dst = dst;
diff --git a/src/boot/libc/memset.c b/src/boot/libc/memset.c
index 7e0b1c0ed1..ee8a1d17e0 100644
--- a/src/boot/libc/memset.c
+++ b/src/boot/libc/memset.c
@@ -1,4 +1,4 @@
-#include "libc/string.h"
+#include "string.h"
 
 void* memset(void* ptr, int val, size_t size) {
     unsigned char* dst = ptr;
diff --git a/src/boot/libc/strcmp.c b/src/boot/libc/strcmp.c
index d65e4411f7..7df0ef5b28 100644
--- a/src/boot/libc/strcmp.c
+++ b/src/boot/libc/strcmp.c
@@ -1,4 +1,4 @@
-#include "libc/string.h"
+#include "string.h"
 
 int strcmp(const char* str1, const char* str2) {
     unsigned char c1;
diff --git a/src/boot/libc/strcpy.c b/src/boot/libc/strcpy.c
index 8166a47e0e..db961df98c 100644
--- a/src/boot/libc/strcpy.c
+++ b/src/boot/libc/strcpy.c
@@ -1,4 +1,4 @@
-#include "libc/string.h"
+#include "string.h"
 
 char* strcpy(char* dst, const char* src) {
     char* _dst = dst;
diff --git a/src/boot/libc64/__osMalloc.c b/src/boot/libc64/__osMalloc.c
index 5540089975..3272603e13 100644
--- a/src/boot/libc64/__osMalloc.c
+++ b/src/boot/libc64/__osMalloc.c
@@ -1,9 +1,9 @@
 #include "libc64/os_malloc.h"
 
 #include "alignment.h"
-#include "libc/stdbool.h"
-#include "libc/stdint.h"
-#include "libc/string.h"
+#include "stdbool.h"
+#include "stdint.h"
+#include "string.h"
 #include "macros.h"
 
 #define FILL_ALLOCBLOCK (1 << 0)
diff --git a/src/boot/libc64/math64.c b/src/boot/libc64/math64.c
index ed9e8a7c12..185b2900ce 100644
--- a/src/boot/libc64/math64.c
+++ b/src/boot/libc64/math64.c
@@ -6,8 +6,8 @@
 #include "libc64/math64.h"
 
 #include "libc64/fixed_point.h"
-#include "libc/stdbool.h"
-#include "libc/math.h"
+#include "stdbool.h"
+#include "math.h"
 
 s32 gUseAtanContFrac;
 
diff --git a/src/boot/libc64/sprintf.c b/src/boot/libc64/sprintf.c
index 07bee8064d..58f2484142 100644
--- a/src/boot/libc64/sprintf.c
+++ b/src/boot/libc64/sprintf.c
@@ -1,6 +1,6 @@
 #include "libc64/sprintf.h"
 
-#include "libc/string.h"
+#include "string.h"
 
 void* proutPrintf(void* dst, const char* fmt, size_t size) {
     return (void*)((uintptr_t)memcpy(dst, fmt, size) + size);
diff --git a/src/boot/libm/fmodf.c b/src/boot/libm/fmodf.c
index 0c2df736dd..d91be7e408 100644
--- a/src/boot/libm/fmodf.c
+++ b/src/boot/libm/fmodf.c
@@ -1,4 +1,4 @@
-#include "libc/math.h"
+#include "math.h"
 
 float fmodf(float dividend, float divisor) {
     int quotient;
diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c
index cfbc04e861..3d504e0a5d 100644
--- a/src/boot/viconfig.c
+++ b/src/boot/viconfig.c
@@ -1,6 +1,6 @@
 #include "viconfig.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "idle.h"
 
 void ViConfig_UpdateVi(u32 black) {
diff --git a/src/code/PreRender.c b/src/code/PreRender.c
index fa8805b41f..52a914a075 100644
--- a/src/code/PreRender.c
+++ b/src/code/PreRender.c
@@ -7,8 +7,8 @@
  */
 #include "z64prerender.h"
 
-#include "libc/alloca.h"
-#include "libc/stdbool.h"
+#include "alloca.h"
+#include "stdbool.h"
 #include "PR/gs2dex.h"
 
 #include "global.h"
diff --git a/src/code/cutscene_camera.c b/src/code/cutscene_camera.c
index f225651feb..6eb782787f 100644
--- a/src/code/cutscene_camera.c
+++ b/src/code/cutscene_camera.c
@@ -1,6 +1,6 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "libc/string.h"
+#include "string.h"
 
 CutsceneCamera* sCurCsCamera;
 
diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c
index e6998adc99..01d0976414 100644
--- a/src/code/jpegdecoder.c
+++ b/src/code/jpegdecoder.c
@@ -1,5 +1,5 @@
 #include "z64jpeg.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "macros.h"
 
 u8* sJpegBitStreamPtr;
diff --git a/src/code/jpegutils.c b/src/code/jpegutils.c
index fbf6c69c27..a24f86a89b 100644
--- a/src/code/jpegutils.c
+++ b/src/code/jpegutils.c
@@ -1,5 +1,5 @@
 #include "z64jpeg.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "macros.h"
 
 void JpegUtils_ProcessQuantizationTable(u8* dqt, JpegQuantizationTable* qt, u8 count) {
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index a16a6b5c1d..974e6cdf7b 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -34,7 +34,7 @@ s16 gCfbUpperAdjust;
 u8 gSysCfbHiResEnabled;
 
 #include "sys_cfb.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "buffers.h"
 #include "libc64/malloc.h"
 #include "z64vimode.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 2959781f52..a5da64a12e 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -45,7 +45,7 @@
 
 #include "prevent_bss_reordering.h"
 #include "global.h"
-#include "libc/string.h"
+#include "string.h"
 #include "z64malloc.h"
 #include "z64quake.h"
 #include "z64shrink_window.h"
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index e6d291831b..bbbc420f41 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -2,7 +2,7 @@
 
 #include "alignment.h"
 #include "sequence.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "z64environment.h"
 #include "z64transition.h"
 
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 6ac53632fa..22dab64328 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -1,6 +1,6 @@
 #include "z64eff_blure.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "gfx.h"
 #include "macros.h"
 #include "sys_matrix.h"
diff --git a/src/code/z_eventmgr.c b/src/code/z_eventmgr.c
index 5bad9f1a14..a5aacd4f90 100644
--- a/src/code/z_eventmgr.c
+++ b/src/code/z_eventmgr.c
@@ -6,7 +6,7 @@
 
 #include "global.h"
 #include "z64shrink_window.h"
-#include "libc/string.h"
+#include "string.h"
 
 CutsceneEntry sGlobalCutsceneList[] = {
     // CS_ID_GLOBAL_78
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index f1e535594b..64502a68e8 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -1,6 +1,6 @@
 #include "z64transition.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "gfx.h"
 #include "regs.h"
 #include "z64math.h"
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index 6569d95d76..2cc9532465 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -27,7 +27,7 @@
 
 #include "z64curve.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "z64actor.h"
 #include "z64animation.h"
 #include "z64curve.h"
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index cc2f24ee01..00cbe135a1 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -1,6 +1,6 @@
 #include "z64jpeg.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "main.h"
 #include "sys_ucode.h"
 #include "macros.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 5f9757296b..ae2487eccf 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -62,7 +62,7 @@ Gfx* sSkyboxStarsDList;
 #include "z64environment.h"
 
 #include "global.h"
-#include "libc/string.h"
+#include "string.h"
 #include "sys_cfb.h"
 
 #include "objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/code/z_pause.c b/src/code/z_pause.c
index b16cc62c13..a1bcf8d92c 100644
--- a/src/code/z_pause.c
+++ b/src/code/z_pause.c
@@ -20,7 +20,7 @@
  */
 
 #include "z64frameadvance.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "padutils.h"
 #include "macros.h"
 
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index 9c42e1f379..37b51df700 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -1,6 +1,6 @@
 #include "z64quake.h"
 
-#include "libc/string.h"
+#include "string.h"
 
 #include "global.h"
 #include "z64view.h"
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index cbf85860b2..5ced3edeac 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -1,6 +1,6 @@
 #include "z64skin.h"
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 #include "global.h"
 #include "gfx.h"
diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c
index 86fb644749..e6ab69bdf9 100644
--- a/src/code/z_viszbuf.c
+++ b/src/code/z_viszbuf.c
@@ -34,7 +34,7 @@
 #include "z64vis.h"
 #include "global.h"
 #include "sys_cfb.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 // Height of the fragments the z-buffer is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM.
diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c
index 8814595079..c911b55cb6 100644
--- a/src/libultra/gu/cosf.c
+++ b/src/libultra/gu/cosf.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 #include "macros.h"
 
 #pragma weak cosf = __cosf
diff --git a/src/libultra/gu/position.c b/src/libultra/gu/position.c
index 590b15b3f3..26fc4d62cd 100644
--- a/src/libultra/gu/position.c
+++ b/src/libultra/gu/position.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 
 /**
  * guPositionF
diff --git a/src/libultra/gu/rotate.c b/src/libultra/gu/rotate.c
index ec58791931..16e47322b3 100644
--- a/src/libultra/gu/rotate.c
+++ b/src/libultra/gu/rotate.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 
 void guRotateF(float m[4][4], float a, float x, float y, float z) {
     static float dtor = F_PI / 180.0f;
diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c
index 4d458b0712..454a648caf 100644
--- a/src/libultra/gu/sinf.c
+++ b/src/libultra/gu/sinf.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 #include "macros.h"
 
 #pragma weak sinf = __sinf
diff --git a/src/libultra/gu/sins.c b/src/libultra/gu/sins.c
index 247bb36890..4fbafbb188 100644
--- a/src/libultra/gu/sins.c
+++ b/src/libultra/gu/sins.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/math.h"
+#include "math.h"
 
 static s16 sintable[0x400] = {
     0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E,
diff --git a/src/libultra/io/cartrominit.c b/src/libultra/io/cartrominit.c
index eeca4b339e..2d2b6b56b7 100644
--- a/src/libultra/io/cartrominit.c
+++ b/src/libultra/io/cartrominit.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "alignment.h"
 
 OSPiHandle __CartRomHandle ALIGNED(8);
diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c
index ca57673cd4..2b6ad5fd13 100644
--- a/src/libultra/io/controller.c
+++ b/src/libultra/io/controller.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "PR/controller.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "alignment.h"
 #include "macros.h"
 
diff --git a/src/libultra/io/devmgr.c b/src/libultra/io/devmgr.c
index 168ca9b8df..b1117c59fd 100644
--- a/src/libultra/io/devmgr.c
+++ b/src/libultra/io/devmgr.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 void __osDevMgrMain(void* arg) {
     OSIoMesg* ioMesg;
diff --git a/src/libultra/io/pfsfilestate.c b/src/libultra/io/pfsfilestate.c
index a39d55c02c..f62c2e71d7 100644
--- a/src/libultra/io/pfsfilestate.c
+++ b/src/libultra/io/pfsfilestate.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "PR/controller.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) {
     s32 ret;
diff --git a/src/libultra/io/si.c b/src/libultra/io/si.c
index f1511c0d6f..4f9dff1543 100644
--- a/src/libultra/io/si.c
+++ b/src/libultra/io/si.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 s32 __osSiDeviceBusy() {
     register u32 status = IO_READ(SI_STATUS_REG);
diff --git a/src/libultra/io/sp.c b/src/libultra/io/sp.c
index e1d95eeb88..1808795a2f 100644
--- a/src/libultra/io/sp.c
+++ b/src/libultra/io/sp.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 s32 __osSpDeviceBusy(void) {
     register u32 status = IO_READ(SP_STATUS_REG);
diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c
index 485bdf5973..ca07e76ebd 100644
--- a/src/libultra/io/vimgr.c
+++ b/src/libultra/io/vimgr.c
@@ -2,7 +2,7 @@
 #include "PR/osint.h"
 #include "stack.h"
 #include "PR/osint.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "macros.h"
 #include "alignment.h"
 
diff --git a/src/libultra/libc/ldiv.c b/src/libultra/libc/ldiv.c
index 66b144da48..e56b439b8b 100644
--- a/src/libultra/libc/ldiv.c
+++ b/src/libultra/libc/ldiv.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdlib.h"
+#include "stdlib.h"
 
 ldiv_t ldiv(long numer, long denom) {
     ldiv_t val;
diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c
index b4bdf84aee..93dbcfd468 100644
--- a/src/libultra/libc/string.c
+++ b/src/libultra/libc/string.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
-#include "libc/stdlib.h"
-#include "libc/string.h"
+#include "stdlib.h"
+#include "string.h"
 
 const char* strchr(const char* s, int c) {
     const unsigned char ch = c;
diff --git a/src/libultra/libc/xldtob.c b/src/libultra/libc/xldtob.c
index df9c30a28e..5aea80a086 100644
--- a/src/libultra/libc/xldtob.c
+++ b/src/libultra/libc/xldtob.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
-#include "libc/stdlib.h"
-#include "libc/string.h"
+#include "stdlib.h"
+#include "string.h"
 
 #define BUFF_LEN 0x20
 
diff --git a/src/libultra/libc/xlitob.c b/src/libultra/libc/xlitob.c
index 40596271a9..5923ae45ae 100644
--- a/src/libultra/libc/xlitob.c
+++ b/src/libultra/libc/xlitob.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
-#include "libc/stdlib.h"
-#include "libc/string.h"
+#include "stdlib.h"
+#include "string.h"
 
 #define BUFF_LEN 0x18
 
diff --git a/src/libultra/libc/xprintf.c b/src/libultra/libc/xprintf.c
index b644516f4c..653a64178c 100644
--- a/src/libultra/libc/xprintf.c
+++ b/src/libultra/libc/xprintf.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/string.h"
+#include "string.h"
 
 #define ATOI(i, a)                               \
     for (i = 0; (*a >= '0') && (*a <= '9'); a++) \
diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c
index a39aa91c02..7192831e33 100644
--- a/src/libultra/os/initialize.c
+++ b/src/libultra/os/initialize.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 #define COLD_RESET 0
 
diff --git a/src/libultra/os/seteventmesg.c b/src/libultra/os/seteventmesg.c
index 6f4fb0f97f..2ca53b6ec2 100644
--- a/src/libultra/os/seteventmesg.c
+++ b/src/libultra/os/seteventmesg.c
@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "PR/osint.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "alignment.h"
 
 u32 __osPreNMI = false;
diff --git a/src/libultra/os/timerintr.c b/src/libultra/os/timerintr.c
index ae30b5cf7b..45b768d2a1 100644
--- a/src/libultra/os/timerintr.c
+++ b/src/libultra/os/timerintr.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdbool.h"
+#include "stdbool.h"
 
 OSTimer __osBaseTimer;
 OSTime __osCurrentTime;
diff --git a/src/libultra/os/virtualtophysical.c b/src/libultra/os/virtualtophysical.c
index 864f54eb86..7567d2ef38 100644
--- a/src/libultra/os/virtualtophysical.c
+++ b/src/libultra/os/virtualtophysical.c
@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "libc/stdint.h"
+#include "stdint.h"
 
 uintptr_t osVirtualToPhysical(void* addr) {
     if (IS_KSEG0(addr)) {
diff --git a/src/libultra/voice/voicecrc.c b/src/libultra/voice/voicecrc.c
index 58e405fbdb..5b17a8671c 100644
--- a/src/libultra/voice/voicecrc.c
+++ b/src/libultra/voice/voicecrc.c
@@ -6,7 +6,7 @@
  */
 
 #include "ultra64.h"
-#include "libc/stddef.h"
+#include "stddef.h"
 
 #define VOICE_CRC_LENGTH 8
 #define VOICE_CRC_GENERATOR 0x85
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index b395d6e59e..33e922133d 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -6,7 +6,7 @@
 
 #include "z_en_door.h"
 
-#include "libc/assert.h"
+#include "assert.h"
 
 #include "objects/object_kinsta2_obj/object_kinsta2_obj.h"
 #include "objects/object_dor01/object_dor01.h"
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 63dd55164c..bd00e305c5 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -7,7 +7,7 @@
 #include "z_select.h"
 #include "z64shrink_window.h"
 #include "z64view.h"
-#include "libc/alloca.h"
+#include "alloca.h"
 #include "overlays/gamestates/ovl_title/z_title.h"
 
 void MapSelect_LoadConsoleLogo(MapSelectState* this, u32 entrance, s32 spawn) {