From ca53be8264e9b700fe3d01256297ba5d56647a8e Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 2 May 2026 13:49:29 -0400
Subject: [PATCH] xo-gc stack: refactor + streamline.

Retiring unused Collector typealiases.
Fix #include topology.
Fix/improve write barrier setup.
---
 codegen/genfacet                | 4 +++-
 codegen/iface_facet_xfer.hpp.j2 | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/codegen/genfacet b/codegen/genfacet
index cb6517a6..e1b32be6 100755
--- a/codegen/genfacet
+++ b/codegen/genfacet
@@ -154,11 +154,13 @@ def gen_facet(env,
     # RFoo.hpp
     router_facet_hpp_fname = f'{router_facet}.hpp'
 
+    # REMINDER: this context for FACET definition, e.g. AGCObject
     context = {
         'genfacet': 'xo-facet/codegen/genfacet',
         'genfacet_input': idl_fname,
         'using_dox': using_dox,
-        'impl_hpp_subdir': facet_detail_subdir,
+        'impl_hpp_subdir': facet_detail_subdir,    # legacy name
+        'facet_detail_subdir': facet_detail_subdir,
         #
         'facet_hpp_j2': 'facet.hpp.j2',
         'facet_includes': facet_includes,
diff --git a/codegen/iface_facet_xfer.hpp.j2 b/codegen/iface_facet_xfer.hpp.j2
index 80bd79c1..0a418f68 100644
--- a/codegen/iface_facet_xfer.hpp.j2
+++ b/codegen/iface_facet_xfer.hpp.j2
@@ -9,10 +9,18 @@
  *       [{{ iface_facet_any_hpp_j2 }}]
  *  3. idl for facet methods
  *       [{{ idl_fname }}]
+ *
+ *  variables:
+ *    {facet_hpp_fname} -> {{facet_hpp_fname}}
+ *    {impl_hpp_subdir} -> {{impl_hpp_subdir}}
+ *    {facet_ns1} -> {{facet_ns1}}
+ *    {facet_detail_subdir} -> {{facet_detail_subdir}}
+ *    {abstract_facet_fname} -> {{abstract_facet_fname}}
  **/
 
 #pragma once
 
+#include "{{abstract_facet_fname}}"
 {% for include_fname in facet_includes %}
 #include {{include_fname}}
 {% endfor %}