diff --git a/include/xo/interpreter2/DVsmDefContFrame.hpp b/include/xo/interpreter2/DVsmDefContFrame.hpp
index 68c2510a..c0e6ed0f 100644
--- a/include/xo/interpreter2/DVsmDefContFrame.hpp
+++ b/include/xo/interpreter2/DVsmDefContFrame.hpp
@@ -7,7 +7,7 @@
 
 #include "VsmInstr.hpp"
 #include <xo/expression2/DefineExpr.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
     namespace scm {
diff --git a/include/xo/interpreter2/DVsmIfElseContFrame.hpp b/include/xo/interpreter2/DVsmIfElseContFrame.hpp
index 3d4ace12..8efd9299 100644
--- a/include/xo/interpreter2/DVsmIfElseContFrame.hpp
+++ b/include/xo/interpreter2/DVsmIfElseContFrame.hpp
@@ -7,7 +7,7 @@
 
 #include "VsmInstr.hpp"
 #include <xo/expression2/IfElseExpr.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
     namespace scm {
@@ -61,7 +61,7 @@ namespace xo {
             bool pretty(const ppindentinfo & ppii) const noexcept;
 
             ///@}
-            
+
         private:
             /** @defgroup scm-vsmevalsequenceframe-members member variables **/
             ///@{
diff --git a/include/xo/interpreter2/DVsmSeqContFrame.hpp b/include/xo/interpreter2/DVsmSeqContFrame.hpp
index cb63f0d4..6b543d8b 100644
--- a/include/xo/interpreter2/DVsmSeqContFrame.hpp
+++ b/include/xo/interpreter2/DVsmSeqContFrame.hpp
@@ -7,7 +7,7 @@
 
 #include "VsmInstr.hpp"
 #include <xo/expression2/SequenceExpr.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
     namespace scm {
@@ -50,7 +50,7 @@ namespace xo {
             ///@{
 
             uint32_t incr_i_seq() noexcept { return ++(this->i_seq_); }
-            
+
             ///@}
             /** @defgroup scm-vsmevalsequenceframe-gcobject-facet gcobject facet **/
             ///@{
@@ -66,7 +66,7 @@ namespace xo {
             bool pretty(const ppindentinfo & ppii) const noexcept;
 
             ///@}
-            
+
         private:
             /** @defgroup scm-vsmevalsequenceframe-members member variables **/
             ///@{
diff --git a/include/xo/interpreter2/VirtualSchematikaMachine.hpp b/include/xo/interpreter2/VirtualSchematikaMachine.hpp
index 1bfa5ecb..ec7eda34 100644
--- a/include/xo/interpreter2/VirtualSchematikaMachine.hpp
+++ b/include/xo/interpreter2/VirtualSchematikaMachine.hpp
@@ -13,7 +13,7 @@
 #include <xo/object2/RuntimeError.hpp>
 #include <xo/reader2/SchematikaReader.hpp>
 #include <xo/expression2/Expression.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/abox.hpp>
 #include <variant>
 
diff --git a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
index 309a6ac7..bc3423d9 100644
--- a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
index fb863205..8507d640 100644
--- a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp
index d318bb61..25db925a 100644
--- a/include/xo/interpreter2/detail/IGCObject_DLocalEnv.hpp
+++ b/include/xo/interpreter2/detail/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
index 2baacd05..7db673e7 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
index ca6d3b10..401a91d7 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
index 4a8ad18a..1a91c32f 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
index 1f0f9281..71ac3e49 100644
--- a/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
index d318bb61..25db925a 100644
--- a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
index 293dd70d..1d29a8ac 100644
--- a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/interpreter2/interpreter2_register_types.hpp b/include/xo/interpreter2/interpreter2_register_types.hpp
index 1409d13a..b545f356 100644
--- a/include/xo/interpreter2/interpreter2_register_types.hpp
+++ b/include/xo/interpreter2/interpreter2_register_types.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/Collector.hpp>
+#include <xo/alloc2/Collector.hpp>
 
 namespace xo {
     namespace scm {
diff --git a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
index 1bdbe2ab..9b686c6c 100644
--- a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
+++ b/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"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/src/interpreter2/DVsmDefContFrame.cpp b/src/interpreter2/DVsmDefContFrame.cpp
index 7b3b9e7a..2d5c9adf 100644
--- a/src/interpreter2/DVsmDefContFrame.cpp
+++ b/src/interpreter2/DVsmDefContFrame.cpp
@@ -5,7 +5,7 @@
 
 #include "DVsmDefContFrame.hpp"
 #include <xo/expression2/DefineExpr.hpp>
-#include <xo/gc/Collector.hpp>
+#include <xo/alloc2/Collector.hpp>
 
 namespace xo {
     namespace scm {