diff --git a/xo-object/cmake/xo_objectConfig.cmake.in b/xo-object/cmake/xo_objectConfig.cmake.in
index 32e5b030..df95c47b 100644
--- a/xo-object/cmake/xo_objectConfig.cmake.in
+++ b/xo-object/cmake/xo_objectConfig.cmake.in
@@ -2,7 +2,10 @@
 
 include(CMakeFindDependencyMacro)
 # reminder: deps here must also appear in xo-object/src/object/CMakeLists.txt
-find_dependency(xo_alloc)
+find_dependency(xo_reflectutil)
+find_dependency(xo_unit)
+find_dependency(callback)
+#find_dependency(xo_alloc)
 #find_dependency(xo_flatstring)
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 check_required_components("@PROJECT_NAME@")
diff --git a/xo-object/src/object/Boolean.cpp b/xo-object/src/object/Boolean.cpp
index 20d874b0..424da920 100644
--- a/xo-object/src/object/Boolean.cpp
+++ b/xo-object/src/object/Boolean.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "Boolean.hpp"
-#include "TaggedPtr.hpp"
-#include "xo/reflect/Reflect.hpp"
+#include <xo/reflect/TaggedPtr.hpp>
+#include <xo/reflect/Reflect.hpp>
 #include <array>
 #include <cassert>
 #include <cstddef>
diff --git a/xo-object/src/object/ObjectConverter.cpp b/xo-object/src/object/ObjectConverter.cpp
index a7d0ed4d..5ad36cb5 100644
--- a/xo-object/src/object/ObjectConverter.cpp
+++ b/xo-object/src/object/ObjectConverter.cpp
@@ -8,8 +8,8 @@
 #include "Float.hpp"
 #include "Boolean.hpp"
 #include "String.hpp"
-#include "TaggedPtr.hpp"
-#include "xo/alloc/Blob.hpp"
+#include <xo/reflect/TaggedPtr.hpp>
+#include <xo/alloc/Blob.hpp>
 
 namespace xo {
     using xo::reflect::Reflect;
@@ -145,6 +145,8 @@ namespace xo {
 
                 // still don't have good solver for this yet
                 assert(false);
+
+                return TaggedPtr::universal_null();
             }
         }
 
diff --git a/xo-object/src/object/String.cpp b/xo-object/src/object/String.cpp
index b164c14a..4a457a36 100644
--- a/xo-object/src/object/String.cpp
+++ b/xo-object/src/object/String.cpp
@@ -5,10 +5,12 @@
 
 #include "String.hpp"
 #include "GC.hpp"
-#include "TaggedPtr.hpp"
-#include "xo/reflect/Reflect.hpp"
-#include "xo/indentlog/print/quoted.hpp"
-#include <bsd/string.h>
+#include <xo/reflect/TaggedPtr.hpp>
+#include <xo/reflect/Reflect.hpp>
+#include <xo/indentlog/print/quoted.hpp>
+#ifdef __linux__
+# include <bsd/string.h>
+#endif
 #include <cstddef>
 #include <cstring>
 #include <cassert>