diff --git a/BUILD b/BUILD
index 1412b4ab0f4..eb00c40038a 100644
--- a/BUILD
+++ b/BUILD
@@ -1971,7 +1971,7 @@ grpc_cc_library(
     srcs = GRPCXX_SRCS,
     hdrs = GRPCXX_HDRS,
     language = "c++",
-    public_hdrs = GRPCXX_PUBLIC_HDRS + GRPC_SECURE_PUBLIC_HDRS,
+    public_hdrs = GRPCXX_PUBLIC_HDRS,
     deps = [
         "grpc++_codegen_base",
         "grpc_health_upb",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 080eeb929ab..ddeca03f468 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4338,7 +4338,6 @@ target_link_libraries(grpc++_unsecure
 )
 
 foreach(_hdr
-  include/grpc/grpc_security.h
   include/grpc++/alarm.h
   include/grpc++/channel.h
   include/grpc++/client_context.h
diff --git a/Makefile b/Makefile
index 9b380df9a7a..dc9bb0efd4a 100644
--- a/Makefile
+++ b/Makefile
@@ -6729,7 +6729,6 @@ LIBGRPC++_UNSECURE_SRC = \
     src/cpp/codegen/codegen_init.cc \
 
 PUBLIC_HEADERS_CXX += \
-    include/grpc/grpc_security.h \
     include/grpc++/alarm.h \
     include/grpc++/channel.h \
     include/grpc++/client_context.h \
diff --git a/build.yaml b/build.yaml
index 6e5cabe3242..adcec3728d5 100644
--- a/build.yaml
+++ b/build.yaml
@@ -321,8 +321,6 @@ filegroups:
   - grpc++_common
   - grpc++_codegen_base
 - name: grpc++_base_unsecure
-  public_headers:
-  - include/grpc/grpc_security.h
   deps:
   - grpc_unsecure
   uses: