diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0702bf6a8..45c935773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## New Features
 
 ## Improvements
+- PR #297 Upgrade to libcu++ on GitHub.
 
 ## Bug Fixes
 
diff --git a/cpp/cmake/thirdparty/CMakeLists.txt b/cpp/cmake/thirdparty/CMakeLists.txt
index c81590ae7..cbbb202f0 100644
--- a/cpp/cmake/thirdparty/CMakeLists.txt
+++ b/cpp/cmake/thirdparty/CMakeLists.txt
@@ -26,8 +26,8 @@ message("Fetching libcudacxx")
 
 FetchContent_Declare(
     libcudacxx
-    GIT_REPOSITORY https://github.com/rapidsai/thirdparty-freestanding.git
-    GIT_TAG        cudf
+    GIT_REPOSITORY https://github.com/NVIDIA/libcudacxx.git
+    GIT_TAG        1.4.0
     GIT_SHALLOW    true
 )
 
diff --git a/cpp/include/cuspatial/point_in_polygon.hpp b/cpp/include/cuspatial/point_in_polygon.hpp
index dc5440f51..309a5a883 100644
--- a/cpp/include/cuspatial/point_in_polygon.hpp
+++ b/cpp/include/cuspatial/point_in_polygon.hpp
@@ -18,8 +18,9 @@
 
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_view.hpp>
+#include <cudf/types.hpp>
+
 #include <memory>
-#include "cudf/types.hpp"
 
 namespace cuspatial {
 
diff --git a/cpp/src/indexing/construction/detail/phase_1.cuh b/cpp/src/indexing/construction/detail/phase_1.cuh
index 1679ec724..aeba1dc5a 100644
--- a/cpp/src/indexing/construction/detail/phase_1.cuh
+++ b/cpp/src/indexing/construction/detail/phase_1.cuh
@@ -16,8 +16,9 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include "utilities.cuh"
+
+#include <utility/z_order.cuh>
 
 #include <cudf/column/column_factories.hpp>
 #include <cudf/types.hpp>
diff --git a/cpp/src/indexing/construction/detail/phase_2.cuh b/cpp/src/indexing/construction/detail/phase_2.cuh
index 153e793d6..bd3dfc233 100644
--- a/cpp/src/indexing/construction/detail/phase_2.cuh
+++ b/cpp/src/indexing/construction/detail/phase_2.cuh
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
+#include "utilities.cuh"
 
 #include <cudf/column/column_factories.hpp>
 #include <cudf/types.hpp>
diff --git a/cpp/src/indexing/construction/point_quadtree.cu b/cpp/src/indexing/construction/point_quadtree.cu
index 279df59fd..2d8f2cccb 100644
--- a/cpp/src/indexing/construction/point_quadtree.cu
+++ b/cpp/src/indexing/construction/point_quadtree.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/phase_1.cuh"
-#include "indexing/construction/detail/phase_2.cuh"
-#include "indexing/construction/detail/utilities.cuh"
+#include "detail/phase_1.cuh"
+#include "detail/phase_2.cuh"
+#include "detail/utilities.cuh"
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/point_quadtree.hpp>
diff --git a/cpp/src/join/detail/intersection.cuh b/cpp/src/join/detail/intersection.cuh
index c3db09369..cfc61a211 100644
--- a/cpp/src/join/detail/intersection.cuh
+++ b/cpp/src/join/detail/intersection.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/z_order.cuh>
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/table/table_view.hpp>
diff --git a/cpp/src/join/detail/traversal.cuh b/cpp/src/join/detail/traversal.cuh
index 26a4035e3..5dc0ba9b6 100644
--- a/cpp/src/join/detail/traversal.cuh
+++ b/cpp/src/join/detail/traversal.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/z_order.cuh>
 
 #include <rmm/thrust_rmm_allocator.h>
 #include <rmm/cuda_stream_view.hpp>
diff --git a/cpp/src/join/quadtree_point_in_polygon.cu b/cpp/src/join/quadtree_point_in_polygon.cu
index 4cf89fc8f..e6a7b0323 100644
--- a/cpp/src/join/quadtree_point_in_polygon.cu
+++ b/cpp/src/join/quadtree_point_in_polygon.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/point_in_polygon.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/point_in_polygon.cuh>
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>
diff --git a/cpp/src/join/quadtree_point_to_nearest_polyline.cu b/cpp/src/join/quadtree_point_to_nearest_polyline.cu
index c07361ee9..3cf688ef0 100644
--- a/cpp/src/join/quadtree_point_to_nearest_polyline.cu
+++ b/cpp/src/join/quadtree_point_to_nearest_polyline.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/utilities.cuh"
+#include <indexing/construction/detail/utilities.cuh>
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>
diff --git a/cpp/src/join/quadtree_poly_filtering.cu b/cpp/src/join/quadtree_poly_filtering.cu
index 0695074d5..98f0a5674 100644
--- a/cpp/src/join/quadtree_poly_filtering.cu
+++ b/cpp/src/join/quadtree_poly_filtering.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "join/detail/intersection.cuh"
-#include "join/detail/traversal.cuh"
+#include "detail/intersection.cuh"
+#include "detail/traversal.cuh"
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>
diff --git a/cpp/include/cuspatial/detail/cartesian_product_group_index_iterator.cuh b/cpp/src/spatial/detail/cartesian_product_group_index_iterator.cuh
similarity index 99%
rename from cpp/include/cuspatial/detail/cartesian_product_group_index_iterator.cuh
rename to cpp/src/spatial/detail/cartesian_product_group_index_iterator.cuh
index 7970826df..0c42a64df 100644
--- a/cpp/include/cuspatial/detail/cartesian_product_group_index_iterator.cuh
+++ b/cpp/src/spatial/detail/cartesian_product_group_index_iterator.cuh
@@ -16,12 +16,13 @@
 
 #pragma once
 
+#include <utility/size_from_offsets.cuh>
+
 #include <thrust/binary_search.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/pair.h>
 #include <utility>
-#include "utility/size_from_offsets.cuh"
 
 namespace cuspatial {
 namespace detail {
diff --git a/cpp/include/cuspatial/detail/hausdorff.cuh b/cpp/src/spatial/detail/hausdorff.cuh
similarity index 100%
rename from cpp/include/cuspatial/detail/hausdorff.cuh
rename to cpp/src/spatial/detail/hausdorff.cuh
diff --git a/cpp/src/spatial/hausdorff.cu b/cpp/src/spatial/hausdorff.cu
index 362dfb110..05bffb008 100644
--- a/cpp/src/spatial/hausdorff.cu
+++ b/cpp/src/spatial/hausdorff.cu
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "utility/scatter_output_iterator.cuh"
-#include "utility/size_from_offsets.cuh"
+#include "detail/cartesian_product_group_index_iterator.cuh"
+#include "detail/hausdorff.cuh"
+
+#include <utility/scatter_output_iterator.cuh>
+#include <utility/size_from_offsets.cuh>
 
-#include <cuspatial/detail/cartesian_product_group_index_iterator.cuh>
-#include <cuspatial/detail/hausdorff.cuh>
 #include <cuspatial/error.hpp>
 
 #include <cudf/column/column_device_view.cuh>
diff --git a/cpp/src/trajectory/trajectory_distances_and_speeds.cu b/cpp/src/trajectory/trajectory_distances_and_speeds.cu
index 91057738e..90bb8a025 100644
--- a/cpp/src/trajectory/trajectory_distances_and_speeds.cu
+++ b/cpp/src/trajectory/trajectory_distances_and_speeds.cu
@@ -83,7 +83,7 @@ struct dispatch_timestamp {
 
     using Rep     = typename Timestamp::rep;
     using Dur     = typename Timestamp::duration;
-    using Seconds = typename simt::std::chrono::seconds;
+    using Seconds = typename cuda::std::chrono::seconds;
 
     rmm::device_vector<Rep> durations(x.size() + 1);
     rmm::device_vector<double> distances(x.size() + 1);
@@ -144,7 +144,7 @@ struct dispatch_timestamp {
     );
 
     using Period =
-      typename simt::std::ratio_divide<typename Timestamp::period, typename Seconds::period>::type;
+      typename cuda::std::ratio_divide<typename Timestamp::period, typename Seconds::period>::type;
 
     // Reduce the intermediate durations and kilometer distances into meter
     // distances and speeds in meters/second
diff --git a/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp b/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp
index 0204261c9..64230f408 100644
--- a/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp
+++ b/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp
@@ -16,9 +16,10 @@
 
 #include <vector>
 
-#include <cuspatial/detail/cartesian_product_group_index_iterator.cuh>
 #include <cuspatial/error.hpp>
 
+#include <spatial/detail/cartesian_product_group_index_iterator.cuh>
+
 #include <thrust/binary_search.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
diff --git a/cpp/tests/trajectory/test_derive_trajectories.cu b/cpp/tests/trajectory/test_derive_trajectories.cu
index ae333905f..1dbc43456 100644
--- a/cpp/tests/trajectory/test_derive_trajectories.cu
+++ b/cpp/tests/trajectory/test_derive_trajectories.cu
@@ -17,7 +17,7 @@
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/table_utilities.hpp>
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 struct DeriveTrajectoriesTest : public cudf::test::BaseFixture {
 };
diff --git a/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu b/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu
index 4f104563c..daa9df843 100644
--- a/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu
+++ b/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 #include <cudf/utilities/traits.hpp>
 
diff --git a/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu b/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu
index 1b6b1183e..b0df57b66 100644
--- a/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu
+++ b/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/type_lists.hpp>