includeos · alfreb · Dec 18, 2025 · Oct 28, 2025
diff --git 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
@@ -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
@@ -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 → api/mem/alloc/buddy.hpp b/api/util/alloc_buddy.hpp → api/mem/alloc/buddy.hpp
diff --git a/api/util/alloc_lstack.hpp → api/mem/alloc/lstack.hpp b/api/util/alloc_lstack.hpp → api/mem/alloc/lstack.hpp
diff --git a/api/util/alloc_pmr.hpp → api/mem/alloc/pmr.hpp b/api/util/alloc_pmr.hpp → api/mem/alloc/pmr.hpp
diff --git a/api/util/allocator.hpp → api/mem/allocator.hpp b/api/util/allocator.hpp → api/mem/allocator.hpp
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>