diff --git a/include/xo/reader2/ParserResult.hpp b/include/xo/reader2/ParserResult.hpp
index 492b78b0..9cdf1424 100644
--- a/include/xo/reader2/ParserResult.hpp
+++ b/include/xo/reader2/ParserResult.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <xo/expression2/Expression.hpp>
-#include <xo/object2/DString.hpp>
+#include <xo/stringtable2/DString.hpp>
 #include <xo/indentlog/print/pretty.hpp>
 #include <string_view>
 
diff --git a/src/reader2/DExpectExprSsm.cpp b/src/reader2/DExpectExprSsm.cpp
index aef5c7a4..40ed2476 100644
--- a/src/reader2/DExpectExprSsm.cpp
+++ b/src/reader2/DExpectExprSsm.cpp
@@ -18,15 +18,13 @@
 #include <xo/object2/Boolean.hpp>
 #include <xo/object2/Integer.hpp>
 #include <xo/object2/Float.hpp>
-#include <xo/object2/String.hpp>
+#include <xo/stringtable2/String.hpp>
 #include <xo/alloc2/GCObject.hpp>
 #include <xo/facet/facet_implementation.hpp>
 
 #ifdef NOT_YET
 #include "define_xs.hpp"
 #include "paren_xs.hpp"
-#include "sequence_xs.hpp"
-#include "progress_xs.hpp"
 #endif
 
 namespace xo {
diff --git a/src/reader2/DToplevelSeqSsm.cpp b/src/reader2/DToplevelSeqSsm.cpp
index 493c745e..d7444e43 100644
--- a/src/reader2/DToplevelSeqSsm.cpp
+++ b/src/reader2/DToplevelSeqSsm.cpp
@@ -17,17 +17,17 @@
 #include <xo/expression2/Constant.hpp>
 //#include <xo/expression2/detail/IExpression_DConstant.hpp>
 
-#include <xo/object2/DString.hpp>
-#include <xo/object2/string/IGCObject_DString.hpp>
+#include <xo/stringtable2/String.hpp>
+//#include <xo/object2/string/IGCObject_DString.hpp>
 
-#include <xo/object2/DFloat.hpp>
-#include <xo/object2/number/IGCObject_DFloat.hpp>
+#include <xo/object2/Float.hpp>
+//#include <xo/object2/number/IGCObject_DFloat.hpp>
 
-#include <xo/object2/DInteger.hpp>
-#include <xo/object2/number/IGCObject_DInteger.hpp>
+#include <xo/object2/Integer.hpp>
+//#include <xo/object2/number/IGCObject_DInteger.hpp>
 
-#include <xo/object2/DBoolean.hpp>
-#include <xo/object2/boolean/IGCObject_DBoolean.hpp>
+#include <xo/object2/Boolean.hpp>
+//#include <xo/object2/boolean/IGCObject_DBoolean.hpp>
 
 #include <xo/alloc2/GCObject.hpp>
 
diff --git a/src/reader2/init_reader2.cpp b/src/reader2/init_reader2.cpp
index a6e1a7b0..df0de7c0 100644
--- a/src/reader2/init_reader2.cpp
+++ b/src/reader2/init_reader2.cpp
@@ -9,7 +9,7 @@
 
 #include <xo/expression2/init_expression2.hpp>
 #include <xo/numeric/init_numeric.hpp>
-#include <xo/gc/CollectorTypeRegistry.hpp>
+#include <xo/alloc2/CollectorTypeRegistry.hpp>
 
 namespace xo {
     using xo::scm::reader2_register_facets;
diff --git a/utest/SchematikaParser.test.cpp b/utest/SchematikaParser.test.cpp
index 0404a800..c299306f 100644
--- a/utest/SchematikaParser.test.cpp
+++ b/utest/SchematikaParser.test.cpp
@@ -17,7 +17,7 @@
 #include <xo/procedure2/Primitive_gco_2_gco_gco.hpp>
 #include <xo/object2/Float.hpp>
 #include <xo/object2/Integer.hpp>
-#include <xo/object2/String.hpp>
+#include <xo/stringtable2/String.hpp>
 #include <xo/alloc2/arena/IAllocator_DArena.hpp>
 #include <xo/facet/TypeRegistry.hpp>
 #include <catch2/catch.hpp>
@@ -25,10 +25,10 @@
 namespace xo {
     using xo::scm::ParserConfig;
     using xo::scm::SchematikaParser;
-    using xo::scm::ASyntaxStateMachine;
-    using xo::scm::syntaxstatetype;
+//    using xo::scm::ASyntaxStateMachine;
+//    using xo::scm::syntaxstatetype;
 //    using xo::scm::DDefineSsm;
-    using xo::scm::DExpectExprSsm;
+//    using xo::scm::DExpectExprSsm;
 
     using xo::scm::AExpression;
     using xo::scm::DDefineExpr;
@@ -51,7 +51,7 @@ namespace xo {
     using xo::mm::AAllocator;
     using xo::mm::DArena;
     using xo::mm::MemorySizeInfo;
-    using xo::facet::with_facet;
+//    using xo::facet::with_facet;
 
     static InitEvidence s_init = (InitSubsys<S_reader2_tag>::require());