From b26212c5aad44828a3bee703d0072084b6c9f760 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 14 Dec 2025 17:28:19 -0500
Subject: [PATCH] xo-alloc2: still more header org-streamlining

---
 include/xo/alloc2/{gc => }/Collector.hpp            |  6 +++---
 include/xo/alloc2/GCObject.hpp                      | 13 +++++++++++++
 include/xo/alloc2/gc/ACollector.hpp                 |  2 +-
 include/xo/alloc2/{gc => gcobject}/AGCObject.hpp    |  0
 .../xo/alloc2/{gc => gcobject}/IGCObject_Any.hpp    |  0
 .../xo/alloc2/{gc => gcobject}/IGCObject_Xfer.hpp   |  0
 include/xo/alloc2/{gc => gcobject}/RGCObject.hpp    |  0
 src/alloc2/IGCObject_Any.cpp                        |  2 +-
 utest/Collector.test.cpp                            |  2 +-
 9 files changed, 19 insertions(+), 6 deletions(-)
 rename include/xo/alloc2/{gc => }/Collector.hpp (54%)
 create mode 100644 include/xo/alloc2/GCObject.hpp
 rename include/xo/alloc2/{gc => gcobject}/AGCObject.hpp (100%)
 rename include/xo/alloc2/{gc => gcobject}/IGCObject_Any.hpp (100%)
 rename include/xo/alloc2/{gc => gcobject}/IGCObject_Xfer.hpp (100%)
 rename include/xo/alloc2/{gc => gcobject}/RGCObject.hpp (100%)

diff --git a/include/xo/alloc2/gc/Collector.hpp b/include/xo/alloc2/Collector.hpp
similarity index 54%
rename from include/xo/alloc2/gc/Collector.hpp
rename to include/xo/alloc2/Collector.hpp
index 58d6bde..69bb90b 100644
--- a/include/xo/alloc2/gc/Collector.hpp
+++ b/include/xo/alloc2/Collector.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "ACollector.hpp"
-#include "ICollector_Any.hpp"
-#include "RCollector.hpp"
+#include "gc/ACollector.hpp"
+#include "gc/ICollector_Any.hpp"
+#include "gc/RCollector.hpp"
 
 /* end Collector.hpp */
diff --git a/include/xo/alloc2/GCObject.hpp b/include/xo/alloc2/GCObject.hpp
new file mode 100644
index 0000000..edc89c3
--- /dev/null
+++ b/include/xo/alloc2/GCObject.hpp
@@ -0,0 +1,13 @@
+/** @file GCObject.hpp
+ *
+ *  @author Roland Conybeare, Dec 2025
+ **/
+
+#pragma once
+
+#include "gcobject/AGCObject.hpp"
+#include "gcobject/IGCObject_Any.hpp"
+#include "gcobject/IGCObject_Xfer.hpp"
+#include "gcobject/RGCObject.hpp"
+
+/* end GCObject.hpp */
diff --git a/include/xo/alloc2/gc/ACollector.hpp b/include/xo/alloc2/gc/ACollector.hpp
index 1c6d1cb..da694e9 100644
--- a/include/xo/alloc2/gc/ACollector.hpp
+++ b/include/xo/alloc2/gc/ACollector.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "IGCObject_Any.hpp"
+#include "gcobject/IGCObject_Any.hpp"
 
 #include <xo/facet/facet_implementation.hpp>
 #include <xo/facet/typeseq.hpp>
diff --git a/include/xo/alloc2/gc/AGCObject.hpp b/include/xo/alloc2/gcobject/AGCObject.hpp
similarity index 100%
rename from include/xo/alloc2/gc/AGCObject.hpp
rename to include/xo/alloc2/gcobject/AGCObject.hpp
diff --git a/include/xo/alloc2/gc/IGCObject_Any.hpp b/include/xo/alloc2/gcobject/IGCObject_Any.hpp
similarity index 100%
rename from include/xo/alloc2/gc/IGCObject_Any.hpp
rename to include/xo/alloc2/gcobject/IGCObject_Any.hpp
diff --git a/include/xo/alloc2/gc/IGCObject_Xfer.hpp b/include/xo/alloc2/gcobject/IGCObject_Xfer.hpp
similarity index 100%
rename from include/xo/alloc2/gc/IGCObject_Xfer.hpp
rename to include/xo/alloc2/gcobject/IGCObject_Xfer.hpp
diff --git a/include/xo/alloc2/gc/RGCObject.hpp b/include/xo/alloc2/gcobject/RGCObject.hpp
similarity index 100%
rename from include/xo/alloc2/gc/RGCObject.hpp
rename to include/xo/alloc2/gcobject/RGCObject.hpp
diff --git a/src/alloc2/IGCObject_Any.cpp b/src/alloc2/IGCObject_Any.cpp
index f7b1336..22e1cf4 100644
--- a/src/alloc2/IGCObject_Any.cpp
+++ b/src/alloc2/IGCObject_Any.cpp
@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "gc/IGCObject_Any.hpp"
+#include "gcobject/IGCObject_Any.hpp"
 #include <iostream>
 
 namespace xo {
diff --git a/utest/Collector.test.cpp b/utest/Collector.test.cpp
index d23db5e..4db1c29 100644
--- a/utest/Collector.test.cpp
+++ b/utest/Collector.test.cpp
@@ -7,7 +7,7 @@
  *        see xo-object2/utest
  **/
 
-#include "gc/Collector.hpp"
+#include "Collector.hpp"
 #include "gc/DX1Collector.hpp"
 #include <xo/indentlog/print/tag.hpp>
 #include <catch2/catch.hpp>