diff --git a/tooling/internal/cpp/include/detail/ndarray/impl.h b/tooling/internal/cpp/include/detail/ndarray/impl.h
index 53a966be..1c501a6c 100644
--- a/tooling/internal/cpp/include/detail/ndarray/impl.h
+++ b/tooling/internal/cpp/include/detail/ndarray/impl.h
@@ -2,10 +2,22 @@
 
 #include <utility>
 
+#ifndef XTENSOR_VERSION_MAJOR
+// need to include this for version info
+#  include <xtensor/xtensor.hpp>
+#endif
+
+#if XTENSOR_VERSION_MAJOR == 0 && XTENSOR_VERSION_MINOR < 26
 #include <xtensor/xarray.hpp>
 #include <xtensor/xfixed.hpp>
 #include <xtensor/xio.hpp>
 #include <xtensor/xtensor.hpp>
+#else
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/containers/xfixed.hpp>
+#include <xtensor/io/xio.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#endif
 
 namespace yardl {