diff --git a/build.yaml b/build.yaml
index 4c9dbd046d3..fa4dd5a691f 100644
--- a/build.yaml
+++ b/build.yaml
@@ -776,6 +776,8 @@ filegroups:
   src:
   - src/cpp/ext/reflection.grpc.pb.cc
   - src/cpp/ext/reflection.pb.cc
+  uses:
+  - grpc++_codegen_proto
 libs:
 - name: gpr
   build: all
@@ -977,7 +979,6 @@ libs:
   - grpc++
   filegroups:
   - grpc++_reflection_proto
-  - grpc++_codegen_proto
 - name: grpc++_reflection_codegen
   build: private
   language: c++
diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py
index c028499ca63..28c1dc46d7f 100755
--- a/tools/run_tests/sanity/check_sources_and_headers.py
+++ b/tools/run_tests/sanity/check_sources_and_headers.py
@@ -55,7 +55,8 @@ def target_has_header(target, name):
   for dep in target['deps']:
     if target_has_header(get_target(dep), name):
       return True
-  if name == 'src/core/lib/profiling/stap_probes.h':
+  if name in ['src/core/lib/profiling/stap_probes.h',
+              'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h']:
     return True
   return False
 
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 451f535a2aa..87e5001c091 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -4360,7 +4360,6 @@
   {
     "deps": [
       "grpc++", 
-      "grpc++_codegen_proto", 
       "grpc++_reflection_proto"
     ], 
     "headers": [
@@ -6760,7 +6759,9 @@
     "type": "filegroup"
   }, 
   {
-    "deps": [], 
+    "deps": [
+      "grpc++_codegen_proto"
+    ], 
     "headers": [
       "include/grpc++/ext/reflection.grpc.pb.h", 
       "include/grpc++/ext/reflection.pb.h"