From c7884dee133d5cb540be689cbb4e9dee43a4424b Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Wed, 11 Mar 2026 08:49:03 -0500
Subject: [PATCH] xo-interpreter2 stack: bugfix after GCObject facet location
 change

---
 xo-expression2/idl/IGCObject_DApplyExpr.json5                   | 2 +-
 xo-expression2/idl/IGCObject_DConstant.json5                    | 2 +-
 xo-expression2/idl/IGCObject_DDefineExpr.json5                  | 2 +-
 xo-expression2/idl/IGCObject_DGlobalSymtab.json5                | 2 +-
 xo-expression2/idl/IGCObject_DIfElseExpr.json5                  | 2 +-
 xo-expression2/idl/IGCObject_DLambdaExpr.json5                  | 2 +-
 xo-expression2/idl/IGCObject_DLocalSymtab.json5                 | 2 +-
 xo-expression2/idl/IGCObject_DSequenceExpr.json5                | 2 +-
 xo-expression2/idl/IGCObject_DVarRef.json5                      | 2 +-
 xo-expression2/idl/IGCObject_DVariable.json5                    | 2 +-
 .../include/xo/expression2/define/IGCObject_DDefineExpr.hpp     | 2 +-
 .../include/xo/expression2/detail/IGCObject_DApplyExpr.hpp      | 2 +-
 .../include/xo/expression2/detail/IGCObject_DConstant.hpp       | 2 +-
 .../include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp     | 2 +-
 .../include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp     | 2 +-
 .../include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp   | 2 +-
 .../include/xo/expression2/detail/IGCObject_DVarRef.hpp         | 2 +-
 .../include/xo/expression2/detail/IGCObject_DVariable.hpp       | 2 +-
 .../include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp   | 2 +-
 .../include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp    | 2 +-
 xo-interpreter2/idl/IGCObject_DClosure.json5                    | 2 +-
 xo-interpreter2/idl/IGCObject_DGlobalEnv.json5                  | 2 +-
 xo-interpreter2/idl/IGCObject_DLocalEnv.json5                   | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5       | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5              | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmDefContFrame.json5            | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5           | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5         | 2 +-
 xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5            | 2 +-
 .../xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp       | 2 +-
 .../include/xo/interpreter2/detail/IGCObject_DClosure.hpp       | 2 +-
 .../xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp  | 2 +-
 .../include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp | 2 +-
 .../xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp      | 2 +-
 .../include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp        | 2 +-
 .../include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp         | 2 +-
 .../xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp    | 2 +-
 .../xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp     | 2 +-
 xo-procedure2/idl/IGCObject_DPrimitive_gco_0.json5              | 2 +-
 xo-procedure2/idl/IGCObject_DPrimitive_gco_1_gco.json5          | 2 +-
 xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5      | 2 +-
 .../idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5        | 2 +-
 xo-procedure2/idl/Procedure.json5                               | 2 +-
 xo-procedure2/include/xo/procedure2/detail/AProcedure.hpp       | 2 +-
 .../include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp | 2 +-
 .../xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp     | 2 +-
 .../xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp | 2 +-
 .../detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp       | 2 +-
 xo-procedure2/include/xo/procedure2/detail/IProcedure_Xfer.hpp  | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/xo-expression2/idl/IGCObject_DApplyExpr.json5 b/xo-expression2/idl/IGCObject_DApplyExpr.json5
index 60f997c8..fd1d528a 100644
--- a/xo-expression2/idl/IGCObject_DApplyExpr.json5
+++ b/xo-expression2/idl/IGCObject_DApplyExpr.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DConstant.json5 b/xo-expression2/idl/IGCObject_DConstant.json5
index 961f39bb..5e598b95 100644
--- a/xo-expression2/idl/IGCObject_DConstant.json5
+++ b/xo-expression2/idl/IGCObject_DConstant.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DDefineExpr.json5 b/xo-expression2/idl/IGCObject_DDefineExpr.json5
index 6b0eba68..2509897b 100644
--- a/xo-expression2/idl/IGCObject_DDefineExpr.json5
+++ b/xo-expression2/idl/IGCObject_DDefineExpr.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "define",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DGlobalSymtab.json5 b/xo-expression2/idl/IGCObject_DGlobalSymtab.json5
index ac779ec2..858a5eab 100644
--- a/xo-expression2/idl/IGCObject_DGlobalSymtab.json5
+++ b/xo-expression2/idl/IGCObject_DGlobalSymtab.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "symtab",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DIfElseExpr.json5 b/xo-expression2/idl/IGCObject_DIfElseExpr.json5
index 6fb8c07a..bd0b183c 100644
--- a/xo-expression2/idl/IGCObject_DIfElseExpr.json5
+++ b/xo-expression2/idl/IGCObject_DIfElseExpr.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DLambdaExpr.json5 b/xo-expression2/idl/IGCObject_DLambdaExpr.json5
index a0f494ff..7913a6bc 100644
--- a/xo-expression2/idl/IGCObject_DLambdaExpr.json5
+++ b/xo-expression2/idl/IGCObject_DLambdaExpr.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DLocalSymtab.json5 b/xo-expression2/idl/IGCObject_DLocalSymtab.json5
index ec8260a0..807a229a 100644
--- a/xo-expression2/idl/IGCObject_DLocalSymtab.json5
+++ b/xo-expression2/idl/IGCObject_DLocalSymtab.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "symtab",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DSequenceExpr.json5 b/xo-expression2/idl/IGCObject_DSequenceExpr.json5
index 1fc67e48..b8c06cbc 100644
--- a/xo-expression2/idl/IGCObject_DSequenceExpr.json5
+++ b/xo-expression2/idl/IGCObject_DSequenceExpr.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DVarRef.json5 b/xo-expression2/idl/IGCObject_DVarRef.json5
index 6c1bad33..2cbc4715 100644
--- a/xo-expression2/idl/IGCObject_DVarRef.json5
+++ b/xo-expression2/idl/IGCObject_DVarRef.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/idl/IGCObject_DVariable.json5 b/xo-expression2/idl/IGCObject_DVariable.json5
index 6bea1dc3..b9f27623 100644
--- a/xo-expression2/idl/IGCObject_DVariable.json5
+++ b/xo-expression2/idl/IGCObject_DVariable.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/expression2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp b/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp
index 216dd18b..8e516773 100644
--- a/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp
+++ b/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DDefineExpr.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp
index 10b08c10..effcd01c 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DApplyExpr.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp
index 871f9c91..608d4d6a 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DConstant.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp
index 6a47d9b8..63fdb6ee 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DIfElseExpr.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp
index 7d1ba5b0..91bb24da 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DLambdaExpr.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp
index 1f6b8deb..20d21159 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DSequenceExpr.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp
index e991ebb8..228e74c0 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVarRef.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DVariable.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DVariable.hpp
index 242f335f..0b23f630 100644
--- a/xo-expression2/include/xo/expression2/detail/IGCObject_DVariable.hpp
+++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DVariable.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVariable.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp b/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp
index 92149015..fe487e1a 100644
--- a/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp
+++ b/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DGlobalSymtab.hpp"
 
diff --git a/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp
index 94b9e279..6c0ec0c7 100644
--- a/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp
+++ b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DLocalSymtab.hpp"
 
diff --git a/xo-interpreter2/idl/IGCObject_DClosure.json5 b/xo-interpreter2/idl/IGCObject_DClosure.json5
index a9b5616a..944ee2f4 100644
--- a/xo-interpreter2/idl/IGCObject_DClosure.json5
+++ b/xo-interpreter2/idl/IGCObject_DClosure.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DGlobalEnv.json5 b/xo-interpreter2/idl/IGCObject_DGlobalEnv.json5
index ce0bc090..9ce50388 100644
--- a/xo-interpreter2/idl/IGCObject_DGlobalEnv.json5
+++ b/xo-interpreter2/idl/IGCObject_DGlobalEnv.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "env",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5 b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5
index 252bfbd7..82dd7ed0 100644
--- a/xo-interpreter2/idl/IGCObject_DLocalEnv.json5
+++ b/xo-interpreter2/idl/IGCObject_DLocalEnv.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "env",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5
index 2b68d579..bfdb8c96 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmApplyClosureFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5
index ae284287..4bb09a61 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmApplyFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmDefContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmDefContFrame.json5
index 061fca5d..faaee199 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmDefContFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmDefContFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "define",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5
index d36304b8..90781d9c 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmEvalArgsFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "detail",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5
index 63617067..29e980ae 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmIfElseContFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "ifelse",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5 b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5
index d2b68020..5e8fcc25 100644
--- a/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5
+++ b/xo-interpreter2/idl/IGCObject_DVsmSeqContFrame.json5
@@ -4,7 +4,7 @@
     output_hpp_dir: "include/xo/interpreter2",
     output_impl_subdir: "sequence",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],
diff --git a/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
index 309a6ac7..f287f9fb 100644
--- a/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmDefContFrame.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
index fb863205..592b1640 100644
--- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DClosure.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
index 2baacd05..1d455a71 100644
--- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmApplyClosureFrame.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
index ca6d3b10..a2257125 100644
--- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmApplyFrame.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
index 4a8ad18a..3816203c 100644
--- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmEvalArgsFrame.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
index 1f0f9281..a2fcb5f6 100644
--- a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DGlobalEnv.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
index d318bb61..93f1cce3 100644
--- a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DLocalEnv.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
index 293dd70d..d62c896b 100644
--- a/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmIfElseContFrame.hpp"
 
diff --git a/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
index 1bdbe2ab..acf77945 100644
--- a/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
+++ b/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmSeqContFrame.hpp"
 
diff --git a/xo-procedure2/idl/IGCObject_DPrimitive_gco_0.json5 b/xo-procedure2/idl/IGCObject_DPrimitive_gco_0.json5
index 27557c24..89c7de3a 100644
--- a/xo-procedure2/idl/IGCObject_DPrimitive_gco_0.json5
+++ b/xo-procedure2/idl/IGCObject_DPrimitive_gco_0.json5
@@ -5,7 +5,7 @@
     output_impl_subdir: "detail",
     includes: [
         //<xo/procedure2/GCObjectConversion_DPrimitive_gco_0.hpp>
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>",
     ],
     local_types: [ ],
diff --git a/xo-procedure2/idl/IGCObject_DPrimitive_gco_1_gco.json5 b/xo-procedure2/idl/IGCObject_DPrimitive_gco_1_gco.json5
index 3b85d4a0..60785f65 100644
--- a/xo-procedure2/idl/IGCObject_DPrimitive_gco_1_gco.json5
+++ b/xo-procedure2/idl/IGCObject_DPrimitive_gco_1_gco.json5
@@ -5,7 +5,7 @@
     output_impl_subdir: "detail",
     includes: [
         //<xo/procedure2/GCObjectConversion_DPrimitive_gco_1_gco.hpp>
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>",
     ],
     local_types: [ ],
diff --git a/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 b/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
index cd17ae4f..e0ffb9fe 100644
--- a/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
+++ b/xo-procedure2/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
@@ -5,7 +5,7 @@
     output_impl_subdir: "detail",
     includes: [
         //<xo/procedure2/GCObjectConversion_DPrimitive_gco_2_gco_gco.hpp>
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>",
     ],
     local_types: [ ],
diff --git a/xo-procedure2/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5 b/xo-procedure2/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
index 342b9bfd..ad44b582 100644
--- a/xo-procedure2/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
+++ b/xo-procedure2/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
@@ -5,7 +5,7 @@
     output_impl_subdir: "detail",
     includes: [
         //<xo/procedure2/GCObjectConversion_DPrimitive_gco_3_dict_string_gco.hpp>
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>",
     ],
     local_types: [ ],
diff --git a/xo-procedure2/idl/Procedure.json5 b/xo-procedure2/idl/Procedure.json5
index b45227d0..a4597ddd 100644
--- a/xo-procedure2/idl/Procedure.json5
+++ b/xo-procedure2/idl/Procedure.json5
@@ -10,7 +10,7 @@
     // includes in ASyntaxStateMachine.hpp
     includes: [
         "\"RuntimeContext.hpp\"",
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
     ],
     // extra includes in Procedure.hpp, if any
     user_hpp_includes: [
diff --git a/xo-procedure2/include/xo/procedure2/detail/AProcedure.hpp b/xo-procedure2/include/xo/procedure2/detail/AProcedure.hpp
index eb119fbd..a5c41b41 100644
--- a/xo-procedure2/include/xo/procedure2/detail/AProcedure.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/AProcedure.hpp
@@ -15,7 +15,7 @@
 
 // includes (via {facet_includes})
 #include "RuntimeContext.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/facet/obj.hpp>
 #include <xo/facet/facet_implementation.hpp>
 #include <xo/facet/typeseq.hpp>
diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
index 91ff1833..c8865270 100644
--- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_0.hpp"
 
diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
index 190a92c7..ac5a4439 100644
--- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_1_gco.hpp"
 
diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
index f6bfe6ed..fee6d62b 100644
--- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_2_gco_gco.hpp"
 
diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
index abb30bca..951bda1c 100644
--- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_3_dict_string_gco.hpp"
 
diff --git a/xo-procedure2/include/xo/procedure2/detail/IProcedure_Xfer.hpp b/xo-procedure2/include/xo/procedure2/detail/IProcedure_Xfer.hpp
index 0be093fb..59742f32 100644
--- a/xo-procedure2/include/xo/procedure2/detail/IProcedure_Xfer.hpp
+++ b/xo-procedure2/include/xo/procedure2/detail/IProcedure_Xfer.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RuntimeContext.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
 namespace scm {