diff --git a/api/hal/machine.hpp b/api/hal/machine.hpp
index 3f9a920991..87653be4a5 100644
--- a/api/hal/machine.hpp
+++ b/api/hal/machine.hpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include <arch.hpp>
-#include <util/allocator.hpp>
+#include <mem/allocator.hpp>
 
 namespace os {
   namespace detail { class Machine; }
diff --git a/api/hal/machine_memory.hpp b/api/hal/machine_memory.hpp
index 951b9567d5..eec08f2008 100644
--- a/api/hal/machine_memory.hpp
+++ b/api/hal/machine_memory.hpp
@@ -15,7 +15,7 @@
 // limitations under the License.
 
 #include <os.hpp>
-#include <util/alloc_lstack.hpp>
+#include <mem/alloc/lstack.hpp>
 
 #ifndef OS_MACHINE_MEMORY_HPP
 #define OS_MACHINE_MEMORY_HPP
diff --git a/api/kernel/memory.hpp b/api/kernel/memory.hpp
index c19480b4c1..46d8641cc7 100644
--- a/api/kernel/memory.hpp
+++ b/api/kernel/memory.hpp
@@ -21,8 +21,8 @@
 
 #include <util/bitops.hpp>
 #include <util/units.hpp>
-#include <util/alloc_buddy.hpp>
-#include <util/allocator.hpp>
+#include <mem/alloc/buddy.hpp>
+#include <mem/allocator.hpp>
 #include <sstream>
 #include <expects>
 #include <kernel/memmap.hpp>
diff --git a/api/util/alloc_buddy.hpp b/api/mem/alloc/buddy.hpp
similarity index 100%
rename from api/util/alloc_buddy.hpp
rename to api/mem/alloc/buddy.hpp
diff --git a/api/util/alloc_lstack.hpp b/api/mem/alloc/lstack.hpp
similarity index 100%
rename from api/util/alloc_lstack.hpp
rename to api/mem/alloc/lstack.hpp
diff --git a/api/util/alloc_pmr.hpp b/api/mem/alloc/pmr.hpp
similarity index 100%
rename from api/util/alloc_pmr.hpp
rename to api/mem/alloc/pmr.hpp
diff --git a/api/util/allocator.hpp b/api/mem/allocator.hpp
similarity index 100%
rename from api/util/allocator.hpp
rename to api/mem/allocator.hpp
diff --git a/api/net/tcp/connection.hpp b/api/net/tcp/connection.hpp
index a6c35cfeaa..846216a243 100644
--- a/api/net/tcp/connection.hpp
+++ b/api/net/tcp/connection.hpp
@@ -31,7 +31,7 @@
 #include <delegate>
 #include <util/timer.hpp>
 
-#include <util/alloc_pmr.hpp>
+#include <mem/alloc/pmr.hpp>
 
 namespace net {
   // Forward declaration of the TCP object
diff --git a/api/net/tcp/tcp.hpp b/api/net/tcp/tcp.hpp
index a3072857a3..2ee67a9b42 100644
--- a/api/net/tcp/tcp.hpp
+++ b/api/net/tcp/tcp.hpp
@@ -31,7 +31,7 @@
 #include <net/socket.hpp>
 #include <net/ip4/ip4.hpp>
 #include <util/bitops.hpp>
-#include <util/alloc_pmr.hpp>
+#include <mem/alloc/pmr.hpp>
 
 namespace net {
 
diff --git a/src/musl/mmap.cpp b/src/musl/mmap.cpp
index 691681691c..d218324948 100644
--- a/src/musl/mmap.cpp
+++ b/src/musl/mmap.cpp
@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <sys/mman.h>
 #include <errno.h>
-#include <util/alloc_buddy.hpp>
+#include <mem/alloc/buddy.hpp>
 #include <os>
 #include <kernel/memory.hpp>
 #include <kernel.hpp>
diff --git a/src/util/pmr_default.cpp b/src/util/pmr_default.cpp
index cc7fc7f4e4..7caafecb39 100644
--- a/src/util/pmr_default.cpp
+++ b/src/util/pmr_default.cpp
@@ -1,5 +1,5 @@
 
-#include <util/alloc_pmr.hpp>
+#include <mem/alloc/pmr.hpp>
 
 std::pmr::memory_resource* std::pmr::get_default_resource() noexcept {
   static os::mem::Default_pmr* default_pmr;
diff --git a/test/unit/memory/alloc/buddy_alloc_test.cpp b/test/unit/memory/alloc/buddy_alloc_test.cpp
index cdac74d4aa..2d47f4849b 100644
--- a/test/unit/memory/alloc/buddy_alloc_test.cpp
+++ b/test/unit/memory/alloc/buddy_alloc_test.cpp
@@ -17,8 +17,8 @@
 // #define DEBUG_UNIT
 
 #include <common.cxx>
-#include <util/alloc_buddy.hpp>
-#include <util/allocator.hpp>
+#include <mem/alloc/buddy.hpp>
+#include <mem/allocator.hpp>
 #include <vector>
 
 struct Pool {
diff --git a/test/unit/memory/alloc/pmr_alloc_test.cpp b/test/unit/memory/alloc/pmr_alloc_test.cpp
index 97b43a0358..1d3cd39a0d 100644
--- a/test/unit/memory/alloc/pmr_alloc_test.cpp
+++ b/test/unit/memory/alloc/pmr_alloc_test.cpp
@@ -17,7 +17,7 @@
 #define DEBUG_UNIT
 
 #include <common.cxx>
-#include <util/alloc_pmr.hpp>
+#include <mem/alloc/pmr.hpp>
 #include <util/units.hpp>
 
 #if __has_include(<experimental/memory_resource>)
diff --git a/test/unit/memory/lstack/test_lstack.hpp b/test/unit/memory/lstack/test_lstack.hpp
index 8d5dd2f6f4..519d1f6d57 100644
--- a/test/unit/memory/lstack/test_lstack.hpp
+++ b/test/unit/memory/lstack/test_lstack.hpp
@@ -23,7 +23,7 @@
 #include <common.cxx>
 
 #include <algorithm>
-#include <util/alloc_lstack.hpp>
+#include <mem/alloc/lstack.hpp>
 #include <util/units.hpp>
 #include <util/bitops.hpp>
 #include <malloc.h>