diff --git a/xo-allocutil/include/xo/allocutil/gc_allocator_traits.hpp b/xo-allocutil/include/xo/allocutil/gc_allocator_traits.hpp
index 20568689..7e27d673 100644
--- a/xo-allocutil/include/xo/allocutil/gc_allocator_traits.hpp
+++ b/xo-allocutil/include/xo/allocutil/gc_allocator_traits.hpp
@@ -46,11 +46,11 @@ namespace xo {
         template <typename GcObjectInterface>
         struct FallbackGcInterface {
             template <typename Allocator>
-            FallbackGcInterface(Allocator & alloc) {}
+            FallbackGcInterface(Allocator & /*alloc*/) {}
 
-            bool check_write_barrier(const void * parent,
-                                     const void * const * lhs,
-                                     bool may_throw) { return true; };
+            bool check_write_barrier(const void * /*parent*/,
+                                     const void * const * /*lhs*/,
+                                     bool /*may_throw*/) { return true; };
         };
 
         /** Extended version of
diff --git a/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp b/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp
index 7c9347fb..066226fa 100644
--- a/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp
+++ b/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp
@@ -602,13 +602,13 @@ namespace xo {
 
                 /* RB1. */
                 if (root_ != nullptr) {
-                    XO_EXPECT(root_->parent_ == nullptr,
+                    XO_EXPECT(root_->parent() == nullptr,
                               tostr(c_self, ": expect root->parent=nullptr",
-                                    xtag("parent", root_->parent_)));
-                    XO_EXPECT(root_->size_ == this->size_,
+                                    xtag("parent", root_->parent())));
+                    XO_EXPECT(root_->size() == this->size_,
                               tostr(c_self, ": expect self.size=root.size",
                                     xtag("self.size", size_),
-                                    xtag("root.size", root_->size_)));
+                                    xtag("root.size", root_->size())));
                 }
 
                 /* height (counting only black nodes) of tree */
diff --git a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp
index 002166b2..02edc821 100644
--- a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp
+++ b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp
@@ -424,8 +424,11 @@ namespace xo {
 
             private:
                 friend class RbTreeUtil<Key, Value, Reduce, GcObjectInterface>;
+
+#ifdef REMOVING
                 template <typename Key1, typename Value1, typename Reduce1, typename Allocator>
                 friend class xo::tree::RedBlackTree;
+#endif
 
             private:
                 /* red | black */