diff --git a/Makefile b/Makefile
index 308796a9e8eeb7d7973e934cc1d7ad3ea099bc50..44a20e680686938bd5d3374c032a358489694e30 100644
--- a/Makefile
+++ b/Makefile
@@ -3595,16 +3595,6 @@ LIBGRPC_PLUGIN_SUPPORT_SRC = \
     src/compiler/python_generator.cc \
     src/compiler/ruby_generator.cc \
 
-PUBLIC_HEADERS_CXX += \
-    src/compiler/config.h \
-    src/compiler/cpp_generator.h \
-    src/compiler/cpp_generator_helpers.h \
-    src/compiler/generator_helpers.h \
-    src/compiler/python_generator.h \
-    src/compiler/ruby_generator.h \
-    src/compiler/ruby_generator_helpers-inl.h \
-    src/compiler/ruby_generator_map-inl.h \
-    src/compiler/ruby_generator_string-inl.h \
 
 LIBGRPC_PLUGIN_SUPPORT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_PLUGIN_SUPPORT_SRC))))
 
diff --git a/build.json b/build.json
index 0d53bd603189caad647d593c26930a03ac8546f2..2fa2ac9cdd872add60f38f63370db1f3fd3aad58 100644
--- a/build.json
+++ b/build.json
@@ -502,7 +502,7 @@
       "name": "grpc_plugin_support",
       "build": "protoc",
       "language": "c++",
-      "public_headers": [
+      "headers": [
         "src/compiler/config.h",
         "src/compiler/cpp_generator.h",
         "src/compiler/cpp_generator_helpers.h",