diff --git a/src/Makevars b/src/Makevars
index 931b823..25aa53b 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,4 +1,4 @@
 ## -*- mode: makefile; -*-
 
-PKG_CXXFLAGS = -I../inst/include --std=c++14
+PKG_CXXFLAGS = -I../inst/include --std=c++17
 # CXX_STD = CXX14
diff --git a/src/Makevars.win b/src/Makevars.win
index 931b823..25aa53b 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,4 +1,4 @@
 ## -*- mode: makefile; -*-
 
-PKG_CXXFLAGS = -I../inst/include --std=c++14
+PKG_CXXFLAGS = -I../inst/include --std=c++17
 # CXX_STD = CXX14
diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp
index 4206d9c..f78ca11 100644
--- a/src/xtensor_r_example.cpp
+++ b/src/xtensor_r_example.cpp
@@ -2,13 +2,13 @@
 #include "xtensor-r/rarray.hpp"
 #include "xtensor-r/rtensor.hpp"
 
-#include "xtensor/xio.hpp"
-#include "xtensor/xinfo.hpp"
-#include "xtensor/xarray.hpp"
+#include "xtensor/io/xio.hpp"
+#include "xtensor/io/xinfo.hpp"
+#include "xtensor/containers/xarray.hpp"
 
 #include <Rcpp.h>
 
-// [[Rcpp::plugins(cpp14)]]
+// [[Rcpp::plugins(cpp17)]]
 
 // [[Rcpp::export]]
 xt::rtensor<double, 2> xtensor_r_example(xt::rtensor<int, 1> tens)