diff --git a/idl/IGCObject_DApplyExpr.json5 b/idl/IGCObject_DApplyExpr.json5
index 60f997c8..fd1d528a 100644
--- a/idl/IGCObject_DApplyExpr.json5
+++ b/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/idl/IGCObject_DConstant.json5 b/idl/IGCObject_DConstant.json5
index 961f39bb..5e598b95 100644
--- a/idl/IGCObject_DConstant.json5
+++ b/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/idl/IGCObject_DDefineExpr.json5 b/idl/IGCObject_DDefineExpr.json5
index 6b0eba68..2509897b 100644
--- a/idl/IGCObject_DDefineExpr.json5
+++ b/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/idl/IGCObject_DGlobalSymtab.json5 b/idl/IGCObject_DGlobalSymtab.json5
index ac779ec2..858a5eab 100644
--- a/idl/IGCObject_DGlobalSymtab.json5
+++ b/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/idl/IGCObject_DIfElseExpr.json5 b/idl/IGCObject_DIfElseExpr.json5
index 6fb8c07a..bd0b183c 100644
--- a/idl/IGCObject_DIfElseExpr.json5
+++ b/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/idl/IGCObject_DLambdaExpr.json5 b/idl/IGCObject_DLambdaExpr.json5
index a0f494ff..7913a6bc 100644
--- a/idl/IGCObject_DLambdaExpr.json5
+++ b/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/idl/IGCObject_DLocalSymtab.json5 b/idl/IGCObject_DLocalSymtab.json5
index ec8260a0..807a229a 100644
--- a/idl/IGCObject_DLocalSymtab.json5
+++ b/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/idl/IGCObject_DSequenceExpr.json5 b/idl/IGCObject_DSequenceExpr.json5
index 1fc67e48..b8c06cbc 100644
--- a/idl/IGCObject_DSequenceExpr.json5
+++ b/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/idl/IGCObject_DVarRef.json5 b/idl/IGCObject_DVarRef.json5
index 6c1bad33..2cbc4715 100644
--- a/idl/IGCObject_DVarRef.json5
+++ b/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/idl/IGCObject_DVariable.json5 b/idl/IGCObject_DVariable.json5
index 6bea1dc3..b9f27623 100644
--- a/idl/IGCObject_DVariable.json5
+++ b/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/include/xo/expression2/define/IGCObject_DDefineExpr.hpp b/include/xo/expression2/define/IGCObject_DDefineExpr.hpp
index 216dd18b..8e516773 100644
--- a/include/xo/expression2/define/IGCObject_DDefineExpr.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp b/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp
index 10b08c10..effcd01c 100644
--- a/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DConstant.hpp b/include/xo/expression2/detail/IGCObject_DConstant.hpp
index 871f9c91..608d4d6a 100644
--- a/include/xo/expression2/detail/IGCObject_DConstant.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp b/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp
index 6a47d9b8..63fdb6ee 100644
--- a/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp b/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp
index 7d1ba5b0..91bb24da 100644
--- a/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp b/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp
index 1f6b8deb..20d21159 100644
--- a/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DVarRef.hpp b/include/xo/expression2/detail/IGCObject_DVarRef.hpp
index e991ebb8..228e74c0 100644
--- a/include/xo/expression2/detail/IGCObject_DVarRef.hpp
+++ b/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/include/xo/expression2/detail/IGCObject_DVariable.hpp b/include/xo/expression2/detail/IGCObject_DVariable.hpp
index 242f335f..0b23f630 100644
--- a/include/xo/expression2/detail/IGCObject_DVariable.hpp
+++ b/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/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp b/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp
index 92149015..fe487e1a 100644
--- a/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp
+++ b/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/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp b/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp
index 94b9e279..6c0ec0c7 100644
--- a/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp
+++ b/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"