diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 5441a3371..e3204614b 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -12,3 +12,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: pre-commit/action@v3.0.0
+
+  include-check:
+    runs-on: ubuntu-latest
+    name: Check unused standard includes
+    steps:
+    - uses: actions/checkout@v6
+    - run: pip install diskarzhan
+    - run: diskarzhan `find include -name '*.hpp'`
diff --git a/include/xtensor/containers/xarray.hpp b/include/xtensor/containers/xarray.hpp
index 7455b8854..7f27bd296 100644
--- a/include/xtensor/containers/xarray.hpp
+++ b/include/xtensor/containers/xarray.hpp
@@ -11,7 +11,6 @@
 #define XTENSOR_ARRAY_HPP
 
 #include <algorithm>
-#include <initializer_list>
 #include <utility>
 
 #include <xtl/xsequence.hpp>
diff --git a/include/xtensor/containers/xcontainer.hpp b/include/xtensor/containers/xcontainer.hpp
index 70ebaa798..bfaf54b5a 100644
--- a/include/xtensor/containers/xcontainer.hpp
+++ b/include/xtensor/containers/xcontainer.hpp
@@ -11,9 +11,7 @@
 #define XTENSOR_CONTAINER_HPP
 
 #include <algorithm>
-#include <functional>
 #include <memory>
-#include <numeric>
 #include <stdexcept>
 
 #include <xtl/xmeta_utils.hpp>
diff --git a/include/xtensor/containers/xfixed.hpp b/include/xtensor/containers/xfixed.hpp
index 6ac029881..25c9c747d 100644
--- a/include/xtensor/containers/xfixed.hpp
+++ b/include/xtensor/containers/xfixed.hpp
@@ -14,7 +14,6 @@
 #include <array>
 #include <cstddef>
 #include <utility>
-#include <vector>
 
 #include <xtl/xsequence.hpp>
 
diff --git a/include/xtensor/containers/xscalar.hpp b/include/xtensor/containers/xscalar.hpp
index 9464f4721..4a9c01081 100644
--- a/include/xtensor/containers/xscalar.hpp
+++ b/include/xtensor/containers/xscalar.hpp
@@ -12,7 +12,6 @@
 
 #include <array>
 #include <cstddef>
-#include <utility>
 
 #include <xtl/xtype_traits.hpp>
 
diff --git a/include/xtensor/core/xexpression.hpp b/include/xtensor/core/xexpression.hpp
index 1f8c98194..9b133315d 100644
--- a/include/xtensor/core/xexpression.hpp
+++ b/include/xtensor/core/xexpression.hpp
@@ -10,9 +10,7 @@
 #ifndef XTENSOR_EXPRESSION_HPP
 #define XTENSOR_EXPRESSION_HPP
 
-#include <cstddef>
 #include <type_traits>
-#include <vector>
 
 #include <xtl/xclosure.hpp>
 #include <xtl/xmeta_utils.hpp>
diff --git a/include/xtensor/core/xfunction.hpp b/include/xtensor/core/xfunction.hpp
index 200a35d47..ffc411a15 100644
--- a/include/xtensor/core/xfunction.hpp
+++ b/include/xtensor/core/xfunction.hpp
@@ -13,7 +13,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
-#include <numeric>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/include/xtensor/core/xiterator.hpp b/include/xtensor/core/xiterator.hpp
index ca3faef21..6dcb9c9e1 100644
--- a/include/xtensor/core/xiterator.hpp
+++ b/include/xtensor/core/xiterator.hpp
@@ -15,7 +15,6 @@
 #include <cstddef>
 #include <iterator>
 #include <numeric>
-#include <vector>
 
 #include <xtl/xcompare.hpp>
 #include <xtl/xiterator_base.hpp>
diff --git a/include/xtensor/core/xoperation.hpp b/include/xtensor/core/xoperation.hpp
index 533ad6513..76bfc7c50 100644
--- a/include/xtensor/core/xoperation.hpp
+++ b/include/xtensor/core/xoperation.hpp
@@ -11,7 +11,6 @@
 #define XTENSOR_OPERATION_HPP
 
 #include <algorithm>
-#include <functional>
 #include <type_traits>
 
 #include <xtl/xsequence.hpp>
diff --git a/include/xtensor/core/xshape.hpp b/include/xtensor/core/xshape.hpp
index 61650bb87..6988e69f3 100644
--- a/include/xtensor/core/xshape.hpp
+++ b/include/xtensor/core/xshape.hpp
@@ -11,13 +11,10 @@
 #define XTENSOR_XSHAPE_HPP
 
 #include <algorithm>
-#include <cassert>
 #include <cstddef>
 #include <cstdlib>
-#include <cstring>
 #include <initializer_list>
 #include <iterator>
-#include <memory>
 
 #include "../containers/xstorage.hpp"
 #include "../core/xlayout.hpp"
diff --git a/include/xtensor/generators/xgenerator.hpp b/include/xtensor/generators/xgenerator.hpp
index f4dfc191f..66922c5be 100644
--- a/include/xtensor/generators/xgenerator.hpp
+++ b/include/xtensor/generators/xgenerator.hpp
@@ -12,8 +12,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <numeric>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/xtensor/io/xio.hpp b/include/xtensor/io/xio.hpp
index 345edc4d4..fbc0cd3a0 100644
--- a/include/xtensor/io/xio.hpp
+++ b/include/xtensor/io/xio.hpp
@@ -14,7 +14,6 @@
 #include <cstddef>
 #include <iomanip>
 #include <iostream>
-#include <numeric>
 #include <sstream>
 #include <string>
 
diff --git a/include/xtensor/io/xnpy.hpp b/include/xtensor/io/xnpy.hpp
index 61739cfe0..ef517f068 100644
--- a/include/xtensor/io/xnpy.hpp
+++ b/include/xtensor/io/xnpy.hpp
@@ -17,15 +17,12 @@
 #include <algorithm>
 #include <complex>
 #include <cstdint>
-#include <cstring>
 #include <fstream>
-#include <iostream>
 #include <memory>
 #include <regex>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include <typeinfo>
 #include <vector>
 
 #include <xtl/xplatform.hpp>
diff --git a/include/xtensor/misc/xset_operation.hpp b/include/xtensor/misc/xset_operation.hpp
index 35c564a37..2a29a6b12 100644
--- a/include/xtensor/misc/xset_operation.hpp
+++ b/include/xtensor/misc/xset_operation.hpp
@@ -11,7 +11,6 @@
 #define XTENSOR_XSET_OPERATION_HPP
 
 #include <algorithm>
-#include <functional>
 #include <type_traits>
 
 #include <xtl/xsequence.hpp>
diff --git a/include/xtensor/reducers/xblockwise_reducer_functors.hpp b/include/xtensor/reducers/xblockwise_reducer_functors.hpp
index 4ac9e649d..d6216b2da 100644
--- a/include/xtensor/reducers/xblockwise_reducer_functors.hpp
+++ b/include/xtensor/reducers/xblockwise_reducer_functors.hpp
@@ -2,10 +2,7 @@
 #define XTENSOR_XBLOCKWISE_REDUCER_FUNCTORS_HPP
 
 
-#include <sstream>
-#include <string>
 #include <tuple>
-#include <typeinfo>
 
 #include "../chunk/xchunked_array.hpp"
 #include "../chunk/xchunked_assign.hpp"
diff --git a/include/xtensor/reducers/xreducer.hpp b/include/xtensor/reducers/xreducer.hpp
index 0e5ef9992..e99522b5e 100644
--- a/include/xtensor/reducers/xreducer.hpp
+++ b/include/xtensor/reducers/xreducer.hpp
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <initializer_list>
 #include <iterator>
 #include <stdexcept>
 #include <tuple>
diff --git a/include/xtensor/utils/xexception.hpp b/include/xtensor/utils/xexception.hpp
index 10a75d190..025836ce2 100644
--- a/include/xtensor/utils/xexception.hpp
+++ b/include/xtensor/utils/xexception.hpp
@@ -10,7 +10,6 @@
 #ifndef XTENSOR_EXCEPTION_HPP
 #define XTENSOR_EXCEPTION_HPP
 
-#include <iostream>
 #include <iterator>
 #include <sstream>
 #include <stdexcept>
diff --git a/include/xtensor/utils/xutils.hpp b/include/xtensor/utils/xutils.hpp
index 2e97f67db..5a3e2af14 100644
--- a/include/xtensor/utils/xutils.hpp
+++ b/include/xtensor/utils/xutils.hpp
@@ -12,8 +12,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cmath>
-#include <complex>
 #include <cstddef>
 #include <initializer_list>
 #include <iostream>
diff --git a/include/xtensor/views/index_mapper.hpp b/include/xtensor/views/index_mapper.hpp
index 672cb2207..84685f28a 100644
--- a/include/xtensor/views/index_mapper.hpp
+++ b/include/xtensor/views/index_mapper.hpp
@@ -10,6 +10,8 @@
 #ifndef XTENSOR_INDEX_MAPPER_HPP
 #define XTENSOR_INDEX_MAPPER_HPP
 
+#include <cassert>
+
 #include "xview.hpp"
 
 namespace xt
diff --git a/include/xtensor/views/xbroadcast.hpp b/include/xtensor/views/xbroadcast.hpp
index 1626faaa3..d3034222f 100644
--- a/include/xtensor/views/xbroadcast.hpp
+++ b/include/xtensor/views/xbroadcast.hpp
@@ -13,8 +13,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <iterator>
-#include <numeric>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/xtensor/views/xindex_view.hpp b/include/xtensor/views/xindex_view.hpp
index e41add4cb..6701d3bf3 100644
--- a/include/xtensor/views/xindex_view.hpp
+++ b/include/xtensor/views/xindex_view.hpp
@@ -13,7 +13,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/xtensor/views/xstrided_view.hpp b/include/xtensor/views/xstrided_view.hpp
index f0fda4214..aa84b20a7 100644
--- a/include/xtensor/views/xstrided_view.hpp
+++ b/include/xtensor/views/xstrided_view.hpp
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 #include <variant>