diff --git a/include/grpcpp/server_posix.h b/include/grpcpp/server_posix.h
index 7b46967a8ba..3d209cbc14f 100644
--- a/include/grpcpp/server_posix.h
+++ b/include/grpcpp/server_posix.h
@@ -21,4 +21,16 @@
 
 #include <grpcpp/server_posix_impl.h>
 
+namespace grpc {
+
+#ifdef GPR_SUPPORT_CHANNELS_FROM_FD
+
+static inline void AddInsecureChannelFromFd(Server* server, int fd) {
+  ::grpc_impl::AddInsecureChannelFromFd(server, fd);
+}
+
+#endif  // GPR_SUPPORT_CHANNELS_FROM_FD
+
+}  // namespace grpc
+
 #endif  // GRPCPP_SERVER_POSIX_H
diff --git a/src/cpp/common/resource_quota_cc.cc b/src/cpp/common/resource_quota_cc.cc
index 1ed92d7396d..276e5f79548 100644
--- a/src/cpp/common/resource_quota_cc.cc
+++ b/src/cpp/common/resource_quota_cc.cc
@@ -37,4 +37,4 @@ ResourceQuota& ResourceQuota::SetMaxThreads(int new_max_threads) {
   grpc_resource_quota_set_max_threads(impl_, new_max_threads);
   return *this;
 }
-}  // namespace grpc_impl
+}  // namespace grpc
diff --git a/src/cpp/server/server_posix.cc b/src/cpp/server/server_posix.cc
index 7c221ed036a..7b77e24bc0e 100644
--- a/src/cpp/server/server_posix.cc
+++ b/src/cpp/server/server_posix.cc
@@ -20,14 +20,14 @@
 
 #include <grpc/grpc_posix.h>
 
-namespace grpc {
+namespace grpc_impl {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 
-void AddInsecureChannelFromFd(Server* server, int fd) {
+void AddInsecureChannelFromFd(grpc::Server* server, int fd) {
   grpc_server_add_insecure_channel_from_fd(server->c_server(), nullptr, fd);
 }
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD
 
-}  // namespace grpc
+}  // namespace grpc_impl
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 367160a0ca9..9f17a25298a 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -995,7 +995,6 @@ include/grpcpp/impl/server_builder_plugin.h \
 include/grpcpp/impl/server_initializer.h \
 include/grpcpp/impl/service_type.h \
 include/grpcpp/resource_quota.h \
-include/grpcpp/resource_quota_impl.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/credentials.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4c1ba9d4f9d..c0078bf2764 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -997,7 +997,6 @@ include/grpcpp/impl/server_builder_plugin.h \
 include/grpcpp/impl/server_initializer.h \
 include/grpcpp/impl/service_type.h \
 include/grpcpp/resource_quota.h \
-include/grpcpp/resource_quota_impl.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/credentials.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index bcf2cf4f5ec..8adde9ec602 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -11411,7 +11411,6 @@
       "include/grpcpp/impl/server_initializer.h", 
       "include/grpcpp/impl/service_type.h", 
       "include/grpcpp/resource_quota.h", 
-      "include/grpcpp/resource_quota_impl.h", 
       "include/grpcpp/security/auth_context.h", 
       "include/grpcpp/security/auth_metadata_processor.h", 
       "include/grpcpp/security/credentials.h", 
@@ -11521,7 +11520,6 @@
       "include/grpcpp/impl/server_initializer.h", 
       "include/grpcpp/impl/service_type.h", 
       "include/grpcpp/resource_quota.h", 
-      "include/grpcpp/resource_quota_impl.h", 
       "include/grpcpp/security/auth_context.h", 
       "include/grpcpp/security/auth_metadata_processor.h", 
       "include/grpcpp/security/credentials.h",