diff --git a/cpp/src/neighbors/scann/detail/scann_avq.cuh b/cpp/src/neighbors/scann/detail/scann_avq.cuh
index d950d4686e..d23f7df219 100644
--- a/cpp/src/neighbors/scann/detail/scann_avq.cuh
+++ b/cpp/src/neighbors/scann/detail/scann_avq.cuh
@@ -12,23 +12,17 @@
 #include <raft/core/host_mdspan.hpp>
 #include <raft/core/operators.hpp>
 #include <raft/core/resource/cuda_stream.hpp>
-#include <raft/linalg/add.cuh>
-#include <raft/linalg/coalesced_reduction.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <raft/linalg/detail/cusolver_wrappers.hpp>
 #include <raft/linalg/dot.cuh>
-#include <raft/linalg/gemm.cuh>
-#include <raft/linalg/gemv.cuh>
 #include <raft/linalg/linalg_types.hpp>
 #include <raft/linalg/map.cuh>
-#include <raft/linalg/matrix_vector.cuh>
 #include <raft/linalg/matrix_vector_op.cuh>
 #include <raft/linalg/multiply.cuh>
 #include <raft/linalg/norm.cuh>
 #include <raft/linalg/power.cuh>
 #include <raft/linalg/reduce.cuh>
 #include <raft/linalg/transpose.cuh>
-#include <raft/matrix/argmin.cuh>
 #include <raft/matrix/copy.cuh>
 #include <raft/matrix/diagonal.cuh>
 #include <raft/matrix/init.cuh>
diff --git a/cpp/src/neighbors/scann/detail/scann_build.cuh b/cpp/src/neighbors/scann/detail/scann_build.cuh
index da4d20d998..ebb950f923 100644
--- a/cpp/src/neighbors/scann/detail/scann_build.cuh
+++ b/cpp/src/neighbors/scann/detail/scann_build.cuh
@@ -10,60 +10,23 @@
 #include <cuvs/cluster/kmeans.hpp>
 #include <cuvs/neighbors/scann.hpp>
 
-#include <cub/cub.cuh>
 #include <cuda_bf16.h>
-#include <nvtx3/nvtx3.hpp>
-#include <raft/cluster/kmeans.cuh>
-#include <raft/cluster/kmeans_types.hpp>
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_mdspan.hpp>
 #include <raft/core/error.hpp>
 #include <raft/core/host_device_accessor.hpp>
-#include <raft/core/host_mdarray.hpp>
-#include <raft/core/host_mdspan.hpp>
-#include <raft/core/operators.hpp>
 #include <raft/core/resource/cuda_stream.hpp>
-#include <raft/linalg/add.cuh>
-#include <raft/linalg/coalesced_reduction.cuh>
-#include <raft/linalg/dot.cuh>
-#include <raft/linalg/gemm.hpp>
-#include <raft/linalg/gemv.cuh>
-#include <raft/linalg/linalg_types.hpp>
 #include <raft/linalg/map.cuh>
-#include <raft/linalg/matrix_vector.cuh>
-#include <raft/linalg/matrix_vector_op.cuh>
-#include <raft/linalg/multiply.cuh>
-#include <raft/linalg/normalize.cuh>
-#include <raft/linalg/power.cuh>
-#include <raft/linalg/reduce.cuh>
-#include <raft/linalg/transpose.cuh>
-#include <raft/linalg/unary_op.cuh>
-#include <raft/matrix/argmin.cuh>
 #include <raft/matrix/copy.cuh>
-#include <raft/matrix/diagonal.cuh>
-#include <raft/matrix/init.cuh>
 #include <raft/matrix/sample_rows.cuh>
 #include <raft/matrix/slice.cuh>
-#include <raft/random/make_blobs.cuh>
 #include <raft/random/rng.cuh>
-#include <raft/sparse/neighbors/cross_component_nn.cuh>
-#include <raft/util/memory_type_dispatcher.cuh>
-
-#include <thrust/device_vector.h>
-#include <thrust/sequence.h>
-#include <thrust/unique.h>
-
-#include <cuvs/distance/distance.hpp>
 
 #include "scann_avq.cuh"
 #include "scann_common.cuh"
 #include "scann_quantize.cuh"
 #include "scann_soar.cuh"
 
-#include <chrono>
-#include <cstdio>
-#include <vector>
-
 namespace cuvs::neighbors::experimental::scann::detail {
 using namespace cuvs::spatial::knn::detail;  // NOLINT
 
@@ -71,8 +34,6 @@ using namespace cuvs::spatial::knn::detail;  // NOLINT
  * @{
  */
 
-static const std::string RAFT_NAME = "raft";
-
 template <typename T,
           typename IdxT     = int64_t,
           typename Accessor = raft::host_device_accessor<std::experimental::default_accessor<T>,
diff --git a/cpp/src/neighbors/scann/detail/scann_soar.cuh b/cpp/src/neighbors/scann/detail/scann_soar.cuh
index 685c2aee6e..7eeef9ac51 100644
--- a/cpp/src/neighbors/scann/detail/scann_soar.cuh
+++ b/cpp/src/neighbors/scann/detail/scann_soar.cuh
@@ -6,29 +6,16 @@
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_mdspan.hpp>
 #include <raft/core/error.hpp>
-#include <raft/core/host_device_accessor.hpp>
 #include <raft/core/host_mdarray.hpp>
-#include <raft/core/host_mdspan.hpp>
 #include <raft/core/operators.hpp>
 #include <raft/core/resource/cuda_stream.hpp>
-#include <raft/linalg/add.cuh>
-#include <raft/linalg/coalesced_reduction.cuh>
-#include <raft/linalg/dot.cuh>
 #include <raft/linalg/gemm.hpp>
-#include <raft/linalg/gemv.cuh>
-#include <raft/linalg/linalg_types.hpp>
 #include <raft/linalg/map.cuh>
-#include <raft/linalg/matrix_vector.cuh>
 #include <raft/linalg/matrix_vector_op.cuh>
-#include <raft/linalg/multiply.cuh>
 #include <raft/linalg/normalize.cuh>
-#include <raft/linalg/power.cuh>
 #include <raft/linalg/reduce.cuh>
 #include <raft/linalg/transpose.cuh>
 #include <raft/matrix/argmin.cuh>
-#include <raft/matrix/copy.cuh>
-#include <raft/matrix/diagonal.cuh>
-#include <raft/matrix/init.cuh>
 
 /**
  * @brief Compute SOAR labels for each dataset vector