diff --git a/cpp/examples/basic_no_cuda.cpp b/cpp/examples/basic_no_cuda.cpp
index 0d79a52883..a146f15ae6 100644
--- a/cpp/examples/basic_no_cuda.cpp
+++ b/cpp/examples/basic_no_cuda.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <chrono>
 #include <iostream>
+#include <numeric>
 
 #include <kvikio/batch.hpp>
 #include <kvikio/buffer.hpp>
diff --git a/cpp/include/kvikio/buffer.hpp b/cpp/include/kvikio/buffer.hpp
index c0aa7f9fbc..b023095bef 100644
--- a/cpp/include/kvikio/buffer.hpp
+++ b/cpp/include/kvikio/buffer.hpp
@@ -16,8 +16,6 @@
 #pragma once
 
 #include <algorithm>
-#include <iostream>
-#include <map>
 #include <vector>
 
 #include <kvikio/defaults.hpp>
diff --git a/cpp/include/kvikio/error.hpp b/cpp/include/kvikio/error.hpp
index e84ebd770c..80e3afb2c7 100644
--- a/cpp/include/kvikio/error.hpp
+++ b/cpp/include/kvikio/error.hpp
@@ -16,8 +16,7 @@
 #pragma once
 
 #include <cstring>
-#include <exception>
-#include <system_error>
+#include <stdexcept>
 
 #include <kvikio/shim/cuda.hpp>
 #include <kvikio/shim/cufile_h_wrapper.hpp>
diff --git a/cpp/include/kvikio/parallel_operation.hpp b/cpp/include/kvikio/parallel_operation.hpp
index f345333c4f..7c18d653eb 100644
--- a/cpp/include/kvikio/parallel_operation.hpp
+++ b/cpp/include/kvikio/parallel_operation.hpp
@@ -17,8 +17,6 @@
 
 #include <cassert>
 #include <future>
-#include <numeric>
-#include <system_error>
 #include <utility>
 #include <vector>
 
diff --git a/cpp/src/remote_handle.cpp b/cpp/src/remote_handle.cpp
index adcf56befc..3253f8b4d4 100644
--- a/cpp/src/remote_handle.cpp
+++ b/cpp/src/remote_handle.cpp
@@ -17,11 +17,6 @@
 #include <cassert>
 #include <cstddef>
 #include <cstring>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <stdexcept>
-#include <string>
 
 #include <kvikio/defaults.hpp>
 #include <kvikio/error.hpp>