c++ify
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4dbb4..b58065b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -703,7 +703,6 @@
   src/core/lib/gpr/env_linux.cc
   src/core/lib/gpr/env_posix.cc
   src/core/lib/gpr/env_windows.cc
-  src/core/lib/gpr/fork.cc
   src/core/lib/gpr/host_port.cc
   src/core/lib/gpr/log.cc
   src/core/lib/gpr/log_android.cc
@@ -728,6 +727,7 @@
   src/core/lib/gpr/tmpfile_posix.cc
   src/core/lib/gpr/tmpfile_windows.cc
   src/core/lib/gpr/wrap_memcpy.cc
+  src/core/lib/gprpp/fork.cc
   src/core/lib/gprpp/thd_posix.cc
   src/core/lib/gprpp/thd_windows.cc
   src/core/lib/profiling/basic_timers.cc
@@ -6161,7 +6161,7 @@
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC)
 
 add_executable(fork_test
-  test/core/gpr/fork_test.cc
+  test/core/gprpp/fork_test.cc
 )