diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 7ee7bb5..23a0101 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -115,14 +115,12 @@
                       'include/grpc/support/atm_gcc_sync.h',
                       'include/grpc/support/atm_windows.h',
                       'include/grpc/support/avl.h',
-                      'include/grpc/support/cmdline.h',
                       'include/grpc/support/cpu.h',
                       'include/grpc/support/host_port.h',
                       'include/grpc/support/log.h',
                       'include/grpc/support/log_windows.h',
                       'include/grpc/support/port_platform.h',
                       'include/grpc/support/string_util.h',
-                      'include/grpc/support/subprocess.h',
                       'include/grpc/support/sync.h',
                       'include/grpc/support/sync_custom.h',
                       'include/grpc/support/sync_generic.h',
@@ -215,7 +213,6 @@
                       'src/core/lib/gpr/arena.cc',
                       'src/core/lib/gpr/atm.cc',
                       'src/core/lib/gpr/avl.cc',
-                      'src/core/lib/gpr/cmdline.cc',
                       'src/core/lib/gpr/cpu_iphone.cc',
                       'src/core/lib/gpr/cpu_linux.cc',
                       'src/core/lib/gpr/cpu_posix.cc',
@@ -236,8 +233,6 @@
                       'src/core/lib/gpr/string_posix.cc',
                       'src/core/lib/gpr/string_util_windows.cc',
                       'src/core/lib/gpr/string_windows.cc',
-                      'src/core/lib/gpr/subprocess_posix.cc',
-                      'src/core/lib/gpr/subprocess_windows.cc',
                       'src/core/lib/gpr/sync.cc',
                       'src/core/lib/gpr/sync_posix.cc',
                       'src/core/lib/gpr/sync_windows.cc',
@@ -993,6 +988,7 @@
                       'test/core/end2end/fixtures/http_proxy_fixture.cc',
                       'test/core/end2end/fixtures/proxy.cc',
                       'test/core/iomgr/endpoint_tests.cc',
+                      'test/core/util/cmdline.cc',
                       'test/core/util/debugger_macros.cc',
                       'test/core/util/grpc_profiler.cc',
                       'test/core/util/histogram.cc',
@@ -1004,6 +1000,8 @@
                       'test/core/util/port_isolated_runtime_environment.cc',
                       'test/core/util/port_server_client.cc',
                       'test/core/util/slice_splitter.cc',
+                      'test/core/util/subprocess_posix.cc',
+                      'test/core/util/subprocess_windows.cc',
                       'test/core/util/tracer_util.cc',
                       'test/core/util/trickle_endpoint.cc',
                       'test/core/end2end/data/ssl_test_data.h',
@@ -1012,6 +1010,7 @@
                       'test/core/end2end/fixtures/http_proxy_fixture.h',
                       'test/core/end2end/fixtures/proxy.h',
                       'test/core/iomgr/endpoint_tests.h',
+                      'test/core/util/cmdline.h',
                       'test/core/util/debugger_macros.h',
                       'test/core/util/grpc_profiler.h',
                       'test/core/util/histogram.h',
@@ -1022,6 +1021,7 @@
                       'test/core/util/port.h',
                       'test/core/util/port_server_client.h',
                       'test/core/util/slice_splitter.h',
+                      'test/core/util/subprocess.h',
                       'test/core/util/tracer_util.h',
                       'test/core/util/trickle_endpoint.h',
                       'test/core/end2end/end2end_tests.cc',