diff --git a/.gitmodules b/.gitmodules
index 3d32f6ce040..f503cf4728d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -348,6 +348,9 @@
 [submodule "contrib/idna"]
 	path = contrib/idna
 	url = https://github.com/ada-url/idna.git
+[submodule "contrib/google-cloud-cpp"]
+	path = contrib/google-cloud-cpp
+	url = https://github.com/ClickHouse/google-cloud-cpp.git
 [submodule "contrib/rust_vendor"]
 	path = contrib/rust_vendor
 	url = https://github.com/ClickHouse/rust_vendor.git
@@ -369,6 +372,3 @@
 [submodule "contrib/postgres"]
 	path = contrib/postgres
 	url = https://github.com/ClickHouse/postgres.git
-[submodule "contrib/google-cloud-cpp"]
-	path = contrib/google-cloud-cpp
-	url = https://github.com/ClickHouse/google-cloud-cpp.git
diff --git a/contrib/google-cloud-cpp b/contrib/google-cloud-cpp
index 3d95768dde2..83f30caadb8 160000
--- a/contrib/google-cloud-cpp
+++ b/contrib/google-cloud-cpp
@@ -1 +1 @@
-Subproject commit 3d95768dde2c7dda6a94c246d51623c1c7dc8281
+Subproject commit 83f30caadb8613fb5c408d8c2fd545291596b53f
diff --git a/contrib/google-cloud-cpp-cmake/CMakeLists.txt b/contrib/google-cloud-cpp-cmake/CMakeLists.txt
index 7160a66282b..7996635ecc9 100644
--- a/contrib/google-cloud-cpp-cmake/CMakeLists.txt
+++ b/contrib/google-cloud-cpp-cmake/CMakeLists.txt
@@ -1,28 +1,38 @@
-set(ENABLE_GOOGLE_CLOUD_DEFAULT OFF)
+set(ENABLE_GOOGLE_CLOUD_CPP_DEFAULT OFF)
 
-if(ENABLE_LIBRARIES AND (OS_LINUX OR OS_DARWIN) AND TARGET OpenSSL::Crypto)
-    set(ENABLE_GOOGLE_CLOUD_DEFAULT ON)
+if(ENABLE_LIBRARIES AND OS_LINUX)
+    set(ENABLE_GOOGLE_CLOUD_CPP_DEFAULT ON)
 endif()
 
-option(ENABLE_GOOGLE_CLOUD "Enable Google Cloud SDK" ${ENABLE_GOOGLE_CLOUD_DEFAULT})
+option(ENABLE_GOOGLE_CLOUD_CPP "Enable Google Cloud Cpp" ${ENABLE_GOOGLE_CLOUD_CPP_DEFAULT})
 
-if(NOT ENABLE_GOOGLE_CLOUD)
-    message(STATUS "Not using Google Cloud")
+if(NOT ENABLE_GOOGLE_CLOUD_CPP)
+    message(STATUS "Not using Google Cloud Cpp")
     return()
 endif()
 
 if(NOT ENABLE_GRPC)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use Google Cloud without gRPC")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use Google Cloud Cpp without gRPC")
 endif()
 if (NOT ENABLE_PROTOBUF)
-    message( ${RECONFIGURE_MESSAGE_LEVEL} "Can't use Google Cloud without protobuf")
+    message( ${RECONFIGURE_MESSAGE_LEVEL} "Can't use Google Cloud Cpp without protobuf")
 endif()
 
 # Gather sources and options.
-set(GOOGLE_CLOUD_SOURCES)
-set(GOOGLE_CLOUD_PUBLIC_INCLUDES)
-set(GOOGLE_CLOUD_PRIVATE_INCLUDES)
-set(GOOGLE_CLOUD_PRIVATE_LIBS)
+set(GOOGLE_CLOUD_CPP_SOURCES)
+set(GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES)
+set(GOOGLE_CLOUD_CPP_PRIVATE_INCLUDES)
+set(GOOGLE_CLOUD_CPP_PRIVATE_LIBS)
+
+# Directories.
+SET(GOOGLE_CLOUD_CPP_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-cloud-cpp" )
+list(APPEND GOOGLE_CLOUD_CPP_PRIVATE_INCLUDES "${GOOGLE_CLOUD_CPP_DIR}")
+
+# Set the PROJECT_SOURCE_DIR so that all Google Cloud cmake files work
+set(PROJECT_SOURCE_DIR_BAK ${PROJECT_SOURCE_DIR})
+set(PROJECT_SOURCE_DIR ${GOOGLE_CLOUD_CPP_DIR})
+
+list(APPEND CMAKE_MODULE_PATH "${GOOGLE_CLOUD_CPP_DIR}/cmake")
 
 # -- The build needs protobuf files. The original build scripts download them from a remote server (see target 'googleapis_download').
 #    This is too unreliable in the context of ClickHouse ... we instead ship the downloaded archive with the ClickHouse source and
@@ -51,16 +61,6 @@ file(RENAME
 )
 # ---
 
-# Directories.
-SET(GOOGLE_CLOUD_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-cloud-cpp" )
-list(APPEND GOOGLE_CLOUD_PRIVATE_INCLUDES "${GOOGLE_CLOUD_DIR}")
-
-# Set the PROJECT_SOURCE_DIR so that all Google Cloud cmake files work
-set(PROJECT_SOURCE_DIR_BAK ${PROJECT_SOURCE_DIR})
-set(PROJECT_SOURCE_DIR ${GOOGLE_CLOUD_DIR})
-
-list(APPEND CMAKE_MODULE_PATH "${GOOGLE_CLOUD_DIR}/cmake")
-
 # Building this target results in all protobufs being compiled.
 add_custom_target(google-cloud-cpp-protos)
 
@@ -84,25 +84,25 @@ google_cloud_cpp_add_library_protos(kms)
 include(google_cloud_cpp_common.cmake)
 include(google_cloud_cpp_grpc_utils.cmake)
 
-SET(GOOGLE_CLOUD_KMS_DIR "${GOOGLE_CLOUD_DIR}/google/cloud/kms")
+SET(GOOGLE_CLOUD_CPP_KMS_DIR "${GOOGLE_CLOUD_CPP_DIR}/google/cloud/kms")
 
-file(GLOB GOOGLE_CLOUD_KMS_SRC
-    "${GOOGLE_CLOUD_KMS_DIR}/v1/*.cc"
-    "${GOOGLE_CLOUD_KMS_DIR}/v1/internal/*.cc"
-    "${GOOGLE_CLOUD_KMS_DIR}/inventory/v1/*.cc"
+file(GLOB GOOGLE_CLOUD_CPP_KMS_SRC
+    "${GOOGLE_CLOUD_CPP_KMS_DIR}/v1/*.cc"
+    "${GOOGLE_CLOUD_CPP_KMS_DIR}/v1/internal/*.cc"
+    "${GOOGLE_CLOUD_CPP_KMS_DIR}/inventory/v1/*.cc"
 )
 
-list(APPEND GOOGLE_CLOUD_SOURCES ${GOOGLE_CLOUD_KMS_SRC})
-list(APPEND GOOGLE_CLOUD_PUBLIC_INCLUDES "${GOOGLE_CLOUD_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
+list(APPEND GOOGLE_CLOUD_CPP_SOURCES ${GOOGLE_CLOUD_CPP_KMS_SRC})
+list(APPEND GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES "${GOOGLE_CLOUD_CPP_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
 
 set(GRPC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc")
-list(APPEND GOOGLE_CLOUD_PUBLIC_INCLUDES "${GRPC_INCLUDE_DIR}/include" "${GRPC_INCLUDE_DIR}/spm-cpp-include")
+list(APPEND GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES "${GRPC_INCLUDE_DIR}/include" "${GRPC_INCLUDE_DIR}/spm-cpp-include")
 
 # Restore the PROJECT_SOURCE_DIR.
 set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR_BAK})
 
 # Link against external libraries.
-list(APPEND GOOGLE_CLOUD_PRIVATE_LIBS
+list(APPEND GOOGLE_CLOUD_CPP_PRIVATE_LIBS
     google_cloud_cpp_common
     google_cloud_cpp_grpc_utils
     google_cloud_cpp_kms_protos
@@ -112,21 +112,21 @@ list(APPEND GOOGLE_CLOUD_PRIVATE_LIBS
     absl::optional
 )
 
-list(APPEND GOOGLE_CLOUD_PUBLIC_LIBS
+list(APPEND GOOGLE_CLOUD_CPP_PUBLIC_LIBS
     absl::optional
     gRPC::grpc++
 )
 
 # Add library.
-add_library(_gcloud ${GOOGLE_CLOUD_SOURCES})
+add_library(_gcloud ${GOOGLE_CLOUD_CPP_SOURCES})
 
-target_include_directories(_gcloud SYSTEM PUBLIC ${GOOGLE_CLOUD_PUBLIC_INCLUDES})
-target_include_directories(_gcloud SYSTEM PRIVATE ${GOOGLE_CLOUD_PRIVATE_INCLUDES})
-target_link_libraries(_gcloud PRIVATE ${GOOGLE_CLOUD_PRIVATE_LIBS})
+target_include_directories(_gcloud SYSTEM PUBLIC ${GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES})
+target_include_directories(_gcloud SYSTEM PRIVATE ${GOOGLE_CLOUD_CPP_PRIVATE_INCLUDES})
+target_link_libraries(_gcloud PRIVATE ${GOOGLE_CLOUD_CPP_PRIVATE_LIBS})
 
 # The library is large - avoid bloat.
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
-    target_compile_options (_gcloud PRIVATE -g0)
+    target_compile_options(_gcloud PRIVATE -g0)
 endif()
 
-add_library(ch_contrib::google_cloud ALIAS _gcloud)
+add_library(ch_contrib::google_cloud_cpp ALIAS _gcloud)
diff --git a/contrib/google-cloud-cpp-cmake/GoogleApis.cmake b/contrib/google-cloud-cpp-cmake/GoogleApis.cmake
index c2eae94e39a..e6d4afc4e34 100644
--- a/contrib/google-cloud-cpp-cmake/GoogleApis.cmake
+++ b/contrib/google-cloud-cpp-cmake/GoogleApis.cmake
@@ -349,8 +349,8 @@ external_googleapis_add_library(
     "google/iam/credentials/v1/iamcredentials.proto" api_annotations_protos
     api_client_protos iam_credentials_v1_common_protos)
 
-google_cloud_cpp_load_protolist(cloud_common_list "${GOOGLE_CLOUD_DIR}/external/googleapis/protolists/common.list")
-google_cloud_cpp_load_protodeps(cloud_common_deps "${GOOGLE_CLOUD_DIR}/external/googleapis/protodeps/common.deps")
+google_cloud_cpp_load_protolist(cloud_common_list "${GOOGLE_CLOUD_CPP_DIR}/external/googleapis/protolists/common.list")
+google_cloud_cpp_load_protodeps(cloud_common_deps "${GOOGLE_CLOUD_CPP_DIR}/external/googleapis/protodeps/common.deps")
 google_cloud_cpp_grpcpp_library(
     google_cloud_cpp_cloud_common_common_protos ${cloud_common_list}
     PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
diff --git a/contrib/google-cloud-cpp-cmake/google_cloud_cpp_common.cmake b/contrib/google-cloud-cpp-cmake/google_cloud_cpp_common.cmake
index 8c14e3a7028..5f23ce0fafb 100644
--- a/contrib/google-cloud-cpp-cmake/google_cloud_cpp_common.cmake
+++ b/contrib/google-cloud-cpp-cmake/google_cloud_cpp_common.cmake
@@ -16,168 +16,168 @@
 
 # File copied from google-cloud-cpp/google-cloud-cpp/google_cloud_cpp_common.cmake with minor modifications.
 
-set(GOOGLE_CLOUD_COMMON_DIR "${GOOGLE_CLOUD_DIR}/google/cloud")
+set(GOOGLE_CLOUD_CPP_COMMON_DIR "${GOOGLE_CLOUD_CPP_DIR}/google/cloud")
 
 # Generate the version information from the CMake values.
-# configure_file(${GOOGLE_CLOUD_COMMON_DIR}/internal/version_info.h.in
+# configure_file(${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/version_info.h.in
 #                ${CMAKE_CURRENT_SOURCE_DIR}/internal/version_info.h)
 
 # Create the file that captures build information. Having access to the compiler
 # and build flags at runtime allows us to print better benchmark results.
 string(TOUPPER "${CMAKE_BUILD_TYPE}" GOOGLE_CLOUD_CPP_BUILD_TYPE_UPPER)
-configure_file(${GOOGLE_CLOUD_COMMON_DIR}/internal/build_info.cc.in internal/build_info.cc)
+configure_file(${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/build_info.cc.in internal/build_info.cc)
 
 # the client library
 add_library(
     google_cloud_cpp_common # cmake-format: sort
     ${CMAKE_CURRENT_BINARY_DIR}/internal/build_info.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/access_token.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/access_token.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/backoff_policy.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/common_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/credentials.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/credentials.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/experimental_tag.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/future.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/future_generic.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/future_void.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/idempotency.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/absl_str_cat_quiet.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/absl_str_join_quiet.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/absl_str_replace_quiet.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/algorithm.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/api_client_header.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/api_client_header.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/attributes.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/auth_header_error.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/auth_header_error.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/backoff_policy.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/backoff_policy.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/base64_transforms.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/base64_transforms.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/big_endian.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/build_info.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/call_context.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/clock.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/compiler_info.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/compiler_info.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/compute_engine_util.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/compute_engine_util.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/credentials_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/credentials_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_future_status.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_future_status.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/detect_gcp.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/detect_gcp_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/detect_gcp_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/diagnostics_pop.inc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/diagnostics_push.inc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/disable_deprecation_warnings.inc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/disable_msvc_crt_secure_warnings.inc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/error_context.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/error_context.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/filesystem.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/filesystem.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/format_time_point.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/format_time_point.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_base.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_coroutines.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_fwd.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_then_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/future_then_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/getenv.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/getenv.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/group_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/invocation_id_generator.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/invocation_id_generator.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/invoke_result.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/ios_flags_saver.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/log_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/log_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/make_status.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/make_status.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/noexcept_action.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/noexcept_action.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/non_constructible.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/opentelemetry.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/opentelemetry.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/opentelemetry_context.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/opentelemetry_context.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/pagination_range.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/parse_rfc3339.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/parse_rfc3339.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/populate_common_options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/populate_common_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/port_platform.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/random.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/random.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_info.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_loop_helpers.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_loop_helpers.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_policy_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_policy_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/service_endpoint.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/service_endpoint.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/sha256_hash.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/sha256_hash.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/sha256_hmac.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/sha256_hmac.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/sha256_type.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/status_payload_keys.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/status_payload_keys.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/status_utils.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/status_utils.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/strerror.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/strerror.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/subject_token.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/subject_token.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/throw_delegate.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/throw_delegate.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/timer_queue.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/timer_queue.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/trace_propagator.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/trace_propagator.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/traced_stream_range.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/tuple.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/type_list.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/type_traits.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/url_encode.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/url_encode.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/user_agent_prefix.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/user_agent_prefix.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/utility.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/version_info.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/kms_key_name.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/kms_key_name.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/location.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/location.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/log.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/log.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/no_await_tag.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/opentelemetry_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/optional.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/polling_policy.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/project.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/project.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/retry_policy.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/rpc_metadata.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/status.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/status.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/status_or.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/stream_range.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/terminate_handler.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/terminate_handler.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/tracing_options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/tracing_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/universe_domain_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/version.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/version.h)
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/access_token.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/access_token.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/backoff_policy.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/common_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/credentials.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/credentials.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/experimental_tag.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/future.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/future_generic.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/future_void.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/idempotency.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/absl_str_cat_quiet.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/absl_str_join_quiet.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/absl_str_replace_quiet.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/algorithm.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/api_client_header.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/api_client_header.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/attributes.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/auth_header_error.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/auth_header_error.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/backoff_policy.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/backoff_policy.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/base64_transforms.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/base64_transforms.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/big_endian.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/build_info.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/call_context.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/clock.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/compiler_info.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/compiler_info.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/compute_engine_util.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/compute_engine_util.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/credentials_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/credentials_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_future_status.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_future_status.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/detect_gcp.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/detect_gcp_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/detect_gcp_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/diagnostics_pop.inc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/diagnostics_push.inc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/disable_deprecation_warnings.inc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/disable_msvc_crt_secure_warnings.inc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/error_context.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/error_context.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/filesystem.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/filesystem.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/format_time_point.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/format_time_point.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_base.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_coroutines.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_fwd.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_then_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/future_then_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/getenv.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/getenv.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/group_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/invocation_id_generator.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/invocation_id_generator.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/invoke_result.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/ios_flags_saver.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/log_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/log_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/make_status.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/make_status.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/noexcept_action.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/noexcept_action.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/non_constructible.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/opentelemetry.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/opentelemetry.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/opentelemetry_context.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/opentelemetry_context.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/pagination_range.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/parse_rfc3339.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/parse_rfc3339.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/populate_common_options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/populate_common_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/port_platform.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/random.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/random.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_info.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_loop_helpers.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_loop_helpers.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_policy_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_policy_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/service_endpoint.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/service_endpoint.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/sha256_hash.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/sha256_hash.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/sha256_hmac.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/sha256_hmac.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/sha256_type.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/status_payload_keys.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/status_payload_keys.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/status_utils.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/status_utils.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/strerror.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/strerror.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/subject_token.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/subject_token.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/throw_delegate.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/throw_delegate.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/timer_queue.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/timer_queue.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/trace_propagator.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/trace_propagator.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/traced_stream_range.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/tuple.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/type_list.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/type_traits.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/url_encode.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/url_encode.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/user_agent_prefix.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/user_agent_prefix.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/utility.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/version_info.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/kms_key_name.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/kms_key_name.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/location.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/location.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/log.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/log.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/no_await_tag.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/opentelemetry_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/optional.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/polling_policy.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/project.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/project.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/retry_policy.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/rpc_metadata.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/status.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/status.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/status_or.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/stream_range.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/terminate_handler.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/terminate_handler.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/tracing_options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/tracing_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/universe_domain_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/version.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/version.h)
 target_link_libraries(
     google_cloud_cpp_common
     PUBLIC absl::base
diff --git a/contrib/google-cloud-cpp-cmake/google_cloud_cpp_grpc_utils.cmake b/contrib/google-cloud-cpp-cmake/google_cloud_cpp_grpc_utils.cmake
index b0131504e66..e5538b2eaa8 100644
--- a/contrib/google-cloud-cpp-cmake/google_cloud_cpp_grpc_utils.cmake
+++ b/contrib/google-cloud-cpp-cmake/google_cloud_cpp_grpc_utils.cmake
@@ -16,104 +16,104 @@
 
 # File copied from google-cloud-cpp/google-cloud-cpp/google_cloud_cpp_grpc_utils.cmake with minor modifications.
 
-set(GOOGLE_CLOUD_COMMON_DIR "${GOOGLE_CLOUD_DIR}/google/cloud")
+set(GOOGLE_CLOUD_CPP_COMMON_DIR "${GOOGLE_CLOUD_CPP_DIR}/google/cloud")
 
 # the library
 add_library(
     google_cloud_cpp_grpc_utils # cmake-format: sort
-    ${GOOGLE_CLOUD_COMMON_DIR}/async_operation.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/async_streaming_read_write_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/background_threads.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/completion_queue.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/completion_queue.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/connection_options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/connection_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_error_delegate.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_error_delegate.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_utils/async_operation.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_utils/completion_queue.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_utils/grpc_error_delegate.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/grpc_utils/version.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/iam_updater.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_connection_ready.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_connection_ready.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_long_running_operation.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_polling_loop.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_polling_loop.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_stream_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_write_stream_auth.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_write_stream_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_write_stream_logging.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_write_stream_timeout.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_read_write_stream_tracing.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_retry_loop.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_retry_unary_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_rpc_details.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc_auth.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc_logging.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc_timeout.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_read_rpc_tracing.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc_auth.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc_logging.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc_timeout.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/async_streaming_write_rpc_tracing.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/background_threads_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/background_threads_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/completion_queue_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string_protobuf.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string_protobuf.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string_status.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/debug_string_status.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/default_completion_queue_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/default_completion_queue_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/extract_long_running_result.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/extract_long_running_result.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_access_token_authentication.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_access_token_authentication.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_api_key_authentication.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_api_key_authentication.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_async_access_token_cache.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_async_access_token_cache.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_channel_credentials_authentication.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_channel_credentials_authentication.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_impersonate_service_account.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_impersonate_service_account.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_metadata_view.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_opentelemetry.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_opentelemetry.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_request_metadata.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_request_metadata.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_service_account_authentication.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/grpc_service_account_authentication.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/log_wrapper.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/log_wrapper.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/minimal_iam_credentials_stub.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/minimal_iam_credentials_stub.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/populate_grpc_options.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/populate_grpc_options.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/resumable_streaming_read_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/retry_loop.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/routing_matcher.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/setup_context.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_read_rpc.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_read_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_read_rpc_logging.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_read_rpc_tracing.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_write_rpc.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_write_rpc_impl.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_write_rpc_impl.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_write_rpc_logging.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/streaming_write_rpc_tracing.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/time_utils.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/time_utils.h
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/unified_grpc_credentials.cc
-    ${GOOGLE_CLOUD_COMMON_DIR}/internal/unified_grpc_credentials.h)
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/async_operation.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/async_streaming_read_write_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/background_threads.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/completion_queue.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/completion_queue.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/connection_options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/connection_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_error_delegate.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_error_delegate.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_utils/async_operation.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_utils/completion_queue.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_utils/grpc_error_delegate.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/grpc_utils/version.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/iam_updater.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_connection_ready.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_connection_ready.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_long_running_operation.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_polling_loop.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_polling_loop.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_stream_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_write_stream_auth.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_write_stream_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_write_stream_logging.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_write_stream_timeout.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_read_write_stream_tracing.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_retry_loop.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_retry_unary_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_rpc_details.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc_auth.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc_logging.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc_timeout.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_read_rpc_tracing.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc_auth.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc_logging.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc_timeout.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/async_streaming_write_rpc_tracing.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/background_threads_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/background_threads_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/completion_queue_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string_protobuf.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string_protobuf.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string_status.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/debug_string_status.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/default_completion_queue_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/default_completion_queue_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/extract_long_running_result.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/extract_long_running_result.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_access_token_authentication.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_access_token_authentication.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_api_key_authentication.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_api_key_authentication.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_async_access_token_cache.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_async_access_token_cache.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_channel_credentials_authentication.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_channel_credentials_authentication.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_impersonate_service_account.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_impersonate_service_account.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_metadata_view.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_opentelemetry.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_opentelemetry.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_request_metadata.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_request_metadata.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_service_account_authentication.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/grpc_service_account_authentication.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/log_wrapper.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/log_wrapper.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/minimal_iam_credentials_stub.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/minimal_iam_credentials_stub.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/populate_grpc_options.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/populate_grpc_options.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/resumable_streaming_read_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/retry_loop.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/routing_matcher.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/setup_context.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_read_rpc.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_read_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_read_rpc_logging.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_read_rpc_tracing.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_write_rpc.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_write_rpc_impl.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_write_rpc_impl.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_write_rpc_logging.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/streaming_write_rpc_tracing.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/time_utils.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/time_utils.h
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/unified_grpc_credentials.cc
+    ${GOOGLE_CLOUD_CPP_COMMON_DIR}/internal/unified_grpc_credentials.h)
 target_link_libraries(
     google_cloud_cpp_grpc_utils
     PUBLIC absl::function_ref
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c23c18e636..55228b2d1ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -639,8 +639,8 @@ if (TARGET ch_rust::skim)
     dbms_target_link_libraries(PUBLIC ch_rust::skim)
 endif()
 
-if (TARGET ch_contrib::google_cloud)
-    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::google_cloud)
+if (TARGET ch_contrib::google_cloud_cpp)
+    dbms_target_link_libraries(PUBLIC ch_contrib::google_cloud_cpp)
 endif()
 
 if (ENABLE_TESTS)