diff --git a/osMalloc.h b/include/libc64/os_malloc.h
similarity index 97%
rename from osMalloc.h
rename to include/libc64/os_malloc.h
index 73f310fa1..e31a6f08f 100644
--- a/osMalloc.h
+++ b/include/libc64/os_malloc.h
@@ -1,5 +1,5 @@
-#ifndef OSMALLOC_H
-#define OSMALLOC_H
+#ifndef LIBC64_OS_MALLOC_H
+#define LIBC64_OS_MALLOC_H
 
 #include "ultra64.h"
 
diff --git a/include/variables.h b/include/variables.h
index a242ec05c..92f68735b 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -2,7 +2,7 @@
 #define VARIABLES_H
 
 #include "z64.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 #include "segment_symbols.h"
 
 extern Mtx D_01000000;
diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c
index 373f1d53c..8bed1af23 100644
--- a/src/code/code_800FC620.c
+++ b/src/code/code_800FC620.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 
 typedef void (*arg3_800FC868)(void*);
 typedef void (*arg3_800FC8D8)(void*, u32);
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index 5be04b23c..a1def050a 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 92b1976aa..eb3019d33 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "fault.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 #include "stack.h"
 #include "terminal.h"
 
diff --git a/src/code/game.c b/src/code/game.c
index af22e7949..45362fb58 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "fault.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 #include "terminal.h"
 #if PLATFORM_N64
 #include "n64dd.h"
diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c
index 5b1c5637f..901e7b4e7 100644
--- a/src/code/z_malloc.c
+++ b/src/code/z_malloc.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2
diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c
index 45e19532f..8d903f5ae 100644
--- a/src/libc64/__osMalloc_gc.c
+++ b/src/libc64/__osMalloc_gc.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "fault.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 #include "terminal.h"
 
 #if PLATFORM_GC
diff --git a/src/libc64/__osMalloc_n64.c b/src/libc64/__osMalloc_n64.c
index bd9c358af..8efb4ec6c 100644
--- a/src/libc64/__osMalloc_n64.c
+++ b/src/libc64/__osMalloc_n64.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "fault.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 
 #if PLATFORM_N64
 
diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c
index de6a56b30..a5bd8032b 100644
--- a/src/libc64/malloc.c
+++ b/src/libc64/malloc.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "osMalloc.h"
+#include "libc64/os_malloc.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2