diff --git a/api/envoy/service/health/v3/hds.proto b/api/envoy/service/health/v3/hds.proto
index bb8781d5c3958..51266a64fa959 100644
--- a/api/envoy/service/health/v3/hds.proto
+++ b/api/envoy/service/health/v3/hds.proto
@@ -186,3 +186,8 @@ message HealthCheckSpecifier {
   // The default is 1 second.
   google.protobuf.Duration interval = 2;
 }
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message HdsDummy {
+}
diff --git a/api/envoy/service/health/v4alpha/hds.proto b/api/envoy/service/health/v4alpha/hds.proto
index 9ce239f5e9cf9..b84009c08c32e 100644
--- a/api/envoy/service/health/v4alpha/hds.proto
+++ b/api/envoy/service/health/v4alpha/hds.proto
@@ -190,3 +190,9 @@ message HealthCheckSpecifier {
   // The default is 1 second.
   google.protobuf.Duration interval = 2;
 }
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message HdsDummy {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.service.health.v3.HdsDummy";
+}
diff --git a/generated_api_shadow/envoy/service/health/v3/hds.proto b/generated_api_shadow/envoy/service/health/v3/hds.proto
index bb8781d5c3958..51266a64fa959 100644
--- a/generated_api_shadow/envoy/service/health/v3/hds.proto
+++ b/generated_api_shadow/envoy/service/health/v3/hds.proto
@@ -186,3 +186,8 @@ message HealthCheckSpecifier {
   // The default is 1 second.
   google.protobuf.Duration interval = 2;
 }
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message HdsDummy {
+}
diff --git a/generated_api_shadow/envoy/service/health/v4alpha/hds.proto b/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
index 1b2446b109d8b..53d2252ee54bb 100644
--- a/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
+++ b/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
@@ -191,3 +191,9 @@ message HealthCheckSpecifier {
   // The default is 1 second.
   google.protobuf.Duration interval = 2;
 }
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message HdsDummy {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.service.health.v3.HdsDummy";
+}
diff --git a/source/common/config/BUILD b/source/common/config/BUILD
index 1890b921b93dc..3e8b524d35be4 100644
--- a/source/common/config/BUILD
+++ b/source/common/config/BUILD
@@ -112,7 +112,6 @@ envoy_cc_library(
         "//source/common/common:token_bucket_impl_lib",
         "//source/common/grpc:common_lib",
         "//source/common/protobuf",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
@@ -172,7 +171,6 @@ envoy_cc_library(
         "//source/common/memory:utils_lib",
         "//source/common/protobuf",
         "@com_google_absl//absl/container:btree",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
@@ -205,7 +203,6 @@ envoy_cc_library(
         "//envoy/event:dispatcher_interface",
         "//envoy/grpc:async_client_interface",
         "//source/common/memory:utils_lib",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
@@ -231,7 +228,6 @@ envoy_cc_library(
         "//source/common/http:rest_api_fetcher_lib",
         "//source/common/protobuf",
         "//source/common/protobuf:utility_lib",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
@@ -277,15 +273,12 @@ envoy_cc_library(
     name = "protobuf_link_hacks",
     hdrs = ["protobuf_link_hacks.h"],
     deps = [
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
-        "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/cluster/v3:pkg_cc_proto",
-        "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/endpoint/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/extension/v3:pkg_cc_proto",
+        "@envoy_api//envoy/service/health/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/listener/v3:pkg_cc_proto",
-        "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/ratelimit/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/runtime/v3:pkg_cc_proto",
diff --git a/source/common/config/delta_subscription_state.h b/source/common/config/delta_subscription_state.h
index cafdbe0022ee5..9765a6736dc3a 100644
--- a/source/common/config/delta_subscription_state.h
+++ b/source/common/config/delta_subscription_state.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/config/subscription.h"
 #include "envoy/event/dispatcher.h"
 #include "envoy/grpc/status.h"
diff --git a/source/common/config/grpc_mux_impl.h b/source/common/config/grpc_mux_impl.h
index 57b4946099373..ec15658c72973 100644
--- a/source/common/config/grpc_mux_impl.h
+++ b/source/common/config/grpc_mux_impl.h
@@ -4,7 +4,6 @@
 #include <memory>
 #include <queue>
 
-#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/common/random_generator.h"
 #include "envoy/common/time.h"
 #include "envoy/config/grpc_mux.h"
diff --git a/source/common/config/http_subscription_impl.h b/source/common/config/http_subscription_impl.h
index 4672e45894882..d5f4d93948c8a 100644
--- a/source/common/config/http_subscription_impl.h
+++ b/source/common/config/http_subscription_impl.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/common/random_generator.h"
 #include "envoy/config/subscription.h"
 #include "envoy/event/dispatcher.h"
diff --git a/source/common/config/new_grpc_mux_impl.h b/source/common/config/new_grpc_mux_impl.h
index 98ded0dec357b..ff6a7c5f7d444 100644
--- a/source/common/config/new_grpc_mux_impl.h
+++ b/source/common/config/new_grpc_mux_impl.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/common/random_generator.h"
 #include "envoy/common/token_bucket.h"
 #include "envoy/config/grpc_mux.h"
diff --git a/source/common/config/protobuf_link_hacks.h b/source/common/config/protobuf_link_hacks.h
index de6e816e37b9a..991291789ef9a 100644
--- a/source/common/config/protobuf_link_hacks.h
+++ b/source/common/config/protobuf_link_hacks.h
@@ -1,21 +1,11 @@
 #pragma once
 
-#include "envoy/api/v2/cds.pb.h"
-#include "envoy/api/v2/eds.pb.h"
-#include "envoy/api/v2/lds.pb.h"
-#include "envoy/api/v2/rds.pb.h"
-#include "envoy/api/v2/srds.pb.h"
-#include "envoy/config/bootstrap/v2/bootstrap.pb.h"
 #include "envoy/service/cluster/v3/cds.pb.h"
-#include "envoy/service/discovery/v2/ads.pb.h"
-#include "envoy/service/discovery/v2/hds.pb.h"
-#include "envoy/service/discovery/v2/rtds.pb.h"
-#include "envoy/service/discovery/v2/sds.pb.h"
 #include "envoy/service/discovery/v3/ads.pb.h"
 #include "envoy/service/endpoint/v3/eds.pb.h"
 #include "envoy/service/extension/v3/config_discovery.pb.h"
+#include "envoy/service/health/v3/hds.pb.h"
 #include "envoy/service/listener/v3/lds.pb.h"
-#include "envoy/service/ratelimit/v2/rls.pb.h"
 #include "envoy/service/ratelimit/v3/rls.pb.h"
 #include "envoy/service/route/v3/rds.pb.h"
 #include "envoy/service/route/v3/srds.pb.h"
@@ -26,18 +16,6 @@
 
 namespace Envoy {
 
-// Hack to force linking of the service: https://github.com/google/protobuf/issues/4221.
-// This file should be included ONLY if this hack is required.
-const envoy::service::discovery::v2::AdsDummy _ads_dummy_v2;
-const envoy::service::ratelimit::v2::RateLimitRequest _rls_dummy_v2;
-const envoy::service::discovery::v2::SdsDummy _sds_dummy_v2;
-const envoy::service::discovery::v2::RtdsDummy _tds_dummy_v2;
-const envoy::api::v2::LdsDummy _lds_dummy_v2;
-const envoy::api::v2::RdsDummy _rds_dummy_v2;
-const envoy::api::v2::CdsDummy _cds_dummy_v2;
-const envoy::api::v2::EdsDummy _eds_dummy_v2;
-const envoy::api::v2::SrdsDummy _srds_dummy_v2;
-
 const envoy::service::discovery::v3::AdsDummy _ads_dummy_v3;
 const envoy::service::ratelimit::v3::RateLimitRequest _rls_dummy_v3;
 const envoy::service::secret::v3::SdsDummy _sds_dummy_v3;
@@ -48,19 +26,7 @@ const envoy::service::cluster::v3::CdsDummy _cds_dummy_v3;
 const envoy::service::endpoint::v3::EdsDummy _eds_dummy_v3;
 const envoy::service::route::v3::SrdsDummy _srds_dummy_v3;
 const envoy::service::extension::v3::EcdsDummy _ecds_dummy_v3;
-
-// With the v2 -> v3 migration there is another, related linking issue.
-// Symbols for v2 protos which headers are not included in any file in the codebase are being
-// dropped by the linker in some circumstances. For example, in the Envoy Mobile iOS build system.
-// Even though all v2 packages are included as a dependency in their corresponding v3 package, and
-// `always_link` is set for all proto bazel targets.
-// Further proof of this can be seen by way of counter example with the envoy.api.v2.Cluster type,
-// which is checked for by proto_descriptors.cc. This type **is** getting linked because its headers
-// is still included in cds_api_impl.cc. On the other side because the v2 hds header is not included
-// anywhere the v2 service type is getting dropped, and thus the descriptor is not present in the
-// descriptor pool.
-// https://github.com/envoyproxy/envoy/issues/9639
-const envoy::config::bootstrap::v2::Bootstrap _bootstrap_dummy_v2;
-const envoy::service::discovery::v2::Capability _hds_dummy_v2;
+const envoy::service::runtime::v3::RtdsDummy _rtds_dummy_v3;
+const envoy::service::health::v3::HdsDummy _hds_dummy_v3;
 
 } // namespace Envoy
diff --git a/source/common/router/BUILD b/source/common/router/BUILD
index 524bd27213f19..0a5ab46ba76c4 100644
--- a/source/common/router/BUILD
+++ b/source/common/router/BUILD
@@ -151,7 +151,6 @@ envoy_cc_library(
         "//source/common/init:target_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/router:route_config_update_impl_lib",
-        "@envoy_api//envoy/api/v2/route:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
@@ -189,7 +188,6 @@ envoy_cc_library(
         "//source/common/router:route_config_update_impl_lib",
         "//source/common/router:vhds_lib",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
@@ -237,7 +235,6 @@ envoy_cc_library(
         "//source/common/init:manager_lib",
         "//source/common/init:watcher_lib",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc
index 670b5e1268cc0..b779053275808 100644
--- a/source/common/router/rds_impl.cc
+++ b/source/common/router/rds_impl.cc
@@ -6,7 +6,6 @@
 #include <string>
 
 #include "envoy/admin/v3/config_dump.pb.h"
-#include "envoy/api/v2/route.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc
index 13cee6e2449e0..90133db6992d6 100644
--- a/source/common/router/scoped_rds.cc
+++ b/source/common/router/scoped_rds.cc
@@ -3,7 +3,6 @@
 #include <memory>
 
 #include "envoy/admin/v3/config_dump.pb.h"
-#include "envoy/api/v2/scoped_route.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/config/route/v3/scoped_route.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
diff --git a/source/common/router/vhds.cc b/source/common/router/vhds.cc
index b291b9af14f5d..b943391d511f7 100644
--- a/source/common/router/vhds.cc
+++ b/source/common/router/vhds.cc
@@ -5,7 +5,6 @@
 #include <memory>
 #include <string>
 
-#include "envoy/api/v2/route/route_components.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/config/subscription.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
diff --git a/source/common/secret/BUILD b/source/common/secret/BUILD
index 4dc783bc83e32..acef30c90ef7c 100644
--- a/source/common/secret/BUILD
+++ b/source/common/secret/BUILD
@@ -63,7 +63,6 @@ envoy_cc_library(
         "//source/common/protobuf:utility_lib",
         "//source/common/ssl:certificate_validation_context_config_impl_lib",
         "//source/common/ssl:tls_certificate_config_impl_lib",
-        "@envoy_api//envoy/api/v2/auth:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
diff --git a/source/common/secret/sds_api.cc b/source/common/secret/sds_api.cc
index 03dba0ccfe555..558798eeb74e7 100644
--- a/source/common/secret/sds_api.cc
+++ b/source/common/secret/sds_api.cc
@@ -1,6 +1,5 @@
 #include "source/common/secret/sds_api.h"
 
-#include "envoy/api/v2/auth/cert.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD
index 13dcb3846af3b..8ed241ffd125d 100644
--- a/source/common/upstream/BUILD
+++ b/source/common/upstream/BUILD
@@ -414,7 +414,6 @@ envoy_cc_library(
         "//source/common/network:resolver_lib",
         "//source/common/network:utility_lib",
         "//source/common/protobuf:utility_lib",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto",
diff --git a/source/common/upstream/eds.cc b/source/common/upstream/eds.cc
index c8ea0bb333487..6eb0bdb8b41f5 100644
--- a/source/common/upstream/eds.cc
+++ b/source/common/upstream/eds.cc
@@ -1,6 +1,5 @@
 #include "source/common/upstream/eds.h"
 
-#include "envoy/api/v2/endpoint.pb.h"
 #include "envoy/common/exception.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc
index e9346911355a0..28443fe69ea08 100644
--- a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc
+++ b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc
@@ -10,7 +10,7 @@ namespace AccessLoggers {
 namespace GrpcCommon {
 
 void validateProtoDescriptors() {
-  const auto method = "envoy.service.accesslog.v2.AccessLogService.StreamAccessLogs";
+  const auto method = "envoy.service.accesslog.v3.AccessLogService.StreamAccessLogs";
 
   RELEASE_ASSERT(Protobuf::DescriptorPool::generated_pool()->FindMethodByName(method) != nullptr,
                  "");
diff --git a/source/extensions/filters/http/oauth2/BUILD b/source/extensions/filters/http/oauth2/BUILD
index e0d8962aca9cb..1d2ba1439de7d 100644
--- a/source/extensions/filters/http/oauth2/BUILD
+++ b/source/extensions/filters/http/oauth2/BUILD
@@ -67,7 +67,6 @@ envoy_cc_extension(
         ":oauth_lib",
         "//envoy/registry",
         "//source/extensions/filters/http/common:factory_base_lib",
-        "@envoy_api//envoy/api/v2/auth:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/oauth2/v3alpha:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/filters/http/oauth2/config.cc b/source/extensions/filters/http/oauth2/config.cc
index ef8cfc364cb37..74bc5567504ad 100644
--- a/source/extensions/filters/http/oauth2/config.cc
+++ b/source/extensions/filters/http/oauth2/config.cc
@@ -4,7 +4,6 @@
 #include <memory>
 #include <string>
 
-#include "envoy/api/v2/auth/secret.pb.h"
 #include "envoy/common/exception.h"
 #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.validate.h"
 #include "envoy/registry/registry.h"
diff --git a/source/extensions/filters/http/squash/squash_filter.cc b/source/extensions/filters/http/squash/squash_filter.cc
index d15077455483e..e2db20a9f2d2e 100644
--- a/source/extensions/filters/http/squash/squash_filter.cc
+++ b/source/extensions/filters/http/squash/squash_filter.cc
@@ -91,7 +91,8 @@ void SquashFilterConfig::updateTemplateInValue(ProtobufWkt::Value& curvalue) {
  To interpolate an environment variable named ENV, add '{{ ENV }}' (without the
   quotes, with the spaces) to the template string.
 
-  See api/envoy/config/filter/http/squash/v2/squash.proto for the motivation on why this is needed.
+  See api/envoy/extensions/filters/http/squash/v3/squash.proto for the motivation on why this is
+ needed.
 */
 std::string SquashFilterConfig::replaceEnv(const std::string& attachment_template) {
   std::string s;
diff --git a/source/extensions/tracers/zipkin/span_buffer.h b/source/extensions/tracers/zipkin/span_buffer.h
index c1667c609078a..16927506ce5ff 100644
--- a/source/extensions/tracers/zipkin/span_buffer.h
+++ b/source/extensions/tracers/zipkin/span_buffer.h
@@ -24,7 +24,7 @@ class SpanBuffer {
    * the method allocateBuffer(size).
    *
    * @param version The selected Zipkin collector version. @see
-   * api/envoy/config/trace/v2/trace.proto.
+   * api/envoy/config/trace/v3/trace.proto.
    * @param shared_span_context To determine whether client and server spans will share the same
    * span context.
    */
@@ -35,7 +35,7 @@ class SpanBuffer {
    * Constructor that initializes a buffer with the given size.
    *
    * @param version The selected Zipkin collector version. @see
-   * api/envoy/config/trace/v2/trace.proto.
+   * api/envoy/config/trace/v3/trace.proto.
    * @param shared_span_context To determine whether client and server spans will share the same
    * span context.
    * @param size The desired buffer size.
diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
index 9e000cafd6601..59a5540361b37 100644
--- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
+++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
@@ -163,7 +163,7 @@ struct CollectorInfo {
   std::string endpoint_{DEFAULT_COLLECTOR_ENDPOINT};
 
   // The version of the collector. This is related to endpoint's supported payload specification and
-  // transport. Currently it defaults to envoy::config::trace::v2::ZipkinConfig::HTTP_JSON_V1. In
+  // transport. Currently it defaults to envoy::config::trace::v3::ZipkinConfig::HTTP_JSON_V1. In
   // the future, we will throw when collector_endpoint_version is not specified.
   envoy::config::trace::v3::ZipkinConfig::CollectorEndpointVersion version_{
       envoy::config::trace::v3::ZipkinConfig::hidden_envoy_deprecated_HTTP_JSON_V1};
diff --git a/source/server/proto_descriptors.cc b/source/server/proto_descriptors.cc
index d7043ff18feb1..6322ce7637162 100644
--- a/source/server/proto_descriptors.cc
+++ b/source/server/proto_descriptors.cc
@@ -12,25 +12,25 @@ namespace Server {
 
 void validateProtoDescriptors() {
   const auto methods = {
-      "envoy.api.v2.ClusterDiscoveryService.FetchClusters",
-      "envoy.api.v2.ClusterDiscoveryService.StreamClusters",
-      "envoy.api.v2.ClusterDiscoveryService.DeltaClusters",
-      "envoy.api.v2.EndpointDiscoveryService.FetchEndpoints",
-      "envoy.api.v2.EndpointDiscoveryService.StreamEndpoints",
-      "envoy.api.v2.EndpointDiscoveryService.DeltaEndpoints",
-      "envoy.api.v2.ListenerDiscoveryService.FetchListeners",
-      "envoy.api.v2.ListenerDiscoveryService.StreamListeners",
-      "envoy.api.v2.ListenerDiscoveryService.DeltaListeners",
-      "envoy.api.v2.RouteDiscoveryService.FetchRoutes",
-      "envoy.api.v2.RouteDiscoveryService.StreamRoutes",
-      "envoy.api.v2.RouteDiscoveryService.DeltaRoutes",
-      "envoy.service.discovery.v2.AggregatedDiscoveryService.StreamAggregatedResources",
-      "envoy.service.discovery.v2.AggregatedDiscoveryService.DeltaAggregatedResources",
-      "envoy.service.discovery.v2.HealthDiscoveryService.FetchHealthCheck",
-      "envoy.service.discovery.v2.HealthDiscoveryService.StreamHealthCheck",
-      "envoy.service.discovery.v2.RuntimeDiscoveryService.FetchRuntime",
-      "envoy.service.discovery.v2.RuntimeDiscoveryService.StreamRuntime",
-      "envoy.service.ratelimit.v2.RateLimitService.ShouldRateLimit",
+      "envoy.service.cluster.v3.ClusterDiscoveryService.FetchClusters",
+      "envoy.service.cluster.v3.ClusterDiscoveryService.StreamClusters",
+      "envoy.service.cluster.v3.ClusterDiscoveryService.DeltaClusters",
+      "envoy.service.discovery.v3.AggregatedDiscoveryService.StreamAggregatedResources",
+      "envoy.service.discovery.v3.AggregatedDiscoveryService.DeltaAggregatedResources",
+      "envoy.service.endpoint.v3.EndpointDiscoveryService.FetchEndpoints",
+      "envoy.service.endpoint.v3.EndpointDiscoveryService.StreamEndpoints",
+      "envoy.service.endpoint.v3.EndpointDiscoveryService.DeltaEndpoints",
+      "envoy.service.health.v3.HealthDiscoveryService.FetchHealthCheck",
+      "envoy.service.health.v3.HealthDiscoveryService.StreamHealthCheck",
+      "envoy.service.listener.v3.ListenerDiscoveryService.FetchListeners",
+      "envoy.service.listener.v3.ListenerDiscoveryService.StreamListeners",
+      "envoy.service.listener.v3.ListenerDiscoveryService.DeltaListeners",
+      "envoy.service.ratelimit.v3.RateLimitService.ShouldRateLimit",
+      "envoy.service.route.v3.RouteDiscoveryService.FetchRoutes",
+      "envoy.service.route.v3.RouteDiscoveryService.StreamRoutes",
+      "envoy.service.route.v3.RouteDiscoveryService.DeltaRoutes",
+      "envoy.service.runtime.v3.RuntimeDiscoveryService.StreamRuntime",
+      "envoy.service.runtime.v3.RuntimeDiscoveryService.FetchRuntime",
   };
 
   for (const auto& method : methods) {
diff --git a/test/common/config/BUILD b/test/common/config/BUILD
index aa0e857d6a77b..23f8b4dfc014c 100644
--- a/test/common/config/BUILD
+++ b/test/common/config/BUILD
@@ -154,6 +154,7 @@ envoy_cc_test(
         "//source/common/protobuf",
         "//source/common/stats:isolated_store_lib",
         "//test/common/stats:stat_test_utility_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks:common_lib",
         "//test/mocks/config:config_mocks",
         "//test/mocks/event:event_mocks",
@@ -180,6 +181,7 @@ envoy_cc_test(
         "//source/common/config:version_converter_lib",
         "//source/common/protobuf",
         "//test/common/stats:stat_test_utility_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks:common_lib",
         "//test/mocks/config:config_mocks",
         "//test/mocks/event:event_mocks",
@@ -191,6 +193,7 @@ envoy_cc_test(
         "//test/test_common:simulated_time_system_lib",
         "//test/test_common:test_runtime_lib",
         "//test/test_common:utility_lib",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
@@ -202,6 +205,7 @@ envoy_cc_test(
     deps = [
         "//source/common/config:grpc_stream_lib",
         "//test/common/stats:stat_test_utility_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks:common_lib",
         "//test/mocks/config:config_mocks",
         "//test/mocks/event:event_mocks",
@@ -218,6 +222,7 @@ envoy_cc_test(
     deps = [
         ":grpc_subscription_test_harness",
         "//source/common/buffer:zero_copy_input_stream_lib",
+        "//test/config:v2_link_hacks",
     ],
 )
 
@@ -254,11 +259,13 @@ envoy_cc_test_library(
         "//source/common/config:new_grpc_mux_lib",
         "//source/common/config:version_converter_lib",
         "//source/common/grpc:common_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks/config:config_mocks",
         "//test/mocks/event:event_mocks",
         "//test/mocks/grpc:grpc_mocks",
         "//test/mocks/local_info:local_info_mocks",
         "//test/mocks/runtime:runtime_mocks",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
@@ -270,6 +277,7 @@ envoy_cc_test(
     srcs = ["http_subscription_impl_test.cc"],
     deps = [
         ":http_subscription_test_harness",
+        "//test/config:v2_link_hacks",
     ],
 )
 
@@ -313,6 +321,7 @@ envoy_cc_test(
     deps = [
         "//source/common/config:subscription_factory_lib",
         "//source/common/config:xds_resource_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks/config:config_mocks",
         "//test/mocks/event:event_mocks",
         "//test/mocks/filesystem:filesystem_mocks",
@@ -339,6 +348,7 @@ envoy_cc_test(
         ":grpc_subscription_test_harness",
         ":http_subscription_test_harness",
         ":subscription_test_harness",
+        "//test/config:v2_link_hacks",
     ],
 )
 
@@ -357,6 +367,7 @@ envoy_cc_test(
     srcs = ["type_to_endpoint_test.cc"],
     deps = [
         "//source/common/config:type_to_endpoint_lib",
+        "//test/config:v2_link_hacks",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/service/route/v3:pkg_cc_proto",
     ],
diff --git a/test/common/config/delta_subscription_impl_test.cc b/test/common/config/delta_subscription_impl_test.cc
index 92e11a0f7f214..0ac5092aaaa5c 100644
--- a/test/common/config/delta_subscription_impl_test.cc
+++ b/test/common/config/delta_subscription_impl_test.cc
@@ -7,6 +7,7 @@
 #include "source/common/config/api_version.h"
 
 #include "test/common/config/delta_subscription_test_harness.h"
+#include "test/config/v2_link_hacks.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/test/common/config/delta_subscription_test_harness.h b/test/common/config/delta_subscription_test_harness.h
index e74e33f40230e..76c4e94b6cb96 100644
--- a/test/common/config/delta_subscription_test_harness.h
+++ b/test/common/config/delta_subscription_test_harness.h
@@ -2,6 +2,7 @@
 
 #include <queue>
 
+#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
diff --git a/test/common/config/grpc_mux_impl_test.cc b/test/common/config/grpc_mux_impl_test.cc
index 3eecdbb4f5dec..f68827e552c71 100644
--- a/test/common/config/grpc_mux_impl_test.cc
+++ b/test/common/config/grpc_mux_impl_test.cc
@@ -15,6 +15,7 @@
 #include "source/common/stats/isolated_store_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/mocks/common.h"
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/config/grpc_stream_test.cc b/test/common/config/grpc_stream_test.cc
index 1ae7e7a7c27b8..42d21afc5f032 100644
--- a/test/common/config/grpc_stream_test.cc
+++ b/test/common/config/grpc_stream_test.cc
@@ -4,6 +4,7 @@
 #include "source/common/protobuf/protobuf.h"
 
 #include "test/common/stats/stat_test_utility.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/mocks/common.h"
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/config/grpc_subscription_impl_test.cc b/test/common/config/grpc_subscription_impl_test.cc
index 74860c19e8593..63c34ef10fa78 100644
--- a/test/common/config/grpc_subscription_impl_test.cc
+++ b/test/common/config/grpc_subscription_impl_test.cc
@@ -1,4 +1,5 @@
 #include "test/common/config/grpc_subscription_test_harness.h"
+#include "test/config/v2_link_hacks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/config/http_subscription_impl_test.cc b/test/common/config/http_subscription_impl_test.cc
index e0fb0a8ece98e..e9199d236ead0 100644
--- a/test/common/config/http_subscription_impl_test.cc
+++ b/test/common/config/http_subscription_impl_test.cc
@@ -1,6 +1,7 @@
 #include <memory>
 
 #include "test/common/config/http_subscription_test_harness.h"
+#include "test/config/v2_link_hacks.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/config/new_grpc_mux_impl_test.cc b/test/common/config/new_grpc_mux_impl_test.cc
index ce917b39a0fc7..aee3d1d814f48 100644
--- a/test/common/config/new_grpc_mux_impl_test.cc
+++ b/test/common/config/new_grpc_mux_impl_test.cc
@@ -1,5 +1,6 @@
 #include <memory>
 
+#include "envoy/api/v2/discovery.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 #include "envoy/event/timer.h"
@@ -13,6 +14,7 @@
 #include "source/common/protobuf/protobuf.h"
 
 #include "test/common/stats/stat_test_utility.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/mocks/common.h"
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/config/subscription_factory_impl_test.cc b/test/common/config/subscription_factory_impl_test.cc
index 465ea24496245..e0be2e4105c3f 100644
--- a/test/common/config/subscription_factory_impl_test.cc
+++ b/test/common/config/subscription_factory_impl_test.cc
@@ -11,6 +11,7 @@
 #include "source/common/config/subscription_factory_impl.h"
 #include "source/common/config/xds_resource.h"
 
+#include "test/config/v2_link_hacks.h"
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/filesystem/mocks.h"
diff --git a/test/common/config/subscription_impl_test.cc b/test/common/config/subscription_impl_test.cc
index 4076319aa80e7..3000297b023a1 100644
--- a/test/common/config/subscription_impl_test.cc
+++ b/test/common/config/subscription_impl_test.cc
@@ -6,6 +6,7 @@
 #include "test/common/config/grpc_subscription_test_harness.h"
 #include "test/common/config/http_subscription_test_harness.h"
 #include "test/common/config/subscription_test_harness.h"
+#include "test/config/v2_link_hacks.h"
 
 using testing::InSequence;
 
diff --git a/test/common/config/type_to_endpoint_test.cc b/test/common/config/type_to_endpoint_test.cc
index 1dd24c0c03083..fa20d89088296 100644
--- a/test/common/config/type_to_endpoint_test.cc
+++ b/test/common/config/type_to_endpoint_test.cc
@@ -3,6 +3,8 @@
 
 #include "source/common/config/type_to_endpoint.h"
 
+#include "test/config/v2_link_hacks.h"
+
 #include "gtest/gtest.h"
 
 // API_NO_BOOST_FILE
diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD
index 84c54f4dfd2eb..f63c7800dd21f 100644
--- a/test/common/upstream/BUILD
+++ b/test/common/upstream/BUILD
@@ -42,6 +42,7 @@ envoy_cc_test(
         ":test_cluster_manager",
         "//source/common/router:context_lib",
         "//source/extensions/transport_sockets/tls:config",
+        "//test/config:v2_link_hacks",
         "//test/mocks/matcher:matcher_mocks",
         "//test/mocks/upstream:cds_api_mocks",
         "//test/mocks/upstream:cluster_priority_set_mocks",
diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc
index 28023040e9be6..7cedf710a1c76 100644
--- a/test/common/upstream/cluster_manager_impl_test.cc
+++ b/test/common/upstream/cluster_manager_impl_test.cc
@@ -10,6 +10,7 @@
 #include "source/extensions/transport_sockets/raw_buffer/config.h"
 
 #include "test/common/upstream/test_cluster_manager.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/mocks/http/conn_pool.h"
 #include "test/mocks/matcher/mocks.h"
 #include "test/mocks/upstream/cds_api.h"
diff --git a/test/config/BUILD b/test/config/BUILD
index fe8cf3472c9a0..9e5807cad1712 100644
--- a/test/config/BUILD
+++ b/test/config/BUILD
@@ -44,3 +44,15 @@ envoy_cc_test_library(
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],
 )
+
+envoy_cc_test_library(
+    name = "v2_link_hacks",
+    hdrs = ["v2_link_hacks.h"],
+    deps = [
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
+        "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
+        "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto",
+        "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto",
+    ],
+    alwayslink = 1,
+)
diff --git a/test/config/v2_link_hacks.h b/test/config/v2_link_hacks.h
new file mode 100644
index 0000000000000..63108af3435ae
--- /dev/null
+++ b/test/config/v2_link_hacks.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "envoy/api/v2/cds.pb.h"
+#include "envoy/api/v2/discovery.pb.h"
+#include "envoy/api/v2/eds.pb.h"
+#include "envoy/api/v2/lds.pb.h"
+#include "envoy/api/v2/rds.pb.h"
+#include "envoy/api/v2/srds.pb.h"
+#include "envoy/config/bootstrap/v2/bootstrap.pb.h"
+#include "envoy/service/discovery/v2/ads.pb.h"
+#include "envoy/service/discovery/v2/hds.pb.h"
+#include "envoy/service/discovery/v2/rtds.pb.h"
+#include "envoy/service/discovery/v2/sds.pb.h"
+#include "envoy/service/ratelimit/v2/rls.pb.h"
+
+namespace Envoy {
+
+// Hack to force linking of the service: https://github.com/google/protobuf/issues/4221.
+// This file should be included ONLY if this hack is required.
+const envoy::service::discovery::v2::AdsDummy _ads_dummy_v2;
+const envoy::service::ratelimit::v2::RateLimitRequest _rls_dummy_v2;
+const envoy::service::discovery::v2::SdsDummy _sds_dummy_v2;
+const envoy::service::discovery::v2::RtdsDummy _tds_dummy_v2;
+const envoy::api::v2::LdsDummy _lds_dummy_v2;
+const envoy::api::v2::RdsDummy _rds_dummy_v2;
+const envoy::api::v2::CdsDummy _cds_dummy_v2;
+const envoy::api::v2::EdsDummy _eds_dummy_v2;
+const envoy::api::v2::SrdsDummy _srds_dummy_v2;
+const envoy::config::bootstrap::v2::Bootstrap _bootstrap_dummy_v2;
+const envoy::service::discovery::v2::Capability _hds_dummy_v2;
+
+} // namespace Envoy
diff --git a/test/config_test/BUILD b/test/config_test/BUILD
index 929fa0eb3b5c7..c8837d38b666e 100644
--- a/test/config_test/BUILD
+++ b/test/config_test/BUILD
@@ -26,6 +26,7 @@ envoy_cc_test(
     deps = [
         ":config_test_lib",
         "//source/common/filesystem:filesystem_lib",
+        "//test/config:v2_link_hacks",
         "//test/test_common:environment_lib",
         "//test/test_common:utility_lib",
     ],
diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc
index 37e0d561d8dc1..fc5b0892008c9 100644
--- a/test/config_test/example_configs_test.cc
+++ b/test/config_test/example_configs_test.cc
@@ -1,5 +1,6 @@
 #include "source/common/filesystem/filesystem_impl.h"
 
+#include "test/config/v2_link_hacks.h"
 #include "test/config_test/config_test.h"
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD
index 4a9fd793aaa9b..03a8652831fe2 100644
--- a/test/extensions/clusters/aggregate/BUILD
+++ b/test/extensions/clusters/aggregate/BUILD
@@ -66,6 +66,7 @@ envoy_extension_cc_test(
         "//source/extensions/filters/network/tcp_proxy:config",
         "//source/extensions/retry/priority/previous_priorities:config",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/integration:http_integration_lib",
         "//test/integration:integration_lib",
         "//test/mocks/runtime:runtime_mocks",
diff --git a/test/extensions/clusters/aggregate/cluster_integration_test.cc b/test/extensions/clusters/aggregate/cluster_integration_test.cc
index e7dbaecfbbccb..aad8f587b5a32 100644
--- a/test/extensions/clusters/aggregate/cluster_integration_test.cc
+++ b/test/extensions/clusters/aggregate/cluster_integration_test.cc
@@ -7,6 +7,7 @@
 #include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/integration/utility.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/extensions/filters/http/lua/BUILD b/test/extensions/filters/http/lua/BUILD
index f19e5db07370a..1ed127f9a5dc8 100644
--- a/test/extensions/filters/http/lua/BUILD
+++ b/test/extensions/filters/http/lua/BUILD
@@ -52,6 +52,7 @@ envoy_extension_cc_test(
     extension_names = ["envoy.filters.http.lua"],
     deps = [
         "//source/extensions/filters/http/lua:config",
+        "//test/config:v2_link_hacks",
         "//test/integration:http_integration_lib",
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
diff --git a/test/extensions/filters/http/lua/lua_integration_test.cc b/test/extensions/filters/http/lua/lua_integration_test.cc
index db22ad91a3dd9..118af6ae224b5 100644
--- a/test/extensions/filters/http/lua/lua_integration_test.cc
+++ b/test/extensions/filters/http/lua/lua_integration_test.cc
@@ -1,6 +1,7 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/test_common/utility.h"
 
diff --git a/test/integration/BUILD b/test/integration/BUILD
index aed12c5b25dda..220c7b3a0f3e5 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -37,6 +37,7 @@ envoy_cc_test_library(
         "//source/common/version:version_lib",
         "//source/extensions/filters/network/redis_proxy:config",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/test_common:network_utility_lib",
         "//test/test_common:resources_lib",
         "//test/test_common:utility_lib",
@@ -120,6 +121,7 @@ envoy_cc_test(
         "//source/common/config:protobuf_link_hacks",
         "//source/common/protobuf:utility_lib",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks/runtime:runtime_mocks",
         "//test/test_common:network_utility_lib",
         "//test/test_common:resources_lib",
@@ -213,6 +215,7 @@ envoy_cc_test(
         "//source/common/config:protobuf_link_hacks",
         "//source/common/protobuf:utility_lib",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/mocks/runtime:runtime_mocks",
         "//test/test_common:network_utility_lib",
         "//test/test_common:resources_lib",
@@ -301,6 +304,7 @@ envoy_cc_test(
         "//source/common/config:api_version_lib",
         "//source/common/protobuf",
         "//source/extensions/http/original_ip_detection/xff:config",
+        "//test/config:v2_link_hacks",
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
@@ -1134,6 +1138,7 @@ envoy_cc_test(
     deps = [
         ":http_integration_lib",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "@envoy_api//envoy/service/runtime/v3:pkg_cc_proto",
     ],
 )
@@ -1144,6 +1149,7 @@ envoy_cc_test(
     deps = [
         ":http_integration_lib",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/integration/filters:set_is_terminal_filter_config_proto_cc_proto",
         "//test/integration/filters:set_is_terminal_filter_lib",
         "//test/integration/filters:set_response_code_filter_config_proto_cc_proto",
@@ -1239,6 +1245,7 @@ envoy_cc_test(
         ":http_integration_lib",
         "//envoy/registry",
         "//source/common/grpc:common_lib",
+        "//test/config:v2_link_hacks",
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
@@ -1573,6 +1580,7 @@ envoy_cc_test(
         "//source/common/network:connection_lib",
         "//source/common/network:utility_lib",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/test_common:resources_lib",
         "//test/test_common:utility_lib",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
@@ -1598,6 +1606,7 @@ envoy_cc_test(
         "//source/extensions/filters/http/health_check:config",
         "//source/extensions/filters/network/tcp_proxy:config",
         "//test/common/grpc:grpc_client_integration_lib",
+        "//test/config:v2_link_hacks",
         "//test/integration/filters:address_restore_listener_filter_lib",
         "//test/test_common:network_utility_lib",
         "//test/test_common:resources_lib",
@@ -1695,6 +1704,7 @@ envoy_cc_test(
         ":http_integration_lib",
         ":integration_lib",
         "//test/common/http/http2:http2_frame",
+        "//test/config:v2_link_hacks",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc
index f8045c2ad55a7..26405c9ac9669 100644
--- a/test/integration/ads_integration_test.cc
+++ b/test/integration/ads_integration_test.cc
@@ -13,6 +13,7 @@
 #include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/ads_integration.h"
 #include "test/integration/http_integration.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/cds_integration_test.cc b/test/integration/cds_integration_test.cc
index 4b62e426f0215..3da9db2c5e897 100644
--- a/test/integration/cds_integration_test.cc
+++ b/test/integration/cds_integration_test.cc
@@ -8,6 +8,7 @@
 #include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/integration/utility.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/integration/extension_discovery_integration_test.cc b/test/integration/extension_discovery_integration_test.cc
index ded9093dccbb9..c4e9237e1f8c0 100644
--- a/test/integration/extension_discovery_integration_test.cc
+++ b/test/integration/extension_discovery_integration_test.cc
@@ -4,6 +4,7 @@
 #include "envoy/service/extension/v3/config_discovery.pb.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/filters/set_is_terminal_filter_config.pb.h"
 #include "test/integration/filters/set_response_code_filter_config.pb.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc
index 0abf8213f4d4e..b82ce208251f3 100644
--- a/test/integration/header_integration_test.cc
+++ b/test/integration/header_integration_test.cc
@@ -11,6 +11,7 @@
 #include "source/common/http/exception.h"
 #include "source/common/protobuf/protobuf.h"
 
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/test_common/network_utility.h"
 #include "test/test_common/resources.h"
diff --git a/test/integration/health_check_integration_test.cc b/test/integration/health_check_integration_test.cc
index c0ea0fea9a742..7c271d70af8e6 100644
--- a/test/integration/health_check_integration_test.cc
+++ b/test/integration/health_check_integration_test.cc
@@ -5,6 +5,7 @@
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/common/http/http2/http2_frame.h"
 #include "test/common/upstream/utility.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 
 #include "gtest/gtest.h"
diff --git a/test/integration/listener_lds_integration_test.cc b/test/integration/listener_lds_integration_test.cc
index 55a2c00a797f8..1582060b53be8 100644
--- a/test/integration/listener_lds_integration_test.cc
+++ b/test/integration/listener_lds_integration_test.cc
@@ -12,6 +12,7 @@
 #include "source/common/config/version_converter.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/test_common/network_utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/integration/rtds_integration_test.cc b/test/integration/rtds_integration_test.cc
index 114b24a67957f..98e4489abf586 100644
--- a/test/integration/rtds_integration_test.cc
+++ b/test/integration/rtds_integration_test.cc
@@ -1,6 +1,7 @@
 #include "envoy/service/runtime/v3/rtds.pb.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/test_common/utility.h"
 
diff --git a/test/integration/scoped_rds_integration_test.cc b/test/integration/scoped_rds_integration_test.cc
index 6daa40e230a84..11184f160f4d0 100644
--- a/test/integration/scoped_rds_integration_test.cc
+++ b/test/integration/scoped_rds_integration_test.cc
@@ -10,6 +10,7 @@
 #include "source/common/config/version_converter.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/test_common/printers.h"
 #include "test/test_common/resources.h"
diff --git a/test/integration/sds_generic_secret_integration_test.cc b/test/integration/sds_generic_secret_integration_test.cc
index 581870cab2c74..5d9c64c921b2b 100644
--- a/test/integration/sds_generic_secret_integration_test.cc
+++ b/test/integration/sds_generic_secret_integration_test.cc
@@ -9,6 +9,7 @@
 #include "source/common/config/datasource.h"
 #include "source/common/grpc/common.h"
 
+#include "test/config/v2_link_hacks.h"
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/http_integration.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/vhds_integration_test.cc b/test/integration/vhds_integration_test.cc
index 3af21e7945fea..8edd51e96e8b0 100644
--- a/test/integration/vhds_integration_test.cc
+++ b/test/integration/vhds_integration_test.cc
@@ -8,6 +8,7 @@
 #include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/http_integration.h"
 #include "test/integration/utility.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/server/BUILD b/test/server/BUILD
index 04d1e2248ff63..5e50e3cbacb4d 100644
--- a/test/server/BUILD
+++ b/test/server/BUILD
@@ -420,6 +420,7 @@ envoy_cc_test(
         "//source/server:server_lib",
         "//test/common/config:dummy_config_proto_cc_proto",
         "//test/common/stats:stat_test_utility_lib",
+        "//test/config:v2_link_hacks",
         "//test/integration:integration_lib",
         "//test/mocks/server:bootstrap_extension_factory_mocks",
         "//test/mocks/server:fatal_action_factory_mocks",
diff --git a/test/server/server_test.cc b/test/server/server_test.cc
index 6ccd6b64da714..7410ee5595bdf 100644
--- a/test/server/server_test.cc
+++ b/test/server/server_test.cc
@@ -18,6 +18,7 @@
 
 #include "test/common/config/dummy_config.pb.h"
 #include "test/common/stats/stat_test_utility.h"
+#include "test/config/v2_link_hacks.h"
 #include "test/integration/server.h"
 #include "test/mocks/server/bootstrap_extension_factory.h"
 #include "test/mocks/server/fatal_action_factory.h"