diff --git a/cpp/src/column/column_view.cpp b/cpp/src/column/column_view.cpp
index bc2865e9cd0..019127643e3 100644
--- a/cpp/src/column/column_view.cpp
+++ b/cpp/src/column/column_view.cpp
@@ -20,9 +20,10 @@
 #include <cudf/utilities/error.hpp>
 #include <cudf/utilities/traits.hpp>
 
-#include <cudf_test/column_wrapper.hpp>
+#include <thrust/iterator/transform_iterator.h>
 
 #include <exception>
+#include <numeric>
 #include <vector>
 
 namespace cudf {
diff --git a/cpp/src/copying/slice.cpp b/cpp/src/copying/slice.cpp
index b607bb6cba0..7e3929e235c 100644
--- a/cpp/src/copying/slice.cpp
+++ b/cpp/src/copying/slice.cpp
@@ -17,14 +17,13 @@
 #include <cudf/column/column_view.hpp>
 #include <cudf/copying.hpp>
 #include <cudf/detail/copy.hpp>
+#include <cudf/detail/iterator.cuh>
 #include <cudf/detail/null_mask.hpp>
 #include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/utilities/error.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
 
-#include <cudf_test/column_wrapper.hpp> // TODO replace with cudf header
-
 #include <algorithm>
 
 namespace cudf {
@@ -54,7 +53,7 @@ std::vector<column_view> slice(column_view const& input,
                        input.offset() + begin,
                        children};
   };
-  auto begin = cudf::test::make_counting_transform_iterator(0, op);
+  auto begin = cudf::detail::make_counting_transform_iterator(0, op);
   return {begin, begin + indices.size() / 2};
 }
 
diff --git a/cpp/src/interop/to_arrow.cpp b/cpp/src/interop/to_arrow.cpp
index 5656eefd615..9c9179c334c 100644
--- a/cpp/src/interop/to_arrow.cpp
+++ b/cpp/src/interop/to_arrow.cpp
@@ -29,7 +29,6 @@
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
-#include "cudf_test/column_wrapper.hpp"
 
 namespace cudf {
 namespace detail {