diff --git a/BUILD b/BUILD
index 44c9b930967..5e6e9f67c05 100644
--- a/BUILD
+++ b/BUILD
@@ -97,6 +97,9 @@ cc_library(
     "src/core/support/tls_pthread.c",
   ],
   hdrs = [
+    "include/grpc/impl/codegen/connectivity_state.h",
+    "include/grpc/impl/codegen/port_platform.h",
+    "include/grpc/impl/codegen/time.h",
     "include/grpc/support/alloc.h",
     "include/grpc/support/atm.h",
     "include/grpc/support/atm_gcc_atomic.h",
@@ -1048,6 +1051,9 @@ objc_library(
     "src/core/support/tls_pthread.c",
   ],
   hdrs = [
+    "include/grpc/impl/codegen/connectivity_state.h",
+    "include/grpc/impl/codegen/port_platform.h",
+    "include/grpc/impl/codegen/time.h",
     "include/grpc/support/alloc.h",
     "include/grpc/support/atm.h",
     "include/grpc/support/atm_gcc_atomic.h",
diff --git a/Makefile b/Makefile
index ab75dc730d8..21c3367e86b 100644
--- a/Makefile
+++ b/Makefile
@@ -2221,6 +2221,9 @@ LIBGPR_SRC = \
     src/core/support/tls_pthread.c \
 
 PUBLIC_HEADERS_C += \
+    include/grpc/impl/codegen/connectivity_state.h \
+    include/grpc/impl/codegen/port_platform.h \
+    include/grpc/impl/codegen/time.h \
     include/grpc/support/alloc.h \
     include/grpc/support/atm.h \
     include/grpc/support/atm_gcc_atomic.h \
diff --git a/build.yaml b/build.yaml
index feea528de42..b95bc03cfdf 100644
--- a/build.yaml
+++ b/build.yaml
@@ -381,6 +381,9 @@ libs:
   build: all
   language: c
   public_headers:
+  - include/grpc/impl/codegen/connectivity_state.h
+  - include/grpc/impl/codegen/port_platform.h
+  - include/grpc/impl/codegen/time.h
   - include/grpc/support/alloc.h
   - include/grpc/support/atm.h
   - include/grpc/support/atm_gcc_atomic.h
diff --git a/gRPC.podspec b/gRPC.podspec
index 5dfe6add7f8..8236b5b93b6 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -73,6 +73,9 @@ Pod::Spec.new do |s|
                       'src/core/support/string_win32.h',
                       'src/core/support/thd_internal.h',
                       'src/core/support/time_precise.h',
+                      'include/grpc/impl/codegen/connectivity_state.h',
+                      'include/grpc/impl/codegen/port_platform.h',
+                      'include/grpc/impl/codegen/time.h',
                       'include/grpc/support/alloc.h',
                       'include/grpc/support/atm.h',
                       'include/grpc/support/atm_gcc_atomic.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index ab78a42416b..4bd88f61abb 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -46,6 +46,9 @@ Gem::Specification.new do |s|
 
   s.extensions = %w(src/ruby/ext/grpc/extconf.rb)
 
+  s.files += %w( include/grpc/impl/codegen/connectivity_state.h )
+  s.files += %w( include/grpc/impl/codegen/port_platform.h )
+  s.files += %w( include/grpc/impl/codegen/time.h )
   s.files += %w( include/grpc/support/alloc.h )
   s.files += %w( include/grpc/support/atm.h )
   s.files += %w( include/grpc/support/atm_gcc_atomic.h )
diff --git a/package.json b/package.json
index 7168813b014..178a4ee49d2 100644
--- a/package.json
+++ b/package.json
@@ -367,6 +367,9 @@
     "src/core/census/initialize.c",
     "src/core/census/operation.c",
     "src/core/census/tracing.c",
+    "include/grpc/impl/codegen/connectivity_state.h",
+    "include/grpc/impl/codegen/port_platform.h",
+    "include/grpc/impl/codegen/time.h",
     "include/grpc/support/alloc.h",
     "include/grpc/support/atm.h",
     "include/grpc/support/atm_gcc_atomic.h",
diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core
index 8ce9dd5e921..d5dddd4ad30 100644
--- a/tools/doxygen/Doxyfile.core
+++ b/tools/doxygen/Doxyfile.core
@@ -770,6 +770,9 @@ include/grpc/impl/codegen/port_platform.h \
 include/grpc/impl/codegen/time.h \
 include/grpc/status.h \
 include/grpc/census.h \
+include/grpc/impl/codegen/connectivity_state.h \
+include/grpc/impl/codegen/port_platform.h \
+include/grpc/impl/codegen/time.h \
 include/grpc/support/alloc.h \
 include/grpc/support/atm.h \
 include/grpc/support/atm_gcc_atomic.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index a2b37c9c1c5..5fe14d5d2f8 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1051,6 +1051,9 @@ src/core/census/context.c \
 src/core/census/initialize.c \
 src/core/census/operation.c \
 src/core/census/tracing.c \
+include/grpc/impl/codegen/connectivity_state.h \
+include/grpc/impl/codegen/port_platform.h \
+include/grpc/impl/codegen/time.h \
 include/grpc/support/alloc.h \
 include/grpc/support/atm.h \
 include/grpc/support/atm_gcc_atomic.h \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 476ccbec27b..28bdedf4870 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -2740,6 +2740,9 @@
   {
     "deps": [], 
     "headers": [
+      "include/grpc/impl/codegen/connectivity_state.h", 
+      "include/grpc/impl/codegen/port_platform.h", 
+      "include/grpc/impl/codegen/time.h", 
       "include/grpc/support/alloc.h", 
       "include/grpc/support/atm.h", 
       "include/grpc/support/atm_gcc_atomic.h", 
@@ -2782,6 +2785,9 @@
     "language": "c", 
     "name": "gpr", 
     "src": [
+      "include/grpc/impl/codegen/connectivity_state.h", 
+      "include/grpc/impl/codegen/port_platform.h", 
+      "include/grpc/impl/codegen/time.h", 
       "include/grpc/support/alloc.h", 
       "include/grpc/support/atm.h", 
       "include/grpc/support/atm_gcc_atomic.h", 
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj
index 270fc89749d..f95f435b391 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj
@@ -147,6 +147,9 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\alloc.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_atomic.h" />
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
index c92a92fb9b1..e27f9755253 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
@@ -126,6 +126,15 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h">
+      <Filter>include\grpc\impl\codegen</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h">
+      <Filter>include\grpc\impl\codegen</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
+      <Filter>include\grpc\impl\codegen</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc\support\alloc.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
@@ -251,6 +260,12 @@
     <Filter Include="include\grpc">
       <UniqueIdentifier>{e6957ec1-85ba-6515-03c0-e12878045b1f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\grpc\impl">
+      <UniqueIdentifier>{4c72091a-872d-10da-2694-ce5a7b069a1f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\grpc\impl\codegen">
+      <UniqueIdentifier>{e52e0384-d0d3-1475-0d4e-11719aac8f2a}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\grpc\support">
       <UniqueIdentifier>{31c42000-3ed7-95e1-d076-df814b72cdee}</UniqueIdentifier>
     </Filter>