diff --git a/CMakeLists.txt b/CMakeLists.txt
index 592bf697..e12def34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,8 +82,8 @@ add_subdirectory(xo-cmake)
 add_subdirectory(xo-indentlog)
 add_subdirectory(xo-reflectutil)  # header-only reflect support
 add_subdirectory(xo-randomgen)    # xoshiro256ss
-add_subdirectory(xo-arena)   # arena allocator (DArena)
-add_subdirectory(xo-facet)   # sep iface,data
+add_subdirectory(xo-arena)        # arena allocator (DArena)
+add_subdirectory(xo-facet)        # sep iface,data
 add_subdirectory(xo-allocutil)
 add_subdirectory(xo-refcnt)
 add_subdirectory(xo-subsys)
diff --git a/xo-arena/include/xo/arena/hashmap/DArenaHashMapIterator.hpp b/xo-arena/include/xo/arena/hashmap/DArenaHashMapIterator.hpp
index ea87c0ce..77c450d7 100644
--- a/xo-arena/include/xo/arena/hashmap/DArenaHashMapIterator.hpp
+++ b/xo-arena/include/xo/arena/hashmap/DArenaHashMapIterator.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "hashmap/DArenaHashMapUtil.hpp"
+#include <xo/arena/hashmap/DArenaHashMapUtil.hpp>
 
 namespace xo {
     namespace map {
diff --git a/xo-arena/include/xo/arena/hashmap/HashMapStore.hpp b/xo-arena/include/xo/arena/hashmap/HashMapStore.hpp
index 6393bb02..23b9d31f 100644
--- a/xo-arena/include/xo/arena/hashmap/HashMapStore.hpp
+++ b/xo-arena/include/xo/arena/hashmap/HashMapStore.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "hashmap/DArenaHashMapUtil.hpp"
-#include "hashmap/ControlGroup.hpp"
+#include <xo/arena/hashmap/DArenaHashMapUtil.hpp>
+#include <xo/arena/hashmap/ControlGroup.hpp>
 
 namespace xo {
     namespace map {
@@ -52,7 +52,7 @@ namespace xo {
                 float load_factor() const noexcept { return size_ / static_cast<float>(n_slot_); }
 
                 void visit_pools(const MemorySizeVisitor & visitor) const {
-                    // complexity here in service of HashMapStore-specific value for MemorySizeInfo.used 
+                    // complexity here in service of HashMapStore-specific value for MemorySizeInfo.used
 
                     MemorySizeInfo ctl_info;
                     MemorySizeInfo slot_info;