diff --git a/include/openmc/bremsstrahlung.h b/include/openmc/bremsstrahlung.h
index 2f7e41bf087..5bb5195adc7 100644
--- a/include/openmc/bremsstrahlung.h
+++ b/include/openmc/bremsstrahlung.h
@@ -3,7 +3,7 @@
 
 #include "openmc/particle.h"
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 namespace openmc {
 
diff --git a/include/openmc/distribution_energy.h b/include/openmc/distribution_energy.h
index 9b08ed039dc..63bbd57b708 100644
--- a/include/openmc/distribution_energy.h
+++ b/include/openmc/distribution_energy.h
@@ -5,7 +5,7 @@
 #define OPENMC_DISTRIBUTION_ENERGY_H
 
 #include "hdf5.h"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/endf.h"
diff --git a/include/openmc/eigenvalue.h b/include/openmc/eigenvalue.h
index b456fee21eb..260b1f2ca14 100644
--- a/include/openmc/eigenvalue.h
+++ b/include/openmc/eigenvalue.h
@@ -6,7 +6,7 @@
 
 #include <cstdint> // for int64_t
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <hdf5.h>
 
 #include "openmc/array.h"
diff --git a/include/openmc/hdf5_interface.h b/include/openmc/hdf5_interface.h
index 28b0d2b113d..e869090797d 100644
--- a/include/openmc/hdf5_interface.h
+++ b/include/openmc/hdf5_interface.h
@@ -11,8 +11,8 @@
 
 #include "hdf5.h"
 #include "hdf5_hl.h"
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xarray.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/containers/xarray.hpp"
 
 #include "openmc/array.h"
 #include "openmc/error.h"
diff --git a/include/openmc/material.h b/include/openmc/material.h
index c10f25551e8..0af8c55db35 100644
--- a/include/openmc/material.h
+++ b/include/openmc/material.h
@@ -6,7 +6,7 @@
 
 #include "openmc/span.h"
 #include "pugixml.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <hdf5.h>
 
 #include "openmc/bremsstrahlung.h"
diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index 5dc327fe359..62a0ba508a2 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -9,7 +9,7 @@
 
 #include "hdf5.h"
 #include "pugixml.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/bounding_box.h"
 #include "openmc/error.h"
diff --git a/include/openmc/mgxs.h b/include/openmc/mgxs.h
index 43505f432d6..398f6437ab4 100644
--- a/include/openmc/mgxs.h
+++ b/include/openmc/mgxs.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/hdf5_interface.h"
diff --git a/include/openmc/photon.h b/include/openmc/photon.h
index f6f28a4df1d..ecb36fe1607 100644
--- a/include/openmc/photon.h
+++ b/include/openmc/photon.h
@@ -6,7 +6,7 @@
 #include "openmc/particle.h"
 #include "openmc/vector.h"
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <hdf5.h>
 
 #include <string>
diff --git a/include/openmc/plot.h b/include/openmc/plot.h
index 02ff2848ded..01d8a193219 100644
--- a/include/openmc/plot.h
+++ b/include/openmc/plot.h
@@ -7,7 +7,7 @@
 #include <unordered_set>
 
 #include "pugixml.hpp"
-#include "xtensor/xarray.hpp"
+#include "xtensor/containers/xarray.hpp"
 
 #include "hdf5.h"
 #include "openmc/cell.h"
diff --git a/include/openmc/scattdata.h b/include/openmc/scattdata.h
index a75ef09d97b..cbaf04cbd6b 100644
--- a/include/openmc/scattdata.h
+++ b/include/openmc/scattdata.h
@@ -4,7 +4,7 @@
 #ifndef OPENMC_SCATTDATA_H
 #define OPENMC_SCATTDATA_H
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/vector.h"
diff --git a/include/openmc/secondary_correlated.h b/include/openmc/secondary_correlated.h
index 6905c38e369..6ffbd7fa1fe 100644
--- a/include/openmc/secondary_correlated.h
+++ b/include/openmc/secondary_correlated.h
@@ -5,7 +5,7 @@
 #define OPENMC_SECONDARY_CORRELATED_H
 
 #include "hdf5.h"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/angle_energy.h"
 #include "openmc/distribution.h"
diff --git a/include/openmc/secondary_kalbach.h b/include/openmc/secondary_kalbach.h
index 83806d35248..b55f100e77f 100644
--- a/include/openmc/secondary_kalbach.h
+++ b/include/openmc/secondary_kalbach.h
@@ -5,7 +5,7 @@
 #define OPENMC_SECONDARY_KALBACH_H
 
 #include "hdf5.h"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/angle_energy.h"
 #include "openmc/constants.h"
diff --git a/include/openmc/secondary_thermal.h b/include/openmc/secondary_thermal.h
index 5b18902afbb..9cb7bcc8c3c 100644
--- a/include/openmc/secondary_thermal.h
+++ b/include/openmc/secondary_thermal.h
@@ -9,7 +9,7 @@
 #include "openmc/secondary_correlated.h"
 #include "openmc/vector.h"
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <hdf5.h>
 
 namespace openmc {
diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h
index 374daff92a0..e992aaf6b55 100644
--- a/include/openmc/tallies/tally.h
+++ b/include/openmc/tallies/tally.h
@@ -9,8 +9,8 @@
 #include "openmc/vector.h"
 
 #include "pugixml.hpp"
-#include "xtensor/xfixed.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xfixed.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include <string>
 #include <unordered_map>
diff --git a/include/openmc/thermal.h b/include/openmc/thermal.h
index de0767d0af0..84d43e23a90 100644
--- a/include/openmc/thermal.h
+++ b/include/openmc/thermal.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/angle_energy.h"
 #include "openmc/endf.h"
diff --git a/include/openmc/urr.h b/include/openmc/urr.h
index 1e603715847..c0fcb39092d 100644
--- a/include/openmc/urr.h
+++ b/include/openmc/urr.h
@@ -3,7 +3,7 @@
 #ifndef OPENMC_URR_H
 #define OPENMC_URR_H
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/hdf5_interface.h"
diff --git a/include/openmc/volume_calc.h b/include/openmc/volume_calc.h
index fa8d3d65ece..61e5c9b44f4 100644
--- a/include/openmc/volume_calc.h
+++ b/include/openmc/volume_calc.h
@@ -13,7 +13,7 @@
 #include "openmc/vector.h"
 
 #include "pugixml.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #ifdef _OPENMP
 #include <omp.h>
 #endif
diff --git a/include/openmc/wmp.h b/include/openmc/wmp.h
index 6a4abd86714..29831bf2ace 100644
--- a/include/openmc/wmp.h
+++ b/include/openmc/wmp.h
@@ -2,7 +2,7 @@
 #define OPENMC_WMP_H
 
 #include "hdf5.h"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include <complex>
 #include <string>
diff --git a/include/openmc/xml_interface.h b/include/openmc/xml_interface.h
index f49613ecde1..6a60088a93e 100644
--- a/include/openmc/xml_interface.h
+++ b/include/openmc/xml_interface.h
@@ -6,8 +6,8 @@
 #include <string>
 
 #include "pugixml.hpp"
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xarray.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/containers/xarray.hpp"
 
 #include "openmc/position.h"
 #include "openmc/vector.h"
diff --git a/include/openmc/xsdata.h b/include/openmc/xsdata.h
index feafde68dd3..dc676c088af 100644
--- a/include/openmc/xsdata.h
+++ b/include/openmc/xsdata.h
@@ -4,7 +4,7 @@
 #ifndef OPENMC_XSDATA_H
 #define OPENMC_XSDATA_H
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/hdf5_interface.h"
 #include "openmc/memory.h"
diff --git a/src/bremsstrahlung.cpp b/src/bremsstrahlung.cpp
index d77066fb0eb..0a93210f93d 100644
--- a/src/bremsstrahlung.cpp
+++ b/src/bremsstrahlung.cpp
@@ -6,7 +6,7 @@
 #include "openmc/search.h"
 #include "openmc/settings.h"
 
-#include "xtensor/xmath.hpp"
+#include "xtensor/core/xmath.hpp"
 
 namespace openmc {
 
diff --git a/src/cmfd_solver.cpp b/src/cmfd_solver.cpp
index 943042f67e7..08a07825114 100644
--- a/src/cmfd_solver.cpp
+++ b/src/cmfd_solver.cpp
@@ -5,7 +5,7 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "openmc/bank.h"
 #include "openmc/capi.h"
diff --git a/src/distribution_angle.cpp b/src/distribution_angle.cpp
index 50f1aca112b..3b57a8c5dbc 100644
--- a/src/distribution_angle.cpp
+++ b/src/distribution_angle.cpp
@@ -2,8 +2,8 @@
 
 #include <cmath> // for abs, copysign
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/endf.h"
 #include "openmc/hdf5_interface.h"
diff --git a/src/distribution_energy.cpp b/src/distribution_energy.cpp
index a4a5ce9e1b6..fb6512073b3 100644
--- a/src/distribution_energy.cpp
+++ b/src/distribution_energy.cpp
@@ -4,7 +4,7 @@
 #include <cstddef>   // for size_t
 #include <iterator>  // for back_inserter
 
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/endf.h"
 #include "openmc/hdf5_interface.h"
diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp
index dc4fbb420b8..e43017e53ba 100644
--- a/src/eigenvalue.cpp
+++ b/src/eigenvalue.cpp
@@ -1,9 +1,9 @@
 #include "openmc/eigenvalue.h"
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xtensor.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/array.h"
 #include "openmc/bank.h"
diff --git a/src/endf.cpp b/src/endf.cpp
index c0c1d2e7e8b..a74c29df039 100644
--- a/src/endf.cpp
+++ b/src/endf.cpp
@@ -5,8 +5,8 @@
 #include <iterator>  // for back_inserter
 #include <stdexcept> // for runtime_error
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/array.h"
 #include "openmc/constants.h"
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 5ca9d574627..2accc62b050 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -30,7 +30,7 @@
 #include "openmc/volume_calc.h"
 #include "openmc/weight_windows.h"
 
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xview.hpp"
 
 namespace openmc {
 
diff --git a/src/hdf5_interface.cpp b/src/hdf5_interface.cpp
index c56d485e281..b2a830c4ba9 100644
--- a/src/hdf5_interface.cpp
+++ b/src/hdf5_interface.cpp
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <string>
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <fmt/core.h>
 
 #include "hdf5.h"
diff --git a/src/material.cpp b/src/material.cpp
index 072e6decad1..bed9fc2b4de 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -8,9 +8,9 @@
 #include <string>
 #include <unordered_set>
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xoperation.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/core/xoperation.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/capi.h"
 #include "openmc/container_util.h"
diff --git a/src/mesh.cpp b/src/mesh.cpp
index acd90033f32..8dea170861c 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -16,13 +16,13 @@
 #include "mpi.h"
 #endif
 
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xeval.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xsort.hpp"
-#include "xtensor/xtensor.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/core/xeval.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/misc/xsort.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h> // for fmt
 
 #include "openmc/capi.h"
diff --git a/src/mgxs.cpp b/src/mgxs.cpp
index a2c479f2156..d98b1068384 100644
--- a/src/mgxs.cpp
+++ b/src/mgxs.cpp
@@ -5,10 +5,10 @@
 #include <cstdlib>
 #include <sstream>
 
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xsort.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/misc/xsort.hpp"
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 
 #include "openmc/error.h"
diff --git a/src/nuclide.cpp b/src/nuclide.cpp
index 69e603a7c66..9e3ce0fad93 100644
--- a/src/nuclide.cpp
+++ b/src/nuclide.cpp
@@ -17,8 +17,8 @@
 
 #include <fmt/core.h>
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include <algorithm> // for sort, min_element
 #include <cassert>
diff --git a/src/output.cpp b/src/output.cpp
index ae2daaffc14..f9b59ebfd2a 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -17,7 +17,7 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/capi.h"
 #include "openmc/cell.h"
diff --git a/src/photon.cpp b/src/photon.cpp
index 951acb9fbd8..13bb0c0c4d8 100644
--- a/src/photon.cpp
+++ b/src/photon.cpp
@@ -13,11 +13,11 @@
 #include "openmc/search.h"
 #include "openmc/settings.h"
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xoperation.hpp"
-#include "xtensor/xslice.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/core/xoperation.hpp"
+#include "xtensor/views/xslice.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include <cmath>
 #include <fmt/core.h>
diff --git a/src/physics.cpp b/src/physics.cpp
index 1f72e4fac07..13543df99c4 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -32,7 +32,7 @@
 
 #include <algorithm> // for max, min, max_element
 #include <cmath>     // for sqrt, exp, log, abs, copysign
-#include <xtensor/xview.hpp>
+#include <xtensor/views/xview.hpp>
 
 namespace openmc {
 
diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp
index 58a21a67895..776e98f12f1 100644
--- a/src/physics_mg.cpp
+++ b/src/physics_mg.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "xtensor/xarray.hpp"
+#include "xtensor/containers/xarray.hpp"
 #include <fmt/core.h>
 
 #include "openmc/bank.h"
diff --git a/src/plot.cpp b/src/plot.cpp
index daeb0bde7c6..322a43c8c58 100644
--- a/src/plot.cpp
+++ b/src/plot.cpp
@@ -7,8 +7,8 @@
 #include <fstream>
 #include <sstream>
 
-#include "xtensor/xmanipulation.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/misc/xmanipulation.hpp"
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 #include <fmt/ostream.h>
 #ifdef USE_LIBPNG
diff --git a/src/scattdata.cpp b/src/scattdata.cpp
index 21b18cbd923..d57ba415063 100644
--- a/src/scattdata.cpp
+++ b/src/scattdata.cpp
@@ -4,8 +4,8 @@
 #include <cmath>
 #include <numeric>
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/error.h"
diff --git a/src/secondary_correlated.cpp b/src/secondary_correlated.cpp
index e820419b484..420c39594c5 100644
--- a/src/secondary_correlated.cpp
+++ b/src/secondary_correlated.cpp
@@ -5,8 +5,8 @@
 #include <cstddef>  // for size_t
 #include <iterator> // for back_inserter
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/endf.h"
 #include "openmc/hdf5_interface.h"
diff --git a/src/secondary_kalbach.cpp b/src/secondary_kalbach.cpp
index 6ac91e665b9..268d5669ea6 100644
--- a/src/secondary_kalbach.cpp
+++ b/src/secondary_kalbach.cpp
@@ -5,8 +5,8 @@
 #include <cstddef>   // for size_t
 #include <iterator>  // for back_inserter
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/hdf5_interface.h"
 #include "openmc/math_functions.h"
diff --git a/src/secondary_thermal.cpp b/src/secondary_thermal.cpp
index 030d398aabe..87572cb776e 100644
--- a/src/secondary_thermal.cpp
+++ b/src/secondary_thermal.cpp
@@ -5,7 +5,7 @@
 #include "openmc/random_lcg.h"
 #include "openmc/search.h"
 
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include <cassert>
 #include <cmath> // for log, exp
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 18e40a8bc73..d34b5b7af2b 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -30,7 +30,7 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xview.hpp"
 
 #ifdef OPENMC_MPI
 #include <mpi.h>
diff --git a/src/source.cpp b/src/source.cpp
index 8bd9c789352..ef48287b885 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -10,7 +10,7 @@
 #include <dlfcn.h> // for dlopen, dlsym, dlclose, dlerror
 #endif
 
-#include "xtensor/xadapt.hpp"
+#include "xtensor/containers/xadapt.hpp"
 #include <fmt/core.h>
 
 #include "openmc/bank.h"
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 455299529b3..00e6f3b0066 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -4,8 +4,8 @@
 #include <cstdint> // for int64_t
 #include <string>
 
-#include "xtensor/xbuilder.hpp" // for empty_like
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp" // for empty_like
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 
 #include "openmc/bank.h"
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 8cdf3a9050c..d7d2285cd9a 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -35,9 +35,9 @@
 #include "openmc/tallies/filter_time.h"
 #include "openmc/xml_interface.h"
 
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xbuilder.hpp" // for empty_like
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/generators/xbuilder.hpp" // for empty_like
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 
 #include <algorithm> // for max, set_union
diff --git a/src/thermal.cpp b/src/thermal.cpp
index cbe0983ed65..13b267a8f3a 100644
--- a/src/thermal.cpp
+++ b/src/thermal.cpp
@@ -3,12 +3,12 @@
 #include <algorithm> // for sort, move, min, max, find
 #include <cmath>     // for round, sqrt, abs
 
-#include "xtensor/xarray.hpp"
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xsort.hpp"
-#include "xtensor/xtensor.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/misc/xsort.hpp"
+#include "xtensor/containers/xtensor.hpp"
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 
 #include "openmc/constants.h"
diff --git a/src/track_output.cpp b/src/track_output.cpp
index e86f774f046..47cbaa7baaa 100644
--- a/src/track_output.cpp
+++ b/src/track_output.cpp
@@ -8,7 +8,7 @@
 #include "openmc/simulation.h"
 #include "openmc/vector.h"
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 #include <fmt/core.h>
 #include <hdf5.h>
 
diff --git a/src/volume_calc.cpp b/src/volume_calc.cpp
index 1deffb80488..b45b429a238 100644
--- a/src/volume_calc.cpp
+++ b/src/volume_calc.cpp
@@ -17,8 +17,8 @@
 #include "openmc/timer.h"
 #include "openmc/xml_interface.h"
 
-#include "xtensor/xadapt.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/containers/xadapt.hpp"
+#include "xtensor/views/xview.hpp"
 #include <fmt/core.h>
 
 #include <algorithm> // for copy
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 5ca4addbbf7..be59ba4bfbe 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -6,12 +6,12 @@
 #include <set>
 #include <string>
 
-#include "xtensor/xdynamic_view.hpp"
-#include "xtensor/xindex_view.hpp"
-#include "xtensor/xio.hpp"
-#include "xtensor/xmasked_view.hpp"
-#include "xtensor/xnoalias.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/views/xdynamic_view.hpp"
+#include "xtensor/views/xindex_view.hpp"
+#include "xtensor/io/xio.hpp"
+#include "xtensor/views/xmasked_view.hpp"
+#include "xtensor/core/xnoalias.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/error.h"
 #include "openmc/file_utils.h"
diff --git a/src/xsdata.cpp b/src/xsdata.cpp
index 1929f51e6fa..0e8813fb630 100644
--- a/src/xsdata.cpp
+++ b/src/xsdata.cpp
@@ -5,10 +5,10 @@
 #include <cstdlib>
 #include <numeric>
 
-#include "xtensor/xbuilder.hpp"
-#include "xtensor/xindex_view.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xview.hpp"
+#include "xtensor/generators/xbuilder.hpp"
+#include "xtensor/views/xindex_view.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/views/xview.hpp"
 
 #include "openmc/constants.h"
 #include "openmc/error.h"
diff --git a/vendor/xtensor b/vendor/xtensor
index 3634f2ded19..f31d415a507 160000
--- a/vendor/xtensor
+++ b/vendor/xtensor
@@ -1 +1 @@
-Subproject commit 3634f2ded19e0cf38208c8b86cea9e1d7c8e397d
+Subproject commit f31d415a507b84d0097436a38293df3f56906ad1