diff --git a/BUILD b/BUILD
index 5e6e9f67c0547e53167725e9ca8e8aa8e408d37f..2980bb7dc5ea4e73839082b708ae82359b3c82c8 100644
--- a/BUILD
+++ b/BUILD
@@ -953,6 +953,7 @@ cc_library(
 cc_library(
   name = "grpc_plugin_support",
   srcs = [
+    "include/grpc++/impl/codegen/config.h",
     "include/grpc++/support/config.h",
     "include/grpc++/support/config_protobuf.h",
     "src/compiler/config.h",
diff --git a/build.yaml b/build.yaml
index b95bc03cfdf3b879cc3810a67cba39e6c3b259a5..dae0d583a1af75b8587801075cb4def5708e2b89 100644
--- a/build.yaml
+++ b/build.yaml
@@ -688,6 +688,7 @@ libs:
   build: protoc
   language: c++
   headers:
+  - include/grpc++/impl/codegen/config.h
   - include/grpc++/support/config.h
   - include/grpc++/support/config_protobuf.h
   - src/compiler/config.h
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 28bdedf487031280c083a474cd366a9b9d518012..456444271e178cee998111dd596d965af75ed4a2 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -4211,6 +4211,7 @@
   {
     "deps": [], 
     "headers": [
+      "include/grpc++/impl/codegen/config.h", 
       "include/grpc++/support/config.h", 
       "include/grpc++/support/config_protobuf.h", 
       "src/compiler/config.h", 
@@ -4230,6 +4231,7 @@
     "language": "c++", 
     "name": "grpc_plugin_support", 
     "src": [
+      "include/grpc++/impl/codegen/config.h", 
       "include/grpc++/support/config.h", 
       "include/grpc++/support/config_protobuf.h", 
       "src/compiler/config.h", 
diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
index 6a70001e0ece2721ecbd86e61af41f8f178b48a2..a7f8e3c2e8ff3fe1ba134b49106df21622e7c8c2 100644
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
@@ -147,6 +147,7 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config_protobuf.h" />
     <ClInclude Include="$(SolutionDir)\..\src\compiler\config.h" />
diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
index 133e1e33d9ca270e08be818ec1328943da5955e0..264c84a8311f19bfeb2807b6f944168d9b618cd0 100644
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
@@ -18,6 +18,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
@@ -72,6 +75,12 @@
     <Filter Include="include\grpc++">
       <UniqueIdentifier>{893c09ee-e315-e763-9d9d-37522ba2f51c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\grpc++\impl">
+      <UniqueIdentifier>{3e8c71a4-8a06-a577-2799-2224a1ad1f1b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\grpc++\impl\codegen">
+      <UniqueIdentifier>{ec2a6e26-915b-ba1b-4f59-f361dc01105c}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\grpc++\support">
       <UniqueIdentifier>{1c34d005-1ffb-8a31-881a-c6bb431cda69}</UniqueIdentifier>
     </Filter>