From 45e05f03cbddb30d6f83681735503b3b34d022b9 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 14 Dec 2025 17:04:45 -0500
Subject: [PATCH] xo-alloc2: streamline headers (more reorg)

---
 xo-alloc2/include/xo/alloc2/Allocator.hpp    | 12 ++++++++++++
 xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp |  3 +--
 xo-alloc2/utest/arena.test.cpp               |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 xo-alloc2/include/xo/alloc2/Allocator.hpp

diff --git a/xo-alloc2/include/xo/alloc2/Allocator.hpp b/xo-alloc2/include/xo/alloc2/Allocator.hpp
new file mode 100644
index 00000000..ee5e709f
--- /dev/null
+++ b/xo-alloc2/include/xo/alloc2/Allocator.hpp
@@ -0,0 +1,12 @@
+/** @file Allocator.hpp
+ *
+ *  @author Roland Conybeare, Dec 2025
+ **/
+
+#pragma once
+
+#include "AAllocator.hpp"
+#include "IAllocator_Any.hpp"
+#include "RAllocator.hpp"
+
+/* end Allocator.hpp */
diff --git a/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp b/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp
index c5586244..1e0a6d45 100644
--- a/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp
+++ b/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp
@@ -5,8 +5,7 @@
 
 #pragma once
 
-#include "IAllocator_Any.hpp"
-#include "RAllocator.hpp"
+#include "Allocator.hpp"
 #include "xo/facet/facet_implementation.hpp"
 #include "xo/facet/typeseq.hpp"
 #include "xo/facet/obj.hpp"   // for obj<AAllocator> in shallow_copy
diff --git a/xo-alloc2/utest/arena.test.cpp b/xo-alloc2/utest/arena.test.cpp
index 69a2f0f3..501724d8 100644
--- a/xo-alloc2/utest/arena.test.cpp
+++ b/xo-alloc2/utest/arena.test.cpp
@@ -3,8 +3,8 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "xo/alloc2/AAllocator.hpp"
-#include "xo/alloc2/IAllocator_Any.hpp"
+#include "xo/alloc2/Allocator.hpp"
+//#include "xo/alloc2/IAllocator_Any.hpp"
 #include "xo/alloc2/IAllocator_Xfer.hpp"
 //#include "xo/alloc2/DArena.hpp"
 #include "xo/alloc2/IAllocator_DArena.hpp"