diff --git a/src/kernel/boot/debug.c b/src/kernel/boot/debug.c
index 80977c2..de826db 100644
--- a/src/kernel/boot/debug.c
+++ b/src/kernel/boot/debug.c
@@ -1,7 +1,6 @@
-#include <stddef.h>
 #include <stdarg.h>
 #include <stdint.h>
-#include <memory.h>
+#include <string.h>
 #include <terminal.h>
 
 void num2str(char *buf, uint64_t num, uint64_t base)
diff --git a/src/kernel/boot/multiboot.c b/src/kernel/boot/multiboot.c
index 5ad8abf..f2a05af 100644
--- a/src/kernel/boot/multiboot.c
+++ b/src/kernel/boot/multiboot.c
@@ -1,4 +1,6 @@
 #include <stdint.h>
+#include <stddef.h>
+#include <string.h>
 #include <multiboot.h>
 #include <memory.h>
 #include <debug.h>
diff --git a/src/kernel/cpu/interrupts.c b/src/kernel/cpu/interrupts.c
index 0e2c063..381a419 100644
--- a/src/kernel/cpu/interrupts.c
+++ b/src/kernel/cpu/interrupts.c
@@ -3,6 +3,7 @@
 #include <memory.h>
 #include <cpu.h>
 #include <debug.h>
+#include <string.h>
 
 #define IDT_INTERRUPT 0xE
 #define IDT_DPL0 0x0
diff --git a/src/kernel/drivers/framebuffer.c b/src/kernel/drivers/framebuffer.c
index c3f6b25..9a28f07 100644
--- a/src/kernel/drivers/framebuffer.c
+++ b/src/kernel/drivers/framebuffer.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
-#include <memory.h>
-#include <multiboot.h>
-#include <framebuffer.h>
 #include <stdlib.h>
+#include <string.h>
+#include <memory.h>
+#include <framebuffer.h>
 
 gfx_context kernel_fb;
 
diff --git a/src/kernel/drivers/terminal/terminal.c b/src/kernel/drivers/terminal/terminal.c
index 4b561af..1bc00d5 100644
--- a/src/kernel/drivers/terminal/terminal.c
+++ b/src/kernel/drivers/terminal/terminal.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
+#include <string.h>
 #include <terminal.h>
-#include <memory.h>
 
 #define FRAMEBUFFER 0x1
 #define EGA_TEXT 0x2
diff --git a/src/kernel/drivers/terminal/vga.c b/src/kernel/drivers/terminal/vga.c
index a94e49f..77f9e77 100644
--- a/src/kernel/drivers/terminal/vga.c
+++ b/src/kernel/drivers/terminal/vga.c
@@ -1,9 +1,10 @@
+// #include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 #include <terminal.h>
-#include <memory.h>
 #include <ports.h>
+#include <memory.h>
 #include <multiboot.h>
-#include <stddef.h>
-#include <debug.h>
 
 #define VGA_ADDRESS_PORT 0x3D4
 #define VGA_DATA_PORT 0x3D5
diff --git a/src/kernel/include/memory.h b/src/kernel/include/memory.h
index fbbb62c..e8f4c37 100644
--- a/src/kernel/include/memory.h
+++ b/src/kernel/include/memory.h
@@ -40,13 +40,6 @@
     uint64_t pmm_alloc();
     uint64_t pmm_calloc();
 
-    // memory/string.c
-    void *memcpy(void *dst, const void *src, size_t n);
-    void *memset(void *s, int c, size_t n);
-    void *memmove(void *dest, const void *src, size_t n);
-    int memcmp(const void *s1, const void *s2, size_t n);
-    size_t strlen(const char *s);
-
     // memory/kbrk.c
     long kbrk(long brk, long, long, long, long, long);
 
diff --git a/src/kernel/include/terminal.h b/src/kernel/include/terminal.h
index 8ec6475..7f3e586 100644
--- a/src/kernel/include/terminal.h
+++ b/src/kernel/include/terminal.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <multiboot.h>
 #include <framebuffer.h>
 
 #define VGA_COLS 80
diff --git a/src/kernel/memory/pmm.c b/src/kernel/memory/pmm.c
index ce9191f..a0a3edb 100644
--- a/src/kernel/memory/pmm.c
+++ b/src/kernel/memory/pmm.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <memory.h>
+#include <string.h>
 
 // Physical address of next page
 uint64_t next = 0;
diff --git a/src/kernel/memory/string.c b/src/kernel/memory/string.c
deleted file mode 100644
index d27a142..0000000
--- a/src/kernel/memory/string.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <memory.h>
-#include <stdint.h>
-#include <stddef.h>
-
-void *memcpy(void *dst, const void *src, size_t n)
-{
-    char *dp = dst;
-    const char *sp = src;
-    while(n--) *dp++ = *sp++;
-    return dst;
-}
-
-void *memset(void *s, int c, size_t n)
-{
-    unsigned char *p = s;
-    while(n--) *p++ = (unsigned char)c;
-    return s;
-}
-
-void *memmove(void *dst, const void *src, size_t n)
-{
-    if(src == dst)
-        return dst;
-
-    const void *src_end = (const void *)((uintptr_t)src + n);
-    if(src < dst && dst < src_end)
-    {
-        char *dp = dst;
-        const char *sp = src;
-        while(n--)
-            dp[n] = sp[n];
-        return dst;
-    }
-
-    memcpy(dst, src, n);
-    return dst;
-}
-
-int memcmp(const void *s1, const void *s2, size_t n)
-{
-    const unsigned char *p1 = s1, *p2 = s2;
-    for(; n--; p1++, p2++)
-    {
-        if(*p1 != *p2)
-        return *p1 - *p2;
-    }
-    return 0;
-}
-
-size_t strlen(const char *s)
-{
-    size_t len = 0;
-    while(*s++) len++;
-    return len;
-}
\ No newline at end of file