diff --git a/include/xo/object2/IGCObject_DFloat.hpp b/include/xo/object2/IGCObject_DFloat.hpp
index df4eed7..a2da922 100644
--- a/include/xo/object2/IGCObject_DFloat.hpp
+++ b/include/xo/object2/IGCObject_DFloat.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "xo/alloc2/AAllocator.hpp"
+#include <xo/alloc2/alloc/AAllocator.hpp>
 #include <xo/alloc2/gc/AGCObject.hpp>
 #include <xo/alloc2/gc/IGCObject_Xfer.hpp>
 #include "DFloat.hpp"
diff --git a/include/xo/object2/IGCObject_DInteger.hpp b/include/xo/object2/IGCObject_DInteger.hpp
index 20f8976..12fa745 100644
--- a/include/xo/object2/IGCObject_DInteger.hpp
+++ b/include/xo/object2/IGCObject_DInteger.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "xo/alloc2/AAllocator.hpp"
+#include "xo/alloc2/alloc/AAllocator.hpp"
 #include <xo/alloc2/gc/AGCObject.hpp>
 #include <xo/alloc2/gc/IGCObject_Xfer.hpp>
 #include "DInteger.hpp"
diff --git a/include/xo/object2/IGCObject_DList.hpp b/include/xo/object2/IGCObject_DList.hpp
index 9f0199d..ef599dc 100644
--- a/include/xo/object2/IGCObject_DList.hpp
+++ b/include/xo/object2/IGCObject_DList.hpp
@@ -5,11 +5,12 @@
 
 #pragma once
 
-#include <xo/alloc2/AAllocator.hpp>
-#include <xo/alloc2/RAllocator.hpp>
-#include <xo/alloc2/gc/ACollector.hpp>
-#include <xo/alloc2/gc/ICollector_Any.hpp>
-#include <xo/alloc2/gc/RCollector.hpp>
+#include <xo/alloc2/alloc/AAllocator.hpp>
+#include <xo/alloc2/alloc/RAllocator.hpp>
+#include <xo/alloc2/gc/Collector.hpp>
+//#include <xo/alloc2/gc/ACollector.hpp>
+//#include <xo/alloc2/gc/ICollector_Any.hpp>
+//#include <xo/alloc2/gc/RCollector.hpp>
 #include <xo/alloc2/gc/AGCObject.hpp>
 #include <xo/alloc2/gc/IGCObject_Xfer.hpp>
 #include "DList.hpp"
diff --git a/src/object2/IGCObject_DFloat.cpp b/src/object2/IGCObject_DFloat.cpp
index 2c339b0..4c67631 100644
--- a/src/object2/IGCObject_DFloat.cpp
+++ b/src/object2/IGCObject_DFloat.cpp
@@ -4,7 +4,7 @@
  **/
 
 #include "IGCObject_DFloat.hpp"
-#include "AAllocator.hpp"
+#include "xo/alloc2/alloc/AAllocator.hpp"
 #include "xo/facet/obj.hpp"
 #include <cstddef>
 
diff --git a/src/object2/IGCObject_DInteger.cpp b/src/object2/IGCObject_DInteger.cpp
index 0fd2b2e..0bd97f1 100644
--- a/src/object2/IGCObject_DInteger.cpp
+++ b/src/object2/IGCObject_DInteger.cpp
@@ -4,7 +4,7 @@
  **/
 
 #include "IGCObject_DInteger.hpp"
-#include "AAllocator.hpp"
+#include "xo/alloc2/alloc/AAllocator.hpp"
 #include "xo/facet/obj.hpp"
 #include <cstddef>