diff --git a/cpp/include/cudf/utilities/bit.hpp b/cpp/include/cudf/utilities/bit.hpp
index 31c8835f4c6..458587946f2 100644
--- a/cpp/include/cudf/utilities/bit.hpp
+++ b/cpp/include/cudf/utilities/bit.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <cassert>
-#include <climits>
+#include <cuda/std/climits>
 #include <cudf/types.hpp>
 
 /**
diff --git a/cpp/src/jit/cache.cpp b/cpp/src/jit/cache.cpp
index f79c82aa0db..cb401c184ee 100644
--- a/cpp/src/jit/cache.cpp
+++ b/cpp/src/jit/cache.cpp
@@ -97,7 +97,7 @@ std::string get_program_cache_dir()
 {
 #if defined(JITIFY_USE_CACHE)
   return get_cache_dir().string();
-#elif
+#else
   return {};
 #endif
 }
diff --git a/cpp/tests/unary/math_ops_test.cpp b/cpp/tests/unary/math_ops_test.cpp
index 2799c2f13df..08a40edb776 100644
--- a/cpp/tests/unary/math_ops_test.cpp
+++ b/cpp/tests/unary/math_ops_test.cpp
@@ -25,7 +25,7 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/type_lists.hpp>
 
-#include <climits>
+#include <cuda/std/climits>
 #include <vector>
 
 template <typename T>