diff --git a/BUILD b/BUILD
index 46db2e490ac4c..f3f9f129331a0 100644
--- a/BUILD
+++ b/BUILD
@@ -521,6 +521,7 @@ grpc_cc_library(
"src/core/lib/gprpp/map.h",
"src/core/lib/gprpp/memory.h",
"src/core/lib/gprpp/mpscq.h",
+ "src/core/lib/gprpp/set.h",
"src/core/lib/gprpp/string_view.h",
"src/core/lib/gprpp/sync.h",
"src/core/lib/gprpp/thd.h",
diff --git a/BUILD.gn b/BUILD.gn
index 88bf0e632e25e..650d54c9eeed3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -149,6 +149,7 @@ config("grpc_config") {
"src/core/lib/gprpp/memory.h",
"src/core/lib/gprpp/mpscq.cc",
"src/core/lib/gprpp/mpscq.h",
+ "src/core/lib/gprpp/set.h",
"src/core/lib/gprpp/sync.h",
"src/core/lib/gprpp/thd.h",
"src/core/lib/gprpp/thd_posix.cc",
@@ -1253,6 +1254,7 @@ config("grpc_config") {
"src/core/lib/gprpp/orphanable.h",
"src/core/lib/gprpp/ref_counted.h",
"src/core/lib/gprpp/ref_counted_ptr.h",
+ "src/core/lib/gprpp/set.h",
"src/core/lib/gprpp/string_view.h",
"src/core/lib/gprpp/sync.h",
"src/core/lib/gprpp/thd.h",
diff --git a/build.yaml b/build.yaml
index b96786afbc3ce..615ed4f793576 100644
--- a/build.yaml
+++ b/build.yaml
@@ -291,6 +291,7 @@ filegroups:
- src/core/lib/gprpp/map.h
- src/core/lib/gprpp/memory.h
- src/core/lib/gprpp/mpscq.h
+ - src/core/lib/gprpp/set.h
- src/core/lib/gprpp/sync.h
- src/core/lib/gprpp/thd.h
- src/core/lib/profiling/timers.h
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 9aa8d215cc06d..bf06d7bf2da08 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -311,6 +311,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/map.h',
'src/core/lib/gprpp/memory.h',
'src/core/lib/gprpp/mpscq.h',
+ 'src/core/lib/gprpp/set.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/profiling/timers.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index e144acb6331c0..02718c7a40a58 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -214,6 +214,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/map.h',
'src/core/lib/gprpp/memory.h',
'src/core/lib/gprpp/mpscq.h',
+ 'src/core/lib/gprpp/set.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/profiling/timers.h',
@@ -988,6 +989,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/map.h',
'src/core/lib/gprpp/memory.h',
'src/core/lib/gprpp/mpscq.h',
+ 'src/core/lib/gprpp/set.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/profiling/timers.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index ef79e0cedeaa4..1bfd393a7c63d 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -108,6 +108,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/gprpp/map.h )
s.files += %w( src/core/lib/gprpp/memory.h )
s.files += %w( src/core/lib/gprpp/mpscq.h )
+ s.files += %w( src/core/lib/gprpp/set.h )
s.files += %w( src/core/lib/gprpp/sync.h )
s.files += %w( src/core/lib/gprpp/thd.h )
s.files += %w( src/core/lib/profiling/timers.h )
diff --git a/package.xml b/package.xml
index b9ad2970e5086..5a3ad6b229f27 100644
--- a/package.xml
+++ b/package.xml
@@ -113,6 +113,7 @@
+
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 01825a14eb9aa..9134c1c08d1b5 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -26,9 +26,6 @@
#include
#include
-#include