diff --git a/cpp/src/groupby/hash/compute_aggregations.cu b/cpp/src/groupby/hash/compute_aggregations.cu
index 54f37c7f397..8b559ffc1be 100644
--- a/cpp/src/groupby/hash/compute_aggregations.cu
+++ b/cpp/src/groupby/hash/compute_aggregations.cu
@@ -21,7 +21,6 @@
 #include "single_pass_functors.cuh"
 
 #include <cudf/aggregation.hpp>
-#include <cudf/detail/cuco_helpers.hpp>
 #include <cudf/detail/utilities/cuda.cuh>
 #include <cudf/detail/utilities/cuda.hpp>
 #include <cudf/detail/utilities/integer_utils.hpp>
diff --git a/cpp/src/groupby/hash/compute_groupby.cu b/cpp/src/groupby/hash/compute_groupby.cu
index 9643567a825..4aa03d17999 100644
--- a/cpp/src/groupby/hash/compute_groupby.cu
+++ b/cpp/src/groupby/hash/compute_groupby.cu
@@ -13,17 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#pragma once
 
-#include "compute_single_pass_aggs.cuh"
-// #include "compute_single_pass_aggs.hpp"
+#include "compute_single_pass_aggs.hpp"
 #include "helpers.cuh"
-#include "sparse_to_dense_results.cuh"
+#include "sparse_to_dense_results.hpp"
 #include "var_hash_functor.cuh"
 
 #include <cudf/column/column_factories.hpp>
 #include <cudf/detail/aggregation/result_cache.hpp>
 #include <cudf/detail/binaryop.hpp>
+#include <cudf/detail/cuco_helpers.hpp>
 #include <cudf/detail/gather.hpp>
 #include <cudf/detail/unary.hpp>
 #include <cudf/groupby.hpp>
diff --git a/cpp/src/groupby/hash/sparse_to_dense_results.cu b/cpp/src/groupby/hash/sparse_to_dense_results.cu
index a416e2124ce..7f7290141f9 100644
--- a/cpp/src/groupby/hash/sparse_to_dense_results.cu
+++ b/cpp/src/groupby/hash/sparse_to_dense_results.cu
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#pragma once
 
 #include "hash_compound_agg_finalizer.cuh"
+#include "helpers.cuh"
 
 #include <cudf/detail/aggregation/result_cache.hpp>
+#include <cudf/detail/null_mask.hpp>
 #include <cudf/groupby.hpp>
 #include <cudf/table/table_view.hpp>
 #include <cudf/types.hpp>