diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
index f33c92c943df7..c312d1f6f2e5f 100644
--- a/bazel/envoy_build_system.bzl
+++ b/bazel/envoy_build_system.bzl
@@ -12,7 +12,6 @@ load(
     _envoy_cc_posix_library = "envoy_cc_posix_library",
     _envoy_cc_posix_without_linux_library = "envoy_cc_posix_without_linux_library",
     _envoy_cc_win32_library = "envoy_cc_win32_library",
-    _envoy_include_prefix = "envoy_include_prefix",
     _envoy_proto_library = "envoy_proto_library",
 )
 load(
@@ -225,7 +224,6 @@ envoy_cc_linux_library = _envoy_cc_linux_library
 envoy_cc_posix_library = _envoy_cc_posix_library
 envoy_cc_posix_without_linux_library = _envoy_cc_posix_without_linux_library
 envoy_cc_win32_library = _envoy_cc_win32_library
-envoy_include_prefix = _envoy_include_prefix
 envoy_proto_library = _envoy_proto_library
 
 # Test wrappers (from envoy_test.bzl)
diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl
index 30d5106edb8e2..a6e77598f912d 100644
--- a/bazel/envoy_library.bzl
+++ b/bazel/envoy_library.bzl
@@ -82,6 +82,7 @@ def envoy_cc_library(
         tags = [],
         deps = [],
         strip_include_prefix = None,
+        include_prefix = None,
         textual_hdrs = None,
         defines = []):
     if tcmalloc_dep:
@@ -96,7 +97,7 @@ def envoy_cc_library(
         tags = tags,
         textual_hdrs = textual_hdrs,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
-            repository + "//include/envoy/common:base_includes",
+            repository + "//envoy/common:base_includes",
             repository + "//source/common/common:fmt_lib",
             envoy_external_dep_path("abseil_flat_hash_map"),
             envoy_external_dep_path("abseil_flat_hash_set"),
@@ -104,10 +105,10 @@ def envoy_cc_library(
             envoy_external_dep_path("spdlog"),
             envoy_external_dep_path("fmtlib"),
         ],
-        include_prefix = envoy_include_prefix(native.package_name()),
         alwayslink = 1,
         linkstatic = envoy_linkstatic(),
         strip_include_prefix = strip_include_prefix,
+        include_prefix = include_prefix,
         defines = defines,
     )
 
@@ -121,6 +122,7 @@ def envoy_cc_library(
         tags = ["nocompdb"] + tags,
         deps = [":" + name],
         strip_include_prefix = strip_include_prefix,
+        include_prefix = include_prefix,
     )
 
 # Used to specify a library that only builds on POSIX
@@ -185,14 +187,6 @@ def envoy_cc_win32_library(name, srcs = [], hdrs = [], **kargs):
         **kargs
     )
 
-# Transform the package path (e.g. include/envoy/common) into a path for
-# exporting the package headers at (e.g. envoy/common). Source files can then
-# include using this path scheme (e.g. #include "envoy/common/time.h").
-def envoy_include_prefix(path):
-    if path.startswith("source/") or path.startswith("include/"):
-        return "/".join(path.split("/")[1:])
-    return None
-
 # Envoy proto targets should be specified with this function.
 def envoy_proto_library(name, external_deps = [], **kwargs):
     api_cc_py_proto_library(
diff --git a/bazel/external/quiche.genrule_cmd b/bazel/external/quiche.genrule_cmd
index b67f4dc74bdad..43f17a517e408 100644
--- a/bazel/external/quiche.genrule_cmd
+++ b/bazel/external/quiche.genrule_cmd
@@ -47,10 +47,10 @@ cat <<EOF >sed_commands
 /^#include/ s!"epoll_server/!"quiche/epoll_server/!
 
 # The above global substitutions will prepend "quiche" to the platform code which we want to undo.
-/^#include/ s!"quiche/common/quic/platform/!"common/quic/platform/!
+/^#include/ s!"quiche/common/quic/platform/!"source/common/quic/platform/!
 
 # Use envoy specific implementations for below platform APIs.
-/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"common/quic/platform/quiche_logging_impl.h!
+/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"source/common/quic/platform/quiche_logging_impl.h!
 
 # The reset platform APIs use the QUICHE default implementations.
 /^#include/ s!"quiche_platform_impl/!"quiche/common/platform/default/quiche_platform_impl/!
diff --git a/ci/filter_example_setup.sh b/ci/filter_example_setup.sh
index 0d0cd1f602805..5ef74fa491195 100644
--- a/ci/filter_example_setup.sh
+++ b/ci/filter_example_setup.sh
@@ -5,7 +5,7 @@
 set -e
 
 # This is the hash on https://github.com/envoyproxy/envoy-filter-example.git we pin to.
-ENVOY_FILTER_EXAMPLE_GITSHA="dfdc226d44d1b7c300e6e691e2e8ada98b045edb"
+ENVOY_FILTER_EXAMPLE_GITSHA="ac6a66a4a1c08138ccc03c23aafc9637b2df55a1"
 ENVOY_FILTER_EXAMPLE_SRCDIR="${BUILD_DIR}/envoy-filter-example"
 
 # shellcheck disable=SC2034
diff --git a/include/envoy/access_log/BUILD b/envoy/access_log/BUILD
similarity index 55%
rename from include/envoy/access_log/BUILD
rename to envoy/access_log/BUILD
index 6bf20375270a9..c9578cb50311d 100644
--- a/include/envoy/access_log/BUILD
+++ b/envoy/access_log/BUILD
@@ -12,10 +12,10 @@ envoy_cc_library(
     name = "access_log_interface",
     hdrs = ["access_log.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/protobuf",
     ],
 )
diff --git a/include/envoy/access_log/access_log.h b/envoy/access_log/access_log.h
similarity index 98%
rename from include/envoy/access_log/access_log.h
rename to envoy/access_log/access_log.h
index 23a4bb0631864..5c8d952877d43 100644
--- a/include/envoy/access_log/access_log.h
+++ b/envoy/access_log/access_log.h
@@ -8,7 +8,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace AccessLog {
diff --git a/include/envoy/api/BUILD b/envoy/api/BUILD
similarity index 59%
rename from include/envoy/api/BUILD
rename to envoy/api/BUILD
index 36736838c6d80..55e267505ee54 100644
--- a/include/envoy/api/BUILD
+++ b/envoy/api/BUILD
@@ -12,12 +12,12 @@ envoy_cc_library(
     name = "api_interface",
     hdrs = ["api.h"],
     deps = [
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:scaled_range_timer_manager_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/server:process_context_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:scaled_range_timer_manager_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/server:process_context_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
diff --git a/include/envoy/api/api.h b/envoy/api/api.h
similarity index 100%
rename from include/envoy/api/api.h
rename to envoy/api/api.h
diff --git a/include/envoy/api/io_error.h b/envoy/api/io_error.h
similarity index 100%
rename from include/envoy/api/io_error.h
rename to envoy/api/io_error.h
diff --git a/include/envoy/api/os_sys_calls.h b/envoy/api/os_sys_calls.h
similarity index 100%
rename from include/envoy/api/os_sys_calls.h
rename to envoy/api/os_sys_calls.h
diff --git a/include/envoy/api/os_sys_calls_common.h b/envoy/api/os_sys_calls_common.h
similarity index 100%
rename from include/envoy/api/os_sys_calls_common.h
rename to envoy/api/os_sys_calls_common.h
diff --git a/include/envoy/api/os_sys_calls_hot_restart.h b/envoy/api/os_sys_calls_hot_restart.h
similarity index 100%
rename from include/envoy/api/os_sys_calls_hot_restart.h
rename to envoy/api/os_sys_calls_hot_restart.h
diff --git a/include/envoy/api/os_sys_calls_linux.h b/envoy/api/os_sys_calls_linux.h
similarity index 100%
rename from include/envoy/api/os_sys_calls_linux.h
rename to envoy/api/os_sys_calls_linux.h
diff --git a/include/envoy/buffer/BUILD b/envoy/buffer/BUILD
similarity index 89%
rename from include/envoy/buffer/BUILD
rename to envoy/buffer/BUILD
index 9367bedb85ecb..3b9157d06f5fd 100644
--- a/include/envoy/buffer/BUILD
+++ b/envoy/buffer/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
         "abseil_inlined_vector",
     ],
     deps = [
-        "//include/envoy/api:os_sys_calls_interface",
+        "//envoy/api:os_sys_calls_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:byte_order_lib",
         "//source/common/common:utility_lib",
diff --git a/include/envoy/buffer/buffer.h b/envoy/buffer/buffer.h
similarity index 99%
rename from include/envoy/buffer/buffer.h
rename to envoy/buffer/buffer.h
index 2ac7674e37668..a4029715e6c7b 100644
--- a/include/envoy/buffer/buffer.h
+++ b/envoy/buffer/buffer.h
@@ -10,9 +10,9 @@
 #include "envoy/common/platform.h"
 #include "envoy/common/pure.h"
 
-#include "common/common/assert.h"
-#include "common/common/byte_order.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/inlined_vector.h"
 #include "absl/strings/string_view.h"
diff --git a/include/envoy/common/BUILD b/envoy/common/BUILD
similarity index 91%
rename from include/envoy/common/BUILD
rename to envoy/common/BUILD
index f831dcd62708b..d7e0130cf1f13 100644
--- a/include/envoy/common/BUILD
+++ b/envoy/common/BUILD
@@ -18,15 +18,14 @@ envoy_basic_cc_library(
         "pure.h",
     ],
     external_deps = ["abseil_optional"],
-    include_prefix = "envoy/common",
 )
 
 envoy_cc_library(
     name = "conn_pool_interface",
     hdrs = ["conn_pool.h"],
     deps = [
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/upstream:upstream_interface",
     ],
 )
 
diff --git a/include/envoy/common/backoff_strategy.h b/envoy/common/backoff_strategy.h
similarity index 100%
rename from include/envoy/common/backoff_strategy.h
rename to envoy/common/backoff_strategy.h
diff --git a/include/envoy/common/callback.h b/envoy/common/callback.h
similarity index 100%
rename from include/envoy/common/callback.h
rename to envoy/common/callback.h
diff --git a/include/envoy/common/conn_pool.h b/envoy/common/conn_pool.h
similarity index 100%
rename from include/envoy/common/conn_pool.h
rename to envoy/common/conn_pool.h
diff --git a/include/envoy/common/crypto/BUILD b/envoy/common/crypto/BUILD
similarity index 100%
rename from include/envoy/common/crypto/BUILD
rename to envoy/common/crypto/BUILD
diff --git a/include/envoy/common/crypto/crypto.h b/envoy/common/crypto/crypto.h
similarity index 100%
rename from include/envoy/common/crypto/crypto.h
rename to envoy/common/crypto/crypto.h
diff --git a/include/envoy/common/exception.h b/envoy/common/exception.h
similarity index 100%
rename from include/envoy/common/exception.h
rename to envoy/common/exception.h
diff --git a/include/envoy/common/interval_set.h b/envoy/common/interval_set.h
similarity index 100%
rename from include/envoy/common/interval_set.h
rename to envoy/common/interval_set.h
diff --git a/include/envoy/common/matchers.h b/envoy/common/matchers.h
similarity index 100%
rename from include/envoy/common/matchers.h
rename to envoy/common/matchers.h
diff --git a/include/envoy/common/mutex_tracer.h b/envoy/common/mutex_tracer.h
similarity index 100%
rename from include/envoy/common/mutex_tracer.h
rename to envoy/common/mutex_tracer.h
diff --git a/include/envoy/common/optref.h b/envoy/common/optref.h
similarity index 100%
rename from include/envoy/common/optref.h
rename to envoy/common/optref.h
diff --git a/include/envoy/common/platform.h b/envoy/common/platform.h
similarity index 100%
rename from include/envoy/common/platform.h
rename to envoy/common/platform.h
diff --git a/include/envoy/common/pure.h b/envoy/common/pure.h
similarity index 100%
rename from include/envoy/common/pure.h
rename to envoy/common/pure.h
diff --git a/include/envoy/common/random_generator.h b/envoy/common/random_generator.h
similarity index 97%
rename from include/envoy/common/random_generator.h
rename to envoy/common/random_generator.h
index ed4c079d2fb03..b0e4257bcb169 100644
--- a/include/envoy/common/random_generator.h
+++ b/envoy/common/random_generator.h
@@ -6,7 +6,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 namespace Envoy {
 namespace Random {
diff --git a/include/envoy/common/regex.h b/envoy/common/regex.h
similarity index 100%
rename from include/envoy/common/regex.h
rename to envoy/common/regex.h
diff --git a/include/envoy/common/resource.h b/envoy/common/resource.h
similarity index 100%
rename from include/envoy/common/resource.h
rename to envoy/common/resource.h
diff --git a/include/envoy/common/scope_tracker.h b/envoy/common/scope_tracker.h
similarity index 100%
rename from include/envoy/common/scope_tracker.h
rename to envoy/common/scope_tracker.h
diff --git a/include/envoy/common/time.h b/envoy/common/time.h
similarity index 100%
rename from include/envoy/common/time.h
rename to envoy/common/time.h
diff --git a/include/envoy/common/token_bucket.h b/envoy/common/token_bucket.h
similarity index 100%
rename from include/envoy/common/token_bucket.h
rename to envoy/common/token_bucket.h
diff --git a/include/envoy/compression/compressor/BUILD b/envoy/compression/compressor/BUILD
similarity index 76%
rename from include/envoy/compression/compressor/BUILD
rename to envoy/compression/compressor/BUILD
index 6632229aaed46..7b767df2e1894 100644
--- a/include/envoy/compression/compressor/BUILD
+++ b/envoy/compression/compressor/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "compressor_interface",
     hdrs = ["compressor.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -29,7 +29,7 @@ envoy_cc_library(
     hdrs = ["config.h"],
     deps = [
         ":compressor_factory_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
diff --git a/include/envoy/compression/compressor/compressor.h b/envoy/compression/compressor/compressor.h
similarity index 100%
rename from include/envoy/compression/compressor/compressor.h
rename to envoy/compression/compressor/compressor.h
diff --git a/include/envoy/compression/compressor/config.h b/envoy/compression/compressor/config.h
similarity index 100%
rename from include/envoy/compression/compressor/config.h
rename to envoy/compression/compressor/config.h
diff --git a/include/envoy/compression/compressor/factory.h b/envoy/compression/compressor/factory.h
similarity index 100%
rename from include/envoy/compression/compressor/factory.h
rename to envoy/compression/compressor/factory.h
diff --git a/include/envoy/compression/decompressor/BUILD b/envoy/compression/decompressor/BUILD
similarity index 76%
rename from include/envoy/compression/decompressor/BUILD
rename to envoy/compression/decompressor/BUILD
index 156d81d52356f..f3c32382d59a9 100644
--- a/include/envoy/compression/decompressor/BUILD
+++ b/envoy/compression/decompressor/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     hdrs = ["config.h"],
     deps = [
         ":decompressor_factory_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
 
@@ -30,6 +30,6 @@ envoy_cc_library(
     name = "decompressor_interface",
     hdrs = ["decompressor.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
diff --git a/include/envoy/compression/decompressor/config.h b/envoy/compression/decompressor/config.h
similarity index 100%
rename from include/envoy/compression/decompressor/config.h
rename to envoy/compression/decompressor/config.h
diff --git a/include/envoy/compression/decompressor/decompressor.h b/envoy/compression/decompressor/decompressor.h
similarity index 100%
rename from include/envoy/compression/decompressor/decompressor.h
rename to envoy/compression/decompressor/decompressor.h
diff --git a/include/envoy/compression/decompressor/factory.h b/envoy/compression/decompressor/factory.h
similarity index 100%
rename from include/envoy/compression/decompressor/factory.h
rename to envoy/compression/decompressor/factory.h
diff --git a/include/envoy/config/BUILD b/envoy/config/BUILD
similarity index 89%
rename from include/envoy/config/BUILD
rename to envoy/config/BUILD
index e01486c8d0f09..cb8b6a9ce6cf1 100644
--- a/include/envoy/config/BUILD
+++ b/envoy/config/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     hdrs = ["config_provider.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf",
     ],
@@ -24,7 +24,7 @@ envoy_cc_library(
     hdrs = ["config_provider_manager.h"],
     deps = [
         ":config_provider_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/protobuf",
     ],
 )
@@ -33,7 +33,7 @@ envoy_cc_library(
     name = "context_provider_interface",
     hdrs = ["context_provider.h"],
     deps = [
-        "//include/envoy/common:callback",
+        "//envoy/common:callback",
         "@com_github_cncf_udpa//xds/core/v3:pkg_cc_proto",
     ],
 )
@@ -49,7 +49,7 @@ envoy_cc_library(
     hdrs = ["grpc_mux.h"],
     deps = [
         ":subscription_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/common:cleanup_lib",
         "//source/common/protobuf",
     ],
@@ -69,7 +69,7 @@ envoy_cc_library(
     name = "subscription_interface",
     hdrs = ["subscription.h"],
     deps = [
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/config:api_type_oracle_lib",
         "//source/common/protobuf",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
diff --git a/include/envoy/config/config_provider.h b/envoy/config/config_provider.h
similarity index 98%
rename from include/envoy/config/config_provider.h
rename to envoy/config/config_provider.h
index dbc5b579c626a..bda6cc5871c20 100644
--- a/include/envoy/config/config_provider.h
+++ b/envoy/config/config_provider.h
@@ -4,8 +4,8 @@
 
 #include "envoy/common/time.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/config/config_provider_manager.h b/envoy/config/config_provider_manager.h
similarity index 98%
rename from include/envoy/config/config_provider_manager.h
rename to envoy/config/config_provider_manager.h
index eaf6d4d0ec114..fbb98c14605cb 100644
--- a/include/envoy/config/config_provider_manager.h
+++ b/envoy/config/config_provider_manager.h
@@ -5,7 +5,7 @@
 #include "envoy/config/config_provider.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/include/envoy/config/context_provider.h b/envoy/config/context_provider.h
similarity index 100%
rename from include/envoy/config/context_provider.h
rename to envoy/config/context_provider.h
diff --git a/include/envoy/config/extension_config_provider.h b/envoy/config/extension_config_provider.h
similarity index 97%
rename from include/envoy/config/extension_config_provider.h
rename to envoy/config/extension_config_provider.h
index 182670f523dbb..6524f10270881 100644
--- a/include/envoy/config/extension_config_provider.h
+++ b/envoy/config/extension_config_provider.h
@@ -2,7 +2,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/config/grpc_mux.h b/envoy/config/grpc_mux.h
similarity index 98%
rename from include/envoy/config/grpc_mux.h
rename to envoy/config/grpc_mux.h
index 57befc93e01ca..0139cb3d95243 100644
--- a/include/envoy/config/grpc_mux.h
+++ b/envoy/config/grpc_mux.h
@@ -7,8 +7,8 @@
 #include "envoy/config/subscription.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/cleanup.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/include/envoy/config/subscription.h b/envoy/config/subscription.h
similarity index 99%
rename from include/envoy/config/subscription.h
rename to envoy/config/subscription.h
index 22385e6eb4877..8f7ba87c20365 100644
--- a/include/envoy/config/subscription.h
+++ b/envoy/config/subscription.h
@@ -8,7 +8,7 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/include/envoy/config/subscription_factory.h b/envoy/config/subscription_factory.h
similarity index 100%
rename from include/envoy/config/subscription_factory.h
rename to envoy/config/subscription_factory.h
diff --git a/include/envoy/config/typed_config.h b/envoy/config/typed_config.h
similarity index 94%
rename from include/envoy/config/typed_config.h
rename to envoy/config/typed_config.h
index 49cc2c1f3416c..e75a841d26e74 100644
--- a/include/envoy/config/typed_config.h
+++ b/envoy/config/typed_config.h
@@ -2,8 +2,8 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/include/envoy/config/typed_metadata.h b/envoy/config/typed_metadata.h
similarity index 98%
rename from include/envoy/config/typed_metadata.h
rename to envoy/config/typed_metadata.h
index 9406e6a99baa8..059c563c782e9 100644
--- a/include/envoy/config/typed_metadata.h
+++ b/envoy/config/typed_metadata.h
@@ -6,7 +6,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/config/typed_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/include/envoy/event/BUILD b/envoy/event/BUILD
similarity index 68%
rename from include/envoy/event/BUILD
rename to envoy/event/BUILD
index acc8770007d00..ec7695f542820 100644
--- a/include/envoy/event/BUILD
+++ b/envoy/event/BUILD
@@ -29,17 +29,17 @@ envoy_cc_library(
         ":schedulable_cb_interface",
         ":signal_interface",
         ":timer_interface",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/filesystem:watcher_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/server:watchdog_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/common:time_interface",
+        "//envoy/filesystem:watcher_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/server:watchdog_interface",
+        "//envoy/thread:thread_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -81,6 +81,6 @@ envoy_cc_library(
     hdrs = ["timer.h"],
     deps = [
         ":schedulable_cb_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
     ],
 )
diff --git a/include/envoy/event/deferred_deletable.h b/envoy/event/deferred_deletable.h
similarity index 100%
rename from include/envoy/event/deferred_deletable.h
rename to envoy/event/deferred_deletable.h
diff --git a/include/envoy/event/dispatcher.h b/envoy/event/dispatcher.h
similarity index 100%
rename from include/envoy/event/dispatcher.h
rename to envoy/event/dispatcher.h
diff --git a/include/envoy/event/dispatcher_thread_deletable.h b/envoy/event/dispatcher_thread_deletable.h
similarity index 100%
rename from include/envoy/event/dispatcher_thread_deletable.h
rename to envoy/event/dispatcher_thread_deletable.h
diff --git a/include/envoy/event/file_event.h b/envoy/event/file_event.h
similarity index 100%
rename from include/envoy/event/file_event.h
rename to envoy/event/file_event.h
diff --git a/include/envoy/event/scaled_range_timer_manager.h b/envoy/event/scaled_range_timer_manager.h
similarity index 97%
rename from include/envoy/event/scaled_range_timer_manager.h
rename to envoy/event/scaled_range_timer_manager.h
index 8b91ec5758fce..d7e86dc542d93 100644
--- a/include/envoy/event/scaled_range_timer_manager.h
+++ b/envoy/event/scaled_range_timer_manager.h
@@ -4,7 +4,7 @@
 #include "envoy/event/scaled_timer.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 #include "absl/types/variant.h"
 
diff --git a/include/envoy/event/scaled_timer.h b/envoy/event/scaled_timer.h
similarity index 98%
rename from include/envoy/event/scaled_timer.h
rename to envoy/event/scaled_timer.h
index 0d05c79614260..bfc06b87973ed 100644
--- a/include/envoy/event/scaled_timer.h
+++ b/envoy/event/scaled_timer.h
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <ostream>
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/variant.h"
diff --git a/include/envoy/event/schedulable_cb.h b/envoy/event/schedulable_cb.h
similarity index 100%
rename from include/envoy/event/schedulable_cb.h
rename to envoy/event/schedulable_cb.h
diff --git a/include/envoy/event/signal.h b/envoy/event/signal.h
similarity index 100%
rename from include/envoy/event/signal.h
rename to envoy/event/signal.h
diff --git a/include/envoy/event/timer.h b/envoy/event/timer.h
similarity index 100%
rename from include/envoy/event/timer.h
rename to envoy/event/timer.h
diff --git a/include/envoy/filesystem/BUILD b/envoy/filesystem/BUILD
similarity index 75%
rename from include/envoy/filesystem/BUILD
rename to envoy/filesystem/BUILD
index 94d5405b122b9..e4349eba0d179 100644
--- a/include/envoy/filesystem/BUILD
+++ b/envoy/filesystem/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "filesystem_interface",
     hdrs = ["filesystem.h"],
     deps = [
-        "//include/envoy/api:io_error_interface",
-        "//include/envoy/api:os_sys_calls_interface",
+        "//envoy/api:io_error_interface",
+        "//envoy/api:os_sys_calls_interface",
     ],
 )
 
diff --git a/include/envoy/filesystem/filesystem.h b/envoy/filesystem/filesystem.h
similarity index 100%
rename from include/envoy/filesystem/filesystem.h
rename to envoy/filesystem/filesystem.h
diff --git a/include/envoy/filesystem/watcher.h b/envoy/filesystem/watcher.h
similarity index 100%
rename from include/envoy/filesystem/watcher.h
rename to envoy/filesystem/watcher.h
diff --git a/include/envoy/filter/http/BUILD b/envoy/filter/http/BUILD
similarity index 59%
rename from include/envoy/filter/http/BUILD
rename to envoy/filter/http/BUILD
index 5a76c4ba7b9dc..887967fd5e8c4 100644
--- a/include/envoy/filter/http/BUILD
+++ b/envoy/filter/http/BUILD
@@ -12,10 +12,10 @@ envoy_cc_library(
     name = "filter_config_provider_interface",
     hdrs = ["filter_config_provider.h"],
     deps = [
-        "//include/envoy/config:extension_config_provider_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:extension_config_provider_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/server:filter_config_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/filter/http/filter_config_provider.h b/envoy/filter/http/filter_config_provider.h
similarity index 100%
rename from include/envoy/filter/http/filter_config_provider.h
rename to envoy/filter/http/filter_config_provider.h
diff --git a/include/envoy/formatter/BUILD b/envoy/formatter/BUILD
similarity index 61%
rename from include/envoy/formatter/BUILD
rename to envoy/formatter/BUILD
index df87c4cbac10b..f630c6607644c 100644
--- a/include/envoy/formatter/BUILD
+++ b/envoy/formatter/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "substitution_formatter_interface",
     hdrs = ["substitution_formatter.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stream_info:stream_info_interface",
     ],
 )
diff --git a/include/envoy/formatter/substitution_formatter.h b/envoy/formatter/substitution_formatter.h
similarity index 100%
rename from include/envoy/formatter/substitution_formatter.h
rename to envoy/formatter/substitution_formatter.h
diff --git a/include/envoy/grpc/BUILD b/envoy/grpc/BUILD
similarity index 67%
rename from include/envoy/grpc/BUILD
rename to envoy/grpc/BUILD
index 07d87ce33d193..0d782aee76e54 100644
--- a/include/envoy/grpc/BUILD
+++ b/envoy/grpc/BUILD
@@ -14,10 +14,10 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":status",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf",
     ],
@@ -28,7 +28,7 @@ envoy_cc_library(
     hdrs = ["async_client_manager.h"],
     deps = [
         ":async_client_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -37,8 +37,8 @@ envoy_cc_library(
     name = "context_interface",
     hdrs = ["context.h"],
     deps = [
-        "//include/envoy/http:context_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:context_interface",
+        "//envoy/upstream:upstream_interface",
     ],
 )
 
@@ -49,8 +49,8 @@ envoy_cc_library(
         "grpc",
     ],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/api:api_interface",
+        "//envoy/config:typed_config_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/grpc/async_client.h b/envoy/grpc/async_client.h
similarity index 98%
rename from include/envoy/grpc/async_client.h
rename to envoy/grpc/async_client.h
index bba3d106df00d..09caee17099f7 100644
--- a/include/envoy/grpc/async_client.h
+++ b/envoy/grpc/async_client.h
@@ -9,8 +9,8 @@
 #include "envoy/http/header_map.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/grpc/async_client_manager.h b/envoy/grpc/async_client_manager.h
similarity index 100%
rename from include/envoy/grpc/async_client_manager.h
rename to envoy/grpc/async_client_manager.h
diff --git a/include/envoy/grpc/context.h b/envoy/grpc/context.h
similarity index 100%
rename from include/envoy/grpc/context.h
rename to envoy/grpc/context.h
diff --git a/include/envoy/grpc/google_grpc_creds.h b/envoy/grpc/google_grpc_creds.h
similarity index 100%
rename from include/envoy/grpc/google_grpc_creds.h
rename to envoy/grpc/google_grpc_creds.h
diff --git a/include/envoy/grpc/status.h b/envoy/grpc/status.h
similarity index 100%
rename from include/envoy/grpc/status.h
rename to envoy/grpc/status.h
diff --git a/include/envoy/http/BUILD b/envoy/http/BUILD
similarity index 66%
rename from include/envoy/http/BUILD
rename to envoy/http/BUILD
index de8f76446a1dd..dab2c3fab66c1 100644
--- a/include/envoy/http/BUILD
+++ b/envoy/http/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "alternate_protocols_cache_interface",
     hdrs = ["alternate_protocols_cache.h"],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -29,8 +29,8 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":message_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
@@ -43,10 +43,10 @@ envoy_cc_library(
         ":header_map_interface",
         ":metadata_interface",
         ":protocol_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/grpc:status",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/grpc:status",
+        "//envoy/network:address_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/http:status_lib",
     ],
 )
@@ -54,7 +54,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "codes_interface",
     hdrs = ["codes.h"],
-    deps = ["//include/envoy/stats:stats_interface"],
+    deps = ["//envoy/stats:stats_interface"],
 )
 
 envoy_cc_library(
@@ -62,9 +62,9 @@ envoy_cc_library(
     hdrs = ["conn_pool.h"],
     deps = [
         ":codec_interface",
-        "//include/envoy/common:conn_pool_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/common:conn_pool_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/upstream:upstream_interface",
     ],
 )
 
@@ -84,15 +84,15 @@ envoy_cc_library(
     deps = [
         ":codec_interface",
         ":header_map_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:status",
-        "//include/envoy/matcher:matcher_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/stream_info:stream_info_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:status",
+        "//envoy/matcher:matcher_interface",
+        "//envoy/router:router_interface",
+        "//envoy/ssl:connection_interface",
+        "//envoy/stream_info:stream_info_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/common:scope_tracked_object_stack",
     ],
 )
@@ -102,8 +102,8 @@ envoy_cc_library(
     hdrs = ["hash_policy.h"],
     deps = [
         ":header_map_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/network:address_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -125,7 +125,7 @@ envoy_cc_library(
     hdrs = ["message.h"],
     deps = [
         ":header_map_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -150,7 +150,7 @@ envoy_cc_library(
     hdrs = ["request_id_extension.h"],
     deps = [
         ":header_map_interface",
-        "//include/envoy/tracing:trace_reason_interface",
+        "//envoy/tracing:trace_reason_interface",
     ],
 )
 
@@ -158,7 +158,7 @@ envoy_cc_library(
     name = "header_formatter_interface",
     hdrs = ["header_formatter.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
     ],
 )
 
@@ -168,8 +168,8 @@ envoy_cc_library(
     deps = [
         ":codes_interface",
         ":header_map_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/network:address_interface",
+        "//envoy/server:factory_context_interface",
     ],
 )
diff --git a/include/envoy/http/alternate_protocols_cache.h b/envoy/http/alternate_protocols_cache.h
similarity index 100%
rename from include/envoy/http/alternate_protocols_cache.h
rename to envoy/http/alternate_protocols_cache.h
diff --git a/include/envoy/http/api_listener.h b/envoy/http/api_listener.h
similarity index 100%
rename from include/envoy/http/api_listener.h
rename to envoy/http/api_listener.h
diff --git a/include/envoy/http/async_client.h b/envoy/http/async_client.h
similarity index 99%
rename from include/envoy/http/async_client.h
rename to envoy/http/async_client.h
index b38eabc2d76c0..81058137ce6a3 100644
--- a/include/envoy/http/async_client.h
+++ b/envoy/http/async_client.h
@@ -9,7 +9,7 @@
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/http/codec.h b/envoy/http/codec.h
similarity index 99%
rename from include/envoy/http/codec.h
rename to envoy/http/codec.h
index 67b1bc95ce813..606fe1d5bde46 100644
--- a/include/envoy/http/codec.h
+++ b/envoy/http/codec.h
@@ -14,7 +14,7 @@
 #include "envoy/network/address.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/http/status.h"
+#include "source/common/http/status.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/include/envoy/http/codes.h b/envoy/http/codes.h
similarity index 100%
rename from include/envoy/http/codes.h
rename to envoy/http/codes.h
diff --git a/include/envoy/http/conn_pool.h b/envoy/http/conn_pool.h
similarity index 100%
rename from include/envoy/http/conn_pool.h
rename to envoy/http/conn_pool.h
diff --git a/include/envoy/http/context.h b/envoy/http/context.h
similarity index 100%
rename from include/envoy/http/context.h
rename to envoy/http/context.h
diff --git a/include/envoy/http/filter.h b/envoy/http/filter.h
similarity index 99%
rename from include/envoy/http/filter.h
rename to envoy/http/filter.h
index 3d15d9735da19..e677c85e1b7de 100644
--- a/include/envoy/http/filter.h
+++ b/envoy/http/filter.h
@@ -18,7 +18,7 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/scope_tracked_object_stack.h"
+#include "source/common/common/scope_tracked_object_stack.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/http/hash_policy.h b/envoy/http/hash_policy.h
similarity index 100%
rename from include/envoy/http/hash_policy.h
rename to envoy/http/hash_policy.h
diff --git a/include/envoy/http/header_formatter.h b/envoy/http/header_formatter.h
similarity index 100%
rename from include/envoy/http/header_formatter.h
rename to envoy/http/header_formatter.h
diff --git a/include/envoy/http/header_map.h b/envoy/http/header_map.h
similarity index 99%
rename from include/envoy/http/header_map.h
rename to envoy/http/header_map.h
index 2567a95b6935f..202f2e492f449 100644
--- a/include/envoy/http/header_map.h
+++ b/envoy/http/header_map.h
@@ -12,9 +12,9 @@
 #include "envoy/common/pure.h"
 #include "envoy/http/header_formatter.h"
 
-#include "common/common/assert.h"
-#include "common/common/hash.h"
-#include "common/common/macros.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/macros.h"
 
 #include "absl/container/inlined_vector.h"
 #include "absl/strings/string_view.h"
diff --git a/include/envoy/http/message.h b/envoy/http/message.h
similarity index 100%
rename from include/envoy/http/message.h
rename to envoy/http/message.h
diff --git a/include/envoy/http/metadata_interface.h b/envoy/http/metadata_interface.h
similarity index 100%
rename from include/envoy/http/metadata_interface.h
rename to envoy/http/metadata_interface.h
diff --git a/include/envoy/http/original_ip_detection.h b/envoy/http/original_ip_detection.h
similarity index 100%
rename from include/envoy/http/original_ip_detection.h
rename to envoy/http/original_ip_detection.h
diff --git a/include/envoy/http/protocol.h b/envoy/http/protocol.h
similarity index 100%
rename from include/envoy/http/protocol.h
rename to envoy/http/protocol.h
diff --git a/include/envoy/http/query_params.h b/envoy/http/query_params.h
similarity index 100%
rename from include/envoy/http/query_params.h
rename to envoy/http/query_params.h
diff --git a/include/envoy/http/request_id_extension.h b/envoy/http/request_id_extension.h
similarity index 100%
rename from include/envoy/http/request_id_extension.h
rename to envoy/http/request_id_extension.h
diff --git a/include/envoy/init/BUILD b/envoy/init/BUILD
similarity index 100%
rename from include/envoy/init/BUILD
rename to envoy/init/BUILD
diff --git a/include/envoy/init/manager.h b/envoy/init/manager.h
similarity index 100%
rename from include/envoy/init/manager.h
rename to envoy/init/manager.h
diff --git a/include/envoy/init/target.h b/envoy/init/target.h
similarity index 100%
rename from include/envoy/init/target.h
rename to envoy/init/target.h
diff --git a/include/envoy/init/watcher.h b/envoy/init/watcher.h
similarity index 100%
rename from include/envoy/init/watcher.h
rename to envoy/init/watcher.h
diff --git a/include/envoy/json/BUILD b/envoy/json/BUILD
similarity index 100%
rename from include/envoy/json/BUILD
rename to envoy/json/BUILD
diff --git a/include/envoy/json/json_object.h b/envoy/json/json_object.h
similarity index 100%
rename from include/envoy/json/json_object.h
rename to envoy/json/json_object.h
diff --git a/include/envoy/local_info/BUILD b/envoy/local_info/BUILD
similarity index 64%
rename from include/envoy/local_info/BUILD
rename to envoy/local_info/BUILD
index 20cf5b66d0bbe..31ee44aa746ed 100644
--- a/include/envoy/local_info/BUILD
+++ b/envoy/local_info/BUILD
@@ -12,9 +12,9 @@ envoy_cc_library(
     name = "local_info_interface",
     hdrs = ["local_info.h"],
     deps = [
-        "//include/envoy/config:context_provider_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/stats:symbol_table_interface",
+        "//envoy/config:context_provider_interface",
+        "//envoy/network:address_interface",
+        "//envoy/stats:symbol_table_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/local_info/local_info.h b/envoy/local_info/local_info.h
similarity index 100%
rename from include/envoy/local_info/local_info.h
rename to envoy/local_info/local_info.h
diff --git a/include/envoy/matcher/BUILD b/envoy/matcher/BUILD
similarity index 78%
rename from include/envoy/matcher/BUILD
rename to envoy/matcher/BUILD
index fadfc109afb0c..e04a38f51cfb5 100644
--- a/include/envoy/matcher/BUILD
+++ b/envoy/matcher/BUILD
@@ -16,8 +16,8 @@ envoy_cc_library(
         "abseil_hash",
     ],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/protobuf:message_validator_interface",
         "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
diff --git a/include/envoy/matcher/matcher.h b/envoy/matcher/matcher.h
similarity index 100%
rename from include/envoy/matcher/matcher.h
rename to envoy/matcher/matcher.h
diff --git a/include/envoy/network/BUILD b/envoy/network/BUILD
similarity index 72%
rename from include/envoy/network/BUILD
rename to envoy/network/BUILD
index 32239faccff61..10a3458c687ac 100644
--- a/include/envoy/network/BUILD
+++ b/envoy/network/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "address_interface",
     hdrs = ["address.h"],
     deps = [
-        "//include/envoy/api:os_sys_calls_interface",
+        "//envoy/api:os_sys_calls_interface",
     ],
 )
 
@@ -24,10 +24,10 @@ envoy_cc_library(
         ":address_interface",
         ":filter_interface",
         ":listen_socket_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/ssl:connection_interface",
+        "//envoy/stream_info:stream_info_interface",
     ],
 )
 
@@ -38,7 +38,7 @@ envoy_cc_library(
         ":connection_balancer_interface",
         ":listen_socket_interface",
         ":listener_interface",
-        "//include/envoy/ssl:context_interface",
+        "//envoy/ssl:context_interface",
         "//source/common/common:interval_value",
     ],
 )
@@ -50,17 +50,17 @@ envoy_cc_library(
         ":address_interface",
         ":io_handle_interface",
         ":socket_interface",
-        "//include/envoy/api:io_error_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/api:io_error_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
     ],
 )
 
 envoy_cc_library(
     name = "dns_interface",
     hdrs = ["dns.h"],
-    deps = ["//include/envoy/network:address_interface"],
+    deps = ["//envoy/network:address_interface"],
 )
 
 envoy_cc_library(
@@ -79,9 +79,9 @@ envoy_cc_library(
     deps = [
         ":listen_socket_interface",
         ":transport_socket_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/stream_info:stream_info_interface",
-        "//include/envoy/upstream:host_description_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/stream_info:stream_info_interface",
+        "//envoy/upstream:host_description_interface",
         "//source/common/protobuf",
     ],
 )
@@ -101,9 +101,9 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":address_interface",
-        "//include/envoy/api:io_error_interface",
-        "//include/envoy/api:os_sys_calls_interface",
-        "//include/envoy/event:file_event_interface",
+        "//envoy/api:io_error_interface",
+        "//envoy/api:os_sys_calls_interface",
+        "//envoy/event:file_event_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -123,7 +123,7 @@ envoy_cc_library(
     hdrs = ["socket_interface.h"],
     deps = [
         ":socket_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
     ],
 )
 
@@ -133,7 +133,7 @@ envoy_cc_library(
     deps = [
         ":io_handle_interface",
         ":socket_interface",
-        "//include/envoy/common:scope_tracker_interface",
+        "//envoy/common:scope_tracker_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -145,8 +145,8 @@ envoy_cc_library(
         ":io_handle_interface",
         ":post_io_action_interface",
         ":proxy_protocol_options_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/ssl:connection_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/ssl:connection_interface",
     ],
 )
 
@@ -172,10 +172,10 @@ envoy_cc_library(
         ":connection_interface",
         ":listen_socket_interface",
         ":udp_packet_writer_handler_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/common:resource_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/common:resource_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:interval_value",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
@@ -187,7 +187,7 @@ envoy_cc_library(
     hdrs = ["resolver.h"],
     deps = [
         ":address_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/network/address.h b/envoy/network/address.h
similarity index 100%
rename from include/envoy/network/address.h
rename to envoy/network/address.h
diff --git a/include/envoy/network/connection.h b/envoy/network/connection.h
similarity index 100%
rename from include/envoy/network/connection.h
rename to envoy/network/connection.h
diff --git a/include/envoy/network/connection_balancer.h b/envoy/network/connection_balancer.h
similarity index 100%
rename from include/envoy/network/connection_balancer.h
rename to envoy/network/connection_balancer.h
diff --git a/include/envoy/network/connection_handler.h b/envoy/network/connection_handler.h
similarity index 99%
rename from include/envoy/network/connection_handler.h
rename to envoy/network/connection_handler.h
index 1a3ba831bfc9b..e5c48a359ed6a 100644
--- a/include/envoy/network/connection_handler.h
+++ b/envoy/network/connection_handler.h
@@ -10,7 +10,7 @@
 #include "envoy/network/listener.h"
 #include "envoy/ssl/context.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/include/envoy/network/dns.h b/envoy/network/dns.h
similarity index 100%
rename from include/envoy/network/dns.h
rename to envoy/network/dns.h
diff --git a/include/envoy/network/drain_decision.h b/envoy/network/drain_decision.h
similarity index 100%
rename from include/envoy/network/drain_decision.h
rename to envoy/network/drain_decision.h
diff --git a/include/envoy/network/exception.h b/envoy/network/exception.h
similarity index 100%
rename from include/envoy/network/exception.h
rename to envoy/network/exception.h
diff --git a/include/envoy/network/filter.h b/envoy/network/filter.h
similarity index 99%
rename from include/envoy/network/filter.h
rename to envoy/network/filter.h
index 88b94cc664ab6..f14a11bf53c8a 100644
--- a/include/envoy/network/filter.h
+++ b/envoy/network/filter.h
@@ -8,7 +8,7 @@
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/upstream/host_description.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 
diff --git a/include/envoy/network/hash_policy.h b/envoy/network/hash_policy.h
similarity index 100%
rename from include/envoy/network/hash_policy.h
rename to envoy/network/hash_policy.h
diff --git a/include/envoy/network/io_handle.h b/envoy/network/io_handle.h
similarity index 100%
rename from include/envoy/network/io_handle.h
rename to envoy/network/io_handle.h
diff --git a/include/envoy/network/listen_socket.h b/envoy/network/listen_socket.h
similarity index 100%
rename from include/envoy/network/listen_socket.h
rename to envoy/network/listen_socket.h
diff --git a/include/envoy/network/listener.h b/envoy/network/listener.h
similarity index 99%
rename from include/envoy/network/listener.h
rename to envoy/network/listener.h
index 73dbced7fa93a..d4377278d59a2 100644
--- a/include/envoy/network/listener.h
+++ b/envoy/network/listener.h
@@ -17,7 +17,7 @@
 #include "envoy/network/udp_packet_writer_handler.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/include/envoy/network/post_io_action.h b/envoy/network/post_io_action.h
similarity index 100%
rename from include/envoy/network/post_io_action.h
rename to envoy/network/post_io_action.h
diff --git a/include/envoy/network/proxy_protocol.h b/envoy/network/proxy_protocol.h
similarity index 100%
rename from include/envoy/network/proxy_protocol.h
rename to envoy/network/proxy_protocol.h
diff --git a/include/envoy/network/resolver.h b/envoy/network/resolver.h
similarity index 100%
rename from include/envoy/network/resolver.h
rename to envoy/network/resolver.h
diff --git a/include/envoy/network/socket.h b/envoy/network/socket.h
similarity index 100%
rename from include/envoy/network/socket.h
rename to envoy/network/socket.h
diff --git a/include/envoy/network/socket_interface.h b/envoy/network/socket_interface.h
similarity index 100%
rename from include/envoy/network/socket_interface.h
rename to envoy/network/socket_interface.h
diff --git a/include/envoy/network/transport_socket.h b/envoy/network/transport_socket.h
similarity index 100%
rename from include/envoy/network/transport_socket.h
rename to envoy/network/transport_socket.h
diff --git a/include/envoy/network/udp_packet_writer_handler.h b/envoy/network/udp_packet_writer_handler.h
similarity index 100%
rename from include/envoy/network/udp_packet_writer_handler.h
rename to envoy/network/udp_packet_writer_handler.h
diff --git a/include/envoy/protobuf/BUILD b/envoy/protobuf/BUILD
similarity index 100%
rename from include/envoy/protobuf/BUILD
rename to envoy/protobuf/BUILD
diff --git a/include/envoy/protobuf/message_validator.h b/envoy/protobuf/message_validator.h
similarity index 97%
rename from include/envoy/protobuf/message_validator.h
rename to envoy/protobuf/message_validator.h
index 8ec4dccb46e3b..6a2f02c274c7d 100644
--- a/include/envoy/protobuf/message_validator.h
+++ b/envoy/protobuf/message_validator.h
@@ -3,7 +3,7 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/pure.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/include/envoy/ratelimit/BUILD b/envoy/ratelimit/BUILD
similarity index 55%
rename from include/envoy/ratelimit/BUILD
rename to envoy/ratelimit/BUILD
index 96c325023043c..42e2cd2b6b237 100644
--- a/include/envoy/ratelimit/BUILD
+++ b/envoy/ratelimit/BUILD
@@ -12,10 +12,10 @@ envoy_cc_library(
     name = "ratelimit_interface",
     hdrs = ["ratelimit.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/stream_info:stream_info_interface",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/ratelimit/ratelimit.h b/envoy/ratelimit/ratelimit.h
similarity index 100%
rename from include/envoy/ratelimit/ratelimit.h
rename to envoy/ratelimit/ratelimit.h
diff --git a/include/envoy/registry/BUILD b/envoy/registry/BUILD
similarity index 100%
rename from include/envoy/registry/BUILD
rename to envoy/registry/BUILD
diff --git a/include/envoy/registry/registry.h b/envoy/registry/registry.h
similarity index 98%
rename from include/envoy/registry/registry.h
rename to envoy/registry/registry.h
index b90e86ca52f3a..1bc909f23c76b 100644
--- a/include/envoy/registry/registry.h
+++ b/envoy/registry/registry.h
@@ -9,14 +9,13 @@
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/config/api_type_oracle.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_type_oracle.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/common/utility.h"
 
 #include "absl/base/attributes.h"
 #include "absl/container/flat_hash_map.h"
diff --git a/include/envoy/router/BUILD b/envoy/router/BUILD
similarity index 55%
rename from include/envoy/router/BUILD
rename to envoy/router/BUILD
index 754412a7ee346..86bc52bc99f04 100644
--- a/include/envoy/router/BUILD
+++ b/envoy/router/BUILD
@@ -18,7 +18,7 @@ envoy_cc_library(
     hdrs = ["rds.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
 )
@@ -28,14 +28,14 @@ envoy_cc_library(
     hdrs = ["route_config_provider_manager.h"],
     deps = [
         ":rds_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/json:json_object_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/json:json_object_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
     ],
@@ -47,7 +47,7 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":rds_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
@@ -60,20 +60,20 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":internal_redirect_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/common:conn_pool_interface",
-        "//include/envoy/common:matchers_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:hash_policy_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:resource_manager_interface",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/common:conn_pool_interface",
+        "//envoy/common:matchers_interface",
+        "//envoy/common:time_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:hash_policy_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:resource_manager_interface",
+        "//envoy/upstream:retry_interface",
         "//source/common/protobuf",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
@@ -87,8 +87,8 @@ envoy_cc_library(
     hdrs = ["scopes.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/config:config_provider_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/config:config_provider_interface",
+        "//envoy/http:header_map_interface",
     ],
 )
 
@@ -96,8 +96,8 @@ envoy_cc_library(
     name = "router_ratelimit_interface",
     hdrs = ["router_ratelimit.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/ratelimit:ratelimit_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -106,8 +106,8 @@ envoy_cc_library(
     name = "shadow_writer_interface",
     hdrs = ["shadow_writer.h"],
     deps = [
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/http:message_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/http:message_interface",
     ],
 )
 
@@ -116,7 +116,7 @@ envoy_cc_library(
     hdrs = ["string_accessor.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -124,8 +124,8 @@ envoy_cc_library(
     name = "internal_redirect_interface",
     hdrs = ["internal_redirect.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:minimal_logger_lib",
     ],
 )
diff --git a/include/envoy/router/context.h b/envoy/router/context.h
similarity index 100%
rename from include/envoy/router/context.h
rename to envoy/router/context.h
diff --git a/include/envoy/router/internal_redirect.h b/envoy/router/internal_redirect.h
similarity index 98%
rename from include/envoy/router/internal_redirect.h
rename to envoy/router/internal_redirect.h
index 95f624255ace6..1352bb1e2f2fa 100644
--- a/include/envoy/router/internal_redirect.h
+++ b/envoy/router/internal_redirect.h
@@ -3,7 +3,7 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/stream_info/filter_state.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/include/envoy/router/rds.h b/envoy/router/rds.h
similarity index 100%
rename from include/envoy/router/rds.h
rename to envoy/router/rds.h
diff --git a/include/envoy/router/route_config_provider_manager.h b/envoy/router/route_config_provider_manager.h
similarity index 100%
rename from include/envoy/router/route_config_provider_manager.h
rename to envoy/router/route_config_provider_manager.h
diff --git a/include/envoy/router/route_config_update_receiver.h b/envoy/router/route_config_update_receiver.h
similarity index 98%
rename from include/envoy/router/route_config_update_receiver.h
rename to envoy/router/route_config_update_receiver.h
index a22342274c0c1..13ab7c45cefb5 100644
--- a/include/envoy/router/route_config_update_receiver.h
+++ b/envoy/router/route_config_update_receiver.h
@@ -8,7 +8,7 @@
 #include "envoy/router/rds.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/router/router.h b/envoy/router/router.h
similarity index 99%
rename from include/envoy/router/router.h
rename to envoy/router/router.h
index 7cf920f6f68b2..e8a932262bfb7 100644
--- a/include/envoy/router/router.h
+++ b/envoy/router/router.h
@@ -26,8 +26,8 @@
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/retry.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/router/router_ratelimit.h b/envoy/router/router_ratelimit.h
similarity index 100%
rename from include/envoy/router/router_ratelimit.h
rename to envoy/router/router_ratelimit.h
diff --git a/include/envoy/router/scopes.h b/envoy/router/scopes.h
similarity index 100%
rename from include/envoy/router/scopes.h
rename to envoy/router/scopes.h
diff --git a/include/envoy/router/shadow_writer.h b/envoy/router/shadow_writer.h
similarity index 100%
rename from include/envoy/router/shadow_writer.h
rename to envoy/router/shadow_writer.h
diff --git a/include/envoy/router/string_accessor.h b/envoy/router/string_accessor.h
similarity index 100%
rename from include/envoy/router/string_accessor.h
rename to envoy/router/string_accessor.h
diff --git a/include/envoy/runtime/BUILD b/envoy/runtime/BUILD
similarity index 81%
rename from include/envoy/runtime/BUILD
rename to envoy/runtime/BUILD
index f28a5af6a50ec..da5c1527ab1a4 100644
--- a/include/envoy/runtime/BUILD
+++ b/envoy/runtime/BUILD
@@ -16,8 +16,8 @@ envoy_cc_library(
         "abseil_optional",
     ],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_object",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_object",
         "//source/common/common:assert_lib",
         "//source/common/singleton:threadsafe_singleton",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
diff --git a/include/envoy/runtime/runtime.h b/envoy/runtime/runtime.h
similarity index 99%
rename from include/envoy/runtime/runtime.h
rename to envoy/runtime/runtime.h
index 27264a1f9e583..36be807ac6283 100644
--- a/include/envoy/runtime/runtime.h
+++ b/envoy/runtime/runtime.h
@@ -12,8 +12,8 @@
 #include "envoy/thread_local/thread_local_object.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/assert.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/node_hash_map.h"
diff --git a/include/envoy/secret/BUILD b/envoy/secret/BUILD
similarity index 76%
rename from include/envoy/secret/BUILD
rename to envoy/secret/BUILD
index 04adec2fab503..0f510ec3992e6 100644
--- a/include/envoy/secret/BUILD
+++ b/envoy/secret/BUILD
@@ -18,9 +18,9 @@ envoy_cc_library(
     hdrs = ["secret_provider.h"],
     deps = [
         ":secret_callbacks_interface",
-        "//include/envoy/common:callback",
-        "//include/envoy/ssl:certificate_validation_context_config_interface",
-        "//include/envoy/ssl:tls_certificate_config_interface",
+        "//envoy/common:callback",
+        "//envoy/ssl:certificate_validation_context_config_interface",
+        "//envoy/ssl:tls_certificate_config_interface",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
@@ -30,7 +30,7 @@ envoy_cc_library(
     hdrs = ["secret_manager.h"],
     deps = [
         ":secret_provider_interface",
-        "//include/envoy/init:target_interface",
+        "//envoy/init:target_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
diff --git a/include/envoy/secret/secret_callbacks.h b/envoy/secret/secret_callbacks.h
similarity index 100%
rename from include/envoy/secret/secret_callbacks.h
rename to envoy/secret/secret_callbacks.h
diff --git a/include/envoy/secret/secret_manager.h b/envoy/secret/secret_manager.h
similarity index 100%
rename from include/envoy/secret/secret_manager.h
rename to envoy/secret/secret_manager.h
diff --git a/include/envoy/secret/secret_provider.h b/envoy/secret/secret_provider.h
similarity index 100%
rename from include/envoy/secret/secret_provider.h
rename to envoy/secret/secret_provider.h
diff --git a/include/envoy/server/BUILD b/envoy/server/BUILD
similarity index 50%
rename from include/envoy/server/BUILD
rename to envoy/server/BUILD
index accac0a604273..e7914be881528 100644
--- a/include/envoy/server/BUILD
+++ b/envoy/server/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     hdrs = ["access_log_config.h"],
     deps = [
         ":filter_config_interface",
-        "//include/envoy/access_log:access_log_interface",
+        "//envoy/access_log:access_log_interface",
         "//source/common/protobuf",
     ],
 )
@@ -23,18 +23,18 @@ envoy_cc_library(
     hdrs = ["admin.h"],
     deps = [
         ":config_tracker_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:query_params_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:query_params_interface",
+        "//envoy/network:listen_socket_interface",
     ],
 )
 
 envoy_cc_library(
     name = "api_listener_interface",
     hdrs = ["api_listener.h"],
-    deps = ["//include/envoy/http:api_listener_interface"],
+    deps = ["//envoy/http:api_listener_interface"],
 )
 
 envoy_cc_library(
@@ -42,9 +42,9 @@ envoy_cc_library(
     hdrs = ["configuration.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/http:context_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:context_interface",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
     ],
 )
@@ -61,17 +61,17 @@ envoy_cc_library(
 envoy_cc_library(
     name = "drain_manager_interface",
     hdrs = ["drain_manager.h"],
-    deps = ["//include/envoy/network:drain_decision_interface"],
+    deps = ["//envoy/network:drain_decision_interface"],
 )
 
 envoy_cc_library(
     name = "guarddog_interface",
     hdrs = ["guarddog.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/server:watchdog_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/server:watchdog_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
@@ -80,8 +80,8 @@ envoy_cc_library(
     hdrs = ["guarddog_config.h"],
     deps = [
         ":guarddog_interface",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/api:api_interface",
+        "//envoy/protobuf:message_validator_interface",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
     ],
 )
@@ -90,9 +90,9 @@ envoy_cc_library(
     name = "health_checker_config_interface",
     hdrs = ["health_checker_config.h"],
     deps = [
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/upstream:health_checker_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -101,8 +101,8 @@ envoy_cc_library(
     name = "hot_restart_interface",
     hdrs = ["hot_restart.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/thread:thread_interface",
         "//source/server:hot_restart_cc_proto",
     ],
 )
@@ -118,21 +118,21 @@ envoy_cc_library(
         ":lifecycle_notifier_interface",
         ":listener_manager_interface",
         ":options_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/common:mutex_tracer",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:context_interface",
-        "//include/envoy/http:query_params_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/api:api_interface",
+        "//envoy/common:mutex_tracer",
+        "//envoy/event:timer_interface",
+        "//envoy/http:context_interface",
+        "//envoy/http:query_params_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "@envoy_api//envoy/config/trace/v3:pkg_cc_proto",
     ],
 )
@@ -141,8 +141,8 @@ envoy_cc_library(
     name = "options_interface",
     hdrs = ["options.h"],
     deps = [
-        "//include/envoy/network:address_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/network:address_interface",
+        "//envoy/stats:stats_interface",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
     ],
@@ -152,8 +152,8 @@ envoy_cc_library(
     name = "worker_interface",
     hdrs = ["worker.h"],
     deps = [
-        "//include/envoy/server:guarddog_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
+        "//envoy/server:guarddog_interface",
+        "//envoy/server/overload:overload_manager_interface",
     ],
 )
 
@@ -161,7 +161,7 @@ envoy_cc_library(
     name = "watchdog_interface",
     hdrs = ["watchdog.h"],
     deps = [
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
@@ -175,23 +175,23 @@ envoy_cc_library(
         ":lifecycle_notifier_interface",
         ":options_interface",
         ":process_context_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/grpc:context_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:context_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:drain_decision_interface",
-        "//include/envoy/router:context_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/api:api_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/grpc:context_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:context_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:drain_decision_interface",
+        "//envoy/router:context_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:macros",
         "//source/common/protobuf",
@@ -207,16 +207,16 @@ envoy_cc_library(
         ":factory_context_interface",
         ":lifecycle_notifier_interface",
         ":process_context_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:macros",
         "//source/common/protobuf",
@@ -228,7 +228,7 @@ envoy_cc_library(
     name = "lifecycle_notifier_interface",
     hdrs = ["lifecycle_notifier.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
     ],
 )
 
@@ -240,9 +240,9 @@ envoy_cc_library(
         ":drain_manager_interface",
         ":filter_config_interface",
         ":guarddog_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/ssl:context_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/ssl:context_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
@@ -260,18 +260,18 @@ envoy_cc_library(
     hdrs = ["transport_socket_config.h"],
     deps = [
         ":factory_context_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -281,7 +281,7 @@ envoy_cc_library(
     name = "resource_monitor_interface",
     hdrs = ["resource_monitor.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
         "//source/common/protobuf",
     ],
 )
@@ -291,7 +291,7 @@ envoy_cc_library(
     hdrs = ["request_id_extension_config.h"],
     deps = [
         ":filter_config_interface",
-        "//include/envoy/http:request_id_extension_interface",
+        "//envoy/http:request_id_extension_interface",
         "//source/common/protobuf",
     ],
 )
@@ -302,9 +302,9 @@ envoy_cc_library(
     deps = [
         ":options_interface",
         ":resource_monitor_interface",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/protobuf:message_validator_interface",
     ],
 )
 
@@ -313,7 +313,7 @@ envoy_cc_library(
     hdrs = ["tracer_config.h"],
     deps = [
         ":filter_config_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
         "//source/common/protobuf",
     ],
 )
@@ -323,7 +323,7 @@ envoy_cc_library(
     hdrs = ["bootstrap_extension_config.h"],
     deps = [
         ":factory_context_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
     ],
 )
 
@@ -331,10 +331,10 @@ envoy_cc_library(
     name = "fatal_action_interface",
     hdrs = ["fatal_action_config.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/server:instance_interface",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
     ],
 )
@@ -343,7 +343,7 @@ envoy_cc_library(
     name = "platform_interface",
     hdrs = ["platform.h"],
     deps = [
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
diff --git a/include/envoy/server/access_log_config.h b/envoy/server/access_log_config.h
similarity index 97%
rename from include/envoy/server/access_log_config.h
rename to envoy/server/access_log_config.h
index 4202b3b61e414..7b64779ce7927 100644
--- a/include/envoy/server/access_log_config.h
+++ b/envoy/server/access_log_config.h
@@ -6,7 +6,7 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/admin.h b/envoy/server/admin.h
similarity index 100%
rename from include/envoy/server/admin.h
rename to envoy/server/admin.h
diff --git a/include/envoy/server/api_listener.h b/envoy/server/api_listener.h
similarity index 100%
rename from include/envoy/server/api_listener.h
rename to envoy/server/api_listener.h
diff --git a/include/envoy/server/bootstrap_extension_config.h b/envoy/server/bootstrap_extension_config.h
similarity index 97%
rename from include/envoy/server/bootstrap_extension_config.h
rename to envoy/server/bootstrap_extension_config.h
index f674540d19fb5..d70fb8d9ce0ed 100644
--- a/include/envoy/server/bootstrap_extension_config.h
+++ b/envoy/server/bootstrap_extension_config.h
@@ -4,7 +4,7 @@
 
 #include "envoy/server/factory_context.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/config_tracker.h b/envoy/server/config_tracker.h
similarity index 95%
rename from include/envoy/server/config_tracker.h
rename to envoy/server/config_tracker.h
index 53bcb11121e9f..62932be2c853c 100644
--- a/include/envoy/server/config_tracker.h
+++ b/envoy/server/config_tracker.h
@@ -6,8 +6,8 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/non_copyable.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/configuration.h b/envoy/server/configuration.h
similarity index 100%
rename from include/envoy/server/configuration.h
rename to envoy/server/configuration.h
diff --git a/include/envoy/server/drain_manager.h b/envoy/server/drain_manager.h
similarity index 100%
rename from include/envoy/server/drain_manager.h
rename to envoy/server/drain_manager.h
diff --git a/include/envoy/server/factory_context.h b/envoy/server/factory_context.h
similarity index 98%
rename from include/envoy/server/factory_context.h
rename to envoy/server/factory_context.h
index cbe5433bd64b2..7e63b2b0b3021 100644
--- a/include/envoy/server/factory_context.h
+++ b/envoy/server/factory_context.h
@@ -30,9 +30,9 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/fatal_action_config.h b/envoy/server/fatal_action_config.h
similarity index 100%
rename from include/envoy/server/fatal_action_config.h
rename to envoy/server/fatal_action_config.h
diff --git a/include/envoy/server/filter_config.h b/envoy/server/filter_config.h
similarity index 98%
rename from include/envoy/server/filter_config.h
rename to envoy/server/filter_config.h
index cea17eceabdef..5abe7f6e5872e 100644
--- a/include/envoy/server/filter_config.h
+++ b/envoy/server/filter_config.h
@@ -10,9 +10,9 @@
 #include "envoy/server/drain_manager.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/guarddog.h b/envoy/server/guarddog.h
similarity index 100%
rename from include/envoy/server/guarddog.h
rename to envoy/server/guarddog.h
diff --git a/include/envoy/server/guarddog_config.h b/envoy/server/guarddog_config.h
similarity index 97%
rename from include/envoy/server/guarddog_config.h
rename to envoy/server/guarddog_config.h
index e89a3f5308c77..5063e809f65f8 100644
--- a/include/envoy/server/guarddog_config.h
+++ b/envoy/server/guarddog_config.h
@@ -11,7 +11,7 @@
 #include "envoy/server/guarddog.h"
 #include "envoy/stats/scope.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/health_checker_config.h b/envoy/server/health_checker_config.h
similarity index 100%
rename from include/envoy/server/health_checker_config.h
rename to envoy/server/health_checker_config.h
diff --git a/include/envoy/server/hot_restart.h b/envoy/server/hot_restart.h
similarity index 100%
rename from include/envoy/server/hot_restart.h
rename to envoy/server/hot_restart.h
diff --git a/include/envoy/server/instance.h b/envoy/server/instance.h
similarity index 100%
rename from include/envoy/server/instance.h
rename to envoy/server/instance.h
diff --git a/include/envoy/server/lifecycle_notifier.h b/envoy/server/lifecycle_notifier.h
similarity index 100%
rename from include/envoy/server/lifecycle_notifier.h
rename to envoy/server/lifecycle_notifier.h
diff --git a/include/envoy/server/listener_manager.h b/envoy/server/listener_manager.h
similarity index 99%
rename from include/envoy/server/listener_manager.h
rename to envoy/server/listener_manager.h
index 9f43b26a4e051..5fa8c2503e67a 100644
--- a/include/envoy/server/listener_manager.h
+++ b/envoy/server/listener_manager.h
@@ -14,7 +14,7 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/server/guarddog.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/options.h b/envoy/server/options.h
similarity index 100%
rename from include/envoy/server/options.h
rename to envoy/server/options.h
diff --git a/include/envoy/server/overload/BUILD b/envoy/server/overload/BUILD
similarity index 64%
rename from include/envoy/server/overload/BUILD
rename to envoy/server/overload/BUILD
index a6e3f789c4449..6d937fb8d5e18 100644
--- a/include/envoy/server/overload/BUILD
+++ b/envoy/server/overload/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     hdrs = ["overload_manager.h"],
     deps = [
         ":thread_local_overload_state",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/singleton:const_singleton",
     ],
 )
@@ -23,9 +23,9 @@ envoy_cc_library(
     name = "thread_local_overload_state",
     hdrs = ["thread_local_overload_state.h"],
     deps = [
-        "//include/envoy/event:scaled_range_timer_manager_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/thread_local:thread_local_object",
+        "//envoy/event:scaled_range_timer_manager_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/thread_local:thread_local_object",
         "//source/common/common:interval_value",
     ],
 )
diff --git a/include/envoy/server/overload/overload_manager.h b/envoy/server/overload/overload_manager.h
similarity index 98%
rename from include/envoy/server/overload/overload_manager.h
rename to envoy/server/overload/overload_manager.h
index a9092b64341bf..7aa694b34f489 100644
--- a/include/envoy/server/overload/overload_manager.h
+++ b/envoy/server/overload/overload_manager.h
@@ -7,7 +7,7 @@
 #include "envoy/event/scaled_range_timer_manager.h"
 #include "envoy/server/overload/thread_local_overload_state.h"
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/overload/thread_local_overload_state.h b/envoy/server/overload/thread_local_overload_state.h
similarity index 97%
rename from include/envoy/server/overload/thread_local_overload_state.h
rename to envoy/server/overload/thread_local_overload_state.h
index ccee5b9ceb22c..9a57400d8eb31 100644
--- a/include/envoy/server/overload/thread_local_overload_state.h
+++ b/envoy/server/overload/thread_local_overload_state.h
@@ -7,7 +7,7 @@
 #include "envoy/event/timer.h"
 #include "envoy/thread_local/thread_local_object.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/platform.h b/envoy/server/platform.h
similarity index 100%
rename from include/envoy/server/platform.h
rename to envoy/server/platform.h
diff --git a/include/envoy/server/process_context.h b/envoy/server/process_context.h
similarity index 100%
rename from include/envoy/server/process_context.h
rename to envoy/server/process_context.h
diff --git a/include/envoy/server/request_id_extension_config.h b/envoy/server/request_id_extension_config.h
similarity index 95%
rename from include/envoy/server/request_id_extension_config.h
rename to envoy/server/request_id_extension_config.h
index 4e56597e4fb72..fa2288ae7f9f2 100644
--- a/include/envoy/server/request_id_extension_config.h
+++ b/envoy/server/request_id_extension_config.h
@@ -5,7 +5,7 @@
 #include "envoy/http/request_id_extension.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/resource_monitor.h b/envoy/server/resource_monitor.h
similarity index 100%
rename from include/envoy/server/resource_monitor.h
rename to envoy/server/resource_monitor.h
diff --git a/include/envoy/server/resource_monitor_config.h b/envoy/server/resource_monitor_config.h
similarity index 97%
rename from include/envoy/server/resource_monitor_config.h
rename to envoy/server/resource_monitor_config.h
index f72587022c1ed..18e211e3801f1 100644
--- a/include/envoy/server/resource_monitor_config.h
+++ b/envoy/server/resource_monitor_config.h
@@ -8,7 +8,7 @@
 #include "envoy/server/options.h"
 #include "envoy/server/resource_monitor.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/tracer_config.h b/envoy/server/tracer_config.h
similarity index 97%
rename from include/envoy/server/tracer_config.h
rename to envoy/server/tracer_config.h
index 4af4caf45bc9a..53fb87969ff45 100644
--- a/include/envoy/server/tracer_config.h
+++ b/envoy/server/tracer_config.h
@@ -5,7 +5,7 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/transport_socket_config.h b/envoy/server/transport_socket_config.h
similarity index 99%
rename from include/envoy/server/transport_socket_config.h
rename to envoy/server/transport_socket_config.h
index db15960bac1bf..2cea944a4f45c 100644
--- a/include/envoy/server/transport_socket_config.h
+++ b/envoy/server/transport_socket_config.h
@@ -16,7 +16,7 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/include/envoy/server/watchdog.h b/envoy/server/watchdog.h
similarity index 100%
rename from include/envoy/server/watchdog.h
rename to envoy/server/watchdog.h
diff --git a/include/envoy/server/worker.h b/envoy/server/worker.h
similarity index 100%
rename from include/envoy/server/worker.h
rename to envoy/server/worker.h
diff --git a/include/envoy/singleton/BUILD b/envoy/singleton/BUILD
similarity index 79%
rename from include/envoy/singleton/BUILD
rename to envoy/singleton/BUILD
index a0eb2536c45ea..ae51a9dd285b4 100644
--- a/include/envoy/singleton/BUILD
+++ b/envoy/singleton/BUILD
@@ -18,7 +18,7 @@ envoy_cc_library(
     hdrs = ["manager.h"],
     deps = [
         ":instance_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/registry",
+        "//envoy/config:typed_config_interface",
+        "//envoy/registry",
     ],
 )
diff --git a/include/envoy/singleton/instance.h b/envoy/singleton/instance.h
similarity index 100%
rename from include/envoy/singleton/instance.h
rename to envoy/singleton/instance.h
diff --git a/include/envoy/singleton/manager.h b/envoy/singleton/manager.h
similarity index 100%
rename from include/envoy/singleton/manager.h
rename to envoy/singleton/manager.h
diff --git a/include/envoy/ssl/BUILD b/envoy/ssl/BUILD
similarity index 75%
rename from include/envoy/ssl/BUILD
rename to envoy/ssl/BUILD
index 30f15f687f3ea..d9234abdfafeb 100644
--- a/include/envoy/ssl/BUILD
+++ b/envoy/ssl/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":ssl_socket_state",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
     ],
 )
 
@@ -40,9 +40,9 @@ envoy_cc_library(
     deps = [
         ":context_config_interface",
         ":context_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/common:time_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -50,7 +50,7 @@ envoy_cc_library(
     name = "tls_certificate_config_interface",
     hdrs = ["tls_certificate_config.h"],
     deps = [
-        "//include/envoy/ssl/private_key:private_key_interface",
+        "//envoy/ssl/private_key:private_key_interface",
     ],
 )
 
@@ -80,10 +80,10 @@ envoy_cc_library(
     hdrs = ["handshaker.h"],
     external_deps = ["ssl"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:post_io_action_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/api:api_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:post_io_action_interface",
+        "//envoy/protobuf:message_validator_interface",
     ],
 )
diff --git a/include/envoy/ssl/certificate_validation_context_config.h b/envoy/ssl/certificate_validation_context_config.h
similarity index 100%
rename from include/envoy/ssl/certificate_validation_context_config.h
rename to envoy/ssl/certificate_validation_context_config.h
diff --git a/include/envoy/ssl/connection.h b/envoy/ssl/connection.h
similarity index 100%
rename from include/envoy/ssl/connection.h
rename to envoy/ssl/connection.h
diff --git a/include/envoy/ssl/context.h b/envoy/ssl/context.h
similarity index 100%
rename from include/envoy/ssl/context.h
rename to envoy/ssl/context.h
diff --git a/include/envoy/ssl/context_config.h b/envoy/ssl/context_config.h
similarity index 100%
rename from include/envoy/ssl/context_config.h
rename to envoy/ssl/context_config.h
diff --git a/include/envoy/ssl/context_manager.h b/envoy/ssl/context_manager.h
similarity index 100%
rename from include/envoy/ssl/context_manager.h
rename to envoy/ssl/context_manager.h
diff --git a/include/envoy/ssl/handshaker.h b/envoy/ssl/handshaker.h
similarity index 100%
rename from include/envoy/ssl/handshaker.h
rename to envoy/ssl/handshaker.h
diff --git a/include/envoy/ssl/private_key/BUILD b/envoy/ssl/private_key/BUILD
similarity index 83%
rename from include/envoy/ssl/private_key/BUILD
rename to envoy/ssl/private_key/BUILD
index 51ecf0198ec26..aedc02691ed03 100644
--- a/include/envoy/ssl/private_key/BUILD
+++ b/envoy/ssl/private_key/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     external_deps = ["ssl"],
     deps = [
         ":private_key_callbacks_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
@@ -24,8 +24,8 @@ envoy_cc_library(
     hdrs = ["private_key_config.h"],
     deps = [
         ":private_key_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/registry",
+        "//envoy/config:typed_config_interface",
+        "//envoy/registry",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/ssl/private_key/private_key.h b/envoy/ssl/private_key/private_key.h
similarity index 100%
rename from include/envoy/ssl/private_key/private_key.h
rename to envoy/ssl/private_key/private_key.h
diff --git a/include/envoy/ssl/private_key/private_key_callbacks.h b/envoy/ssl/private_key/private_key_callbacks.h
similarity index 100%
rename from include/envoy/ssl/private_key/private_key_callbacks.h
rename to envoy/ssl/private_key/private_key_callbacks.h
diff --git a/include/envoy/ssl/private_key/private_key_config.h b/envoy/ssl/private_key/private_key_config.h
similarity index 100%
rename from include/envoy/ssl/private_key/private_key_config.h
rename to envoy/ssl/private_key/private_key_config.h
diff --git a/include/envoy/ssl/ssl_socket_extended_info.h b/envoy/ssl/ssl_socket_extended_info.h
similarity index 100%
rename from include/envoy/ssl/ssl_socket_extended_info.h
rename to envoy/ssl/ssl_socket_extended_info.h
diff --git a/include/envoy/ssl/ssl_socket_state.h b/envoy/ssl/ssl_socket_state.h
similarity index 100%
rename from include/envoy/ssl/ssl_socket_state.h
rename to envoy/ssl/ssl_socket_state.h
diff --git a/include/envoy/ssl/tls_certificate_config.h b/envoy/ssl/tls_certificate_config.h
similarity index 100%
rename from include/envoy/ssl/tls_certificate_config.h
rename to envoy/ssl/tls_certificate_config.h
diff --git a/include/envoy/stats/BUILD b/envoy/stats/BUILD
similarity index 93%
rename from include/envoy/stats/BUILD
rename to envoy/stats/BUILD
index 27953a2700415..0516c76b1552b 100644
--- a/include/envoy/stats/BUILD
+++ b/envoy/stats/BUILD
@@ -33,8 +33,8 @@ envoy_cc_library(
     deps = [
         ":refcount_ptr_interface",
         ":symbol_table_interface",
-        "//include/envoy/common:interval_set_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:interval_set_interface",
+        "//envoy/common:time_interface",
     ],
 )
 
diff --git a/include/envoy/stats/allocator.h b/envoy/stats/allocator.h
similarity index 100%
rename from include/envoy/stats/allocator.h
rename to envoy/stats/allocator.h
diff --git a/include/envoy/stats/histogram.h b/envoy/stats/histogram.h
similarity index 100%
rename from include/envoy/stats/histogram.h
rename to envoy/stats/histogram.h
diff --git a/include/envoy/stats/primitive_stats.h b/envoy/stats/primitive_stats.h
similarity index 94%
rename from include/envoy/stats/primitive_stats.h
rename to envoy/stats/primitive_stats.h
index 704908201fe05..d27375a21c008 100644
--- a/include/envoy/stats/primitive_stats.h
+++ b/envoy/stats/primitive_stats.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/non_copyable.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/non_copyable.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/include/envoy/stats/primitive_stats_macros.h b/envoy/stats/primitive_stats_macros.h
similarity index 100%
rename from include/envoy/stats/primitive_stats_macros.h
rename to envoy/stats/primitive_stats_macros.h
diff --git a/include/envoy/stats/refcount_ptr.h b/envoy/stats/refcount_ptr.h
similarity index 99%
rename from include/envoy/stats/refcount_ptr.h
rename to envoy/stats/refcount_ptr.h
index 437f7b40cce24..c467df8215843 100644
--- a/include/envoy/stats/refcount_ptr.h
+++ b/envoy/stats/refcount_ptr.h
@@ -4,7 +4,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/include/envoy/stats/scope.h b/envoy/stats/scope.h
similarity index 100%
rename from include/envoy/stats/scope.h
rename to envoy/stats/scope.h
diff --git a/include/envoy/stats/sink.h b/envoy/stats/sink.h
similarity index 100%
rename from include/envoy/stats/sink.h
rename to envoy/stats/sink.h
diff --git a/include/envoy/stats/stats.h b/envoy/stats/stats.h
similarity index 100%
rename from include/envoy/stats/stats.h
rename to envoy/stats/stats.h
diff --git a/include/envoy/stats/stats_macros.h b/envoy/stats/stats_macros.h
similarity index 98%
rename from include/envoy/stats/stats_macros.h
rename to envoy/stats/stats_macros.h
index 0f61674cfdca0..0cc6ee927472d 100644
--- a/include/envoy/stats/stats_macros.h
+++ b/envoy/stats/stats_macros.h
@@ -5,8 +5,8 @@
 #include "envoy/stats/histogram.h"
 #include "envoy/stats/stats.h"
 
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/include/envoy/stats/stats_matcher.h b/envoy/stats/stats_matcher.h
similarity index 100%
rename from include/envoy/stats/stats_matcher.h
rename to envoy/stats/stats_matcher.h
diff --git a/include/envoy/stats/store.h b/envoy/stats/store.h
similarity index 100%
rename from include/envoy/stats/store.h
rename to envoy/stats/store.h
diff --git a/include/envoy/stats/symbol_table.h b/envoy/stats/symbol_table.h
similarity index 100%
rename from include/envoy/stats/symbol_table.h
rename to envoy/stats/symbol_table.h
diff --git a/include/envoy/stats/tag.h b/envoy/stats/tag.h
similarity index 100%
rename from include/envoy/stats/tag.h
rename to envoy/stats/tag.h
diff --git a/include/envoy/stats/tag_extractor.h b/envoy/stats/tag_extractor.h
similarity index 100%
rename from include/envoy/stats/tag_extractor.h
rename to envoy/stats/tag_extractor.h
diff --git a/include/envoy/stats/tag_producer.h b/envoy/stats/tag_producer.h
similarity index 100%
rename from include/envoy/stats/tag_producer.h
rename to envoy/stats/tag_producer.h
diff --git a/include/envoy/stats/timespan.h b/envoy/stats/timespan.h
similarity index 100%
rename from include/envoy/stats/timespan.h
rename to envoy/stats/timespan.h
diff --git a/include/envoy/stream_info/BUILD b/envoy/stream_info/BUILD
similarity index 70%
rename from include/envoy/stream_info/BUILD
rename to envoy/stream_info/BUILD
index ff6df798b1d65..fb517d70d97e1 100644
--- a/include/envoy/stream_info/BUILD
+++ b/envoy/stream_info/BUILD
@@ -14,13 +14,13 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":filter_state_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:protocol_interface",
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/network:socket_interface",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/upstream:host_description_interface",
+        "//envoy/common:time_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:protocol_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/network:socket_interface",
+        "//envoy/ssl:connection_interface",
+        "//envoy/upstream:host_description_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf",
         "//source/common/singleton:const_singleton",
diff --git a/include/envoy/stream_info/filter_state.h b/envoy/stream_info/filter_state.h
similarity index 98%
rename from include/envoy/stream_info/filter_state.h
rename to envoy/stream_info/filter_state.h
index 612dc6994ec58..2faa5bb8c089c 100644
--- a/include/envoy/stream_info/filter_state.h
+++ b/envoy/stream_info/filter_state.h
@@ -6,9 +6,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/pure.h"
 
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/include/envoy/stream_info/stream_info.h b/envoy/stream_info/stream_info.h
similarity index 99%
rename from include/envoy/stream_info/stream_info.h
rename to envoy/stream_info/stream_info.h
index ecb04a7bf555b..d409aecb89103 100644
--- a/include/envoy/stream_info/stream_info.h
+++ b/envoy/stream_info/stream_info.h
@@ -16,9 +16,9 @@
 #include "envoy/tracing/trace_reason.h"
 #include "envoy/upstream/host_description.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/protobuf.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/envoy/stream_info/uint32_accessor.h b/envoy/stream_info/uint32_accessor.h
similarity index 100%
rename from include/envoy/stream_info/uint32_accessor.h
rename to envoy/stream_info/uint32_accessor.h
diff --git a/include/envoy/tcp/BUILD b/envoy/tcp/BUILD
similarity index 57%
rename from include/envoy/tcp/BUILD
rename to envoy/tcp/BUILD
index 2ab93df039963..7a19f5f9ad7e2 100644
--- a/include/envoy/tcp/BUILD
+++ b/envoy/tcp/BUILD
@@ -12,10 +12,10 @@ envoy_cc_library(
     name = "conn_pool_interface",
     hdrs = ["conn_pool.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common:conn_pool_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common:conn_pool_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/upstream:upstream_interface",
     ],
 )
 
@@ -23,8 +23,8 @@ envoy_cc_library(
     name = "upstream_interface",
     hdrs = ["upstream.h"],
     deps = [
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:upstream_interface",
         "@envoy_api//envoy/extensions/filters/network/tcp_proxy/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/tcp/conn_pool.h b/envoy/tcp/conn_pool.h
similarity index 100%
rename from include/envoy/tcp/conn_pool.h
rename to envoy/tcp/conn_pool.h
diff --git a/include/envoy/tcp/upstream.h b/envoy/tcp/upstream.h
similarity index 100%
rename from include/envoy/tcp/upstream.h
rename to envoy/tcp/upstream.h
diff --git a/include/envoy/thread/BUILD b/envoy/thread/BUILD
similarity index 100%
rename from include/envoy/thread/BUILD
rename to envoy/thread/BUILD
diff --git a/include/envoy/thread/thread.h b/envoy/thread/thread.h
similarity index 97%
rename from include/envoy/thread/thread.h
rename to envoy/thread/thread.h
index 6a2cce96eeb0f..7b969f3e2c011 100644
--- a/include/envoy/thread/thread.h
+++ b/envoy/thread/thread.h
@@ -7,7 +7,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/thread_annotations.h"
+#include "source/common/common/thread_annotations.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/include/envoy/thread_local/BUILD b/envoy/thread_local/BUILD
similarity index 89%
rename from include/envoy/thread_local/BUILD
rename to envoy/thread_local/BUILD
index 9a5e612354943..01b0a4cf5e4d0 100644
--- a/include/envoy/thread_local/BUILD
+++ b/envoy/thread_local/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     hdrs = ["thread_local.h"],
     deps = [
         ":thread_local_object",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/common:assert_lib",
     ],
 )
diff --git a/include/envoy/thread_local/thread_local.h b/envoy/thread_local/thread_local.h
similarity index 99%
rename from include/envoy/thread_local/thread_local.h
rename to envoy/thread_local/thread_local.h
index f3d846ff5cca5..b314fa817aaf3 100644
--- a/include/envoy/thread_local/thread_local.h
+++ b/envoy/thread_local/thread_local.h
@@ -9,7 +9,7 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/thread_local/thread_local_object.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace ThreadLocal {
diff --git a/include/envoy/thread_local/thread_local_object.h b/envoy/thread_local/thread_local_object.h
similarity index 94%
rename from include/envoy/thread_local/thread_local_object.h
rename to envoy/thread_local/thread_local_object.h
index e305102f71187..f5500fa9a4ba2 100644
--- a/include/envoy/thread_local/thread_local_object.h
+++ b/envoy/thread_local/thread_local_object.h
@@ -4,7 +4,7 @@
 #include <functional>
 #include <memory>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace ThreadLocal {
diff --git a/include/envoy/tracing/BUILD b/envoy/tracing/BUILD
similarity index 80%
rename from include/envoy/tracing/BUILD
rename to envoy/tracing/BUILD
index 9bed839d05ae9..c1711b1a92ac5 100644
--- a/include/envoy/tracing/BUILD
+++ b/envoy/tracing/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     hdrs = ["http_tracer.h"],
     deps = [
         ":trace_driver_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/http:header_map_interface",
     ],
 )
 
@@ -37,6 +37,6 @@ envoy_cc_library(
     hdrs = ["trace_driver.h"],
     deps = [
         ":trace_reason_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/stream_info:stream_info_interface",
     ],
 )
diff --git a/include/envoy/tracing/http_tracer.h b/envoy/tracing/http_tracer.h
similarity index 100%
rename from include/envoy/tracing/http_tracer.h
rename to envoy/tracing/http_tracer.h
diff --git a/include/envoy/tracing/http_tracer_manager.h b/envoy/tracing/http_tracer_manager.h
similarity index 100%
rename from include/envoy/tracing/http_tracer_manager.h
rename to envoy/tracing/http_tracer_manager.h
diff --git a/include/envoy/tracing/trace_driver.h b/envoy/tracing/trace_driver.h
similarity index 100%
rename from include/envoy/tracing/trace_driver.h
rename to envoy/tracing/trace_driver.h
diff --git a/include/envoy/tracing/trace_reason.h b/envoy/tracing/trace_reason.h
similarity index 100%
rename from include/envoy/tracing/trace_reason.h
rename to envoy/tracing/trace_reason.h
diff --git a/include/envoy/udp/BUILD b/envoy/udp/BUILD
similarity index 84%
rename from include/envoy/udp/BUILD
rename to envoy/udp/BUILD
index bc5cce7271e36..8454b0e89759c 100644
--- a/include/envoy/udp/BUILD
+++ b/envoy/udp/BUILD
@@ -13,6 +13,6 @@ envoy_cc_library(
     hdrs = ["hash_policy.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/network:address_interface",
+        "//envoy/network:address_interface",
     ],
 )
diff --git a/include/envoy/udp/hash_policy.h b/envoy/udp/hash_policy.h
similarity index 100%
rename from include/envoy/udp/hash_policy.h
rename to envoy/udp/hash_policy.h
diff --git a/include/envoy/upstream/BUILD b/envoy/upstream/BUILD
similarity index 56%
rename from include/envoy/upstream/BUILD
rename to envoy/upstream/BUILD
index 84318a63816fd..7a19f61deec29 100644
--- a/include/envoy/upstream/BUILD
+++ b/envoy/upstream/BUILD
@@ -19,21 +19,21 @@ envoy_cc_library(
         ":load_balancer_interface",
         ":thread_local_cluster_interface",
         ":upstream_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_factory_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_factory_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:options_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/thread_local:thread_local_interface",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
@@ -60,10 +60,10 @@ envoy_cc_library(
     deps = [
         ":health_check_host_monitor_interface",
         ":outlier_detection_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/stats:primitive_stats_macros",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:address_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/stats:primitive_stats_macros",
+        "//envoy/stats:stats_macros",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
@@ -73,8 +73,8 @@ envoy_cc_library(
     hdrs = ["load_balancer.h"],
     deps = [
         ":upstream_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/upstream:types_interface",
+        "//envoy/router:router_interface",
+        "//envoy/upstream:types_interface",
     ],
 )
 
@@ -101,7 +101,7 @@ envoy_cc_library(
     hdrs = ["outlier_detection.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "@envoy_api//envoy/data/cluster/v3:pkg_cc_proto",
     ],
 )
@@ -110,16 +110,16 @@ envoy_cc_library(
     name = "retry_interface",
     hdrs = ["retry.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/upstream:types_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/upstream:types_interface",
+        "//envoy/upstream:upstream_interface",
     ],
 )
 
 envoy_cc_library(
     name = "resource_manager_interface",
     hdrs = ["resource_manager.h"],
-    deps = ["//include/envoy/common:resource_interface"],
+    deps = ["//envoy/common:resource_interface"],
 )
 
 envoy_cc_library(
@@ -128,7 +128,7 @@ envoy_cc_library(
     deps = [
         ":load_balancer_interface",
         ":upstream_interface",
-        "//include/envoy/http:async_client_interface",
+        "//envoy/http:async_client_interface",
     ],
 )
 
@@ -149,16 +149,16 @@ envoy_cc_library(
         ":load_balancer_type_interface",
         ":locality_lib",
         ":resource_manager_interface",
-        "//include/envoy/common:callback",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/upstream:types_interface",
+        "//envoy/common:callback",
+        "//envoy/config:subscription_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/upstream:types_interface",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -174,15 +174,15 @@ envoy_cc_library(
         ":locality_lib",
         ":resource_manager_interface",
         ":upstream_interface",
-        "//include/envoy/common:callback",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/ssl:context_manager_interface",
+        "//envoy/common:callback",
+        "//envoy/config:typed_config_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/ssl:context_manager_interface",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
     ],
 )
diff --git a/include/envoy/upstream/cluster_factory.h b/envoy/upstream/cluster_factory.h
similarity index 100%
rename from include/envoy/upstream/cluster_factory.h
rename to envoy/upstream/cluster_factory.h
diff --git a/include/envoy/upstream/cluster_manager.h b/envoy/upstream/cluster_manager.h
similarity index 100%
rename from include/envoy/upstream/cluster_manager.h
rename to envoy/upstream/cluster_manager.h
diff --git a/include/envoy/upstream/health_check_host_monitor.h b/envoy/upstream/health_check_host_monitor.h
similarity index 100%
rename from include/envoy/upstream/health_check_host_monitor.h
rename to envoy/upstream/health_check_host_monitor.h
diff --git a/include/envoy/upstream/health_checker.h b/envoy/upstream/health_checker.h
similarity index 100%
rename from include/envoy/upstream/health_checker.h
rename to envoy/upstream/health_checker.h
diff --git a/include/envoy/upstream/host_description.h b/envoy/upstream/host_description.h
similarity index 100%
rename from include/envoy/upstream/host_description.h
rename to envoy/upstream/host_description.h
diff --git a/include/envoy/upstream/load_balancer.h b/envoy/upstream/load_balancer.h
similarity index 100%
rename from include/envoy/upstream/load_balancer.h
rename to envoy/upstream/load_balancer.h
diff --git a/include/envoy/upstream/load_balancer_type.h b/envoy/upstream/load_balancer_type.h
similarity index 98%
rename from include/envoy/upstream/load_balancer_type.h
rename to envoy/upstream/load_balancer_type.h
index 44d8f708e8143..280c317cdcce2 100644
--- a/include/envoy/upstream/load_balancer_type.h
+++ b/envoy/upstream/load_balancer_type.h
@@ -7,7 +7,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/include/envoy/upstream/locality.h b/envoy/upstream/locality.h
similarity index 98%
rename from include/envoy/upstream/locality.h
rename to envoy/upstream/locality.h
index 0f5c23ac20b58..a01a0baf697fd 100644
--- a/include/envoy/upstream/locality.h
+++ b/envoy/upstream/locality.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/include/envoy/upstream/outlier_detection.h b/envoy/upstream/outlier_detection.h
similarity index 100%
rename from include/envoy/upstream/outlier_detection.h
rename to envoy/upstream/outlier_detection.h
diff --git a/include/envoy/upstream/resource_manager.h b/envoy/upstream/resource_manager.h
similarity index 100%
rename from include/envoy/upstream/resource_manager.h
rename to envoy/upstream/resource_manager.h
diff --git a/include/envoy/upstream/retry.h b/envoy/upstream/retry.h
similarity index 100%
rename from include/envoy/upstream/retry.h
rename to envoy/upstream/retry.h
diff --git a/include/envoy/upstream/thread_local_cluster.h b/envoy/upstream/thread_local_cluster.h
similarity index 100%
rename from include/envoy/upstream/thread_local_cluster.h
rename to envoy/upstream/thread_local_cluster.h
diff --git a/include/envoy/upstream/types.h b/envoy/upstream/types.h
similarity index 97%
rename from include/envoy/upstream/types.h
rename to envoy/upstream/types.h
index dafc0f22f6bf8..589dbe75cee8f 100644
--- a/include/envoy/upstream/types.h
+++ b/envoy/upstream/types.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "common/common/phantom.h"
+#include "source/common/common/phantom.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/include/envoy/upstream/upstream.h b/envoy/upstream/upstream.h
similarity index 100%
rename from include/envoy/upstream/upstream.h
rename to envoy/upstream/upstream.h
diff --git a/source/common/access_log/BUILD b/source/common/access_log/BUILD
index 00bfcb101f798..0ba22ffe9a4d8 100644
--- a/source/common/access_log/BUILD
+++ b/source/common/access_log/BUILD
@@ -16,13 +16,13 @@ envoy_cc_library(
         "abseil_hash",
     ],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:access_log_config_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:access_log_config_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
         "//source/common/config:utility_lib",
@@ -43,8 +43,8 @@ envoy_cc_library(
     srcs = ["access_log_manager_impl.cc"],
     hdrs = ["access_log_manager_impl.h"],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/api:api_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/api:api_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:logger_lib",
         "//source/common/common:thread_lib",
diff --git a/source/common/access_log/access_log_impl.cc b/source/common/access_log/access_log_impl.cc
index 6eeeeafb9f11b..6e8b0542d4933 100644
--- a/source/common/access_log/access_log_impl.cc
+++ b/source/common/access_log/access_log_impl.cc
@@ -1,4 +1,4 @@
-#include "common/access_log/access_log_impl.h"
+#include "source/common/access_log/access_log_impl.h"
 
 #include <cstdint>
 #include <string>
@@ -11,17 +11,17 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/config/metadata.h"
-#include "common/config/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/utility.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/access_log/access_log_impl.h b/source/common/access_log/access_log_impl.h
index 6993012a356da..1a524bd2c1b24 100644
--- a/source/common/access_log/access_log_impl.h
+++ b/source/common/access_log/access_log_impl.h
@@ -12,10 +12,10 @@
 #include "envoy/server/access_log_config.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/matchers.h"
-#include "common/grpc/status.h"
-#include "common/http/header_utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/matchers.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/hash/hash.h"
diff --git a/source/common/access_log/access_log_manager_impl.cc b/source/common/access_log/access_log_manager_impl.cc
index 14bcb798b06da..9c5f83a189e74 100644
--- a/source/common/access_log/access_log_manager_impl.cc
+++ b/source/common/access_log/access_log_manager_impl.cc
@@ -1,12 +1,12 @@
-#include "common/access_log/access_log_manager_impl.h"
+#include "source/common/access_log/access_log_manager_impl.h"
 
 #include <string>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/lock_guard.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/lock_guard.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/access_log/access_log_manager_impl.h b/source/common/access_log/access_log_manager_impl.h
index 6a94ccedf2752..23651b874e1cc 100644
--- a/source/common/access_log/access_log_manager_impl.h
+++ b/source/common/access_log/access_log_manager_impl.h
@@ -9,9 +9,9 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stats/store.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/api/BUILD b/source/common/api/BUILD
index 7e7264f8f0ff3..60412c4513432 100644
--- a/source/common/api/BUILD
+++ b/source/common/api/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["api_impl.cc"],
     hdrs = ["api_impl.h"],
     deps = [
-        "//include/envoy/api:api_interface",
+        "//envoy/api:api_interface",
         "//source/common/common:thread_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/network:socket_lib",
@@ -39,12 +39,13 @@ envoy_cc_library(
         "//bazel:windows_x86_64": ["win32/os_sys_calls_impl.h"],
         "//conditions:default": ["posix/os_sys_calls_impl.h"],
     }) + envoy_select_hot_restart(["posix/os_sys_calls_impl_hot_restart.h"]),
+    include_prefix = "source/common/api",
     strip_include_prefix = select({
         "//bazel:windows_x86_64": "win32",
         "//conditions:default": "posix",
     }),
     deps = [
-        "//include/envoy/api:os_sys_calls_interface",
+        "//envoy/api:os_sys_calls_interface",
         "//source/common/singleton:threadsafe_singleton",
     ],
 )
diff --git a/source/common/api/api_impl.cc b/source/common/api/api_impl.cc
index f91e5c6a1c6fb..73de8f4a320c2 100644
--- a/source/common/api/api_impl.cc
+++ b/source/common/api/api_impl.cc
@@ -1,10 +1,10 @@
-#include "common/api/api_impl.h"
+#include "source/common/api/api_impl.h"
 
 #include <chrono>
 #include <string>
 
-#include "common/common/thread.h"
-#include "common/event/dispatcher_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/dispatcher_impl.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl.cc b/source/common/api/posix/os_sys_calls_impl.cc
index 9428dc7c5e6fd..ad2a36dd2af1a 100644
--- a/source/common/api/posix/os_sys_calls_impl.cc
+++ b/source/common/api/posix/os_sys_calls_impl.cc
@@ -5,7 +5,7 @@
 #include <cerrno>
 #include <string>
 
-#include "common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl.h b/source/common/api/posix/os_sys_calls_impl.h
index bb23b16aad92f..77ccb0da2b083 100644
--- a/source/common/api/posix/os_sys_calls_impl.h
+++ b/source/common/api/posix/os_sys_calls_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/api/os_sys_calls.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl_hot_restart.cc b/source/common/api/posix/os_sys_calls_impl_hot_restart.cc
index 7f9d6e0ffd280..813ffe1b30b92 100644
--- a/source/common/api/posix/os_sys_calls_impl_hot_restart.cc
+++ b/source/common/api/posix/os_sys_calls_impl_hot_restart.cc
@@ -1,6 +1,6 @@
 #include <cerrno>
 
-#include "common/api/os_sys_calls_impl_hot_restart.h"
+#include "source/common/api/os_sys_calls_impl_hot_restart.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl_hot_restart.h b/source/common/api/posix/os_sys_calls_impl_hot_restart.h
index 59ce2cb6bed9c..146b421dac911 100644
--- a/source/common/api/posix/os_sys_calls_impl_hot_restart.h
+++ b/source/common/api/posix/os_sys_calls_impl_hot_restart.h
@@ -2,7 +2,7 @@
 
 #include "envoy/api/os_sys_calls_hot_restart.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl_linux.cc b/source/common/api/posix/os_sys_calls_impl_linux.cc
index 1eece81f7822c..2971191ac88f3 100644
--- a/source/common/api/posix/os_sys_calls_impl_linux.cc
+++ b/source/common/api/posix/os_sys_calls_impl_linux.cc
@@ -6,7 +6,7 @@
 
 #include <cerrno>
 
-#include "common/api/os_sys_calls_impl_linux.h"
+#include "source/common/api/os_sys_calls_impl_linux.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/posix/os_sys_calls_impl_linux.h b/source/common/api/posix/os_sys_calls_impl_linux.h
index 7a250943c7ace..eaa72435c164c 100644
--- a/source/common/api/posix/os_sys_calls_impl_linux.h
+++ b/source/common/api/posix/os_sys_calls_impl_linux.h
@@ -6,7 +6,7 @@
 
 #include "envoy/api/os_sys_calls_linux.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/api/win32/os_sys_calls_impl.cc b/source/common/api/win32/os_sys_calls_impl.cc
index 717c3a1965d87..d534e5e07cd02 100644
--- a/source/common/api/win32/os_sys_calls_impl.cc
+++ b/source/common/api/win32/os_sys_calls_impl.cc
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <string>
 
-#include "common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
 
 #define DWORD_MAX UINT32_MAX
 
diff --git a/source/common/api/win32/os_sys_calls_impl.h b/source/common/api/win32/os_sys_calls_impl.h
index 89e75f40a29cf..4dc62e0770d2b 100644
--- a/source/common/api/win32/os_sys_calls_impl.h
+++ b/source/common/api/win32/os_sys_calls_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/api/os_sys_calls.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/common/buffer/BUILD b/source/common/buffer/BUILD
index 171aa8a089872..832d72c913128 100644
--- a/source/common/buffer/BUILD
+++ b/source/common/buffer/BUILD
@@ -24,7 +24,7 @@ envoy_cc_library(
     srcs = ["buffer_impl.cc"],
     hdrs = ["buffer_impl.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:non_copyable",
         "//source/common/common:utility_lib",
         "//source/common/event:libevent_lib",
diff --git a/source/common/buffer/buffer_impl.cc b/source/common/buffer/buffer_impl.cc
index 3187cae8abe52..85a7bd34f6582 100644
--- a/source/common/buffer/buffer_impl.cc
+++ b/source/common/buffer/buffer_impl.cc
@@ -1,10 +1,10 @@
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/fixed_array.h"
 #include "event2/buffer.h"
diff --git a/source/common/buffer/buffer_impl.h b/source/common/buffer/buffer_impl.h
index 35d2c16b8079c..8f7977f9c269c 100644
--- a/source/common/buffer/buffer_impl.h
+++ b/source/common/buffer/buffer_impl.h
@@ -8,10 +8,10 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/assert.h"
-#include "common/common/non_copyable.h"
-#include "common/common/utility.h"
-#include "common/event/libevent.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/libevent.h"
 
 namespace Envoy {
 namespace Buffer {
diff --git a/source/common/buffer/watermark_buffer.cc b/source/common/buffer/watermark_buffer.cc
index eefa6022c8ef0..781321f99dc44 100644
--- a/source/common/buffer/watermark_buffer.cc
+++ b/source/common/buffer/watermark_buffer.cc
@@ -1,7 +1,7 @@
-#include "common/buffer/watermark_buffer.h"
+#include "source/common/buffer/watermark_buffer.h"
 
-#include "common/common/assert.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Buffer {
diff --git a/source/common/buffer/watermark_buffer.h b/source/common/buffer/watermark_buffer.h
index c8700cc0ca151..3a432c76481c2 100644
--- a/source/common/buffer/watermark_buffer.h
+++ b/source/common/buffer/watermark_buffer.h
@@ -3,7 +3,7 @@
 #include <functional>
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Buffer {
diff --git a/source/common/buffer/zero_copy_input_stream_impl.cc b/source/common/buffer/zero_copy_input_stream_impl.cc
index bfd0e4794c0a3..83bccc807c047 100644
--- a/source/common/buffer/zero_copy_input_stream_impl.cc
+++ b/source/common/buffer/zero_copy_input_stream_impl.cc
@@ -1,7 +1,7 @@
-#include "common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Buffer {
diff --git a/source/common/buffer/zero_copy_input_stream_impl.h b/source/common/buffer/zero_copy_input_stream_impl.h
index 23304d06e34f6..07d4a3f3afb11 100644
--- a/source/common/buffer/zero_copy_input_stream_impl.h
+++ b/source/common/buffer/zero_copy_input_stream_impl.h
@@ -5,7 +5,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 
diff --git a/source/common/chromium_url/envoy_shim.h b/source/common/chromium_url/envoy_shim.h
index 2b7443926c1f5..c581e21d45bf8 100644
--- a/source/common/chromium_url/envoy_shim.h
+++ b/source/common/chromium_url/envoy_shim.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 // This is a minimal Envoy adaptation layer for the Chromium URL library.
 // NOLINT(namespace-envoy)
diff --git a/source/common/chromium_url/url_canon.cc b/source/common/chromium_url/url_canon.cc
index b9ad1b829726c..79b36e986ca52 100644
--- a/source/common/chromium_url/url_canon.cc
+++ b/source/common/chromium_url/url_canon.cc
@@ -5,9 +5,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "common/chromium_url/url_canon.h"
+#include "source/common/chromium_url/url_canon.h"
 
-#include "common/chromium_url/envoy_shim.h"
+#include "source/common/chromium_url/envoy_shim.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon.h b/source/common/chromium_url/url_canon.h
index a5d0939cb7616..d56346d5ee164 100644
--- a/source/common/chromium_url/url_canon.h
+++ b/source/common/chromium_url/url_canon.h
@@ -11,9 +11,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/chromium_url/envoy_shim.h"
-#include "common/chromium_url/url_parse.h"
-#include "common/common/mem_block_builder.h"
+#include "source/common/chromium_url/envoy_shim.h"
+#include "source/common/chromium_url/url_parse.h"
+#include "source/common/common/mem_block_builder.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon_internal.cc b/source/common/chromium_url/url_canon_internal.cc
index 38c932cad5b47..ee29b04ef162a 100644
--- a/source/common/chromium_url/url_canon_internal.cc
+++ b/source/common/chromium_url/url_canon_internal.cc
@@ -5,7 +5,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "common/chromium_url/url_canon_internal.h"
+#include "source/common/chromium_url/url_canon_internal.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon_internal.h b/source/common/chromium_url/url_canon_internal.h
index 8c405b49814a0..84c761a6a0686 100644
--- a/source/common/chromium_url/url_canon_internal.h
+++ b/source/common/chromium_url/url_canon_internal.h
@@ -16,8 +16,8 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "common/chromium_url/envoy_shim.h"
-#include "common/chromium_url/url_canon.h"
+#include "source/common/chromium_url/envoy_shim.h"
+#include "source/common/chromium_url/url_canon.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon_path.cc b/source/common/chromium_url/url_canon_path.cc
index 22587c0ab8a10..17eec73510db0 100644
--- a/source/common/chromium_url/url_canon_path.cc
+++ b/source/common/chromium_url/url_canon_path.cc
@@ -7,9 +7,9 @@
 
 #include <limits.h>
 
-#include "common/chromium_url/url_canon.h"
-#include "common/chromium_url/url_canon_internal.h"
-#include "common/chromium_url/url_parse_internal.h"
+#include "source/common/chromium_url/url_canon.h"
+#include "source/common/chromium_url/url_canon_internal.h"
+#include "source/common/chromium_url/url_parse_internal.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon_stdstring.cc b/source/common/chromium_url/url_canon_stdstring.cc
index 0c61831e5f1ac..0d62cf5764245 100644
--- a/source/common/chromium_url/url_canon_stdstring.cc
+++ b/source/common/chromium_url/url_canon_stdstring.cc
@@ -5,7 +5,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "common/chromium_url/url_canon_stdstring.h"
+#include "source/common/chromium_url/url_canon_stdstring.h"
 
 namespace chromium_url {
 
diff --git a/source/common/chromium_url/url_canon_stdstring.h b/source/common/chromium_url/url_canon_stdstring.h
index e14d6c22e74e8..6292c4e61dae3 100644
--- a/source/common/chromium_url/url_canon_stdstring.h
+++ b/source/common/chromium_url/url_canon_stdstring.h
@@ -14,8 +14,8 @@
 
 #include <string>
 
-#include "common/chromium_url/envoy_shim.h"
-#include "common/chromium_url/url_canon.h"
+#include "source/common/chromium_url/envoy_shim.h"
+#include "source/common/chromium_url/url_canon.h"
 
 #define DISALLOW_COPY_AND_ASSIGN(TypeName)                                                         \
   TypeName(const TypeName&) = delete;                                                              \
diff --git a/source/common/common/BUILD b/source/common/common/BUILD
index 664e2564e3fa3..15067b74e8e02 100644
--- a/source/common/common/BUILD
+++ b/source/common/common/BUILD
@@ -5,7 +5,6 @@ load(
     "envoy_cc_platform_dep",
     "envoy_cc_posix_library",
     "envoy_cc_win32_library",
-    "envoy_include_prefix",
     "envoy_package",
 )
 
@@ -44,8 +43,8 @@ envoy_cc_library(
     hdrs = ["backoff_strategy.h"],
     deps = [
         ":assert_lib",
-        "//include/envoy/common:backoff_strategy_interface",
-        "//include/envoy/common:random_generator_interface",
+        "//envoy/common:backoff_strategy_interface",
+        "//envoy/common:random_generator_interface",
     ],
 )
 
@@ -56,7 +55,7 @@ envoy_cc_library(
     deps = [
         ":assert_lib",
         ":empty_string",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -111,8 +110,7 @@ envoy_basic_cc_library(
         "abseil_strings",
         "fmtlib",
     ],
-    include_prefix = envoy_include_prefix(package_name()),
-    deps = ["//include/envoy/common:base_includes"],
+    deps = ["//envoy/common:base_includes"],
 )
 
 envoy_cc_library(
@@ -189,6 +187,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "logger_impl_lib_standard",
     hdrs = ["standard/logger_impl.h"],
+    include_prefix = "source/common/common",
     strip_include_prefix = "standard",
     deps = [":base_logger_lib"],
 )
@@ -203,6 +202,7 @@ envoy_cc_library(
         "//bazel:android_logger": ["android/logger_impl.h"],
         "//conditions:default": [],
     }),
+    include_prefix = "source/common/common",
     strip_include_prefix = "android",
     deps = [":base_logger_lib"],
 )
@@ -227,7 +227,7 @@ envoy_cc_library(
     external_deps = ["abseil_synchronization"],
     deps = [
         ":assert_lib",
-        "//include/envoy/common:mutex_tracer",
+        "//envoy/common:mutex_tracer",
     ],
 )
 
@@ -241,7 +241,7 @@ envoy_cc_library(
         ":dump_state_utils",
         ":macros",
         ":minimal_logger_lib",
-        "//include/envoy/access_log:access_log_interface",
+        "//envoy/access_log:access_log_interface",
     ],
 )
 
@@ -249,8 +249,8 @@ envoy_cc_library(
     name = "basic_resource_lib",
     hdrs = ["basic_resource_impl.h"],
     deps = [
-        "//include/envoy/common:resource_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/common:resource_interface",
+        "//envoy/runtime:runtime_interface",
     ],
 )
 
@@ -266,7 +266,7 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":utility_lib",
-        "//include/envoy/common:matchers_interface",
+        "//envoy/common:matchers_interface",
         "//source/common/common:regex_lib",
         "//source/common/config:metadata_lib",
         "//source/common/http:path_utility_lib",
@@ -287,7 +287,7 @@ envoy_cc_library(
     external_deps = ["ssl"],
     deps = [
         ":assert_lib",
-        "//include/envoy/common:random_generator_interface",
+        "//envoy/common:random_generator_interface",
     ],
 )
 
@@ -297,7 +297,7 @@ envoy_cc_library(
     hdrs = ["regex.h"],
     deps = [
         ":assert_lib",
-        "//include/envoy/common:regex_interface",
+        "//envoy/common:regex_interface",
         "//source/common/protobuf:utility_lib",
         "//source/common/stats:symbol_table_lib",
         "@com_googlesource_code_re2//:re2",
@@ -319,8 +319,8 @@ envoy_cc_library(
     name = "scope_tracker",
     hdrs = ["scope_tracker.h"],
     deps = [
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/event:dispatcher_interface",
     ],
 )
 
@@ -328,7 +328,7 @@ envoy_cc_library(
     name = "scope_tracked_object_stack",
     hdrs = ["scope_tracked_object_stack.h"],
     deps = [
-        "//include/envoy/common:scope_tracker_interface",
+        "//envoy/common:scope_tracker_interface",
     ],
 )
 
@@ -368,10 +368,11 @@ envoy_cc_posix_library(
     name = "thread_impl_lib",
     srcs = ["posix/thread_impl.cc"],
     hdrs = ["posix/thread_impl.h"],
+    include_prefix = "source/common/common",
     strip_include_prefix = "posix",
     deps = [
         ":assert_lib",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
@@ -379,10 +380,11 @@ envoy_cc_win32_library(
     name = "thread_impl_lib",
     srcs = ["win32/thread_impl.cc"],
     hdrs = ["win32/thread_impl.h"],
+    include_prefix = "source/common/common",
     strip_include_prefix = "win32",
     deps = [
         ":assert_lib",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
@@ -391,7 +393,7 @@ envoy_cc_library(
     hdrs = ["lock_guard.h"],
     deps = [
         ":thread_annotations",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
 
@@ -404,8 +406,8 @@ envoy_cc_library(
         ":assert_lib",
         ":hash_lib",
         ":non_copyable",
-        "//include/envoy/common:interval_set_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:interval_set_interface",
+        "//envoy/common:time_interface",
         "//source/common/singleton:const_singleton",
     ],
 )
@@ -415,7 +417,7 @@ envoy_cc_library(
     hdrs = ["callback_impl.h"],
     deps = [
         ":assert_lib",
-        "//include/envoy/common:callback",
+        "//envoy/common:callback",
     ],
 )
 
@@ -441,8 +443,8 @@ envoy_cc_library(
     srcs = ["token_bucket_impl.cc"],
     hdrs = ["token_bucket_impl.h"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/common:token_bucket_interface",
+        "//envoy/common:time_interface",
+        "//envoy/common:token_bucket_interface",
         "//source/common/common:utility_lib",
     ],
 )
@@ -452,7 +454,7 @@ envoy_cc_library(
     srcs = ["shared_token_bucket_impl.cc"],
     hdrs = ["shared_token_bucket_impl.h"],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/common:thread_lib",
         "//source/common/common:thread_synchronizer_lib",
         "//source/common/common:token_bucket_impl_lib",
diff --git a/source/common/common/android/logger_impl.cc b/source/common/common/android/logger_impl.cc
index 90af89767d041..4a566863eeea5 100644
--- a/source/common/common/android/logger_impl.cc
+++ b/source/common/common/android/logger_impl.cc
@@ -1,4 +1,4 @@
-#include "common/common/logger_impl.h"
+#include "source/common/common/logger_impl.h"
 
 #include "spdlog/sinks/android_sink.h"
 
diff --git a/source/common/common/android/logger_impl.h b/source/common/common/android/logger_impl.h
index 11bb1a7a48383..4e75598dcf8e5 100644
--- a/source/common/common/android/logger_impl.h
+++ b/source/common/common/android/logger_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/base_logger.h"
+#include "source/common/common/base_logger.h"
 
 namespace Envoy {
 namespace Logger {
diff --git a/source/common/common/assert.cc b/source/common/common/assert.cc
index ae26004b64275..9f79edc0bd655 100644
--- a/source/common/common/assert.cc
+++ b/source/common/common/assert.cc
@@ -1,4 +1,4 @@
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_join.h"
diff --git a/source/common/common/assert.h b/source/common/common/assert.h
index 2580910700aef..2e184bbe13168 100644
--- a/source/common/common/assert.h
+++ b/source/common/common/assert.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Assert {
diff --git a/source/common/common/backoff_strategy.cc b/source/common/common/backoff_strategy.cc
index 8e007a6554ab4..46a298d119032 100644
--- a/source/common/common/backoff_strategy.cc
+++ b/source/common/common/backoff_strategy.cc
@@ -1,4 +1,4 @@
-#include "common/common/backoff_strategy.h"
+#include "source/common/common/backoff_strategy.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/backoff_strategy.h b/source/common/common/backoff_strategy.h
index 2247d5dde730c..cb47e9c6279b9 100644
--- a/source/common/common/backoff_strategy.h
+++ b/source/common/common/backoff_strategy.h
@@ -6,7 +6,7 @@
 #include "envoy/common/backoff_strategy.h"
 #include "envoy/common/random_generator.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/base64.cc b/source/common/common/base64.cc
index fc4cd599c20d3..8d0f02e090c4d 100644
--- a/source/common/common/base64.cc
+++ b/source/common/common/base64.cc
@@ -1,10 +1,10 @@
-#include "common/common/base64.h"
+#include "source/common/common/base64.h"
 
 #include <cstdint>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/common/base_logger.cc b/source/common/common/base_logger.cc
index 2491ab389dc33..f42eeafdb442c 100644
--- a/source/common/common/base_logger.cc
+++ b/source/common/common/base_logger.cc
@@ -1,4 +1,4 @@
-#include "common/common/base_logger.h"
+#include "source/common/common/base_logger.h"
 
 namespace Envoy {
 namespace Logger {
diff --git a/source/common/common/basic_resource_impl.h b/source/common/common/basic_resource_impl.h
index 820412e04a88a..8fedbb4ad8013 100644
--- a/source/common/common/basic_resource_impl.h
+++ b/source/common/common/basic_resource_impl.h
@@ -5,7 +5,7 @@
 #include "envoy/common/resource.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/common/callback_impl.h b/source/common/common/callback_impl.h
index 0e8d0bd017f2c..367aa05591ecb 100644
--- a/source/common/common/callback_impl.h
+++ b/source/common/common/callback_impl.h
@@ -5,7 +5,7 @@
 
 #include "envoy/common/callback.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Common {
diff --git a/source/common/common/cleanup.h b/source/common/common/cleanup.h
index abcf23f6a7b7a..7f18c9854c21c 100644
--- a/source/common/common/cleanup.h
+++ b/source/common/common/cleanup.h
@@ -3,7 +3,7 @@
 #include <functional>
 #include <list>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/containers.h b/source/common/common/containers.h
index ac96e6949dfbf..a2f4090b418ce 100644
--- a/source/common/common/containers.h
+++ b/source/common/common/containers.h
@@ -3,7 +3,7 @@
 #include <functional>
 #include <memory>
 
-#include "common/common/cleanup.h"
+#include "source/common/common/cleanup.h"
 
 namespace Envoy {
 namespace Common {
diff --git a/source/common/common/debug_recursion_checker.h b/source/common/common/debug_recursion_checker.h
index e2ab275ca219d..437029db4415d 100644
--- a/source/common/common/debug_recursion_checker.h
+++ b/source/common/common/debug_recursion_checker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Common {
diff --git a/source/common/common/fancy_logger.cc b/source/common/common/fancy_logger.cc
index 3c28414cbf405..4c5686ec9a274 100644
--- a/source/common/common/fancy_logger.cc
+++ b/source/common/common/fancy_logger.cc
@@ -1,9 +1,9 @@
-#include "common/common/fancy_logger.h"
+#include "source/common/common/fancy_logger.h"
 
 #include <atomic>
 #include <memory>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 using spdlog::level::level_enum;
 
diff --git a/source/common/common/fancy_logger.h b/source/common/common/fancy_logger.h
index bd3e37d2dbd4a..da149d9cdfbf5 100644
--- a/source/common/common/fancy_logger.h
+++ b/source/common/common/fancy_logger.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/common/common/hash.cc b/source/common/common/hash.cc
index 984f040fa3dae..4db50b44e3d2a 100644
--- a/source/common/common/hash.cc
+++ b/source/common/common/hash.cc
@@ -1,4 +1,4 @@
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/common/hash.h b/source/common/common/hash.h
index de37144ab5d82..2c9fb22e777c8 100644
--- a/source/common/common/hash.h
+++ b/source/common/common/hash.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "common/common/macros.h"
-#include "common/common/safe_memcpy.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/safe_memcpy.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/source/common/common/hex.cc b/source/common/common/hex.cc
index 7c0b7f8c2e132..83d6788b50fb9 100644
--- a/source/common/common/hex.cc
+++ b/source/common/common/hex.cc
@@ -1,4 +1,4 @@
-#include "common/common/hex.h"
+#include "source/common/common/hex.h"
 
 #include <array>
 #include <cstdint>
@@ -7,8 +7,8 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 std::string Hex::encode(const uint8_t* data, size_t length) {
diff --git a/source/common/common/json_escape_string.h b/source/common/common/json_escape_string.h
index 94e93bfce2556..679f0ef1da4c1 100644
--- a/source/common/common/json_escape_string.h
+++ b/source/common/common/json_escape_string.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/common/linked_object.h b/source/common/common/linked_object.h
index 9c65e085b76f7..bad90149d72db 100644
--- a/source/common/common/linked_object.h
+++ b/source/common/common/linked_object.h
@@ -3,7 +3,7 @@
 #include <list>
 #include <memory>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/logger.cc b/source/common/common/logger.cc
index cca504814e426..fa62bc23f2de2 100644
--- a/source/common/common/logger.cc
+++ b/source/common/common/logger.cc
@@ -1,4 +1,4 @@
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include <cassert> // use direct system-assert to avoid cyclic dependency.
 #include <cstdint>
@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "common/common/json_escape_string.h"
-#include "common/common/lock_guard.h"
+#include "source/common/common/json_escape_string.h"
+#include "source/common/common/lock_guard.h"
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
diff --git a/source/common/common/logger.h b/source/common/common/logger.h
index 4db2216c43b3a..03edb6b569303 100644
--- a/source/common/common/logger.h
+++ b/source/common/common/logger.h
@@ -9,12 +9,12 @@
 
 #include "envoy/thread/thread.h"
 
-#include "common/common/base_logger.h"
-#include "common/common/fancy_logger.h"
-#include "common/common/fmt.h"
-#include "common/common/logger_impl.h"
-#include "common/common/macros.h"
-#include "common/common/non_copyable.h"
+#include "source/common/common/base_logger.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger_impl.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/non_copyable.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/common/logger_delegates.cc b/source/common/common/logger_delegates.cc
index df6bc446c83e2..8f008b296fb7e 100644
--- a/source/common/common/logger_delegates.cc
+++ b/source/common/common/logger_delegates.cc
@@ -1,4 +1,4 @@
-#include "common/common/logger_delegates.h"
+#include "source/common/common/logger_delegates.h"
 
 #include <cassert> // use direct system-assert to avoid cyclic dependency.
 #include <cstdint>
diff --git a/source/common/common/logger_delegates.h b/source/common/common/logger_delegates.h
index f6058fcd507fa..f9e1d7da69cc1 100644
--- a/source/common/common/logger_delegates.h
+++ b/source/common/common/logger_delegates.h
@@ -6,8 +6,8 @@
 
 #include "envoy/access_log/access_log.h"
 
-#include "common/common/logger.h"
-#include "common/common/macros.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/common/matchers.cc b/source/common/common/matchers.cc
index 490fb0f019e2d..b1970aead08cb 100644
--- a/source/common/common/matchers.cc
+++ b/source/common/common/matchers.cc
@@ -1,4 +1,4 @@
-#include "common/common/matchers.h"
+#include "source/common/common/matchers.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/type/matcher/v3/metadata.pb.h"
@@ -6,10 +6,10 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 #include "envoy/type/matcher/v3/value.pb.h"
 
-#include "common/common/macros.h"
-#include "common/common/regex.h"
-#include "common/config/metadata.h"
-#include "common/http/path_utility.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/regex.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/path_utility.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/common/matchers.h b/source/common/common/matchers.h
index 10f6f34fddd97..396203ce5b50d 100644
--- a/source/common/common/matchers.h
+++ b/source/common/common/matchers.h
@@ -11,8 +11,8 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 #include "envoy/type/matcher/v3/value.pb.h"
 
-#include "common/common/utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Matchers {
diff --git a/source/common/common/mem_block_builder.h b/source/common/common/mem_block_builder.h
index ce2323c44fa80..a391db7cd5c96 100644
--- a/source/common/common/mem_block_builder.h
+++ b/source/common/common/mem_block_builder.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/types/span.h"
 
diff --git a/source/common/common/mutex_tracer_impl.cc b/source/common/common/mutex_tracer_impl.cc
index 3f7c3aa855f2b..2683ed61c803e 100644
--- a/source/common/common/mutex_tracer_impl.cc
+++ b/source/common/common/mutex_tracer_impl.cc
@@ -1,9 +1,9 @@
-#include "common/common/mutex_tracer_impl.h"
+#include "source/common/common/mutex_tracer_impl.h"
 
 #include <iostream>
 #include <memory>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/source/common/common/mutex_tracer_impl.h b/source/common/common/mutex_tracer_impl.h
index f9fa99e11946d..d5368f3c83e95 100644
--- a/source/common/common/mutex_tracer_impl.h
+++ b/source/common/common/mutex_tracer_impl.h
@@ -6,7 +6,7 @@
 
 #include "envoy/common/mutex_tracer.h"
 
-#include "common/common/thread_annotations.h"
+#include "source/common/common/thread_annotations.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/perf_annotation.cc b/source/common/common/perf_annotation.cc
index daa39ff0ca31a..f5170e5b4d0cd 100644
--- a/source/common/common/perf_annotation.cc
+++ b/source/common/common/perf_annotation.cc
@@ -2,7 +2,7 @@
 #define ENVOY_PERF_ANNOTATION
 #endif
 
-#include "common/common/perf_annotation.h"
+#include "source/common/common/perf_annotation.h"
 
 #include <chrono>
 #include <iostream>
@@ -10,8 +10,8 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/utility.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/common/perf_annotation.h b/source/common/common/perf_annotation.h
index 7fba5aec0321f..ab9ec215eae45 100644
--- a/source/common/common/perf_annotation.h
+++ b/source/common/common/perf_annotation.h
@@ -5,8 +5,8 @@
 #include <chrono>
 #include <cstdint>
 
-#include "common/common/thread.h"
-#include "common/common/utility.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/common/posix/thread_impl.cc b/source/common/common/posix/thread_impl.cc
index 71cbf2b02eb6b..fae09194d8cca 100644
--- a/source/common/common/posix/thread_impl.cc
+++ b/source/common/common/posix/thread_impl.cc
@@ -1,5 +1,5 @@
-#include "common/common/assert.h"
-#include "common/common/thread_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread_impl.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/common/random_generator.cc b/source/common/common/random_generator.cc
index 69eabc5e6c078..53e59c2ffb609 100644
--- a/source/common/common/random_generator.cc
+++ b/source/common/common/random_generator.cc
@@ -1,6 +1,6 @@
-#include "common/common/random_generator.h"
+#include "source/common/common/random_generator.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "openssl/rand.h"
 
diff --git a/source/common/common/regex.cc b/source/common/common/regex.cc
index 735a24d25b8d7..deeef41aa12bf 100644
--- a/source/common/common/regex.cc
+++ b/source/common/common/regex.cc
@@ -1,13 +1,13 @@
-#include "common/common/regex.h"
+#include "source/common/common/regex.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/runtime/runtime.h"
 #include "envoy/type/matcher/v3/regex.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "re2/re2.h"
 
diff --git a/source/common/common/scope_tracker.h b/source/common/common/scope_tracker.h
index 4426bbaca5cc1..5e2850b082aab 100644
--- a/source/common/common/scope_tracker.h
+++ b/source/common/common/scope_tracker.h
@@ -3,7 +3,7 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/shared_token_bucket_impl.cc b/source/common/common/shared_token_bucket_impl.cc
index 50a5e02ec582e..f0942226afcf7 100644
--- a/source/common/common/shared_token_bucket_impl.cc
+++ b/source/common/common/shared_token_bucket_impl.cc
@@ -1,8 +1,8 @@
-#include "common/common/shared_token_bucket_impl.h"
+#include "source/common/common/shared_token_bucket_impl.h"
 
 #include <chrono>
 
-#include "common/common/lock_guard.h"
+#include "source/common/common/lock_guard.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/shared_token_bucket_impl.h b/source/common/common/shared_token_bucket_impl.h
index 7b677e543134d..51594c3da57fc 100644
--- a/source/common/common/shared_token_bucket_impl.h
+++ b/source/common/common/shared_token_bucket_impl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "common/common/thread.h"
-#include "common/common/thread_synchronizer.h"
-#include "common/common/token_bucket_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/common/common/token_bucket_impl.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/standard/logger_impl.h b/source/common/common/standard/logger_impl.h
index a07664151c654..938ed5f6ea298 100644
--- a/source/common/common/standard/logger_impl.h
+++ b/source/common/common/standard/logger_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/base_logger.h"
+#include "source/common/common/base_logger.h"
 
 namespace Envoy {
 namespace Logger {
diff --git a/source/common/common/thread.cc b/source/common/common/thread.cc
index d32907be06763..e6ee78c8e5208 100644
--- a/source/common/common/thread.cc
+++ b/source/common/common/thread.cc
@@ -1,4 +1,4 @@
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Thread {
diff --git a/source/common/common/thread.h b/source/common/common/thread.h
index e84fb7b38bf7a..1ade49a3d1b93 100644
--- a/source/common/common/thread.h
+++ b/source/common/common/thread.h
@@ -7,8 +7,8 @@
 
 #include "envoy/thread/thread.h"
 
-#include "common/common/non_copyable.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/source/common/common/thread_synchronizer.cc b/source/common/common/thread_synchronizer.cc
index 099fafdb6ab8c..c4330b4710d29 100644
--- a/source/common/common/thread_synchronizer.cc
+++ b/source/common/common/thread_synchronizer.cc
@@ -1,4 +1,4 @@
-#include "common/common/thread_synchronizer.h"
+#include "source/common/common/thread_synchronizer.h"
 
 namespace Envoy {
 namespace Thread {
diff --git a/source/common/common/thread_synchronizer.h b/source/common/common/thread_synchronizer.h
index b86df8a926bce..bdb4a18a1c092 100644
--- a/source/common/common/thread_synchronizer.h
+++ b/source/common/common/thread_synchronizer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/common/token_bucket_impl.cc b/source/common/common/token_bucket_impl.cc
index 74dd981e1828d..eaf6f06d0c9e9 100644
--- a/source/common/common/token_bucket_impl.cc
+++ b/source/common/common/token_bucket_impl.cc
@@ -1,4 +1,4 @@
-#include "common/common/token_bucket_impl.h"
+#include "source/common/common/token_bucket_impl.h"
 
 #include <chrono>
 
diff --git a/source/common/common/token_bucket_impl.h b/source/common/common/token_bucket_impl.h
index b168b4cc2894e..96ac238e3778f 100644
--- a/source/common/common/token_bucket_impl.h
+++ b/source/common/common/token_bucket_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/common/time.h"
 #include "envoy/common/token_bucket.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 
diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc
index 659259fd86195..06a2a7027fc46 100644
--- a/source/common/common/utility.cc
+++ b/source/common/common/utility.cc
@@ -1,4 +1,4 @@
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include <array>
 #include <chrono>
@@ -12,10 +12,10 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/hash.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hash.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/ascii.h"
diff --git a/source/common/common/utility.h b/source/common/common/utility.h
index dbf1d4192f2e4..24b29a1273500 100644
--- a/source/common/common/utility.h
+++ b/source/common/common/utility.h
@@ -11,9 +11,9 @@
 #include "envoy/common/interval_set.h"
 #include "envoy/common/time.h"
 
-#include "common/common/assert.h"
-#include "common/common/hash.h"
-#include "common/common/non_copyable.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/non_copyable.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/common/win32/event_logger_impl.cc b/source/common/common/win32/event_logger_impl.cc
index 96e0cc74b06b9..f547152ae7daa 100644
--- a/source/common/common/win32/event_logger_impl.cc
+++ b/source/common/common/win32/event_logger_impl.cc
@@ -1,4 +1,4 @@
-#include "common/common/win32/event_logger_impl.h"
+#include "source/common/common/win32/event_logger_impl.h"
 
 #include "spdlog/sinks/win_eventlog_sink.h"
 
diff --git a/source/common/common/win32/event_logger_impl.h b/source/common/common/win32/event_logger_impl.h
index 5fd864bce0ee4..02c711ee57541 100644
--- a/source/common/common/win32/event_logger_impl.h
+++ b/source/common/common/win32/event_logger_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/base_logger.h"
+#include "source/common/common/base_logger.h"
 
 namespace Envoy {
 namespace Logger {
diff --git a/source/common/common/win32/thread_impl.cc b/source/common/common/win32/thread_impl.cc
index 8f26d63e0eb39..e7e548883a806 100644
--- a/source/common/common/win32/thread_impl.cc
+++ b/source/common/common/win32/thread_impl.cc
@@ -1,7 +1,7 @@
 #include <process.h>
 
-#include "common/common/assert.h"
-#include "common/common/thread_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread_impl.h"
 
 namespace Envoy {
 namespace Thread {
diff --git a/source/common/config/BUILD b/source/common/config/BUILD
index e5e73d9e9d4da..1890b921b93dc 100644
--- a/source/common/config/BUILD
+++ b/source/common/config/BUILD
@@ -29,13 +29,13 @@ envoy_cc_library(
     hdrs = ["config_provider_impl.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/config:config_provider_interface",
-        "//include/envoy/config:config_provider_manager_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:config_tracker_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/config:config_provider_interface",
+        "//envoy/config:config_provider_manager_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:config_tracker_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/init:manager_lib",
         "//source/common/init:target_lib",
         "//source/common/init:watcher_lib",
@@ -48,7 +48,7 @@ envoy_cc_library(
     hdrs = ["context_provider_impl.h"],
     deps = [
         ":xds_context_params_lib",
-        "//include/envoy/config:context_provider_interface",
+        "//envoy/config:context_provider_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/common:thread_lib",
     ],
@@ -60,9 +60,9 @@ envoy_cc_library(
     hdrs = ["datasource.h"],
     deps = [
         ":remote_data_fetcher_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/api:api_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:backoff_lib",
         "//source/common/common:empty_string",
         "//source/common/init:target_lib",
@@ -75,7 +75,7 @@ envoy_cc_library(
     name = "decoded_resource_lib",
     hdrs = ["decoded_resource_impl.h"],
     deps = [
-        "//include/envoy/config:subscription_interface",
+        "//envoy/config:subscription_interface",
         "//source/common/protobuf:utility_lib",
         "@com_github_cncf_udpa//xds/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
@@ -87,9 +87,9 @@ envoy_cc_library(
     srcs = ["ttl.cc"],
     hdrs = ["ttl.h"],
     deps = [
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
         "@com_google_absl//absl/container:btree",
     ],
 )
@@ -104,8 +104,8 @@ envoy_cc_library(
         ":ttl_lib",
         ":utility_lib",
         ":watch_map_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:backoff_lib",
         "//source/common/common:minimal_logger_lib",
@@ -123,9 +123,9 @@ envoy_cc_library(
     hdrs = ["filesystem_subscription_impl.h"],
     deps = [
         ":decoded_resource_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/filesystem:filesystem_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/filesystem:filesystem_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
         "//source/common/config:utility_lib",
@@ -141,10 +141,10 @@ envoy_cc_library(
     hdrs = ["grpc_stream.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:backoff_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:token_bucket_impl_lib",
@@ -163,9 +163,9 @@ envoy_cc_library(
         ":grpc_stream_lib",
         ":ttl_lib",
         ":utility_lib",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:cleanup_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
@@ -184,9 +184,9 @@ envoy_cc_library(
     deps = [
         ":grpc_mux_lib",
         ":xds_resource_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:async_client_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:async_client_interface",
     ],
 )
 
@@ -202,8 +202,8 @@ envoy_cc_library(
         ":watch_map_lib",
         ":xds_context_params_lib",
         ":xds_resource_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:async_client_interface",
+        "//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",
@@ -221,8 +221,8 @@ envoy_cc_library(
         ":api_version_lib",
         ":decoded_resource_lib",
         ":version_converter_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
@@ -241,10 +241,10 @@ envoy_cc_library(
     srcs = ["metadata.cc"],
     hdrs = ["metadata.h"],
     deps = [
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/registry",
-        "//include/envoy/singleton:manager_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/registry",
+        "//envoy/singleton:manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf",
         "//source/common/protobuf:utility_lib",
@@ -258,7 +258,7 @@ envoy_cc_library(
     name = "opaque_resource_decoder_lib",
     hdrs = ["opaque_resource_decoder_impl.h"],
     deps = [
-        "//include/envoy/config:subscription_interface",
+        "//envoy/config:subscription_interface",
         "//source/common/protobuf:utility_lib",
     ],
 )
@@ -298,7 +298,7 @@ envoy_cc_library(
     srcs = ["remote_data_fetcher.cc"],
     hdrs = ["remote_data_fetcher.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:hex_lib",
         "//source/common/crypto:utility_lib",
         "//source/common/http:utility_lib",
@@ -335,9 +335,9 @@ envoy_cc_library(
         ":type_to_endpoint_lib",
         ":utility_lib",
         ":xds_resource_lib",
-        "//include/envoy/config:subscription_factory_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:subscription_factory_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:utility_lib",
         "//source/common/protobuf",
@@ -392,12 +392,12 @@ envoy_cc_library(
     deps = [
         ":api_type_oracle_lib",
         ":version_converter_lib",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:backoff_lib",
         "//source/common/common:hash_lib",
@@ -440,7 +440,7 @@ envoy_cc_library(
     deps = [
         ":decoded_resource_lib",
         ":xds_resource_lib",
-        "//include/envoy/config:subscription_interface",
+        "//envoy/config:subscription_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:cleanup_lib",
         "//source/common/common:minimal_logger_lib",
@@ -456,7 +456,7 @@ envoy_cc_library(
     deps = [
         ":opaque_resource_decoder_lib",
         ":resource_name_lib",
-        "//include/envoy/config:subscription_interface",
+        "//envoy/config:subscription_interface",
     ],
 )
 
@@ -465,8 +465,8 @@ envoy_cc_library(
     srcs = ["watched_directory.cc"],
     hdrs = ["watched_directory.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/filesystem:watcher_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/filesystem:watcher_interface",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc
index 8762392af5cbd..66da4f79a9283 100644
--- a/source/common/config/api_type_oracle.cc
+++ b/source/common/config/api_type_oracle.cc
@@ -1,4 +1,4 @@
-#include "common/config/api_type_oracle.h"
+#include "source/common/config/api_type_oracle.h"
 
 #include "udpa/annotations/versioning.pb.h"
 
diff --git a/source/common/config/api_type_oracle.h b/source/common/config/api_type_oracle.h
index bde8186fa555c..7320309b33ccb 100644
--- a/source/common/config/api_type_oracle.h
+++ b/source/common/config/api_type_oracle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/common/config/config_provider_impl.cc b/source/common/config/config_provider_impl.cc
index 78eddb0ffe10f..172c5305ee57d 100644
--- a/source/common/config/config_provider_impl.cc
+++ b/source/common/config/config_provider_impl.cc
@@ -1,4 +1,4 @@
-#include "common/config/config_provider_impl.h"
+#include "source/common/config/config_provider_impl.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/config_provider_impl.h b/source/common/config/config_provider_impl.h
index f1ecf3cf8932c..8db998ebab884 100644
--- a/source/common/config/config_provider_impl.h
+++ b/source/common/config/config_provider_impl.h
@@ -8,13 +8,13 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/thread.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/init/manager_impl.h"
-#include "common/init/target_impl.h"
-#include "common/init/watcher_impl.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/init/watcher_impl.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/context_provider_impl.h b/source/common/config/context_provider_impl.h
index 08e4b6c5c85a5..030d2bc3f1a85 100644
--- a/source/common/config/context_provider_impl.h
+++ b/source/common/config/context_provider_impl.h
@@ -2,9 +2,9 @@
 
 #include "envoy/config/context_provider.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/thread.h"
-#include "common/config/xds_context_params.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/xds_context_params.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/datasource.cc b/source/common/config/datasource.cc
index 3f60da031a28d..19a4b82e6a9da 100644
--- a/source/common/config/datasource.cc
+++ b/source/common/config/datasource.cc
@@ -1,4 +1,4 @@
-#include "common/config/datasource.h"
+#include "source/common/config/datasource.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
diff --git a/source/common/config/datasource.h b/source/common/config/datasource.h
index c3969ee7f4501..9f884bd40968d 100644
--- a/source/common/config/datasource.h
+++ b/source/common/config/datasource.h
@@ -7,11 +7,11 @@
 #include "envoy/init/manager.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/config/remote_data_fetcher.h"
-#include "common/init/target_impl.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/config/remote_data_fetcher.h"
+#include "source/common/init/target_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/config/decoded_resource_impl.h b/source/common/config/decoded_resource_impl.h
index 04299f7745baf..58f6b9d5cd5da 100644
--- a/source/common/config/decoded_resource_impl.h
+++ b/source/common/config/decoded_resource_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/config/subscription.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "xds/core/v3/collection_entry.pb.h"
 
diff --git a/source/common/config/delta_subscription_state.cc b/source/common/config/delta_subscription_state.cc
index 215dc55602fbc..b1b162d3f3274 100644
--- a/source/common/config/delta_subscription_state.cc
+++ b/source/common/config/delta_subscription_state.cc
@@ -1,12 +1,12 @@
-#include "common/config/delta_subscription_state.h"
+#include "source/common/config/delta_subscription_state.h"
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/hash.h"
-#include "common/config/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hash.h"
+#include "source/common/config/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/delta_subscription_state.h b/source/common/config/delta_subscription_state.h
index 7c478002ce379..cafdbe0022ee5 100644
--- a/source/common/config/delta_subscription_state.h
+++ b/source/common/config/delta_subscription_state.h
@@ -7,12 +7,12 @@
 #include "envoy/local_info/local_info.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/config/api_version.h"
-#include "common/config/pausable_ack_queue.h"
-#include "common/config/ttl.h"
-#include "common/config/watch_map.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/pausable_ack_queue.h"
+#include "source/common/config/ttl.h"
+#include "source/common/config/watch_map.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/config/filesystem_subscription_impl.cc b/source/common/config/filesystem_subscription_impl.cc
index 5e27d1e8d937e..0bed53c374e6d 100644
--- a/source/common/config/filesystem_subscription_impl.cc
+++ b/source/common/config/filesystem_subscription_impl.cc
@@ -1,13 +1,13 @@
-#include "common/config/filesystem_subscription_impl.h"
+#include "source/common/config/filesystem_subscription_impl.h"
 
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/filesystem_subscription_impl.h b/source/common/config/filesystem_subscription_impl.h
index 1c8d9d041ccf8..178b6a44a0301 100644
--- a/source/common/config/filesystem_subscription_impl.h
+++ b/source/common/config/filesystem_subscription_impl.h
@@ -6,7 +6,7 @@
 #include "envoy/filesystem/filesystem.h"
 #include "envoy/protobuf/message_validator.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/grpc_mux_impl.cc b/source/common/config/grpc_mux_impl.cc
index eab59e846bdac..efcb6b38b7762 100644
--- a/source/common/config/grpc_mux_impl.cc
+++ b/source/common/config/grpc_mux_impl.cc
@@ -1,12 +1,12 @@
-#include "common/config/grpc_mux_impl.h"
+#include "source/common/config/grpc_mux_impl.h"
 
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/memory/utils.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/memory/utils.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/btree_map.h"
 #include "absl/container/node_hash_set.h"
diff --git a/source/common/config/grpc_mux_impl.h b/source/common/config/grpc_mux_impl.h
index 3c4b973b8d9d1..26b3f2a8669fd 100644
--- a/source/common/config/grpc_mux_impl.h
+++ b/source/common/config/grpc_mux_impl.h
@@ -14,13 +14,13 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/config/api_version.h"
-#include "common/config/grpc_stream.h"
-#include "common/config/ttl.h"
-#include "common/config/utility.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/grpc_stream.h"
+#include "source/common/config/ttl.h"
+#include "source/common/config/utility.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/config/grpc_stream.h b/source/common/config/grpc_stream.h
index f6673402df4f5..a682fef77d0ce 100644
--- a/source/common/config/grpc_stream.h
+++ b/source/common/config/grpc_stream.h
@@ -7,10 +7,10 @@
 #include "envoy/config/grpc_mux.h"
 #include "envoy/grpc/async_client.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/common/token_bucket_impl.h"
-#include "common/config/utility.h"
-#include "common/grpc/typed_async_client.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/token_bucket_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/typed_async_client.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/grpc_subscription_impl.cc b/source/common/config/grpc_subscription_impl.cc
index 3b6412d111dc3..fbc55abe693b6 100644
--- a/source/common/config/grpc_subscription_impl.cc
+++ b/source/common/config/grpc_subscription_impl.cc
@@ -1,14 +1,14 @@
-#include "common/config/grpc_subscription_impl.h"
+#include "source/common/config/grpc_subscription_impl.h"
 
 #include <chrono>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/config/xds_resource.h"
-#include "common/grpc/common.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/grpc/common.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/grpc_subscription_impl.h b/source/common/config/grpc_subscription_impl.h
index 35dfa34f166e8..b1b15c585011c 100644
--- a/source/common/config/grpc_subscription_impl.h
+++ b/source/common/config/grpc_subscription_impl.h
@@ -7,7 +7,7 @@
 #include "envoy/config/subscription.h"
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "xds/core/v3/resource_locator.pb.h"
 
diff --git a/source/common/config/http_subscription_impl.cc b/source/common/config/http_subscription_impl.cc
index d8ad488e108a3..ecf6afffa9b98 100644
--- a/source/common/config/http_subscription_impl.cc
+++ b/source/common/config/http_subscription_impl.cc
@@ -1,19 +1,19 @@
-#include "common/config/http_subscription_impl.h"
+#include "source/common/config/http_subscription_impl.h"
 
 #include <memory>
 
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/http/headers.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "google/api/annotations.pb.h"
 
diff --git a/source/common/config/http_subscription_impl.h b/source/common/config/http_subscription_impl.h
index 33263e0ef3eb3..4672e45894882 100644
--- a/source/common/config/http_subscription_impl.h
+++ b/source/common/config/http_subscription_impl.h
@@ -6,8 +6,8 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/http/rest_api_fetcher.h"
+#include "source/common/config/api_version.h"
+#include "source/common/http/rest_api_fetcher.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/metadata.cc b/source/common/config/metadata.cc
index c5dfaa77540d5..522d82e973039 100644
--- a/source/common/config/metadata.cc
+++ b/source/common/config/metadata.cc
@@ -1,9 +1,9 @@
-#include "common/config/metadata.h"
+#include "source/common/config/metadata.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/type/metadata/v3/metadata.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/metadata.h b/source/common/config/metadata.h
index 9b4ddbbcb0f43..fe870c5169018 100644
--- a/source/common/config/metadata.h
+++ b/source/common/config/metadata.h
@@ -10,8 +10,8 @@
 #include "envoy/singleton/manager.h"
 #include "envoy/type/metadata/v3/metadata.pb.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/shared_pool/shared_pool.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/shared_pool/shared_pool.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/config/new_grpc_mux_impl.cc b/source/common/config/new_grpc_mux_impl.cc
index 62a2ba950d155..07b55626b83a8 100644
--- a/source/common/config/new_grpc_mux_impl.cc
+++ b/source/common/config/new_grpc_mux_impl.cc
@@ -1,17 +1,17 @@
-#include "common/config/new_grpc_mux_impl.h"
+#include "source/common/config/new_grpc_mux_impl.h"
 
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/backoff_strategy.h"
-#include "common/common/token_bucket_impl.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/config/xds_context_params.h"
-#include "common/config/xds_resource.h"
-#include "common/memory/utils.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/token_bucket_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/config/xds_context_params.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/memory/utils.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/new_grpc_mux_impl.h b/source/common/config/new_grpc_mux_impl.h
index 570cc7dfafc44..71ed0735ecf9a 100644
--- a/source/common/config/new_grpc_mux_impl.h
+++ b/source/common/config/new_grpc_mux_impl.h
@@ -9,14 +9,14 @@
 #include "envoy/config/subscription.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/logger.h"
-#include "common/config/api_version.h"
-#include "common/config/delta_subscription_state.h"
-#include "common/config/grpc_stream.h"
-#include "common/config/pausable_ack_queue.h"
-#include "common/config/watch_map.h"
-#include "common/grpc/common.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/delta_subscription_state.h"
+#include "source/common/config/grpc_stream.h"
+#include "source/common/config/pausable_ack_queue.h"
+#include "source/common/config/watch_map.h"
+#include "source/common/grpc/common.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/opaque_resource_decoder_impl.h b/source/common/config/opaque_resource_decoder_impl.h
index ef066101952b2..bb0af603f15d1 100644
--- a/source/common/config/opaque_resource_decoder_impl.h
+++ b/source/common/config/opaque_resource_decoder_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/subscription.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/pausable_ack_queue.cc b/source/common/config/pausable_ack_queue.cc
index b18cb9754f5eb..d2e433c63d383 100644
--- a/source/common/config/pausable_ack_queue.cc
+++ b/source/common/config/pausable_ack_queue.cc
@@ -1,8 +1,8 @@
-#include "common/config/pausable_ack_queue.h"
+#include "source/common/config/pausable_ack_queue.h"
 
 #include <list>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/pausable_ack_queue.h b/source/common/config/pausable_ack_queue.h
index eb04358398df7..07af25fa9bfd8 100644
--- a/source/common/config/pausable_ack_queue.h
+++ b/source/common/config/pausable_ack_queue.h
@@ -2,7 +2,7 @@
 
 #include <list>
 
-#include "common/config/update_ack.h"
+#include "source/common/config/update_ack.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/config/remote_data_fetcher.cc b/source/common/config/remote_data_fetcher.cc
index c6f8382c5c152..66e0e9074e1ef 100644
--- a/source/common/config/remote_data_fetcher.cc
+++ b/source/common/config/remote_data_fetcher.cc
@@ -1,12 +1,12 @@
-#include "common/config/remote_data_fetcher.h"
+#include "source/common/config/remote_data_fetcher.h"
 
 #include "envoy/config/core/v3/http_uri.pb.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/resource_name.h b/source/common/config/resource_name.h
index b21a7d47d7108..b3ca8e8175266 100644
--- a/source/common/config/resource_name.h
+++ b/source/common/config/resource_name.h
@@ -5,8 +5,8 @@
 
 #include "envoy/config/core/v3/config_source.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/api_type_oracle.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/api_type_oracle.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/runtime_utility.cc b/source/common/config/runtime_utility.cc
index b3db72983f981..07f06af8e33e2 100644
--- a/source/common/config/runtime_utility.cc
+++ b/source/common/config/runtime_utility.cc
@@ -1,4 +1,4 @@
-#include "common/config/runtime_utility.h"
+#include "source/common/config/runtime_utility.h"
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
diff --git a/source/common/config/subscription_base.h b/source/common/config/subscription_base.h
index 765e28934ebcb..447931d1c36b1 100644
--- a/source/common/config/subscription_base.h
+++ b/source/common/config/subscription_base.h
@@ -2,8 +2,8 @@
 
 #include "envoy/config/subscription.h"
 
-#include "common/config/opaque_resource_decoder_impl.h"
-#include "common/config/resource_name.h"
+#include "source/common/config/opaque_resource_decoder_impl.h"
+#include "source/common/config/resource_name.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/subscription_factory_impl.cc b/source/common/config/subscription_factory_impl.cc
index 277a3524e7282..eadf0dd3bfda0 100644
--- a/source/common/config/subscription_factory_impl.cc
+++ b/source/common/config/subscription_factory_impl.cc
@@ -1,18 +1,18 @@
-#include "common/config/subscription_factory_impl.h"
+#include "source/common/config/subscription_factory_impl.h"
 
 #include "envoy/config/core/v3/config_source.pb.h"
 
-#include "common/config/filesystem_subscription_impl.h"
-#include "common/config/grpc_mux_impl.h"
-#include "common/config/grpc_subscription_impl.h"
-#include "common/config/http_subscription_impl.h"
-#include "common/config/new_grpc_mux_impl.h"
-#include "common/config/type_to_endpoint.h"
-#include "common/config/utility.h"
-#include "common/config/xds_resource.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/filesystem_subscription_impl.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/config/grpc_subscription_impl.h"
+#include "source/common/config/http_subscription_impl.h"
+#include "source/common/config/new_grpc_mux_impl.h"
+#include "source/common/config/type_to_endpoint.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/subscription_factory_impl.h b/source/common/config/subscription_factory_impl.h
index 246d5afe65746..07cfa5d17520a 100644
--- a/source/common/config/subscription_factory_impl.h
+++ b/source/common/config/subscription_factory_impl.h
@@ -8,7 +8,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/ttl.cc b/source/common/config/ttl.cc
index 07dfec5fe33cf..86dd100c71fc0 100644
--- a/source/common/config/ttl.cc
+++ b/source/common/config/ttl.cc
@@ -1,4 +1,4 @@
-#include "common/config/ttl.h"
+#include "source/common/config/ttl.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/type_to_endpoint.cc b/source/common/config/type_to_endpoint.cc
index 1c32fe47ad2c5..2ac9af5b27f54 100644
--- a/source/common/config/type_to_endpoint.cc
+++ b/source/common/config/type_to_endpoint.cc
@@ -1,8 +1,8 @@
-#include "common/config/type_to_endpoint.h"
+#include "source/common/config/type_to_endpoint.h"
 
 #include "envoy/annotations/resource.pb.h"
 
-#include "common/grpc/common.h"
+#include "source/common/grpc/common.h"
 
 // API_NO_BOOST_FILE
 
diff --git a/source/common/config/type_to_endpoint.h b/source/common/config/type_to_endpoint.h
index ed9f9e6e5c89d..7c9f5a5007374 100644
--- a/source/common/config/type_to_endpoint.h
+++ b/source/common/config/type_to_endpoint.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/config_source.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc
index 440957d0ef55c..b7288b401ed7f 100644
--- a/source/common/config/utility.cc
+++ b/source/common/config/utility.cc
@@ -1,4 +1,4 @@
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
@@ -9,18 +9,18 @@
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/common/utility.h"
-#include "common/config/api_type_oracle.h"
-#include "common/config/version_converter.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/histogram_impl.h"
-#include "common/stats/stats_matcher_impl.h"
-#include "common/stats/tag_producer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_type_oracle.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/stats_matcher_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/utility.h b/source/common/config/utility.h
index 93304377ccf4b..f4bc2be309ffd 100644
--- a/source/common/config/utility.h
+++ b/source/common/config/utility.h
@@ -19,16 +19,16 @@
 #include "envoy/stats/tag_producer.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/backoff_strategy.h"
-#include "common/common/hash.h"
-#include "common/common/hex.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "udpa/type/v1/typed_struct.pb.h"
 
diff --git a/source/common/config/version_converter.cc b/source/common/config/version_converter.cc
index 0477c29bcf861..7129374c8bcee 100644
--- a/source/common/config/version_converter.cc
+++ b/source/common/config/version_converter.cc
@@ -1,12 +1,12 @@
-#include "common/config/version_converter.h"
+#include "source/common/config/version_converter.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/config/api_type_oracle.h"
-#include "common/protobuf/visitor.h"
-#include "common/protobuf/well_known.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/config/api_type_oracle.h"
+#include "source/common/protobuf/visitor.h"
+#include "source/common/protobuf/well_known.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/config/version_converter.h b/source/common/config/version_converter.h
index db9c765239318..a7f5db3e9d8a9 100644
--- a/source/common/config/version_converter.h
+++ b/source/common/config/version_converter.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/config_source.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 // Convenience macro for downgrading a message and obtaining a reference.
 #define API_DOWNGRADE(msg) (*Envoy::Config::VersionConverter::downgrade(msg)->msg_)
diff --git a/source/common/config/watch_map.cc b/source/common/config/watch_map.cc
index fd65b5375b1f9..992fdc35393cf 100644
--- a/source/common/config/watch_map.cc
+++ b/source/common/config/watch_map.cc
@@ -1,11 +1,11 @@
-#include "common/config/watch_map.h"
+#include "source/common/config/watch_map.h"
 
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/utility.h"
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/xds_resource.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/xds_resource.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/watch_map.h b/source/common/config/watch_map.h
index 768117e93be6c..d1139e23e0afb 100644
--- a/source/common/config/watch_map.h
+++ b/source/common/config/watch_map.h
@@ -7,8 +7,8 @@
 #include "envoy/config/subscription.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/source/common/config/watched_directory.cc b/source/common/config/watched_directory.cc
index c3843ee3f71c7..fc2a3a832a505 100644
--- a/source/common/config/watched_directory.cc
+++ b/source/common/config/watched_directory.cc
@@ -1,4 +1,4 @@
-#include "common/config/watched_directory.h"
+#include "source/common/config/watched_directory.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/well_known_names.cc b/source/common/config/well_known_names.cc
index 53388bf160429..71a03839b1a7b 100644
--- a/source/common/config/well_known_names.cc
+++ b/source/common/config/well_known_names.cc
@@ -1,4 +1,4 @@
-#include "common/config/well_known_names.h"
+#include "source/common/config/well_known_names.h"
 
 #include "absl/strings/str_replace.h"
 
diff --git a/source/common/config/well_known_names.h b/source/common/config/well_known_names.h
index 5b809ec8366ce..0b694392a4aeb 100644
--- a/source/common/config/well_known_names.h
+++ b/source/common/config/well_known_names.h
@@ -5,9 +5,9 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/regex.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/regex.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/xds_context_params.cc b/source/common/config/xds_context_params.cc
index d618364dcce51..7a2ad91ec33dd 100644
--- a/source/common/config/xds_context_params.cc
+++ b/source/common/config/xds_context_params.cc
@@ -1,7 +1,7 @@
-#include "common/config/xds_context_params.h"
+#include "source/common/config/xds_context_params.h"
 
-#include "common/common/macros.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/xds_context_params.h b/source/common/config/xds_context_params.h
index 2627ba8e1513c..68519eb414d07 100644
--- a/source/common/config/xds_context_params.h
+++ b/source/common/config/xds_context_params.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "xds/core/v3/context_params.pb.h"
diff --git a/source/common/config/xds_resource.cc b/source/common/config/xds_resource.cc
index 414d2f6b30185..9baa14ea8a955 100644
--- a/source/common/config/xds_resource.cc
+++ b/source/common/config/xds_resource.cc
@@ -1,9 +1,9 @@
-#include "common/config/xds_resource.h"
+#include "source/common/config/xds_resource.h"
 
 #include <algorithm>
 
-#include "common/common/fmt.h"
-#include "common/http/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/utility.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
diff --git a/source/common/conn_pool/BUILD b/source/common/conn_pool/BUILD
index fafa208adc168..d526dfbf956b2 100644
--- a/source/common/conn_pool/BUILD
+++ b/source/common/conn_pool/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["conn_pool_base.cc"],
     hdrs = ["conn_pool_base.h"],
     deps = [
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:linked_object",
         "//source/common/stats:timespan_lib",
         "//source/common/upstream:upstream_lib",
diff --git a/source/common/conn_pool/conn_pool_base.cc b/source/common/conn_pool/conn_pool_base.cc
index a1982b7fa0fe8..9483fcafbab48 100644
--- a/source/common/conn_pool/conn_pool_base.cc
+++ b/source/common/conn_pool/conn_pool_base.cc
@@ -1,10 +1,10 @@
-#include "common/conn_pool/conn_pool_base.h"
+#include "source/common/conn_pool/conn_pool_base.h"
 
-#include "common/common/assert.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stats/timespan_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace ConnectionPool {
diff --git a/source/common/conn_pool/conn_pool_base.h b/source/common/conn_pool/conn_pool_base.h
index dd72cc83a30bd..1332e46009c4b 100644
--- a/source/common/conn_pool/conn_pool_base.h
+++ b/source/common/conn_pool/conn_pool_base.h
@@ -6,8 +6,8 @@
 #include "envoy/stats/timespan.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/dump_state_utils.h"
-#include "common/common/linked_object.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/linked_object.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/crypto/BUILD b/source/common/crypto/BUILD
index e47c843fe72a6..07b461c6ab0b7 100644
--- a/source/common/crypto/BUILD
+++ b/source/common/crypto/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
         "utility.h",
     ],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common/crypto:crypto_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common/crypto:crypto_interface",
         "//source/common/common:assert_lib",
         "//source/common/singleton:threadsafe_singleton",
     ],
diff --git a/source/common/crypto/utility.h b/source/common/crypto/utility.h
index 4f81b0d73e6f6..2dbc4427e8da3 100644
--- a/source/common/crypto/utility.h
+++ b/source/common/crypto/utility.h
@@ -6,7 +6,7 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/crypto/crypto.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/event/BUILD b/source/common/event/BUILD
index 35e5bb6601b1b..f847b9dd614fa 100644
--- a/source/common/event/BUILD
+++ b/source/common/event/BUILD
@@ -25,6 +25,7 @@ envoy_cc_library(
             "posix/signal_impl.h",
         ],
     }),
+    include_prefix = "source/common/event",
     strip_include_prefix = select({
         "//bazel:windows_x86_64": "win32",
         "//conditions:default": "posix",
@@ -35,11 +36,11 @@ envoy_cc_library(
         ":real_time_system_lib",
         ":signal_lib",
         ":scaled_range_timer_manager_lib",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:signal_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:listener_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:signal_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:listener_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:thread_lib",
         "//source/common/filesystem:watcher_lib",
@@ -61,10 +62,11 @@ envoy_cc_posix_library(
     name = "signal_impl_lib",
     srcs = ["posix/signal_impl.cc"],
     hdrs = ["posix/signal_impl.h"],
+    include_prefix = "source/common/event",
     strip_include_prefix = "posix",
     deps = [
         ":dispatcher_includes",
-        "//include/envoy/event:signal_interface",
+        "//envoy/event:signal_interface",
         "//source/common/common:thread_lib",
     ],
 )
@@ -73,10 +75,11 @@ envoy_cc_win32_library(
     name = "signal_impl_lib",
     srcs = ["win32/signal_impl.cc"],
     hdrs = ["win32/signal_impl.h"],
+    include_prefix = "source/common/event",
     strip_include_prefix = "win32",
     deps = [
         ":dispatcher_includes",
-        "//include/envoy/event:signal_interface",
+        "//envoy/event:signal_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:thread_lib",
         "//source/common/network:default_socket_interface_lib",
@@ -99,7 +102,7 @@ envoy_cc_library(
     deps = [
         ":event_impl_base_lib",
         ":timer_lib",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:utility_lib",
         "//source/common/event:dispatcher_includes",
     ],
@@ -119,11 +122,11 @@ envoy_cc_library(
     deps = [
         ":libevent_lib",
         ":libevent_scheduler_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/network:connection_handler_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/network:connection_handler_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:thread_lib",
         "//source/common/signal:fatal_error_handler_lib",
@@ -157,8 +160,8 @@ envoy_cc_library(
         ":libevent_lib",
         ":schedulable_cb_lib",
         ":timer_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -171,7 +174,7 @@ envoy_cc_library(
     deps = [
         ":event_impl_base_lib",
         ":libevent_lib",
-        "//include/envoy/event:schedulable_cb_interface",
+        "//envoy/event:schedulable_cb_interface",
     ],
 )
 
@@ -183,7 +186,7 @@ envoy_cc_library(
     deps = [
         ":event_impl_base_lib",
         ":libevent_lib",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:scope_tracker",
         "//source/common/common:utility_lib",
     ],
@@ -193,8 +196,8 @@ envoy_cc_library(
     name = "deferred_task",
     hdrs = ["deferred_task.h"],
     deps = [
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
     ],
 )
 
@@ -203,9 +206,9 @@ envoy_cc_library(
     srcs = ["scaled_range_timer_manager_impl.cc"],
     hdrs = ["scaled_range_timer_manager_impl.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:scaled_range_timer_manager_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:scaled_range_timer_manager_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:scope_tracker",
     ],
 )
diff --git a/source/common/event/dispatcher_impl.cc b/source/common/event/dispatcher_impl.cc
index fa4f98e747ddc..e6ce9164b0e8a 100644
--- a/source/common/event/dispatcher_impl.cc
+++ b/source/common/event/dispatcher_impl.cc
@@ -1,4 +1,4 @@
-#include "common/event/dispatcher_impl.h"
+#include "source/common/event/dispatcher_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -11,30 +11,30 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/network/listener.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-#include "common/event/file_event_impl.h"
-#include "common/event/libevent_scheduler.h"
-#include "common/event/scaled_range_timer_manager_impl.h"
-#include "common/event/signal_impl.h"
-#include "common/event/timer_impl.h"
-#include "common/filesystem/watcher_impl.h"
-#include "common/network/connection_impl.h"
-#include "common/network/dns_impl.h"
-#include "common/network/tcp_listener_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/file_event_impl.h"
+#include "source/common/event/libevent_scheduler.h"
+#include "source/common/event/scaled_range_timer_manager_impl.h"
+#include "source/common/event/signal_impl.h"
+#include "source/common/event/timer_impl.h"
+#include "source/common/filesystem/watcher_impl.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/dns_impl.h"
+#include "source/common/network/tcp_listener_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "event2/event.h"
 
 #ifdef ENVOY_HANDLE_SIGNALS
-#include "common/signal/signal_action.h"
+#include "source/common/signal/signal_action.h"
 #endif
 
 #ifdef __APPLE__
-#include "common/network/apple_dns_impl.h"
+#include "source/common/network/apple_dns_impl.h"
 #endif
 
 namespace Envoy {
diff --git a/source/common/event/dispatcher_impl.h b/source/common/event/dispatcher_impl.h
index 12df2c5030c14..601bc206c1c31 100644
--- a/source/common/event/dispatcher_impl.h
+++ b/source/common/event/dispatcher_impl.h
@@ -14,11 +14,11 @@
 #include "envoy/network/connection_handler.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/event/libevent.h"
-#include "common/event/libevent_scheduler.h"
-#include "common/signal/fatal_error_handler.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/libevent.h"
+#include "source/common/event/libevent_scheduler.h"
+#include "source/common/signal/fatal_error_handler.h"
 
 #include "absl/container/inlined_vector.h"
 
diff --git a/source/common/event/event_impl_base.cc b/source/common/event/event_impl_base.cc
index c14eb1874bc12..e7cb00f066960 100644
--- a/source/common/event/event_impl_base.cc
+++ b/source/common/event/event_impl_base.cc
@@ -1,4 +1,4 @@
-#include "common/event/event_impl_base.h"
+#include "source/common/event/event_impl_base.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/file_event_impl.cc b/source/common/event/file_event_impl.cc
index 45f01dffa467c..5b83e694d5481 100644
--- a/source/common/event/file_event_impl.cc
+++ b/source/common/event/file_event_impl.cc
@@ -1,9 +1,9 @@
-#include "common/event/file_event_impl.h"
+#include "source/common/event/file_event_impl.h"
 
 #include <cstdint>
 
-#include "common/common/assert.h"
-#include "common/event/dispatcher_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/dispatcher_impl.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/file_event_impl.h b/source/common/event/file_event_impl.h
index a0dd6a362334b..acb43334ccc3a 100644
--- a/source/common/event/file_event_impl.h
+++ b/source/common/event/file_event_impl.h
@@ -4,8 +4,8 @@
 
 #include "envoy/event/file_event.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/event/event_impl_base.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/event_impl_base.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/libevent.cc b/source/common/event/libevent.cc
index c7ec364ddf249..d84dc16d4c519 100644
--- a/source/common/event/libevent.cc
+++ b/source/common/event/libevent.cc
@@ -1,8 +1,8 @@
-#include "common/event/libevent.h"
+#include "source/common/event/libevent.h"
 
 #include <csignal>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "event2/thread.h"
 
diff --git a/source/common/event/libevent.h b/source/common/event/libevent.h
index 304b326fb4ddf..6687333926ca6 100644
--- a/source/common/event/libevent.h
+++ b/source/common/event/libevent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/c_smart_ptr.h"
+#include "source/common/common/c_smart_ptr.h"
 
 struct event_base;
 extern "C" {
diff --git a/source/common/event/libevent_scheduler.cc b/source/common/event/libevent_scheduler.cc
index e0f21c5da2ba8..b41c8db0901dd 100644
--- a/source/common/event/libevent_scheduler.cc
+++ b/source/common/event/libevent_scheduler.cc
@@ -1,8 +1,8 @@
-#include "common/event/libevent_scheduler.h"
+#include "source/common/event/libevent_scheduler.h"
 
-#include "common/common/assert.h"
-#include "common/event/schedulable_cb_impl.h"
-#include "common/event/timer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/schedulable_cb_impl.h"
+#include "source/common/event/timer_impl.h"
 
 #include "event2/util.h"
 
diff --git a/source/common/event/libevent_scheduler.h b/source/common/event/libevent_scheduler.h
index 063f3061a5ce8..93e81ef424bac 100644
--- a/source/common/event/libevent_scheduler.h
+++ b/source/common/event/libevent_scheduler.h
@@ -6,7 +6,7 @@
 #include "envoy/event/schedulable_cb.h"
 #include "envoy/event/timer.h"
 
-#include "common/event/libevent.h"
+#include "source/common/event/libevent.h"
 
 #include "event2/event.h"
 #include "event2/watch.h"
diff --git a/source/common/event/posix/signal_impl.cc b/source/common/event/posix/signal_impl.cc
index 459e3f9b0dead..3e3a55160efcc 100644
--- a/source/common/event/posix/signal_impl.cc
+++ b/source/common/event/posix/signal_impl.cc
@@ -1,5 +1,5 @@
-#include "common/event/dispatcher_impl.h"
-#include "common/event/signal_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/signal_impl.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/posix/signal_impl.h b/source/common/event/posix/signal_impl.h
index b2d6014b041a4..d48aed73aad52 100644
--- a/source/common/event/posix/signal_impl.h
+++ b/source/common/event/posix/signal_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/event/signal.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/event/event_impl_base.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/event_impl_base.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/real_time_system.cc b/source/common/event/real_time_system.cc
index 7f022c23a0bb8..7f8f76005fe68 100644
--- a/source/common/event/real_time_system.cc
+++ b/source/common/event/real_time_system.cc
@@ -1,9 +1,9 @@
-#include "common/event/real_time_system.h"
+#include "source/common/event/real_time_system.h"
 
 #include <chrono>
 
-#include "common/common/assert.h"
-#include "common/event/timer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/timer_impl.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/real_time_system.h b/source/common/event/real_time_system.h
index a5b86466eec1f..01b593d4d5f12 100644
--- a/source/common/event/real_time_system.h
+++ b/source/common/event/real_time_system.h
@@ -2,7 +2,7 @@
 
 #include "envoy/event/timer.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/scaled_range_timer_manager_impl.cc b/source/common/event/scaled_range_timer_manager_impl.cc
index 919116ae06d22..81e4e91afd485 100644
--- a/source/common/event/scaled_range_timer_manager_impl.cc
+++ b/source/common/event/scaled_range_timer_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "common/event/scaled_range_timer_manager_impl.h"
+#include "source/common/event/scaled_range_timer_manager_impl.h"
 
 #include <chrono>
 #include <cmath>
@@ -6,8 +6,8 @@
 
 #include "envoy/event/timer.h"
 
-#include "common/common/assert.h"
-#include "common/common/scope_tracker.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/scope_tracker.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/schedulable_cb_impl.cc b/source/common/event/schedulable_cb_impl.cc
index 2109af17972eb..f59ea2ff5bcb5 100644
--- a/source/common/event/schedulable_cb_impl.cc
+++ b/source/common/event/schedulable_cb_impl.cc
@@ -1,6 +1,6 @@
-#include "common/event/schedulable_cb_impl.h"
+#include "source/common/event/schedulable_cb_impl.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/schedulable_cb_impl.h b/source/common/event/schedulable_cb_impl.h
index 48c6224f6a967..be9e434140c0c 100644
--- a/source/common/event/schedulable_cb_impl.h
+++ b/source/common/event/schedulable_cb_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/event/schedulable_cb.h"
 
-#include "common/event/event_impl_base.h"
-#include "common/event/libevent.h"
+#include "source/common/event/event_impl_base.h"
+#include "source/common/event/libevent.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/timer_impl.cc b/source/common/event/timer_impl.cc
index 3a2189f95c40a..813bd7af55242 100644
--- a/source/common/event/timer_impl.cc
+++ b/source/common/event/timer_impl.cc
@@ -1,8 +1,8 @@
-#include "common/event/timer_impl.h"
+#include "source/common/event/timer_impl.h"
 
 #include <chrono>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/timer_impl.h b/source/common/event/timer_impl.h
index bd56d528409e3..20641db7e29a1 100644
--- a/source/common/event/timer_impl.h
+++ b/source/common/event/timer_impl.h
@@ -4,10 +4,10 @@
 
 #include "envoy/event/timer.h"
 
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/event/event_impl_base.h"
-#include "common/event/libevent.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/event_impl_base.h"
+#include "source/common/event/libevent.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/common/event/win32/signal_impl.cc b/source/common/event/win32/signal_impl.cc
index 4ffd62b73094b..d2a96b0de6fe3 100644
--- a/source/common/event/win32/signal_impl.cc
+++ b/source/common/event/win32/signal_impl.cc
@@ -1,6 +1,6 @@
-#include "common/api/os_sys_calls_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/event/signal_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/signal_impl.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/event/win32/signal_impl.h b/source/common/event/win32/signal_impl.h
index 51e21e4f1ec90..fc7a05cf5697a 100644
--- a/source/common/event/win32/signal_impl.h
+++ b/source/common/event/win32/signal_impl.h
@@ -3,10 +3,10 @@
 #include "envoy/event/signal.h"
 #include "envoy/network/io_handle.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/event/event_impl_base.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/event_impl_base.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/filesystem/BUILD b/source/common/filesystem/BUILD
index afcf463ef0b38..9fc6afae7863f 100644
--- a/source/common/filesystem/BUILD
+++ b/source/common/filesystem/BUILD
@@ -21,9 +21,10 @@ envoy_cc_win32_library(
     name = "directory_iterator_impl_lib",
     srcs = ["win32/directory_iterator_impl.cc"],
     hdrs = ["win32/directory_iterator_impl.h"],
+    include_prefix = "source/common/filesystem",
     strip_include_prefix = "win32",
     deps = [
-        "//include/envoy/filesystem:filesystem_interface",
+        "//envoy/filesystem:filesystem_interface",
     ],
 )
 
@@ -31,9 +32,10 @@ envoy_cc_posix_library(
     name = "directory_iterator_impl_lib",
     srcs = ["posix/directory_iterator_impl.cc"],
     hdrs = ["posix/directory_iterator_impl.h"],
+    include_prefix = "source/common/filesystem",
     strip_include_prefix = "posix",
     deps = [
-        "//include/envoy/filesystem:filesystem_interface",
+        "//envoy/filesystem:filesystem_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:utility_lib",
     ],
@@ -48,6 +50,7 @@ envoy_cc_posix_library(
     name = "filesystem_impl_lib",
     srcs = ["posix/filesystem_impl.cc"],
     hdrs = ["posix/filesystem_impl.h"],
+    include_prefix = "source/common/filesystem",
     strip_include_prefix = "posix",
     deps = [
         ":file_shared_lib",
@@ -58,6 +61,7 @@ envoy_cc_win32_library(
     name = "filesystem_impl_lib",
     srcs = ["win32/filesystem_impl.cc"],
     hdrs = ["win32/filesystem_impl.h"],
+    include_prefix = "source/common/filesystem",
     strip_include_prefix = "win32",
     deps = [
         ":file_shared_lib",
@@ -69,7 +73,7 @@ envoy_cc_library(
     srcs = ["file_shared_impl.cc"],
     hdrs = ["file_shared_impl.h"],
     deps = [
-        "//include/envoy/filesystem:filesystem_interface",
+        "//envoy/filesystem:filesystem_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
     ],
@@ -102,14 +106,15 @@ envoy_cc_library(
     external_deps = [
         "event",
     ],
+    include_prefix = "source/common/filesystem",
     strip_include_prefix = select({
         "//bazel:apple": "kqueue",
         "//bazel:windows_x86_64": "win32",
         "//conditions:default": "inotify",
     }),
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:linked_object",
         "//source/common/common:minimal_logger_lib",
diff --git a/source/common/filesystem/directory.h b/source/common/filesystem/directory.h
index a949ce724a722..2ca76e19fc0d1 100644
--- a/source/common/filesystem/directory.h
+++ b/source/common/filesystem/directory.h
@@ -4,7 +4,7 @@
 
 #include "envoy/filesystem/filesystem.h"
 
-#include "common/filesystem/directory_iterator_impl.h"
+#include "source/common/filesystem/directory_iterator_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/file_shared_impl.cc b/source/common/filesystem/file_shared_impl.cc
index 510912e220dee..f4ad412f61cfa 100644
--- a/source/common/filesystem/file_shared_impl.cc
+++ b/source/common/filesystem/file_shared_impl.cc
@@ -1,6 +1,6 @@
-#include "common/filesystem/file_shared_impl.h"
+#include "source/common/filesystem/file_shared_impl.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/file_shared_impl.h b/source/common/filesystem/file_shared_impl.h
index b3834938b7559..fd81d03ec794e 100644
--- a/source/common/filesystem/file_shared_impl.h
+++ b/source/common/filesystem/file_shared_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/filesystem/filesystem.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/inotify/watcher_impl.cc b/source/common/filesystem/inotify/watcher_impl.cc
index 2aeb9b6ef30b7..a30d6ef48e56e 100644
--- a/source/common/filesystem/inotify/watcher_impl.cc
+++ b/source/common/filesystem/inotify/watcher_impl.cc
@@ -8,10 +8,10 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/file_event.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/filesystem/watcher_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/watcher_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/inotify/watcher_impl.h b/source/common/filesystem/inotify/watcher_impl.h
index 9b416f5c9c031..73c4439fc53a9 100644
--- a/source/common/filesystem/inotify/watcher_impl.h
+++ b/source/common/filesystem/inotify/watcher_impl.h
@@ -8,7 +8,7 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/filesystem/watcher.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/filesystem/kqueue/watcher_impl.cc b/source/common/filesystem/kqueue/watcher_impl.cc
index 2452eeb688b29..47edf3a2c2912 100644
--- a/source/common/filesystem/kqueue/watcher_impl.cc
+++ b/source/common/filesystem/kqueue/watcher_impl.cc
@@ -6,10 +6,10 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/file_event.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/filesystem/watcher_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/watcher_impl.h"
 
 #include "event2/event.h"
 
diff --git a/source/common/filesystem/kqueue/watcher_impl.h b/source/common/filesystem/kqueue/watcher_impl.h
index e34d905489792..4a86f8be4ca5e 100644
--- a/source/common/filesystem/kqueue/watcher_impl.h
+++ b/source/common/filesystem/kqueue/watcher_impl.h
@@ -8,8 +8,8 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/filesystem/watcher.h"
 
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/filesystem/posix/directory_iterator_impl.cc b/source/common/filesystem/posix/directory_iterator_impl.cc
index 34a0ca9b2c4cd..65c1fe2bd7dfe 100644
--- a/source/common/filesystem/posix/directory_iterator_impl.cc
+++ b/source/common/filesystem/posix/directory_iterator_impl.cc
@@ -1,8 +1,8 @@
 #include "envoy/common/exception.h"
 
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/filesystem/directory_iterator_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/directory_iterator_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/posix/directory_iterator_impl.h b/source/common/filesystem/posix/directory_iterator_impl.h
index abbe8e3fc1aa9..ffb2a6b2d62ab 100644
--- a/source/common/filesystem/posix/directory_iterator_impl.h
+++ b/source/common/filesystem/posix/directory_iterator_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/filesystem/filesystem.h"
 
-#include "common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/posix/filesystem_impl.cc b/source/common/filesystem/posix/filesystem_impl.cc
index 0e514c91261a8..c89cacd6dafb4 100644
--- a/source/common/filesystem/posix/filesystem_impl.cc
+++ b/source/common/filesystem/posix/filesystem_impl.cc
@@ -11,11 +11,11 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/filesystem/posix/filesystem_impl.h b/source/common/filesystem/posix/filesystem_impl.h
index 65ff10c64c1a3..98abed720c61f 100644
--- a/source/common/filesystem/posix/filesystem_impl.h
+++ b/source/common/filesystem/posix/filesystem_impl.h
@@ -5,7 +5,7 @@
 
 #include "envoy/api/os_sys_calls.h"
 
-#include "common/filesystem/file_shared_impl.h"
+#include "source/common/filesystem/file_shared_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/win32/directory_iterator_impl.cc b/source/common/filesystem/win32/directory_iterator_impl.cc
index 559cfda7eb271..645d5b16e5211 100644
--- a/source/common/filesystem/win32/directory_iterator_impl.cc
+++ b/source/common/filesystem/win32/directory_iterator_impl.cc
@@ -1,7 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/common/fmt.h"
-#include "common/filesystem/directory_iterator_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/filesystem/directory_iterator_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/win32/filesystem_impl.cc b/source/common/filesystem/win32/filesystem_impl.cc
index 058cca07fe0b2..9ec504375951d 100644
--- a/source/common/filesystem/win32/filesystem_impl.cc
+++ b/source/common/filesystem/win32/filesystem_impl.cc
@@ -8,9 +8,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/filesystem/win32/filesystem_impl.h b/source/common/filesystem/win32/filesystem_impl.h
index fe9b1fea0dc15..4c009dd30beac 100644
--- a/source/common/filesystem/win32/filesystem_impl.h
+++ b/source/common/filesystem/win32/filesystem_impl.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 
-#include "common/filesystem/file_shared_impl.h"
+#include "source/common/filesystem/file_shared_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/win32/watcher_impl.cc b/source/common/filesystem/win32/watcher_impl.cc
index f7e5ed12dfa87..e4a3dd7e87f9e 100644
--- a/source/common/filesystem/win32/watcher_impl.cc
+++ b/source/common/filesystem/win32/watcher_impl.cc
@@ -1,8 +1,8 @@
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/thread_impl.h"
-#include "common/filesystem/watcher_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/filesystem/watcher_impl.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/source/common/filesystem/win32/watcher_impl.h b/source/common/filesystem/win32/watcher_impl.h
index 0633b254b4fca..2742293db6485 100644
--- a/source/common/filesystem/win32/watcher_impl.h
+++ b/source/common/filesystem/win32/watcher_impl.h
@@ -13,12 +13,12 @@
 #include "envoy/filesystem/watcher.h"
 #include "envoy/network/io_handle.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/thread_impl.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/filter/http/BUILD b/source/common/filter/http/BUILD
index 3248d73417450..683467b9530ff 100644
--- a/source/common/filter/http/BUILD
+++ b/source/common/filter/http/BUILD
@@ -13,11 +13,11 @@ envoy_cc_library(
     srcs = ["filter_config_discovery_impl.cc"],
     hdrs = ["filter_config_discovery_impl.h"],
     deps = [
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/filter/http:filter_config_provider_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/filter/http:filter_config_provider_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:containers_lib",
         "//source/common/config:subscription_base_interface",
         "//source/common/config:subscription_factory_lib",
diff --git a/source/common/filter/http/filter_config_discovery_impl.cc b/source/common/filter/http/filter_config_discovery_impl.cc
index 8f5f74b000258..33c47f94eec93 100644
--- a/source/common/filter/http/filter_config_discovery_impl.cc
+++ b/source/common/filter/http/filter_config_discovery_impl.cc
@@ -1,4 +1,4 @@
-#include "common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/filter/http/filter_config_discovery_impl.h"
 
 #include "envoy/config/core/v3/extension.pb.h"
 #include "envoy/config/core/v3/extension.pb.validate.h"
@@ -6,11 +6,11 @@
 #include "envoy/http/filter.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/containers.h"
-#include "common/common/thread.h"
-#include "common/config/utility.h"
-#include "common/grpc/common.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/containers.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/filter/http/filter_config_discovery_impl.h b/source/common/filter/http/filter_config_discovery_impl.h
index 5027bc863f5f5..a207eca3099d0 100644
--- a/source/common/filter/http/filter_config_discovery_impl.h
+++ b/source/common/filter/http/filter_config_discovery_impl.h
@@ -12,10 +12,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/assert.h"
-#include "common/config/subscription_base.h"
-#include "common/init/manager_impl.h"
-#include "common/init/target_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/target_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/source/common/formatter/BUILD b/source/common/formatter/BUILD
index 3acb8213a4637..202ad9d030cda 100644
--- a/source/common/formatter/BUILD
+++ b/source/common/formatter/BUILD
@@ -14,11 +14,11 @@ envoy_cc_library(
     hdrs = ["substitution_formatter.h"],
     external_deps = ["abseil_str_format"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/formatter:substitution_formatter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stream_info:stream_info_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/api:api_interface",
+        "//envoy/formatter:substitution_formatter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stream_info:stream_info_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
         "//source/common/config:datasource_lib",
diff --git a/source/common/formatter/substitution_format_string.cc b/source/common/formatter/substitution_format_string.cc
index 5cd4a2f22e355..72937757950aa 100644
--- a/source/common/formatter/substitution_format_string.cc
+++ b/source/common/formatter/substitution_format_string.cc
@@ -1,10 +1,10 @@
-#include "common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_format_string.h"
 
 #include "envoy/api/api.h"
 
-#include "common/config/datasource.h"
-#include "common/config/utility.h"
-#include "common/formatter/substitution_formatter.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/utility.h"
+#include "source/common/formatter/substitution_formatter.h"
 
 namespace Envoy {
 namespace Formatter {
diff --git a/source/common/formatter/substitution_format_string.h b/source/common/formatter/substitution_format_string.h
index d60033cabafd6..35d36f0c4de79 100644
--- a/source/common/formatter/substitution_format_string.h
+++ b/source/common/formatter/substitution_format_string.h
@@ -6,7 +6,7 @@
 #include "envoy/config/core/v3/substitution_format_string.pb.h"
 #include "envoy/formatter/substitution_formatter.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Formatter {
diff --git a/source/common/formatter/substitution_formatter.cc b/source/common/formatter/substitution_formatter.cc
index 6c1c48c513202..0d13ec9600323 100644
--- a/source/common/formatter/substitution_formatter.cc
+++ b/source/common/formatter/substitution_formatter.cc
@@ -1,4 +1,4 @@
-#include "common/formatter/substitution_formatter.h"
+#include "source/common/formatter/substitution_formatter.h"
 
 #include <climits>
 #include <cstdint>
@@ -9,20 +9,20 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/thread.h"
-#include "common/common/utility.h"
-#include "common/config/metadata.h"
-#include "common/grpc/common.h"
-#include "common/grpc/status.h"
-#include "common/http/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stream_info/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stream_info/utility.h"
 
 #include "absl/strings/str_split.h"
 #include "fmt/format.h"
diff --git a/source/common/formatter/substitution_formatter.h b/source/common/formatter/substitution_formatter.h
index 2a3150be4f2fd..a086359058218 100644
--- a/source/common/formatter/substitution_formatter.h
+++ b/source/common/formatter/substitution_formatter.h
@@ -10,7 +10,7 @@
 #include "envoy/formatter/substitution_formatter.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD
index c00ce5555e079..a0b15654ed0d7 100644
--- a/source/common/grpc/BUILD
+++ b/source/common/grpc/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     deps = [
         ":codec_lib",
         ":context_lib",
-        "//include/envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_interface",
         "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/http:async_client_lib",
     ],
@@ -31,7 +31,7 @@ envoy_cc_library(
         ":codec_lib",
         ":context_lib",
         ":typed_async_client_lib",
-        "//include/envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_interface",
         "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/config:version_converter_lib",
         "//source/common/http:async_client_lib",
@@ -46,10 +46,10 @@ envoy_cc_library(
     deps = [
         ":async_client_lib",
         ":context_lib",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ] + envoy_select_google_grpc([":google_async_client_lib"]),
 )
 
@@ -58,7 +58,7 @@ envoy_cc_library(
     srcs = ["codec.cc"],
     hdrs = ["codec.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:minimal_logger_lib",
     ],
@@ -70,7 +70,7 @@ envoy_cc_library(
     hdrs = ["status.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/grpc:status",
+        "//envoy/grpc:status",
     ],
 )
 
@@ -80,11 +80,11 @@ envoy_cc_library(
     hdrs = ["common.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:message_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:message_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/common:assert_lib",
@@ -112,9 +112,9 @@ envoy_cc_library(
     deps = [
         ":common_lib",
         ":stat_names_lib",
-        "//include/envoy/grpc:context_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/grpc:context_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:hash_lib",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:utility_lib",
@@ -131,8 +131,8 @@ envoy_cc_library(
     ],
     deps = [
         ":google_grpc_creds_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/registry",
+        "//envoy/api:api_interface",
+        "//envoy/registry",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -149,7 +149,7 @@ envoy_cc_library(
     srcs = ["stat_names.cc"],
     hdrs = ["stat_names.h"],
     deps = [
-        "//include/envoy/grpc:status",
+        "//envoy/grpc:status",
         "//source/common/stats:symbol_table_lib",
     ],
 )
@@ -169,10 +169,10 @@ envoy_cc_library(
         ":google_grpc_utils_lib",
         ":stat_names_lib",
         ":typed_async_client_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/grpc:google_grpc_creds_interface",
-        "//include/envoy/thread:thread_interface",
-        "//include/envoy/thread_local:thread_local_object",
+        "//envoy/api:api_interface",
+        "//envoy/grpc:google_grpc_creds_interface",
+        "//envoy/thread:thread_interface",
+        "//envoy/thread_local:thread_local_object",
         "//source/common/common:base64_lib",
         "//source/common/common:empty_string",
         "//source/common/common:linked_object",
@@ -200,9 +200,9 @@ envoy_cc_library(
     hdrs = ["google_grpc_creds_impl.h"],
     external_deps = ["grpc"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/grpc:google_grpc_creds_interface",
-        "//include/envoy/registry",
+        "//envoy/api:api_interface",
+        "//envoy/grpc:google_grpc_creds_interface",
+        "//envoy/registry",
         "//source/common/config:datasource_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -216,9 +216,9 @@ envoy_cc_library(
         "grpc",
     ],
     deps = [
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/server:factory_context_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/server:factory_context_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/thread_local:thread_local_interface",
     ],
 )
diff --git a/source/common/grpc/async_client_impl.cc b/source/common/grpc/async_client_impl.cc
index 6d1152ef9f45a..53aeacf6236e6 100644
--- a/source/common/grpc/async_client_impl.cc
+++ b/source/common/grpc/async_client_impl.cc
@@ -1,13 +1,13 @@
-#include "common/grpc/async_client_impl.h"
+#include "source/common/grpc/async_client_impl.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/async_client_impl.h b/source/common/grpc/async_client_impl.h
index 2e7139df209c0..33d68f61417ef 100644
--- a/source/common/grpc/async_client_impl.h
+++ b/source/common/grpc/async_client_impl.h
@@ -6,11 +6,11 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/grpc/async_client.h"
 
-#include "common/common/linked_object.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/typed_async_client.h"
-#include "common/http/async_client_impl.h"
-#include "common/router/header_parser.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/router/header_parser.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/async_client_manager_impl.cc b/source/common/grpc/async_client_manager_impl.cc
index 7b122e8bd59e4..9538aa3d9d71b 100644
--- a/source/common/grpc/async_client_manager_impl.cc
+++ b/source/common/grpc/async_client_manager_impl.cc
@@ -1,15 +1,15 @@
-#include "common/grpc/async_client_manager_impl.h"
+#include "source/common/grpc/async_client_manager_impl.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/base64.h"
-#include "common/grpc/async_client_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/grpc/async_client_impl.h"
 
 #include "absl/strings/match.h"
 
 #ifdef ENVOY_GOOGLE_GRPC
-#include "common/grpc/google_async_client_impl.h"
+#include "source/common/grpc/google_async_client_impl.h"
 #endif
 
 namespace Envoy {
diff --git a/source/common/grpc/async_client_manager_impl.h b/source/common/grpc/async_client_manager_impl.h
index 923dc3beb9c15..8e3abaf23b55f 100644
--- a/source/common/grpc/async_client_manager_impl.h
+++ b/source/common/grpc/async_client_manager_impl.h
@@ -8,7 +8,7 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/grpc/stat_names.h"
+#include "source/common/grpc/stat_names.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/codec.cc b/source/common/grpc/codec.cc
index 4ac61523d3153..3c8233d2644c8 100644
--- a/source/common/grpc/codec.cc
+++ b/source/common/grpc/codec.cc
@@ -1,11 +1,11 @@
-#include "common/grpc/codec.h"
+#include "source/common/grpc/codec.h"
 
 #include <array>
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/grpc/common.cc b/source/common/grpc/common.cc
index 306062d781420..3cf1af966ffd1 100644
--- a/source/common/grpc/common.cc
+++ b/source/common/grpc/common.cc
@@ -1,25 +1,25 @@
-#include "common/grpc/common.h"
+#include "source/common/grpc/common.h"
 
 #include <atomic>
 #include <cstdint>
 #include <cstring>
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/match.h"
diff --git a/source/common/grpc/common.h b/source/common/grpc/common.h
index dcade2ad8015a..c723aeca970ff 100644
--- a/source/common/grpc/common.h
+++ b/source/common/grpc/common.h
@@ -10,9 +10,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/http/message.h"
 
-#include "common/common/hash.h"
-#include "common/grpc/status.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/hash.h"
+#include "source/common/grpc/status.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 #include "google/rpc/status.pb.h"
diff --git a/source/common/grpc/context_impl.cc b/source/common/grpc/context_impl.cc
index 4c0e2f91ebc3e..11350f4546167 100644
--- a/source/common/grpc/context_impl.cc
+++ b/source/common/grpc/context_impl.cc
@@ -1,10 +1,10 @@
-#include "common/grpc/context_impl.h"
+#include "source/common/grpc/context_impl.h"
 
 #include <cstdint>
 #include <string>
 
-#include "common/grpc/common.h"
-#include "common/stats/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/context_impl.h b/source/common/grpc/context_impl.h
index 98a34695235bb..8cc073a46be4e 100644
--- a/source/common/grpc/context_impl.h
+++ b/source/common/grpc/context_impl.h
@@ -6,10 +6,10 @@
 #include "envoy/grpc/context.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/hash.h"
-#include "common/grpc/stat_names.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/common/hash.h"
+#include "source/common/grpc/stat_names.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/grpc/google_async_client_cache.cc b/source/common/grpc/google_async_client_cache.cc
index 5150f8182b20b..2d7e5c664a73a 100644
--- a/source/common/grpc/google_async_client_cache.cc
+++ b/source/common/grpc/google_async_client_cache.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/google_async_client_cache.h"
+#include "source/common/grpc/google_async_client_cache.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/google_async_client_impl.cc b/source/common/grpc/google_async_client_impl.cc
index c3d1cdd89bc45..56380d58dcb13 100644
--- a/source/common/grpc/google_async_client_impl.cc
+++ b/source/common/grpc/google_async_client_impl.cc
@@ -1,17 +1,17 @@
-#include "common/grpc/google_async_client_impl.h"
+#include "source/common/grpc/google_async_client_impl.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/base64.h"
-#include "common/common/empty_string.h"
-#include "common/common/lock_guard.h"
-#include "common/config/datasource.h"
-#include "common/grpc/common.h"
-#include "common/grpc/google_grpc_creds_impl.h"
-#include "common/grpc/google_grpc_utils.h"
-#include "common/router/header_parser.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/config/datasource.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
+#include "source/common/grpc/google_grpc_utils.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "grpcpp/support/proto_buffer_reader.h"
 
diff --git a/source/common/grpc/google_async_client_impl.h b/source/common/grpc/google_async_client_impl.h
index c3ea7f4c12d46..4977ed2191320 100644
--- a/source/common/grpc/google_async_client_impl.h
+++ b/source/common/grpc/google_async_client_impl.h
@@ -13,14 +13,14 @@
 #include "envoy/thread_local/thread_local_object.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/common/linked_object.h"
-#include "common/common/thread.h"
-#include "common/common/thread_annotations.h"
-#include "common/grpc/google_grpc_context.h"
-#include "common/grpc/stat_names.h"
-#include "common/grpc/typed_async_client.h"
-#include "common/router/header_parser.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/thread_annotations.h"
+#include "source/common/grpc/google_grpc_context.h"
+#include "source/common/grpc/stat_names.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "absl/container/node_hash_set.h"
 #include "grpcpp/generic/generic_stub.h"
diff --git a/source/common/grpc/google_grpc_context.cc b/source/common/grpc/google_grpc_context.cc
index cdd9808399285..5309b11ac2c4f 100644
--- a/source/common/grpc/google_grpc_context.cc
+++ b/source/common/grpc/google_grpc_context.cc
@@ -1,11 +1,11 @@
-#include "common/grpc/google_grpc_context.h"
+#include "source/common/grpc/google_grpc_context.h"
 
 #include <atomic>
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
-#include "common/common/macros.h"
-#include "common/common/thread.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/thread.h"
 
 #ifdef ENVOY_GOOGLE_GRPC
 #include "grpcpp/grpcpp.h"
diff --git a/source/common/grpc/google_grpc_context.h b/source/common/grpc/google_grpc_context.h
index 2ec235161f2e0..b1378a11cf083 100644
--- a/source/common/grpc/google_grpc_context.h
+++ b/source/common/grpc/google_grpc_context.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/google_grpc_creds_impl.cc b/source/common/grpc/google_grpc_creds_impl.cc
index b534c2eebdf76..dc45e45bd78c7 100644
--- a/source/common/grpc/google_grpc_creds_impl.cc
+++ b/source/common/grpc/google_grpc_creds_impl.cc
@@ -1,10 +1,10 @@
-#include "common/grpc/google_grpc_creds_impl.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/datasource.h"
+#include "source/common/config/datasource.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/google_grpc_utils.cc b/source/common/grpc/google_grpc_utils.cc
index b3fe1e20a320b..dc7575ffae56e 100644
--- a/source/common/grpc/google_grpc_utils.cc
+++ b/source/common/grpc/google_grpc_utils.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/google_grpc_utils.h"
+#include "source/common/grpc/google_grpc_utils.h"
 
 #include <atomic>
 #include <cstdint>
@@ -8,13 +8,13 @@
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/registry/registry.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/match.h"
diff --git a/source/common/grpc/stat_names.cc b/source/common/grpc/stat_names.cc
index 3366c45c99cf6..51df2f66247a1 100644
--- a/source/common/grpc/stat_names.cc
+++ b/source/common/grpc/stat_names.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/stat_names.h"
+#include "source/common/grpc/stat_names.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/stat_names.h b/source/common/grpc/stat_names.h
index daa2f7c9aeb9b..2c65f597aeea2 100644
--- a/source/common/grpc/stat_names.h
+++ b/source/common/grpc/stat_names.h
@@ -2,7 +2,7 @@
 
 #include "envoy/grpc/status.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/grpc/status.cc b/source/common/grpc/status.cc
index 7f0c194e2f6c3..87cc5547637d2 100644
--- a/source/common/grpc/status.cc
+++ b/source/common/grpc/status.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/status.h"
+#include "source/common/grpc/status.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/typed_async_client.cc b/source/common/grpc/typed_async_client.cc
index 465bde6e139e0..8afc4ae192a33 100644
--- a/source/common/grpc/typed_async_client.cc
+++ b/source/common/grpc/typed_async_client.cc
@@ -1,11 +1,11 @@
-#include "common/grpc/typed_async_client.h"
+#include "source/common/grpc/typed_async_client.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/utility.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/grpc/typed_async_client.h b/source/common/grpc/typed_async_client.h
index 2905db8f345ac..22a009054357c 100644
--- a/source/common/grpc/typed_async_client.h
+++ b/source/common/grpc/typed_async_client.h
@@ -5,8 +5,8 @@
 
 #include "envoy/grpc/async_client.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/version_converter.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/version_converter.h"
 
 namespace Envoy {
 namespace Grpc {
diff --git a/source/common/html/utility.cc b/source/common/html/utility.cc
index e2b80e188da6b..e895fe857ff43 100644
--- a/source/common/html/utility.cc
+++ b/source/common/html/utility.cc
@@ -1,4 +1,4 @@
-#include "common/html/utility.h"
+#include "source/common/html/utility.h"
 
 #include <string>
 
diff --git a/source/common/http/BUILD b/source/common/http/BUILD
index a07a7265adaf8..55c15b06a3f3f 100644
--- a/source/common/http/BUILD
+++ b/source/common/http/BUILD
@@ -14,18 +14,18 @@ envoy_cc_library(
     srcs = ["async_client_impl.cc"],
     hdrs = ["async_client_impl.h"],
     deps = [
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:context_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:message_interface",
-        "//include/envoy/router:context_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/router:router_ratelimit_interface",
-        "//include/envoy/router:shadow_writer_interface",
-        "//include/envoy/ssl:connection_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:context_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:message_interface",
+        "//envoy/router:context_interface",
+        "//envoy/router:router_interface",
+        "//envoy/router:router_ratelimit_interface",
+        "//envoy/router:shadow_writer_interface",
+        "//envoy/ssl:connection_interface",
         "//source/common/common:empty_string",
         "//source/common/common:linked_object",
         "//source/common/router:router_lib",
@@ -42,7 +42,7 @@ envoy_cc_library(
     srcs = ["async_client_utility.cc"],
     hdrs = ["async_client_utility.h"],
     deps = [
-        "//include/envoy/http:async_client_interface",
+        "//envoy/http:async_client_interface",
     ],
 )
 
@@ -55,10 +55,10 @@ envoy_cc_library(
         ":exception_lib",
         ":status_lib",
         ":utility_lib",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/http:codec_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:linked_object",
@@ -76,7 +76,7 @@ envoy_cc_library(
     name = "codec_helper_lib",
     hdrs = ["codec_helper.h"],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -92,7 +92,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "codec_wrappers_lib",
     hdrs = ["codec_wrappers.h"],
-    deps = ["//include/envoy/http:codec_interface"],
+    deps = ["//envoy/http:codec_interface"],
 )
 
 envoy_cc_library(
@@ -102,9 +102,9 @@ envoy_cc_library(
     deps = [
         ":headers_lib",
         ":utility_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:enum_to_int",
         "//source/common/common:utility_lib",
         "//source/common/stats:symbol_table_lib",
@@ -118,7 +118,7 @@ envoy_cc_library(
     deps = [
         ":codes_lib",
         ":user_agent_lib",
-        "//include/envoy/http:context_interface",
+        "//envoy/http:context_interface",
     ],
 )
 
@@ -128,8 +128,8 @@ envoy_cc_library(
     hdrs = ["conn_pool_base.h"],
     deps = [
         ":codec_client_lib",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:linked_object",
         "//source/common/conn_pool:conn_pool_base_lib",
         "//source/common/stats:timespan_lib",
@@ -154,8 +154,8 @@ envoy_cc_library(
     srcs = ["http3_status_tracker.cc"],
     hdrs = ["http3_status_tracker.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
     ],
 )
 
@@ -170,12 +170,12 @@ envoy_cc_library(
         "alternate_protocols_cache_manager_impl.h",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:alternate_protocols_cache_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:resource_manager_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:alternate_protocols_cache_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:resource_manager_interface",
         "//source/common/common:logger_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -198,11 +198,11 @@ envoy_cc_library(
     hdrs = ["conn_manager_config.h"],
     deps = [
         ":date_provider_lib",
-        "//include/envoy/config:config_provider_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:original_ip_detection_interface",
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/router:rds_interface",
+        "//envoy/config:config_provider_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:original_ip_detection_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/router:rds_interface",
         "//source/common/local_reply:local_reply_lib",
         "//source/common/network:utility_lib",
         "//source/common/stats:symbol_table_lib",
@@ -221,8 +221,8 @@ envoy_cc_library(
     ],
     deps = [
         ":headers_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/matcher:matcher_interface",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:linked_object",
         "//source/common/common:scope_tracked_object_stack",
@@ -260,30 +260,30 @@ envoy_cc_library(
         ":status_lib",
         ":user_agent_lib",
         ":utility_lib",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:api_listener_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:context_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:drain_decision_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/router:rds_interface",
-        "//include/envoy/router:scopes_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/stats:timespan_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:api_listener_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:context_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:drain_decision_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/router:rds_interface",
+        "//envoy/router:scopes_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/ssl:connection_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/stats:timespan_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
@@ -317,10 +317,10 @@ envoy_cc_library(
         "date_provider_impl.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:utility_lib",
     ],
 )
@@ -329,8 +329,8 @@ envoy_cc_library(
     name = "exception_lib",
     hdrs = ["exception.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:header_map_interface",
     ],
 )
 
@@ -340,7 +340,7 @@ envoy_cc_library(
     hdrs = ["hash_policy.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/http:hash_policy_interface",
+        "//envoy/http:hash_policy_interface",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
 )
@@ -350,7 +350,7 @@ envoy_cc_library(
     srcs = ["header_list_view.cc"],
     hdrs = ["header_list_view.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
     ],
 )
 
@@ -360,7 +360,7 @@ envoy_cc_library(
     hdrs = ["header_map_impl.h"],
     deps = [
         ":headers_lib",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
         "//source/common/common:empty_string",
@@ -375,7 +375,7 @@ envoy_cc_library(
     name = "headers_lib",
     hdrs = ["headers.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/singleton:const_singleton",
         "//source/common/singleton:threadsafe_singleton",
     ],
@@ -386,8 +386,8 @@ envoy_cc_library(
     hdrs = ["message_impl.h"],
     deps = [
         ":header_map_lib",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:message_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:message_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:non_copyable",
     ],
@@ -400,9 +400,9 @@ envoy_cc_library(
     deps = [
         ":message_lib",
         ":utility_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:enum_to_int",
         "//source/common/config:utility_lib",
     ],
@@ -414,11 +414,11 @@ envoy_cc_library(
     hdrs = ["user_agent.h"],
     deps = [
         ":headers_lib",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/stats:timespan_interface",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:utility_lib",
     ],
@@ -439,10 +439,10 @@ envoy_cc_library(
         ":header_map_lib",
         ":headers_lib",
         ":message_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:query_params_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:query_params_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -467,8 +467,8 @@ envoy_cc_library(
         ":header_map_lib",
         ":status_lib",
         ":utility_lib",
-        "//include/envoy/common:regex_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/common:regex_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:regex_lib",
         "//source/common/common:utility_lib",
         "//source/common/protobuf:utility_lib",
@@ -488,7 +488,7 @@ envoy_cc_library(
     ],
     deps = [
         ":legacy_path_canonicalizer",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:logger_lib",
         "//source/common/runtime:runtime_features_lib",
         "@com_googlesource_googleurl//url:envoy_url",
@@ -511,8 +511,8 @@ envoy_cc_library(
         "request_id_extension_impl.h",
     ],
     deps = [
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/server:request_id_extension_config_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/server:request_id_extension_config_interface",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
     ],
@@ -526,7 +526,7 @@ envoy_cc_library(
         "abseil_status",
     ],
     deps = [
-        "//include/envoy/http:codes_interface",
+        "//envoy/http:codes_interface",
         "//source/common/common:assert_lib",
     ],
 )
diff --git a/source/common/http/alternate_protocols_cache_impl.cc b/source/common/http/alternate_protocols_cache_impl.cc
index 4368e9a778599..f4a176fb405df 100644
--- a/source/common/http/alternate_protocols_cache_impl.cc
+++ b/source/common/http/alternate_protocols_cache_impl.cc
@@ -1,6 +1,6 @@
-#include "common/http/alternate_protocols_cache_impl.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/alternate_protocols_cache_manager_impl.cc b/source/common/http/alternate_protocols_cache_manager_impl.cc
index b70290b86f6c6..a787e72cbe55d 100644
--- a/source/common/http/alternate_protocols_cache_manager_impl.cc
+++ b/source/common/http/alternate_protocols_cache_manager_impl.cc
@@ -1,7 +1,7 @@
-#include "common/http/alternate_protocols_cache_manager_impl.h"
+#include "source/common/http/alternate_protocols_cache_manager_impl.h"
 
-#include "common/http/alternate_protocols_cache_impl.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/http/async_client_impl.cc b/source/common/http/async_client_impl.cc
index 044bf497b4c42..c66fd5f57a6bc 100644
--- a/source/common/http/async_client_impl.cc
+++ b/source/common/http/async_client_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/async_client_impl.h"
+#include "source/common/http/async_client_impl.h"
 
 #include <chrono>
 #include <map>
@@ -8,9 +8,9 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/grpc/common.h"
-#include "common/http/utility.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/async_client_impl.h b/source/common/http/async_client_impl.h
index c4e7455bda687..d496e21bbefad 100644
--- a/source/common/http/async_client_impl.h
+++ b/source/common/http/async_client_impl.h
@@ -31,13 +31,13 @@
 #include "envoy/upstream/load_balancer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/linked_object.h"
-#include "common/http/message_impl.h"
-#include "common/router/router.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/router/router.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/async_client_utility.cc b/source/common/http/async_client_utility.cc
index 664a0fc0c651a..95630bc474bbe 100644
--- a/source/common/http/async_client_utility.cc
+++ b/source/common/http/async_client_utility.cc
@@ -1,6 +1,6 @@
-#include "common/http/async_client_utility.h"
+#include "source/common/http/async_client_utility.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/codec_client.cc b/source/common/http/codec_client.cc
index 0b21cf4bc6939..899dde6f9eff0 100644
--- a/source/common/http/codec_client.cc
+++ b/source/common/http/codec_client.cc
@@ -1,20 +1,20 @@
-#include "common/http/codec_client.h"
+#include "source/common/http/codec_client.h"
 
 #include <cstdint>
 #include <memory>
 
 #include "envoy/http/codec.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/config/utility.h"
-#include "common/http/exception.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/status.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/status.h"
+#include "source/common/http/utility.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/codec_impl.h"
+#include "source/common/quic/codec_impl.h"
 #endif
 
 namespace Envoy {
diff --git a/source/common/http/codec_client.h b/source/common/http/codec_client.h
index b2cb841010d65..684c962380f32 100644
--- a/source/common/http/codec_client.h
+++ b/source/common/http/codec_client.h
@@ -12,11 +12,11 @@
 #include "envoy/network/filter.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/http/codec_wrappers.h"
-#include "common/network/filter_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/codec_wrappers.h"
+#include "source/common/network/filter_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/codec_helper.h b/source/common/http/codec_helper.h
index 5128891e41055..4a304c159e56c 100644
--- a/source/common/http/codec_helper.h
+++ b/source/common/http/codec_helper.h
@@ -2,7 +2,7 @@
 
 #include "envoy/http/codec.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/inlined_vector.h"
 
diff --git a/source/common/http/codes.cc b/source/common/http/codes.cc
index 37273856a1c60..2cf5d52960397 100644
--- a/source/common/http/codes.cc
+++ b/source/common/http/codes.cc
@@ -1,4 +1,4 @@
-#include "common/http/codes.h"
+#include "source/common/http/codes.h"
 
 #include <cstdint>
 #include <string>
@@ -6,10 +6,10 @@
 #include "envoy/http/header_map.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/http/codes.h b/source/common/http/codes.h
index 3957377aa2c2f..a2c70cc13c597 100644
--- a/source/common/http/codes.h
+++ b/source/common/http/codes.h
@@ -8,8 +8,8 @@
 #include "envoy/http/header_map.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/thread.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h
index 0569921eb9287..d69beb04e0805 100644
--- a/source/common/http/conn_manager_config.h
+++ b/source/common/http/conn_manager_config.h
@@ -10,10 +10,10 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/http/date_provider.h"
-#include "common/local_reply/local_reply.h"
-#include "common/network/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/http/date_provider.h"
+#include "source/common/local_reply/local_reply.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc
index 05d4277b37567..3f4a567f26e07 100644
--- a/source/common/http/conn_manager_impl.cc
+++ b/source/common/http/conn_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/conn_manager_impl.h"
+#include "source/common/http/conn_manager_impl.h"
 
 #include <cstdint>
 #include <functional>
@@ -22,28 +22,28 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/http/codes.h"
-#include "common/http/conn_manager_utility.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/path_utility.h"
-#include "common/http/status.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/router/config_impl.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stats/timespan_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/conn_manager_utility.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/path_utility.h"
+#include "source/common/http/status.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stats/timespan_impl.h"
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
diff --git a/source/common/http/conn_manager_impl.h b/source/common/http/conn_manager_impl.h
index 541cf7b3da632..a81b95b6ac658 100644
--- a/source/common/http/conn_manager_impl.h
+++ b/source/common/http/conn_manager_impl.h
@@ -35,19 +35,19 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/linked_object.h"
-#include "common/grpc/common.h"
-#include "common/http/conn_manager_config.h"
-#include "common/http/filter_manager.h"
-#include "common/http/user_agent.h"
-#include "common/http/utility.h"
-#include "common/local_reply/local_reply.h"
-#include "common/network/proxy_protocol_filter_state.h"
-#include "common/router/scoped_rds.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/filter_manager.h"
+#include "source/common/http/user_agent.h"
+#include "source/common/http/utility.h"
+#include "source/common/local_reply/local_reply.h"
+#include "source/common/network/proxy_protocol_filter_state.h"
+#include "source/common/router/scoped_rds.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/conn_manager_utility.cc b/source/common/http/conn_manager_utility.cc
index 887fe09bcd095..4c0bddcd6a61a 100644
--- a/source/common/http/conn_manager_utility.cc
+++ b/source/common/http/conn_manager_utility.cc
@@ -1,4 +1,4 @@
-#include "common/http/conn_manager_utility.h"
+#include "source/common/http/conn_manager_utility.h"
 
 #include <atomic>
 #include <cstdint>
@@ -6,18 +6,18 @@
 
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/utility.h"
-#include "common/http/conn_manager_config.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/path_utility.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/path_utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/source/common/http/conn_manager_utility.h b/source/common/http/conn_manager_utility.h
index f5b15eebdfebf..a33af8efcae32 100644
--- a/source/common/http/conn_manager_utility.h
+++ b/source/common/http/conn_manager_utility.h
@@ -7,9 +7,9 @@
 #include "envoy/network/connection.h"
 #include "envoy/tracing/trace_reason.h"
 
-#include "common/http/conn_manager_impl.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/conn_pool_base.cc b/source/common/http/conn_pool_base.cc
index 16a043b1fc581..e071614787b34 100644
--- a/source/common/http/conn_pool_base.cc
+++ b/source/common/http/conn_pool_base.cc
@@ -1,11 +1,11 @@
-#include "common/http/conn_pool_base.h"
-
-#include "common/common/assert.h"
-#include "common/http/utility.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stats/timespan_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/http/conn_pool_base.h"
+
+#include "source/common/common/assert.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/conn_pool_base.h b/source/common/http/conn_pool_base.h
index cde57ea4fb89a..0be7cf2fc7c19 100644
--- a/source/common/http/conn_pool_base.h
+++ b/source/common/http/conn_pool_base.h
@@ -5,10 +5,10 @@
 #include "envoy/network/connection.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/common/linked_object.h"
-#include "common/conn_pool/conn_pool_base.h"
-#include "common/http/codec_client.h"
-#include "common/http/utility.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/conn_pool/conn_pool_base.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/utility.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/http/conn_pool_grid.cc b/source/common/http/conn_pool_grid.cc
index 12d143717a9d6..5938c0d1ed342 100644
--- a/source/common/http/conn_pool_grid.cc
+++ b/source/common/http/conn_pool_grid.cc
@@ -1,7 +1,7 @@
-#include "common/http/conn_pool_grid.h"
+#include "source/common/http/conn_pool_grid.h"
 
-#include "common/http/http3/conn_pool.h"
-#include "common/http/mixed_conn_pool.h"
+#include "source/common/http/http3/conn_pool.h"
+#include "source/common/http/mixed_conn_pool.h"
 
 #include "quiche/quic/core/quic_versions.h"
 
diff --git a/source/common/http/conn_pool_grid.h b/source/common/http/conn_pool_grid.h
index e05a2ae68dc8f..3c1b74ed74ea0 100644
--- a/source/common/http/conn_pool_grid.h
+++ b/source/common/http/conn_pool_grid.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "common/http/alternate_protocols_cache_impl.h"
-#include "common/http/conn_pool_base.h"
-#include "common/http/http3_status_tracker.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
+#include "source/common/http/conn_pool_base.h"
+#include "source/common/http/http3_status_tracker.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/http/context_impl.cc b/source/common/http/context_impl.cc
index 05fdd5f54f3db..837564dff8151 100644
--- a/source/common/http/context_impl.cc
+++ b/source/common/http/context_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/context_impl.h"
+#include "source/common/http/context_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/context_impl.h b/source/common/http/context_impl.h
index c7fb0732e8dda..590b997e1f0a8 100644
--- a/source/common/http/context_impl.h
+++ b/source/common/http/context_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/http/context.h"
 
-#include "common/http/codes.h"
-#include "common/http/user_agent.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/user_agent.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/date_provider_impl.cc b/source/common/http/date_provider_impl.cc
index 6f08a53258eea..da41a64e1fa4a 100644
--- a/source/common/http/date_provider_impl.cc
+++ b/source/common/http/date_provider_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/date_provider_impl.h"
+#include "source/common/http/date_provider_impl.h"
 
 #include <chrono>
 #include <string>
diff --git a/source/common/http/date_provider_impl.h b/source/common/http/date_provider_impl.h
index 08ff1bfe6f2e7..03a73aa04c3ef 100644
--- a/source/common/http/date_provider_impl.h
+++ b/source/common/http/date_provider_impl.h
@@ -7,7 +7,7 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "date_provider.h"
 
diff --git a/source/common/http/default_server_string.h b/source/common/http/default_server_string.h
index 26fb7ff47d462..3f0915c66abdc 100644
--- a/source/common/http/default_server_string.h
+++ b/source/common/http/default_server_string.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/filter_manager.cc b/source/common/http/filter_manager.cc
index f5aa68f53052f..a68e3207c7a3e 100644
--- a/source/common/http/filter_manager.cc
+++ b/source/common/http/filter_manager.cc
@@ -1,17 +1,17 @@
-#include "common/http/filter_manager.h"
+#include "source/common/http/filter_manager.h"
 
 #include <functional>
 
 #include "envoy/http/header_map.h"
 #include "envoy/matcher/matcher.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/scope_tracked_object_stack.h"
-#include "common/common/scope_tracker.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/scope_tracked_object_stack.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/filter_manager.h b/source/common/http/filter_manager.h
index 2f65055c77839..1e826f1df5d1c 100644
--- a/source/common/http/filter_manager.h
+++ b/source/common/http/filter_manager.h
@@ -15,18 +15,18 @@
 #include "envoy/protobuf/message_validator.h"
 #include "envoy/type/matcher/v3/http_inputs.pb.validate.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/grpc/common.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/matching/data_impl.h"
-#include "common/local_reply/local_reply.h"
-#include "common/matcher/matcher.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/matching/data_impl.h"
+#include "source/common/local_reply/local_reply.h"
+#include "source/common/matcher/matcher.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/hash_policy.cc b/source/common/http/hash_policy.cc
index e8f331d6165a9..a2eda3f01579d 100644
--- a/source/common/http/hash_policy.cc
+++ b/source/common/http/hash_policy.cc
@@ -1,13 +1,13 @@
-#include "common/http/hash_policy.h"
+#include "source/common/http/hash_policy.h"
 
 #include <string>
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/common/matchers.h"
-#include "common/common/regex.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/matchers.h"
+#include "source/common/common/regex.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/http/header_list_view.cc b/source/common/http/header_list_view.cc
index dab359253b100..7b5e551b720e8 100644
--- a/source/common/http/header_list_view.cc
+++ b/source/common/http/header_list_view.cc
@@ -1,4 +1,4 @@
-#include "common/http/header_list_view.h"
+#include "source/common/http/header_list_view.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/header_map_impl.cc b/source/common/http/header_map_impl.cc
index cc83f950e7d27..ed84303497cc1 100644
--- a/source/common/http/header_map_impl.cc
+++ b/source/common/http/header_map_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include <cstdint>
 #include <list>
@@ -7,11 +7,11 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/empty_string.h"
-#include "common/runtime/runtime_features.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/http/header_map_impl.h b/source/common/http/header_map_impl.h
index 2f52e70c66691..e146e1b4c2bfc 100644
--- a/source/common/http/header_map_impl.h
+++ b/source/common/http/header_map_impl.h
@@ -10,10 +10,10 @@
 #include "envoy/common/optref.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/non_copyable.h"
-#include "common/common/utility.h"
-#include "common/http/headers.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/header_utility.cc b/source/common/http/header_utility.cc
index 22f88a64b50cb..a25d62cc83a32 100644
--- a/source/common/http/header_utility.cc
+++ b/source/common/http/header_utility.cc
@@ -1,13 +1,13 @@
-#include "common/http/header_utility.h"
+#include "source/common/http/header_utility.h"
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/common/regex.h"
-#include "common/common/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/regex.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/match.h"
 #include "nghttp2/nghttp2.h"
diff --git a/source/common/http/header_utility.h b/source/common/http/header_utility.h
index a7ab5ab2783e0..c3b8a2088ea90 100644
--- a/source/common/http/header_utility.h
+++ b/source/common/http/header_utility.h
@@ -9,8 +9,8 @@
 #include "envoy/http/protocol.h"
 #include "envoy/type/v3/range.pb.h"
 
-#include "common/http/status.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/http/status.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/headers.h b/source/common/http/headers.h
index 9471dae6eb60a..a4580468bfd8f 100644
--- a/source/common/http/headers.h
+++ b/source/common/http/headers.h
@@ -4,8 +4,8 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/singleton/const_singleton.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/BUILD b/source/common/http/http1/BUILD
index 495eef9ee4fdf..e801968ec5335 100644
--- a/source/common/http/http1/BUILD
+++ b/source/common/http/http1/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["header_formatter.cc"],
     hdrs = ["header_formatter.h"],
     deps = [
-        "//include/envoy/http:header_formatter_interface",
+        "//envoy/http:header_formatter_interface",
     ],
 )
 
@@ -21,8 +21,8 @@ envoy_cc_library(
     name = "codec_stats_lib",
     hdrs = ["codec_stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:thread_lib",
     ],
 )
@@ -36,11 +36,11 @@ envoy_cc_library(
         ":header_formatter_lib",
         ":legacy_parser_lib",
         ":parser_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
@@ -68,12 +68,12 @@ envoy_cc_library(
     hdrs = ["conn_pool.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/http:codec_client_lib",
         "//source/common/http:codec_wrappers_lib",
         "//source/common/http:codes_lib",
@@ -90,8 +90,8 @@ envoy_cc_library(
     hdrs = ["settings.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/protobuf:message_validator_interface",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
diff --git a/source/common/http/http1/codec_impl.cc b/source/common/http/http1/codec_impl.cc
index f6ad7dfe7f0fe..34fa19fd31956 100644
--- a/source/common/http/http1/codec_impl.cc
+++ b/source/common/http/http1/codec_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/http1/codec_impl.h"
+#include "source/common/http/http1/codec_impl.h"
 
 #include <memory>
 #include <string>
@@ -9,20 +9,20 @@
 #include "envoy/http/header_map.h"
 #include "envoy/network/connection.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/statusor.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/exception.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/http1/header_formatter.h"
-#include "common/http/http1/legacy_parser_impl.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/statusor.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http1/header_formatter.h"
+#include "source/common/http/http1/legacy_parser_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/ascii.h"
diff --git a/source/common/http/http1/codec_impl.h b/source/common/http/http1/codec_impl.h
index 4cfd38b5b1ec9..d93e5d50f9024 100644
--- a/source/common/http/http1/codec_impl.h
+++ b/source/common/http/http1/codec_impl.h
@@ -12,16 +12,16 @@
 #include "envoy/http/codec.h"
 #include "envoy/network/connection.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/assert.h"
-#include "common/common/statusor.h"
-#include "common/http/codec_helper.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http1/header_formatter.h"
-#include "common/http/http1/parser.h"
-#include "common/http/status.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/statusor.h"
+#include "source/common/http/codec_helper.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http1/header_formatter.h"
+#include "source/common/http/http1/parser.h"
+#include "source/common/http/status.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/codec_stats.h b/source/common/http/http1/codec_stats.h
index ac296522adc21..8fa7f254a0bd0 100644
--- a/source/common/http/http1/codec_stats.h
+++ b/source/common/http/http1/codec_stats.h
@@ -3,7 +3,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/conn_pool.cc b/source/common/http/http1/conn_pool.cc
index db90cfc87a48b..4667aaae06d73 100644
--- a/source/common/http/http1/conn_pool.cc
+++ b/source/common/http/http1/conn_pool.cc
@@ -1,4 +1,4 @@
-#include "common/http/http1/conn_pool.h"
+#include "source/common/http/http1/conn_pool.h"
 
 #include <cstdint>
 #include <list>
@@ -11,11 +11,11 @@
 #include "envoy/http/header_map.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/http/codec_client.h"
-#include "common/http/codes.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/http/http1/conn_pool.h b/source/common/http/http1/conn_pool.h
index d45109ac93279..f2c295797eb9c 100644
--- a/source/common/http/http1/conn_pool.h
+++ b/source/common/http/http1/conn_pool.h
@@ -4,8 +4,8 @@
 #include "envoy/http/codec.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/http/codec_wrappers.h"
-#include "common/http/conn_pool_base.h"
+#include "source/common/http/codec_wrappers.h"
+#include "source/common/http/conn_pool_base.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/header_formatter.cc b/source/common/http/http1/header_formatter.cc
index 514f2383dff02..c66c70fead200 100644
--- a/source/common/http/http1/header_formatter.cc
+++ b/source/common/http/http1/header_formatter.cc
@@ -1,4 +1,4 @@
-#include "common/http/http1/header_formatter.h"
+#include "source/common/http/http1/header_formatter.h"
 
 #include <string>
 
diff --git a/source/common/http/http1/legacy_parser_impl.cc b/source/common/http/http1/legacy_parser_impl.cc
index 8087e663c8acf..840ba419099f6 100644
--- a/source/common/http/http1/legacy_parser_impl.cc
+++ b/source/common/http/http1/legacy_parser_impl.cc
@@ -1,11 +1,11 @@
-#include "common/http/http1/legacy_parser_impl.h"
+#include "source/common/http/http1/legacy_parser_impl.h"
 
 #include <http_parser.h>
 
 #include <cstdint>
 
-#include "common/common/assert.h"
-#include "common/http/http1/parser.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/http1/parser.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/legacy_parser_impl.h b/source/common/http/http1/legacy_parser_impl.h
index 62b46dde0b062..2099f815824b4 100644
--- a/source/common/http/http1/legacy_parser_impl.h
+++ b/source/common/http/http1/legacy_parser_impl.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/http/http1/parser.h"
+#include "source/common/http/http1/parser.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/parser.h b/source/common/http/http1/parser.h
index 9008b2afd4afc..23f6795a1f752 100644
--- a/source/common/http/http1/parser.h
+++ b/source/common/http/http1/parser.h
@@ -4,8 +4,8 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/common/statusor.h"
-#include "common/http/status.h"
+#include "source/common/common/statusor.h"
+#include "source/common/http/status.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http1/settings.cc b/source/common/http/http1/settings.cc
index 18a4dd0dadf01..43155b42fbe46 100644
--- a/source/common/http/http1/settings.cc
+++ b/source/common/http/http1/settings.cc
@@ -1,8 +1,8 @@
-#include "common/http/http1/settings.h"
+#include "source/common/http/http1/settings.h"
 
 #include "envoy/http/header_formatter.h"
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http2/BUILD b/source/common/http/http2/BUILD
index 7e31b3e97a478..3ec423ce65c1d 100644
--- a/source/common/http/http2/BUILD
+++ b/source/common/http/http2/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "codec_stats_lib",
     hdrs = ["codec_stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:thread_lib",
     ],
 )
@@ -33,13 +33,13 @@ envoy_cc_library(
         ":metadata_decoder_lib",
         ":metadata_encoder_lib",
         ":protocol_constraints_lib",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
@@ -78,8 +78,8 @@ envoy_cc_library(
     srcs = ["conn_pool.cc"],
     hdrs = ["conn_pool.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/http:codec_client_lib",
         "//source/common/http:conn_pool_base_lib",
     ],
@@ -93,7 +93,7 @@ envoy_cc_library(
         "nghttp2",
     ],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -108,7 +108,7 @@ envoy_cc_library(
         "nghttp2",
     ],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -124,7 +124,7 @@ envoy_cc_library(
     ],
     deps = [
         ":codec_stats_lib",
-        "//include/envoy/network:connection_interface",
+        "//envoy/network:connection_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
         "//source/common/http:status_lib",
diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc
index ec188c386cf31..8124c273256ba 100644
--- a/source/common/http/http2/codec_impl.cc
+++ b/source/common/http/http2/codec_impl.cc
@@ -1,4 +1,4 @@
-#include "common/http/http2/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
 
 #include <algorithm>
 #include <cstdint>
@@ -11,21 +11,21 @@
 #include "envoy/http/header_map.h"
 #include "envoy/network/connection.h"
 
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/http/codes.h"
-#include "common/http/exception.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/http/http2/codec_impl.h b/source/common/http/http2/codec_impl.h
index 9a767e1c8337b..10ba725ea9f96 100644
--- a/source/common/http/http2/codec_impl.h
+++ b/source/common/http/http2/codec_impl.h
@@ -16,21 +16,21 @@
 #include "envoy/http/codec.h"
 #include "envoy/network/connection.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/assert.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/common/statusor.h"
-#include "common/common/thread.h"
-#include "common/http/codec_helper.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/http2/metadata_decoder.h"
-#include "common/http/http2/metadata_encoder.h"
-#include "common/http/http2/protocol_constraints.h"
-#include "common/http/status.h"
-#include "common/http/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/statusor.h"
+#include "source/common/common/thread.h"
+#include "source/common/http/codec_helper.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/http2/metadata_decoder.h"
+#include "source/common/http/http2/metadata_encoder.h"
+#include "source/common/http/http2/protocol_constraints.h"
+#include "source/common/http/status.h"
+#include "source/common/http/utility.h"
 
 #include "absl/types/optional.h"
 #include "nghttp2/nghttp2.h"
diff --git a/source/common/http/http2/codec_stats.h b/source/common/http/http2/codec_stats.h
index eb11291f82f4b..ecc71be7a27bf 100644
--- a/source/common/http/http2/codec_stats.h
+++ b/source/common/http/http2/codec_stats.h
@@ -3,7 +3,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http2/conn_pool.cc b/source/common/http/http2/conn_pool.cc
index bc137ba39a8f9..50cb7778b8bfc 100644
--- a/source/common/http/http2/conn_pool.cc
+++ b/source/common/http/http2/conn_pool.cc
@@ -1,12 +1,12 @@
-#include "common/http/http2/conn_pool.h"
+#include "source/common/http/http2/conn_pool.h"
 
 #include <cstdint>
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/http/http2/codec_impl.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http2/conn_pool.h b/source/common/http/http2/conn_pool.h
index 529167cb85357..9d96c494873ca 100644
--- a/source/common/http/http2/conn_pool.h
+++ b/source/common/http/http2/conn_pool.h
@@ -4,8 +4,8 @@
 
 #include "envoy/upstream/upstream.h"
 
-#include "common/http/codec_client.h"
-#include "common/http/conn_pool_base.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/conn_pool_base.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http2/metadata_decoder.cc b/source/common/http/http2/metadata_decoder.cc
index 836bc8dbbe365..3efd9346e5910 100644
--- a/source/common/http/http2/metadata_decoder.cc
+++ b/source/common/http/http2/metadata_decoder.cc
@@ -1,6 +1,6 @@
-#include "common/http/http2/metadata_decoder.h"
+#include "source/common/http/http2/metadata_decoder.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/http/http2/metadata_decoder.h b/source/common/http/http2/metadata_decoder.h
index 16510776e5635..4a3c9ad301ec6 100644
--- a/source/common/http/http2/metadata_decoder.h
+++ b/source/common/http/http2/metadata_decoder.h
@@ -5,8 +5,8 @@
 
 #include "envoy/http/codec.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
 
 #include "nghttp2/nghttp2.h"
 
diff --git a/source/common/http/http2/metadata_encoder.cc b/source/common/http/http2/metadata_encoder.cc
index ac1c06af4f360..81002de8566d9 100644
--- a/source/common/http/http2/metadata_encoder.cc
+++ b/source/common/http/http2/metadata_encoder.cc
@@ -1,6 +1,6 @@
-#include "common/http/http2/metadata_encoder.h"
+#include "source/common/http/http2/metadata_encoder.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/fixed_array.h"
 #include "nghttp2/nghttp2.h"
diff --git a/source/common/http/http2/metadata_encoder.h b/source/common/http/http2/metadata_encoder.h
index 64e520e0cded5..9fe06ce6e459b 100644
--- a/source/common/http/http2/metadata_encoder.h
+++ b/source/common/http/http2/metadata_encoder.h
@@ -6,9 +6,9 @@
 
 #include "envoy/http/codec.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/c_smart_ptr.h"
-#include "common/common/logger.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/common/logger.h"
 
 #include "nghttp2/nghttp2.h"
 
diff --git a/source/common/http/http2/nghttp2.cc b/source/common/http/http2/nghttp2.cc
index 68e9c620e9c86..83e37878221d7 100644
--- a/source/common/http/http2/nghttp2.cc
+++ b/source/common/http/http2/nghttp2.cc
@@ -1,6 +1,6 @@
-#include "common/http/http2/nghttp2.h"
+#include "source/common/http/http2/nghttp2.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 // nghttp2 fails to convey the POSIX ssize_t declaration
 // that Microsoft declines to implement. Pick up a valid
diff --git a/source/common/http/http2/protocol_constraints.cc b/source/common/http/http2/protocol_constraints.cc
index 5d8f38a44c406..cc3d2252d8dc2 100644
--- a/source/common/http/http2/protocol_constraints.cc
+++ b/source/common/http/http2/protocol_constraints.cc
@@ -1,7 +1,7 @@
-#include "common/http/http2/protocol_constraints.h"
+#include "source/common/http/http2/protocol_constraints.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http2/protocol_constraints.h b/source/common/http/http2/protocol_constraints.h
index 017db57289e01..a2e1f203cedcb 100644
--- a/source/common/http/http2/protocol_constraints.h
+++ b/source/common/http/http2/protocol_constraints.h
@@ -6,8 +6,8 @@
 #include "envoy/config/core/v3/protocol.pb.h"
 #include "envoy/network/connection.h"
 
-#include "common/http/http2/codec_stats.h"
-#include "common/http/status.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/status.h"
 
 #include "nghttp2/nghttp2.h"
 
diff --git a/source/common/http/http3/BUILD b/source/common/http/http3/BUILD
index 62021588859a8..92a28b20c1d5a 100644
--- a/source/common/http/http3/BUILD
+++ b/source/common/http/http3/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
     hdrs = ["conn_pool.h"],
     deps = [
         ":quic_client_connection_factory_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/http:codec_client_lib",
         "//source/common/http:conn_pool_base_lib",
         "//source/common/quic:client_connection_factory_lib",
@@ -31,8 +31,8 @@ envoy_cc_library(
     name = "codec_stats_lib",
     hdrs = ["codec_stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:thread_lib",
     ],
 )
diff --git a/source/common/http/http3/codec_stats.h b/source/common/http/http3/codec_stats.h
index c9dcf6f395a29..d8044922cbdbf 100644
--- a/source/common/http/http3/codec_stats.h
+++ b/source/common/http/http3/codec_stats.h
@@ -3,7 +3,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http3/conn_pool.cc b/source/common/http/http3/conn_pool.cc
index ec920aa646d24..efc9b0b61db92 100644
--- a/source/common/http/http3/conn_pool.cc
+++ b/source/common/http/http3/conn_pool.cc
@@ -1,16 +1,16 @@
-#include "common/http/http3/conn_pool.h"
+#include "source/common/http/http3/conn_pool.h"
 
 #include <cstdint>
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/utility.h"
-#include "common/http/http3/quic_client_connection_factory.h"
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/http3/quic_client_connection_factory.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/http3/conn_pool.h b/source/common/http/http3/conn_pool.h
index 674063e3c9411..7ab19f1f4a663 100644
--- a/source/common/http/http3/conn_pool.h
+++ b/source/common/http/http3/conn_pool.h
@@ -4,13 +4,13 @@
 
 #include "envoy/upstream/upstream.h"
 
-#include "common/http/codec_client.h"
-#include "common/http/conn_pool_base.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/conn_pool_base.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/client_connection_factory_impl.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 #else
 #error "http3 conn pool should not be built with QUIC disabled"
 #endif
diff --git a/source/common/http/http3_status_tracker.cc b/source/common/http/http3_status_tracker.cc
index 472d0672ed5b5..1ace46923b667 100644
--- a/source/common/http/http3_status_tracker.cc
+++ b/source/common/http/http3_status_tracker.cc
@@ -1,4 +1,4 @@
-#include "common/http/http3_status_tracker.h"
+#include "source/common/http/http3_status_tracker.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/legacy_path_canonicalizer.cc b/source/common/http/legacy_path_canonicalizer.cc
index 920e81bef260a..e1798b8ec80c4 100644
--- a/source/common/http/legacy_path_canonicalizer.cc
+++ b/source/common/http/legacy_path_canonicalizer.cc
@@ -1,7 +1,7 @@
-#include "common/http/legacy_path_canonicalizer.h"
+#include "source/common/http/legacy_path_canonicalizer.h"
 
-#include "common/chromium_url/url_canon.h"
-#include "common/chromium_url/url_canon_stdstring.h"
+#include "source/common/chromium_url/url_canon.h"
+#include "source/common/chromium_url/url_canon_stdstring.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/match_wrapper/BUILD b/source/common/http/match_wrapper/BUILD
index 1350d3db39e0b..a89a51a3b402d 100644
--- a/source/common/http/match_wrapper/BUILD
+++ b/source/common/http/match_wrapper/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/matcher:matcher_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/common/http/match_wrapper/config.cc b/source/common/http/match_wrapper/config.cc
index fe1bf7efd34f0..ef4fd0fa966f7 100644
--- a/source/common/http/match_wrapper/config.cc
+++ b/source/common/http/match_wrapper/config.cc
@@ -1,11 +1,11 @@
-#include "common/http/match_wrapper/config.h"
+#include "source/common/http/match_wrapper/config.h"
 
 #include "envoy/http/filter.h"
 #include "envoy/matcher/matcher.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/matcher/matcher.h"
+#include "source/common/config/utility.h"
+#include "source/common/matcher/matcher.h"
 
 #include "absl/status/status.h"
 
diff --git a/source/common/http/match_wrapper/config.h b/source/common/http/match_wrapper/config.h
index c1417aaa6f247..dd4a3f14fc2fe 100644
--- a/source/common/http/match_wrapper/config.h
+++ b/source/common/http/match_wrapper/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/common/matching/v3/extension_matcher.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Common {
diff --git a/source/common/http/matching/BUILD b/source/common/http/matching/BUILD
index 8b379453cbc65..87837d2e6ff34 100644
--- a/source/common/http/matching/BUILD
+++ b/source/common/http/matching/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "data_impl_lib",
     hdrs = ["data_impl.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
     ],
 )
 
@@ -22,8 +22,8 @@ envoy_cc_library(
     srcs = ["inputs.cc"],
     hdrs = ["inputs.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:header_utility_lib",
         "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto",
     ],
diff --git a/source/common/http/matching/inputs.cc b/source/common/http/matching/inputs.cc
index a7874d440456e..ed1afbfc30ab3 100644
--- a/source/common/http/matching/inputs.cc
+++ b/source/common/http/matching/inputs.cc
@@ -1,4 +1,4 @@
-#include "common/http/matching/inputs.h"
+#include "source/common/http/matching/inputs.h"
 
 #include "envoy/registry/registry.h"
 
diff --git a/source/common/http/matching/inputs.h b/source/common/http/matching/inputs.h
index bb69aa26b306c..af845f3364f8b 100644
--- a/source/common/http/matching/inputs.h
+++ b/source/common/http/matching/inputs.h
@@ -6,7 +6,7 @@
 #include "envoy/type/matcher/v3/http_inputs.pb.h"
 #include "envoy/type/matcher/v3/http_inputs.pb.validate.h"
 
-#include "common/http/header_utility.h"
+#include "source/common/http/header_utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/message_impl.h b/source/common/http/message_impl.h
index d746227912fc7..49ad140fd4800 100644
--- a/source/common/http/message_impl.h
+++ b/source/common/http/message_impl.h
@@ -5,9 +5,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/http/message.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/non_copyable.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/mixed_conn_pool.cc b/source/common/http/mixed_conn_pool.cc
index 07fcfea475aee..f9622d746a21a 100644
--- a/source/common/http/mixed_conn_pool.cc
+++ b/source/common/http/mixed_conn_pool.cc
@@ -1,10 +1,10 @@
-#include "common/http/mixed_conn_pool.h"
+#include "source/common/http/mixed_conn_pool.h"
 
-#include "common/http/codec_client.h"
-#include "common/http/http1/conn_pool.h"
-#include "common/http/http2/conn_pool.h"
-#include "common/http/utility.h"
-#include "common/tcp/conn_pool.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/http1/conn_pool.h"
+#include "source/common/http/http2/conn_pool.h"
+#include "source/common/http/utility.h"
+#include "source/common/tcp/conn_pool.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/mixed_conn_pool.h b/source/common/http/mixed_conn_pool.h
index bdee838d78178..4528aeb6eacd6 100644
--- a/source/common/http/mixed_conn_pool.h
+++ b/source/common/http/mixed_conn_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/http/conn_pool_base.h"
+#include "source/common/http/conn_pool_base.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/path_utility.cc b/source/common/http/path_utility.cc
index 3967520be305d..4afc26cd6ed2b 100644
--- a/source/common/http/path_utility.cc
+++ b/source/common/http/path_utility.cc
@@ -1,8 +1,8 @@
-#include "common/http/path_utility.h"
+#include "source/common/http/path_utility.h"
 
-#include "common/common/logger.h"
-#include "common/http/legacy_path_canonicalizer.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/legacy_path_canonicalizer.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
diff --git a/source/common/http/request_id_extension_impl.cc b/source/common/http/request_id_extension_impl.cc
index 8798c58484138..482a32b60ee48 100644
--- a/source/common/http/request_id_extension_impl.cc
+++ b/source/common/http/request_id_extension_impl.cc
@@ -1,6 +1,6 @@
-#include "common/http/request_id_extension_impl.h"
+#include "source/common/http/request_id_extension_impl.h"
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/rest_api_fetcher.cc b/source/common/http/rest_api_fetcher.cc
index af154ef89caf1..cbcb6a99232ca 100644
--- a/source/common/http/rest_api_fetcher.cc
+++ b/source/common/http/rest_api_fetcher.cc
@@ -1,13 +1,13 @@
-#include "common/http/rest_api_fetcher.h"
+#include "source/common/http/rest_api_fetcher.h"
 
 #include <chrono>
 #include <cstdint>
 #include <string>
 
-#include "common/common/enum_to_int.h"
-#include "common/config/utility.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/status.cc b/source/common/http/status.cc
index 1204a9ac9e4ff..a6eb3c92eb8f2 100644
--- a/source/common/http/status.cc
+++ b/source/common/http/status.cc
@@ -1,6 +1,6 @@
-#include "common/http/status.h"
+#include "source/common/http/status.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/http/user_agent.cc b/source/common/http/user_agent.cc
index 65c243aeae24c..cf5e6746f7783 100644
--- a/source/common/http/user_agent.cc
+++ b/source/common/http/user_agent.cc
@@ -1,4 +1,4 @@
-#include "common/http/user_agent.h"
+#include "source/common/http/user_agent.h"
 
 #include <cstdint>
 #include <memory>
@@ -8,9 +8,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/http/headers.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/user_agent.h b/source/common/http/user_agent.h
index aa617f48c4e59..8cb482b556c36 100644
--- a/source/common/http/user_agent.h
+++ b/source/common/http/user_agent.h
@@ -10,7 +10,7 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc
index c1ade1087e365..58ac1b6015f50 100644
--- a/source/common/http/utility.cc
+++ b/source/common/http/utility.cc
@@ -1,4 +1,4 @@
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 
 #include <http_parser.h>
 
@@ -10,20 +10,20 @@
 #include "envoy/config/core/v3/protocol.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/grpc/status.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/match.h"
diff --git a/source/common/http/utility.h b/source/common/http/utility.h
index 4c972a3fb4cf0..0cf5f612eb367 100644
--- a/source/common/http/utility.h
+++ b/source/common/http/utility.h
@@ -13,8 +13,8 @@
 #include "envoy/http/metadata_interface.h"
 #include "envoy/http/query_params.h"
 
-#include "common/http/exception.h"
-#include "common/http/status.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/status.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/common/init/BUILD b/source/common/init/BUILD
index 5b75ca4a82851..7df56e667b4b1 100644
--- a/source/common/init/BUILD
+++ b/source/common/init/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["watcher_impl.cc"],
     hdrs = ["watcher_impl.h"],
     deps = [
-        "//include/envoy/init:watcher_interface",
+        "//envoy/init:watcher_interface",
         "//source/common/common:logger_lib",
     ],
 )
@@ -23,7 +23,7 @@ envoy_cc_library(
     srcs = ["target_impl.cc"],
     hdrs = ["target_impl.h"],
     deps = [
-        "//include/envoy/init:target_interface",
+        "//envoy/init:target_interface",
         "//source/common/common:logger_lib",
     ],
 )
@@ -34,7 +34,7 @@ envoy_cc_library(
     hdrs = ["manager_impl.h"],
     deps = [
         ":watcher_lib",
-        "//include/envoy/init:manager_interface",
+        "//envoy/init:manager_interface",
         "//source/common/common:logger_lib",
     ],
 )
diff --git a/source/common/init/manager_impl.cc b/source/common/init/manager_impl.cc
index f0452170d7785..4ffbf75a2b1bf 100644
--- a/source/common/init/manager_impl.cc
+++ b/source/common/init/manager_impl.cc
@@ -1,9 +1,9 @@
-#include "common/init/manager_impl.h"
+#include "source/common/init/manager_impl.h"
 
 #include <functional>
 
-#include "common/common/assert.h"
-#include "common/init/watcher_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/init/watcher_impl.h"
 
 namespace Envoy {
 namespace Init {
diff --git a/source/common/init/manager_impl.h b/source/common/init/manager_impl.h
index 4bba5b344659f..85d901cd56a66 100644
--- a/source/common/init/manager_impl.h
+++ b/source/common/init/manager_impl.h
@@ -4,8 +4,8 @@
 
 #include "envoy/init/manager.h"
 
-#include "common/common/logger.h"
-#include "common/init/watcher_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/init/watcher_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/init/target_impl.cc b/source/common/init/target_impl.cc
index 4e3fda44b6a08..1c8ddfdea5cec 100644
--- a/source/common/init/target_impl.cc
+++ b/source/common/init/target_impl.cc
@@ -1,4 +1,4 @@
-#include "common/init/target_impl.h"
+#include "source/common/init/target_impl.h"
 
 namespace Envoy {
 namespace Init {
diff --git a/source/common/init/target_impl.h b/source/common/init/target_impl.h
index 9cc0bac76c11e..72bde7f8d32a9 100644
--- a/source/common/init/target_impl.h
+++ b/source/common/init/target_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/init/target.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Init {
diff --git a/source/common/init/watcher_impl.cc b/source/common/init/watcher_impl.cc
index 50b792bdcbbe0..de17f7c1b5dc2 100644
--- a/source/common/init/watcher_impl.cc
+++ b/source/common/init/watcher_impl.cc
@@ -1,4 +1,4 @@
-#include "common/init/watcher_impl.h"
+#include "source/common/init/watcher_impl.h"
 
 namespace Envoy {
 namespace Init {
diff --git a/source/common/init/watcher_impl.h b/source/common/init/watcher_impl.h
index fb41d8c0400a7..10ff51ee83b56 100644
--- a/source/common/init/watcher_impl.h
+++ b/source/common/init/watcher_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/init/watcher.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Init {
diff --git a/source/common/json/BUILD b/source/common/json/BUILD
index 4cc634bc0d697..23060918cb52b 100644
--- a/source/common/json/BUILD
+++ b/source/common/json/BUILD
@@ -16,7 +16,7 @@ envoy_cc_library(
         "rapidjson",
     ],
     deps = [
-        "//include/envoy/json:json_object_interface",
+        "//envoy/json:json_object_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:hash_lib",
         "//source/common/common:utility_lib",
@@ -32,7 +32,7 @@ envoy_cc_library(
         "json",
     ],
     deps = [
-        "//include/envoy/json:json_object_interface",
+        "//envoy/json:json_object_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:hash_lib",
         "//source/common/common:utility_lib",
@@ -47,7 +47,7 @@ envoy_cc_library(
     deps = [
         ":json_internal_legacy_lib",
         ":json_internal_lib",
-        "//include/envoy/json:json_object_interface",
+        "//envoy/json:json_object_interface",
         "//source/common/runtime:runtime_features_lib",
     ],
 )
diff --git a/source/common/json/json_internal.cc b/source/common/json/json_internal.cc
index d26c62d1e163c..b4afc8ef10041 100644
--- a/source/common/json/json_internal.cc
+++ b/source/common/json/json_internal.cc
@@ -1,4 +1,4 @@
-#include "common/json/json_internal.h"
+#include "source/common/json/json_internal.h"
 
 #include <cstdint>
 #include <fstream>
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/hash.h"
-#include "common/common/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/utility.h"
+#include "source/common/protobuf/utility.h"
 
 // Do not let nlohmann/json leak outside of this file.
 #include "include/nlohmann/json.hpp"
diff --git a/source/common/json/json_internal_legacy.cc b/source/common/json/json_internal_legacy.cc
index c323cf75810c7..d77fd773122bf 100644
--- a/source/common/json/json_internal_legacy.cc
+++ b/source/common/json/json_internal_legacy.cc
@@ -1,4 +1,4 @@
-#include "common/json/json_internal_legacy.h"
+#include "source/common/json/json_internal_legacy.h"
 
 #include <cstdint>
 #include <fstream>
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/hash.h"
-#include "common/common/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/utility.h"
+#include "source/common/protobuf/utility.h"
 
 // Do not let RapidJson leak outside of this file.
 #include "rapidjson/document.h"
diff --git a/source/common/json/json_loader.cc b/source/common/json/json_loader.cc
index 0e4f3669a1b85..2bef4c314be21 100644
--- a/source/common/json/json_loader.cc
+++ b/source/common/json/json_loader.cc
@@ -1,8 +1,8 @@
-#include "common/json/json_loader.h"
+#include "source/common/json/json_loader.h"
 
-#include "common/json/json_internal.h"
-#include "common/json/json_internal_legacy.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/json/json_internal.h"
+#include "source/common/json/json_internal_legacy.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Json {
diff --git a/source/common/local_info/BUILD b/source/common/local_info/BUILD
index 47c3b542d5bb5..254710601695f 100644
--- a/source/common/local_info/BUILD
+++ b/source/common/local_info/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "local_info_lib",
     hdrs = ["local_info_impl.h"],
     deps = [
-        "//include/envoy/local_info:local_info_interface",
+        "//envoy/local_info:local_info_interface",
         "//source/common/config:context_provider_lib",
         "//source/common/config:version_converter_lib",
         "//source/common/stats:symbol_table_lib",
diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h
index 629d5eaff0e0a..1d583c14e8231 100644
--- a/source/common/local_info/local_info_impl.h
+++ b/source/common/local_info/local_info_impl.h
@@ -5,9 +5,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/local_info/local_info.h"
 
-#include "common/config/context_provider_impl.h"
-#include "common/config/version_converter.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/config/context_provider_impl.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace LocalInfo {
diff --git a/source/common/local_reply/BUILD b/source/common/local_reply/BUILD
index a01895c3bebc6..4976d7c19ab58 100644
--- a/source/common/local_reply/BUILD
+++ b/source/common/local_reply/BUILD
@@ -13,11 +13,11 @@ envoy_cc_library(
     srcs = ["local_reply.cc"],
     hdrs = ["local_reply.h"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/common:enum_to_int",
         "//source/common/config:datasource_lib",
diff --git a/source/common/local_reply/local_reply.cc b/source/common/local_reply/local_reply.cc
index 753003f223b33..c99c3b2d44454 100644
--- a/source/common/local_reply/local_reply.cc
+++ b/source/common/local_reply/local_reply.cc
@@ -1,17 +1,17 @@
-#include "common/local_reply/local_reply.h"
+#include "source/common/local_reply/local_reply.h"
 
 #include <string>
 #include <vector>
 
 #include "envoy/api/api.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/config/datasource.h"
-#include "common/formatter/substitution_format_string.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/http/header_map_impl.h"
-#include "common/router/header_parser.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/config/datasource.h"
+#include "source/common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/header_parser.h"
 
 namespace Envoy {
 namespace LocalReply {
diff --git a/source/common/local_reply/local_reply.h b/source/common/local_reply/local_reply.h
index 5db93caa07fda..23294df76a25f 100644
--- a/source/common/local_reply/local_reply.h
+++ b/source/common/local_reply/local_reply.h
@@ -5,7 +5,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 namespace Envoy {
 namespace LocalReply {
diff --git a/source/common/matcher/BUILD b/source/common/matcher/BUILD
index 98fe3f15b0ce7..303c889ef82b2 100644
--- a/source/common/matcher/BUILD
+++ b/source/common/matcher/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "exact_map_matcher_lib",
     hdrs = ["exact_map_matcher.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
     ],
 )
 
@@ -20,7 +20,7 @@ envoy_cc_library(
     name = "value_input_matcher_lib",
     hdrs = ["value_input_matcher.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
         "//source/common/common:matchers_lib",
     ],
 )
@@ -29,7 +29,7 @@ envoy_cc_library(
     name = "validation_visitor_lib",
     hdrs = ["validation_visitor.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
     ],
 )
 
@@ -38,7 +38,7 @@ envoy_cc_library(
     hdrs = ["list_matcher.h"],
     deps = [
         ":field_matcher_lib",
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
     ],
 )
 
@@ -46,7 +46,7 @@ envoy_cc_library(
     name = "field_matcher_lib",
     hdrs = ["field_matcher.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
     ],
 )
 
@@ -60,8 +60,8 @@ envoy_cc_library(
         ":list_matcher_lib",
         ":validation_visitor_lib",
         ":value_input_matcher_lib",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/matcher:matcher_interface",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/source/common/matcher/list_matcher.h b/source/common/matcher/list_matcher.h
index 94b9b9274f77e..336446160a3e2 100644
--- a/source/common/matcher/list_matcher.h
+++ b/source/common/matcher/list_matcher.h
@@ -2,7 +2,7 @@
 
 #include "envoy/matcher/matcher.h"
 
-#include "common/matcher/field_matcher.h"
+#include "source/common/matcher/field_matcher.h"
 
 namespace Envoy {
 namespace Matcher {
diff --git a/source/common/matcher/matcher.cc b/source/common/matcher/matcher.cc
index e784c8f02496e..ea7215a3fcf60 100644
--- a/source/common/matcher/matcher.cc
+++ b/source/common/matcher/matcher.cc
@@ -1,6 +1,6 @@
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/matcher.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {}
diff --git a/source/common/matcher/matcher.h b/source/common/matcher/matcher.h
index 511e844287e92..7659fdd871b15 100644
--- a/source/common/matcher/matcher.h
+++ b/source/common/matcher/matcher.h
@@ -8,13 +8,13 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/matcher/matcher.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/matcher/exact_map_matcher.h"
-#include "common/matcher/field_matcher.h"
-#include "common/matcher/list_matcher.h"
-#include "common/matcher/validation_visitor.h"
-#include "common/matcher/value_input_matcher.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/matcher/exact_map_matcher.h"
+#include "source/common/matcher/field_matcher.h"
+#include "source/common/matcher/list_matcher.h"
+#include "source/common/matcher/validation_visitor.h"
+#include "source/common/matcher/value_input_matcher.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/common/matcher/value_input_matcher.h b/source/common/matcher/value_input_matcher.h
index acbfded9cd7e2..e381f393550c2 100644
--- a/source/common/matcher/value_input_matcher.h
+++ b/source/common/matcher/value_input_matcher.h
@@ -2,7 +2,7 @@
 
 #include "envoy/matcher/matcher.h"
 
-#include "common/common/matchers.h"
+#include "source/common/common/matchers.h"
 
 namespace Envoy {
 namespace Matcher {
diff --git a/source/common/memory/BUILD b/source/common/memory/BUILD
index 1fe67e534e494..e6e528c960006 100644
--- a/source/common/memory/BUILD
+++ b/source/common/memory/BUILD
@@ -34,9 +34,9 @@ envoy_cc_library(
     hdrs = ["heap_shrinker.h"],
     deps = [
         ":utils_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/stats:symbol_table_lib",
     ],
 )
diff --git a/source/common/memory/heap_shrinker.cc b/source/common/memory/heap_shrinker.cc
index 5df99c8b42d09..4cc3ea7c51319 100644
--- a/source/common/memory/heap_shrinker.cc
+++ b/source/common/memory/heap_shrinker.cc
@@ -1,7 +1,7 @@
-#include "common/memory/heap_shrinker.h"
+#include "source/common/memory/heap_shrinker.h"
 
-#include "common/memory/utils.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/memory/utils.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/memory/stats.cc b/source/common/memory/stats.cc
index 5b4e97261a4c9..3c3abb00aae4b 100644
--- a/source/common/memory/stats.cc
+++ b/source/common/memory/stats.cc
@@ -1,8 +1,8 @@
-#include "common/memory/stats.h"
+#include "source/common/memory/stats.h"
 
 #include <cstdint>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #if defined(TCMALLOC)
 
diff --git a/source/common/memory/utils.cc b/source/common/memory/utils.cc
index c6ac4f6c5fe87..f8b19d92e3502 100644
--- a/source/common/memory/utils.cc
+++ b/source/common/memory/utils.cc
@@ -1,7 +1,7 @@
-#include "common/memory/utils.h"
+#include "source/common/memory/utils.h"
 
-#include "common/common/assert.h"
-#include "common/memory/stats.h"
+#include "source/common/common/assert.h"
+#include "source/common/memory/stats.h"
 
 #if defined(TCMALLOC)
 #include "tcmalloc/malloc_extension.h"
diff --git a/source/common/network/BUILD b/source/common/network/BUILD
index 4991af1ad8996..650edfa192ea4 100644
--- a/source/common/network/BUILD
+++ b/source/common/network/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     hdrs = ["address_impl.h"],
     deps = [
         ":socket_interface_lib",
-        "//include/envoy/network:address_interface",
+        "//envoy/network:address_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:safe_memcpy_lib",
@@ -27,7 +27,7 @@ envoy_cc_library(
     srcs = ["application_protocol.cc"],
     hdrs = ["application_protocol.h"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
@@ -39,7 +39,7 @@ envoy_cc_library(
     deps = [
         ":address_lib",
         ":utility_lib",
-        "//include/envoy/network:address_interface",
+        "//envoy/network:address_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:safe_memcpy_lib",
         "//source/common/common:utility_lib",
@@ -52,7 +52,7 @@ envoy_cc_library(
     srcs = ["connection_balancer_impl.cc"],
     hdrs = ["connection_balancer_impl.h"],
     deps = [
-        "//include/envoy/network:connection_balancer_interface",
+        "//envoy/network:connection_balancer_interface",
     ],
 )
 
@@ -62,8 +62,8 @@ envoy_cc_library(
     hdrs = ["connection_impl_base.h"],
     deps = [
         ":filter_manager_lib",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
     ],
@@ -79,10 +79,10 @@ envoy_cc_library(
         ":connection_base_lib",
         ":raw_buffer_socket_lib",
         ":utility_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server/overload:thread_local_overload_state",
+        "//envoy/event:timer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/server/overload:thread_local_overload_state",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
@@ -109,10 +109,10 @@ envoy_cc_library(
     deps = [
         ":address_lib",
         ":utility_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:dns_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:dns_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:backoff_lib",
         "//source/common/common:linked_object",
@@ -128,9 +128,9 @@ envoy_cc_library(
     deps = [
         ":address_lib",
         ":utility_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/network:dns_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/network:dns_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:linked_object",
     ],
@@ -140,7 +140,7 @@ envoy_cc_library(
     name = "filter_lib",
     hdrs = ["filter_impl.h"],
     deps = [
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:filter_interface",
     ],
 )
 
@@ -149,8 +149,8 @@ envoy_cc_library(
     srcs = ["filter_manager_impl.cc"],
     hdrs = ["filter_manager_impl.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:linked_object",
     ],
@@ -161,7 +161,7 @@ envoy_cc_library(
     srcs = ["hash_policy.cc"],
     hdrs = ["hash_policy.h"],
     deps = [
-        "//include/envoy/network:hash_policy_interface",
+        "//envoy/network:hash_policy_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:hash_lib",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
@@ -173,7 +173,7 @@ envoy_cc_library(
     srcs = ["io_socket_error_impl.cc"],
     hdrs = ["io_socket_error_impl.h"],
     deps = [
-        "//include/envoy/api:io_error_interface",
+        "//envoy/api:io_error_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
     ],
@@ -198,10 +198,10 @@ envoy_cc_library(
     name = "socket_interface_lib",
     hdrs = ["socket_interface.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/network:socket_interface_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:bootstrap_extension_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/network:socket_interface_interface",
+        "//envoy/registry",
+        "//envoy/server:bootstrap_extension_config_interface",
     ],
 )
 
@@ -220,8 +220,8 @@ envoy_cc_library(
         ":io_socket_error_lib",
         ":socket_interface_lib",
         ":socket_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:io_handle_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:io_handle_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/event:dispatcher_includes",
         "@envoy_api//envoy/extensions/network/socket_interface/v3:pkg_cc_proto",
@@ -233,8 +233,8 @@ envoy_cc_library(
     srcs = ["socket_impl.cc"],
     hdrs = ["socket_impl.h"],
     deps = [
-        "//include/envoy/network:socket_interface",
-        "//include/envoy/network:socket_interface_interface",
+        "//envoy/network:socket_interface",
+        "//envoy/network:socket_interface_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
@@ -249,8 +249,8 @@ envoy_cc_library(
     deps = [
         ":socket_lib",
         ":utility_lib",
-        "//include/envoy/network:exception_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:exception_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/common:assert_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -272,13 +272,13 @@ envoy_cc_library(
         ":address_lib",
         ":default_socket_interface_lib",
         ":listen_socket_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/network:exception_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/network:exception_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -294,8 +294,8 @@ envoy_cc_library(
     hdrs = ["raw_buffer_socket.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/http:headers_lib",
@@ -308,9 +308,9 @@ envoy_cc_library(
     hdrs = ["resolver_impl.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:resolver_interface",
-        "//include/envoy/registry",
+        "//envoy/network:address_interface",
+        "//envoy/network:resolver_interface",
+        "//envoy/registry",
         "//source/common/config:well_known_names",
         "//source/common/network:address_lib",
         "//source/common/protobuf",
@@ -326,8 +326,8 @@ envoy_cc_library(
     deps = [
         ":address_lib",
         ":listen_socket_lib",
-        "//include/envoy/api:os_sys_calls_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/api:os_sys_calls_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -345,7 +345,7 @@ envoy_cc_library(
         ":address_lib",
         ":socket_lib",
         ":socket_option_lib",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:logger_lib",
@@ -361,7 +361,7 @@ envoy_cc_library(
         ":address_lib",
         ":socket_lib",
         ":socket_option_lib",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:logger_lib",
@@ -380,7 +380,7 @@ envoy_cc_library(
         ":address_lib",
         ":socket_option_lib",
         ":win32_redirect_records_option_lib",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/common:logger_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -394,9 +394,9 @@ envoy_cc_library(
         ":address_lib",
         ":default_socket_interface_lib",
         ":socket_lib",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
@@ -416,9 +416,9 @@ envoy_cc_library(
         ":proxy_protocol_filter_state_lib",
         ":upstream_server_name_lib",
         ":upstream_subject_alt_names_lib",
-        "//include/envoy/network:proxy_protocol_options_lib",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/network:proxy_protocol_options_lib",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:scalar_to_byte_vector_lib",
         "//source/common/common:utility_lib",
     ],
@@ -429,7 +429,7 @@ envoy_cc_library(
     srcs = ["upstream_server_name.cc"],
     hdrs = ["upstream_server_name.h"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
@@ -439,7 +439,7 @@ envoy_cc_library(
     srcs = ["upstream_subject_alt_names.cc"],
     hdrs = ["upstream_subject_alt_names.h"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
@@ -454,8 +454,8 @@ envoy_cc_library(
         "abseil_str_format",
     ],
     deps = [
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
         "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
     ],
 )
@@ -467,8 +467,8 @@ envoy_cc_library(
     deps = [
         ":io_socket_error_lib",
         ":utility_lib",
-        "//include/envoy/network:socket_interface",
-        "//include/envoy/network:udp_packet_writer_handler_interface",
+        "//envoy/network:socket_interface",
+        "//envoy/network:udp_packet_writer_handler_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
@@ -478,8 +478,8 @@ envoy_cc_library(
     srcs = ["proxy_protocol_filter_state.cc"],
     hdrs = ["proxy_protocol_filter_state.h"],
     deps = [
-        "//include/envoy/network:proxy_protocol_options_lib",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/network:proxy_protocol_options_lib",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
@@ -491,8 +491,8 @@ envoy_cc_library(
     deps = [
         ":socket_interface_lib",
         ":socket_option_factory_lib",
-        "//include/envoy/network:io_handle_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/network:io_handle_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
diff --git a/source/common/network/addr_family_aware_socket_option_impl.cc b/source/common/network/addr_family_aware_socket_option_impl.cc
index 4e48958f27120..8c4c756a1093c 100644
--- a/source/common/network/addr_family_aware_socket_option_impl.cc
+++ b/source/common/network/addr_family_aware_socket_option_impl.cc
@@ -1,13 +1,13 @@
-#include "common/network/addr_family_aware_socket_option_impl.h"
+#include "source/common/network/addr_family_aware_socket_option_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/addr_family_aware_socket_option_impl.h b/source/common/network/addr_family_aware_socket_option_impl.h
index 5f06b13e9cd80..749788a4d9fa4 100644
--- a/source/common/network/addr_family_aware_socket_option_impl.h
+++ b/source/common/network/addr_family_aware_socket_option_impl.h
@@ -4,8 +4,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/listen_socket.h"
 
-#include "common/common/logger.h"
-#include "common/network/socket_option_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/socket_option_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/network/address_impl.cc b/source/common/network/address_impl.cc
index 478299a503ee3..be1d06a491148 100644
--- a/source/common/network/address_impl.cc
+++ b/source/common/network/address_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/address_impl.h"
+#include "source/common/network/address_impl.h"
 
 #include <array>
 #include <cstdint>
@@ -7,11 +7,11 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-#include "common/network/socket_interface.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/socket_interface.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/address_impl.h b/source/common/network/address_impl.h
index 584b5384d1405..a158ca63e4fca 100644
--- a/source/common/network/address_impl.h
+++ b/source/common/network/address_impl.h
@@ -10,7 +10,7 @@
 #include "envoy/network/address.h"
 #include "envoy/network/socket.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/apple_dns_impl.cc b/source/common/network/apple_dns_impl.cc
index 25a44ace0a666..f542c2424f7f8 100644
--- a/source/common/network/apple_dns_impl.cc
+++ b/source/common/network/apple_dns_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/apple_dns_impl.h"
+#include "source/common/network/apple_dns_impl.h"
 
 #include <dns_sd.h>
 
@@ -11,10 +11,10 @@
 #include "envoy/common/platform.h"
 #include "envoy/event/file_event.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/network/apple_dns_impl.h b/source/common/network/apple_dns_impl.h
index 0ca2cd2517bc0..d22bc2c7c87e2 100644
--- a/source/common/network/apple_dns_impl.h
+++ b/source/common/network/apple_dns_impl.h
@@ -11,11 +11,11 @@
 #include "envoy/event/timer.h"
 #include "envoy/network/dns.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/network/application_protocol.cc b/source/common/network/application_protocol.cc
index 57d9bbb556ce3..6794194ac90d5 100644
--- a/source/common/network/application_protocol.cc
+++ b/source/common/network/application_protocol.cc
@@ -1,6 +1,6 @@
-#include "common/network/application_protocol.h"
+#include "source/common/network/application_protocol.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/base_listener_impl.cc b/source/common/network/base_listener_impl.cc
index bd524c7921549..df953ecd29e3d 100644
--- a/source/common/network/base_listener_impl.cc
+++ b/source/common/network/base_listener_impl.cc
@@ -1,14 +1,14 @@
-#include "common/network/base_listener_impl.h"
+#include "source/common/network/base_listener_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/event/file_event_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/file_event_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_impl.h"
 
 #include "event2/listener.h"
 
diff --git a/source/common/network/base_listener_impl.h b/source/common/network/base_listener_impl.h
index 2cf97dea86c4a..62cebdbd4dd57 100644
--- a/source/common/network/base_listener_impl.h
+++ b/source/common/network/base_listener_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/network/listener.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/network/listen_socket_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/listen_socket_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/cidr_range.cc b/source/common/network/cidr_range.cc
index 2ee249f265c1b..cdbfe9fe1d60b 100644
--- a/source/common/network/cidr_range.cc
+++ b/source/common/network/cidr_range.cc
@@ -1,4 +1,4 @@
-#include "common/network/cidr_range.h"
+#include "source/common/network/cidr_range.h"
 
 #include <array>
 #include <cstdint>
@@ -9,12 +9,12 @@
 #include "envoy/common/platform.h"
 #include "envoy/config/core/v3/address.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/cidr_range.h b/source/common/network/cidr_range.h
index 9ec72f39156b8..791f3de7b5d67 100644
--- a/source/common/network/cidr_range.h
+++ b/source/common/network/cidr_range.h
@@ -6,7 +6,7 @@
 #include "envoy/config/core/v3/address.pb.h"
 #include "envoy/network/address.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/connection_balancer_impl.cc b/source/common/network/connection_balancer_impl.cc
index 84aed4ef64051..309628073f19e 100644
--- a/source/common/network/connection_balancer_impl.cc
+++ b/source/common/network/connection_balancer_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/connection_balancer_impl.h"
+#include "source/common/network/connection_balancer_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc
index 2d964ac4c22a6..9f37d4b5b70da 100644
--- a/source/common/network/connection_impl.cc
+++ b/source/common/network/connection_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/connection_impl.h"
+#include "source/common/network/connection_impl.h"
 
 #include <atomic>
 #include <cstdint>
@@ -12,15 +12,15 @@
 #include "envoy/network/filter.h"
 #include "envoy/network/socket.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/scope_tracker.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/connection_impl.h b/source/common/network/connection_impl.h
index 17021980febbf..4e9f0044924c1 100644
--- a/source/common/network/connection_impl.h
+++ b/source/common/network/connection_impl.h
@@ -9,10 +9,10 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/event/libevent.h"
-#include "common/network/connection_impl_base.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/event/libevent.h"
+#include "source/common/network/connection_impl_base.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/network/connection_impl_base.cc b/source/common/network/connection_impl_base.cc
index 22803ec56642a..71a5fbb5e94ac 100644
--- a/source/common/network/connection_impl_base.cc
+++ b/source/common/network/connection_impl_base.cc
@@ -1,4 +1,4 @@
-#include "common/network/connection_impl_base.h"
+#include "source/common/network/connection_impl_base.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/connection_impl_base.h b/source/common/network/connection_impl_base.h
index 5bb12eea5a7d9..05a7eddee9f60 100644
--- a/source/common/network/connection_impl_base.h
+++ b/source/common/network/connection_impl_base.h
@@ -2,8 +2,8 @@
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/logger.h"
-#include "common/network/filter_manager_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/filter_manager_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/dns_impl.cc b/source/common/network/dns_impl.cc
index 1adaa9656c0e6..5e42755061c72 100644
--- a/source/common/network/dns_impl.cc
+++ b/source/common/network/dns_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/dns_impl.h"
+#include "source/common/network/dns_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -8,11 +8,11 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/thread.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "absl/strings/str_join.h"
 #include "ares.h"
diff --git a/source/common/network/dns_impl.h b/source/common/network/dns_impl.h
index d03aacbb46d14..f58609ad674a8 100644
--- a/source/common/network/dns_impl.h
+++ b/source/common/network/dns_impl.h
@@ -8,9 +8,9 @@
 #include "envoy/event/file_event.h"
 #include "envoy/network/dns.h"
 
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/node_hash_map.h"
 #include "ares.h"
diff --git a/source/common/network/filter_manager_impl.cc b/source/common/network/filter_manager_impl.cc
index 5bec16f5f75ae..f5984f2db43ce 100644
--- a/source/common/network/filter_manager_impl.cc
+++ b/source/common/network/filter_manager_impl.cc
@@ -1,10 +1,10 @@
-#include "common/network/filter_manager_impl.h"
+#include "source/common/network/filter_manager_impl.h"
 
 #include <list>
 
 #include "envoy/network/connection.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/filter_manager_impl.h b/source/common/network/filter_manager_impl.h
index 0f10e6302a1f6..87973160939ef 100644
--- a/source/common/network/filter_manager_impl.h
+++ b/source/common/network/filter_manager_impl.h
@@ -7,7 +7,7 @@
 #include "envoy/network/filter.h"
 #include "envoy/network/socket.h"
 
-#include "common/common/linked_object.h"
+#include "source/common/common/linked_object.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/filter_matcher.cc b/source/common/network/filter_matcher.cc
index 3865d3e05d992..6e1410eab566a 100644
--- a/source/common/network/filter_matcher.cc
+++ b/source/common/network/filter_matcher.cc
@@ -1,8 +1,8 @@
-#include "common/network/filter_matcher.h"
+#include "source/common/network/filter_matcher.h"
 
 #include "envoy/network/filter.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/str_format.h"
 
diff --git a/source/common/network/hash_policy.cc b/source/common/network/hash_policy.cc
index 486be4772f3b5..2baf9fe8d0e51 100644
--- a/source/common/network/hash_policy.cc
+++ b/source/common/network/hash_policy.cc
@@ -1,9 +1,9 @@
-#include "common/network/hash_policy.h"
+#include "source/common/network/hash_policy.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/type/v3/hash_policy.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/hash_policy.h b/source/common/network/hash_policy.h
index b0c2c4894cc4e..1b5d09489fcf0 100644
--- a/source/common/network/hash_policy.h
+++ b/source/common/network/hash_policy.h
@@ -3,7 +3,7 @@
 #include "envoy/network/hash_policy.h"
 #include "envoy/type/v3/hash_policy.pb.h"
 
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/io_socket_error_impl.cc b/source/common/network/io_socket_error_impl.cc
index 04a91c3d79623..8d664be8e1f47 100644
--- a/source/common/network/io_socket_error_impl.cc
+++ b/source/common/network/io_socket_error_impl.cc
@@ -1,9 +1,9 @@
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/io_socket_error_impl.h b/source/common/network/io_socket_error_impl.h
index 1b361a9a3e2f3..bd4d80ce68e12 100644
--- a/source/common/network/io_socket_error_impl.h
+++ b/source/common/network/io_socket_error_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/api/io_error.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/io_socket_handle_impl.cc b/source/common/network/io_socket_handle_impl.cc
index b8bd7f2ac1c94..7e2f3a5b789db 100644
--- a/source/common/network/io_socket_handle_impl.cc
+++ b/source/common/network/io_socket_handle_impl.cc
@@ -1,11 +1,11 @@
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/utility.h"
-#include "common/event/file_event_impl.h"
-#include "common/network/address_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/file_event_impl.h"
+#include "source/common/network/address_impl.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/types/optional.h"
diff --git a/source/common/network/io_socket_handle_impl.h b/source/common/network/io_socket_handle_impl.h
index 6b21e94c6927a..398ab1f554f5f 100644
--- a/source/common/network/io_socket_handle_impl.h
+++ b/source/common/network/io_socket_handle_impl.h
@@ -6,8 +6,8 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/network/io_handle.h"
 
-#include "common/common/logger.h"
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/lc_trie.h b/source/common/network/lc_trie.h
index 6069eab01eb0c..db523fe980a59 100644
--- a/source/common/network/lc_trie.h
+++ b/source/common/network/lc_trie.h
@@ -8,11 +8,11 @@
 #include "envoy/common/platform.h"
 #include "envoy/network/address.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/cidr_range.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/utility.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/numeric/int128.h"
diff --git a/source/common/network/listen_socket_impl.cc b/source/common/network/listen_socket_impl.cc
index bd8a8b8bb0a3e..4ed599d19b737 100644
--- a/source/common/network/listen_socket_impl.cc
+++ b/source/common/network/listen_socket_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/listen_socket_impl.h"
+#include "source/common/network/listen_socket_impl.h"
 
 #include <sys/types.h>
 
@@ -9,11 +9,11 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/listen_socket_impl.h b/source/common/network/listen_socket_impl.h
index 4a98916115317..d42e8cadd683a 100644
--- a/source/common/network/listen_socket_impl.h
+++ b/source/common/network/listen_socket_impl.h
@@ -10,10 +10,10 @@
 #include "envoy/network/socket.h"
 #include "envoy/network/socket_interface.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/network/socket_impl.h"
-#include "common/network/socket_interface.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/socket_interface.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/proxy_protocol_filter_state.cc b/source/common/network/proxy_protocol_filter_state.cc
index cae58c9612537..37940bbad746a 100644
--- a/source/common/network/proxy_protocol_filter_state.cc
+++ b/source/common/network/proxy_protocol_filter_state.cc
@@ -1,6 +1,6 @@
-#include "common/network/proxy_protocol_filter_state.h"
+#include "source/common/network/proxy_protocol_filter_state.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/raw_buffer_socket.cc b/source/common/network/raw_buffer_socket.cc
index 96f75a1c419be..ad72a2fb434de 100644
--- a/source/common/network/raw_buffer_socket.cc
+++ b/source/common/network/raw_buffer_socket.cc
@@ -1,9 +1,9 @@
-#include "common/network/raw_buffer_socket.h"
+#include "source/common/network/raw_buffer_socket.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/http/headers.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/raw_buffer_socket.h b/source/common/network/raw_buffer_socket.h
index 24e498ebf59a9..06462d86f886d 100644
--- a/source/common/network/raw_buffer_socket.h
+++ b/source/common/network/raw_buffer_socket.h
@@ -4,7 +4,7 @@
 #include "envoy/network/connection.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/resolver_impl.cc b/source/common/network/resolver_impl.cc
index 66554c0d23674..069ff71208ee2 100644
--- a/source/common/network/resolver_impl.cc
+++ b/source/common/network/resolver_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/resolver_impl.h"
+#include "source/common/network/resolver_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/address.pb.h"
@@ -6,9 +6,9 @@
 #include "envoy/network/resolver.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/well_known_names.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/resolver_impl.h b/source/common/network/resolver_impl.h
index 0241a4fe53094..e6da88a4af508 100644
--- a/source/common/network/resolver_impl.h
+++ b/source/common/network/resolver_impl.h
@@ -5,7 +5,7 @@
 #include "envoy/network/connection.h"
 #include "envoy/network/resolver.h"
 
-#include "common/network/address_impl.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_impl.cc b/source/common/network/socket_impl.cc
index 7a558ca059081..08505cb65b0a4 100644
--- a/source/common/network/socket_impl.cc
+++ b/source/common/network/socket_impl.cc
@@ -1,10 +1,10 @@
-#include "common/network/socket_impl.h"
+#include "source/common/network/socket_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/network/socket_interface.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_impl.h b/source/common/network/socket_impl.h
index 756b96638d21a..fd2765646f1ce 100644
--- a/source/common/network/socket_impl.h
+++ b/source/common/network/socket_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/network/socket.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_interface.h b/source/common/network/socket_interface.h
index 89ae1d9770ded..d225040cd0163 100644
--- a/source/common/network/socket_interface.h
+++ b/source/common/network/socket_interface.h
@@ -5,7 +5,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/bootstrap_extension_config.h"
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/network/socket_interface_impl.cc b/source/common/network/socket_interface_impl.cc
index 8a3802e36769e..4847161321e5e 100644
--- a/source/common/network/socket_interface_impl.cc
+++ b/source/common/network/socket_interface_impl.cc
@@ -1,12 +1,12 @@
-#include "common/network/socket_interface_impl.h"
+#include "source/common/network/socket_interface_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_interface_impl.h b/source/common/network/socket_interface_impl.h
index ecc14e2e551b1..ce3889230f85a 100644
--- a/source/common/network/socket_interface_impl.h
+++ b/source/common/network/socket_interface_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/socket.h"
 
-#include "common/network/socket_interface.h"
+#include "source/common/network/socket_interface.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_option_factory.cc b/source/common/network/socket_option_factory.cc
index 484f0f3999afe..72b71d60fab0e 100644
--- a/source/common/network/socket_option_factory.cc
+++ b/source/common/network/socket_option_factory.cc
@@ -1,11 +1,11 @@
-#include "common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_factory.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/network/addr_family_aware_socket_option_impl.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/win32_redirect_records_option_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/network/addr_family_aware_socket_option_impl.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/win32_redirect_records_option_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_option_factory.h b/source/common/network/socket_option_factory.h
index 878a5fc0cd721..e40730167a1ba 100644
--- a/source/common/network/socket_option_factory.h
+++ b/source/common/network/socket_option_factory.h
@@ -4,8 +4,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/socket.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/network/socket_option_impl.cc b/source/common/network/socket_option_impl.cc
index 7293fa483b2f4..53d3bc8efd1ff 100644
--- a/source/common/network/socket_option_impl.cc
+++ b/source/common/network/socket_option_impl.cc
@@ -1,12 +1,12 @@
-#include "common/network/socket_option_impl.h"
+#include "source/common/network/socket_option_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/socket_option_impl.h b/source/common/network/socket_option_impl.h
index ce6ebb9265793..4c47dde2c08a7 100644
--- a/source/common/network/socket_option_impl.h
+++ b/source/common/network/socket_option_impl.h
@@ -5,8 +5,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/listen_socket.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/tcp_listener_impl.cc b/source/common/network/tcp_listener_impl.cc
index 09d56d566074f..ad8eb0e5c310f 100644
--- a/source/common/network/tcp_listener_impl.cc
+++ b/source/common/network/tcp_listener_impl.cc
@@ -1,18 +1,18 @@
-#include "common/network/tcp_listener_impl.h"
+#include "source/common/network/tcp_listener_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/event/file_event_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/file_event_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/tcp_listener_impl.h b/source/common/network/tcp_listener_impl.h
index 207b1b95abfc4..bf5826038c844 100644
--- a/source/common/network/tcp_listener_impl.h
+++ b/source/common/network/tcp_listener_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/common/random_generator.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 #include "absl/strings/string_view.h"
 #include "base_listener_impl.h"
diff --git a/source/common/network/transport_socket_options_impl.cc b/source/common/network/transport_socket_options_impl.cc
index 739bb3011d58e..2950a918cd22a 100644
--- a/source/common/network/transport_socket_options_impl.cc
+++ b/source/common/network/transport_socket_options_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/transport_socket_options_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
 
 #include <cstdint>
 #include <memory>
@@ -6,12 +6,12 @@
 #include <utility>
 #include <vector>
 
-#include "common/common/scalar_to_byte_vector.h"
-#include "common/common/utility.h"
-#include "common/network/application_protocol.h"
-#include "common/network/proxy_protocol_filter_state.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_subject_alt_names.h"
+#include "source/common/common/scalar_to_byte_vector.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/proxy_protocol_filter_state.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_subject_alt_names.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/udp_listener_impl.cc b/source/common/network/udp_listener_impl.cc
index 940ae25f9073f..44179ec4b0e52 100644
--- a/source/common/network/udp_listener_impl.cc
+++ b/source/common/network/udp_listener_impl.cc
@@ -1,4 +1,4 @@
-#include "common/network/udp_listener_impl.h"
+#include "source/common/network/udp_listener_impl.h"
 
 #include <cerrno>
 #include <csetjmp>
@@ -10,13 +10,13 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/exception.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 #include "absl/container/fixed_array.h"
 #include "event2/listener.h"
diff --git a/source/common/network/udp_listener_impl.h b/source/common/network/udp_listener_impl.h
index afd78713eb896..e6bd28c82ba21 100644
--- a/source/common/network/udp_listener_impl.h
+++ b/source/common/network/udp_listener_impl.h
@@ -4,10 +4,10 @@
 
 #include "envoy/common/time.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/event/event_impl_base.h"
-#include "common/event/file_event_impl.h"
-#include "common/network/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/event/event_impl_base.h"
+#include "source/common/event/file_event_impl.h"
+#include "source/common/network/utility.h"
 
 #include "base_listener_impl.h"
 
diff --git a/source/common/network/udp_packet_writer_handler_impl.cc b/source/common/network/udp_packet_writer_handler_impl.cc
index 27d499268e28a..cb0e8991e0ae9 100644
--- a/source/common/network/udp_packet_writer_handler_impl.cc
+++ b/source/common/network/udp_packet_writer_handler_impl.cc
@@ -1,7 +1,7 @@
-#include "common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/udp_packet_writer_handler_impl.h b/source/common/network/udp_packet_writer_handler_impl.h
index 16182d79fb6c7..7162195d85834 100644
--- a/source/common/network/udp_packet_writer_handler_impl.h
+++ b/source/common/network/udp_packet_writer_handler_impl.h
@@ -4,7 +4,7 @@
 #include "envoy/network/socket.h"
 #include "envoy/network/udp_packet_writer_handler.h"
 
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/upstream_server_name.cc b/source/common/network/upstream_server_name.cc
index d4bd93a94dc15..c6bc2559679eb 100644
--- a/source/common/network/upstream_server_name.cc
+++ b/source/common/network/upstream_server_name.cc
@@ -1,6 +1,6 @@
-#include "common/network/upstream_server_name.h"
+#include "source/common/network/upstream_server_name.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/upstream_socket_options_filter_state.cc b/source/common/network/upstream_socket_options_filter_state.cc
index 9ab637f05a34b..3ef5627482342 100644
--- a/source/common/network/upstream_socket_options_filter_state.cc
+++ b/source/common/network/upstream_socket_options_filter_state.cc
@@ -1,6 +1,6 @@
-#include "common/network/upstream_socket_options_filter_state.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/upstream_subject_alt_names.cc b/source/common/network/upstream_subject_alt_names.cc
index 341f47e454e2c..df8aa9adb1842 100644
--- a/source/common/network/upstream_subject_alt_names.cc
+++ b/source/common/network/upstream_subject_alt_names.cc
@@ -1,6 +1,6 @@
-#include "common/network/upstream_subject_alt_names.h"
+#include "source/common/network/upstream_subject_alt_names.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc
index c2c58af71c086..df7c966232df1 100644
--- a/source/common/network/utility.cc
+++ b/source/common/network/utility.cc
@@ -1,4 +1,4 @@
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 #include <cstdint>
 #include <list>
@@ -13,17 +13,17 @@
 #include "envoy/config/core/v3/address.pb.h"
 #include "envoy/network/connection.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_error_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/match.h"
diff --git a/source/common/network/win32_redirect_records_option_impl.cc b/source/common/network/win32_redirect_records_option_impl.cc
index a1dafb5ac8457..2786e85df1140 100644
--- a/source/common/network/win32_redirect_records_option_impl.cc
+++ b/source/common/network/win32_redirect_records_option_impl.cc
@@ -1,13 +1,13 @@
-#include "common/network/win32_redirect_records_option_impl.h"
+#include "source/common/network/win32_redirect_records_option_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/scalar_to_byte_vector.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/scalar_to_byte_vector.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/network/win32_redirect_records_option_impl.h b/source/common/network/win32_redirect_records_option_impl.h
index febf71846f3a9..3fbe5f6fc5855 100644
--- a/source/common/network/win32_redirect_records_option_impl.h
+++ b/source/common/network/win32_redirect_records_option_impl.h
@@ -5,8 +5,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/listen_socket.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/common/profiler/profiler.cc b/source/common/profiler/profiler.cc
index b3ef32ca832ba..fdf9244751216 100644
--- a/source/common/profiler/profiler.cc
+++ b/source/common/profiler/profiler.cc
@@ -1,4 +1,4 @@
-#include "common/profiler/profiler.h"
+#include "source/common/profiler/profiler.h"
 
 #include <string>
 
diff --git a/source/common/protobuf/BUILD b/source/common/protobuf/BUILD
index d8f3c67a06c95..64bfefa6c0031 100644
--- a/source/common/protobuf/BUILD
+++ b/source/common/protobuf/BUILD
@@ -32,8 +32,8 @@ envoy_cc_library(
     hdrs = ["message_validator_impl.h"],
     external_deps = ["protobuf"],
     deps = [
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:documentation_url_lib",
         "//source/common/common:hash_lib",
         "//source/common/common:logger_lib",
@@ -62,9 +62,9 @@ envoy_cc_library(
         ":message_validator_lib",
         ":protobuf",
         ":well_known_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/api:api_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:documentation_url_lib",
         "//source/common/common:hash_lib",
diff --git a/source/common/protobuf/message_validator_impl.cc b/source/common/protobuf/message_validator_impl.cc
index c486f9d0d4ecd..2d9d3dbb334ce 100644
--- a/source/common/protobuf/message_validator_impl.cc
+++ b/source/common/protobuf/message_validator_impl.cc
@@ -1,10 +1,10 @@
-#include "common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/hash.h"
-#include "common/common/macros.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/macros.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/protobuf/message_validator_impl.h b/source/common/protobuf/message_validator_impl.h
index 54644f49b8430..865fc7e8ee559 100644
--- a/source/common/protobuf/message_validator_impl.h
+++ b/source/common/protobuf/message_validator_impl.h
@@ -3,8 +3,8 @@
 #include "envoy/protobuf/message_validator.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/documentation_url.h"
-#include "common/common/logger.h"
+#include "source/common/common/documentation_url.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc
index 806aca2aec969..543e8cf7a99f2 100644
--- a/source/common/protobuf/utility.cc
+++ b/source/common/protobuf/utility.cc
@@ -1,4 +1,4 @@
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include <limits>
 #include <numeric>
@@ -7,16 +7,16 @@
 #include "envoy/protobuf/message_validator.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/documentation_url.h"
-#include "common/common/fmt.h"
-#include "common/config/api_type_oracle.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/visitor.h"
-#include "common/protobuf/well_known.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/documentation_url.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_type_oracle.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/visitor.h"
+#include "source/common/protobuf/well_known.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/match.h"
 #include "udpa/annotations/sensitive.pb.h"
diff --git a/source/common/protobuf/utility.h b/source/common/protobuf/utility.h
index 2feee5bcadb2f..0ba43337a8344 100644
--- a/source/common/protobuf/utility.h
+++ b/source/common/protobuf/utility.h
@@ -8,12 +8,12 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/hash.h"
-#include "common/common/stl_helpers.h"
-#include "common/common/utility.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/protobuf.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/stl_helpers.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/protobuf/visitor.cc b/source/common/protobuf/visitor.cc
index d978f964ff0fb..ed6d0b6857d9a 100644
--- a/source/common/protobuf/visitor.cc
+++ b/source/common/protobuf/visitor.cc
@@ -1,4 +1,4 @@
-#include "common/protobuf/visitor.h"
+#include "source/common/protobuf/visitor.h"
 
 namespace Envoy {
 namespace ProtobufMessage {
diff --git a/source/common/protobuf/visitor.h b/source/common/protobuf/visitor.h
index 93ec07af93b71..129f5e52d4743 100644
--- a/source/common/protobuf/visitor.h
+++ b/source/common/protobuf/visitor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace ProtobufMessage {
diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD
index 60061ec64963a..84352360f91df 100644
--- a/source/common/quic/BUILD
+++ b/source/common/quic/BUILD
@@ -18,8 +18,8 @@ envoy_cc_library(
     external_deps = ["quiche_quic_platform"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
         "@com_googlesource_quiche//:quic_core_alarm_lib",
         "@com_googlesource_quiche//:quic_core_clock_lib",
     ],
@@ -57,7 +57,7 @@ envoy_cc_library(
     hdrs = ["quic_stat_names.h"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/stats:symbol_table_lib",
         "@com_googlesource_quiche//:quic_core_error_codes_lib",
         "@com_googlesource_quiche//:quic_core_types_lib",
@@ -91,7 +91,7 @@ envoy_cc_library(
         ":envoy_quic_utils_lib",
         ":quic_io_handle_wrapper_lib",
         ":quic_transport_socket_factory_lib",
-        "//include/envoy/ssl:tls_certificate_config_interface",
+        "//envoy/ssl:tls_certificate_config_interface",
         "//source/server:connection_handler_lib",
         "@com_googlesource_quiche//:quic_core_crypto_certificate_view_lib",
     ],
@@ -154,8 +154,8 @@ envoy_cc_library(
         ":envoy_quic_utils_lib",
         ":quic_filter_manager_connection_lib",
         ":send_buffer_monitor_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:codec_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:codec_interface",
         "//source/common/http:codec_helper_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -175,8 +175,8 @@ envoy_cc_library(
         ":envoy_quic_server_session_lib",
         ":envoy_quic_session_cache_lib",
         ":envoy_quic_utils_lib",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/registry",
+        "//envoy/http:codec_interface",
+        "//envoy/registry",
         "//source/common/http/http3:quic_client_connection_factory_lib",
         "//source/extensions/transport_sockets/tls:ssl_socket_lib",
         "@com_googlesource_quiche//:quic_core_http_spdy_session_lib",
@@ -192,8 +192,8 @@ envoy_cc_library(
         ":envoy_quic_client_session_lib",
         ":envoy_quic_server_session_lib",
         ":envoy_quic_utils_lib",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/registry",
+        "//envoy/http:codec_interface",
+        "//envoy/registry",
         "@com_googlesource_quiche//:quic_core_http_spdy_session_lib",
     ],
 )
@@ -207,8 +207,8 @@ envoy_cc_library(
         ":envoy_quic_simulated_watermark_buffer_lib",
         ":quic_network_connection_lib",
         ":send_buffer_monitor_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -275,7 +275,7 @@ envoy_cc_library(
     name = "quic_io_handle_wrapper_lib",
     hdrs = ["quic_io_handle_wrapper.h"],
     deps = [
-        "//include/envoy/network:io_handle_interface",
+        "//envoy/network:io_handle_interface",
         "//source/common/network:io_socket_error_lib",
     ],
 )
@@ -286,7 +286,7 @@ envoy_cc_library(
     hdrs = ["quic_network_connection.h"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/network:connection_interface",
+        "//envoy/network:connection_interface",
         "//source/common/network:listen_socket_lib",
     ],
 )
@@ -313,7 +313,7 @@ envoy_cc_library(
     deps = [
         ":envoy_quic_packet_writer_lib",
         ":quic_network_connection_lib",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/network:socket_option_factory_lib",
         "//source/common/network:udp_packet_writer_handler_lib",
         "@com_googlesource_quiche//:quic_core_connection_lib",
@@ -331,7 +331,7 @@ envoy_cc_library(
         ":envoy_quic_proof_source_lib",
         ":envoy_quic_server_connection_lib",
         ":envoy_quic_server_session_lib",
-        "//include/envoy/network:listener_interface",
+        "//envoy/network:listener_interface",
         "//source/server:connection_handler_lib",
         "@com_googlesource_quiche//:quic_core_server_lib",
         "@com_googlesource_quiche//:quic_core_utils_lib",
@@ -356,7 +356,7 @@ envoy_cc_library(
         ":envoy_quic_packet_writer_lib",
         ":envoy_quic_proof_source_lib",
         ":envoy_quic_utils_lib",
-        "//include/envoy/network:listener_interface",
+        "//envoy/network:listener_interface",
         "//source/common/network:listener_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/runtime:runtime_lib",
@@ -375,7 +375,7 @@ envoy_cc_library(
     ],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
         "//source/common/http:header_map_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/network:address_lib",
@@ -395,9 +395,9 @@ envoy_cc_library(
     hdrs = ["quic_transport_socket_factory.h"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:context_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:context_config_interface",
         "//source/common/common:assert_lib",
         "//source/extensions/transport_sockets/tls:context_config_lib",
         "//source/extensions/transport_sockets/tls:ssl_socket_lib",
@@ -446,7 +446,7 @@ envoy_cc_library(
     tags = ["nofips"],
     deps = [
         ":envoy_quic_utils_lib",
-        "//include/envoy/network:udp_packet_writer_handler_interface",
+        "//envoy/network:udp_packet_writer_handler_interface",
         "//source/common/network:io_socket_error_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/runtime:runtime_lib",
diff --git a/source/common/quic/active_quic_listener.cc b/source/common/quic/active_quic_listener.cc
index eaa3991c94d55..835b371457f48 100644
--- a/source/common/quic/active_quic_listener.cc
+++ b/source/common/quic/active_quic_listener.cc
@@ -1,4 +1,4 @@
-#include "common/quic/active_quic_listener.h"
+#include "source/common/quic/active_quic_listener.h"
 
 #include "envoy/network/exception.h"
 
@@ -8,17 +8,17 @@
 
 #include <vector>
 
-#include "common/http/utility.h"
-#include "common/network/socket_option_impl.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_dispatcher.h"
-#include "common/quic/envoy_quic_packet_writer.h"
-#include "common/quic/envoy_quic_proof_source.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_network_connection.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_dispatcher.h"
+#include "source/common/quic/envoy_quic_packet_writer.h"
+#include "source/common/quic/envoy_quic_proof_source.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_network_connection.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/active_quic_listener.h b/source/common/quic/active_quic_listener.h
index 8eccfa075333e..44ec98bb7c939 100644
--- a/source/common/quic/active_quic_listener.h
+++ b/source/common/quic/active_quic_listener.h
@@ -6,12 +6,11 @@
 #include "envoy/network/socket.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/protobuf/utility.h"
-#include "common/quic/envoy_quic_dispatcher.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "server/active_udp_listener.h"
-#include "server/connection_handler_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/quic/envoy_quic_dispatcher.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/server/active_udp_listener.h"
+#include "source/server/connection_handler_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/client_connection_factory_impl.cc b/source/common/quic/client_connection_factory_impl.cc
index fcc871f382670..8d3519b630ac4 100644
--- a/source/common/quic/client_connection_factory_impl.cc
+++ b/source/common/quic/client_connection_factory_impl.cc
@@ -1,7 +1,7 @@
-#include "common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/client_connection_factory_impl.h"
 
-#include "common/quic/envoy_quic_session_cache.h"
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/envoy_quic_session_cache.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/client_connection_factory_impl.h b/source/common/quic/client_connection_factory_impl.h
index 991249bebee47..ca66d75725562 100644
--- a/source/common/quic/client_connection_factory_impl.h
+++ b/source/common/quic/client_connection_factory_impl.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "common/http/http3/quic_client_connection_factory.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_client_session.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_proof_verifier.h"
-#include "common/quic/envoy_quic_utils.h"
-
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/http/http3/quic_client_connection_factory.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_proof_verifier.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "quiche/quic/core/http/quic_client_push_promise_index.h"
 #include "quiche/quic/core/quic_utils.h"
diff --git a/source/common/quic/codec_impl.cc b/source/common/quic/codec_impl.cc
index 6ec3c355e0232..546ea7ee0c193 100644
--- a/source/common/quic/codec_impl.cc
+++ b/source/common/quic/codec_impl.cc
@@ -1,7 +1,7 @@
-#include "common/quic/codec_impl.h"
+#include "source/common/quic/codec_impl.h"
 
-#include "common/quic/envoy_quic_client_stream.h"
-#include "common/quic/envoy_quic_server_stream.h"
+#include "source/common/quic/envoy_quic_client_stream.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/codec_impl.h b/source/common/quic/codec_impl.h
index 1dca7b65931ab..7faed7d94136f 100644
--- a/source/common/quic/codec_impl.h
+++ b/source/common/quic/codec_impl.h
@@ -3,10 +3,10 @@
 #include "envoy/http/codec.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/quic/envoy_quic_client_session.h"
-#include "common/quic/envoy_quic_server_session.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_server_session.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_alarm.cc b/source/common/quic/envoy_quic_alarm.cc
index a5c123be556f0..780a3cbfcf11c 100644
--- a/source/common/quic/envoy_quic_alarm.cc
+++ b/source/common/quic/envoy_quic_alarm.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_alarm.h"
+#include "source/common/quic/envoy_quic_alarm.h"
 
 #include <algorithm>
 
diff --git a/source/common/quic/envoy_quic_alarm.h b/source/common/quic/envoy_quic_alarm.h
index ec56eafa6fff0..fdbdc2031716a 100644
--- a/source/common/quic/envoy_quic_alarm.h
+++ b/source/common/quic/envoy_quic_alarm.h
@@ -3,7 +3,7 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "quiche/quic/core/quic_alarm.h"
 #include "quiche/quic/core/quic_clock.h"
diff --git a/source/common/quic/envoy_quic_alarm_factory.cc b/source/common/quic/envoy_quic_alarm_factory.cc
index 8f285650ece2d..865370c355da0 100644
--- a/source/common/quic/envoy_quic_alarm_factory.cc
+++ b/source/common/quic/envoy_quic_alarm_factory.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_alarm_factory.h b/source/common/quic/envoy_quic_alarm_factory.h
index 8a185b0c6d239..ca491b2005ece 100644
--- a/source/common/quic/envoy_quic_alarm_factory.h
+++ b/source/common/quic/envoy_quic_alarm_factory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/non_copyable.h"
-#include "common/quic/envoy_quic_alarm.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/quic/envoy_quic_alarm.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
diff --git a/source/common/quic/envoy_quic_client_connection.cc b/source/common/quic/envoy_quic_client_connection.cc
index ac30a8d8b9cf1..2b15f236b757a 100644
--- a/source/common/quic/envoy_quic_client_connection.cc
+++ b/source/common/quic/envoy_quic_client_connection.cc
@@ -1,14 +1,14 @@
-#include "common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
 
 #include <memory>
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/quic/envoy_quic_packet_writer.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/quic/envoy_quic_packet_writer.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_client_connection.h b/source/common/quic/envoy_quic_client_connection.h
index 21000adce734c..dbf6fc23f3f69 100644
--- a/source/common/quic/envoy_quic_client_connection.h
+++ b/source/common/quic/envoy_quic_client_connection.h
@@ -2,9 +2,9 @@
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/network/utility.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_network_connection.h"
+#include "source/common/network/utility.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_network_connection.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
diff --git a/source/common/quic/envoy_quic_client_session.cc b/source/common/quic/envoy_quic_client_session.cc
index 0763a5f009322..8910d62e8eb32 100644
--- a/source/common/quic/envoy_quic_client_session.cc
+++ b/source/common/quic/envoy_quic_client_session.cc
@@ -1,6 +1,6 @@
-#include "common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_client_session.h"
 
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_client_session.h b/source/common/quic/envoy_quic_client_session.h
index c4fe12ffd7062..29da91ad1a0be 100644
--- a/source/common/quic/envoy_quic_client_session.h
+++ b/source/common/quic/envoy_quic_client_session.h
@@ -13,9 +13,9 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_client_stream.h"
-#include "common/quic/envoy_quic_client_connection.h"
-#include "common/quic/quic_filter_manager_connection_impl.h"
+#include "source/common/quic/envoy_quic_client_stream.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_client_stream.cc b/source/common/quic/envoy_quic_client_stream.cc
index 581ebfb6ae594..10cde85e31e10 100644
--- a/source/common/quic/envoy_quic_client_stream.cc
+++ b/source/common/quic/envoy_quic_client_stream.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_client_stream.h"
+#include "source/common/quic/envoy_quic_client_stream.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
@@ -9,22 +9,22 @@
 #include "quiche/quic/core/quic_session.h"
 #include "quiche/quic/core/http/quic_header_list.h"
 #include "quiche/spdy/core/spdy_header_block.h"
-#include "common/quic/platform/quic_mem_slice_span_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_span_impl.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_client_session.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/utility.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_client_stream.h b/source/common/quic/envoy_quic_client_stream.h
index b7e3f21d0d05f..0e82d8622319e 100644
--- a/source/common/quic/envoy_quic_client_stream.h
+++ b/source/common/quic/envoy_quic_client_stream.h
@@ -14,7 +14,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_stream.h"
+#include "source/common/quic/envoy_quic_stream.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_connection_helper.h b/source/common/quic/envoy_quic_connection_helper.h
index 8772e1ef0ab16..a8d8ba2bbc949 100644
--- a/source/common/quic/envoy_quic_connection_helper.h
+++ b/source/common/quic/envoy_quic_connection_helper.h
@@ -15,7 +15,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_dispatcher.cc b/source/common/quic/envoy_quic_dispatcher.cc
index 602a610736ca7..95709319823aa 100644
--- a/source/common/quic/envoy_quic_dispatcher.cc
+++ b/source/common/quic/envoy_quic_dispatcher.cc
@@ -1,10 +1,10 @@
-#include "common/quic/envoy_quic_dispatcher.h"
+#include "source/common/quic/envoy_quic_dispatcher.h"
 
-#include "common/common/safe_memcpy.h"
-#include "common/http/utility.h"
-#include "common/quic/envoy_quic_server_connection.h"
-#include "common/quic/envoy_quic_server_session.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/http/utility.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_dispatcher.h b/source/common/quic/envoy_quic_dispatcher.h
index 81058fcedf808..caa259329dc99 100644
--- a/source/common/quic/envoy_quic_dispatcher.h
+++ b/source/common/quic/envoy_quic_dispatcher.h
@@ -17,9 +17,9 @@
 #include <string>
 
 #include "envoy/network/listener.h"
-#include "server/connection_handler_impl.h"
-#include "server/active_listener_base.h"
-#include "common/quic/quic_stat_names.h"
+#include "source/server/connection_handler_impl.h"
+#include "source/server/active_listener_base.h"
+#include "source/common/quic/quic_stat_names.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_packet_writer.cc b/source/common/quic/envoy_quic_packet_writer.cc
index 9c125b6c3b772..5ee3b5da3a57f 100644
--- a/source/common/quic/envoy_quic_packet_writer.cc
+++ b/source/common/quic/envoy_quic_packet_writer.cc
@@ -1,8 +1,8 @@
-#include "common/quic/envoy_quic_packet_writer.h"
+#include "source/common/quic/envoy_quic_packet_writer.h"
 
 #include <memory>
 
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_proof_source.cc b/source/common/quic/envoy_quic_proof_source.cc
index e1b7673596d7d..c9ee45eb12000 100644
--- a/source/common/quic/envoy_quic_proof_source.cc
+++ b/source/common/quic/envoy_quic_proof_source.cc
@@ -1,11 +1,11 @@
-#include "common/quic/envoy_quic_proof_source.h"
+#include "source/common/quic/envoy_quic_proof_source.h"
 
 #include <openssl/bio.h>
 
 #include "envoy/ssl/tls_certificate_config.h"
 
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_io_handle_wrapper.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_io_handle_wrapper.h"
 
 #include "openssl/bytestring.h"
 #include "quiche/quic/core/crypto/certificate_view.h"
diff --git a/source/common/quic/envoy_quic_proof_source.h b/source/common/quic/envoy_quic_proof_source.h
index 97c2120870b75..fcf388c609140 100644
--- a/source/common/quic/envoy_quic_proof_source.h
+++ b/source/common/quic/envoy_quic_proof_source.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "common/quic/envoy_quic_proof_source_base.h"
-#include "common/quic/quic_transport_socket_factory.h"
-
-#include "server/active_listener_base.h"
-#include "server/connection_handler_impl.h"
+#include "source/common/quic/envoy_quic_proof_source_base.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
+#include "source/server/active_listener_base.h"
+#include "source/server/connection_handler_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_proof_source_base.cc b/source/common/quic/envoy_quic_proof_source_base.cc
index 79cfa0c3171f9..f6adb247d95ed 100644
--- a/source/common/quic/envoy_quic_proof_source_base.cc
+++ b/source/common/quic/envoy_quic_proof_source_base.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_proof_source_base.h"
+#include "source/common/quic/envoy_quic_proof_source_base.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
@@ -11,7 +11,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_proof_source_base.h b/source/common/quic/envoy_quic_proof_source_base.h
index 22de52a0ce5e9..f963edec26e5a 100644
--- a/source/common/quic/envoy_quic_proof_source_base.h
+++ b/source/common/quic/envoy_quic_proof_source_base.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/str_cat.h"
 
@@ -23,7 +23,7 @@
 
 #include "openssl/ssl.h"
 #include "envoy/network/filter.h"
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_proof_verifier.cc b/source/common/quic/envoy_quic_proof_verifier.cc
index 2e79eeb7ef7c1..2a4b80c76e1aa 100644
--- a/source/common/quic/envoy_quic_proof_verifier.cc
+++ b/source/common/quic/envoy_quic_proof_verifier.cc
@@ -1,8 +1,7 @@
-#include "common/quic/envoy_quic_proof_verifier.h"
+#include "source/common/quic/envoy_quic_proof_verifier.h"
 
-#include "common/quic/envoy_quic_utils.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h"
 
 #include "quiche/quic/core/crypto/certificate_view.h"
 
diff --git a/source/common/quic/envoy_quic_proof_verifier.h b/source/common/quic/envoy_quic_proof_verifier.h
index cdbfc70109b6a..6574ab434bd01 100644
--- a/source/common/quic/envoy_quic_proof_verifier.h
+++ b/source/common/quic/envoy_quic_proof_verifier.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/quic/envoy_quic_proof_verifier_base.h"
-
-#include "extensions/transport_sockets/tls/context_impl.h"
+#include "source/common/quic/envoy_quic_proof_verifier_base.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_proof_verifier_base.cc b/source/common/quic/envoy_quic_proof_verifier_base.cc
index cc880404bcfb0..7f791b0c3f103 100644
--- a/source/common/quic/envoy_quic_proof_verifier_base.cc
+++ b/source/common/quic/envoy_quic_proof_verifier_base.cc
@@ -1,6 +1,6 @@
-#include "common/quic/envoy_quic_proof_verifier_base.h"
+#include "source/common/quic/envoy_quic_proof_verifier_base.h"
 
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 #include "openssl/ssl.h"
 #include "quiche/quic/core/crypto/certificate_view.h"
diff --git a/source/common/quic/envoy_quic_proof_verifier_base.h b/source/common/quic/envoy_quic_proof_verifier_base.h
index f45736c7d19ad..e3835b917ddae 100644
--- a/source/common/quic/envoy_quic_proof_verifier_base.h
+++ b/source/common/quic/envoy_quic_proof_verifier_base.h
@@ -14,7 +14,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_server_connection.cc b/source/common/quic/envoy_quic_server_connection.cc
index f2bc90257dd85..c30cf02fcaa0f 100644
--- a/source/common/quic/envoy_quic_server_connection.cc
+++ b/source/common/quic/envoy_quic_server_connection.cc
@@ -1,8 +1,8 @@
-#include "common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
 
-#include "common/network/listen_socket_impl.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_io_handle_wrapper.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_io_handle_wrapper.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_server_connection.h b/source/common/quic/envoy_quic_server_connection.h
index 04c1a4b8f80d9..7b188366cda4c 100644
--- a/source/common/quic/envoy_quic_server_connection.h
+++ b/source/common/quic/envoy_quic_server_connection.h
@@ -2,10 +2,9 @@
 
 #include "envoy/network/listener.h"
 
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_network_connection.h"
-
-#include "server/connection_handler_impl.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_network_connection.h"
+#include "source/server/connection_handler_impl.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
diff --git a/source/common/quic/envoy_quic_server_session.cc b/source/common/quic/envoy_quic_server_session.cc
index 44208d4fb3f34..0ad888aaf34ac 100644
--- a/source/common/quic/envoy_quic_server_session.cc
+++ b/source/common/quic/envoy_quic_server_session.cc
@@ -1,10 +1,10 @@
-#include "common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/envoy_quic_server_session.h"
 
 #include <memory>
 
-#include "common/common/assert.h"
-#include "common/quic/envoy_quic_proof_source.h"
-#include "common/quic/envoy_quic_server_stream.h"
+#include "source/common/common/assert.h"
+#include "source/common/quic/envoy_quic_proof_source.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_server_session.h b/source/common/quic/envoy_quic_server_session.h
index b186cc3b2b53a..9eee2c94107ca 100644
--- a/source/common/quic/envoy_quic_server_session.h
+++ b/source/common/quic/envoy_quic_server_session.h
@@ -19,10 +19,10 @@
 
 #include <memory>
 
-#include "common/quic/send_buffer_monitor.h"
-#include "common/quic/quic_filter_manager_connection_impl.h"
-#include "common/quic/envoy_quic_server_connection.h"
-#include "common/quic/envoy_quic_server_stream.h"
+#include "source/common/quic/send_buffer_monitor.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_server_stream.cc b/source/common/quic/envoy_quic_server_stream.cc
index 74b439e246253..e9fd4fd72d8c6 100644
--- a/source/common/quic/envoy_quic_server_stream.cc
+++ b/source/common/quic/envoy_quic_server_stream.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_server_stream.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
 
 #include <openssl/bio.h>
 #include <openssl/evp.h>
@@ -14,19 +14,19 @@
 #include "quiche/quic/core/http/quic_header_list.h"
 #include "quiche/quic/core/quic_session.h"
 #include "quiche/spdy/core/spdy_header_block.h"
-#include "common/quic/platform/quic_mem_slice_span_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_span_impl.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_server_session.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_map_impl.h"
-#include "common/common/assert.h"
-#include "common/http/header_utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_utility.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_server_stream.h b/source/common/quic/envoy_quic_server_stream.h
index ac44a083b1f4b..e0b98e835fdad 100644
--- a/source/common/quic/envoy_quic_server_stream.h
+++ b/source/common/quic/envoy_quic_server_stream.h
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_stream.h"
+#include "source/common/quic/envoy_quic_stream.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_session_cache.cc b/source/common/quic/envoy_quic_session_cache.cc
index 7404f132f1537..b6ce80f7717c6 100644
--- a/source/common/quic/envoy_quic_session_cache.cc
+++ b/source/common/quic/envoy_quic_session_cache.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_session_cache.h"
+#include "source/common/quic/envoy_quic_session_cache.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_simulated_watermark_buffer.h b/source/common/quic/envoy_quic_simulated_watermark_buffer.h
index 50c46f0152769..e4dbdcb187eda 100644
--- a/source/common/quic/envoy_quic_simulated_watermark_buffer.h
+++ b/source/common/quic/envoy_quic_simulated_watermark_buffer.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "spdlog/spdlog.h"
 
diff --git a/source/common/quic/envoy_quic_stream.h b/source/common/quic/envoy_quic_stream.h
index 56e744d56d80b..f28cae4cf0119 100644
--- a/source/common/quic/envoy_quic_stream.h
+++ b/source/common/quic/envoy_quic_stream.h
@@ -4,11 +4,11 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/http/codec.h"
 
-#include "common/http/codec_helper.h"
-#include "common/quic/envoy_quic_simulated_watermark_buffer.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_filter_manager_connection_impl.h"
-#include "common/quic/send_buffer_monitor.h"
+#include "source/common/http/codec_helper.h"
+#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
+#include "source/common/quic/send_buffer_monitor.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_utils.cc b/source/common/quic/envoy_quic_utils.cc
index 2f9682b31a20f..1ca1ecfd24f0d 100644
--- a/source/common/quic/envoy_quic_utils.cc
+++ b/source/common/quic/envoy_quic_utils.cc
@@ -1,13 +1,13 @@
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 #include <memory>
 
 #include "envoy/common/platform.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/http/utility.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/envoy_quic_utils.h b/source/common/quic/envoy_quic_utils.h
index 2625e7acc0e0c..292caaabaf985 100644
--- a/source/common/quic/envoy_quic_utils.h
+++ b/source/common/quic/envoy_quic_utils.h
@@ -4,11 +4,11 @@
 #include "envoy/config/listener/v3/quic_config.pb.h"
 #include "envoy/http/codec.h"
 
-#include "common/common/assert.h"
-#include "common/http/header_map_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/quic/quic_io_handle_wrapper.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/quic/quic_io_handle_wrapper.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
@@ -27,7 +27,7 @@
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/platform/api/quic_ip_address.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
-#include "common/http/header_utility.h"
+#include "source/common/http/header_utility.h"
 
 #include "openssl/ssl.h"
 
diff --git a/source/common/quic/platform/BUILD b/source/common/quic/platform/BUILD
index 0d9edee9c2334..b3a72681cd759 100644
--- a/source/common/quic/platform/BUILD
+++ b/source/common/quic/platform/BUILD
@@ -137,7 +137,7 @@ envoy_cc_library(
     deps = [
         ":quiche_flags_impl_lib",
         ":string_utils_lib",
-        "//include/envoy/api:io_error_interface",
+        "//envoy/api:io_error_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/server:backtrace_lib",
@@ -189,7 +189,7 @@ envoy_cc_library(
     tags = ["nofips"],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "@com_googlesource_quiche//:quic_core_types_lib",
         "@com_googlesource_quiche//:quic_platform_base",
     ],
@@ -233,7 +233,7 @@ envoy_cc_library(
     tags = ["nofips"],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "@com_googlesource_quiche//:quic_core_clock_lib",
     ],
 )
diff --git a/source/common/quic/platform/envoy_quic_clock.cc b/source/common/quic/platform/envoy_quic_clock.cc
index 4981716706202..450caa59f0282 100644
--- a/source/common/quic/platform/envoy_quic_clock.cc
+++ b/source/common/quic/platform/envoy_quic_clock.cc
@@ -1,4 +1,4 @@
-#include "common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/platform/http2_bug_tracker_impl.h b/source/common/quic/platform/http2_bug_tracker_impl.h
index f36c334ec88af..b8f5a8693039f 100644
--- a/source/common/quic/platform/http2_bug_tracker_impl.h
+++ b/source/common/quic/platform/http2_bug_tracker_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_bug_tracker_impl.h"
+#include "source/common/quic/platform/quic_bug_tracker_impl.h"
 
 #define HTTP2_BUG_IMPL QUIC_BUG_IMPL
 #define HTTP2_BUG_IF_IMPL QUIC_BUG_IF_IMPL
diff --git a/source/common/quic/platform/http2_flags_impl.h b/source/common/quic/platform/http2_flags_impl.h
index f209c3ec8b7a0..27e2b8448a558 100644
--- a/source/common/quic/platform/http2_flags_impl.h
+++ b/source/common/quic/platform/http2_flags_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/flags_impl.h"
+#include "source/common/quic/platform/flags_impl.h"
 
 #define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value()
 
diff --git a/source/common/quic/platform/http2_logging_impl.h b/source/common/quic/platform/http2_logging_impl.h
index 8633db83ce514..5ef754f7aea82 100644
--- a/source/common/quic/platform/http2_logging_impl.h
+++ b/source/common/quic/platform/http2_logging_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 #define HTTP2_LOG_IMPL(severity) QUICHE_LOG_IMPL(severity)
 
diff --git a/source/common/quic/platform/http2_macros_impl.h b/source/common/quic/platform/http2_macros_impl.h
index 984f58885b5ce..1484e360601db 100644
--- a/source/common/quic/platform/http2_macros_impl.h
+++ b/source/common/quic/platform/http2_macros_impl.h
@@ -8,7 +8,7 @@
 
 #include <utility>
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 #include "absl/base/macros.h"
 
diff --git a/source/common/quic/platform/http2_string_utils_impl.h b/source/common/quic/platform/http2_string_utils_impl.h
index 4bd33e99c4009..38c75a57a3948 100644
--- a/source/common/quic/platform/http2_string_utils_impl.h
+++ b/source/common/quic/platform/http2_string_utils_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/string_utils.h"
+#include "source/common/quic/platform/string_utils.h"
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/quic/platform/quic_file_utils_impl.cc b/source/common/quic/platform/quic_file_utils_impl.cc
index 4112785357ebc..9c909c801643c 100644
--- a/source/common/quic/platform/quic_file_utils_impl.cc
+++ b/source/common/quic/platform/quic_file_utils_impl.cc
@@ -4,10 +4,10 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_file_utils_impl.h"
+#include "source/common/quic/platform/quic_file_utils_impl.h"
 
-#include "common/filesystem/directory.h"
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/filesystem/directory.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/quic/platform/quic_flags_impl.h b/source/common/quic/platform/quic_flags_impl.h
index aa433b5b83f48..1fd7e6cfad750 100644
--- a/source/common/quic/platform/quic_flags_impl.h
+++ b/source/common/quic/platform/quic_flags_impl.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 
 // Not wired into command-line parsing.
 #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help)                                \
diff --git a/source/common/quic/platform/quic_hostname_utils_impl.cc b/source/common/quic/platform/quic_hostname_utils_impl.cc
index bc7d64c5c2f8f..1afe7b411eda0 100644
--- a/source/common/quic/platform/quic_hostname_utils_impl.cc
+++ b/source/common/quic/platform/quic_hostname_utils_impl.cc
@@ -4,11 +4,11 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_hostname_utils_impl.h"
+#include "source/common/quic/platform/quic_hostname_utils_impl.h"
 
 #include <string>
 
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/quic/platform/quic_logging_impl.cc b/source/common/quic/platform/quic_logging_impl.cc
index 08eb9699f1d76..00920beb72620 100644
--- a/source/common/quic/platform/quic_logging_impl.cc
+++ b/source/common/quic/platform/quic_logging_impl.cc
@@ -4,12 +4,12 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 #include <atomic>
 #include <cstdlib>
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace quic {
 
diff --git a/source/common/quic/platform/quic_logging_impl.h b/source/common/quic/platform/quic_logging_impl.h
index e08595f4e9034..f5dc65dd7c431 100644
--- a/source/common/quic/platform/quic_logging_impl.h
+++ b/source/common/quic/platform/quic_logging_impl.h
@@ -12,9 +12,9 @@
 #include <sstream>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/common/stl_helpers.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/stl_helpers.h"
 
 #include "absl/base/optimization.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/common/quic/platform/quic_mem_slice_impl.cc b/source/common/quic/platform/quic_mem_slice_impl.cc
index 164419b681f3d..3744ae0597e44 100644
--- a/source/common/quic/platform/quic_mem_slice_impl.cc
+++ b/source/common/quic/platform/quic_mem_slice_impl.cc
@@ -4,11 +4,11 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_mem_slice_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_impl.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace quic {
 
diff --git a/source/common/quic/platform/quic_mem_slice_impl.h b/source/common/quic/platform/quic_mem_slice_impl.h
index 9882b2afad802..c6e90cba507a2 100644
--- a/source/common/quic/platform/quic_mem_slice_impl.h
+++ b/source/common/quic/platform/quic_mem_slice_impl.h
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <memory>
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "quiche/quic/core/quic_buffer_allocator.h"
 
diff --git a/source/common/quic/platform/quic_mem_slice_span_impl.cc b/source/common/quic/platform/quic_mem_slice_span_impl.cc
index e7ac9d86f8379..89a7357d37437 100644
--- a/source/common/quic/platform/quic_mem_slice_span_impl.cc
+++ b/source/common/quic/platform/quic_mem_slice_span_impl.cc
@@ -4,7 +4,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_mem_slice_span_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_span_impl.h"
 
 #include "quiche/quic/platform/api/quic_mem_slice.h"
 
diff --git a/source/common/quic/platform/quic_mem_slice_storage_impl.cc b/source/common/quic/platform/quic_mem_slice_storage_impl.cc
index d4d7767f65874..0f90210eb992b 100644
--- a/source/common/quic/platform/quic_mem_slice_storage_impl.cc
+++ b/source/common/quic/platform/quic_mem_slice_storage_impl.cc
@@ -4,7 +4,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_mem_slice_storage_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_storage_impl.h"
 
 #include <cstdint>
 
diff --git a/source/common/quic/platform/quic_mem_slice_storage_impl.h b/source/common/quic/platform/quic_mem_slice_storage_impl.h
index c7a5e17e187c6..437e9be46736f 100644
--- a/source/common/quic/platform/quic_mem_slice_storage_impl.h
+++ b/source/common/quic/platform/quic_mem_slice_storage_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "quiche/quic/core/quic_buffer_allocator.h"
 #include "quiche/quic/platform/api/quic_iovec.h"
diff --git a/source/common/quic/platform/quic_pcc_sender_impl.h b/source/common/quic/platform/quic_pcc_sender_impl.h
index 1e0f2bcbaf8b2..de6ac4ed2a753 100644
--- a/source/common/quic/platform/quic_pcc_sender_impl.h
+++ b/source/common/quic/platform/quic_pcc_sender_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "quiche/quic/core/quic_types.h"
 
diff --git a/source/common/quic/platform/quic_stack_trace_impl.h b/source/common/quic/platform/quic_stack_trace_impl.h
index ec06b6299d65e..c154796513d95 100644
--- a/source/common/quic/platform/quic_stack_trace_impl.h
+++ b/source/common/quic/platform/quic_stack_trace_impl.h
@@ -9,7 +9,7 @@
 #include <sstream>
 #include <string>
 
-#include "server/backtrace.h"
+#include "source/server/backtrace.h"
 
 namespace quic {
 
diff --git a/source/common/quic/platform/quiche_bug_tracker_impl.h b/source/common/quic/platform/quiche_bug_tracker_impl.h
index 3a13f66c7db8a..0d4f8aa884acb 100644
--- a/source/common/quic/platform/quiche_bug_tracker_impl.h
+++ b/source/common/quic/platform/quiche_bug_tracker_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 // TODO(wub): Implement exponential back off to avoid performance problems due
 // to excessive QUIC_BUG.
diff --git a/source/common/quic/platform/quiche_flags_impl.cc b/source/common/quic/platform/quiche_flags_impl.cc
index 5f937e3b73396..a251af757b085 100644
--- a/source/common/quic/platform/quiche_flags_impl.cc
+++ b/source/common/quic/platform/quiche_flags_impl.cc
@@ -4,11 +4,11 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 
 #include <set>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/match.h"
diff --git a/source/common/quic/platform/quiche_logging_impl.h b/source/common/quic/platform/quiche_logging_impl.h
index 4b7e662d2f011..08dc8f84c7bb4 100644
--- a/source/common/quic/platform/quiche_logging_impl.h
+++ b/source/common/quic/platform/quiche_logging_impl.h
@@ -6,4 +6,4 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
diff --git a/source/common/quic/platform/quiche_text_utils_impl.h b/source/common/quic/platform/quiche_text_utils_impl.h
index aed6d4f5c6b54..b8b4d77dfa8b9 100644
--- a/source/common/quic/platform/quiche_text_utils_impl.h
+++ b/source/common/quic/platform/quiche_text_utils_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/base64.h"
-#include "common/quic/platform/string_utils.h"
+#include "source/common/common/base64.h"
+#include "source/common/quic/platform/string_utils.h"
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
diff --git a/source/common/quic/platform/quiche_time_utils_impl.cc b/source/common/quic/platform/quiche_time_utils_impl.cc
index 4453985b3f2fa..91fda404f8474 100644
--- a/source/common/quic/platform/quiche_time_utils_impl.cc
+++ b/source/common/quic/platform/quiche_time_utils_impl.cc
@@ -4,7 +4,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quiche_time_utils_impl.h"
+#include "source/common/quic/platform/quiche_time_utils_impl.h"
 
 namespace quiche {
 
diff --git a/source/common/quic/platform/spdy_bug_tracker_impl.h b/source/common/quic/platform/spdy_bug_tracker_impl.h
index 708d388648efb..29990935d94f1 100644
--- a/source/common/quic/platform/spdy_bug_tracker_impl.h
+++ b/source/common/quic/platform/spdy_bug_tracker_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quiche_bug_tracker_impl.h"
+#include "source/common/quic/platform/quiche_bug_tracker_impl.h"
 
 #define SPDY_BUG_IMPL QUICHE_BUG_IMPL
 #define SPDY_BUG_IF_IMPL QUICHE_BUG_IF_IMPL
diff --git a/source/common/quic/platform/spdy_flags_impl.h b/source/common/quic/platform/spdy_flags_impl.h
index 697cee197329e..701aff548c1e9 100644
--- a/source/common/quic/platform/spdy_flags_impl.h
+++ b/source/common/quic/platform/spdy_flags_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/flags_impl.h"
+#include "source/common/quic/platform/flags_impl.h"
 
 #define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value()
 
diff --git a/source/common/quic/platform/spdy_logging_impl.h b/source/common/quic/platform/spdy_logging_impl.h
index a2b6f6ff0a5a2..b572688364caa 100644
--- a/source/common/quic/platform/spdy_logging_impl.h
+++ b/source/common/quic/platform/spdy_logging_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 #define SPDY_LOG_IMPL(severity) QUICHE_LOG_IMPL(severity)
 
diff --git a/source/common/quic/platform/spdy_string_utils_impl.h b/source/common/quic/platform/spdy_string_utils_impl.h
index 1e876f0e16bf3..e62fdb3f73aad 100644
--- a/source/common/quic/platform/spdy_string_utils_impl.h
+++ b/source/common/quic/platform/spdy_string_utils_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/string_utils.h"
+#include "source/common/quic/platform/string_utils.h"
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
diff --git a/source/common/quic/platform/string_utils.cc b/source/common/quic/platform/string_utils.cc
index 788cd0a4742e7..5353033aee516 100644
--- a/source/common/quic/platform/string_utils.cc
+++ b/source/common/quic/platform/string_utils.cc
@@ -1,4 +1,4 @@
-#include "common/quic/platform/string_utils.h"
+#include "source/common/quic/platform/string_utils.h"
 
 // NOLINT(namespace-envoy)
 //
@@ -13,7 +13,7 @@
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_format.h"
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace quiche {
 
diff --git a/source/common/quic/quic_filter_manager_connection_impl.cc b/source/common/quic/quic_filter_manager_connection_impl.cc
index e47c27080d1d2..fe3c229ab895a 100644
--- a/source/common/quic/quic_filter_manager_connection_impl.cc
+++ b/source/common/quic/quic_filter_manager_connection_impl.cc
@@ -1,4 +1,4 @@
-#include "common/quic/quic_filter_manager_connection_impl.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
 
 #include <initializer_list>
 #include <memory>
diff --git a/source/common/quic/quic_filter_manager_connection_impl.h b/source/common/quic/quic_filter_manager_connection_impl.h
index f0f666434c7fa..59d1bf8375b5a 100644
--- a/source/common/quic/quic_filter_manager_connection_impl.h
+++ b/source/common/quic/quic_filter_manager_connection_impl.h
@@ -17,14 +17,14 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/http/http3/codec_stats.h"
-#include "common/network/connection_impl_base.h"
-#include "common/quic/quic_network_connection.h"
-#include "common/quic/envoy_quic_simulated_watermark_buffer.h"
-#include "common/quic/send_buffer_monitor.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/http3/codec_stats.h"
+#include "source/common/network/connection_impl_base.h"
+#include "source/common/quic/quic_network_connection.h"
+#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h"
+#include "source/common/quic/send_buffer_monitor.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 namespace Envoy {
 
diff --git a/source/common/quic/quic_io_handle_wrapper.h b/source/common/quic/quic_io_handle_wrapper.h
index cdc4eb3719eaa..15247bb4184c6 100644
--- a/source/common/quic/quic_io_handle_wrapper.h
+++ b/source/common/quic/quic_io_handle_wrapper.h
@@ -5,7 +5,7 @@
 
 #include "envoy/network/io_handle.h"
 
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/quic_network_connection.cc b/source/common/quic/quic_network_connection.cc
index 577178c9cc320..bc22c6efaa670 100644
--- a/source/common/quic/quic_network_connection.cc
+++ b/source/common/quic/quic_network_connection.cc
@@ -1,4 +1,4 @@
-#include "common/quic/quic_network_connection.h"
+#include "source/common/quic/quic_network_connection.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/quic_network_connection.h b/source/common/quic/quic_network_connection.h
index 78ea81402e5c5..ae122304c353c 100644
--- a/source/common/quic/quic_network_connection.h
+++ b/source/common/quic/quic_network_connection.h
@@ -4,7 +4,7 @@
 
 #include "envoy/network/connection.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/quic_stat_names.cc b/source/common/quic/quic_stat_names.cc
index d5d4eb0e49396..5c8440ed892f4 100644
--- a/source/common/quic/quic_stat_names.cc
+++ b/source/common/quic/quic_stat_names.cc
@@ -1,4 +1,4 @@
-#include "common/quic/quic_stat_names.h"
+#include "source/common/quic/quic_stat_names.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/quic_stat_names.h b/source/common/quic/quic_stat_names.h
index 89255aa99cfda..34706a35dd95c 100644
--- a/source/common/quic/quic_stat_names.h
+++ b/source/common/quic/quic_stat_names.h
@@ -2,8 +2,8 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/thread.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/core/quic_types.h"
diff --git a/source/common/quic/quic_transport_socket_factory.cc b/source/common/quic/quic_transport_socket_factory.cc
index 5be0794ba5ec5..452b4f45d7c66 100644
--- a/source/common/quic/quic_transport_socket_factory.cc
+++ b/source/common/quic/quic_transport_socket_factory.cc
@@ -1,8 +1,8 @@
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 
 #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.validate.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/quic_transport_socket_factory.h b/source/common/quic/quic_transport_socket_factory.h
index 9fad6a0b256da..53fede86f8112 100644
--- a/source/common/quic/quic_transport_socket_factory.h
+++ b/source/common/quic/quic_transport_socket_factory.h
@@ -5,9 +5,8 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/ssl/context_config.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/send_buffer_monitor.cc b/source/common/quic/send_buffer_monitor.cc
index 476481b344daf..bf75886710992 100644
--- a/source/common/quic/send_buffer_monitor.cc
+++ b/source/common/quic/send_buffer_monitor.cc
@@ -1,4 +1,4 @@
-#include "common/quic/send_buffer_monitor.h"
+#include "source/common/quic/send_buffer_monitor.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/udp_gso_batch_writer.cc b/source/common/quic/udp_gso_batch_writer.cc
index 8f46df35f2ea8..2eccc5755f129 100644
--- a/source/common/quic/udp_gso_batch_writer.cc
+++ b/source/common/quic/udp_gso_batch_writer.cc
@@ -1,7 +1,7 @@
-#include "common/quic/udp_gso_batch_writer.h"
+#include "source/common/quic/udp_gso_batch_writer.h"
 
-#include "common/network/io_socket_error_impl.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/quic/udp_gso_batch_writer.h b/source/common/quic/udp_gso_batch_writer.h
index 700d061bd5144..367f248bd7b4e 100644
--- a/source/common/quic/udp_gso_batch_writer.h
+++ b/source/common/quic/udp_gso_batch_writer.h
@@ -28,8 +28,8 @@
 
 #include "envoy/network/udp_packet_writer_handler.h"
 
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_protos.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_protos.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/source/common/router/BUILD b/source/common/router/BUILD
index beccd55248f85..a282658e2ec9f 100644
--- a/source/common/router/BUILD
+++ b/source/common/router/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["metadatamatchcriteria_impl.cc"],
     hdrs = ["metadatamatchcriteria_impl.h"],
     deps = [
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
     ],
 )
 
@@ -22,7 +22,7 @@ envoy_cc_library(
     srcs = ["tls_context_match_criteria_impl.cc"],
     hdrs = ["tls_context_match_criteria_impl.h"],
     deps = [
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
 )
@@ -41,13 +41,13 @@ envoy_cc_library(
         ":retry_state_lib",
         ":router_ratelimit_lib",
         ":tls_context_match_criteria_lib",
-        "//include/envoy/config:typed_metadata_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:filter_config_interface",  # TODO(rodaine): break dependency on server
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/config:typed_metadata_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/router:router_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:filter_config_interface",  # TODO(rodaine): break dependency on server
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:hash_lib",
@@ -77,8 +77,8 @@ envoy_cc_library(
     srcs = ["config_utility.cc"],
     hdrs = ["config_utility.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/upstream:resource_manager_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/upstream:resource_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:matchers_lib",
@@ -96,9 +96,9 @@ envoy_cc_library(
     srcs = ["context_impl.cc"],
     hdrs = ["context_impl.h"],
     deps = [
-        "//include/envoy/router:context_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/router:context_interface",
+        "//envoy/router:router_interface",
+        "//envoy/stats:stats_macros",
     ],
 )
 
@@ -107,8 +107,8 @@ envoy_cc_library(
     srcs = ["debug_config.cc"],
     hdrs = ["debug_config.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/common:macros",
     ],
 )
@@ -119,9 +119,9 @@ envoy_cc_library(
     hdrs = ["route_config_update_receiver_impl.h"],
     deps = [
         ":config_lib",
-        "//include/envoy/router:rds_interface",
-        "//include/envoy/router:route_config_update_info_interface",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/router:rds_interface",
+        "//envoy/router:route_config_update_info_interface",
+        "//envoy/server:factory_context_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/protobuf:utility_lib",
@@ -136,14 +136,14 @@ envoy_cc_library(
     hdrs = ["vhds.h"],
     deps = [
         ":config_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/router:rds_interface",
-        "//include/envoy/router:route_config_provider_manager_interface",
-        "//include/envoy/router:route_config_update_info_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/router:rds_interface",
+        "//envoy/router:route_config_provider_manager_interface",
+        "//envoy/router:route_config_update_info_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:api_version_lib",
@@ -165,15 +165,15 @@ envoy_cc_library(
     hdrs = ["rds_impl.h"],
     deps = [
         ":config_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/router:rds_interface",
-        "//include/envoy/router:route_config_provider_manager_interface",
-        "//include/envoy/router:route_config_update_info_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/router:rds_interface",
+        "//envoy/router:route_config_provider_manager_interface",
+        "//envoy/router:route_config_update_info_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:callback_impl_lib",
         "//source/common/common:cleanup_lib",
@@ -207,9 +207,9 @@ envoy_cc_library(
     ],
     deps = [
         ":config_lib",
-        "//include/envoy/router:rds_interface",
-        "//include/envoy/router:scopes_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/router:rds_interface",
+        "//envoy/router:scopes_interface",
+        "//envoy/thread_local:thread_local_interface",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto",
     ],
@@ -222,10 +222,10 @@ envoy_cc_library(
     deps = [
         ":rds_lib",
         ":scoped_config_lib",
-        "//include/envoy/config:config_provider_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/router:route_config_provider_manager_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/config:config_provider_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/router:route_config_provider_manager_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:cleanup_lib",
         "//source/common/common:minimal_logger_lib",
@@ -252,12 +252,12 @@ envoy_cc_library(
     hdrs = ["retry_state_impl.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/router:router_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:backoff_lib",
         "//source/common/common:utility_lib",
@@ -286,21 +286,21 @@ envoy_cc_library(
         ":debug_config_lib",
         ":header_parser_lib",
         ":retry_state_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/grpc:status",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/router:shadow_writer_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/grpc:status",
+        "//envoy/http:codec_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/router:shadow_writer_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
@@ -338,9 +338,9 @@ envoy_cc_library(
     hdrs = ["router_ratelimit.h"],
     deps = [
         ":config_utility_lib",
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/router:router_ratelimit_interface",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/router:router_interface",
+        "//envoy/router:router_ratelimit_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/config:metadata_lib",
@@ -357,8 +357,8 @@ envoy_cc_library(
     srcs = ["shadow_writer_impl.cc"],
     hdrs = ["shadow_writer_impl.h"],
     deps = [
-        "//include/envoy/router:shadow_writer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/router:shadow_writer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/http:headers_lib",
     ],
@@ -370,7 +370,7 @@ envoy_cc_library(
     hdrs = ["header_parser.h"],
     deps = [
         ":header_formatter_lib",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:header_utility_lib",
         "//source/common/http:headers_lib",
         "//source/common/protobuf:utility_lib",
@@ -384,9 +384,9 @@ envoy_cc_library(
     hdrs = ["header_formatter.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/router:string_accessor_interface",
-        "//include/envoy/stream_info:filter_state_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/router:string_accessor_interface",
+        "//envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
         "//source/common/config:metadata_lib",
@@ -401,9 +401,9 @@ envoy_cc_library(
     srcs = ["reset_header_parser.cc"],
     hdrs = ["reset_header_parser.h"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/router:router_interface",
+        "//envoy/common:time_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/router:router_interface",
         "//source/common/http:headers_lib",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
@@ -414,7 +414,7 @@ envoy_cc_library(
     name = "string_accessor_lib",
     hdrs = ["string_accessor_impl.h"],
     deps = [
-        "//include/envoy/router:string_accessor_interface",
+        "//envoy/router:string_accessor_interface",
     ],
 )
 
@@ -423,6 +423,6 @@ envoy_cc_library(
     srcs = ["delegating_route_impl.cc"],
     hdrs = ["delegating_route_impl.h"],
     deps = [
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
     ],
 )
diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc
index 13e017148f94d..742ddc9fbf7fd 100644
--- a/source/common/router/config_impl.cc
+++ b/source/common/router/config_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/config_impl.h"
+#include "source/common/router/config_impl.h"
 
 #include <algorithm>
 #include <chrono>
@@ -18,28 +18,27 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/hash.h"
-#include "common/common/logger.h"
-#include "common/common/regex.h"
-#include "common/common/utility.h"
-#include "common/config/metadata.h"
-#include "common/config/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/http/headers.h"
-#include "common/http/path_utility.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/router/reset_header_parser.h"
-#include "common/router/retry_state_impl.h"
-#include "common/runtime/runtime_features.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/http/common/utility.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/regex.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/path_utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/reset_header_parser.h"
+#include "source/common/router/retry_state_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/http/common/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h
index dc512ebd7121e..e367683e092ec 100644
--- a/source/common/router/config_impl.h
+++ b/source/common/router/config_impl.h
@@ -19,17 +19,17 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/matchers.h"
-#include "common/config/metadata.h"
-#include "common/http/hash_policy.h"
-#include "common/http/header_utility.h"
-#include "common/router/config_utility.h"
-#include "common/router/header_formatter.h"
-#include "common/router/header_parser.h"
-#include "common/router/metadatamatchcriteria_impl.h"
-#include "common/router/router_ratelimit.h"
-#include "common/router/tls_context_match_criteria_impl.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/matchers.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/hash_policy.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/router/config_utility.h"
+#include "source/common/router/header_formatter.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
+#include "source/common/router/router_ratelimit.h"
+#include "source/common/router/tls_context_match_criteria_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/common/router/config_utility.cc b/source/common/router/config_utility.cc
index 99dd80aa0f0fc..f94d6b68a19ef 100644
--- a/source/common/router/config_utility.cc
+++ b/source/common/router/config_utility.cc
@@ -1,4 +1,4 @@
-#include "common/router/config_utility.h"
+#include "source/common/router/config_utility.h"
 
 #include <string>
 #include <vector>
@@ -7,8 +7,8 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/regex.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/regex.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/config_utility.h b/source/common/router/config_utility.h
index 5f9513103af99..3c8167c2faa38 100644
--- a/source/common/router/config_utility.h
+++ b/source/common/router/config_utility.h
@@ -9,12 +9,12 @@
 #include "envoy/http/codes.h"
 #include "envoy/upstream/resource_manager.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/matchers.h"
-#include "common/common/utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/matchers.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/router/context_impl.cc b/source/common/router/context_impl.cc
index dd9cfc22c0353..2a2df3b234e30 100644
--- a/source/common/router/context_impl.cc
+++ b/source/common/router/context_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/context_impl.h"
+#include "source/common/router/context_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/debug_config.cc b/source/common/router/debug_config.cc
index 8ec9cb59687ea..4b6d4f3b5cb41 100644
--- a/source/common/router/debug_config.cc
+++ b/source/common/router/debug_config.cc
@@ -1,6 +1,6 @@
-#include "common/router/debug_config.h"
+#include "source/common/router/debug_config.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/delegating_route_impl.cc b/source/common/router/delegating_route_impl.cc
index bdc8ce1dde02f..935a648e9cbeb 100644
--- a/source/common/router/delegating_route_impl.cc
+++ b/source/common/router/delegating_route_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/delegating_route_impl.h"
+#include "source/common/router/delegating_route_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/header_formatter.cc b/source/common/router/header_formatter.cc
index aa464deab7832..80482fc17b3bb 100644
--- a/source/common/router/header_formatter.cc
+++ b/source/common/router/header_formatter.cc
@@ -1,18 +1,18 @@
-#include "common/router/header_formatter.h"
+#include "source/common/router/header_formatter.h"
 
 #include <string>
 
 #include "envoy/router/string_accessor.h"
 
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/common/utility.h"
-#include "common/config/metadata.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-#include "common/stream_info/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/stream_info/utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/router/header_parser.cc b/source/common/router/header_parser.cc
index 5a46d92d7c152..81a9475714447 100644
--- a/source/common/router/header_parser.cc
+++ b/source/common/router/header_parser.cc
@@ -1,4 +1,4 @@
-#include "common/router/header_parser.h"
+#include "source/common/router/header_parser.h"
 
 #include <cctype>
 #include <memory>
@@ -6,10 +6,10 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/assert.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
diff --git a/source/common/router/header_parser.h b/source/common/router/header_parser.h
index 03b1dc65b00c3..2cf52bdef09dd 100644
--- a/source/common/router/header_parser.h
+++ b/source/common/router/header_parser.h
@@ -7,8 +7,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/router/header_formatter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/router/header_formatter.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/metadatamatchcriteria_impl.cc b/source/common/router/metadatamatchcriteria_impl.cc
index 88cfa4b229fdf..bcfbc733c6d1d 100644
--- a/source/common/router/metadatamatchcriteria_impl.cc
+++ b/source/common/router/metadatamatchcriteria_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/metadatamatchcriteria_impl.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc
index cc9c20e2d30e1..b07c7b9bb02b6 100644
--- a/source/common/router/rds_impl.cc
+++ b/source/common/router/rds_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/rds_impl.h"
+#include "source/common/router/rds_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -11,14 +11,14 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/api_version.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/rds_impl.h b/source/common/router/rds_impl.h
index 22182e48d416e..6ea491b88d253 100644
--- a/source/common/router/rds_impl.h
+++ b/source/common/router/rds_impl.h
@@ -24,15 +24,15 @@
 #include "envoy/stats/scope.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/cleanup.h"
-#include "common/common/logger.h"
-#include "common/init/manager_impl.h"
-#include "common/init/target_impl.h"
-#include "common/init/watcher_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/route_config_update_receiver_impl.h"
-#include "common/router/vhds.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/init/watcher_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/route_config_update_receiver_impl.h"
+#include "source/common/router/vhds.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/container/node_hash_set.h"
diff --git a/source/common/router/reset_header_parser.cc b/source/common/router/reset_header_parser.cc
index f2a7f1581f94d..db73f9f4de3e3 100644
--- a/source/common/router/reset_header_parser.cc
+++ b/source/common/router/reset_header_parser.cc
@@ -1,8 +1,8 @@
-#include "common/router/reset_header_parser.h"
+#include "source/common/router/reset_header_parser.h"
 
 #include <cstdint>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/numbers.h"
 
diff --git a/source/common/router/reset_header_parser.h b/source/common/router/reset_header_parser.h
index 776486d339b18..75f1b26d61cde 100644
--- a/source/common/router/reset_header_parser.h
+++ b/source/common/router/reset_header_parser.h
@@ -9,7 +9,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/router/router.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/router/retry_state_impl.cc b/source/common/router/retry_state_impl.cc
index e39275c5c274d..0b7d86b2c2e7e 100644
--- a/source/common/router/retry_state_impl.cc
+++ b/source/common/router/retry_state_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/retry_state_impl.h"
+#include "source/common/router/retry_state_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -7,12 +7,12 @@
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/retry_state_impl.h b/source/common/router/retry_state_impl.h
index 8931b5bf37516..affa6f9fa0eb6 100644
--- a/source/common/router/retry_state_impl.h
+++ b/source/common/router/retry_state_impl.h
@@ -11,8 +11,8 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/http/header_utility.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/http/header_utility.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/common/router/route_config_update_receiver_impl.cc b/source/common/router/route_config_update_receiver_impl.cc
index b3226de028005..61d451ce62910 100644
--- a/source/common/router/route_config_update_receiver_impl.cc
+++ b/source/common/router/route_config_update_receiver_impl.cc
@@ -1,15 +1,15 @@
-#include "common/router/route_config_update_receiver_impl.h"
+#include "source/common/router/route_config_update_receiver_impl.h"
 
 #include <string>
 
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/thread.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/route_config_update_receiver_impl.h b/source/common/router/route_config_update_receiver_impl.h
index 4f77bd34156bd..fc07c9f9e3f98 100644
--- a/source/common/router/route_config_update_receiver_impl.h
+++ b/source/common/router/route_config_update_receiver_impl.h
@@ -9,9 +9,9 @@
 #include "envoy/server/factory_context.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/router.cc b/source/common/router/router.cc
index ec67fdbd87b0a..4d816305fb010 100644
--- a/source/common/router/router.cc
+++ b/source/common/router/router.cc
@@ -1,4 +1,4 @@
-#include "common/router/router.h"
+#include "source/common/router/router.h"
 
 #include <chrono>
 #include <cstdint>
@@ -15,34 +15,33 @@
 #include "envoy/upstream/health_check_host_monitor.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/network/application_protocol.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_socket_options_filter_state.h"
-#include "common/network/upstream_subject_alt_names.h"
-#include "common/router/config_impl.h"
-#include "common/router/debug_config.h"
-#include "common/router/retry_state_impl.h"
-#include "common/router/upstream_request.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stream_info/uint32_accessor_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
+#include "source/common/network/upstream_subject_alt_names.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/debug_config.h"
+#include "source/common/router/retry_state_impl.h"
+#include "source/common/router/upstream_request.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/router.h b/source/common/router/router.h
index e0ba5d4bae993..8aa19572a94c8 100644
--- a/source/common/router/router.h
+++ b/source/common/router/router.h
@@ -19,21 +19,21 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/cleanup.h"
-#include "common/common/hash.h"
-#include "common/common/hex.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/config/well_known_names.h"
-#include "common/http/utility.h"
-#include "common/router/config_impl.h"
-#include "common/router/context_impl.h"
-#include "common/router/upstream_request.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/router/upstream_request.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/router_ratelimit.cc b/source/common/router/router_ratelimit.cc
index 6a194da1df9f8..d7fe0b081ac54 100644
--- a/source/common/router/router_ratelimit.cc
+++ b/source/common/router/router_ratelimit.cc
@@ -1,4 +1,4 @@
-#include "common/router/router_ratelimit.h"
+#include "source/common/router/router_ratelimit.h"
 
 #include <cstdint>
 #include <memory>
@@ -8,11 +8,11 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/config/metadata.h"
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/router_ratelimit.h b/source/common/router/router_ratelimit.h
index b7d592f329740..d4acc92ae48d7 100644
--- a/source/common/router/router_ratelimit.h
+++ b/source/common/router/router_ratelimit.h
@@ -11,8 +11,8 @@
 #include "envoy/router/router.h"
 #include "envoy/router/router_ratelimit.h"
 
-#include "common/config/metadata.h"
-#include "common/http/header_utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/header_utility.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/common/router/scoped_config_impl.cc b/source/common/router/scoped_config_impl.cc
index 4c379e1b7a333..6aafffaf5ce29 100644
--- a/source/common/router/scoped_config_impl.cc
+++ b/source/common/router/scoped_config_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/scoped_config_impl.h"
+#include "source/common/router/scoped_config_impl.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/scoped_config_impl.h b/source/common/router/scoped_config_impl.h
index 17c6847de79dd..e1783da59255e 100644
--- a/source/common/router/scoped_config_impl.h
+++ b/source/common/router/scoped_config_impl.h
@@ -10,9 +10,9 @@
 #include "envoy/router/scopes.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/hash.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/hash.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
 
 #include "absl/numeric/int128.h"
 #include "absl/strings/str_format.h"
diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc
index 1e7e6d584972f..949c260a1975b 100644
--- a/source/common/router/scoped_rds.cc
+++ b/source/common/router/scoped_rds.cc
@@ -1,4 +1,4 @@
-#include "common/router/scoped_rds.h"
+#include "source/common/router/scoped_rds.h"
 
 #include <memory>
 
@@ -9,18 +9,18 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/config/api_version.h"
-#include "common/config/resource_name.h"
-#include "common/config/version_converter.h"
-#include "common/config/xds_resource.h"
-#include "common/init/manager_impl.h"
-#include "common/init/watcher_impl.h"
-#include "common/router/rds_impl.h"
-#include "common/router/scoped_config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/resource_name.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/watcher_impl.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/router/scoped_config_impl.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h
index 12fde395b134e..df24117c83ead 100644
--- a/source/common/router/scoped_rds.h
+++ b/source/common/router/scoped_rds.h
@@ -13,11 +13,11 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/config_provider_impl.h"
-#include "common/config/subscription_base.h"
-#include "common/init/manager_impl.h"
-#include "common/router/rds_impl.h"
-#include "common/router/scoped_config_impl.h"
+#include "source/common/config/config_provider_impl.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/router/scoped_config_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/shadow_writer_impl.cc b/source/common/router/shadow_writer_impl.cc
index 89da4c9ef85bb..d07447a13aba5 100644
--- a/source/common/router/shadow_writer_impl.cc
+++ b/source/common/router/shadow_writer_impl.cc
@@ -1,10 +1,10 @@
-#include "common/router/shadow_writer_impl.h"
+#include "source/common/router/shadow_writer_impl.h"
 
 #include <chrono>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/http/headers.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/headers.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/router/tls_context_match_criteria_impl.cc b/source/common/router/tls_context_match_criteria_impl.cc
index ee14369720272..128fe5e00e6be 100644
--- a/source/common/router/tls_context_match_criteria_impl.cc
+++ b/source/common/router/tls_context_match_criteria_impl.cc
@@ -1,4 +1,4 @@
-#include "common/router/tls_context_match_criteria_impl.h"
+#include "source/common/router/tls_context_match_criteria_impl.h"
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
diff --git a/source/common/router/upstream_request.cc b/source/common/router/upstream_request.cc
index 99e1fe0b33a68..758b2d734cfda 100644
--- a/source/common/router/upstream_request.cc
+++ b/source/common/router/upstream_request.cc
@@ -1,4 +1,4 @@
-#include "common/router/upstream_request.h"
+#include "source/common/router/upstream_request.h"
 
 #include <chrono>
 #include <cstdint>
@@ -15,30 +15,29 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/network/application_protocol.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_subject_alt_names.h"
-#include "common/router/config_impl.h"
-#include "common/router/debug_config.h"
-#include "common/router/router.h"
-#include "common/stream_info/uint32_accessor_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_subject_alt_names.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/debug_config.h"
+#include "source/common/router/router.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/upstream_request.h b/source/common/router/upstream_request.h
index 5c0bb6480bc8d..33edf91bf0df2 100644
--- a/source/common/router/upstream_request.h
+++ b/source/common/router/upstream_request.h
@@ -13,14 +13,14 @@
 #include "envoy/stats/scope.h"
 #include "envoy/tcp/conn_pool.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/cleanup.h"
-#include "common/common/hash.h"
-#include "common/common/hex.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/config/well_known_names.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/vhds.cc b/source/common/router/vhds.cc
index 572a835344f5c..b291b9af14f5d 100644
--- a/source/common/router/vhds.cc
+++ b/source/common/router/vhds.cc
@@ -1,4 +1,4 @@
-#include "common/router/vhds.h"
+#include "source/common/router/vhds.h"
 
 #include <chrono>
 #include <cstdint>
@@ -10,12 +10,12 @@
 #include "envoy/config/subscription.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/api_version.h"
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/source/common/router/vhds.h b/source/common/router/vhds.h
index 2e38433c454b1..099b00ff322d9 100644
--- a/source/common/router/vhds.h
+++ b/source/common/router/vhds.h
@@ -18,10 +18,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/logger.h"
-#include "common/config/subscription_base.h"
-#include "common/init/target_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/node_hash_set.h"
 
diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD
index 6b2f326d2cb64..ce7a517e9a4a5 100644
--- a/source/common/runtime/BUILD
+++ b/source/common/runtime/BUILD
@@ -21,7 +21,7 @@ envoy_cc_library(
         # AVOID ADDING TO THESE DEPENDENCIES IF POSSIBLE
         # Any code using runtime guards depends on this library, and the more dependencies there are,
         # the harder it is to runtime-guard without dependency loops.
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:hash_lib",
         "//source/common/singleton:const_singleton",
     ],
@@ -33,7 +33,7 @@ envoy_cc_library(
         "runtime_protos.h",
     ],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
@@ -51,14 +51,14 @@ envoy_cc_library(
     deps = [
         ":runtime_features_lib",
         ":runtime_protos_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:empty_string",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:thread_lib",
diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc
index 82f9b46eea368..a5ecd2a14b564 100644
--- a/source/common/runtime/runtime_features.cc
+++ b/source/common/runtime/runtime_features.cc
@@ -1,4 +1,4 @@
-#include "common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/common/runtime/runtime_features.h b/source/common/runtime/runtime_features.h
index 4760d218504c2..deebe3a65c53b 100644
--- a/source/common/runtime/runtime_features.h
+++ b/source/common/runtime/runtime_features.h
@@ -4,7 +4,7 @@
 
 #include "envoy/runtime/runtime.h"
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc
index e41a19217f9cb..85a7fc91ecec4 100644
--- a/source/common/runtime/runtime_impl.cc
+++ b/source/common/runtime/runtime_impl.cc
@@ -1,4 +1,4 @@
-#include "common/runtime/runtime_impl.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include <cstdint>
 #include <string>
@@ -12,15 +12,15 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/type/v3/percent.pb.validate.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/api_version.h"
-#include "common/filesystem/directory.h"
-#include "common/grpc/common.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/filesystem/directory.h"
+#include "source/common/grpc/common.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/container/node_hash_set.h"
@@ -28,7 +28,7 @@
 #include "absl/strings/numbers.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 #endif
 
 namespace Envoy {
diff --git a/source/common/runtime/runtime_impl.h b/source/common/runtime/runtime_impl.h
index 3d99376369677..cd42d479383d6 100644
--- a/source/common/runtime/runtime_impl.h
+++ b/source/common/runtime/runtime_impl.h
@@ -21,13 +21,13 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/config/subscription_base.h"
-#include "common/init/manager_impl.h"
-#include "common/init/target_impl.h"
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 #include "absl/container/node_hash_map.h"
 #include "spdlog/spdlog.h"
diff --git a/source/common/runtime/runtime_protos.h b/source/common/runtime/runtime_protos.h
index b9d7d2550e9fa..e8b6f2381911b 100644
--- a/source/common/runtime/runtime_protos.h
+++ b/source/common/runtime/runtime_protos.h
@@ -6,7 +6,7 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Runtime {
diff --git a/source/common/secret/BUILD b/source/common/secret/BUILD
index 84defb7ef88bd..4dc783bc83e32 100644
--- a/source/common/secret/BUILD
+++ b/source/common/secret/BUILD
@@ -15,8 +15,8 @@ envoy_cc_library(
     deps = [
         ":sds_api_lib",
         ":secret_provider_impl_lib",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:version_converter_lib",
@@ -32,7 +32,7 @@ envoy_cc_library(
     srcs = ["secret_provider_impl.cc"],
     hdrs = ["secret_provider_impl.h"],
     deps = [
-        "//include/envoy/secret:secret_provider_interface",
+        "//envoy/secret:secret_provider_interface",
         "//source/common/ssl:certificate_validation_context_config_impl_lib",
         "//source/common/ssl:tls_certificate_config_impl_lib",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
@@ -44,15 +44,15 @@ envoy_cc_library(
     srcs = ["sds_api.cc"],
     hdrs = ["sds_api.h"],
     deps = [
-        "//include/envoy/config:subscription_factory_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/secret:secret_provider_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/config:subscription_factory_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/secret:secret_provider_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/common:cleanup_lib",
         "//source/common/config:api_version_lib",
diff --git a/source/common/secret/sds_api.cc b/source/common/secret/sds_api.cc
index 0c9323c4f7f3f..03dba0ccfe555 100644
--- a/source/common/secret/sds_api.cc
+++ b/source/common/secret/sds_api.cc
@@ -1,13 +1,13 @@
-#include "common/secret/sds_api.h"
+#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"
 
-#include "common/common/assert.h"
-#include "common/config/api_version.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/api_version.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Secret {
diff --git a/source/common/secret/sds_api.h b/source/common/secret/sds_api.h
index 74edb0fb857dc..a29cfdace2cc4 100644
--- a/source/common/secret/sds_api.h
+++ b/source/common/secret/sds_api.h
@@ -19,14 +19,14 @@
 #include "envoy/stats/stats.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/cleanup.h"
-#include "common/config/subscription_base.h"
-#include "common/config/utility.h"
-#include "common/config/watched_directory.h"
-#include "common/init/target_impl.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/watched_directory.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 namespace Envoy {
 namespace Secret {
diff --git a/source/common/secret/secret_manager_impl.cc b/source/common/secret/secret_manager_impl.cc
index f99a1205caa0f..0d583128c6c43 100644
--- a/source/common/secret/secret_manager_impl.cc
+++ b/source/common/secret/secret_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "common/secret/secret_manager_impl.h"
+#include "source/common/secret/secret_manager_impl.h"
 
 #include "envoy/admin/v3/config_dump.pb.h"
 #include "envoy/common/exception.h"
@@ -6,14 +6,14 @@
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/utility.h"
-#include "common/secret/sds_api.h"
-#include "common/secret/secret_provider_impl.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/secret/sds_api.h"
+#include "source/common/secret/secret_provider_impl.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 namespace Envoy {
 namespace Secret {
diff --git a/source/common/secret/secret_manager_impl.h b/source/common/secret/secret_manager_impl.h
index a3045a87b4da5..66ca9e4435818 100644
--- a/source/common/secret/secret_manager_impl.h
+++ b/source/common/secret/secret_manager_impl.h
@@ -8,8 +8,8 @@
 #include "envoy/ssl/certificate_validation_context_config.h"
 #include "envoy/ssl/tls_certificate_config.h"
 
-#include "common/common/logger.h"
-#include "common/secret/sds_api.h"
+#include "source/common/common/logger.h"
+#include "source/common/secret/sds_api.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/secret/secret_provider_impl.cc b/source/common/secret/secret_provider_impl.cc
index 0513c2180a417..6aed80d0107c0 100644
--- a/source/common/secret/secret_provider_impl.cc
+++ b/source/common/secret/secret_provider_impl.cc
@@ -1,10 +1,10 @@
-#include "common/secret/secret_provider_impl.h"
+#include "source/common/secret/secret_provider_impl.h"
 
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/common/assert.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 namespace Envoy {
 namespace Secret {
diff --git a/source/common/shared_pool/BUILD b/source/common/shared_pool/BUILD
index 1d55c9ec99a03..9ed361337a47b 100644
--- a/source/common/shared_pool/BUILD
+++ b/source/common/shared_pool/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
         "shared_pool.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/singleton:instance_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/singleton:instance_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:non_copyable",
         "//source/common/common:thread_synchronizer_lib",
diff --git a/source/common/shared_pool/shared_pool.h b/source/common/shared_pool/shared_pool.h
index d7119d17140f7..2e1f2309507aa 100644
--- a/source/common/shared_pool/shared_pool.h
+++ b/source/common/shared_pool/shared_pool.h
@@ -8,9 +8,9 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/singleton/instance.h"
 
-#include "common/common/assert.h"
-#include "common/common/non_copyable.h"
-#include "common/common/thread_synchronizer.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/common/thread_synchronizer.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/signal/BUILD b/source/common/signal/BUILD
index 893f2fa78454b..9c825d1d9928e 100644
--- a/source/common/signal/BUILD
+++ b/source/common/signal/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     hdrs = ["fatal_error_handler.h"],
     deps = [
         ":fatal_action_lib",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/common:macros",
     ],
 )
@@ -37,7 +37,7 @@ envoy_cc_library(
     name = "fatal_action_lib",
     hdrs = ["fatal_action.h"],
     deps = [
-        "//include/envoy/server:fatal_action_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/server:fatal_action_interface",
+        "//envoy/thread:thread_interface",
     ],
 )
diff --git a/source/common/signal/fatal_error_handler.cc b/source/common/signal/fatal_error_handler.cc
index 627c352415b10..baf1ea267b579 100644
--- a/source/common/signal/fatal_error_handler.cc
+++ b/source/common/signal/fatal_error_handler.cc
@@ -1,13 +1,13 @@
-#include "common/signal/fatal_error_handler.h"
+#include "source/common/signal/fatal_error_handler.h"
 
 #include <atomic>
 #include <list>
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/signal/fatal_action.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/signal/fatal_action.h"
 
 #include "absl/base/attributes.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/common/signal/fatal_error_handler.h b/source/common/signal/fatal_error_handler.h
index d7d25013432d0..afcb152f9d635 100644
--- a/source/common/signal/fatal_error_handler.h
+++ b/source/common/signal/fatal_error_handler.h
@@ -4,7 +4,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/signal/fatal_action.h"
+#include "source/common/signal/fatal_action.h"
 
 namespace Envoy {
 
diff --git a/source/common/signal/signal_action.cc b/source/common/signal/signal_action.cc
index dea90f1cc1f4c..aec06302ef8f6 100644
--- a/source/common/signal/signal_action.cc
+++ b/source/common/signal/signal_action.cc
@@ -1,12 +1,12 @@
-#include "common/signal/signal_action.h"
+#include "source/common/signal/signal_action.h"
 
 #include <sys/mman.h>
 
 #include <csignal>
 
-#include "common/common/assert.h"
-#include "common/signal/fatal_action.h"
-#include "common/version/version.h"
+#include "source/common/common/assert.h"
+#include "source/common/signal/fatal_action.h"
+#include "source/common/version/version.h"
 
 namespace Envoy {
 
diff --git a/source/common/signal/signal_action.h b/source/common/signal/signal_action.h
index ffabf9cc3cde3..79bc2ab30c765 100644
--- a/source/common/signal/signal_action.h
+++ b/source/common/signal/signal_action.h
@@ -6,10 +6,9 @@
 #include <csignal>
 #include <list>
 
-#include "common/common/non_copyable.h"
-#include "common/signal/fatal_error_handler.h"
-
-#include "server/backtrace.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/signal/fatal_error_handler.h"
+#include "source/server/backtrace.h"
 
 namespace Envoy {
 
diff --git a/source/common/singleton/BUILD b/source/common/singleton/BUILD
index 06d67beae1b50..728c2ed78213a 100644
--- a/source/common/singleton/BUILD
+++ b/source/common/singleton/BUILD
@@ -18,8 +18,8 @@ envoy_cc_library(
     srcs = ["manager_impl.cc"],
     hdrs = ["manager_impl.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/singleton:manager_interface",
+        "//envoy/registry",
+        "//envoy/singleton:manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:non_copyable",
         "//source/common/common:thread_lib",
diff --git a/source/common/singleton/manager_impl.cc b/source/common/singleton/manager_impl.cc
index e90d3b000c63b..cca7ac2bc6b8d 100644
--- a/source/common/singleton/manager_impl.cc
+++ b/source/common/singleton/manager_impl.cc
@@ -1,9 +1,9 @@
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
 
 namespace Envoy {
 namespace Singleton {
diff --git a/source/common/singleton/manager_impl.h b/source/common/singleton/manager_impl.h
index e6eb8cb9af97a..32de2d1127501 100644
--- a/source/common/singleton/manager_impl.h
+++ b/source/common/singleton/manager_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/singleton/manager.h"
 #include "envoy/thread/thread.h"
 
-#include "common/common/non_copyable.h"
+#include "source/common/common/non_copyable.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/singleton/threadsafe_singleton.h b/source/common/singleton/threadsafe_singleton.h
index a909a8b9db81b..f88ae9ed161a2 100644
--- a/source/common/singleton/threadsafe_singleton.h
+++ b/source/common/singleton/threadsafe_singleton.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/base/call_once.h"
 
diff --git a/source/common/ssl/BUILD b/source/common/ssl/BUILD
index c02d221dd5281..714c426b930f3 100644
--- a/source/common/ssl/BUILD
+++ b/source/common/ssl/BUILD
@@ -13,9 +13,9 @@ envoy_cc_library(
     srcs = ["tls_certificate_config_impl.cc"],
     hdrs = ["tls_certificate_config_impl.h"],
     deps = [
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:tls_certificate_config_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:tls_certificate_config_interface",
+        "//envoy/ssl/private_key:private_key_interface",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
@@ -28,8 +28,8 @@ envoy_cc_library(
     hdrs = ["certificate_validation_context_config_impl.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/ssl:certificate_validation_context_config_interface",
+        "//envoy/api:api_interface",
+        "//envoy/ssl:certificate_validation_context_config_interface",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
diff --git a/source/common/ssl/certificate_validation_context_config_impl.cc b/source/common/ssl/certificate_validation_context_config_impl.cc
index 8198290b6ab8f..4782127e99ecc 100644
--- a/source/common/ssl/certificate_validation_context_config_impl.cc
+++ b/source/common/ssl/certificate_validation_context_config_impl.cc
@@ -1,11 +1,11 @@
-#include "common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/config/datasource.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/datasource.h"
 
 namespace Envoy {
 namespace Ssl {
diff --git a/source/common/ssl/tls_certificate_config_impl.cc b/source/common/ssl/tls_certificate_config_impl.cc
index 7a4d4f64ed2a9..1c5073d1ff1ea 100644
--- a/source/common/ssl/tls_certificate_config_impl.cc
+++ b/source/common/ssl/tls_certificate_config_impl.cc
@@ -1,12 +1,12 @@
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/config/datasource.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/datasource.h"
 
 namespace Envoy {
 namespace Ssl {
diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD
index 4e1d1dc29e694..8391ecfd2c4d2 100644
--- a/source/common/stats/BUILD
+++ b/source/common/stats/BUILD
@@ -54,7 +54,7 @@ envoy_cc_library(
         ":stats_lib",
         ":store_impl_lib",
         ":tag_utility_lib",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/stats:allocator_lib",
     ],
 )
@@ -65,7 +65,7 @@ envoy_cc_library(
     hdrs = ["metric_impl.h"],
     deps = [
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -76,8 +76,8 @@ envoy_cc_library(
     hdrs = ["tag_utility.h"],
     deps = [
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:symbol_table_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:symbol_table_interface",
     ],
 )
 
@@ -87,7 +87,7 @@ envoy_cc_library(
     deps = [
         ":metric_impl_lib",
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -97,7 +97,7 @@ envoy_cc_library(
     deps = [
         ":metric_impl_lib",
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -107,7 +107,7 @@ envoy_cc_library(
     deps = [
         ":metric_impl_lib",
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -125,7 +125,7 @@ envoy_cc_library(
     hdrs = ["store_impl.h"],
     deps = [
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -136,7 +136,7 @@ envoy_cc_library(
     deps = [
         ":symbol_table_lib",
         ":utility_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -146,7 +146,7 @@ envoy_cc_library(
     hdrs = ["stat_merger.h"],
     deps = [
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/protobuf",
     ],
 )
@@ -159,9 +159,9 @@ envoy_cc_library(
         ":symbol_table_lib",
         ":tag_extractor_lib",
         ":utility_lib",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/common:time_interface",
+        "//envoy/server:options_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:hash_lib",
         "//source/common/common:non_copyable",
@@ -180,7 +180,7 @@ envoy_cc_library(
     external_deps = ["abseil_base"],
     deps = [
         ":recent_lookups_lib",
-        "//include/envoy/stats:symbol_table_interface",
+        "//envoy/stats:symbol_table_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:mem_block_builder_lib",
         "//source/common/common:minimal_logger_lib",
@@ -194,7 +194,7 @@ envoy_cc_library(
     srcs = ["tag_extractor_impl.cc"],
     hdrs = ["tag_extractor_impl.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:perf_annotation_lib",
         "//source/common/common:regex_lib",
@@ -210,7 +210,7 @@ envoy_cc_library(
         ":symbol_table_lib",
         ":tag_extractor_lib",
         ":utility_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:perf_annotation_lib",
         "//source/common/config:well_known_names",
         "//source/common/protobuf",
@@ -223,7 +223,7 @@ envoy_cc_library(
     srcs = ["stats_matcher_impl.cc"],
     hdrs = ["stats_matcher_impl.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:matchers_lib",
         "//source/common/protobuf",
         "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
@@ -245,7 +245,7 @@ envoy_cc_library(
         ":stats_matcher_lib",
         ":tag_producer_lib",
         ":tag_utility_lib",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/thread_local:thread_local_interface",
     ],
 )
 
@@ -254,9 +254,9 @@ envoy_cc_library(
     srcs = ["timespan_impl.cc"],
     hdrs = ["timespan_impl.h"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/common:time_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -267,6 +267,6 @@ envoy_cc_library(
     hdrs = ["utility.h"],
     deps = [
         ":symbol_table_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
diff --git a/source/common/stats/allocator_impl.cc b/source/common/stats/allocator_impl.cc
index 63e3159a842ed..3c64b6ba49511 100644
--- a/source/common/stats/allocator_impl.cc
+++ b/source/common/stats/allocator_impl.cc
@@ -1,19 +1,19 @@
-#include "common/stats/allocator_impl.h"
+#include "source/common/stats/allocator_impl.h"
 
 #include <cstdint>
 
 #include "envoy/stats/stats.h"
 #include "envoy/stats/symbol_table.h"
 
-#include "common/common/hash.h"
-#include "common/common/lock_guard.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/common/thread_annotations.h"
-#include "common/common/utility.h"
-#include "common/stats/metric_impl.h"
-#include "common/stats/stat_merger.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/thread_annotations.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/metric_impl.h"
+#include "source/common/stats/stat_merger.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/common/stats/allocator_impl.h b/source/common/stats/allocator_impl.h
index 469484866f18a..db656e2e40134 100644
--- a/source/common/stats/allocator_impl.h
+++ b/source/common/stats/allocator_impl.h
@@ -6,8 +6,8 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/symbol_table.h"
 
-#include "common/common/thread_synchronizer.h"
-#include "common/stats/metric_impl.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/common/stats/metric_impl.h"
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/stats/histogram_impl.cc b/source/common/stats/histogram_impl.cc
index a2b866dc112d3..cac5903393183 100644
--- a/source/common/stats/histogram_impl.cc
+++ b/source/common/stats/histogram_impl.cc
@@ -1,9 +1,9 @@
-#include "common/stats/histogram_impl.h"
+#include "source/common/stats/histogram_impl.h"
 
 #include <algorithm>
 #include <string>
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/stats/histogram_impl.h b/source/common/stats/histogram_impl.h
index 67c2d7d170668..4090434f46edd 100644
--- a/source/common/stats/histogram_impl.h
+++ b/source/common/stats/histogram_impl.h
@@ -8,9 +8,9 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/store.h"
 
-#include "common/common/matchers.h"
-#include "common/common/non_copyable.h"
-#include "common/stats/metric_impl.h"
+#include "source/common/common/matchers.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/stats/metric_impl.h"
 
 #include "circllhist.h"
 
diff --git a/source/common/stats/isolated_store_impl.cc b/source/common/stats/isolated_store_impl.cc
index ab419e6ecae1e..47cf0b3fc5c07 100644
--- a/source/common/stats/isolated_store_impl.cc
+++ b/source/common/stats/isolated_store_impl.cc
@@ -1,13 +1,13 @@
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include <algorithm>
 #include <cstring>
 #include <string>
 
-#include "common/common/utility.h"
-#include "common/stats/histogram_impl.h"
-#include "common/stats/scope_prefixer.h"
-#include "common/stats/utility.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/scope_prefixer.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/isolated_store_impl.h b/source/common/stats/isolated_store_impl.h
index 669f115d623ae..f0f924ebda541 100644
--- a/source/common/stats/isolated_store_impl.h
+++ b/source/common/stats/isolated_store_impl.h
@@ -7,14 +7,14 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/store.h"
 
-#include "common/common/utility.h"
-#include "common/stats/allocator_impl.h"
-#include "common/stats/null_counter.h"
-#include "common/stats/null_gauge.h"
-#include "common/stats/store_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/tag_utility.h"
-#include "common/stats/utility.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/common/stats/null_counter.h"
+#include "source/common/stats/null_gauge.h"
+#include "source/common/stats/store_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/tag_utility.h"
+#include "source/common/stats/utility.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/stats/metric_impl.cc b/source/common/stats/metric_impl.cc
index 12801e90fafe4..7a43ce886e3e5 100644
--- a/source/common/stats/metric_impl.cc
+++ b/source/common/stats/metric_impl.cc
@@ -1,8 +1,8 @@
-#include "common/stats/metric_impl.h"
+#include "source/common/stats/metric_impl.h"
 
 #include "envoy/stats/tag.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/metric_impl.h b/source/common/stats/metric_impl.h
index 52b577230fd3b..e188f1abe7942 100644
--- a/source/common/stats/metric_impl.h
+++ b/source/common/stats/metric_impl.h
@@ -7,8 +7,8 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/tag.h"
 
-#include "common/common/assert.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/null_counter.h b/source/common/stats/null_counter.h
index 61e86d16b6449..074349125a3f0 100644
--- a/source/common/stats/null_counter.h
+++ b/source/common/stats/null_counter.h
@@ -2,7 +2,7 @@
 
 #include "envoy/stats/stats.h"
 
-#include "common/stats/metric_impl.h"
+#include "source/common/stats/metric_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/null_gauge.h b/source/common/stats/null_gauge.h
index bbd8b2e507359..2c12f923aeda0 100644
--- a/source/common/stats/null_gauge.h
+++ b/source/common/stats/null_gauge.h
@@ -2,7 +2,7 @@
 
 #include "envoy/stats/stats.h"
 
-#include "common/stats/metric_impl.h"
+#include "source/common/stats/metric_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/null_text_readout.h b/source/common/stats/null_text_readout.h
index da6c0976abf74..4cb01d74c9a80 100644
--- a/source/common/stats/null_text_readout.h
+++ b/source/common/stats/null_text_readout.h
@@ -2,7 +2,7 @@
 
 #include "envoy/stats/stats.h"
 
-#include "common/stats/metric_impl.h"
+#include "source/common/stats/metric_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/recent_lookups.cc b/source/common/stats/recent_lookups.cc
index 994441cccb025..243208b88ba97 100644
--- a/source/common/stats/recent_lookups.cc
+++ b/source/common/stats/recent_lookups.cc
@@ -1,6 +1,6 @@
-#include "common/stats/recent_lookups.h"
+#include "source/common/stats/recent_lookups.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/scope_prefixer.cc b/source/common/stats/scope_prefixer.cc
index 0bdfe99354665..cbe4c3b1c45e6 100644
--- a/source/common/stats/scope_prefixer.cc
+++ b/source/common/stats/scope_prefixer.cc
@@ -1,9 +1,9 @@
-#include "common/stats/scope_prefixer.h"
+#include "source/common/stats/scope_prefixer.h"
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/scope_prefixer.h b/source/common/stats/scope_prefixer.h
index 5f64c08149650..4e1301d356e15 100644
--- a/source/common/stats/scope_prefixer.h
+++ b/source/common/stats/scope_prefixer.h
@@ -2,7 +2,7 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/stat_merger.cc b/source/common/stats/stat_merger.cc
index 870866a2615e7..8b772483d8cb3 100644
--- a/source/common/stats/stat_merger.cc
+++ b/source/common/stats/stat_merger.cc
@@ -1,4 +1,4 @@
-#include "common/stats/stat_merger.h"
+#include "source/common/stats/stat_merger.h"
 
 #include <algorithm>
 
diff --git a/source/common/stats/stat_merger.h b/source/common/stats/stat_merger.h
index 6dbf01d25aa3a..3a9fb6c3093fd 100644
--- a/source/common/stats/stat_merger.h
+++ b/source/common/stats/stat_merger.h
@@ -2,8 +2,8 @@
 
 #include "envoy/stats/store.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/stats/stats_matcher_impl.cc b/source/common/stats/stats_matcher_impl.cc
index 3a5793bb651e3..01b0049771f03 100644
--- a/source/common/stats/stats_matcher_impl.cc
+++ b/source/common/stats/stats_matcher_impl.cc
@@ -1,11 +1,11 @@
-#include "common/stats/stats_matcher_impl.h"
+#include "source/common/stats/stats_matcher_impl.h"
 
 #include <regex>
 #include <string>
 
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/stats_matcher_impl.h b/source/common/stats/stats_matcher_impl.h
index a47b2a7b9f25a..de8ece9a02da2 100644
--- a/source/common/stats/stats_matcher_impl.h
+++ b/source/common/stats/stats_matcher_impl.h
@@ -5,8 +5,8 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 #include "envoy/stats/stats_matcher.h"
 
-#include "common/common/matchers.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/matchers.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/common/stats/store_impl.h b/source/common/stats/store_impl.h
index e4a83f7514372..e4de8fe918b20 100644
--- a/source/common/stats/store_impl.h
+++ b/source/common/stats/store_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/store.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/symbol_table_impl.cc b/source/common/stats/symbol_table_impl.cc
index 22529eadab7ea..a60fa31d9b426 100644
--- a/source/common/stats/symbol_table_impl.cc
+++ b/source/common/stats/symbol_table_impl.cc
@@ -1,13 +1,13 @@
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include <algorithm>
 #include <iostream>
 #include <memory>
 #include <vector>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/stats/symbol_table_impl.h b/source/common/stats/symbol_table_impl.h
index 96db24124a6ba..cee896e649fa3 100644
--- a/source/common/stats/symbol_table_impl.h
+++ b/source/common/stats/symbol_table_impl.h
@@ -10,14 +10,14 @@
 #include "envoy/common/exception.h"
 #include "envoy/stats/symbol_table.h"
 
-#include "common/common/assert.h"
-#include "common/common/hash.h"
-#include "common/common/lock_guard.h"
-#include "common/common/mem_block_builder.h"
-#include "common/common/non_copyable.h"
-#include "common/common/thread.h"
-#include "common/common/utility.h"
-#include "common/stats/recent_lookups.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/mem_block_builder.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/recent_lookups.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/container/flat_hash_map.h"
diff --git a/source/common/stats/tag_extractor_impl.cc b/source/common/stats/tag_extractor_impl.cc
index 337de441f4563..0756995c30695 100644
--- a/source/common/stats/tag_extractor_impl.cc
+++ b/source/common/stats/tag_extractor_impl.cc
@@ -1,14 +1,14 @@
-#include "common/stats/tag_extractor_impl.h"
+#include "source/common/stats/tag_extractor_impl.h"
 
 #include <cstring>
 #include <string>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/perf_annotation.h"
-#include "common/common/regex.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/perf_annotation.h"
+#include "source/common/common/regex.h"
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/match.h"
diff --git a/source/common/stats/tag_extractor_impl.h b/source/common/stats/tag_extractor_impl.h
index a6ea3d7bb779a..2da63cd173f60 100644
--- a/source/common/stats/tag_extractor_impl.h
+++ b/source/common/stats/tag_extractor_impl.h
@@ -10,7 +10,7 @@
 
 #include "envoy/stats/tag_extractor.h"
 
-#include "common/common/regex.h"
+#include "source/common/common/regex.h"
 
 #include "absl/strings/string_view.h"
 #include "re2/re2.h"
diff --git a/source/common/stats/tag_producer_impl.cc b/source/common/stats/tag_producer_impl.cc
index 81843def060fb..85384e7eb2ec2 100644
--- a/source/common/stats/tag_producer_impl.cc
+++ b/source/common/stats/tag_producer_impl.cc
@@ -1,12 +1,12 @@
-#include "common/stats/tag_producer_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
 
 #include <string>
 
 #include "envoy/common/exception.h"
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/common/utility.h"
-#include "common/stats/tag_extractor_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/tag_extractor_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/tag_producer_impl.h b/source/common/stats/tag_producer_impl.h
index 093d4021389b8..ff5dc3d34fb10 100644
--- a/source/common/stats/tag_producer_impl.h
+++ b/source/common/stats/tag_producer_impl.h
@@ -10,10 +10,10 @@
 #include "envoy/stats/tag_extractor.h"
 #include "envoy/stats/tag_producer.h"
 
-#include "common/common/hash.h"
-#include "common/common/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/node_hash_set.h"
diff --git a/source/common/stats/tag_utility.cc b/source/common/stats/tag_utility.cc
index 7710277fd5ba2..b73ff3d81fe20 100644
--- a/source/common/stats/tag_utility.cc
+++ b/source/common/stats/tag_utility.cc
@@ -1,6 +1,6 @@
-#include "common/stats/tag_utility.h"
+#include "source/common/stats/tag_utility.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/tag_utility.h b/source/common/stats/tag_utility.h
index 0aeacbaf53ae2..b3e56e7737b3d 100644
--- a/source/common/stats/tag_utility.h
+++ b/source/common/stats/tag_utility.h
@@ -3,7 +3,7 @@
 #include "envoy/stats/symbol_table.h"
 #include "envoy/stats/tag.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/thread_local_store.cc b/source/common/stats/thread_local_store.cc
index 78dda479cf821..de7b0c061a191 100644
--- a/source/common/stats/thread_local_store.cc
+++ b/source/common/stats/thread_local_store.cc
@@ -1,4 +1,4 @@
-#include "common/stats/thread_local_store.h"
+#include "source/common/stats/thread_local_store.h"
 
 #include <chrono>
 #include <cstdint>
@@ -11,11 +11,11 @@
 #include "envoy/stats/sink.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/lock_guard.h"
-#include "common/stats/histogram_impl.h"
-#include "common/stats/stats_matcher_impl.h"
-#include "common/stats/tag_producer_impl.h"
-#include "common/stats/tag_utility.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/stats_matcher_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
+#include "source/common/stats/tag_utility.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/stats/thread_local_store.h b/source/common/stats/thread_local_store.h
index bc76c13c9aa92..ecc359841bce0 100644
--- a/source/common/stats/thread_local_store.h
+++ b/source/common/stats/thread_local_store.h
@@ -10,15 +10,15 @@
 #include "envoy/stats/tag.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/hash.h"
-#include "common/common/thread_synchronizer.h"
-#include "common/stats/allocator_impl.h"
-#include "common/stats/histogram_impl.h"
-#include "common/stats/null_counter.h"
-#include "common/stats/null_gauge.h"
-#include "common/stats/null_text_readout.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/common/hash.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/null_counter.h"
+#include "source/common/stats/null_gauge.h"
+#include "source/common/stats/null_text_readout.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
diff --git a/source/common/stats/timespan_impl.cc b/source/common/stats/timespan_impl.cc
index 4c63172389262..33875c0656a4c 100644
--- a/source/common/stats/timespan_impl.cc
+++ b/source/common/stats/timespan_impl.cc
@@ -1,7 +1,7 @@
-#include "common/stats/timespan_impl.h"
+#include "source/common/stats/timespan_impl.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/source/common/stats/utility.cc b/source/common/stats/utility.cc
index d6b8917f826d0..a4e5574713e23 100644
--- a/source/common/stats/utility.cc
+++ b/source/common/stats/utility.cc
@@ -1,4 +1,4 @@
-#include "common/stats/utility.h"
+#include "source/common/stats/utility.h"
 
 #include <algorithm>
 #include <string>
diff --git a/source/common/stats/utility.h b/source/common/stats/utility.h
index 926aace1004d7..2ef817b61c171 100644
--- a/source/common/stats/utility.h
+++ b/source/common/stats/utility.h
@@ -5,8 +5,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/thread.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/container/inlined_vector.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/stream_info/BUILD b/source/common/stream_info/BUILD
index 9096e23a71cb7..8ed41ec327106 100644
--- a/source/common/stream_info/BUILD
+++ b/source/common/stream_info/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     hdrs = ["stream_info_impl.h"],
     deps = [
         ":filter_state_lib",
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:dump_state_utils",
         "//source/common/network:socket_lib",
@@ -27,7 +27,7 @@ envoy_cc_library(
     srcs = ["filter_state_impl.cc"],
     hdrs = ["filter_state_impl.h"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -37,8 +37,8 @@ envoy_cc_library(
     hdrs = ["utility.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/common:time_interface",
+        "//envoy/stream_info:stream_info_interface",
     ],
 )
 
@@ -46,6 +46,6 @@ envoy_cc_library(
     name = "uint32_accessor_lib",
     hdrs = ["uint32_accessor_impl.h"],
     deps = [
-        "//include/envoy/stream_info:uint32_accessor_interface",
+        "//envoy/stream_info:uint32_accessor_interface",
     ],
 )
diff --git a/source/common/stream_info/filter_state_impl.cc b/source/common/stream_info/filter_state_impl.cc
index d873587abfcf8..d5a42eb75c18f 100644
--- a/source/common/stream_info/filter_state_impl.cc
+++ b/source/common/stream_info/filter_state_impl.cc
@@ -1,4 +1,4 @@
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "envoy/common/exception.h"
 
diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h
index 9e64932af177e..537596f06b2d5 100644
--- a/source/common/stream_info/stream_info_impl.h
+++ b/source/common/stream_info/stream_info_impl.h
@@ -11,11 +11,11 @@
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/tracing/trace_reason.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/macros.h"
-#include "common/network/socket_impl.h"
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/macros.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "absl/strings/str_replace.h"
 
diff --git a/source/common/stream_info/utility.cc b/source/common/stream_info/utility.cc
index e09708fc46cfa..8ea8da5158b48 100644
--- a/source/common/stream_info/utility.cc
+++ b/source/common/stream_info/utility.cc
@@ -1,4 +1,4 @@
-#include "common/stream_info/utility.h"
+#include "source/common/stream_info/utility.h"
 
 #include <string>
 
diff --git a/source/common/tcp/BUILD b/source/common/tcp/BUILD
index 9a4234e77bb8f..82bcdfbf6a6f7 100644
--- a/source/common/tcp/BUILD
+++ b/source/common/tcp/BUILD
@@ -20,14 +20,14 @@ envoy_cc_library(
     ],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:linked_object",
         "//source/common/common:utility_lib",
         "//source/common/http:conn_pool_base_lib",
diff --git a/source/common/tcp/conn_pool.cc b/source/common/tcp/conn_pool.cc
index f26d82c4a4d9a..dd0ae46994ff1 100644
--- a/source/common/tcp/conn_pool.cc
+++ b/source/common/tcp/conn_pool.cc
@@ -1,4 +1,4 @@
-#include "common/tcp/conn_pool.h"
+#include "source/common/tcp/conn_pool.h"
 
 #include <memory>
 
@@ -6,8 +6,8 @@
 #include "envoy/event/timer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/stats/timespan_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Tcp {
diff --git a/source/common/tcp/conn_pool.h b/source/common/tcp/conn_pool.h
index 9f204ad3c9658..e1208f7205359 100644
--- a/source/common/tcp/conn_pool.h
+++ b/source/common/tcp/conn_pool.h
@@ -11,10 +11,10 @@
 #include "envoy/tcp/conn_pool.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/http/conn_pool_base.h"
-#include "common/network/filter_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/conn_pool_base.h"
+#include "source/common/network/filter_impl.h"
 
 namespace Envoy {
 namespace Tcp {
diff --git a/source/common/tcp/original_conn_pool.cc b/source/common/tcp/original_conn_pool.cc
index b34c31280f89a..33796607c4489 100644
--- a/source/common/tcp/original_conn_pool.cc
+++ b/source/common/tcp/original_conn_pool.cc
@@ -1,4 +1,4 @@
-#include "common/tcp/original_conn_pool.h"
+#include "source/common/tcp/original_conn_pool.h"
 
 #include <memory>
 
@@ -6,8 +6,8 @@
 #include "envoy/event/timer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/stats/timespan_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Tcp {
diff --git a/source/common/tcp/original_conn_pool.h b/source/common/tcp/original_conn_pool.h
index b10b6b0b8d41c..d6b021bcf3e29 100644
--- a/source/common/tcp/original_conn_pool.h
+++ b/source/common/tcp/original_conn_pool.h
@@ -12,9 +12,9 @@
 #include "envoy/tcp/conn_pool.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/network/filter_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/filter_impl.h"
 
 namespace Envoy {
 namespace Tcp {
diff --git a/source/common/tcp_proxy/BUILD b/source/common/tcp_proxy/BUILD
index 1e80c6506d71b..bd2a496c4eef5 100644
--- a/source/common/tcp_proxy/BUILD
+++ b/source/common/tcp_proxy/BUILD
@@ -17,10 +17,10 @@ envoy_cc_library(
         "upstream.h",
     ],
     deps = [
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/tcp:upstream_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/tcp:upstream_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:load_balancer_interface",
         "//source/common/http:codec_client_lib",
         "//source/common/http:header_map_lib",
         "//source/common/http:headers_lib",
@@ -39,22 +39,22 @@ envoy_cc_library(
     ],
     deps = [
         ":upstream_lib",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/stats:timespan_interface",
-        "//include/envoy/stream_info:filter_state_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/tcp:upstream_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/router:router_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/stats:timespan_interface",
+        "//envoy/stream_info:filter_state_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/tcp:upstream_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
diff --git a/source/common/tcp_proxy/tcp_proxy.cc b/source/common/tcp_proxy/tcp_proxy.cc
index fb76f6a942c7e..37f71070dd9d2 100644
--- a/source/common/tcp_proxy/tcp_proxy.cc
+++ b/source/common/tcp_proxy/tcp_proxy.cc
@@ -1,4 +1,4 @@
-#include "common/tcp_proxy/tcp_proxy.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
 
 #include <cstdint>
 #include <memory>
@@ -13,22 +13,22 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/network/application_protocol.h"
-#include "common/network/proxy_protocol_filter_state.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_socket_options_filter_state.h"
-#include "common/router/metadatamatchcriteria_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/proxy_protocol_filter_state.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
 
 namespace Envoy {
 namespace TcpProxy {
diff --git a/source/common/tcp_proxy/tcp_proxy.h b/source/common/tcp_proxy/tcp_proxy.h
index 6579995d1340e..e51d3e7ffbcdf 100644
--- a/source/common/tcp_proxy/tcp_proxy.h
+++ b/source/common/tcp_proxy/tcp_proxy.h
@@ -20,14 +20,14 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/logger.h"
-#include "common/network/cidr_range.h"
-#include "common/network/filter_impl.h"
-#include "common/network/hash_policy.h"
-#include "common/network/utility.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/tcp_proxy/upstream.h"
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/network/hash_policy.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/tcp_proxy/upstream.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/common/tcp_proxy/upstream.cc b/source/common/tcp_proxy/upstream.cc
index 25665d290e10b..3e866bf94f830 100644
--- a/source/common/tcp_proxy/upstream.cc
+++ b/source/common/tcp_proxy/upstream.cc
@@ -1,13 +1,13 @@
-#include "common/tcp_proxy/upstream.h"
+#include "source/common/tcp_proxy/upstream.h"
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/codec_client.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace TcpProxy {
diff --git a/source/common/tcp_proxy/upstream.h b/source/common/tcp_proxy/upstream.h
index 1f910edd67960..4da9830209d96 100644
--- a/source/common/tcp_proxy/upstream.h
+++ b/source/common/tcp_proxy/upstream.h
@@ -8,9 +8,9 @@
 #include "envoy/upstream/thread_local_cluster.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/dump_state_utils.h"
-#include "common/http/codec_client.h"
-#include "common/router/header_parser.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/router/header_parser.h"
 
 namespace Envoy {
 namespace TcpProxy {
diff --git a/source/common/thread/BUILD b/source/common/thread/BUILD
index 6f79301e8676b..45ffdec2aa146 100644
--- a/source/common/thread/BUILD
+++ b/source/common/thread/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["terminate_thread.cc"],
     hdrs = ["terminate_thread.h"],
     deps = [
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/common:minimal_logger_lib",
     ],
 )
diff --git a/source/common/thread/terminate_thread.cc b/source/common/thread/terminate_thread.cc
index 435d704e6d249..8ddb9f20edf95 100644
--- a/source/common/thread/terminate_thread.cc
+++ b/source/common/thread/terminate_thread.cc
@@ -1,10 +1,10 @@
-#include "common/thread/terminate_thread.h"
+#include "source/common/thread/terminate_thread.h"
 
 #include <sys/types.h>
 
 #include <csignal>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Thread {
diff --git a/source/common/thread_local/BUILD b/source/common/thread_local/BUILD
index 3892298e00d64..3e1697e397855 100644
--- a/source/common/thread_local/BUILD
+++ b/source/common/thread_local/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     srcs = ["thread_local_impl.cc"],
     hdrs = ["thread_local_impl.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:stl_helpers",
diff --git a/source/common/thread_local/thread_local_impl.cc b/source/common/thread_local/thread_local_impl.cc
index 9bf485419745b..baeade40f0c27 100644
--- a/source/common/thread_local/thread_local_impl.cc
+++ b/source/common/thread_local/thread_local_impl.cc
@@ -1,4 +1,4 @@
-#include "common/thread_local/thread_local_impl.h"
+#include "source/common/thread_local/thread_local_impl.h"
 
 #include <algorithm>
 #include <atomic>
@@ -7,8 +7,8 @@
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/assert.h"
-#include "common/common/stl_helpers.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/stl_helpers.h"
 
 namespace Envoy {
 namespace ThreadLocal {
diff --git a/source/common/thread_local/thread_local_impl.h b/source/common/thread_local/thread_local_impl.h
index c9df63b1e0b85..f7825b66e151f 100644
--- a/source/common/thread_local/thread_local_impl.h
+++ b/source/common/thread_local/thread_local_impl.h
@@ -8,8 +8,8 @@
 
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/logger.h"
-#include "common/common/non_copyable.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/non_copyable.h"
 
 namespace Envoy {
 namespace ThreadLocal {
diff --git a/source/common/tracing/BUILD b/source/common/tracing/BUILD
index 8dce4bdd7b64f..93b6a596fa970 100644
--- a/source/common/tracing/BUILD
+++ b/source/common/tracing/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
         "null_span_impl.h",
     ],
     deps = [
-        "//include/envoy/tracing:trace_driver_interface",
+        "//envoy/tracing:trace_driver_interface",
         "//source/common/common:empty_string",
     ],
 )
@@ -40,12 +40,12 @@ envoy_cc_library(
     deps = [
         ":common_values_lib",
         ":null_span_lib",
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/common:base64_lib",
         "//source/common/common:macros",
@@ -73,7 +73,7 @@ envoy_cc_library(
         "tracer_config_impl.h",
     ],
     deps = [
-        "//include/envoy/server:tracer_config_interface",
+        "//envoy/server:tracer_config_interface",
     ],
 )
 
@@ -86,9 +86,9 @@ envoy_cc_library(
         "http_tracer_manager_impl.h",
     ],
     deps = [
-        "//include/envoy/server:tracer_config_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/tracing:http_tracer_manager_interface",
+        "//envoy/server:tracer_config_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/tracing:http_tracer_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
         "//source/common/tracing:http_tracer_lib",
diff --git a/source/common/tracing/common_values.h b/source/common/tracing/common_values.h
index 41cb3947772f4..8595c959fced2 100644
--- a/source/common/tracing/common_values.h
+++ b/source/common/tracing/common_values.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Tracing {
diff --git a/source/common/tracing/http_tracer_impl.cc b/source/common/tracing/http_tracer_impl.cc
index df9d29b4a72a1..12aeace932b89 100644
--- a/source/common/tracing/http_tracer_impl.cc
+++ b/source/common/tracing/http_tracer_impl.cc
@@ -1,4 +1,4 @@
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include <string>
 
@@ -8,18 +8,18 @@
 #include "envoy/type/metadata/v3/metadata.pb.h"
 #include "envoy/type/tracing/v3/custom_tag.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/utility.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/common/tracing/http_tracer_impl.h b/source/common/tracing/http_tracer_impl.h
index 4c3b733ab0904..6bd0b8e6b6671 100644
--- a/source/common/tracing/http_tracer_impl.h
+++ b/source/common/tracing/http_tracer_impl.h
@@ -13,11 +13,11 @@
 #include "envoy/type/tracing/v3/custom_tag.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/config/metadata.h"
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-#include "common/tracing/common_values.h"
-#include "common/tracing/null_span_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/tracing/common_values.h"
+#include "source/common/tracing/null_span_impl.h"
 
 namespace Envoy {
 namespace Tracing {
diff --git a/source/common/tracing/http_tracer_manager_impl.cc b/source/common/tracing/http_tracer_manager_impl.cc
index e25f5d99ba2d9..e746ff89d6662 100644
--- a/source/common/tracing/http_tracer_manager_impl.cc
+++ b/source/common/tracing/http_tracer_manager_impl.cc
@@ -1,6 +1,6 @@
-#include "common/tracing/http_tracer_manager_impl.h"
+#include "source/common/tracing/http_tracer_manager_impl.h"
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Tracing {
diff --git a/source/common/tracing/http_tracer_manager_impl.h b/source/common/tracing/http_tracer_manager_impl.h
index a4fb18bcbf139..2080e56d00777 100644
--- a/source/common/tracing/http_tracer_manager_impl.h
+++ b/source/common/tracing/http_tracer_manager_impl.h
@@ -4,8 +4,8 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/tracing/http_tracer_manager.h"
 
-#include "common/common/logger.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 namespace Envoy {
 namespace Tracing {
diff --git a/source/common/tracing/null_span_impl.h b/source/common/tracing/null_span_impl.h
index 18677818dfcaa..653147ffd88f0 100644
--- a/source/common/tracing/null_span_impl.h
+++ b/source/common/tracing/null_span_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/tracing/trace_driver.h"
 
-#include "common/common/empty_string.h"
+#include "source/common/common/empty_string.h"
 
 namespace Envoy {
 namespace Tracing {
diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD
index 3ed278bf859e3..901d530d882df 100644
--- a/source/common/upstream/BUILD
+++ b/source/common/upstream/BUILD
@@ -14,9 +14,9 @@ envoy_cc_library(
     srcs = ["cds_api_helper.cc"],
     hdrs = ["cds_api_helper.h"],
     deps = [
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:resource_name_lib",
         "//source/common/protobuf",
@@ -31,10 +31,10 @@ envoy_cc_library(
     hdrs = ["cds_api_impl.h"],
     deps = [
         ":cds_api_helper_lib",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:subscription_base_interface",
         "//source/common/grpc:common_lib",
@@ -54,16 +54,16 @@ envoy_cc_library(
         ":load_stats_reporter_lib",
         ":ring_hash_lb_lib",
         ":subset_lb_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/router:context_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/router:context_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:cleanup_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:utility_lib",
@@ -102,7 +102,7 @@ envoy_cc_library(
     srcs = ["cluster_update_tracker.cc"],
     hdrs = ["cluster_update_tracker.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ],
 )
 
@@ -110,9 +110,9 @@ envoy_cc_library(
     name = "conn_pool_map",
     hdrs = ["conn_pool_map.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/upstream:resource_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/upstream:resource_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:debug_recursion_checker_lib",
     ],
 )
@@ -130,9 +130,9 @@ envoy_cc_library(
     hdrs = ["priority_conn_pool_map.h"],
     deps = [
         ":conn_pool_map",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/upstream:resource_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/upstream:resource_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:debug_recursion_checker_lib",
     ],
 )
@@ -157,7 +157,7 @@ envoy_cc_library(
     srcs = ["health_checker_base_impl.cc"],
     hdrs = ["health_checker_base_impl.h"],
     deps = [
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/upstream:health_checker_interface",
         "//source/common/router:router_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/data/core/v3:pkg_cc_proto",
@@ -178,7 +178,7 @@ envoy_cc_library(
         "@envoy_api//envoy/data/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
         # TODO(dio): Remove dependency to server.
-        "//include/envoy/server:health_checker_config_interface",
+        "//envoy/server:health_checker_config_interface",
         "//source/common/grpc:codec_lib",
         "//source/common/http:codec_client_lib",
         "//source/common/upstream:host_utility_lib",
@@ -189,7 +189,7 @@ envoy_cc_library(
     name = "host_utility_lib",
     srcs = ["host_utility.cc"],
     hdrs = ["host_utility.h"],
-    deps = ["//include/envoy/upstream:upstream_interface"],
+    deps = ["//envoy/upstream:upstream_interface"],
 )
 
 envoy_cc_library(
@@ -198,11 +198,11 @@ envoy_cc_library(
     hdrs = ["load_balancer_impl.h"],
     deps = [
         ":edf_scheduler_lib",
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/runtime:runtime_protos_lib",
@@ -215,9 +215,9 @@ envoy_cc_library(
     srcs = ["load_stats_reporter.cc"],
     hdrs = ["load_stats_reporter.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:version_converter_lib",
         "//source/common/grpc:async_client_lib",
@@ -243,14 +243,14 @@ envoy_cc_library(
         ":health_checker_lib",
         ":locality_endpoint_lib",
         ":upstream_includes",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:backoff_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
@@ -286,7 +286,7 @@ envoy_cc_library(
         ":cluster_factory_lib",
         ":logical_host_lib",
         ":upstream_includes",
-        "//include/envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_factory_interface",
         "//source/common/common:empty_string",
         "//source/common/config:utility_lib",
         "//source/common/network:address_lib",
@@ -306,8 +306,8 @@ envoy_cc_library(
     deps = [
         ":cluster_factory_lib",
         ":upstream_includes",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/upstream:cluster_factory_interface",
         "//source/common/common:empty_string",
         "//source/common/network:address_lib",
         "//source/common/network:utility_lib",
@@ -322,12 +322,12 @@ envoy_cc_library(
     srcs = ["outlier_detection_impl.cc"],
     hdrs = ["outlier_detection_impl.h"],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:outlier_detection_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:outlier_detection_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
         "//source/common/http:codes_lib",
@@ -341,9 +341,9 @@ envoy_cc_library(
     name = "resource_manager_lib",
     hdrs = ["resource_manager_impl.h"],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:resource_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:resource_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:basic_resource_lib",
     ],
@@ -395,13 +395,13 @@ envoy_cc_library(
     deps = [
         ":cluster_factory_lib",
         ":upstream_includes",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_factory_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:locality_lib",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_factory_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:locality_lib",
         "//source/common/config:api_version_lib",
         "//source/common/config:decoded_resource_lib",
         "//source/common/config:metadata_lib",
@@ -430,8 +430,8 @@ envoy_cc_library(
         ":maglev_lb_lib",
         ":ring_hash_lb_lib",
         ":upstream_lib",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:load_balancer_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:metadata_lib",
@@ -458,12 +458,12 @@ envoy_cc_library(
         "@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",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/upstream:health_checker_interface",
         "//source/common/common:enum_to_int",
         "//source/common/common:thread_lib",
         "//source/common/common:utility_lib",
@@ -532,19 +532,19 @@ envoy_cc_library(
         ":load_balancer_lib",
         ":outlier_detection_lib",
         ":resource_manager_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:health_checker_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:locality_lib",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:health_checker_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:locality_lib",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:minimal_logger_lib",
@@ -572,12 +572,12 @@ envoy_cc_library(
         ":cluster_factory_includes",
         ":health_checker_lib",
         ":upstream_includes",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/upstream:health_checker_interface",
         "//source/common/common:enum_to_int",
         "//source/common/common:utility_lib",
         "//source/common/http:utility_lib",
@@ -600,19 +600,19 @@ envoy_cc_library(
         ":outlier_detection_lib",
         ":resource_manager_lib",
         ":upstream_includes",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:health_checker_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:locality_lib",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:health_checker_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:locality_lib",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:minimal_logger_lib",
diff --git a/source/common/upstream/cds_api_helper.cc b/source/common/upstream/cds_api_helper.cc
index a5a860078f08c..c75b1526d2f08 100644
--- a/source/common/upstream/cds_api_helper.cc
+++ b/source/common/upstream/cds_api_helper.cc
@@ -1,12 +1,12 @@
-#include "common/upstream/cds_api_helper.h"
+#include "source/common/upstream/cds_api_helper.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/config/grpc_mux.h"
 
-#include "common/common/fmt.h"
-#include "common/config/resource_name.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/resource_name.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/common/upstream/cds_api_helper.h b/source/common/upstream/cds_api_helper.h
index a7a91c4ebe46a..17384a6fb6025 100644
--- a/source/common/upstream/cds_api_helper.h
+++ b/source/common/upstream/cds_api_helper.h
@@ -6,8 +6,8 @@
 #include "envoy/config/subscription.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/cds_api_impl.cc b/source/common/upstream/cds_api_impl.cc
index e442c72b613af..3c9d8ab46b6dc 100644
--- a/source/common/upstream/cds_api_impl.cc
+++ b/source/common/upstream/cds_api_impl.cc
@@ -1,7 +1,7 @@
-#include "common/upstream/cds_api_impl.h"
+#include "source/common/upstream/cds_api_impl.h"
 
-#include "common/common/assert.h"
-#include "common/grpc/common.h"
+#include "source/common/common/assert.h"
+#include "source/common/grpc/common.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/common/upstream/cds_api_impl.h b/source/common/upstream/cds_api_impl.h
index ef88890b58862..63ca584eb06db 100644
--- a/source/common/upstream/cds_api_impl.h
+++ b/source/common/upstream/cds_api_impl.h
@@ -12,9 +12,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/config/subscription_base.h"
-#include "common/protobuf/protobuf.h"
-#include "common/upstream/cds_api_helper.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/upstream/cds_api_helper.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/cluster_factory_impl.cc b/source/common/upstream/cluster_factory_impl.cc
index 0feb94bd64430..ab599bd092b66 100644
--- a/source/common/upstream/cluster_factory_impl.cc
+++ b/source/common/upstream/cluster_factory_impl.cc
@@ -1,15 +1,14 @@
-#include "common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/server/options.h"
 
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/upstream/health_checker_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/cluster_factory_impl.h b/source/common/upstream/cluster_factory_impl.h
index c284e808a2fcf..acae527f57268 100644
--- a/source/common/upstream/cluster_factory_impl.h
+++ b/source/common/upstream/cluster_factory_impl.h
@@ -30,19 +30,19 @@
 #include "envoy/upstream/locality.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/config/metadata.h"
-#include "common/config/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/outlier_detection_impl.h"
-#include "common/upstream/resource_manager_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/outlier_detection_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc
index 717c5f2b95e3d..4ffb69b48f545 100644
--- a/source/common/upstream/cluster_manager_impl.cc
+++ b/source/common/upstream/cluster_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/cluster_manager_impl.h"
+#include "source/common/upstream/cluster_manager_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -17,37 +17,37 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/new_grpc_mux_impl.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/config/xds_resource.h"
-#include "common/grpc/async_client_manager_impl.h"
-#include "common/http/async_client_impl.h"
-#include "common/http/http1/conn_pool.h"
-#include "common/http/http2/conn_pool.h"
-#include "common/http/mixed_conn_pool.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/router/shadow_writer_impl.h"
-#include "common/runtime/runtime_features.h"
-#include "common/tcp/conn_pool.h"
-#include "common/tcp/original_conn_pool.h"
-#include "common/upstream/cds_api_impl.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/maglev_lb.h"
-#include "common/upstream/original_dst_cluster.h"
-#include "common/upstream/priority_conn_pool_map_impl.h"
-#include "common/upstream/ring_hash_lb.h"
-#include "common/upstream/subset_lb.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/new_grpc_mux_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/grpc/async_client_manager_impl.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/http/http1/conn_pool.h"
+#include "source/common/http/http2/conn_pool.h"
+#include "source/common/http/mixed_conn_pool.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/shadow_writer_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/tcp/conn_pool.h"
+#include "source/common/tcp/original_conn_pool.h"
+#include "source/common/upstream/cds_api_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/maglev_lb.h"
+#include "source/common/upstream/original_dst_cluster.h"
+#include "source/common/upstream/priority_conn_pool_map_impl.h"
+#include "source/common/upstream/ring_hash_lb.h"
+#include "source/common/upstream/subset_lb.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/http/conn_pool_grid.h"
-#include "common/http/http3/conn_pool.h"
+#include "source/common/http/conn_pool_grid.h"
+#include "source/common/http/http3/conn_pool.h"
 #endif
 
 namespace Envoy {
diff --git a/source/common/upstream/cluster_manager_impl.h b/source/common/upstream/cluster_manager_impl.h
index 9192e7cdcd528..18073d43a00df 100644
--- a/source/common/upstream/cluster_manager_impl.h
+++ b/source/common/upstream/cluster_manager_impl.h
@@ -26,15 +26,15 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/cleanup.h"
-#include "common/config/grpc_mux_impl.h"
-#include "common/config/subscription_factory_impl.h"
-#include "common/http/alternate_protocols_cache_impl.h"
-#include "common/http/alternate_protocols_cache_manager_impl.h"
-#include "common/http/async_client_impl.h"
-#include "common/upstream/load_stats_reporter.h"
-#include "common/upstream/priority_conn_pool_map.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/config/subscription_factory_impl.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
+#include "source/common/http/alternate_protocols_cache_manager_impl.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/upstream/load_stats_reporter.h"
+#include "source/common/upstream/priority_conn_pool_map.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/cluster_update_tracker.cc b/source/common/upstream/cluster_update_tracker.cc
index 5a591f1774697..15eefc0d2ca5f 100644
--- a/source/common/upstream/cluster_update_tracker.cc
+++ b/source/common/upstream/cluster_update_tracker.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/cluster_update_tracker.h"
+#include "source/common/upstream/cluster_update_tracker.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/conn_pool_map.h b/source/common/upstream/conn_pool_map.h
index 041f619e0bfab..0b5f61cb6eaf8 100644
--- a/source/common/upstream/conn_pool_map.h
+++ b/source/common/upstream/conn_pool_map.h
@@ -7,7 +7,7 @@
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/debug_recursion_checker.h"
+#include "source/common/common/debug_recursion_checker.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/common/upstream/conn_pool_map_impl.h b/source/common/upstream/conn_pool_map_impl.h
index c0daca8ef37a8..b183f9d438bb7 100644
--- a/source/common/upstream/conn_pool_map_impl.h
+++ b/source/common/upstream/conn_pool_map_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/upstream/conn_pool_map.h"
+#include "source/common/upstream/conn_pool_map.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/edf_scheduler.h b/source/common/upstream/edf_scheduler.h
index 2f91d0e5cbedf..eaac9f08857a0 100644
--- a/source/common/upstream/edf_scheduler.h
+++ b/source/common/upstream/edf_scheduler.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <queue>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/eds.cc b/source/common/upstream/eds.cc
index 57fe03e3de329..c8ea0bb333487 100644
--- a/source/common/upstream/eds.cc
+++ b/source/common/upstream/eds.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/eds.h"
+#include "source/common/upstream/eds.h"
 
 #include "envoy/api/v2/endpoint.pb.h"
 #include "envoy/common/exception.h"
@@ -6,11 +6,11 @@
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/config/api_version.h"
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/version_converter.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/version_converter.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/eds.h b/source/common/upstream/eds.h
index 314516cb49110..45469661df798 100644
--- a/source/common/upstream/eds.h
+++ b/source/common/upstream/eds.h
@@ -15,9 +15,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/locality.h"
 
-#include "common/config/subscription_base.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/health_checker_base_impl.cc b/source/common/upstream/health_checker_base_impl.cc
index c396402a118c1..b82058cf2aadd 100644
--- a/source/common/upstream/health_checker_base_impl.cc
+++ b/source/common/upstream/health_checker_base_impl.cc
@@ -1,12 +1,12 @@
-#include "common/upstream/health_checker_base_impl.h"
+#include "source/common/upstream/health_checker_base_impl.h"
 
 #include "envoy/config/core/v3/address.pb.h"
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/data/core/v3/health_check_event.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/utility.h"
-#include "common/router/router.h"
+#include "source/common/network/utility.h"
+#include "source/common/router/router.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/health_checker_base_impl.h b/source/common/upstream/health_checker_base_impl.h
index 4053cd3f623d6..5081aac7351d2 100644
--- a/source/common/upstream/health_checker_base_impl.h
+++ b/source/common/upstream/health_checker_base_impl.h
@@ -11,9 +11,9 @@
 #include "envoy/type/matcher/string.pb.h"
 #include "envoy/upstream/health_checker.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/network/transport_socket_options_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/network/transport_socket_options_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc
index 608c02e2b7a22..2859e58767584 100644
--- a/source/common/upstream/health_checker_impl.cc
+++ b/source/common/upstream/health_checker_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/health_checker_impl.h"
+#include "source/common/upstream/health_checker_impl.h"
 
 #include <memory>
 
@@ -8,21 +8,21 @@
 #include "envoy/type/v3/http.pb.h"
 #include "envoy/type/v3/range.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/macros.h"
-#include "common/config/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_impl.h"
-#include "common/network/utility.h"
-#include "common/router/router.h"
-#include "common/runtime/runtime_features.h"
-#include "common/upstream/host_utility.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/macros.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/router/router.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/upstream/host_utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/upstream/health_checker_impl.h b/source/common/upstream/health_checker_impl.h
index fdc337d142f6d..ec3b615ea5abe 100644
--- a/source/common/upstream/health_checker_impl.h
+++ b/source/common/upstream/health_checker_impl.h
@@ -10,13 +10,13 @@
 #include "envoy/type/v3/http.pb.h"
 #include "envoy/type/v3/range.pb.h"
 
-#include "common/common/dump_state_utils.h"
-#include "common/common/logger.h"
-#include "common/grpc/codec.h"
-#include "common/http/codec_client.h"
-#include "common/router/header_parser.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/upstream/health_checker_base_impl.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/upstream/health_checker_base_impl.h"
 
 #include "src/proto/grpc/health/v1/health.pb.h"
 
diff --git a/source/common/upstream/health_discovery_service.cc b/source/common/upstream/health_discovery_service.cc
index 01a171c3ef1d9..c9f5a58649582 100644
--- a/source/common/upstream/health_discovery_service.cc
+++ b/source/common/upstream/health_discovery_service.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/health_discovery_service.h"
+#include "source/common/upstream/health_discovery_service.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/address.pb.h"
@@ -9,11 +9,11 @@
 #include "envoy/service/health/v3/hds.pb.validate.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/version_converter.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/health_discovery_service.h b/source/common/upstream/health_discovery_service.h
index e943efe63fe41..dd9b37722ee4f 100644
--- a/source/common/upstream/health_discovery_service.h
+++ b/source/common/upstream/health_discovery_service.h
@@ -11,17 +11,16 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/common/logger.h"
-#include "common/common/macros.h"
-#include "common/config/utility.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/network/resolver_impl.h"
-#include "common/upstream/health_checker_impl.h"
-#include "common/upstream/locality_endpoint.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/common/upstream/locality_endpoint.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/common/upstream/host_utility.cc b/source/common/upstream/host_utility.cc
index 10df4ae94029c..7a09ee9dc0299 100644
--- a/source/common/upstream/host_utility.cc
+++ b/source/common/upstream/host_utility.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/host_utility.h"
+#include "source/common/upstream/host_utility.h"
 
 #include <string>
 
diff --git a/source/common/upstream/load_balancer_impl.cc b/source/common/upstream/load_balancer_impl.cc
index 6278a4ab39dcd..47db0423169e5 100644
--- a/source/common/upstream/load_balancer_impl.cc
+++ b/source/common/upstream/load_balancer_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include <cstdint>
 #include <memory>
@@ -9,8 +9,8 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/common/upstream/load_balancer_impl.h b/source/common/upstream/load_balancer_impl.h
index db9f815dce0e4..330fc14be3d5d 100644
--- a/source/common/upstream/load_balancer_impl.h
+++ b/source/common/upstream/load_balancer_impl.h
@@ -14,9 +14,9 @@
 #include "envoy/upstream/load_balancer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_protos.h"
-#include "common/upstream/edf_scheduler.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/common/upstream/edf_scheduler.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/load_stats_reporter.cc b/source/common/upstream/load_stats_reporter.cc
index 9edf4e318a273..3b3f1bd06d08e 100644
--- a/source/common/upstream/load_stats_reporter.cc
+++ b/source/common/upstream/load_stats_reporter.cc
@@ -1,10 +1,10 @@
-#include "common/upstream/load_stats_reporter.h"
+#include "source/common/upstream/load_stats_reporter.h"
 
 #include "envoy/service/load_stats/v3/lrs.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/version_converter.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/load_stats_reporter.h b/source/common/upstream/load_stats_reporter.h
index d656ad0cf6e3e..97302ad1223f2 100644
--- a/source/common/upstream/load_stats_reporter.h
+++ b/source/common/upstream/load_stats_reporter.h
@@ -6,9 +6,9 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/grpc/typed_async_client.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/grpc/typed_async_client.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/locality_endpoint.h b/source/common/upstream/locality_endpoint.h
index a928cbde3ad0b..295110bf1e0ff 100644
--- a/source/common/upstream/locality_endpoint.h
+++ b/source/common/upstream/locality_endpoint.h
@@ -3,7 +3,7 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc
index c0a3433f49f9e..7424ba44fbb53 100644
--- a/source/common/upstream/logical_dns_cluster.cc
+++ b/source/common/upstream/logical_dns_cluster.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/logical_dns_cluster.h"
+#include "source/common/upstream/logical_dns_cluster.h"
 
 #include <chrono>
 #include <list>
@@ -12,12 +12,12 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h
index 443523c53e2fb..b2d13cbc9b515 100644
--- a/source/common/upstream/logical_dns_cluster.h
+++ b/source/common/upstream/logical_dns_cluster.h
@@ -10,10 +10,10 @@
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/empty_string.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/logical_host.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/logical_host.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/logical_host.cc b/source/common/upstream/logical_host.cc
index 302b125cc18e7..6fe30a3498936 100644
--- a/source/common/upstream/logical_host.cc
+++ b/source/common/upstream/logical_host.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/logical_host.h"
+#include "source/common/upstream/logical_host.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/logical_host.h b/source/common/upstream/logical_host.h
index ae2efb3ebb45a..68d6ca0b66dd4 100644
--- a/source/common/upstream/logical_host.h
+++ b/source/common/upstream/logical_host.h
@@ -4,7 +4,7 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/maglev_lb.cc b/source/common/upstream/maglev_lb.cc
index bf542bf788791..7617853725d06 100644
--- a/source/common/upstream/maglev_lb.cc
+++ b/source/common/upstream/maglev_lb.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/maglev_lb.h"
+#include "source/common/upstream/maglev_lb.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
diff --git a/source/common/upstream/maglev_lb.h b/source/common/upstream/maglev_lb.h
index 3f80b842d4744..d2c4ed58109bd 100644
--- a/source/common/upstream/maglev_lb.h
+++ b/source/common/upstream/maglev_lb.h
@@ -5,8 +5,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/upstream/thread_aware_lb_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/thread_aware_lb_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/original_dst_cluster.cc b/source/common/upstream/original_dst_cluster.cc
index 22313edebe5d0..6ab8ed4db7599 100644
--- a/source/common/upstream/original_dst_cluster.cc
+++ b/source/common/upstream/original_dst_cluster.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/original_dst_cluster.h"
+#include "source/common/upstream/original_dst_cluster.h"
 
 #include <chrono>
 #include <list>
@@ -11,11 +11,11 @@
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/http/headers.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/original_dst_cluster.h b/source/common/upstream/original_dst_cluster.h
index 36bdfe8af455d..2ee8eceac5018 100644
--- a/source/common/upstream/original_dst_cluster.h
+++ b/source/common/upstream/original_dst_cluster.h
@@ -10,10 +10,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/outlier_detection_impl.cc b/source/common/upstream/outlier_detection_impl.cc
index 4532c6c43ca81..bbf52ae4bc615 100644
--- a/source/common/upstream/outlier_detection_impl.cc
+++ b/source/common/upstream/outlier_detection_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/outlier_detection_impl.h"
+#include "source/common/upstream/outlier_detection_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -12,12 +12,12 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/http/codes.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/priority_conn_pool_map.h b/source/common/upstream/priority_conn_pool_map.h
index 92b17174170da..18ce2c52eb959 100644
--- a/source/common/upstream/priority_conn_pool_map.h
+++ b/source/common/upstream/priority_conn_pool_map.h
@@ -4,7 +4,7 @@
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/upstream/conn_pool_map.h"
+#include "source/common/upstream/conn_pool_map.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/priority_conn_pool_map_impl.h b/source/common/upstream/priority_conn_pool_map_impl.h
index 8ece04d0272e0..b1cb6f8c54d12 100644
--- a/source/common/upstream/priority_conn_pool_map_impl.h
+++ b/source/common/upstream/priority_conn_pool_map_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/upstream/conn_pool_map_impl.h"
-#include "common/upstream/priority_conn_pool_map.h"
+#include "source/common/upstream/conn_pool_map_impl.h"
+#include "source/common/upstream/priority_conn_pool_map.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/resource_manager_impl.h b/source/common/upstream/resource_manager_impl.h
index 4cbf371daf1da..1609273568d2d 100644
--- a/source/common/upstream/resource_manager_impl.h
+++ b/source/common/upstream/resource_manager_impl.h
@@ -10,8 +10,8 @@
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/basic_resource_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/basic_resource_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/ring_hash_lb.cc b/source/common/upstream/ring_hash_lb.cc
index bbdcec520def0..567ea6b300d0e 100644
--- a/source/common/upstream/ring_hash_lb.cc
+++ b/source/common/upstream/ring_hash_lb.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/ring_hash_lb.h"
+#include "source/common/upstream/ring_hash_lb.h"
 
 #include <cstdint>
 #include <iostream>
@@ -7,8 +7,8 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/common/assert.h"
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "absl/container/inlined_vector.h"
 #include "absl/strings/string_view.h"
diff --git a/source/common/upstream/ring_hash_lb.h b/source/common/upstream/ring_hash_lb.h
index 2f6dc03ab5636..3369a7ba635a1 100644
--- a/source/common/upstream/ring_hash_lb.h
+++ b/source/common/upstream/ring_hash_lb.h
@@ -7,8 +7,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-#include "common/upstream/thread_aware_lb_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/thread_aware_lb_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/static_cluster.cc b/source/common/upstream/static_cluster.cc
index 12fa3999b5524..e6044f91aa019 100644
--- a/source/common/upstream/static_cluster.cc
+++ b/source/common/upstream/static_cluster.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/static_cluster.h"
+#include "source/common/upstream/static_cluster.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
diff --git a/source/common/upstream/static_cluster.h b/source/common/upstream/static_cluster.h
index 0354f1f7df4fd..a6c710ac6aec6 100644
--- a/source/common/upstream/static_cluster.h
+++ b/source/common/upstream/static_cluster.h
@@ -2,8 +2,8 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/strict_dns_cluster.cc b/source/common/upstream/strict_dns_cluster.cc
index 726070b6389b7..8eb57bf2ba2e8 100644
--- a/source/common/upstream/strict_dns_cluster.cc
+++ b/source/common/upstream/strict_dns_cluster.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/strict_dns_cluster.h"
+#include "source/common/upstream/strict_dns_cluster.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
diff --git a/source/common/upstream/strict_dns_cluster.h b/source/common/upstream/strict_dns_cluster.h
index 2c12344cf5a99..6be3a83f436ec 100644
--- a/source/common/upstream/strict_dns_cluster.h
+++ b/source/common/upstream/strict_dns_cluster.h
@@ -3,8 +3,8 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/subset_lb.cc b/source/common/upstream/subset_lb.cc
index 65fc2d241c6a6..95cbf16af8cb4 100644
--- a/source/common/upstream/subset_lb.cc
+++ b/source/common/upstream/subset_lb.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/subset_lb.h"
+#include "source/common/upstream/subset_lb.h"
 
 #include <memory>
 
@@ -6,13 +6,13 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/common/assert.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/maglev_lb.h"
-#include "common/upstream/ring_hash_lb.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/maglev_lb.h"
+#include "source/common/upstream/ring_hash_lb.h"
 
 #include "absl/container/node_hash_set.h"
 
diff --git a/source/common/upstream/subset_lb.h b/source/common/upstream/subset_lb.h
index 87b08ae115b88..c84c572d78baf 100644
--- a/source/common/upstream/subset_lb.h
+++ b/source/common/upstream/subset_lb.h
@@ -10,10 +10,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/load_balancer.h"
 
-#include "common/common/macros.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/common/upstream/thread_aware_lb_impl.cc b/source/common/upstream/thread_aware_lb_impl.cc
index 1a4141fb85c86..888f63a3789f3 100644
--- a/source/common/upstream/thread_aware_lb_impl.cc
+++ b/source/common/upstream/thread_aware_lb_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/thread_aware_lb_impl.h"
+#include "source/common/upstream/thread_aware_lb_impl.h"
 
 #include <memory>
 #include <random>
diff --git a/source/common/upstream/thread_aware_lb_impl.h b/source/common/upstream/thread_aware_lb_impl.h
index 97895e8e2d858..38c04e99b5019 100644
--- a/source/common/upstream/thread_aware_lb_impl.h
+++ b/source/common/upstream/thread_aware_lb_impl.h
@@ -3,10 +3,10 @@
 #include "envoy/common/callback.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/common/logger.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/common/upstream/transport_socket_match_impl.cc b/source/common/upstream/transport_socket_match_impl.cc
index 7d425dd4a53c7..57e8f140a94b2 100644
--- a/source/common/upstream/transport_socket_match_impl.cc
+++ b/source/common/upstream/transport_socket_match_impl.cc
@@ -1,10 +1,10 @@
-#include "common/upstream/transport_socket_match_impl.h"
+#include "source/common/upstream/transport_socket_match_impl.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/transport_socket_match_impl.h b/source/common/upstream/transport_socket_match_impl.h
index f3fb2ab173e40..83ffb41774c91 100644
--- a/source/common/upstream/transport_socket_match_impl.h
+++ b/source/common/upstream/transport_socket_match_impl.h
@@ -11,10 +11,10 @@
 #include "envoy/upstream/host_description.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/logger.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc
index a4dbd0eeb21a7..d710972e00311 100644
--- a/source/common/upstream/upstream_impl.cc
+++ b/source/common/upstream/upstream_impl.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -28,30 +28,28 @@
 #include "envoy/upstream/health_checker.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/upstream/eds.h"
-#include "common/upstream/health_checker_impl.h"
-#include "common/upstream/logical_dns_cluster.h"
-#include "common/upstream/original_dst_cluster.h"
-
-#include "server/transport_socket_config_impl.h"
-
-#include "extensions/filters/network/common/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/upstream/eds.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/common/upstream/logical_dns_cluster.h"
+#include "source/common/upstream/original_dst_cluster.h"
+#include "source/extensions/filters/network/common/utility.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/common/upstream/upstream_impl.h b/source/common/upstream/upstream_impl.h
index 18c8d8ce832da..52f5731db50c2 100644
--- a/source/common/upstream/upstream_impl.h
+++ b/source/common/upstream/upstream_impl.h
@@ -37,27 +37,25 @@
 #include "envoy/upstream/locality.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/http3/codec_stats.h"
-#include "common/init/manager_impl.h"
-#include "common/network/utility.h"
-#include "common/shared_pool/shared_pool.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/outlier_detection_impl.h"
-#include "common/upstream/resource_manager_impl.h"
-#include "common/upstream/transport_socket_match_impl.h"
-
-#include "server/transport_socket_config_impl.h"
-
-#include "extensions/upstreams/http/config.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/http3/codec_stats.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/shared_pool/shared_pool.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/outlier_detection_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
+#include "source/common/upstream/transport_socket_match_impl.h"
+#include "source/extensions/upstreams/http/config.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/common/version/api_version.h b/source/common/version/api_version.h
index 10681596c44e1..38e36a20f0f55 100644
--- a/source/common/version/api_version.h
+++ b/source/common/version/api_version.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "common/version/api_version_struct.h"
+#include "source/common/version/api_version_struct.h"
 
 // Defines the ApiVersion current version (Envoy::api_version), and oldest
 // version (Envoy::oldest_api_version).
-#include "common/version/api_version_number.h"
+#include "source/common/version/api_version_number.h"
 
 namespace Envoy {
 
diff --git a/source/common/version/version.cc b/source/common/version/version.cc
index f1d80c8e19e4b..1d0b3ff7d05b2 100644
--- a/source/common/version/version.cc
+++ b/source/common/version/version.cc
@@ -1,12 +1,12 @@
-#include "common/version/version.h"
+#include "source/common/version/version.h"
 
 #include <map>
 #include <regex>
 #include <string>
 
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
diff --git a/source/common/version/version.h b/source/common/version/version.h
index 345ef2714c066..a1ed1a5e2d200 100644
--- a/source/common/version/version.h
+++ b/source/common/version/version.h
@@ -4,8 +4,8 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/singleton/const_singleton.h"
-#include "common/version/version_number.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/common/version/version_number.h"
 
 namespace Envoy {
 
diff --git a/source/common/watchdog/BUILD b/source/common/watchdog/BUILD
index db6b6162ba75d..21fbfd3302ce5 100644
--- a/source/common/watchdog/BUILD
+++ b/source/common/watchdog/BUILD
@@ -13,9 +13,9 @@ envoy_cc_library(
     srcs = ["abort_action.cc"],
     hdrs = ["abort_action.h"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/server:guarddog_config_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/common:time_interface",
+        "//envoy/server:guarddog_config_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/common:assert_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/thread:terminate_thread_lib",
@@ -29,7 +29,7 @@ envoy_cc_library(
     hdrs = ["abort_action_config.h"],
     deps = [
         ":abort_action_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/protobuf",
         "//source/common/protobuf:message_validator_lib",
diff --git a/source/common/watchdog/abort_action.cc b/source/common/watchdog/abort_action.cc
index d629b0bce70ea..daa405fdda249 100644
--- a/source/common/watchdog/abort_action.cc
+++ b/source/common/watchdog/abort_action.cc
@@ -1,12 +1,12 @@
-#include "common/watchdog/abort_action.h"
+#include "source/common/watchdog/abort_action.h"
 
 #include "envoy/thread/thread.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/protobuf/utility.h"
-#include "common/thread/terminate_thread.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/thread/terminate_thread.h"
 
 namespace Envoy {
 namespace Watchdog {
diff --git a/source/common/watchdog/abort_action_config.cc b/source/common/watchdog/abort_action_config.cc
index 916864386ace2..ad775743598a8 100644
--- a/source/common/watchdog/abort_action_config.cc
+++ b/source/common/watchdog/abort_action_config.cc
@@ -1,10 +1,10 @@
-#include "common/watchdog/abort_action_config.h"
+#include "source/common/watchdog/abort_action_config.h"
 
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/watchdog/abort_action.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/watchdog/abort_action.h"
 
 namespace Envoy {
 namespace Watchdog {
diff --git a/source/common/watchdog/abort_action_config.h b/source/common/watchdog/abort_action_config.h
index 27f65ea16b609..54f2169bf15f6 100644
--- a/source/common/watchdog/abort_action_config.h
+++ b/source/common/watchdog/abort_action_config.h
@@ -3,7 +3,7 @@
 #include "envoy/server/guarddog_config.h"
 #include "envoy/watchdog/v3alpha/abort_action.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Watchdog {
diff --git a/source/exe/BUILD b/source/exe/BUILD
index f7ac0c912ff5b..f3fb551eb83ab 100644
--- a/source/exe/BUILD
+++ b/source/exe/BUILD
@@ -111,7 +111,7 @@ envoy_cc_library(
         ":envoy_common_with_core_extensions_lib",
         ":platform_impl_lib",
         ":process_wide_lib",
-        "//include/envoy/server:platform_interface",
+        "//envoy/server:platform_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:compiler_requirements_lib",
         "//source/common/common:perf_annotation_lib",
@@ -151,7 +151,7 @@ envoy_cc_library(
     name = "platform_header_lib",
     hdrs = ["platform_impl.h"],
     deps = [
-        "//include/envoy/server:platform_interface",
+        "//envoy/server:platform_interface",
     ],
 )
 
@@ -203,6 +203,7 @@ envoy_cc_library(
         ],
         "//conditions:default": [],
     }),
+    include_prefix = "source/exe",
     strip_include_prefix = select({
         "//bazel:windows_x86_64": "win32",
         "//conditions:default": "",
diff --git a/source/exe/linux/platform_impl.cc b/source/exe/linux/platform_impl.cc
index 60e2ae80914ab..a1c04243eb773 100644
--- a/source/exe/linux/platform_impl.cc
+++ b/source/exe/linux/platform_impl.cc
@@ -4,10 +4,9 @@
 
 #include <sys/prctl.h>
 
-#include "common/common/thread_impl.h"
-#include "common/filesystem/filesystem_impl.h"
-
-#include "exe/platform_impl.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/filesystem/filesystem_impl.h"
+#include "source/exe/platform_impl.h"
 
 namespace Envoy {
 
diff --git a/source/exe/main.cc b/source/exe/main.cc
index 0737d3e1d22e8..d1c1ba8d40a94 100644
--- a/source/exe/main.cc
+++ b/source/exe/main.cc
@@ -1,7 +1,7 @@
-#include "exe/main_common.h"
+#include "source/exe/main_common.h"
 
 #ifdef WIN32
-#include "exe/service_base.h"
+#include "source/exe/service_base.h"
 #endif
 
 // NOLINT(namespace-envoy)
diff --git a/source/exe/main_common.cc b/source/exe/main_common.cc
index 2051c22b0a510..2db8fca337e36 100644
--- a/source/exe/main_common.cc
+++ b/source/exe/main_common.cc
@@ -1,4 +1,4 @@
-#include "exe/main_common.h"
+#include "source/exe/main_common.h"
 
 #include <fstream>
 #include <iostream>
@@ -7,26 +7,24 @@
 
 #include "envoy/config/listener/v3/listener.pb.h"
 
-#include "common/common/compiler_requirements.h"
-#include "common/common/logger.h"
-#include "common/common/perf_annotation.h"
-#include "common/network/utility.h"
-#include "common/stats/thread_local_store.h"
-
-#include "exe/platform_impl.h"
-
-#include "server/config_validation/server.h"
-#include "server/drain_manager_impl.h"
-#include "server/hot_restart_nop_impl.h"
-#include "server/listener_hooks.h"
-#include "server/options_impl.h"
-#include "server/server.h"
+#include "source/common/common/compiler_requirements.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/perf_annotation.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/exe/platform_impl.h"
+#include "source/server/config_validation/server.h"
+#include "source/server/drain_manager_impl.h"
+#include "source/server/hot_restart_nop_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/options_impl.h"
+#include "source/server/server.h"
 
 #include "absl/debugging/symbolize.h"
 #include "absl/strings/str_split.h"
 
 #ifdef ENVOY_HOT_RESTART
-#include "server/hot_restart_impl.h"
+#include "source/server/hot_restart_impl.h"
 #endif
 
 namespace Envoy {
diff --git a/source/exe/main_common.h b/source/exe/main_common.h
index 60ef44d42997a..d61ecdac4ee06 100644
--- a/source/exe/main_common.h
+++ b/source/exe/main_common.h
@@ -4,22 +4,20 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/server/platform.h"
 
-#include "common/common/thread.h"
-#include "common/event/real_time_system.h"
-#include "common/grpc/google_grpc_context.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/thread_local/thread_local_impl.h"
-
-#include "exe/process_wide.h"
-
-#include "server/listener_hooks.h"
-#include "server/options_impl.h"
-#include "server/server.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/real_time_system.h"
+#include "source/common/grpc/google_grpc_context.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/exe/process_wide.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/options_impl.h"
+#include "source/server/server.h"
 
 #ifdef ENVOY_HANDLE_SIGNALS
-#include "common/signal/signal_action.h"
-#include "exe/terminate_handler.h"
+#include "source/common/signal/signal_action.h"
+#include "source/exe/terminate_handler.h"
 #endif
 
 namespace Envoy {
diff --git a/source/exe/posix/platform_impl.cc b/source/exe/posix/platform_impl.cc
index 730280c4bd960..391d3be940ae2 100644
--- a/source/exe/posix/platform_impl.cc
+++ b/source/exe/posix/platform_impl.cc
@@ -1,7 +1,6 @@
-#include "common/common/thread_impl.h"
-#include "common/filesystem/filesystem_impl.h"
-
-#include "exe/platform_impl.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/filesystem/filesystem_impl.h"
+#include "source/exe/platform_impl.h"
 
 namespace Envoy {
 
diff --git a/source/exe/process_wide.cc b/source/exe/process_wide.cc
index 219921c081bbc..48512525bc5f5 100644
--- a/source/exe/process_wide.cc
+++ b/source/exe/process_wide.cc
@@ -1,10 +1,9 @@
-#include "exe/process_wide.h"
+#include "source/exe/process_wide.h"
 
-#include "common/common/assert.h"
-#include "common/event/libevent.h"
-#include "common/http/http2/nghttp2.h"
-
-#include "server/proto_descriptors.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/libevent.h"
+#include "source/common/http/http2/nghttp2.h"
+#include "source/server/proto_descriptors.h"
 
 #include "ares.h"
 
diff --git a/source/exe/terminate_handler.cc b/source/exe/terminate_handler.cc
index 262ebbfbf0b6d..74c68e2076f2d 100644
--- a/source/exe/terminate_handler.cc
+++ b/source/exe/terminate_handler.cc
@@ -1,10 +1,9 @@
-#include "exe/terminate_handler.h"
+#include "source/exe/terminate_handler.h"
 
 #include <cstdlib>
 
-#include "common/common/logger.h"
-
-#include "server/backtrace.h"
+#include "source/common/common/logger.h"
+#include "source/server/backtrace.h"
 
 namespace Envoy {
 
diff --git a/source/exe/terminate_handler.h b/source/exe/terminate_handler.h
index e862031af651f..62ddfe5876737 100644
--- a/source/exe/terminate_handler.h
+++ b/source/exe/terminate_handler.h
@@ -2,8 +2,8 @@
 
 #include <exception>
 
-#include "common/common/logger.h"
-#include "common/common/non_copyable.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/non_copyable.h"
 
 namespace Envoy {
 
diff --git a/source/exe/win32/platform_impl.cc b/source/exe/win32/platform_impl.cc
index 4b10bece2bbf2..8b788a60e586d 100644
--- a/source/exe/win32/platform_impl.cc
+++ b/source/exe/win32/platform_impl.cc
@@ -1,13 +1,12 @@
 #include <chrono>
 #include <thread>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/thread_impl.h"
-#include "common/event/signal_impl.h"
-#include "common/filesystem/filesystem_impl.h"
-
-#include "exe/platform_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/event/signal_impl.h"
+#include "source/common/filesystem/filesystem_impl.h"
+#include "source/exe/platform_impl.h"
 
 namespace Envoy {
 
diff --git a/source/exe/win32/service_base.cc b/source/exe/win32/service_base.cc
index e5e3298c667a1..0c226a8acf637 100644
--- a/source/exe/win32/service_base.cc
+++ b/source/exe/win32/service_base.cc
@@ -1,13 +1,12 @@
 #include <codecvt>
 #include <locale>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/thread.h"
-#include "common/event/signal_impl.h"
-
-#include "exe/main_common.h"
-#include "exe/service_base.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/signal_impl.h"
+#include "source/exe/main_common.h"
+#include "source/exe/service_base.h"
 
 #include "absl/debugging/symbolize.h"
 
diff --git a/source/exe/win32/service_base.h b/source/exe/win32/service_base.h
index ed48c2ac7430a..14bd8498ddd7e 100644
--- a/source/exe/win32/service_base.h
+++ b/source/exe/win32/service_base.h
@@ -9,9 +9,8 @@
 
 #include "envoy/event/signal.h"
 
-#include "common/common/win32/event_logger_impl.h"
-
-#include "exe/service_status.h"
+#include "source/common/common/win32/event_logger_impl.h"
+#include "source/exe/service_status.h"
 
 namespace Envoy {
 class ServiceBase {
diff --git a/source/extensions/access_loggers/common/BUILD b/source/extensions/access_loggers/common/BUILD
index 669f7149cd2a0..d7968b6e0560c 100644
--- a/source/extensions/access_loggers/common/BUILD
+++ b/source/extensions/access_loggers/common/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     srcs = ["access_log_base.cc"],
     hdrs = ["access_log_base.h"],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
+        "//envoy/access_log:access_log_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/http:header_map_lib",
         "//source/common/singleton:const_singleton",
@@ -49,11 +49,11 @@ envoy_cc_library(
     name = "grpc_access_logger",
     hdrs = ["grpc_access_logger.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:typed_async_client_lib",
         "//source/common/protobuf:utility_lib",
diff --git a/source/extensions/access_loggers/common/access_log_base.cc b/source/extensions/access_loggers/common/access_log_base.cc
index 0323013d63504..f5ed7675f85f5 100644
--- a/source/extensions/access_loggers/common/access_log_base.cc
+++ b/source/extensions/access_loggers/common/access_log_base.cc
@@ -1,7 +1,7 @@
-#include "extensions/access_loggers/common/access_log_base.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/common/access_log_base.h b/source/extensions/access_loggers/common/access_log_base.h
index 4fc1aae87d6c2..5ae041c72951a 100644
--- a/source/extensions/access_loggers/common/access_log_base.h
+++ b/source/extensions/access_loggers/common/access_log_base.h
@@ -8,8 +8,8 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/server/access_log_config.h"
 
-#include "common/http/header_utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/common/file_access_log_impl.cc b/source/extensions/access_loggers/common/file_access_log_impl.cc
index 37f2698057dcd..9b074362e55a7 100644
--- a/source/extensions/access_loggers/common/file_access_log_impl.cc
+++ b/source/extensions/access_loggers/common/file_access_log_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/common/file_access_log_impl.h b/source/extensions/access_loggers/common/file_access_log_impl.h
index b44b2999582f5..6a4f0daf7df9b 100644
--- a/source/extensions/access_loggers/common/file_access_log_impl.h
+++ b/source/extensions/access_loggers/common/file_access_log_impl.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/formatter/substitution_formatter.h"
-
-#include "extensions/access_loggers/common/access_log_base.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/common/grpc_access_logger.h b/source/extensions/access_loggers/common/grpc_access_logger.h
index 9fa38a4491b4e..91e634d499b09 100644
--- a/source/extensions/access_loggers/common/grpc_access_logger.h
+++ b/source/extensions/access_loggers/common/grpc_access_logger.h
@@ -9,9 +9,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/assert.h"
-#include "common/grpc/typed_async_client.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/extensions/access_loggers/common/stream_access_log_common_impl.h b/source/extensions/access_loggers/common/stream_access_log_common_impl.h
index feec726dc834d..7c5e335594a25 100644
--- a/source/extensions/access_loggers/common/stream_access_log_common_impl.h
+++ b/source/extensions/access_loggers/common/stream_access_log_common_impl.h
@@ -2,10 +2,9 @@
 
 #include "envoy/server/access_log_config.h"
 
-#include "common/formatter/substitution_format_string.h"
-#include "common/formatter/substitution_formatter.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/file/BUILD b/source/extensions/access_loggers/file/BUILD
index 88376ee987759..b0f1c2df0ea67 100644
--- a/source/extensions/access_loggers/file/BUILD
+++ b/source/extensions/access_loggers/file/BUILD
@@ -20,7 +20,7 @@ envoy_cc_extension(
         "//test:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:config_provider_lib",
         "//source/common/formatter:substitution_format_string_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/access_loggers/file/config.cc b/source/extensions/access_loggers/file/config.cc
index aaba4ea1e2a15..44e7a29a7b92a 100644
--- a/source/extensions/access_loggers/file/config.cc
+++ b/source/extensions/access_loggers/file/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/file/config.h"
+#include "source/extensions/access_loggers/file/config.h"
 
 #include <memory>
 
@@ -7,13 +7,12 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-#include "common/config/utility.h"
-#include "common/formatter/substitution_format_string.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/utility.h"
+#include "source/common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/BUILD b/source/extensions/access_loggers/grpc/BUILD
index 1c0a4b484f30c..1174056f7b798 100644
--- a/source/extensions/access_loggers/grpc/BUILD
+++ b/source/extensions/access_loggers/grpc/BUILD
@@ -18,9 +18,9 @@ envoy_cc_library(
     hdrs = ["config_utils.h"],
     deps = [
         ":grpc_access_log_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/singleton:instance_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
+        "//envoy/singleton:instance_interface",
     ],
 )
 
@@ -29,10 +29,10 @@ envoy_cc_library(
     srcs = ["grpc_access_log_impl.cc"],
     hdrs = ["grpc_access_log_impl.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/config:utility_lib",
         "//source/common/grpc:typed_async_client_lib",
         "//source/extensions/access_loggers/common:grpc_access_logger",
@@ -47,7 +47,7 @@ envoy_cc_library(
     srcs = ["grpc_access_log_utils.cc"],
     hdrs = ["grpc_access_log_utils.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/network:utility_lib",
         "//source/common/stream_info:stream_info_lib",
         "//source/common/stream_info:utility_lib",
@@ -104,7 +104,7 @@ envoy_cc_extension(
     ],
     deps = [
         ":config_utils",
-        "//include/envoy/server:access_log_config_interface",
+        "//envoy/server:access_log_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:async_client_lib",
         "//source/common/protobuf",
@@ -125,7 +125,7 @@ envoy_cc_extension(
     ],
     deps = [
         ":config_utils",
-        "//include/envoy/server:access_log_config_interface",
+        "//envoy/server:access_log_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:async_client_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/access_loggers/grpc/config_utils.cc b/source/extensions/access_loggers/grpc/config_utils.cc
index b09bf2735bcfd..0010109617cd7 100644
--- a/source/extensions/access_loggers/grpc/config_utils.cc
+++ b/source/extensions/access_loggers/grpc/config_utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/grpc/config_utils.h"
+#include "source/extensions/access_loggers/grpc/config_utils.h"
 
 #include "envoy/singleton/manager.h"
 
diff --git a/source/extensions/access_loggers/grpc/config_utils.h b/source/extensions/access_loggers/grpc/config_utils.h
index 7d7e5082f8482..561d941784a2c 100644
--- a/source/extensions/access_loggers/grpc/config_utils.h
+++ b/source/extensions/access_loggers/grpc/config_utils.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "extensions/access_loggers/grpc/grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc
index 8543e533a1a13..3c14627c3c96b 100644
--- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc
+++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc
@@ -1,12 +1,12 @@
-#include "extensions/access_loggers/grpc/grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h"
 
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/grpc/async_client_manager.h"
 #include "envoy/local_info/local_info.h"
 
-#include "common/config/utility.h"
-#include "common/grpc/typed_async_client.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/typed_async_client.h"
 
 const char GRPC_LOG_STATS_PREFIX[] = "access_logs.grpc_access_log.";
 
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h
index 0ab9628deb81a..5aef1e3edcf9f 100644
--- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h
+++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h
@@ -10,7 +10,7 @@
 #include "envoy/service/accesslog/v3/als.pb.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "extensions/access_loggers/common/grpc_access_logger.h"
+#include "source/extensions/access_loggers/common/grpc_access_logger.h"
 
 namespace Envoy {
 namespace Extensions {
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 67dd0585bc557..e9346911355a0 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
@@ -1,8 +1,8 @@
-#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc
index 84784c34ada8f..3d924c0cd47cb 100644
--- a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc
+++ b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc
@@ -1,10 +1,10 @@
-#include "extensions/access_loggers/grpc/grpc_access_log_utils.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h"
 
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/http_config.cc b/source/extensions/access_loggers/grpc/http_config.cc
index 502a2e2f09c0a..4d333f6d91fdc 100644
--- a/source/extensions/access_loggers/grpc/http_config.cc
+++ b/source/extensions/access_loggers/grpc/http_config.cc
@@ -1,18 +1,17 @@
-#include "extensions/access_loggers/grpc/http_config.h"
+#include "source/extensions/access_loggers/grpc/http_config.h"
 
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/grpc/config_utils.h"
-#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
-#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/grpc/config_utils.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
+#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc
index 64d3a283d13b2..cb37f1315efd2 100644
--- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc
+++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc
@@ -1,16 +1,15 @@
-#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/http/headers.h"
-#include "common/network/utility.h"
-#include "common/stream_info/utility.h"
-
-#include "extensions/access_loggers/grpc/grpc_access_log_utils.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/utility.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h
index fcae58bd5f105..d403596f8decc 100644
--- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h
+++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h
@@ -10,10 +10,9 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/grpc/typed_async_client.h"
-
-#include "extensions/access_loggers/common/access_log_base.h"
-#include "extensions/access_loggers/grpc/grpc_access_log_impl.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/tcp_config.cc b/source/extensions/access_loggers/grpc/tcp_config.cc
index 3c2c45b153a32..185a76e934d8a 100644
--- a/source/extensions/access_loggers/grpc/tcp_config.cc
+++ b/source/extensions/access_loggers/grpc/tcp_config.cc
@@ -1,18 +1,17 @@
-#include "extensions/access_loggers/grpc/tcp_config.h"
+#include "source/extensions/access_loggers/grpc/tcp_config.h"
 
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/grpc/config_utils.h"
-#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
-#include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/grpc/config_utils.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h"
+#include "source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc
index 85c2b258cbb93..c475f134a7b61 100644
--- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc
+++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc
@@ -1,14 +1,13 @@
-#include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h"
 
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/network/utility.h"
-#include "common/stream_info/utility.h"
-
-#include "extensions/access_loggers/grpc/grpc_access_log_utils.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/utility.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h
index cf424bb92a3df..fba13f16d6c6d 100644
--- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h
+++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h
@@ -9,10 +9,9 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/grpc/typed_async_client.h"
-
-#include "extensions/access_loggers/common/access_log_base.h"
-#include "extensions/access_loggers/grpc/grpc_access_log_impl.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/open_telemetry/BUILD b/source/extensions/access_loggers/open_telemetry/BUILD
index bc2609eaa0146..c500ee1aea1f3 100644
--- a/source/extensions/access_loggers/open_telemetry/BUILD
+++ b/source/extensions/access_loggers/open_telemetry/BUILD
@@ -14,10 +14,10 @@ envoy_cc_library(
     srcs = ["grpc_access_log_impl.cc"],
     hdrs = ["grpc_access_log_impl.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/config:utility_lib",
         "//source/common/grpc:typed_async_client_lib",
         "//source/common/protobuf",
@@ -34,8 +34,8 @@ envoy_cc_library(
     hdrs = ["access_log_impl.h"],
     deps = [
         ":grpc_access_log_lib",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/protobuf:message_validator_interface",
         "//source/common/formatter:substitution_formatter_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/access_loggers/common:access_log_base",
@@ -67,7 +67,7 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/server:access_log_config_interface",
+        "//envoy/server:access_log_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:async_client_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/access_loggers/open_telemetry/access_log_impl.cc b/source/extensions/access_loggers/open_telemetry/access_log_impl.cc
index ea4920151fba7..f3376483ad318 100644
--- a/source/extensions/access_loggers/open_telemetry/access_log_impl.cc
+++ b/source/extensions/access_loggers/open_telemetry/access_log_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/open_telemetry/access_log_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h"
 
 #include <chrono>
 
@@ -7,14 +7,14 @@
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/http/headers.h"
-#include "common/network/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/utility.h"
 
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/proto/common/v1/common.pb.h"
diff --git a/source/extensions/access_loggers/open_telemetry/access_log_impl.h b/source/extensions/access_loggers/open_telemetry/access_log_impl.h
index aa9fb20eac5d8..1bd6b34804c8b 100644
--- a/source/extensions/access_loggers/open_telemetry/access_log_impl.h
+++ b/source/extensions/access_loggers/open_telemetry/access_log_impl.h
@@ -11,11 +11,10 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/formatter/substitution_formatter.h"
-#include "common/grpc/typed_async_client.h"
-
-#include "extensions/access_loggers/common/access_log_base.h"
-#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
+#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
 
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/proto/common/v1/common.pb.h"
diff --git a/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc b/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc
index 892aa74b0c963..aa8ba51c77578 100644
--- a/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc
+++ b/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc
@@ -1,8 +1,8 @@
-#include "extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/open_telemetry/config.cc b/source/extensions/access_loggers/open_telemetry/config.cc
index d5fff2ec4bed7..2b0f02f3acd2b 100644
--- a/source/extensions/access_loggers/open_telemetry/config.cc
+++ b/source/extensions/access_loggers/open_telemetry/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/open_telemetry/config.h"
+#include "source/extensions/access_loggers/open_telemetry/config.h"
 
 #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h"
 #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.validate.h"
@@ -6,13 +6,12 @@
 #include "envoy/server/access_log_config.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/open_telemetry/access_log_impl.h"
-#include "extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc
index 535d7023ff74f..909caf38aa3dd 100644
--- a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc
+++ b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc
@@ -1,12 +1,12 @@
-#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
 
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h"
 #include "envoy/grpc/async_client_manager.h"
 #include "envoy/local_info/local_info.h"
 
-#include "common/config/utility.h"
-#include "common/grpc/typed_async_client.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/typed_async_client.h"
 
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/proto/common/v1/common.pb.h"
diff --git a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h
index 006cc9691ed05..4273b1a420016 100644
--- a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h
+++ b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h
@@ -8,9 +8,8 @@
 #include "envoy/local_info/local_info.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/grpc_access_logger.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/grpc_access_logger.h"
 
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 #include "opentelemetry/proto/common/v1/common.pb.h"
diff --git a/source/extensions/access_loggers/stream/BUILD b/source/extensions/access_loggers/stream/BUILD
index 2e94c47e56197..2b006910ca15a 100644
--- a/source/extensions/access_loggers/stream/BUILD
+++ b/source/extensions/access_loggers/stream/BUILD
@@ -16,7 +16,7 @@ envoy_cc_extension(
         "//test:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:config_provider_lib",
         "//source/common/formatter:substitution_format_string_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/access_loggers/stream/config.cc b/source/extensions/access_loggers/stream/config.cc
index e80cc5c82a990..9482d510f92f7 100644
--- a/source/extensions/access_loggers/stream/config.cc
+++ b/source/extensions/access_loggers/stream/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/stream/config.h"
+#include "source/extensions/access_loggers/stream/config.h"
 
 #include <memory>
 
@@ -7,14 +7,13 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-#include "common/config/utility.h"
-#include "common/formatter/substitution_format_string.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
-#include "extensions/access_loggers/common/stream_access_log_common_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/utility.h"
+#include "source/common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/extensions/access_loggers/common/stream_access_log_common_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/wasm/BUILD b/source/extensions/access_loggers/wasm/BUILD
index 6c1c5d86acdd1..3ea6a5ba7c0fb 100644
--- a/source/extensions/access_loggers/wasm/BUILD
+++ b/source/extensions/access_loggers/wasm/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     name = "wasm_access_log_lib",
     hdrs = ["wasm_access_log_impl.h"],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
+        "//envoy/access_log:access_log_interface",
         "//source/common/http:header_map_lib",
         "//source/extensions/common/wasm:wasm_lib",
     ],
@@ -27,8 +27,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":wasm_access_log_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:access_log_config_interface",
+        "//envoy/registry",
+        "//envoy/server:access_log_config_interface",
         "//source/common/config:datasource_lib",
         "//source/common/protobuf",
         "//source/extensions/common/wasm:wasm_lib",
diff --git a/source/extensions/access_loggers/wasm/config.cc b/source/extensions/access_loggers/wasm/config.cc
index 68a5c6b3f8603..0c8fb063abb04 100644
--- a/source/extensions/access_loggers/wasm/config.cc
+++ b/source/extensions/access_loggers/wasm/config.cc
@@ -1,14 +1,13 @@
-#include "extensions/access_loggers/wasm/config.h"
+#include "source/extensions/access_loggers/wasm/config.h"
 
 #include "envoy/extensions/access_loggers/wasm/v3/wasm.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/wasm/wasm_access_log_impl.h"
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/wasm/wasm_access_log_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/wasm/config.h b/source/extensions/access_loggers/wasm/config.h
index 2a8062fb34c7b..9806fe66d36e5 100644
--- a/source/extensions/access_loggers/wasm/config.h
+++ b/source/extensions/access_loggers/wasm/config.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/access_log_config.h"
 
-#include "common/config/datasource.h"
+#include "source/common/config/datasource.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h
index 0369da5518d40..ec7fb29797dea 100644
--- a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h
+++ b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h
@@ -2,9 +2,8 @@
 
 #include "envoy/access_log/access_log.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/access_loggers/well_known_names.h b/source/extensions/access_loggers/well_known_names.h
new file mode 100644
index 0000000000000..a76efede95907
--- /dev/null
+++ b/source/extensions/access_loggers/well_known_names.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace AccessLoggers {
+
+/**
+ * Well-known access logger names.
+ * NOTE: New access loggers should use the well known name: envoy.access_loggers.name.
+ */
+class AccessLogNameValues {
+public:
+  // File access log
+  const std::string File = "envoy.access_loggers.file";
+  // HTTP gRPC access log
+  const std::string HttpGrpc = "envoy.access_loggers.http_grpc";
+  // Standard error access log
+  const std::string Stderr = "envoy.access_loggers.stderr";
+  // Standard output access log
+  const std::string Stdout = "envoy.access_loggers.stdout";
+  // TCP gRPC access log
+  const std::string TcpGrpc = "envoy.access_loggers.tcp_grpc";
+  // OpenTelemetry gRPC access log
+  const std::string OpenTelemetry = "envoy.access_loggers.open_telemetry";
+  // WASM access log
+  const std::string Wasm = "envoy.access_loggers.wasm";
+};
+
+using AccessLogNames = ConstSingleton<AccessLogNameValues>;
+
+} // namespace AccessLoggers
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/bootstrap/wasm/BUILD b/source/extensions/bootstrap/wasm/BUILD
index be38ee803f4aa..913e72fc54317 100644
--- a/source/extensions/bootstrap/wasm/BUILD
+++ b/source/extensions/bootstrap/wasm/BUILD
@@ -17,10 +17,10 @@ envoy_cc_extension(
         "config.h",
     ],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:bootstrap_extension_config_interface",
-        "//include/envoy/server:factory_context_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/registry",
+        "//envoy/server:bootstrap_extension_config_interface",
+        "//envoy/server:factory_context_interface",
+        "//envoy/server:instance_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
diff --git a/source/extensions/bootstrap/wasm/config.cc b/source/extensions/bootstrap/wasm/config.cc
index 3a2b0d488601d..ae8e733d57d60 100644
--- a/source/extensions/bootstrap/wasm/config.cc
+++ b/source/extensions/bootstrap/wasm/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/bootstrap/wasm/config.h"
+#include "source/extensions/bootstrap/wasm/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/bootstrap/wasm/config.h b/source/extensions/bootstrap/wasm/config.h
index 9d09a7905b2d4..db415cb14f14a 100644
--- a/source/extensions/bootstrap/wasm/config.h
+++ b/source/extensions/bootstrap/wasm/config.h
@@ -7,9 +7,8 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/server/instance.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/aggregate/cluster.cc b/source/extensions/clusters/aggregate/cluster.cc
index ac4eee0885946..c7f21b5abdbd3 100644
--- a/source/extensions/clusters/aggregate/cluster.cc
+++ b/source/extensions/clusters/aggregate/cluster.cc
@@ -1,11 +1,11 @@
-#include "extensions/clusters/aggregate/cluster.h"
+#include "source/extensions/clusters/aggregate/cluster.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/event/dispatcher.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/aggregate/cluster.h b/source/extensions/clusters/aggregate/cluster.h
index 2d62ce594d0d6..031a3fe2b63d3 100644
--- a/source/extensions/clusters/aggregate/cluster.h
+++ b/source/extensions/clusters/aggregate/cluster.h
@@ -8,11 +8,10 @@
 #include "envoy/thread_local/thread_local_object.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/common/logger.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/clusters/aggregate/lb_context.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/clusters/aggregate/lb_context.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/aggregate/lb_context.h b/source/extensions/clusters/aggregate/lb_context.h
index 08aae97f51e7e..8add803c63c29 100644
--- a/source/extensions/clusters/aggregate/lb_context.h
+++ b/source/extensions/clusters/aggregate/lb_context.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc
index 39712337ecb39..335bb2a8c9a86 100644
--- a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc
+++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc
@@ -1,12 +1,11 @@
-#include "extensions/clusters/dynamic_forward_proxy/cluster.h"
+#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h"
 
-#include "common/network/transport_socket_options_impl.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.h b/source/extensions/clusters/dynamic_forward_proxy/cluster.h
index 93f984c8dd59e..dcd1e235607f5 100644
--- a/source/extensions/clusters/dynamic_forward_proxy/cluster.h
+++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.h
@@ -5,10 +5,9 @@
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h"
 
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/logical_host.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/logical_host.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD
index 3e01d5d9aa9ed..464da0ef8bfb6 100644
--- a/source/extensions/clusters/redis/BUILD
+++ b/source/extensions/clusters/redis/BUILD
@@ -25,8 +25,8 @@ envoy_cc_library(
     ],
     deps = [
         ":crc16_lib",
-        "//include/envoy/upstream:thread_local_cluster_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:thread_local_cluster_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/upstream:upstream_includes",
         "//source/common/upstream:upstream_lib",
         "//source/extensions/filters/network/common/redis:client_interface",
@@ -43,12 +43,12 @@ envoy_cc_extension(
     ],
     deps = [
         "redis_cluster_lb",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/config:datasource_lib",
         "//source/common/config:metadata_lib",
         "//source/common/event:dispatcher_lib",
diff --git a/source/extensions/clusters/redis/redis_cluster.h b/source/extensions/clusters/redis/redis_cluster.h
index f7729fddc47aa..96161c3514b11 100644
--- a/source/extensions/clusters/redis/redis_cluster.h
+++ b/source/extensions/clusters/redis/redis_cluster.h
@@ -40,31 +40,28 @@
 #include "envoy/upstream/locality.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/callback_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/config/datasource.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/outlier_detection_impl.h"
-#include "common/upstream/resource_manager_impl.h"
-#include "common/upstream/upstream_impl.h"
-
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/outlier_detection_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 #include "source/extensions/clusters/redis/redis_cluster_lb.h"
-
-#include "server/transport_socket_config_impl.h"
-
-#include "extensions/common/redis/cluster_refresh_manager_impl.h"
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/codec.h"
-#include "extensions/filters/network/common/redis/utility.h"
-#include "extensions/filters/network/redis_proxy/config.h"
+#include "source/extensions/common/redis/cluster_refresh_manager_impl.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
+#include "source/extensions/filters/network/redis_proxy/config.h"
+#include "source/server/transport_socket_config_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/clusters/redis/redis_cluster_lb.h b/source/extensions/clusters/redis/redis_cluster_lb.h
index 77860938d581b..4ac9f565e0b58 100644
--- a/source/extensions/clusters/redis/redis_cluster_lb.h
+++ b/source/extensions/clusters/redis/redis_cluster_lb.h
@@ -7,15 +7,13 @@
 #include "envoy/upstream/load_balancer.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/network/address_impl.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
-
+#include "source/common/network/address_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 #include "source/extensions/clusters/redis/crc16.h"
-
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/codec.h"
-#include "extensions/filters/network/common/redis/supported_commands.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
 
 #include "absl/container/btree_map.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/extensions/clusters/well_known_names.h b/source/extensions/clusters/well_known_names.h
new file mode 100644
index 0000000000000..569141745b77f
--- /dev/null
+++ b/source/extensions/clusters/well_known_names.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "source/common/config/well_known_names.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace Clusters {
+
+/**
+ * Well-known cluster types, this supersede the service discovery types
+ */
+class ClusterTypeValues {
+public:
+  // Static clusters (cluster that have a fixed number of hosts with resolved IP addresses).
+  const std::string Static = "envoy.cluster.static";
+
+  // Strict DNS (cluster that periodic DNS resolution and updates the host member set if the DNS
+  // members change).
+  const std::string StrictDns = "envoy.cluster.strict_dns";
+
+  // Logical DNS (cluster that creates a single logical host that wraps an async DNS resolver).
+  const std::string LogicalDns = "envoy.cluster.logical_dns";
+
+  // Endpoint Discovery Service (dynamic cluster that reads host information from the Endpoint
+  // Discovery Service).
+  const std::string Eds = "envoy.cluster.eds";
+
+  // Original destination (dynamic cluster that automatically adds hosts as needed based on the
+  // original destination address of the downstream connection).
+  const std::string OriginalDst = "envoy.cluster.original_dst";
+
+  // Redis cluster (cluster that reads host information using the redis cluster protocol).
+  const std::string Redis = "envoy.clusters.redis";
+
+  // Dynamic forward proxy cluster. This cluster is designed to work directly with the
+  // dynamic forward proxy HTTP filter.
+  const std::string DynamicForwardProxy = "envoy.clusters.dynamic_forward_proxy";
+
+  // Aggregate cluster which may contain different types of clusters. It allows load balance between
+  // different type of clusters.
+  const std::string Aggregate = "envoy.clusters.aggregate";
+};
+
+using ClusterTypes = ConstSingleton<ClusterTypeValues>;
+
+} // namespace Clusters
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/common/BUILD b/source/extensions/common/BUILD
index 50e003b975619..70c9f76e7af4c 100644
--- a/source/extensions/common/BUILD
+++ b/source/extensions/common/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     # Legacy.  TODO(#9953) clean up.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:documentation_url_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
diff --git a/source/extensions/common/aws/BUILD b/source/extensions/common/aws/BUILD
index 621d60806d548..2f79649e36a05 100644
--- a/source/extensions/common/aws/BUILD
+++ b/source/extensions/common/aws/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "signer_interface",
     hdrs = ["signer.h"],
     deps = [
-        "//include/envoy/http:message_interface",
+        "//envoy/http:message_interface",
     ],
 )
 
@@ -48,7 +48,7 @@ envoy_cc_library(
     external_deps = ["abseil_time"],
     deps = [
         ":credentials_provider_interface",
-        "//include/envoy/api:api_interface",
+        "//envoy/api:api_interface",
         "//source/common/common:logger_lib",
         "//source/common/common:thread_lib",
         "//source/common/http:utility_lib",
diff --git a/source/extensions/common/aws/credentials_provider_impl.cc b/source/extensions/common/aws/credentials_provider_impl.cc
index aa367a07d0198..4dd5bfed47aee 100644
--- a/source/extensions/common/aws/credentials_provider_impl.cc
+++ b/source/extensions/common/aws/credentials_provider_impl.cc
@@ -1,10 +1,10 @@
-#include "extensions/common/aws/credentials_provider_impl.h"
+#include "source/extensions/common/aws/credentials_provider_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/lock_guard.h"
-#include "common/http/utility.h"
-#include "common/json/json_loader.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/http/utility.h"
+#include "source/common/json/json_loader.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/aws/credentials_provider_impl.h b/source/extensions/common/aws/credentials_provider_impl.h
index e493ebdb74ddb..b15637282aa8e 100644
--- a/source/extensions/common/aws/credentials_provider_impl.h
+++ b/source/extensions/common/aws/credentials_provider_impl.h
@@ -5,10 +5,9 @@
 #include "envoy/api/api.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-
-#include "extensions/common/aws/credentials_provider.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/extensions/common/aws/credentials_provider.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/common/aws/region_provider_impl.cc b/source/extensions/common/aws/region_provider_impl.cc
index 3943f45ba2cc3..0914c46ced410 100644
--- a/source/extensions/common/aws/region_provider_impl.cc
+++ b/source/extensions/common/aws/region_provider_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/aws/region_provider_impl.h"
+#include "source/extensions/common/aws/region_provider_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/aws/region_provider_impl.h b/source/extensions/common/aws/region_provider_impl.h
index 9e45823d44655..b4f08af157372 100644
--- a/source/extensions/common/aws/region_provider_impl.h
+++ b/source/extensions/common/aws/region_provider_impl.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/common/logger.h"
-
-#include "extensions/common/aws/region_provider.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/aws/region_provider.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/aws/signer_impl.cc b/source/extensions/common/aws/signer_impl.cc
index a328610e28042..368285c91fb05 100644
--- a/source/extensions/common/aws/signer_impl.cc
+++ b/source/extensions/common/aws/signer_impl.cc
@@ -1,14 +1,13 @@
-#include "extensions/common/aws/signer_impl.h"
+#include "source/extensions/common/aws/signer_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-#include "common/http/headers.h"
-
-#include "extensions/common/aws/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/common/aws/utility.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/extensions/common/aws/signer_impl.h b/source/extensions/common/aws/signer_impl.h
index b1b5ad3c550d4..301ead3e40eec 100644
--- a/source/extensions/common/aws/signer_impl.h
+++ b/source/extensions/common/aws/signer_impl.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/common/aws/credentials_provider.h"
-#include "extensions/common/aws/signer.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/common/aws/credentials_provider.h"
+#include "source/extensions/common/aws/signer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/aws/utility.cc b/source/extensions/common/aws/utility.cc
index 794051e0d67a5..497e37f409628 100644
--- a/source/extensions/common/aws/utility.cc
+++ b/source/extensions/common/aws/utility.cc
@@ -1,7 +1,7 @@
-#include "extensions/common/aws/utility.h"
+#include "source/extensions/common/aws/utility.h"
 
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/str_join.h"
 #include "curl/curl.h"
diff --git a/source/extensions/common/aws/utility.h b/source/extensions/common/aws/utility.h
index 5aba489ce707b..79f9b937b8959 100644
--- a/source/extensions/common/aws/utility.h
+++ b/source/extensions/common/aws/utility.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/http/headers.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/crypto/BUILD b/source/extensions/common/crypto/BUILD
index 4cd26ae3701ae..1896816e5e960 100644
--- a/source/extensions/common/crypto/BUILD
+++ b/source/extensions/common/crypto/BUILD
@@ -27,7 +27,7 @@ envoy_cc_extension(
         "//test/common/crypto:__subpackages__",
     ],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:assert_lib",
         "//source/common/crypto:utility_lib",
     ],
diff --git a/source/extensions/common/crypto/crypto_impl.cc b/source/extensions/common/crypto/crypto_impl.cc
index b5abbf8b858a2..e26682cbf6483 100644
--- a/source/extensions/common/crypto/crypto_impl.cc
+++ b/source/extensions/common/crypto/crypto_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/crypto/crypto_impl.h"
+#include "source/extensions/common/crypto/crypto_impl.h"
 
 namespace Envoy {
 namespace Common {
diff --git a/source/extensions/common/crypto/utility_impl.cc b/source/extensions/common/crypto/utility_impl.cc
index b8c1b151ef548..7319bfca3676a 100644
--- a/source/extensions/common/crypto/utility_impl.cc
+++ b/source/extensions/common/crypto/utility_impl.cc
@@ -1,8 +1,7 @@
-#include "extensions/common/crypto/utility_impl.h"
+#include "source/extensions/common/crypto/utility_impl.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/common/crypto/crypto_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/common/crypto/crypto_impl.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/ascii.h"
diff --git a/source/extensions/common/crypto/utility_impl.h b/source/extensions/common/crypto/utility_impl.h
index 1b5b107a4738f..3f18ac436be54 100644
--- a/source/extensions/common/crypto/utility_impl.h
+++ b/source/extensions/common/crypto/utility_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/crypto/utility.h"
+#include "source/common/crypto/utility.h"
 
 #include "openssl/bytestring.h"
 #include "openssl/hmac.h"
diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD
index 618ec12bedea8..1fa99cbecef29 100644
--- a/source/extensions/common/dynamic_forward_proxy/BUILD
+++ b/source/extensions/common/dynamic_forward_proxy/BUILD
@@ -12,12 +12,12 @@ envoy_cc_library(
     name = "dns_cache_interface",
     hdrs = ["dns_cache.h"],
     deps = [
-        "//include/envoy/common:backoff_strategy_interface",
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:resource_manager_interface",
+        "//envoy/common:backoff_strategy_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:resource_manager_interface",
         "@envoy_api//envoy/extensions/common/dynamic_forward_proxy/v3:pkg_cc_proto",
     ],
 )
@@ -40,8 +40,8 @@ envoy_cc_library(
     deps = [
         ":dns_cache_interface",
         ":dns_cache_resource_manager",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:cleanup_lib",
         "//source/common/config:utility_lib",
         "//source/common/network:resolver_lib",
@@ -57,8 +57,8 @@ envoy_cc_library(
     hdrs = ["dns_cache_resource_manager.h"],
     deps = [
         ":dns_cache_interface",
-        "//include/envoy/common:resource_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/common:resource_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:basic_resource_lib",
         "//source/common/runtime:runtime_lib",
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc
index 585ef3f0793f3..15e3adb4d715b 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc
@@ -1,14 +1,14 @@
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
 
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "common/config/utility.h"
-#include "common/http/utility.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/utility.h"
 
 // TODO(mattklein123): Move DNS family helpers to a smaller include.
-#include "common/upstream/upstream_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h
index 1f5237dc035e5..1e668c9847f20 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h
@@ -6,10 +6,9 @@
 #include "envoy/network/dns.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/cleanup.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
-#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
+#include "source/common/common/cleanup.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc
index c758d416d6fa8..70d577df63d7a 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc
@@ -1,10 +1,9 @@
-#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
 
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h
index 3a8c5d26013be..553f45e22bacd 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc
index 65ce809275efa..fbe02fe11b8c9 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h
index 34a6004f6e360..1c435d69f88c9 100644
--- a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h
+++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h
@@ -10,11 +10,10 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/resource_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/basic_resource_impl.h"
-#include "common/upstream/resource_manager_impl.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/basic_resource_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/matcher/matcher.cc b/source/extensions/common/matcher/matcher.cc
index 8040b4650bca0..f2a5056ec4882 100644
--- a/source/extensions/common/matcher/matcher.cc
+++ b/source/extensions/common/matcher/matcher.cc
@@ -1,6 +1,6 @@
-#include "extensions/common/matcher/matcher.h"
+#include "source/extensions/common/matcher/matcher.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/matcher/matcher.h b/source/extensions/common/matcher/matcher.h
index 4eecd25d3786a..03309fa73406b 100644
--- a/source/extensions/common/matcher/matcher.h
+++ b/source/extensions/common/matcher/matcher.h
@@ -2,8 +2,8 @@
 
 #include "envoy/config/common/matcher/v3/matcher.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/proxy_protocol/BUILD b/source/extensions/common/proxy_protocol/BUILD
index 7a2b9bf66d034..55493cebc9697 100644
--- a/source/extensions/common/proxy_protocol/BUILD
+++ b/source/extensions/common/proxy_protocol/BUILD
@@ -15,9 +15,9 @@ envoy_cc_library(
     # This is used by the router, so considered core code.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:connection_interface",
         "//source/common/network:address_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/common/proxy_protocol/proxy_protocol_header.cc b/source/extensions/common/proxy_protocol/proxy_protocol_header.cc
index 123bff19f2b71..3296b0e14044c 100644
--- a/source/extensions/common/proxy_protocol/proxy_protocol_header.cc
+++ b/source/extensions/common/proxy_protocol/proxy_protocol_header.cc
@@ -1,11 +1,11 @@
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
 
 #include <sstream>
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/address.h"
 
-#include "common/network/address_impl.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/redis/BUILD b/source/extensions/common/redis/BUILD
index f7427e61ad2e8..36e05034f57f6 100644
--- a/source/extensions/common/redis/BUILD
+++ b/source/extensions/common/redis/BUILD
@@ -25,9 +25,9 @@ envoy_cc_library(
     hdrs = ["cluster_refresh_manager_impl.h"],
     deps = [
         ":cluster_refresh_manager_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:lock_guard_lib",
         "//source/common/common:thread_annotations",
         "//source/common/common:thread_lib",
diff --git a/source/extensions/common/redis/cluster_refresh_manager_impl.cc b/source/extensions/common/redis/cluster_refresh_manager_impl.cc
index c3caa96d9eec3..bc22bace274c7 100644
--- a/source/extensions/common/redis/cluster_refresh_manager_impl.cc
+++ b/source/extensions/common/redis/cluster_refresh_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/redis/cluster_refresh_manager_impl.h"
+#include "source/extensions/common/redis/cluster_refresh_manager_impl.h"
 
 #include "envoy/singleton/manager.h"
 
diff --git a/source/extensions/common/redis/cluster_refresh_manager_impl.h b/source/extensions/common/redis/cluster_refresh_manager_impl.h
index a62db60327f1b..94bbfc315db65 100644
--- a/source/extensions/common/redis/cluster_refresh_manager_impl.h
+++ b/source/extensions/common/redis/cluster_refresh_manager_impl.h
@@ -8,10 +8,9 @@
 #include "envoy/singleton/instance.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-
-#include "extensions/common/redis/cluster_refresh_manager.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/extensions/common/redis/cluster_refresh_manager.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/sqlutils/sqlutils.cc b/source/extensions/common/sqlutils/sqlutils.cc
index 64b5438111be2..1c9a30d6e502d 100644
--- a/source/extensions/common/sqlutils/sqlutils.cc
+++ b/source/extensions/common/sqlutils/sqlutils.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/sqlutils/sqlutils.h"
+#include "source/extensions/common/sqlutils/sqlutils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/sqlutils/sqlutils.h b/source/extensions/common/sqlutils/sqlutils.h
index 659025893027f..4c62f2a5e91d9 100644
--- a/source/extensions/common/sqlutils/sqlutils.h
+++ b/source/extensions/common/sqlutils/sqlutils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "include/sqlparser/SQLParser.h"
 
diff --git a/source/extensions/common/tap/BUILD b/source/extensions/common/tap/BUILD
index e127bf3aaa192..c70943346fb7c 100644
--- a/source/extensions/common/tap/BUILD
+++ b/source/extensions/common/tap/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "tap_interface",
     hdrs = ["tap.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/extensions/common/matcher:matcher_lib",
         "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
         "@envoy_api//envoy/data/tap/v3:pkg_cc_proto",
@@ -39,8 +39,8 @@ envoy_cc_library(
     hdrs = ["admin.h"],
     deps = [
         ":tap_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/singleton:manager_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/singleton:manager_interface",
         "//source/common/buffer:buffer_lib",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
@@ -53,7 +53,7 @@ envoy_cc_library(
     srcs = ["extension_config_base.cc"],
     hdrs = ["extension_config_base.h"],
     deps = [
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/extensions/common/tap:admin",
         "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/common/tap/v3:pkg_cc_proto",
diff --git a/source/extensions/common/tap/admin.cc b/source/extensions/common/tap/admin.cc
index ee52d24b0c175..8c674cb141f6f 100644
--- a/source/extensions/common/tap/admin.cc
+++ b/source/extensions/common/tap/admin.cc
@@ -1,13 +1,13 @@
-#include "extensions/common/tap/admin.h"
+#include "source/extensions/common/tap/admin.h"
 
 #include "envoy/admin/v3/tap.pb.h"
 #include "envoy/admin/v3/tap.pb.validate.h"
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/wrapper.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/tap/admin.h b/source/extensions/common/tap/admin.h
index 90feda4946e9b..39d002a52caf2 100644
--- a/source/extensions/common/tap/admin.h
+++ b/source/extensions/common/tap/admin.h
@@ -3,7 +3,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/singleton/manager.h"
 
-#include "extensions/common/tap/tap.h"
+#include "source/extensions/common/tap/tap.h"
 
 #include "absl/container/node_hash_set.h"
 
diff --git a/source/extensions/common/tap/extension_config_base.cc b/source/extensions/common/tap/extension_config_base.cc
index 04a6fb73d20b7..66173ebbee210 100644
--- a/source/extensions/common/tap/extension_config_base.cc
+++ b/source/extensions/common/tap/extension_config_base.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/tap/extension_config_base.h"
+#include "source/extensions/common/tap/extension_config_base.h"
 
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/extensions/common/tap/v3/common.pb.h"
diff --git a/source/extensions/common/tap/extension_config_base.h b/source/extensions/common/tap/extension_config_base.h
index 7e0e00625dd9e..ff8f87646a6c8 100644
--- a/source/extensions/common/tap/extension_config_base.h
+++ b/source/extensions/common/tap/extension_config_base.h
@@ -4,8 +4,8 @@
 #include "envoy/extensions/common/tap/v3/common.pb.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "extensions/common/tap/admin.h"
-#include "extensions/common/tap/tap.h"
+#include "source/extensions/common/tap/admin.h"
+#include "source/extensions/common/tap/tap.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/tap/tap.h b/source/extensions/common/tap/tap.h
index 972ebef3a8130..83b521ce8043a 100644
--- a/source/extensions/common/tap/tap.h
+++ b/source/extensions/common/tap/tap.h
@@ -5,7 +5,7 @@
 #include "envoy/data/tap/v3/wrapper.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "extensions/common/matcher/matcher.h"
+#include "source/extensions/common/matcher/matcher.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/common/tap/tap_config_base.cc b/source/extensions/common/tap/tap_config_base.cc
index 5e7d77a1a15a0..b1f9785c65888 100644
--- a/source/extensions/common/tap/tap_config_base.cc
+++ b/source/extensions/common/tap/tap_config_base.cc
@@ -1,15 +1,14 @@
-#include "extensions/common/tap/tap_config_base.h"
+#include "source/extensions/common/tap/tap_config_base.h"
 
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/wrapper.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/common/matcher/matcher.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/common/matcher/matcher.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/common/tap/tap_config_base.h b/source/extensions/common/tap/tap_config_base.h
index a0aeb9967fc3d..94685339fba02 100644
--- a/source/extensions/common/tap/tap_config_base.h
+++ b/source/extensions/common/tap/tap_config_base.h
@@ -7,8 +7,8 @@
 #include "envoy/data/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/wrapper.pb.h"
 
-#include "extensions/common/matcher/matcher.h"
-#include "extensions/common/tap/tap.h"
+#include "source/extensions/common/matcher/matcher.h"
+#include "source/extensions/common/tap/tap.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/utility.h b/source/extensions/common/utility.h
index 378223c912cdc..7b326227222ec 100644
--- a/source/extensions/common/utility.h
+++ b/source/extensions/common/utility.h
@@ -3,9 +3,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/common/documentation_url.h"
-#include "common/common/logger.h"
-#include "common/common/utility.h"
+#include "source/common/common/documentation_url.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD
index 37182ea34ebef..f319fb2d00d6d 100644
--- a/source/extensions/common/wasm/BUILD
+++ b/source/extensions/common/wasm/BUILD
@@ -30,11 +30,11 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/server:lifecycle_notifier_interface",
-        "//include/envoy/thread_local:thread_local_object",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/server:lifecycle_notifier_interface",
+        "//envoy/thread_local:thread_local_object",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/config:datasource_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/singleton:const_singleton",
@@ -71,7 +71,7 @@ envoy_cc_library(
         ":wasm_runtime_factory_interface",
         "//external:abseil_base",
         "//external:abseil_node_hash_map",
-        "//include/envoy/server:lifecycle_notifier_interface",
+        "//envoy/server:lifecycle_notifier_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:safe_memcpy_lib",
diff --git a/source/extensions/common/wasm/context.cc b/source/extensions/common/wasm/context.cc
index 7d9c0fdeb22c2..34db41d71e7f0 100644
--- a/source/extensions/common/wasm/context.cc
+++ b/source/extensions/common/wasm/context.cc
@@ -15,20 +15,19 @@
 #include "envoy/stats/sink.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/common/safe_memcpy.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/common/wasm/plugin.h"
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/common/expr/context.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/common/expr/context.h"
 
 #include "absl/base/casts.h"
 #include "absl/container/flat_hash_map.h"
diff --git a/source/extensions/common/wasm/context.h b/source/extensions/common/wasm/context.h
index 65b8e862bbcbe..53b3a273df3d8 100644
--- a/source/extensions/common/wasm/context.h
+++ b/source/extensions/common/wasm/context.h
@@ -11,12 +11,11 @@
 #include "envoy/stats/sink.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
-#include "extensions/common/wasm/plugin.h"
-#include "extensions/filters/common/expr/cel_state.h"
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/wasm/plugin.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 #include "eval/public/activation.h"
 #include "include/proxy-wasm/wasm.h"
diff --git a/source/extensions/common/wasm/ext/envoy_null_plugin.h b/source/extensions/common/wasm/ext/envoy_null_plugin.h
index 1463e00e1ef5c..49544355f4623 100644
--- a/source/extensions/common/wasm/ext/envoy_null_plugin.h
+++ b/source/extensions/common/wasm/ext/envoy_null_plugin.h
@@ -26,7 +26,7 @@ proxy_wasm::Word resolve_dns(void* raw_context, proxy_wasm::Word dns_address,
 namespace proxy_wasm {
 namespace null_plugin {
 
-#include "extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
+#include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
 using GrpcService = envoy::config::core::v3::GrpcService;
 using namespace proxy_wasm::null_plugin;
 
diff --git a/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h b/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h
index f6415b3fd2fa4..dd74afa291401 100644
--- a/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h
+++ b/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h
@@ -17,7 +17,7 @@ namespace null_plugin {
 #include "proxy_wasm_api.h"
 #undef _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_
 #define _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_ 1
-#include "extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
+#include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
 #undef _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_
 
 } // namespace null_plugin
diff --git a/source/extensions/common/wasm/foreign.cc b/source/extensions/common/wasm/foreign.cc
index 2d59dcc43e1f2..9ace82a588172 100644
--- a/source/extensions/common/wasm/foreign.cc
+++ b/source/extensions/common/wasm/foreign.cc
@@ -1,8 +1,6 @@
-#include "common/common/logger.h"
-
+#include "source/common/common/logger.h"
 #include "source/extensions/common/wasm/ext/declare_property.pb.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #if defined(WASM_USE_CEL_PARSER)
 #include "eval/public/builtin_func_registrar.h"
diff --git a/source/extensions/common/wasm/plugin.cc b/source/extensions/common/wasm/plugin.cc
index fe773a3b1e100..ae1628981e870 100644
--- a/source/extensions/common/wasm/plugin.cc
+++ b/source/extensions/common/wasm/plugin.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/plugin.h"
 
 #include "envoy/common/exception.h"
 
diff --git a/source/extensions/common/wasm/plugin.h b/source/extensions/common/wasm/plugin.h
index 1e053e607ffd0..ca42101f8de03 100644
--- a/source/extensions/common/wasm/plugin.h
+++ b/source/extensions/common/wasm/plugin.h
@@ -5,8 +5,8 @@
 #include "envoy/extensions/wasm/v3/wasm.pb.validate.h"
 #include "envoy/local_info/local_info.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "include/proxy-wasm/wasm.h"
 
diff --git a/source/extensions/common/wasm/wasm.cc b/source/extensions/common/wasm/wasm.cc
index c1e7d91a11cda..47de62bacd48e 100644
--- a/source/extensions/common/wasm/wasm.cc
+++ b/source/extensions/common/wasm/wasm.cc
@@ -1,14 +1,13 @@
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include <algorithm>
 #include <chrono>
 
 #include "envoy/event/deferred_deletable.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/common/wasm/plugin.h"
-#include "extensions/common/wasm/wasm_extension.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/wasm_extension.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/extensions/common/wasm/wasm.h b/source/extensions/common/wasm/wasm.h
index a44da29e56492..2b34132b668fc 100644
--- a/source/extensions/common/wasm/wasm.h
+++ b/source/extensions/common/wasm/wasm.h
@@ -14,16 +14,15 @@
 #include "envoy/thread_local/thread_local_object.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/config/datasource.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/version/version.h"
-
-#include "extensions/common/wasm/context.h"
-#include "extensions/common/wasm/plugin.h"
-#include "extensions/common/wasm/wasm_extension.h"
-#include "extensions/common/wasm/wasm_vm.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/datasource.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/version/version.h"
+#include "source/extensions/common/wasm/context.h"
+#include "source/extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/wasm_extension.h"
+#include "source/extensions/common/wasm/wasm_vm.h"
 
 #include "include/proxy-wasm/exports.h"
 #include "include/proxy-wasm/wasm.h"
diff --git a/source/extensions/common/wasm/wasm_extension.cc b/source/extensions/common/wasm/wasm_extension.cc
index 44b3b0776cd4d..376c7cd3cb59c 100644
--- a/source/extensions/common/wasm/wasm_extension.cc
+++ b/source/extensions/common/wasm/wasm_extension.cc
@@ -1,8 +1,8 @@
-#include "extensions/common/wasm/wasm_extension.h"
+#include "source/extensions/common/wasm/wasm_extension.h"
 
-#include "extensions/common/wasm/context.h"
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/common/wasm/wasm_vm.h"
+#include "source/extensions/common/wasm/context.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm_vm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/wasm/wasm_extension.h b/source/extensions/common/wasm/wasm_extension.h
index 706eb4f78c029..d365fec05246f 100644
--- a/source/extensions/common/wasm/wasm_extension.h
+++ b/source/extensions/common/wasm/wasm_extension.h
@@ -7,11 +7,10 @@
 #include "envoy/stats/stats.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/common/wasm/context.h"
-#include "extensions/common/wasm/plugin.h"
+#include "source/common/common/logger.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/common/wasm/context.h"
+#include "source/extensions/common/wasm/plugin.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/common/wasm/wasm_vm.cc b/source/extensions/common/wasm/wasm_vm.cc
index ca6538de5cf8b..c5827116cfeaf 100644
--- a/source/extensions/common/wasm/wasm_vm.cc
+++ b/source/extensions/common/wasm/wasm_vm.cc
@@ -1,12 +1,12 @@
-#include "extensions/common/wasm/wasm_vm.h"
+#include "source/extensions/common/wasm/wasm_vm.h"
 
 #include <algorithm>
 #include <memory>
 
-#include "extensions/common/wasm/context.h"
-#include "extensions/common/wasm/ext/envoy_null_vm_wasm_api.h"
-#include "extensions/common/wasm/wasm_extension.h"
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/context.h"
+#include "source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h"
+#include "source/extensions/common/wasm/wasm_extension.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/null_plugin.h"
 
diff --git a/source/extensions/common/wasm/wasm_vm.h b/source/extensions/common/wasm/wasm_vm.h
index 668f8a60f36b2..be8f77e0da3fa 100644
--- a/source/extensions/common/wasm/wasm_vm.h
+++ b/source/extensions/common/wasm/wasm_vm.h
@@ -6,7 +6,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/str_cat.h"
 #include "include/proxy-wasm/wasm_vm.h"
diff --git a/source/extensions/common/wasm/well_known_names.h b/source/extensions/common/wasm/well_known_names.h
new file mode 100644
index 0000000000000..580ecac609a6f
--- /dev/null
+++ b/source/extensions/common/wasm/well_known_names.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace Common {
+namespace Wasm {
+
+/**
+ * Well-known wasm runtime names.
+ * NOTE: New wasm runtimes should use the well known name: envoy.wasm.runtime.name.
+ */
+class WasmRuntimeValues {
+public:
+  // Wasmtime (https://github.com/bytecodealliance/wasmtime).
+  const std::string Wasmtime = "envoy.wasm.runtime.wasmtime";
+  // WAVM (https://github.com/WAVM/WAVM) Wasm VM.
+  const std::string Wavm = "envoy.wasm.runtime.wavm";
+  // Null sandbox: modules must be compiled into envoy and registered name is given in the
+  // DataSource.inline_string.
+  const std::string Null = "envoy.wasm.runtime.null";
+  // V8-based (https://v8.dev) WebAssembly runtime.
+  const std::string V8 = "envoy.wasm.runtime.v8";
+
+  // Filter state name
+  const std::string FilterState = "envoy.wasm";
+};
+
+using WasmRuntimeNames = ConstSingleton<WasmRuntimeValues>;
+
+} // namespace Wasm
+} // namespace Common
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/compression/brotli/common/base.cc b/source/extensions/compression/brotli/common/base.cc
index 12a9a944c8fdb..fd364124962c9 100644
--- a/source/extensions/compression/brotli/common/base.cc
+++ b/source/extensions/compression/brotli/common/base.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/brotli/common/base.h"
+#include "source/extensions/compression/brotli/common/base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/brotli/compressor/BUILD b/source/extensions/compression/brotli/compressor/BUILD
index d190709060059..c8e6e3a8a424b 100644
--- a/source/extensions/compression/brotli/compressor/BUILD
+++ b/source/extensions/compression/brotli/compressor/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     hdrs = ["brotli_compressor_impl.h"],
     external_deps = ["brotlienc"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_interface",
+        "//envoy/compression/compressor:compressor_interface",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/compression/brotli/common:brotli_base_lib",
     ],
diff --git a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc
index 4b4366fbe3aff..94b389cbefb64 100644
--- a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc
+++ b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc
@@ -1,6 +1,6 @@
-#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h"
+#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h
index ff153e81b6ad7..a30603865261e 100644
--- a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h
+++ b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/compression/compressor/compressor.h"
 
-#include "extensions/compression/brotli/common/base.h"
+#include "source/extensions/compression/brotli/common/base.h"
 
 #include "brotli/encode.h"
 
diff --git a/source/extensions/compression/brotli/compressor/config.cc b/source/extensions/compression/brotli/compressor/config.cc
index 4ca5f639f1a0d..0f5559aa5c6f7 100644
--- a/source/extensions/compression/brotli/compressor/config.cc
+++ b/source/extensions/compression/brotli/compressor/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/brotli/compressor/config.h"
+#include "source/extensions/compression/brotli/compressor/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/brotli/compressor/config.h b/source/extensions/compression/brotli/compressor/config.h
index 7046676421337..9cd3d8bc869e3 100644
--- a/source/extensions/compression/brotli/compressor/config.h
+++ b/source/extensions/compression/brotli/compressor/config.h
@@ -4,10 +4,9 @@
 #include "envoy/extensions/compression/brotli/compressor/v3/brotli.pb.h"
 #include "envoy/extensions/compression/brotli/compressor/v3/brotli.pb.validate.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h"
-#include "extensions/compression/common/compressor/factory_base.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h"
+#include "source/extensions/compression/common/compressor/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/brotli/decompressor/BUILD b/source/extensions/compression/brotli/decompressor/BUILD
index 22ae257a84ab9..252eb0e072ac0 100644
--- a/source/extensions/compression/brotli/decompressor/BUILD
+++ b/source/extensions/compression/brotli/decompressor/BUILD
@@ -15,9 +15,9 @@ envoy_cc_library(
     hdrs = ["brotli_decompressor_impl.h"],
     external_deps = ["brotlidec"],
     deps = [
-        "//include/envoy/compression/decompressor:decompressor_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/compression/decompressor:decompressor_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/compression/brotli/common:brotli_base_lib",
     ],
diff --git a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc
index 634c832b80332..adc2dbb9c731b 100644
--- a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc
+++ b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
+#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
 
 #include <memory>
 
diff --git a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h
index 26472903410f2..f55f6a7c545ac 100644
--- a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h
+++ b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h
@@ -4,7 +4,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "extensions/compression/brotli/common/base.h"
+#include "source/extensions/compression/brotli/common/base.h"
 
 #include "brotli/decode.h"
 
diff --git a/source/extensions/compression/brotli/decompressor/config.cc b/source/extensions/compression/brotli/decompressor/config.cc
index 63ae34cd2f994..f8b21e1a7a106 100644
--- a/source/extensions/compression/brotli/decompressor/config.cc
+++ b/source/extensions/compression/brotli/decompressor/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/brotli/decompressor/config.h"
+#include "source/extensions/compression/brotli/decompressor/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/brotli/decompressor/config.h b/source/extensions/compression/brotli/decompressor/config.h
index 111e9b5ebe77e..632a11d91cde9 100644
--- a/source/extensions/compression/brotli/decompressor/config.h
+++ b/source/extensions/compression/brotli/decompressor/config.h
@@ -4,10 +4,9 @@
 #include "envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.h"
 #include "envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.validate.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
-#include "extensions/compression/common/decompressor/factory_base.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
+#include "source/extensions/compression/common/decompressor/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/common/compressor/BUILD b/source/extensions/compression/common/compressor/BUILD
index db3d5c88ae16f..3756d2ae341f1 100644
--- a/source/extensions/compression/common/compressor/BUILD
+++ b/source/extensions/compression/common/compressor/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "compressor_factory_base_lib",
     hdrs = ["factory_base.h"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_config_interface",
-        "//include/envoy/compression/compressor:compressor_factory_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/compression/compressor:compressor_config_interface",
+        "//envoy/compression/compressor:compressor_factory_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
diff --git a/source/extensions/compression/common/decompressor/BUILD b/source/extensions/compression/common/decompressor/BUILD
index 0d69c90a8acdc..da1d737174d47 100644
--- a/source/extensions/compression/common/decompressor/BUILD
+++ b/source/extensions/compression/common/decompressor/BUILD
@@ -12,6 +12,6 @@ envoy_cc_library(
     name = "decompressor_factory_base_lib",
     hdrs = ["factory_base.h"],
     deps = [
-        "//include/envoy/compression/decompressor:decompressor_config_interface",
+        "//envoy/compression/decompressor:decompressor_config_interface",
     ],
 )
diff --git a/source/extensions/compression/gzip/common/base.cc b/source/extensions/compression/gzip/common/base.cc
index b3843c1aec1ff..0e956c1826067 100644
--- a/source/extensions/compression/gzip/common/base.cc
+++ b/source/extensions/compression/gzip/common/base.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/gzip/common/base.h"
+#include "source/extensions/compression/gzip/common/base.h"
 
 namespace Envoy {
 namespace Zlib {
diff --git a/source/extensions/compression/gzip/compressor/BUILD b/source/extensions/compression/gzip/compressor/BUILD
index 1274b4d8e6ea7..672f5cfe500a6 100644
--- a/source/extensions/compression/gzip/compressor/BUILD
+++ b/source/extensions/compression/gzip/compressor/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     hdrs = ["zlib_compressor_impl.h"],
     external_deps = ["zlib"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_interface",
+        "//envoy/compression/compressor:compressor_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/extensions/compression/gzip/common:zlib_base_lib",
diff --git a/source/extensions/compression/gzip/compressor/config.cc b/source/extensions/compression/gzip/compressor/config.cc
index 0971a9a905864..4b4b07251709b 100644
--- a/source/extensions/compression/gzip/compressor/config.cc
+++ b/source/extensions/compression/gzip/compressor/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/gzip/compressor/config.h"
+#include "source/extensions/compression/gzip/compressor/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/gzip/compressor/config.h b/source/extensions/compression/gzip/compressor/config.h
index 2fcee31020b30..cb45ac8546386 100644
--- a/source/extensions/compression/gzip/compressor/config.h
+++ b/source/extensions/compression/gzip/compressor/config.h
@@ -4,11 +4,10 @@
 #include "envoy/extensions/compression/gzip/compressor/v3/gzip.pb.h"
 #include "envoy/extensions/compression/gzip/compressor/v3/gzip.pb.validate.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/compression/common/compressor/factory_base.h"
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/compression/common/compressor/factory_base.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc
index 432c36e970150..9cde79fadacf9 100644
--- a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc
+++ b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc
@@ -1,10 +1,10 @@
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
 
 #include <memory>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h
index deddf3aac37a5..0bb86a46ec912 100644
--- a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h
+++ b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h
@@ -2,7 +2,7 @@
 
 #include "envoy/compression/compressor/compressor.h"
 
-#include "extensions/compression/gzip/common/base.h"
+#include "source/extensions/compression/gzip/common/base.h"
 
 #include "zlib.h"
 
diff --git a/source/extensions/compression/gzip/decompressor/BUILD b/source/extensions/compression/gzip/decompressor/BUILD
index 541aa8bf8df96..13939fdcbf2c9 100644
--- a/source/extensions/compression/gzip/decompressor/BUILD
+++ b/source/extensions/compression/gzip/decompressor/BUILD
@@ -15,9 +15,9 @@ envoy_cc_library(
     hdrs = ["zlib_decompressor_impl.h"],
     external_deps = ["zlib"],
     deps = [
-        "//include/envoy/compression/decompressor:decompressor_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/compression/decompressor:decompressor_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
diff --git a/source/extensions/compression/gzip/decompressor/config.cc b/source/extensions/compression/gzip/decompressor/config.cc
index 66ea8d0a6494f..d7b5dbbff0768 100644
--- a/source/extensions/compression/gzip/decompressor/config.cc
+++ b/source/extensions/compression/gzip/decompressor/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/gzip/decompressor/config.h"
+#include "source/extensions/compression/gzip/decompressor/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/gzip/decompressor/config.h b/source/extensions/compression/gzip/decompressor/config.h
index 34c9ca11bf57b..4394ae66a1cdf 100644
--- a/source/extensions/compression/gzip/decompressor/config.h
+++ b/source/extensions/compression/gzip/decompressor/config.h
@@ -4,10 +4,9 @@
 #include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.h"
 #include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/compression/common/decompressor/factory_base.h"
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/compression/common/decompressor/factory_base.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc
index 9066af8f0426f..966730c238805 100644
--- a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc
+++ b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 #include <zlib.h>
 
@@ -6,7 +6,7 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h
index ec20b8c8dbcaa..78bfb1147b38f 100644
--- a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h
+++ b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h
@@ -4,9 +4,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/compression/gzip/common/base.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/compression/gzip/common/base.h"
 
 #include "zlib.h"
 
diff --git a/source/extensions/filters/common/expr/BUILD b/source/extensions/filters/common/expr/BUILD
index 70fe78aad022d..dc146b13b9a6c 100644
--- a/source/extensions/filters/common/expr/BUILD
+++ b/source/extensions/filters/common/expr/BUILD
@@ -50,7 +50,7 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/protobuf",
         "//source/common/singleton:const_singleton",
         "@com_github_google_flatbuffers//:flatbuffers",
diff --git a/source/extensions/filters/common/expr/cel_state.cc b/source/extensions/filters/common/expr/cel_state.cc
index 72774378162f3..7a25144b80ede 100644
--- a/source/extensions/filters/common/expr/cel_state.cc
+++ b/source/extensions/filters/common/expr/cel_state.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/expr/cel_state.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
 
 #include "eval/public/structs/cel_proto_wrapper.h"
 #include "flatbuffers/reflection.h"
diff --git a/source/extensions/filters/common/expr/cel_state.h b/source/extensions/filters/common/expr/cel_state.h
index 703a271a0860b..6c4659dcc53b9 100644
--- a/source/extensions/filters/common/expr/cel_state.h
+++ b/source/extensions/filters/common/expr/cel_state.h
@@ -4,8 +4,8 @@
 
 #include "envoy/stream_info/filter_state.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/extensions/filters/common/expr/context.cc b/source/extensions/filters/common/expr/context.cc
index a0d6213ec4bba..66603460003c6 100644
--- a/source/extensions/filters/common/expr/context.cc
+++ b/source/extensions/filters/common/expr/context.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/common/expr/context.h"
+#include "source/extensions/filters/common/expr/context.h"
 
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/common/expr/cel_state.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/time/time.h"
diff --git a/source/extensions/filters/common/expr/context.h b/source/extensions/filters/common/expr/context.h
index ad6fcb9721609..2f3f2539c98c5 100644
--- a/source/extensions/filters/common/expr/context.h
+++ b/source/extensions/filters/common/expr/context.h
@@ -3,9 +3,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/grpc/status.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
 
 #include "eval/public/cel_value.h"
 #include "eval/public/cel_value_producer.h"
diff --git a/source/extensions/filters/common/expr/evaluator.cc b/source/extensions/filters/common/expr/evaluator.cc
index 4a7ed3c9fc4cd..3c5e04dd5955d 100644
--- a/source/extensions/filters/common/expr/evaluator.cc
+++ b/source/extensions/filters/common/expr/evaluator.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 #include "envoy/common/exception.h"
 
diff --git a/source/extensions/filters/common/expr/evaluator.h b/source/extensions/filters/common/expr/evaluator.h
index 32ee98572f354..2e00d620f9e82 100644
--- a/source/extensions/filters/common/expr/evaluator.h
+++ b/source/extensions/filters/common/expr/evaluator.h
@@ -2,10 +2,9 @@
 
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/http/headers.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/common/expr/context.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/common/expr/context.h"
 
 #include "eval/public/cel_expression.h"
 #include "eval/public/cel_value.h"
diff --git a/source/extensions/filters/common/ext_authz/BUILD b/source/extensions/filters/common/ext_authz/BUILD
index fdd81e0081d89..fe5d536b437ff 100644
--- a/source/extensions/filters/common/ext_authz/BUILD
+++ b/source/extensions/filters/common/ext_authz/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "ext_authz_interface",
     hdrs = ["ext_authz.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/http:headers_lib",
         "//source/common/tracing:http_tracer_lib",
         "@envoy_api//envoy/service/auth/v3:pkg_cc_proto",
@@ -27,15 +27,15 @@ envoy_cc_library(
     deps = [
         ":check_request_utils_lib",
         ":ext_authz_interface",
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:protocol_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:protocol_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:async_client_lib",
         "//source/common/grpc:typed_async_client_lib",
@@ -57,7 +57,7 @@ envoy_cc_library(
     deps = [
         ":check_request_utils_lib",
         ":ext_authz_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:matchers_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:async_client_lib",
@@ -76,10 +76,10 @@ envoy_cc_library(
     hdrs = ["check_request_utils.h"],
     deps = [
         ":ext_authz_interface",
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/grpc:async_client_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/auth/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.cc b/source/extensions/filters/common/ext_authz/check_request_utils.cc
index e77dd8e0b32b1..f389dea8201d8 100644
--- a/source/extensions/filters/common/ext_authz/check_request_utils.cc
+++ b/source/extensions/filters/common/ext_authz/check_request_utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/ext_authz/check_request_utils.h"
+#include "source/extensions/filters/common/ext_authz/check_request_utils.h"
 
 #include <chrono>
 #include <cstdint>
@@ -10,18 +10,17 @@
 #include "envoy/service/auth/v3/external_auth.pb.h"
 #include "envoy/ssl/connection.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/http/codes.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.h b/source/extensions/filters/common/ext_authz/check_request_utils.h
index f0272d6741666..cb47e4e05737d 100644
--- a/source/extensions/filters/common/ext_authz/check_request_utils.h
+++ b/source/extensions/filters/common/ext_authz/check_request_utils.h
@@ -19,8 +19,8 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/async_client_impl.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ext_authz/ext_authz.h b/source/extensions/filters/common/ext_authz/ext_authz.h
index 0d89e58031614..3d06846ed1123 100644
--- a/source/extensions/filters/common/ext_authz/ext_authz.h
+++ b/source/extensions/filters/common/ext_authz/ext_authz.h
@@ -11,8 +11,8 @@
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/http/headers.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/http/headers.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc
index ee6027ca0ad9f..2902b954ff221 100644
--- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc
+++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/service/auth/v3/external_auth.pb.h"
 
-#include "common/common/assert.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h
index e9e7edfb46357..4dc841eedd7a7 100644
--- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h
+++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h
@@ -20,10 +20,9 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/grpc/typed_async_client.h"
-
-#include "extensions/filters/common/ext_authz/check_request_utils.h"
-#include "extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/extensions/filters/common/ext_authz/check_request_utils.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc
index 11da8bc4f7dd8..f80b3022080a0 100644
--- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc
+++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc
@@ -1,16 +1,16 @@
-#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h"
 #include "envoy/service/auth/v3/external_auth.pb.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/matchers.h"
-#include "common/http/async_client_impl.h"
-#include "common/http/codes.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/http/codes.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h
index f2e6e5726973d..ab13c2b494fa8 100644
--- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h
+++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h
@@ -7,11 +7,10 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/router/header_parser.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/router/header_parser.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/fault/BUILD b/source/extensions/filters/common/fault/BUILD
index bf05af548e013..a8a2e84e58e8a 100644
--- a/source/extensions/filters/common/fault/BUILD
+++ b/source/extensions/filters/common/fault/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     srcs = ["fault_config.cc"],
     hdrs = ["fault_config.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:codes_lib",
         "//source/common/http:headers_lib",
         "//source/common/protobuf:utility_lib",
diff --git a/source/extensions/filters/common/fault/fault_config.cc b/source/extensions/filters/common/fault/fault_config.cc
index db7f6028152cf..2f263e9f9346a 100644
--- a/source/extensions/filters/common/fault/fault_config.cc
+++ b/source/extensions/filters/common/fault/fault_config.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/common/fault/fault_config.h"
+#include "source/extensions/filters/common/fault/fault_config.h"
 
 #include "envoy/extensions/filters/common/fault/v3/fault.pb.h"
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/fault/fault_config.h b/source/extensions/filters/common/fault/fault_config.h
index eca8c7918aee6..486b7ac0d8fd4 100644
--- a/source/extensions/filters/common/fault/fault_config.h
+++ b/source/extensions/filters/common/fault/fault_config.h
@@ -6,9 +6,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/http/codes.h"
-#include "common/http/headers.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/headers.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/local_ratelimit/BUILD b/source/extensions/filters/common/local_ratelimit/BUILD
index 0234c335c3e68..2e6af5b6daccc 100644
--- a/source/extensions/filters/common/local_ratelimit/BUILD
+++ b/source/extensions/filters/common/local_ratelimit/BUILD
@@ -13,9 +13,9 @@ envoy_cc_library(
     srcs = ["local_ratelimit_impl.cc"],
     hdrs = ["local_ratelimit_impl.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/ratelimit:ratelimit_interface",
         "//source/common/common:thread_synchronizer_lib",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/extensions/common/ratelimit/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc
index ab3100e503911..1acd3049456cd 100644
--- a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc
+++ b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
+#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h
index 2c66a1e0f9150..ab8f4e3a5ea51 100644
--- a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h
+++ b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h
@@ -7,8 +7,8 @@
 #include "envoy/extensions/common/ratelimit/v3/ratelimit.pb.h"
 #include "envoy/ratelimit/ratelimit.h"
 
-#include "common/common/thread_synchronizer.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/lua/BUILD b/source/extensions/filters/common/lua/BUILD
index 78894e43b475f..ede969dfc1d22 100644
--- a/source/extensions/filters/common/lua/BUILD
+++ b/source/extensions/filters/common/lua/BUILD
@@ -27,7 +27,7 @@ envoy_cc_library(
     srcs = ["lua.cc"],
     hdrs = ["lua.h"],
     deps = [
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:lock_guard_lib",
         "//source/common/common:thread_lib",
@@ -45,7 +45,7 @@ envoy_cc_library(
     hdrs = ["wrappers.h"],
     deps = [
         ":lua_lib",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:hex_lib",
         "//source/common/protobuf",
     ],
diff --git a/source/extensions/filters/common/lua/lua.cc b/source/extensions/filters/common/lua/lua.cc
index e5daf32216398..d399510368bd3 100644
--- a/source/extensions/filters/common/lua/lua.cc
+++ b/source/extensions/filters/common/lua/lua.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/common/lua/lua.h"
+#include "source/extensions/filters/common/lua/lua.h"
 
 #include <memory>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/lua/lua.h b/source/extensions/filters/common/lua/lua.h
index d911316eb82b8..54bdcabe33bc5 100644
--- a/source/extensions/filters/common/lua/lua.h
+++ b/source/extensions/filters/common/lua/lua.h
@@ -7,9 +7,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/assert.h"
-#include "common/common/c_smart_ptr.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/common/logger.h"
 
 #include "lua.hpp"
 
diff --git a/source/extensions/filters/common/lua/wrappers.cc b/source/extensions/filters/common/lua/wrappers.cc
index 8c26d9e10bec9..cb148e18bcfe2 100644
--- a/source/extensions/filters/common/lua/wrappers.cc
+++ b/source/extensions/filters/common/lua/wrappers.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/common/lua/wrappers.h"
+#include "source/extensions/filters/common/lua/wrappers.h"
 
 #include <lua.h>
 
 #include <cstdint>
 
-#include "common/common/assert.h"
-#include "common/common/hex.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hex.h"
 
 #include "absl/time/time.h"
 
diff --git a/source/extensions/filters/common/lua/wrappers.h b/source/extensions/filters/common/lua/wrappers.h
index 2b0f39970c746..344467d39ff2c 100644
--- a/source/extensions/filters/common/lua/wrappers.h
+++ b/source/extensions/filters/common/lua/wrappers.h
@@ -2,9 +2,8 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/common/lua/lua.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/common/lua/lua.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/original_src/BUILD b/source/extensions/filters/common/original_src/BUILD
index 0c4b4832e2e35..a8422fdc3d335 100644
--- a/source/extensions/filters/common/original_src/BUILD
+++ b/source/extensions/filters/common/original_src/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     srcs = ["original_src_socket_option.cc"],
     hdrs = ["original_src_socket_option.h"],
     deps = [
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/network:address_lib",
@@ -30,7 +30,7 @@ envoy_cc_library(
     hdrs = ["socket_option_factory.h"],
     deps = [
         ":original_src_socket_option_lib",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/network:address_lib",
         "//source/common/network:socket_option_factory_lib",
         "//source/common/network:utility_lib",
diff --git a/source/extensions/filters/common/original_src/original_src_socket_option.cc b/source/extensions/filters/common/original_src/original_src_socket_option.cc
index 4bdbdd4ea7f8e..0942ffd113d8d 100644
--- a/source/extensions/filters/common/original_src/original_src_socket_option.cc
+++ b/source/extensions/filters/common/original_src/original_src_socket_option.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/common/original_src/original_src_socket_option.h"
+#include "source/extensions/filters/common/original_src/original_src_socket_option.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/original_src/socket_option_factory.cc b/source/extensions/filters/common/original_src/socket_option_factory.cc
index cf84b9d26596c..47f429cce8ca0 100644
--- a/source/extensions/filters/common/original_src/socket_option_factory.cc
+++ b/source/extensions/filters/common/original_src/socket_option_factory.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/common/original_src/socket_option_factory.h"
+#include "source/extensions/filters/common/original_src/socket_option_factory.h"
 
-#include "common/network/socket_option_factory.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/original_src/original_src_socket_option.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/original_src/original_src_socket_option.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ratelimit/BUILD b/source/extensions/filters/common/ratelimit/BUILD
index 4bf0b36b1e5de..0f4978d7025f2 100644
--- a/source/extensions/filters/common/ratelimit/BUILD
+++ b/source/extensions/filters/common/ratelimit/BUILD
@@ -14,11 +14,11 @@ envoy_cc_library(
     hdrs = ["ratelimit_impl.h"],
     deps = [
         ":ratelimit_client_interface",
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_manager_interface",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/grpc:typed_async_client_lib",
@@ -35,9 +35,9 @@ envoy_cc_library(
     hdrs = ["ratelimit.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/singleton:manager_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/singleton:manager_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/stats:symbol_table_lib",
         "@envoy_api//envoy/service/ratelimit/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc
index 055d2e8cdd55a..37378240d5c3b 100644
--- a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc
+++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -9,9 +9,9 @@
 #include "envoy/extensions/common/ratelimit/v3/ratelimit.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.h b/source/extensions/filters/common/ratelimit/ratelimit_impl.h
index 4386102a21ca7..7ff0f1a7a8253 100644
--- a/source/extensions/filters/common/ratelimit/ratelimit_impl.h
+++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.h
@@ -15,11 +15,10 @@
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/grpc/typed_async_client.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/ratelimit/stat_names.h b/source/extensions/filters/common/ratelimit/stat_names.h
index 33dd13a188b34..45161fe43d44e 100644
--- a/source/extensions/filters/common/ratelimit/stat_names.h
+++ b/source/extensions/filters/common/ratelimit/stat_names.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/rbac/BUILD b/source/extensions/filters/common/rbac/BUILD
index 14c649ca43406..5d8e3712c0e2a 100644
--- a/source/extensions/filters/common/rbac/BUILD
+++ b/source/extensions/filters/common/rbac/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     hdrs = ["utility.h"],
     deps = [
         ":engine_lib",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/singleton:const_singleton",
     ],
 )
@@ -25,8 +25,8 @@ envoy_cc_library(
     hdrs = ["matchers.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:matchers_lib",
         "//source/common/http:header_utility_lib",
@@ -43,9 +43,9 @@ envoy_cc_library(
     name = "engine_interface",
     hdrs = ["engine.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
     ],
 )
 
diff --git a/source/extensions/filters/common/rbac/engine_impl.cc b/source/extensions/filters/common/rbac/engine_impl.cc
index dc2a6ba79222a..dbac3dee1135a 100644
--- a/source/extensions/filters/common/rbac/engine_impl.cc
+++ b/source/extensions/filters/common/rbac/engine_impl.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/common/rbac/engine_impl.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
 
 #include "envoy/config/rbac/v3/rbac.pb.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/rbac/engine_impl.h b/source/extensions/filters/common/rbac/engine_impl.h
index 0aacfb41f8e15..237d4fd79868f 100644
--- a/source/extensions/filters/common/rbac/engine_impl.h
+++ b/source/extensions/filters/common/rbac/engine_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/config/rbac/v3/rbac.pb.h"
 
-#include "extensions/filters/common/rbac/engine.h"
-#include "extensions/filters/common/rbac/matchers.h"
+#include "source/extensions/filters/common/rbac/engine.h"
+#include "source/extensions/filters/common/rbac/matchers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/rbac/matchers.cc b/source/extensions/filters/common/rbac/matchers.cc
index eac3c3d20576e..25d8e2de63b54 100644
--- a/source/extensions/filters/common/rbac/matchers.cc
+++ b/source/extensions/filters/common/rbac/matchers.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/common/rbac/matchers.h"
+#include "source/extensions/filters/common/rbac/matchers.h"
 
 #include "envoy/config/rbac/v3/rbac.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/rbac/matchers.h b/source/extensions/filters/common/rbac/matchers.h
index a73bcf3732665..472b4a2c9c17e 100644
--- a/source/extensions/filters/common/rbac/matchers.h
+++ b/source/extensions/filters/common/rbac/matchers.h
@@ -10,11 +10,10 @@
 #include "envoy/type/matcher/v3/path.pb.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/matchers.h"
-#include "common/http/header_utility.h"
-#include "common/network/cidr_range.h"
-
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/network/cidr_range.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/common/rbac/utility.cc b/source/extensions/filters/common/rbac/utility.cc
index 8273e9659c207..3e2697745cfa8 100644
--- a/source/extensions/filters/common/rbac/utility.cc
+++ b/source/extensions/filters/common/rbac/utility.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/rbac/utility.h"
+#include "source/extensions/filters/common/rbac/utility.h"
 
 #include <string>
 
diff --git a/source/extensions/filters/common/rbac/utility.h b/source/extensions/filters/common/rbac/utility.h
index 91f8711f2210a..f4acc822a36fb 100644
--- a/source/extensions/filters/common/rbac/utility.h
+++ b/source/extensions/filters/common/rbac/utility.h
@@ -2,10 +2,9 @@
 
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/fmt.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/common/rbac/engine_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/adaptive_concurrency/BUILD b/source/extensions/filters/http/adaptive_concurrency/BUILD
index 8baef84564d7e..a3f7ad6748ea5 100644
--- a/source/extensions/filters/http/adaptive_concurrency/BUILD
+++ b/source/extensions/filters/http/adaptive_concurrency/BUILD
@@ -18,7 +18,7 @@ envoy_cc_library(
     srcs = ["adaptive_concurrency_filter.cc"],
     hdrs = ["adaptive_concurrency_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/adaptive_concurrency/controller:controller_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
@@ -31,7 +31,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/adaptive_concurrency:adaptive_concurrency_filter_lib",
         "//source/extensions/filters/http/adaptive_concurrency/controller:controller_lib",
diff --git a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc
index 1b2d7400f771b..d03da5915c84d 100644
--- a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc
+++ b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
+#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
 
 #include <chrono>
 #include <cstdint>
@@ -7,11 +7,10 @@
 
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h
index 7424e1d3bdbaa..4b426a732217f 100644
--- a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h
+++ b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h
@@ -11,11 +11,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/cleanup.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/adaptive_concurrency/config.cc b/source/extensions/filters/http/adaptive_concurrency/config.cc
index 45783f034de11..5abc39bf6fd97 100644
--- a/source/extensions/filters/http/adaptive_concurrency/config.cc
+++ b/source/extensions/filters/http/adaptive_concurrency/config.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/http/adaptive_concurrency/config.h"
+#include "source/extensions/filters/http/adaptive_concurrency/config.h"
 
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h"
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
-#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
+#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/adaptive_concurrency/config.h b/source/extensions/filters/http/adaptive_concurrency/config.h
index da9733579cf91..27fdd0ef87e47 100644
--- a/source/extensions/filters/http/adaptive_concurrency/config.h
+++ b/source/extensions/filters/http/adaptive_concurrency/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h"
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/BUILD b/source/extensions/filters/http/adaptive_concurrency/controller/BUILD
index 67e85c133f4d1..60cb03dd31d2a 100644
--- a/source/extensions/filters/http/adaptive_concurrency/controller/BUILD
+++ b/source/extensions/filters/http/adaptive_concurrency/controller/BUILD
@@ -23,7 +23,7 @@ envoy_cc_library(
         "libcircllhist",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/common:thread_synchronizer_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc
index aa9bc226d74f4..c00112da2ede4 100644
--- a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc
+++ b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
 
 #include <atomic>
 #include <chrono>
@@ -9,11 +9,10 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/cleanup.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h
index 0309aaa0c6eaa..1764f4aec6cb3 100644
--- a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h
+++ b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h
@@ -10,9 +10,8 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/thread_synchronizer.h"
-
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/numbers.h"
diff --git a/source/extensions/filters/http/admission_control/BUILD b/source/extensions/filters/http/admission_control/BUILD
index f7b60baf0ef51..c6cec4e9a52dc 100644
--- a/source/extensions/filters/http/admission_control/BUILD
+++ b/source/extensions/filters/http/admission_control/BUILD
@@ -23,9 +23,9 @@ envoy_cc_library(
         "thread_local_controller.h",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/thread_local:thread_local_object",
+        "//envoy/http:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/thread_local:thread_local_object",
         "//source/common/common:cleanup_lib",
         "//source/common/http:codes_lib",
         "//source/common/runtime:runtime_lib",
@@ -41,7 +41,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:enum_to_int",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/admission_control:admission_control_filter_lib",
diff --git a/source/extensions/filters/http/admission_control/admission_control.cc b/source/extensions/filters/http/admission_control/admission_control.cc
index 9329e10ab351a..3576dfb9099d5 100644
--- a/source/extensions/filters/http/admission_control/admission_control.cc
+++ b/source/extensions/filters/http/admission_control/admission_control.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/admission_control/admission_control.h"
+#include "source/extensions/filters/http/admission_control/admission_control.h"
 
 #include <chrono>
 #include <cstdint>
@@ -12,15 +12,14 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/enum_to_int.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/admission_control.h b/source/extensions/filters/http/admission_control/admission_control.h
index 7b4e83de80c7f..7e6b0d159b876 100644
--- a/source/extensions/filters/http/admission_control/admission_control.h
+++ b/source/extensions/filters/http/admission_control/admission_control.h
@@ -14,16 +14,15 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/logger.h"
-#include "common/grpc/common.h"
-#include "common/grpc/status.h"
-#include "common/http/codes.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h"
-#include "extensions/filters/http/admission_control/thread_local_controller.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/codes.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h"
+#include "source/extensions/filters/http/admission_control/thread_local_controller.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/config.cc b/source/extensions/filters/http/admission_control/config.cc
index 27b7f9f1eb253..e28e0445b6435 100644
--- a/source/extensions/filters/http/admission_control/config.cc
+++ b/source/extensions/filters/http/admission_control/config.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/http/admission_control/config.h"
+#include "source/extensions/filters/http/admission_control/config.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/enum_to_int.h"
-
-#include "extensions/filters/http/admission_control/admission_control.h"
-#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h"
-#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/extensions/filters/http/admission_control/admission_control.h"
+#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h"
+#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/config.h b/source/extensions/filters/http/admission_control/config.h
index 8abe84eafefcb..e8ca3c6e8322b 100644
--- a/source/extensions/filters/http/admission_control/config.h
+++ b/source/extensions/filters/http/admission_control/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/evaluators/BUILD b/source/extensions/filters/http/admission_control/evaluators/BUILD
index c5c72ee2db5ca..cddd0f2f0a43f 100644
--- a/source/extensions/filters/http/admission_control/evaluators/BUILD
+++ b/source/extensions/filters/http/admission_control/evaluators/BUILD
@@ -19,7 +19,7 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/grpc:status",
+        "//envoy/grpc:status",
         "//source/common/common:enum_to_int",
         "@envoy_api//envoy/extensions/filters/http/admission_control/v3alpha:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc
index 6771bfba9a7b2..5a7ae7fc915c7 100644
--- a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc
+++ b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
+#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
 
 #include <algorithm>
 
 #include "envoy/common/exception.h"
 #include "envoy/grpc/status.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h
index 511d54408f42e..551975ead8818 100644
--- a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h
+++ b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h
@@ -5,7 +5,7 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 
-#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h"
+#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/admission_control/thread_local_controller.cc b/source/extensions/filters/http/admission_control/thread_local_controller.cc
index 30f0aac40061c..e98ee62433cbb 100644
--- a/source/extensions/filters/http/admission_control/thread_local_controller.cc
+++ b/source/extensions/filters/http/admission_control/thread_local_controller.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/admission_control/thread_local_controller.h"
+#include "source/extensions/filters/http/admission_control/thread_local_controller.h"
 
 #include <cstdint>
 
diff --git a/source/extensions/filters/http/aws_lambda/BUILD b/source/extensions/filters/http/aws_lambda/BUILD
index 43544b5eccee7..11026fd340101 100644
--- a/source/extensions/filters/http/aws_lambda/BUILD
+++ b/source/extensions/filters/http/aws_lambda/BUILD
@@ -24,7 +24,7 @@ envoy_cc_library(
     hdrs = ["aws_lambda_filter.h"],
     deps = [
         ":request_response_cc_proto",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/common:base64_lib",
         "//source/extensions/common/aws:credentials_provider_impl_lib",
         "//source/extensions/common/aws:signer_impl_lib",
@@ -39,7 +39,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":aws_lambda_filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/aws_lambda/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc
index e1597a36ae95f..01655e1aa41e3 100644
--- a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc
+++ b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h"
+#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h"
 
 #include <string>
 #include <vector>
@@ -8,20 +8,18 @@
 #include "envoy/http/header_map.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/base64.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/const_singleton.h"
-
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/const_singleton.h"
 #include "source/extensions/filters/http/aws_lambda/request_response.pb.validate.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h
index 82bfdaf85cf2f..be3d03d3a24c3 100644
--- a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h
+++ b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h
@@ -5,10 +5,9 @@
 #include "envoy/http/filter.h"
 #include "envoy/stats/scope.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/common/aws/signer.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/common/aws/signer.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/aws_lambda/config.cc b/source/extensions/filters/http/aws_lambda/config.cc
index c784020da619d..a538f07847ddd 100644
--- a/source/extensions/filters/http/aws_lambda/config.cc
+++ b/source/extensions/filters/http/aws_lambda/config.cc
@@ -1,16 +1,15 @@
-#include "extensions/filters/http/aws_lambda/config.h"
+#include "source/extensions/filters/http/aws_lambda/config.h"
 
 #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/fmt.h"
-
-#include "extensions/common/aws/credentials_provider_impl.h"
-#include "extensions/common/aws/signer_impl.h"
-#include "extensions/common/aws/utility.h"
-#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/common/aws/credentials_provider_impl.h"
+#include "source/extensions/common/aws/signer_impl.h"
+#include "source/extensions/common/aws/utility.h"
+#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/aws_lambda/config.h b/source/extensions/filters/http/aws_lambda/config.h
index fbdfb26ff9e71..50705ea95270d 100644
--- a/source/extensions/filters/http/aws_lambda/config.h
+++ b/source/extensions/filters/http/aws_lambda/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.h"
 #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/aws_request_signing/BUILD b/source/extensions/filters/http/aws_request_signing/BUILD
index b1bcf820a85e5..5093d9d759837 100644
--- a/source/extensions/filters/http/aws_request_signing/BUILD
+++ b/source/extensions/filters/http/aws_request_signing/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     srcs = ["aws_request_signing_filter.cc"],
     hdrs = ["aws_request_signing_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/extensions/common/aws:credentials_provider_impl_lib",
         "//source/extensions/common/aws:signer_impl_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
@@ -31,7 +31,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":aws_request_signing_filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/aws:credentials_provider_impl_lib",
         "//source/extensions/common/aws:signer_impl_lib",
         "//source/extensions/filters/http:well_known_names",
diff --git a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc
index 4a9fb083345dd..94b1c6add1a68 100644
--- a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc
+++ b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
+#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
 
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h"
 
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h
index 2903ec4898530..2ae73277d995d 100644
--- a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h
+++ b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h
@@ -5,8 +5,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "extensions/common/aws/signer.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/common/aws/signer.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/aws_request_signing/config.cc b/source/extensions/filters/http/aws_request_signing/config.cc
index 11396f39e0523..02408ec90a091 100644
--- a/source/extensions/filters/http/aws_request_signing/config.cc
+++ b/source/extensions/filters/http/aws_request_signing/config.cc
@@ -1,13 +1,13 @@
-#include "extensions/filters/http/aws_request_signing/config.h"
+#include "source/extensions/filters/http/aws_request_signing/config.h"
 
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h"
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/aws/credentials_provider_impl.h"
-#include "extensions/common/aws/signer_impl.h"
-#include "extensions/common/aws/utility.h"
-#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
+#include "source/extensions/common/aws/credentials_provider_impl.h"
+#include "source/extensions/common/aws/signer_impl.h"
+#include "source/extensions/common/aws/utility.h"
+#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/aws_request_signing/config.h b/source/extensions/filters/http/aws_request_signing/config.h
index 21128e3d755a8..4dad8a603d64d 100644
--- a/source/extensions/filters/http/aws_request_signing/config.h
+++ b/source/extensions/filters/http/aws_request_signing/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h"
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/bandwidth_limit/BUILD b/source/extensions/filters/http/bandwidth_limit/BUILD
index 723e3aa158f38..3f3b5e3f72735 100644
--- a/source/extensions/filters/http/bandwidth_limit/BUILD
+++ b/source/extensions/filters/http/bandwidth_limit/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["bandwidth_limit.cc"],
     hdrs = ["bandwidth_limit.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/http:codes_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:shared_token_bucket_impl_lib",
         "//source/common/common:utility_lib",
         "//source/common/http:header_utility_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":bandwidth_limit_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/bandwidth_limit/v3alpha:pkg_cc_proto",
diff --git a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc
index 23735fe9b1664..6d831d6de8903 100644
--- a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc
+++ b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
+#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
 
 #include <string>
 #include <vector>
 
 #include "envoy/http/codes.h"
 
-#include "common/http/utility.h"
-#include "common/stats/timespan_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/stats/timespan_impl.h"
 
 using envoy::extensions::filters::http::bandwidth_limit::v3alpha::BandwidthLimit;
 using Envoy::Extensions::HttpFilters::Common::StreamRateLimiter;
diff --git a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h
index d3b44e75380af..f5bac46426425 100644
--- a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h
+++ b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h
@@ -12,13 +12,12 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/common/assert.h"
-#include "common/common/shared_token_bucket_impl.h"
-#include "common/http/header_map_impl.h"
-#include "common/router/header_parser.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/http/common/stream_rate_limiter.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/shared_token_bucket_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/http/common/stream_rate_limiter.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/source/extensions/filters/http/bandwidth_limit/config.cc b/source/extensions/filters/http/bandwidth_limit/config.cc
index 2ed2118fea451..95b62c134175a 100644
--- a/source/extensions/filters/http/bandwidth_limit/config.cc
+++ b/source/extensions/filters/http/bandwidth_limit/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/http/bandwidth_limit/config.h"
+#include "source/extensions/filters/http/bandwidth_limit/config.h"
 
 #include <string>
 
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/bandwidth_limit/config.h b/source/extensions/filters/http/bandwidth_limit/config.h
index e9945bbf745d8..b29a3ac2320b2 100644
--- a/source/extensions/filters/http/bandwidth_limit/config.h
+++ b/source/extensions/filters/http/bandwidth_limit/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.h"
 #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/buffer/BUILD b/source/extensions/filters/http/buffer/BUILD
index c691bc382862b..631163874cad9 100644
--- a/source/extensions/filters/http/buffer/BUILD
+++ b/source/extensions/filters/http/buffer/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["buffer_filter.cc"],
     hdrs = ["buffer_filter.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
@@ -40,7 +40,7 @@ envoy_cc_extension(
     # Legacy test use. TODO(#9953) clean up.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/buffer:buffer_filter_lib",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/buffer/buffer_filter.cc b/source/extensions/filters/http/buffer/buffer_filter.cc
index 18cf208e71b50..978d0452930d5 100644
--- a/source/extensions/filters/http/buffer/buffer_filter.cc
+++ b/source/extensions/filters/http/buffer/buffer_filter.cc
@@ -1,18 +1,17 @@
-#include "extensions/filters/http/buffer/buffer_filter.h"
+#include "source/extensions/filters/http/buffer/buffer_filter.h"
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/http/codes.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_impl.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/buffer/buffer_filter.h b/source/extensions/filters/http/buffer/buffer_filter.h
index bc0750374a648..c8296063c8c57 100644
--- a/source/extensions/filters/http/buffer/buffer_filter.h
+++ b/source/extensions/filters/http/buffer/buffer_filter.h
@@ -8,7 +8,7 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/http/filter.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/buffer/config.cc b/source/extensions/filters/http/buffer/config.cc
index 23c18ed50c7d6..dcd9c6b9d7ddd 100644
--- a/source/extensions/filters/http/buffer/config.cc
+++ b/source/extensions/filters/http/buffer/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/buffer/config.h"
+#include "source/extensions/filters/http/buffer/config.h"
 
 #include <chrono>
 #include <cstdint>
@@ -8,7 +8,7 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/buffer/buffer_filter.h"
+#include "source/extensions/filters/http/buffer/buffer_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/buffer/config.h b/source/extensions/filters/http/buffer/config.h
index e31cd5dbf75b4..9464fae241d1a 100644
--- a/source/extensions/filters/http/buffer/config.h
+++ b/source/extensions/filters/http/buffer/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/BUILD b/source/extensions/filters/http/cache/BUILD
index bd205889fdfa1..6c3a0dd173e09 100644
--- a/source/extensions/filters/http/cache/BUILD
+++ b/source/extensions/filters/http/cache/BUILD
@@ -57,11 +57,11 @@ envoy_cc_library(
         ":cache_custom_headers",
         ":cache_headers_utils_lib",
         ":key_cc_proto",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/common:time_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:assert_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:headers_lib",
@@ -77,8 +77,8 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":cache_custom_headers",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/common:time_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:matchers_lib",
         "//source/common/http:header_map_lib",
         "//source/common/http:header_utility_lib",
diff --git a/source/extensions/filters/http/cache/cache_custom_headers.cc b/source/extensions/filters/http/cache/cache_custom_headers.cc
index 119100fc9e9d6..507ae5c398700 100644
--- a/source/extensions/filters/http/cache/cache_custom_headers.cc
+++ b/source/extensions/filters/http/cache/cache_custom_headers.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/cache_custom_headers.h b/source/extensions/filters/http/cache/cache_custom_headers.h
index 61a094b452570..dd5d2694fea37 100644
--- a/source/extensions/filters/http/cache/cache_custom_headers.h
+++ b/source/extensions/filters/http/cache/cache_custom_headers.h
@@ -2,7 +2,7 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/http/headers.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/cache_filter.cc b/source/extensions/filters/http/cache/cache_filter.cc
index 8eea39694faf9..768fd0ae5b99e 100644
--- a/source/extensions/filters/http/cache/cache_filter.cc
+++ b/source/extensions/filters/http/cache/cache_filter.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/cache/cache_filter.h"
+#include "source/extensions/filters/http/cache/cache_filter.h"
 
 #include "envoy/http/header_map.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/cache/cache_custom_headers.h"
-#include "extensions/filters/http/cache/cacheability_utils.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/extensions/filters/http/cache/cacheability_utils.h"
 
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/extensions/filters/http/cache/cache_filter.h b/source/extensions/filters/http/cache/cache_filter.h
index 360c91fa816c7..5560298f73561 100644
--- a/source/extensions/filters/http/cache/cache_filter.h
+++ b/source/extensions/filters/http/cache/cache_filter.h
@@ -7,11 +7,10 @@
 
 #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/http/cache/cache_headers_utils.h"
-#include "extensions/filters/http/cache/http_cache.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/extensions/filters/http/cache/http_cache.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/cache_headers_utils.cc b/source/extensions/filters/http/cache/cache_headers_utils.cc
index 9577d7876532c..73a9c5b5625a8 100644
--- a/source/extensions/filters/http/cache/cache_headers_utils.cc
+++ b/source/extensions/filters/http/cache/cache_headers_utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
 
 #include <array>
 #include <chrono>
@@ -6,10 +6,9 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-
-#include "extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
 
 #include "absl/algorithm/container.h"
 #include "absl/strings/ascii.h"
diff --git a/source/extensions/filters/http/cache/cache_headers_utils.h b/source/extensions/filters/http/cache/cache_headers_utils.h
index aec5c78e4bcfa..5c170452a9697 100644
--- a/source/extensions/filters/http/cache/cache_headers_utils.h
+++ b/source/extensions/filters/http/cache/cache_headers_utils.h
@@ -4,11 +4,11 @@
 #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/matchers.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/cache/cacheability_utils.cc b/source/extensions/filters/http/cache/cacheability_utils.cc
index a4c0d8a0c6737..20fe9107ebfe5 100644
--- a/source/extensions/filters/http/cache/cacheability_utils.cc
+++ b/source/extensions/filters/http/cache/cacheability_utils.cc
@@ -1,11 +1,10 @@
-#include "extensions/filters/http/cache/cacheability_utils.h"
+#include "source/extensions/filters/http/cache/cacheability_utils.h"
 
 #include "envoy/http/header_map.h"
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-
-#include "extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/cacheability_utils.h b/source/extensions/filters/http/cache/cacheability_utils.h
index d968c3261cf07..00f5cfd8bfdf1 100644
--- a/source/extensions/filters/http/cache/cacheability_utils.h
+++ b/source/extensions/filters/http/cache/cacheability_utils.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "common/common/utility.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/config.cc b/source/extensions/filters/http/cache/config.cc
index 86277189a789b..f1d713e8d1c19 100644
--- a/source/extensions/filters/http/cache/config.cc
+++ b/source/extensions/filters/http/cache/config.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/cache/config.h"
+#include "source/extensions/filters/http/cache/config.h"
 
-#include "extensions/filters/http/cache/cache_filter.h"
+#include "source/extensions/filters/http/cache/cache_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/config.h b/source/extensions/filters/http/cache/config.h
index 656a1d68ca959..f9c9f678ff20e 100644
--- a/source/extensions/filters/http/cache/config.h
+++ b/source/extensions/filters/http/cache/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h"
 #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/http_cache.cc b/source/extensions/filters/http/cache/http_cache.cc
index 2229252407d42..2fef083676bfb 100644
--- a/source/extensions/filters/http/cache/http_cache.cc
+++ b/source/extensions/filters/http/cache/http_cache.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cache/http_cache.h"
+#include "source/extensions/filters/http/cache/http_cache.h"
 
 #include <algorithm>
 #include <ostream>
@@ -7,12 +7,11 @@
 #include "envoy/http/codes.h"
 #include "envoy/http/header_map.h"
 
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/cache/cache_custom_headers.h"
-#include "extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/cache/http_cache.h b/source/extensions/filters/http/cache/http_cache.h
index efde461d146a3..ebd6c888ec97c 100644
--- a/source/extensions/filters/http/cache/http_cache.h
+++ b/source/extensions/filters/http/cache/http_cache.h
@@ -10,13 +10,11 @@
 #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
 #include "source/extensions/filters/http/cache/key.pb.h"
 
-#include "extensions/filters/http/cache/cache_headers_utils.h"
-
 #include "absl/strings/string_view.h"
 
 namespace Envoy {
diff --git a/source/extensions/filters/http/cache/simple_http_cache/BUILD b/source/extensions/filters/http/cache/simple_http_cache/BUILD
index 481380f23591f..5b25659f64b0f 100644
--- a/source/extensions/filters/http/cache/simple_http_cache/BUILD
+++ b/source/extensions/filters/http/cache/simple_http_cache/BUILD
@@ -15,8 +15,8 @@ envoy_cc_extension(
     srcs = ["simple_http_cache.cc"],
     hdrs = ["simple_http_cache.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/registry",
+        "//envoy/runtime:runtime_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:macros",
         "//source/common/http:header_map_lib",
diff --git a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc
index 7a7f3170504e9..c39b136be8764 100644
--- a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc
+++ b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
+#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
 
 #include "envoy/extensions/cache/simple_http_cache/v3alpha/config.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h
index 03ee72e51e613..0cb45d7b58701 100644
--- a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h
+++ b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/cache/http_cache.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/cache/http_cache.h"
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
diff --git a/source/extensions/filters/http/cdn_loop/BUILD b/source/extensions/filters/http/cdn_loop/BUILD
index b42834465a14f..5ef8fb6b4068a 100644
--- a/source/extensions/filters/http/cdn_loop/BUILD
+++ b/source/extensions/filters/http/cdn_loop/BUILD
@@ -15,9 +15,9 @@ envoy_cc_library(
     hdrs = ["filter.h"],
     deps = [
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:statusor_lib",
         "//source/common/http:headers_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
@@ -48,9 +48,9 @@ envoy_cc_extension(
     deps = [
         ":filter_lib",
         ":parser_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:factory_context_interface",
         "//source/common/common:statusor_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/cdn_loop/config.cc b/source/extensions/filters/http/cdn_loop/config.cc
index 0b16b3c819583..93c3d155a8ad8 100644
--- a/source/extensions/filters/http/cdn_loop/config.cc
+++ b/source/extensions/filters/http/cdn_loop/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cdn_loop/config.h"
+#include "source/extensions/filters/http/cdn_loop/config.h"
 
 #include <memory>
 
@@ -8,10 +8,9 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/common/statusor.h"
-
-#include "extensions/filters/http/cdn_loop/filter.h"
-#include "extensions/filters/http/cdn_loop/parser.h"
+#include "source/common/common/statusor.h"
+#include "source/extensions/filters/http/cdn_loop/filter.h"
+#include "source/extensions/filters/http/cdn_loop/parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cdn_loop/config.h b/source/extensions/filters/http/cdn_loop/config.h
index 1e03a123649f1..d46a44c83cf4d 100644
--- a/source/extensions/filters/http/cdn_loop/config.h
+++ b/source/extensions/filters/http/cdn_loop/config.h
@@ -7,8 +7,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/server/factory_context.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cdn_loop/filter.cc b/source/extensions/filters/http/cdn_loop/filter.cc
index 38158011502e7..544ad53dcaa77 100644
--- a/source/extensions/filters/http/cdn_loop/filter.cc
+++ b/source/extensions/filters/http/cdn_loop/filter.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/cdn_loop/filter.h"
+#include "source/extensions/filters/http/cdn_loop/filter.h"
 
 #include "envoy/http/codes.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/statusor.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/cdn_loop/utils.h"
+#include "source/common/common/statusor.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/cdn_loop/utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cdn_loop/filter.h b/source/extensions/filters/http/cdn_loop/filter.h
index 77216b798d500..d65fa5c170045 100644
--- a/source/extensions/filters/http/cdn_loop/filter.h
+++ b/source/extensions/filters/http/cdn_loop/filter.h
@@ -5,7 +5,7 @@
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cdn_loop/parser.cc b/source/extensions/filters/http/cdn_loop/parser.cc
index 6f37ac5eb3fa7..db002350d6fb9 100644
--- a/source/extensions/filters/http/cdn_loop/parser.cc
+++ b/source/extensions/filters/http/cdn_loop/parser.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/cdn_loop/parser.h"
+#include "source/extensions/filters/http/cdn_loop/parser.h"
 
-#include "common/common/statusor.h"
+#include "source/common/common/statusor.h"
 
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
diff --git a/source/extensions/filters/http/cdn_loop/parser.h b/source/extensions/filters/http/cdn_loop/parser.h
index 5b9aad5175b26..625b4b454b395 100644
--- a/source/extensions/filters/http/cdn_loop/parser.h
+++ b/source/extensions/filters/http/cdn_loop/parser.h
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include "common/common/statusor.h"
+#include "source/common/common/statusor.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/cdn_loop/utils.cc b/source/extensions/filters/http/cdn_loop/utils.cc
index e7c4785099109..e2fffa92f298e 100644
--- a/source/extensions/filters/http/cdn_loop/utils.cc
+++ b/source/extensions/filters/http/cdn_loop/utils.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/http/cdn_loop/utils.h"
+#include "source/extensions/filters/http/cdn_loop/utils.h"
 
 #include <algorithm>
 
-#include "common/common/statusor.h"
-
-#include "extensions/filters/http/cdn_loop/parser.h"
+#include "source/common/common/statusor.h"
+#include "source/extensions/filters/http/cdn_loop/parser.h"
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/cdn_loop/utils.h b/source/extensions/filters/http/cdn_loop/utils.h
index ba486edadc160..c2813b424e653 100644
--- a/source/extensions/filters/http/cdn_loop/utils.h
+++ b/source/extensions/filters/http/cdn_loop/utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/common/statusor.h"
+#include "source/common/common/statusor.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/http/common/BUILD b/source/extensions/filters/http/common/BUILD
index d9a7558fb38ed..d0825a13b0dfa 100644
--- a/source/extensions/filters/http/common/BUILD
+++ b/source/extensions/filters/http/common/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     # A thin shim used by test and prod filters.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
 
@@ -23,7 +23,7 @@ envoy_cc_library(
     hdrs = ["factory_base.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
 
@@ -35,7 +35,7 @@ envoy_cc_library(
         "jwt_verify_lib",
     ],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/http:utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
@@ -50,7 +50,7 @@ envoy_cc_library(
         "//test:__subpackages__",
     ],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:macros",
         "//source/extensions/common:utility_lib",
         "//source/extensions/filters/http:well_known_names",
@@ -62,9 +62,9 @@ envoy_cc_library(
     srcs = ["stream_rate_limiter.cc"],
     hdrs = ["stream_rate_limiter.h"],
     deps = [
-        "//include/envoy/common:token_bucket_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/common:token_bucket_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
diff --git a/source/extensions/filters/http/common/compressor/BUILD b/source/extensions/filters/http/common/compressor/BUILD
index ec0648006b5c1..4b7c5fc58698f 100644
--- a/source/extensions/filters/http/common/compressor/BUILD
+++ b/source/extensions/filters/http/common/compressor/BUILD
@@ -14,9 +14,9 @@ envoy_cc_library(
     srcs = ["compressor.cc"],
     hdrs = ["compressor.h"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/compression/compressor:compressor_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:header_map_lib",
         "//source/common/http:utility_lib",
diff --git a/source/extensions/filters/http/common/compressor/compressor.cc b/source/extensions/filters/http/common/compressor/compressor.cc
index 7f9f5fe8e0a01..88b196147c0e3 100644
--- a/source/extensions/filters/http/common/compressor/compressor.cc
+++ b/source/extensions/filters/http/common/compressor/compressor.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/common/compressor/compressor.h"
+#include "source/extensions/filters/http/common/compressor/compressor.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/common/compressor/compressor.h b/source/extensions/filters/http/common/compressor/compressor.h
index c18cc1aaccf91..c79f04fd30ef1 100644
--- a/source/extensions/filters/http/common/compressor/compressor.h
+++ b/source/extensions/filters/http/common/compressor/compressor.h
@@ -6,10 +6,9 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stream_info/filter_state.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/common/jwks_fetcher.cc b/source/extensions/filters/http/common/jwks_fetcher.cc
index 5aadb8c94bdff..b5f0048b10211 100644
--- a/source/extensions/filters/http/common/jwks_fetcher.cc
+++ b/source/extensions/filters/http/common/jwks_fetcher.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/common/jwks_fetcher.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
 
 #include "envoy/config/core/v3/http_uri.pb.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 #include "jwt_verify_lib/status.h"
 
diff --git a/source/extensions/filters/http/common/stream_rate_limiter.cc b/source/extensions/filters/http/common/stream_rate_limiter.cc
index c5d39a28769fd..6763adbeb2414 100644
--- a/source/extensions/filters/http/common/stream_rate_limiter.cc
+++ b/source/extensions/filters/http/common/stream_rate_limiter.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/common/stream_rate_limiter.h"
+#include "source/extensions/filters/http/common/stream_rate_limiter.h"
 
 #include <chrono>
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/assert.h"
-#include "common/common/token_bucket_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/token_bucket_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/common/stream_rate_limiter.h b/source/extensions/filters/http/common/stream_rate_limiter.h
index 406791497155b..b8aed9ac8a72a 100644
--- a/source/extensions/filters/http/common/stream_rate_limiter.h
+++ b/source/extensions/filters/http/common/stream_rate_limiter.h
@@ -8,7 +8,7 @@
 #include "envoy/event/timer.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/buffer/watermark_buffer.h"
+#include "source/common/buffer/watermark_buffer.h"
 
 namespace Envoy {
 
diff --git a/source/extensions/filters/http/common/utility.h b/source/extensions/filters/http/common/utility.h
index b119e2db12b50..a6b4dd3d67b47 100644
--- a/source/extensions/filters/http/common/utility.h
+++ b/source/extensions/filters/http/common/utility.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "common/common/macros.h"
-
-#include "extensions/common/utility.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/common/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/BUILD b/source/extensions/filters/http/composite/BUILD
index 63cb62a7c7b00..ba4055de5aac4 100644
--- a/source/extensions/filters/http/composite/BUILD
+++ b/source/extensions/filters/http/composite/BUILD
@@ -33,7 +33,7 @@ envoy_cc_library(
     ],
     deps = [
         ":action_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/http:header_map_lib",
         "//source/common/http:headers_lib",
         "//source/common/matcher:matcher_lib",
@@ -46,8 +46,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/composite:filter_lib",
diff --git a/source/extensions/filters/http/composite/action.cc b/source/extensions/filters/http/composite/action.cc
index 97aef4c0952d1..14935fa819dbc 100644
--- a/source/extensions/filters/http/composite/action.cc
+++ b/source/extensions/filters/http/composite/action.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/composite/action.h"
+#include "source/extensions/filters/http/composite/action.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/action.h b/source/extensions/filters/http/composite/action.h
index a10988f346810..1d2b822e79949 100644
--- a/source/extensions/filters/http/composite/action.h
+++ b/source/extensions/filters/http/composite/action.h
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/filters/http/composite/v3/composite.pb.validate.h"
 
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/matcher.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/config.cc b/source/extensions/filters/http/composite/config.cc
index 3d640a119a0f6..ca1697885ffa8 100644
--- a/source/extensions/filters/http/composite/config.cc
+++ b/source/extensions/filters/http/composite/config.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/http/composite/config.h"
+#include "source/extensions/filters/http/composite/config.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/composite/filter.h"
+#include "source/extensions/filters/http/composite/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/config.h b/source/extensions/filters/http/composite/config.h
index a5fe8ed5536d2..c95245d52d0d0 100644
--- a/source/extensions/filters/http/composite/config.h
+++ b/source/extensions/filters/http/composite/config.h
@@ -7,11 +7,10 @@
 #include "envoy/type/matcher/v3/http_inputs.pb.h"
 #include "envoy/type/matcher/v3/http_inputs.pb.validate.h"
 
-#include "common/matcher/matcher.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/matcher/matcher.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/factory_wrapper.cc b/source/extensions/filters/http/composite/factory_wrapper.cc
index 41215b1d2c6ef..1ec4dab18f6a2 100644
--- a/source/extensions/filters/http/composite/factory_wrapper.cc
+++ b/source/extensions/filters/http/composite/factory_wrapper.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/composite/factory_wrapper.h"
+#include "source/extensions/filters/http/composite/factory_wrapper.h"
 
-#include "extensions/filters/http/composite/filter.h"
+#include "source/extensions/filters/http/composite/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/filter.cc b/source/extensions/filters/http/composite/filter.cc
index d04ba6d430622..843ea55f1a8ea 100644
--- a/source/extensions/filters/http/composite/filter.cc
+++ b/source/extensions/filters/http/composite/filter.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/composite/filter.h"
+#include "source/extensions/filters/http/composite/filter.h"
 
 #include "envoy/http/filter.h"
 
-#include "common/common/stl_helpers.h"
+#include "source/common/common/stl_helpers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/composite/filter.h b/source/extensions/filters/http/composite/filter.h
index c46696f42a11f..5c790e4041309 100644
--- a/source/extensions/filters/http/composite/filter.h
+++ b/source/extensions/filters/http/composite/filter.h
@@ -4,9 +4,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
-#include "extensions/filters/http/composite/action.h"
-#include "extensions/filters/http/composite/factory_wrapper.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/composite/action.h"
+#include "source/extensions/filters/http/composite/factory_wrapper.h"
 
 #include "absl/types/variant.h"
 
diff --git a/source/extensions/filters/http/compressor/BUILD b/source/extensions/filters/http/compressor/BUILD
index ad18a973c8649..46df06be38db3 100644
--- a/source/extensions/filters/http/compressor/BUILD
+++ b/source/extensions/filters/http/compressor/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     srcs = ["compressor_filter.cc"],
     hdrs = ["compressor_filter.h"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_factory_interface",
+        "//envoy/compression/compressor:compressor_factory_interface",
         "//source/extensions/filters/http/common/compressor:compressor_lib",
         "@envoy_api//envoy/extensions/filters/http/compressor/v3:pkg_cc_proto",
     ],
@@ -29,7 +29,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":compressor_filter_lib",
-        "//include/envoy/compression/compressor:compressor_config_interface",
+        "//envoy/compression/compressor:compressor_config_interface",
         "//source/common/config:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/compressor/compressor_filter.cc b/source/extensions/filters/http/compressor/compressor_filter.cc
index 24e974e012e5c..20b6c3482a73f 100644
--- a/source/extensions/filters/http/compressor/compressor_filter.cc
+++ b/source/extensions/filters/http/compressor/compressor_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/compressor/compressor_filter.h"
+#include "source/extensions/filters/http/compressor/compressor_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/compressor/compressor_filter.h b/source/extensions/filters/http/compressor/compressor_filter.h
index 8d7347847f794..24f20dd1eafbb 100644
--- a/source/extensions/filters/http/compressor/compressor_filter.h
+++ b/source/extensions/filters/http/compressor/compressor_filter.h
@@ -3,7 +3,7 @@
 #include "envoy/compression/compressor/factory.h"
 #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h"
 
-#include "extensions/filters/http/common/compressor/compressor.h"
+#include "source/extensions/filters/http/common/compressor/compressor.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/compressor/config.cc b/source/extensions/filters/http/compressor/config.cc
index aff3ca5afe4cc..caec2e0fb10d5 100644
--- a/source/extensions/filters/http/compressor/config.cc
+++ b/source/extensions/filters/http/compressor/config.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/http/compressor/config.h"
+#include "source/extensions/filters/http/compressor/config.h"
 
 #include "envoy/compression/compressor/config.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/filters/http/compressor/compressor_filter.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/filters/http/compressor/compressor_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/compressor/config.h b/source/extensions/filters/http/compressor/config.h
index 50127769f3b4f..bef488db16ca6 100644
--- a/source/extensions/filters/http/compressor/config.h
+++ b/source/extensions/filters/http/compressor/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h"
 #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cors/BUILD b/source/extensions/filters/http/cors/BUILD
index 1e8dd4f8b64c5..9fe8c075d572c 100644
--- a/source/extensions/filters/http/cors/BUILD
+++ b/source/extensions/filters/http/cors/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["cors_filter.cc"],
     hdrs = ["cors_filter.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
@@ -32,8 +32,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/cors:cors_filter_lib",
diff --git a/source/extensions/filters/http/cors/config.cc b/source/extensions/filters/http/cors/config.cc
index 4a97416e714c2..22fbc4daa75ec 100644
--- a/source/extensions/filters/http/cors/config.cc
+++ b/source/extensions/filters/http/cors/config.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/cors/config.h"
+#include "source/extensions/filters/http/cors/config.h"
 
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/cors/cors_filter.h"
+#include "source/extensions/filters/http/cors/cors_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cors/config.h b/source/extensions/filters/http/cors/config.h
index 96acf31a33a2b..203f11e5286e4 100644
--- a/source/extensions/filters/http/cors/config.h
+++ b/source/extensions/filters/http/cors/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/cors/v3/cors.pb.h"
 #include "envoy/extensions/filters/http/cors/v3/cors.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cors/cors_filter.cc b/source/extensions/filters/http/cors/cors_filter.cc
index e936b16c8f245..c7314a437a58f 100644
--- a/source/extensions/filters/http/cors/cors_filter.cc
+++ b/source/extensions/filters/http/cors/cors_filter.cc
@@ -1,13 +1,13 @@
-#include "extensions/filters/http/cors/cors_filter.h"
+#include "source/extensions/filters/http/cors/cors_filter.h"
 
 #include "envoy/http/codes.h"
 #include "envoy/http/header_map.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/cors/cors_filter.h b/source/extensions/filters/http/cors/cors_filter.h
index 6603469055a76..5bcef49783f00 100644
--- a/source/extensions/filters/http/cors/cors_filter.h
+++ b/source/extensions/filters/http/cors/cors_filter.h
@@ -4,7 +4,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/csrf/BUILD b/source/extensions/filters/http/csrf/BUILD
index e8e88ea6fa493..a31db01d1a37e 100644
--- a/source/extensions/filters/http/csrf/BUILD
+++ b/source/extensions/filters/http/csrf/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     srcs = ["csrf_filter.cc"],
     hdrs = ["csrf_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:matchers_lib",
         "//source/common/http:header_map_lib",
@@ -34,7 +34,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/csrf:csrf_filter_lib",
diff --git a/source/extensions/filters/http/csrf/config.cc b/source/extensions/filters/http/csrf/config.cc
index 34e1fbd92f747..7a455c3c5e89b 100644
--- a/source/extensions/filters/http/csrf/config.cc
+++ b/source/extensions/filters/http/csrf/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/csrf/config.h"
+#include "source/extensions/filters/http/csrf/config.h"
 
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h"
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/csrf/csrf_filter.h"
+#include "source/extensions/filters/http/csrf/csrf_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/csrf/config.h b/source/extensions/filters/http/csrf/config.h
index c480bc1ca4751..192e0f5cfee61 100644
--- a/source/extensions/filters/http/csrf/config.h
+++ b/source/extensions/filters/http/csrf/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h"
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/csrf/csrf_filter.cc b/source/extensions/filters/http/csrf/csrf_filter.cc
index 01fe2f38127a9..1a85fb1c8c756 100644
--- a/source/extensions/filters/http/csrf/csrf_filter.cc
+++ b/source/extensions/filters/http/csrf/csrf_filter.cc
@@ -1,14 +1,13 @@
-#include "extensions/filters/http/csrf/csrf_filter.h"
+#include "source/extensions/filters/http/csrf/csrf_filter.h"
 
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/empty_string.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/csrf/csrf_filter.h b/source/extensions/filters/http/csrf/csrf_filter.h
index 69e88ff858b0e..5697cf99f59e4 100644
--- a/source/extensions/filters/http/csrf/csrf_filter.h
+++ b/source/extensions/filters/http/csrf/csrf_filter.h
@@ -6,8 +6,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/matchers.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/matchers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/decompressor/BUILD b/source/extensions/filters/http/decompressor/BUILD
index 78f76c5573f8f..bd9e426b0e963 100644
--- a/source/extensions/filters/http/decompressor/BUILD
+++ b/source/extensions/filters/http/decompressor/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["decompressor_filter.cc"],
     hdrs = ["decompressor_filter.h"],
     deps = [
-        "//include/envoy/compression/decompressor:decompressor_config_interface",
-        "//include/envoy/compression/decompressor:decompressor_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/compression/decompressor:decompressor_config_interface",
+        "//envoy/compression/decompressor:decompressor_interface",
+        "//envoy/http:filter_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:macros",
         "//source/common/http:headers_lib",
@@ -35,7 +35,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":decompressor_filter_lib",
-        "//include/envoy/compression/decompressor:decompressor_config_interface",
+        "//envoy/compression/decompressor:decompressor_config_interface",
         "//source/common/config:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/decompressor/config.cc b/source/extensions/filters/http/decompressor/config.cc
index 988f76c758597..e15257c7d2e3b 100644
--- a/source/extensions/filters/http/decompressor/config.cc
+++ b/source/extensions/filters/http/decompressor/config.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/http/decompressor/config.h"
+#include "source/extensions/filters/http/decompressor/config.h"
 
 #include "envoy/compression/decompressor/config.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/filters/http/decompressor/decompressor_filter.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/filters/http/decompressor/decompressor_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/decompressor/config.h b/source/extensions/filters/http/decompressor/config.h
index cdcef94a180e9..7cc698dcb5f7b 100644
--- a/source/extensions/filters/http/decompressor/config.h
+++ b/source/extensions/filters/http/decompressor/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h"
 #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/decompressor/decompressor_filter.cc b/source/extensions/filters/http/decompressor/decompressor_filter.cc
index c30c5b1a93608..d632c356004bd 100644
--- a/source/extensions/filters/http/decompressor/decompressor_filter.cc
+++ b/source/extensions/filters/http/decompressor/decompressor_filter.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/decompressor/decompressor_filter.h"
+#include "source/extensions/filters/http/decompressor/decompressor_filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/common/macros.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/decompressor/decompressor_filter.h b/source/extensions/filters/http/decompressor/decompressor_filter.h
index 601d170fe1367..5f13e6b3b13da 100644
--- a/source/extensions/filters/http/decompressor/decompressor_filter.h
+++ b/source/extensions/filters/http/decompressor/decompressor_filter.h
@@ -5,11 +5,10 @@
 #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h"
 #include "envoy/http/filter.h"
 
-#include "common/common/macros.h"
-#include "common/http/headers.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/headers.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamic_forward_proxy/BUILD b/source/extensions/filters/http/dynamic_forward_proxy/BUILD
index 9b10214907852..030fae3712f4d 100644
--- a/source/extensions/filters/http/dynamic_forward_proxy/BUILD
+++ b/source/extensions/filters/http/dynamic_forward_proxy/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["proxy_filter.cc"],
     hdrs = ["proxy_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/http:header_utility_lib",
         "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface",
         "//source/extensions/filters/http:well_known_names",
@@ -30,8 +30,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/dynamic_forward_proxy/config.cc b/source/extensions/filters/http/dynamic_forward_proxy/config.cc
index 1907801bfa1d0..eb7dd21633a97 100644
--- a/source/extensions/filters/http/dynamic_forward_proxy/config.cc
+++ b/source/extensions/filters/http/dynamic_forward_proxy/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/dynamic_forward_proxy/config.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/config.h"
 
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
-#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamic_forward_proxy/config.h b/source/extensions/filters/http/dynamic_forward_proxy/config.h
index 26fb6d0e13119..980d5a70552de 100644
--- a/source/extensions/filters/http/dynamic_forward_proxy/config.h
+++ b/source/extensions/filters/http/dynamic_forward_proxy/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc
index 61cc51db154b2..837c0c734b0c8 100644
--- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc
+++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 
-#include "common/http/utility.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h
index e4dccab636944..d97e3efeed54c 100644
--- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h
+++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/BUILD b/source/extensions/filters/http/dynamo/BUILD
index 0abf478922ff3..474528353b7ca 100644
--- a/source/extensions/filters/http/dynamo/BUILD
+++ b/source/extensions/filters/http/dynamo/BUILD
@@ -19,8 +19,8 @@ envoy_cc_library(
     deps = [
         ":dynamo_request_parser_lib",
         ":dynamo_stats_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:exception_lib",
@@ -32,7 +32,7 @@ envoy_cc_library(
     srcs = ["dynamo_request_parser.cc"],
     hdrs = ["dynamo_request_parser.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/common:utility_lib",
         "//source/common/json:json_loader_lib",
     ],
@@ -44,8 +44,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":dynamo_filter_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/dynamo/v3:pkg_cc_proto",
@@ -58,7 +58,7 @@ envoy_cc_library(
     hdrs = ["dynamo_stats.h"],
     deps = [
         ":dynamo_request_parser_lib",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:utility_lib",
     ],
diff --git a/source/extensions/filters/http/dynamo/config.cc b/source/extensions/filters/http/dynamo/config.cc
index 128999520fc46..0850dc9b70836 100644
--- a/source/extensions/filters/http/dynamo/config.cc
+++ b/source/extensions/filters/http/dynamo/config.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/dynamo/config.h"
+#include "source/extensions/filters/http/dynamo/config.h"
 
 #include <string>
 
 #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/dynamo/dynamo_filter.h"
-#include "extensions/filters/http/dynamo/dynamo_stats.h"
+#include "source/extensions/filters/http/dynamo/dynamo_filter.h"
+#include "source/extensions/filters/http/dynamo/dynamo_stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/config.h b/source/extensions/filters/http/dynamo/config.h
index 551438e674545..939ba741e7380 100644
--- a/source/extensions/filters/http/dynamo/config.h
+++ b/source/extensions/filters/http/dynamo/config.h
@@ -6,8 +6,8 @@
 #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/dynamo_filter.cc b/source/extensions/filters/http/dynamo/dynamo_filter.cc
index 4be293580b8b7..bb41e4dd9a5ed 100644
--- a/source/extensions/filters/http/dynamo/dynamo_filter.cc
+++ b/source/extensions/filters/http/dynamo/dynamo_filter.cc
@@ -1,20 +1,19 @@
-#include "extensions/filters/http/dynamo/dynamo_filter.h"
+#include "source/extensions/filters/http/dynamo/dynamo_filter.h"
 
 #include <chrono>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/http/codes.h"
-#include "common/http/exception.h"
-#include "common/http/utility.h"
-#include "common/json/json_loader.h"
-
-#include "extensions/filters/http/dynamo/dynamo_request_parser.h"
-#include "extensions/filters/http/dynamo/dynamo_stats.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h"
+#include "source/extensions/filters/http/dynamo/dynamo_stats.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/filters/http/dynamo/dynamo_filter.h b/source/extensions/filters/http/dynamo/dynamo_filter.h
index d341c801cad61..c7249f7fcdd5d 100644
--- a/source/extensions/filters/http/dynamo/dynamo_filter.h
+++ b/source/extensions/filters/http/dynamo/dynamo_filter.h
@@ -7,10 +7,9 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/scope.h"
 
-#include "common/json/json_loader.h"
-
-#include "extensions/filters/http/dynamo/dynamo_request_parser.h"
-#include "extensions/filters/http/dynamo/dynamo_stats.h"
+#include "source/common/json/json_loader.h"
+#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h"
+#include "source/extensions/filters/http/dynamo/dynamo_stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/dynamo_request_parser.cc b/source/extensions/filters/http/dynamo/dynamo_request_parser.cc
index 6fd0a1d42a843..e0d29327f03bd 100644
--- a/source/extensions/filters/http/dynamo/dynamo_request_parser.cc
+++ b/source/extensions/filters/http/dynamo/dynamo_request_parser.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/http/dynamo/dynamo_request_parser.h"
+#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h"
 
 #include <cmath>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/extensions/filters/http/dynamo/dynamo_request_parser.h b/source/extensions/filters/http/dynamo/dynamo_request_parser.h
index 931d0a4835f89..39e8fcbb31ecf 100644
--- a/source/extensions/filters/http/dynamo/dynamo_request_parser.h
+++ b/source/extensions/filters/http/dynamo/dynamo_request_parser.h
@@ -6,7 +6,7 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/json/json_loader.h"
+#include "source/common/json/json_loader.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.cc b/source/extensions/filters/http/dynamo/dynamo_stats.cc
index 06f3770a688e6..ba0e5d9355389 100644
--- a/source/extensions/filters/http/dynamo/dynamo_stats.cc
+++ b/source/extensions/filters/http/dynamo/dynamo_stats.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/dynamo/dynamo_stats.h"
+#include "source/extensions/filters/http/dynamo/dynamo_stats.h"
 
 #include <memory>
 #include <string>
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/http/dynamo/dynamo_request_parser.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.h b/source/extensions/filters/http/dynamo/dynamo_stats.h
index 48399e4f4d23b..78bd72c728035 100644
--- a/source/extensions/filters/http/dynamo/dynamo_stats.h
+++ b/source/extensions/filters/http/dynamo/dynamo_stats.h
@@ -5,8 +5,8 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_authz/BUILD b/source/extensions/filters/http/ext_authz/BUILD
index 6314f305e97fa..f65fdf5f1ddde 100644
--- a/source/extensions/filters/http/ext_authz/BUILD
+++ b/source/extensions/filters/http/ext_authz/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["ext_authz.cc"],
     hdrs = ["ext_authz.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/http:codes_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -42,8 +42,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":ext_authz",
-        "//include/envoy/registry",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/registry",
+        "//envoy/stats:stats_macros",
         "//source/common/config:utility_lib",
         "//source/common/grpc:google_async_client_cache",
         "//source/common/protobuf:utility_lib",
diff --git a/source/extensions/filters/http/ext_authz/config.cc b/source/extensions/filters/http/ext_authz/config.cc
index c99894009d9ab..9370b6c3c8439 100644
--- a/source/extensions/filters/http/ext_authz/config.cc
+++ b/source/extensions/filters/http/ext_authz/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/ext_authz/config.h"
+#include "source/extensions/filters/http/ext_authz/config.h"
 
 #include <chrono>
 #include <string>
@@ -8,13 +8,12 @@
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/grpc/google_async_client_cache.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
-#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h"
-#include "extensions/filters/http/ext_authz/ext_authz.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/google_async_client_cache.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h"
+#include "source/extensions/filters/http/ext_authz/ext_authz.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_authz/config.h b/source/extensions/filters/http/ext_authz/config.h
index 600c572f05070..f0f3aea5bba1f 100644
--- a/source/extensions/filters/http/ext_authz/config.h
+++ b/source/extensions/filters/http/ext_authz/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h"
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h"
 
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_authz/ext_authz.cc b/source/extensions/filters/http/ext_authz/ext_authz.cc
index 97ca3d7782062..46d9a967c7dd0 100644
--- a/source/extensions/filters/http/ext_authz/ext_authz.cc
+++ b/source/extensions/filters/http/ext_authz/ext_authz.cc
@@ -1,14 +1,13 @@
-#include "extensions/filters/http/ext_authz/ext_authz.h"
+#include "source/extensions/filters/http/ext_authz/ext_authz.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/matchers.h"
-#include "common/http/utility.h"
-#include "common/router/config_impl.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_authz/ext_authz.h b/source/extensions/filters/http/ext_authz/ext_authz.h
index 9b1aca32f97af..4ebde47703804 100644
--- a/source/extensions/filters/http/ext_authz/ext_authz.h
+++ b/source/extensions/filters/http/ext_authz/ext_authz.h
@@ -13,16 +13,15 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz.h"
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
-#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/BUILD b/source/extensions/filters/http/ext_proc/BUILD
index 6f4e7a9c4928d..58e90e05eef88 100644
--- a/source/extensions/filters/http/ext_proc/BUILD
+++ b/source/extensions/filters/http/ext_proc/BUILD
@@ -22,10 +22,10 @@ envoy_cc_library(
     deps = [
         ":client_interface",
         ":mutation_utils_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/event:timer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "@com_google_absl//absl/strings:str_format",
@@ -51,7 +51,7 @@ envoy_cc_library(
     name = "client_interface",
     hdrs = ["client.h"],
     deps = [
-        "//include/envoy/grpc:status",
+        "//envoy/grpc:status",
         "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto",
     ],
 )
@@ -61,8 +61,8 @@ envoy_cc_library(
     srcs = ["mutation_utils.cc"],
     hdrs = ["mutation_utils.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:header_utility_lib",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto",
@@ -75,9 +75,9 @@ envoy_cc_library(
     hdrs = ["client_impl.h"],
     deps = [
         ":client_interface",
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/grpc:typed_async_client_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto",
diff --git a/source/extensions/filters/http/ext_proc/client_impl.cc b/source/extensions/filters/http/ext_proc/client_impl.cc
index d5e2f0a5a0ae1..ca18cffcc0b65 100644
--- a/source/extensions/filters/http/ext_proc/client_impl.cc
+++ b/source/extensions/filters/http/ext_proc/client_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/ext_proc/client_impl.h"
+#include "source/extensions/filters/http/ext_proc/client_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/client_impl.h b/source/extensions/filters/http/ext_proc/client_impl.h
index dc2973ef109cb..fdce71ed1a173 100644
--- a/source/extensions/filters/http/ext_proc/client_impl.h
+++ b/source/extensions/filters/http/ext_proc/client_impl.h
@@ -8,9 +8,8 @@
 #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/grpc/typed_async_client.h"
-
-#include "extensions/filters/http/ext_proc/client.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/extensions/filters/http/ext_proc/client.h"
 
 using envoy::service::ext_proc::v3alpha::ProcessingRequest;
 using envoy::service::ext_proc::v3alpha::ProcessingResponse;
diff --git a/source/extensions/filters/http/ext_proc/config.cc b/source/extensions/filters/http/ext_proc/config.cc
index 117f8f6eca6eb..221ebac44a969 100644
--- a/source/extensions/filters/http/ext_proc/config.cc
+++ b/source/extensions/filters/http/ext_proc/config.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/http/ext_proc/config.h"
+#include "source/extensions/filters/http/ext_proc/config.h"
 
 #include <string>
 
-#include "extensions/filters/http/ext_proc/client_impl.h"
-#include "extensions/filters/http/ext_proc/ext_proc.h"
+#include "source/extensions/filters/http/ext_proc/client_impl.h"
+#include "source/extensions/filters/http/ext_proc/ext_proc.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/config.h b/source/extensions/filters/http/ext_proc/config.h
index a3626a249e7ad..382ccda93b075 100644
--- a/source/extensions/filters/http/ext_proc/config.h
+++ b/source/extensions/filters/http/ext_proc/config.h
@@ -5,8 +5,8 @@
 #include "envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.pb.h"
 #include "envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/ext_proc.cc b/source/extensions/filters/http/ext_proc/ext_proc.cc
index 3467dfd01fd2c..2e55d836ac4fc 100644
--- a/source/extensions/filters/http/ext_proc/ext_proc.cc
+++ b/source/extensions/filters/http/ext_proc/ext_proc.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/ext_proc/ext_proc.h"
+#include "source/extensions/filters/http/ext_proc/ext_proc.h"
 
-#include "extensions/filters/http/ext_proc/mutation_utils.h"
+#include "source/extensions/filters/http/ext_proc/mutation_utils.h"
 
 #include "absl/strings/str_format.h"
 
diff --git a/source/extensions/filters/http/ext_proc/ext_proc.h b/source/extensions/filters/http/ext_proc/ext_proc.h
index 0ccb231621131..a3754db99aba0 100644
--- a/source/extensions/filters/http/ext_proc/ext_proc.h
+++ b/source/extensions/filters/http/ext_proc/ext_proc.h
@@ -12,11 +12,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
-#include "extensions/filters/http/ext_proc/client.h"
-#include "extensions/filters/http/ext_proc/processor_state.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/ext_proc/client.h"
+#include "source/extensions/filters/http/ext_proc/processor_state.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/mutation_utils.cc b/source/extensions/filters/http/ext_proc/mutation_utils.cc
index e0a5602030a20..8fa43ade130de 100644
--- a/source/extensions/filters/http/ext_proc/mutation_utils.cc
+++ b/source/extensions/filters/http/ext_proc/mutation_utils.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/ext_proc/mutation_utils.h"
+#include "source/extensions/filters/http/ext_proc/mutation_utils.h"
 
 #include "envoy/http/header_map.h"
 
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/mutation_utils.h b/source/extensions/filters/http/ext_proc/mutation_utils.h
index cb700019c5a78..14b28cf306e7d 100644
--- a/source/extensions/filters/http/ext_proc/mutation_utils.h
+++ b/source/extensions/filters/http/ext_proc/mutation_utils.h
@@ -4,7 +4,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/processor_state.cc b/source/extensions/filters/http/ext_proc/processor_state.cc
index f02faf3e267a4..5fd79fa82d2f1 100644
--- a/source/extensions/filters/http/ext_proc/processor_state.cc
+++ b/source/extensions/filters/http/ext_proc/processor_state.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/http/ext_proc/processor_state.h"
+#include "source/extensions/filters/http/ext_proc/processor_state.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/ext_proc/ext_proc.h"
-#include "extensions/filters/http/ext_proc/mutation_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/ext_proc/ext_proc.h"
+#include "source/extensions/filters/http/ext_proc/mutation_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ext_proc/processor_state.h b/source/extensions/filters/http/ext_proc/processor_state.h
index fc3914c66c1d8..5a22c0ba26f96 100644
--- a/source/extensions/filters/http/ext_proc/processor_state.h
+++ b/source/extensions/filters/http/ext_proc/processor_state.h
@@ -7,7 +7,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/fault/BUILD b/source/extensions/filters/http/fault/BUILD
index 3cfe5b8ee205e..ae2c90f7999ac 100644
--- a/source/extensions/filters/http/fault/BUILD
+++ b/source/extensions/filters/http/fault/BUILD
@@ -17,13 +17,13 @@ envoy_cc_library(
     srcs = ["fault_filter.cc"],
     hdrs = ["fault_filter.h"],
     deps = [
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/event:timer_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -47,7 +47,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/fault:fault_filter_lib",
diff --git a/source/extensions/filters/http/fault/config.cc b/source/extensions/filters/http/fault/config.cc
index 3810eaddfdb46..a4b20fa046657 100644
--- a/source/extensions/filters/http/fault/config.cc
+++ b/source/extensions/filters/http/fault/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/fault/config.h"
+#include "source/extensions/filters/http/fault/config.h"
 
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.h"
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/fault/fault_filter.h"
+#include "source/extensions/filters/http/fault/fault_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/fault/config.h b/source/extensions/filters/http/fault/config.h
index 102511399bb53..b30ce426bca73 100644
--- a/source/extensions/filters/http/fault/config.h
+++ b/source/extensions/filters/http/fault/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.h"
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/fault/fault_filter.cc b/source/extensions/filters/http/fault/fault_filter.cc
index 8c21d85f19413..1a0fb3ecce61f 100644
--- a/source/extensions/filters/http/fault/fault_filter.cc
+++ b/source/extensions/filters/http/fault/fault_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/fault/fault_filter.h"
+#include "source/extensions/filters/http/fault/fault_filter.h"
 
 #include <chrono>
 #include <cstdint>
@@ -12,17 +12,16 @@
 #include "envoy/http/header_map.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/fault/fault_filter.h b/source/extensions/filters/http/fault/fault_filter.h
index fefea8bd06f51..f96756f16c133 100644
--- a/source/extensions/filters/http/fault/fault_filter.h
+++ b/source/extensions/filters/http/fault/fault_filter.h
@@ -13,13 +13,12 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/token_bucket_impl.h"
-#include "common/http/header_utility.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/common/fault/fault_config.h"
-#include "extensions/filters/http/common/stream_rate_limiter.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/token_bucket_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/common/fault/fault_config.h"
+#include "source/extensions/filters/http/common/stream_rate_limiter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_bridge/BUILD b/source/extensions/filters/http/grpc_http1_bridge/BUILD
index 4685a8d07c9d1..8598e63f403ed 100644
--- a/source/extensions/filters/http/grpc_http1_bridge/BUILD
+++ b/source/extensions/filters/http/grpc_http1_bridge/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["http1_bridge_filter.cc"],
     hdrs = ["http1_bridge_filter.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:enum_to_int",
         "//source/common/common:utility_lib",
         "//source/common/grpc:common_lib",
@@ -40,8 +40,8 @@ envoy_cc_extension(
         "//test/server:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/grpc_http1_bridge:http1_bridge_filter_lib",
diff --git a/source/extensions/filters/http/grpc_http1_bridge/config.cc b/source/extensions/filters/http/grpc_http1_bridge/config.cc
index 17f41987248f3..bc058d0d28bb7 100644
--- a/source/extensions/filters/http/grpc_http1_bridge/config.cc
+++ b/source/extensions/filters/http/grpc_http1_bridge/config.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/grpc_http1_bridge/config.h"
+#include "source/extensions/filters/http/grpc_http1_bridge/config.h"
 
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
+#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_bridge/config.h b/source/extensions/filters/http/grpc_http1_bridge/config.h
index a431632da5621..6e340b760bb3a 100644
--- a/source/extensions/filters/http/grpc_http1_bridge/config.h
+++ b/source/extensions/filters/http/grpc_http1_bridge/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.h"
 #include "envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc
index ae5332d3504af..5dc10045c3fc1 100644
--- a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc
+++ b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
+#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
 
 #include <cstdint>
 #include <string>
@@ -6,12 +6,12 @@
 
 #include "envoy/http/codes.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/headers.h"
-#include "common/http/http1/codec_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http1/codec_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h
index 84b1ad18a4d01..948e2952eac97 100644
--- a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h
+++ b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h
@@ -3,8 +3,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/grpc/context_impl.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD
index c4f65adb09a95..36681152d9f96 100644
--- a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD
+++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["filter.cc"],
     hdrs = ["filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/common:enum_to_int",
         "//source/common/grpc:codec_lib",
         "//source/common/grpc:common_lib",
@@ -33,9 +33,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":filter_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc
index da1269246d28c..a5cbcde53c6a7 100644
--- a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc
+++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/grpc_http1_reverse_bridge/config.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/config.h"
 
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h"
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h
index c9579e3f13797..50a14c1e025f6 100644
--- a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h
+++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h
@@ -4,8 +4,8 @@
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc
index b8119639e8c1e..9036ebe6d02c3 100644
--- a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc
+++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
 
 #include "envoy/http/header_map.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/grpc/status.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h
index 12707aac9f6c4..aed2ecdd34edf 100644
--- a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h
+++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h
@@ -6,10 +6,9 @@
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h"
 #include "envoy/http/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/status.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/status.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_json_transcoder/BUILD b/source/extensions/filters/http/grpc_json_transcoder/BUILD
index c1ae930c7fc88..38e1fc1fad375 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/BUILD
+++ b/source/extensions/filters/http/grpc_json_transcoder/BUILD
@@ -25,7 +25,7 @@ envoy_cc_library(
     deps = [
         ":http_body_utils_lib",
         ":transcoder_input_stream_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/grpc:codec_lib",
         "//source/common/grpc:common_lib",
         "//source/common/http:headers_lib",
@@ -63,7 +63,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/grpc_json_transcoder:json_transcoder_filter_lib",
diff --git a/source/extensions/filters/http/grpc_json_transcoder/config.cc b/source/extensions/filters/http/grpc_json_transcoder/config.cc
index f4386c97eeb7c..4b8850136c974 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/config.cc
+++ b/source/extensions/filters/http/grpc_json_transcoder/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/grpc_json_transcoder/config.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/config.h"
 
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_json_transcoder/config.h b/source/extensions/filters/http/grpc_json_transcoder/config.h
index a48b06dd75117..e67fc47b993e0 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/config.h
+++ b/source/extensions/filters/http/grpc_json_transcoder/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc
index 7741c98c06135..2c14539be75ba 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc
+++ b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
 
 #include "google/api/httpbody.pb.h"
 
diff --git a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h
index 82ef031ca35be..8847441c4732d 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h
+++ b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h
@@ -2,9 +2,9 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/codec.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc
index a7d93f1b63429..2a14a74633bad 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc
+++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
 
 #include <memory>
 #include <unordered_set>
@@ -7,18 +7,17 @@
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 #include "envoy/http/filter.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-
-#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "google/api/annotations.pb.h"
 #include "google/api/http.pb.h"
diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h
index 6b80e0cc5762e..727e9e39525c3 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h
+++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h
@@ -6,12 +6,11 @@
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/grpc/codec.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
 
 #include "google/api/http.pb.h"
 #include "grpc_transcoding/path_matcher.h"
diff --git a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc
index f2dbe5983f612..7c220c004a641 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc
+++ b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h
index ff342cfdb5c43..5c294d74ce609 100644
--- a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h
+++ b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
 
 #include "grpc_transcoding/transcoder_input_stream.h"
 
diff --git a/source/extensions/filters/http/grpc_stats/BUILD b/source/extensions/filters/http/grpc_stats/BUILD
index 078b140e912eb..7a119258e8a45 100644
--- a/source/extensions/filters/http/grpc_stats/BUILD
+++ b/source/extensions/filters/http/grpc_stats/BUILD
@@ -15,9 +15,9 @@ envoy_cc_extension(
     srcs = ["grpc_stats_filter.cc"],
     hdrs = ["grpc_stats_filter.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stream_info:filter_state_interface",
         "//source/common/grpc:codec_lib",
         "//source/common/grpc:common_lib",
         "//source/common/grpc:context_lib",
diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc
index e71f7993f57dd..24861b1be852e 100644
--- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc
+++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc
@@ -1,16 +1,15 @@
-#include "extensions/filters/http/grpc_stats/grpc_stats_filter.h"
+#include "source/extensions/filters/http/grpc_stats/grpc_stats_filter.h"
 
 #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.h"
 #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/grpc/context_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h
index 0734d10e8d3d0..f66d23744b8f1 100644
--- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h
+++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h
@@ -5,8 +5,8 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/stream_info/filter_state.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_web/BUILD b/source/extensions/filters/http/grpc_web/BUILD
index f0f341b49708a..21fa6e4ac5d37 100644
--- a/source/extensions/filters/http/grpc_web/BUILD
+++ b/source/extensions/filters/http/grpc_web/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["grpc_web_filter.cc"],
     hdrs = ["grpc_web_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:base64_lib",
         "//source/common/common:utility_lib",
         "//source/common/grpc:codec_lib",
@@ -33,8 +33,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/grpc_web:grpc_web_filter_lib",
diff --git a/source/extensions/filters/http/grpc_web/config.cc b/source/extensions/filters/http/grpc_web/config.cc
index 28fb50f6fd4d3..c86c8bbcf50e8 100644
--- a/source/extensions/filters/http/grpc_web/config.cc
+++ b/source/extensions/filters/http/grpc_web/config.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/grpc_web/config.h"
+#include "source/extensions/filters/http/grpc_web/config.h"
 
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/grpc_web/grpc_web_filter.h"
+#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_web/config.h b/source/extensions/filters/http/grpc_web/config.h
index fccfe0d3a1e09..a14a734d7d411 100644
--- a/source/extensions/filters/http/grpc_web/config.h
+++ b/source/extensions/filters/http/grpc_web/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.h"
 #include "envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_web/grpc_web_filter.cc b/source/extensions/filters/http/grpc_web/grpc_web_filter.cc
index 93953fe44efd7..ca474514a4508 100644
--- a/source/extensions/filters/http/grpc_web/grpc_web_filter.cc
+++ b/source/extensions/filters/http/grpc_web/grpc_web_filter.cc
@@ -1,19 +1,19 @@
-#include "extensions/filters/http/grpc_web/grpc_web_filter.h"
+#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h"
 
 #ifndef WIN32
 #include <arpa/inet.h>
 #endif
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/grpc_web/grpc_web_filter.h b/source/extensions/filters/http/grpc_web/grpc_web_filter.h
index 01f4d59699b26..11c3a75a374d4 100644
--- a/source/extensions/filters/http/grpc_web/grpc_web_filter.h
+++ b/source/extensions/filters/http/grpc_web/grpc_web_filter.h
@@ -3,10 +3,10 @@
 #include "envoy/http/filter.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/non_copyable.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/context_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/non_copyable.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/context_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/gzip/config.cc b/source/extensions/filters/http/gzip/config.cc
index e4344b8c9e352..ebfd4e192ce95 100644
--- a/source/extensions/filters/http/gzip/config.cc
+++ b/source/extensions/filters/http/gzip/config.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/gzip/config.h"
+#include "source/extensions/filters/http/gzip/config.h"
 
-#include "extensions/filters/http/gzip/gzip_filter.h"
+#include "source/extensions/filters/http/gzip/gzip_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/gzip/config.h b/source/extensions/filters/http/gzip/config.h
index b91f55699430c..53addbfcacebf 100644
--- a/source/extensions/filters/http/gzip/config.h
+++ b/source/extensions/filters/http/gzip/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h"
 #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/gzip/gzip_filter.cc b/source/extensions/filters/http/gzip/gzip_filter.cc
index 804c3b9bd337f..c1e6d529222a5 100644
--- a/source/extensions/filters/http/gzip/gzip_filter.cc
+++ b/source/extensions/filters/http/gzip/gzip_filter.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/gzip/gzip_filter.h"
+#include "source/extensions/filters/http/gzip/gzip_filter.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/http/headers.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/gzip/gzip_filter.h b/source/extensions/filters/http/gzip/gzip_filter.h
index be30f081a043c..b0cd103be2666 100644
--- a/source/extensions/filters/http/gzip/gzip_filter.h
+++ b/source/extensions/filters/http/gzip/gzip_filter.h
@@ -2,8 +2,8 @@
 
 #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h"
 
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/filters/http/common/compressor/compressor.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/filters/http/common/compressor/compressor.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/header_to_metadata/BUILD b/source/extensions/filters/http/header_to_metadata/BUILD
index f0e7a6a1c3d01..4bb0ab59aa48b 100644
--- a/source/extensions/filters/http/header_to_metadata/BUILD
+++ b/source/extensions/filters/http/header_to_metadata/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     srcs = ["header_to_metadata_filter.cc"],
     hdrs = ["header_to_metadata_filter.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:base64_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:utility_lib",
@@ -31,7 +31,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/header_to_metadata/config.cc b/source/extensions/filters/http/header_to_metadata/config.cc
index e51104c658da9..1412e662fbce6 100644
--- a/source/extensions/filters/http/header_to_metadata/config.cc
+++ b/source/extensions/filters/http/header_to_metadata/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/header_to_metadata/config.h"
+#include "source/extensions/filters/http/header_to_metadata/config.h"
 
 #include <string>
 
@@ -6,9 +6,8 @@
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/header_to_metadata/config.h b/source/extensions/filters/http/header_to_metadata/config.h
index 247fa1c535e33..3c4798333b27c 100644
--- a/source/extensions/filters/http/header_to_metadata/config.h
+++ b/source/extensions/filters/http/header_to_metadata/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h"
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc
index 2d5358f89aebe..52242f1120ea3 100644
--- a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc
+++ b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
+#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
 
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h"
 
-#include "common/common/base64.h"
-#include "common/common/regex.h"
-#include "common/config/well_known_names.h"
-#include "common/http/header_utility.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/regex.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h
index a9bb0476f9661..b135f412bca81 100644
--- a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h
+++ b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h
@@ -7,8 +7,8 @@
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/http/health_check/BUILD b/source/extensions/filters/http/health_check/BUILD
index 52c1554da2e06..ca01c4f01de08 100644
--- a/source/extensions/filters/http/health_check/BUILD
+++ b/source/extensions/filters/http/health_check/BUILD
@@ -17,11 +17,11 @@ envoy_cc_library(
     srcs = ["health_check.cc"],
     hdrs = ["health_check.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
         "//source/common/http:codes_lib",
@@ -44,7 +44,7 @@ envoy_cc_extension(
         "//test/server:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/http:header_utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/health_check/config.cc b/source/extensions/filters/http/health_check/config.cc
index 7baa31b01daa5..faad4fce070c3 100644
--- a/source/extensions/filters/http/health_check/config.cc
+++ b/source/extensions/filters/http/health_check/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/health_check/config.h"
+#include "source/extensions/filters/http/health_check/config.h"
 
 #include <memory>
 
@@ -6,10 +6,9 @@
 #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/health_check/health_check.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/health_check/health_check.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/health_check/config.h b/source/extensions/filters/http/health_check/config.h
index e42bdacd03b71..207e8a956a65c 100644
--- a/source/extensions/filters/http/health_check/config.h
+++ b/source/extensions/filters/http/health_check/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.h"
 #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/health_check/health_check.cc b/source/extensions/filters/http/health_check/health_check.cc
index 65713a721c1c4..4a15e62df9f95 100644
--- a/source/extensions/filters/http/health_check/health_check.cc
+++ b/source/extensions/filters/http/health_check/health_check.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/health_check/health_check.h"
+#include "source/extensions/filters/http/health_check/health_check.h"
 
 #include <chrono>
 #include <string>
@@ -7,13 +7,13 @@
 #include "envoy/event/timer.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/health_check/health_check.h b/source/extensions/filters/http/health_check/health_check.h
index d11f0d3a80a93..674ed59af58ee 100644
--- a/source/extensions/filters/http/health_check/health_check.h
+++ b/source/extensions/filters/http/health_check/health_check.h
@@ -9,7 +9,7 @@
 #include "envoy/http/filter.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/http/header_utility.h"
+#include "source/common/http/header_utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ip_tagging/BUILD b/source/extensions/filters/http/ip_tagging/BUILD
index 443d168101f46..4d280597e6ed6 100644
--- a/source/extensions/filters/http/ip_tagging/BUILD
+++ b/source/extensions/filters/http/ip_tagging/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["ip_tagging_filter.cc"],
     hdrs = ["ip_tagging_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:assert_lib",
         "//source/common/http:header_map_lib",
         "//source/common/http:headers_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/ip_tagging/config.cc b/source/extensions/filters/http/ip_tagging/config.cc
index 4b66bb2d34a08..7ee7d5797fb2c 100644
--- a/source/extensions/filters/http/ip_tagging/config.cc
+++ b/source/extensions/filters/http/ip_tagging/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/http/ip_tagging/config.h"
+#include "source/extensions/filters/http/ip_tagging/config.h"
 
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h"
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ip_tagging/config.h b/source/extensions/filters/http/ip_tagging/config.h
index b9d296096f1dc..4a4d09ab9eff8 100644
--- a/source/extensions/filters/http/ip_tagging/config.h
+++ b/source/extensions/filters/http/ip_tagging/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h"
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc
index ed68cbe77144f..3d308294ecb01 100644
--- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc
+++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h"
+#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h"
 
 #include "envoy/config/core/v3/address.pb.h"
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h
index a37c5b9006a87..3753122a3dff5 100644
--- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h
+++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h
@@ -12,9 +12,9 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/cidr_range.h"
-#include "common/network/lc_trie.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/lc_trie.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/jwt_authn/BUILD b/source/extensions/filters/http/jwt_authn/BUILD
index d90c7cd27631e..20425aa8ebc8a 100644
--- a/source/extensions/filters/http/jwt_authn/BUILD
+++ b/source/extensions/filters/http/jwt_authn/BUILD
@@ -24,7 +24,7 @@ envoy_cc_library(
     name = "stats_lib",
     hdrs = ["stats.h"],
     deps = [
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
     ],
 )
 
@@ -37,7 +37,7 @@ envoy_cc_library(
     ],
     deps = [
         ":stats_lib",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/server:factory_context_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/init:target_lib",
         "//source/common/protobuf:utility_lib",
@@ -68,8 +68,8 @@ envoy_cc_library(
     deps = [
         ":extractor_lib",
         ":jwks_cache_lib",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/http:message_lib",
         "//source/common/tracing:http_tracer_lib",
         "//source/extensions/filters/http/common:jwks_fetcher_lib",
@@ -86,7 +86,7 @@ envoy_cc_library(
     deps = [
         ":filter_config_lib",
         ":matchers_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/http:headers_lib",
         "//source/extensions/filters/http:well_known_names",
     ],
@@ -98,7 +98,7 @@ envoy_cc_extension(
     hdrs = ["filter_factory.h"],
     deps = [
         ":filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto",
@@ -126,7 +126,7 @@ envoy_cc_library(
     deps = [
         ":authenticator_lib",
         ":extractor_lib",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto",
     ],
 )
@@ -138,10 +138,10 @@ envoy_cc_library(
     deps = [
         ":jwks_cache_lib",
         ":matchers_lib",
-        "//include/envoy/router:string_accessor_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/router:string_accessor_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/thread_local:thread_local_interface",
         "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/filters/http/jwt_authn/authenticator.cc b/source/extensions/filters/http/jwt_authn/authenticator.cc
index fd960636ac41d..ee5aa0b1cc007 100644
--- a/source/extensions/filters/http/jwt_authn/authenticator.cc
+++ b/source/extensions/filters/http/jwt_authn/authenticator.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/http/jwt_authn/authenticator.h"
+#include "source/extensions/filters/http/jwt_authn/authenticator.h"
 
 #include "envoy/http/async_client.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "jwt_verify_lib/jwt.h"
 #include "jwt_verify_lib/verify.h"
diff --git a/source/extensions/filters/http/jwt_authn/authenticator.h b/source/extensions/filters/http/jwt_authn/authenticator.h
index 04ee62cede1e1..f8dd647c7f4f9 100644
--- a/source/extensions/filters/http/jwt_authn/authenticator.h
+++ b/source/extensions/filters/http/jwt_authn/authenticator.h
@@ -2,8 +2,8 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/jwt_authn/extractor.h"
-#include "extensions/filters/http/jwt_authn/jwks_cache.h"
+#include "source/extensions/filters/http/jwt_authn/extractor.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_cache.h"
 
 #include "jwt_verify_lib/check_audience.h"
 #include "jwt_verify_lib/status.h"
diff --git a/source/extensions/filters/http/jwt_authn/extractor.cc b/source/extensions/filters/http/jwt_authn/extractor.cc
index 68e338c6421a7..8b78af98d0a9b 100644
--- a/source/extensions/filters/http/jwt_authn/extractor.cc
+++ b/source/extensions/filters/http/jwt_authn/extractor.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/http/jwt_authn/extractor.h"
+#include "source/extensions/filters/http/jwt_authn/extractor.h"
 
 #include <memory>
 
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/common/utility.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/match.h"
diff --git a/source/extensions/filters/http/jwt_authn/extractor.h b/source/extensions/filters/http/jwt_authn/extractor.h
index 921e489e7c184..98fb637c05fb1 100644
--- a/source/extensions/filters/http/jwt_authn/extractor.h
+++ b/source/extensions/filters/http/jwt_authn/extractor.h
@@ -6,7 +6,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/jwt_authn/filter.cc b/source/extensions/filters/http/jwt_authn/filter.cc
index 343ebc1cbeff6..bc494c071d9ce 100644
--- a/source/extensions/filters/http/jwt_authn/filter.cc
+++ b/source/extensions/filters/http/jwt_authn/filter.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/http/jwt_authn/filter.h"
+#include "source/extensions/filters/http/jwt_authn/filter.h"
 
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/str_split.h"
 #include "jwt_verify_lib/status.h"
diff --git a/source/extensions/filters/http/jwt_authn/filter.h b/source/extensions/filters/http/jwt_authn/filter.h
index 732eb1ca913dd..f4d95f04d9004 100644
--- a/source/extensions/filters/http/jwt_authn/filter.h
+++ b/source/extensions/filters/http/jwt_authn/filter.h
@@ -2,12 +2,11 @@
 
 #include "envoy/http/filter.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-
-#include "extensions/filters/http/jwt_authn/filter_config.h"
-#include "extensions/filters/http/jwt_authn/matcher.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/extensions/filters/http/jwt_authn/matcher.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/jwt_authn/filter_config.cc b/source/extensions/filters/http/jwt_authn/filter_config.cc
index 475d993daaeca..8d2874290678f 100644
--- a/source/extensions/filters/http/jwt_authn/filter_config.cc
+++ b/source/extensions/filters/http/jwt_authn/filter_config.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
 
 #include <algorithm> // std::sort
 
-#include "common/common/empty_string.h"
+#include "source/common/common/empty_string.h"
 
 using envoy::extensions::filters::http::jwt_authn::v3::RequirementRule;
 
diff --git a/source/extensions/filters/http/jwt_authn/filter_config.h b/source/extensions/filters/http/jwt_authn/filter_config.h
index 78f0e23d98783..b2508e4aa7046 100644
--- a/source/extensions/filters/http/jwt_authn/filter_config.h
+++ b/source/extensions/filters/http/jwt_authn/filter_config.h
@@ -8,9 +8,9 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "extensions/filters/http/jwt_authn/matcher.h"
-#include "extensions/filters/http/jwt_authn/stats.h"
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/extensions/filters/http/jwt_authn/matcher.h"
+#include "source/extensions/filters/http/jwt_authn/stats.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/filters/http/jwt_authn/filter_factory.cc b/source/extensions/filters/http/jwt_authn/filter_factory.cc
index 579571bd3d058..e2dc2b99ebb03 100644
--- a/source/extensions/filters/http/jwt_authn/filter_factory.cc
+++ b/source/extensions/filters/http/jwt_authn/filter_factory.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/http/jwt_authn/filter_factory.h"
+#include "source/extensions/filters/http/jwt_authn/filter_factory.h"
 
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/datasource.h"
-
-#include "extensions/filters/http/jwt_authn/filter.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/filters/http/jwt_authn/filter.h"
 
 #include "jwt_verify_lib/jwks.h"
 
diff --git a/source/extensions/filters/http/jwt_authn/filter_factory.h b/source/extensions/filters/http/jwt_authn/filter_factory.h
index c0398c71e4210..d2c537e2b0f4e 100644
--- a/source/extensions/filters/http/jwt_authn/filter_factory.h
+++ b/source/extensions/filters/http/jwt_authn/filter_factory.h
@@ -4,8 +4,8 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc
index 0ec5bbdce98f8..ddd7350d44d36 100644
--- a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc
+++ b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
 
-#include "common/protobuf/utility.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 using envoy::extensions::filters::http::jwt_authn::v3::RemoteJwks;
 
diff --git a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h
index c5909909b44ed..0d6247394ebac 100644
--- a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h
+++ b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h
@@ -5,11 +5,10 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/common/logger.h"
-#include "common/init/target_impl.h"
-
-#include "extensions/filters/http/common/jwks_fetcher.h"
-#include "extensions/filters/http/jwt_authn/stats.h"
+#include "source/common/common/logger.h"
+#include "source/common/init/target_impl.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/jwt_authn/jwks_cache.cc b/source/extensions/filters/http/jwt_authn/jwks_cache.cc
index 48199f0f6d4ff..673b4f6823d8d 100644
--- a/source/extensions/filters/http/jwt_authn/jwks_cache.cc
+++ b/source/extensions/filters/http/jwt_authn/jwks_cache.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/jwt_authn/jwks_cache.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_cache.h"
 
 #include <chrono>
 
 #include "envoy/common/time.h"
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/common/logger.h"
-#include "common/config/datasource.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/datasource.h"
 
 #include "absl/container/node_hash_map.h"
 #include "jwt_verify_lib/check_audience.h"
diff --git a/source/extensions/filters/http/jwt_authn/jwks_cache.h b/source/extensions/filters/http/jwt_authn/jwks_cache.h
index 186401c44c965..0efcb23931362 100644
--- a/source/extensions/filters/http/jwt_authn/jwks_cache.h
+++ b/source/extensions/filters/http/jwt_authn/jwks_cache.h
@@ -6,9 +6,9 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "extensions/filters/http/common/jwks_fetcher.h"
-#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
-#include "extensions/filters/http/jwt_authn/stats.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/stats.h"
 
 #include "jwt_verify_lib/jwks.h"
 
diff --git a/source/extensions/filters/http/jwt_authn/matcher.cc b/source/extensions/filters/http/jwt_authn/matcher.cc
index 7cc62471c63f5..7eb1cfcab9d85 100644
--- a/source/extensions/filters/http/jwt_authn/matcher.cc
+++ b/source/extensions/filters/http/jwt_authn/matcher.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/jwt_authn/matcher.h"
+#include "source/extensions/filters/http/jwt_authn/matcher.h"
 
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/common/regex.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/common/regex.h"
+#include "source/common/router/config_impl.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/extensions/filters/http/jwt_authn/verifier.cc b/source/extensions/filters/http/jwt_authn/verifier.cc
index 83361c8edd7b8..c22c446cc98e7 100644
--- a/source/extensions/filters/http/jwt_authn/verifier.cc
+++ b/source/extensions/filters/http/jwt_authn/verifier.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
diff --git a/source/extensions/filters/http/jwt_authn/verifier.h b/source/extensions/filters/http/jwt_authn/verifier.h
index b66c157fb45e2..2b62ed4bcec90 100644
--- a/source/extensions/filters/http/jwt_authn/verifier.h
+++ b/source/extensions/filters/http/jwt_authn/verifier.h
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "extensions/filters/http/jwt_authn/authenticator.h"
+#include "source/extensions/filters/http/jwt_authn/authenticator.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/kill_request/BUILD b/source/extensions/filters/http/kill_request/BUILD
index 2a7a21ef355e7..b7ad1487da429 100644
--- a/source/extensions/filters/http/kill_request/BUILD
+++ b/source/extensions/filters/http/kill_request/BUILD
@@ -14,9 +14,9 @@ envoy_cc_library(
     srcs = ["kill_request_filter.cc"],
     hdrs = ["kill_request_filter.h"],
     deps = [
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:header_map_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:headers_lib",
@@ -31,7 +31,7 @@ envoy_cc_extension(
     srcs = ["kill_request_config.cc"],
     hdrs = ["kill_request_config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/kill_request:kill_request_filter_lib",
diff --git a/source/extensions/filters/http/kill_request/kill_request_config.cc b/source/extensions/filters/http/kill_request/kill_request_config.cc
index cb371c098da22..ba74b8c16da9e 100644
--- a/source/extensions/filters/http/kill_request/kill_request_config.cc
+++ b/source/extensions/filters/http/kill_request/kill_request_config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/kill_request/kill_request_config.h"
+#include "source/extensions/filters/http/kill_request/kill_request_config.h"
 
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h"
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/kill_request/kill_request_filter.h"
+#include "source/extensions/filters/http/kill_request/kill_request_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/kill_request/kill_request_config.h b/source/extensions/filters/http/kill_request/kill_request_config.h
index 4e56068d77500..1c757936532c5 100644
--- a/source/extensions/filters/http/kill_request/kill_request_config.h
+++ b/source/extensions/filters/http/kill_request/kill_request_config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h"
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/kill_request/kill_request_filter.cc b/source/extensions/filters/http/kill_request/kill_request_filter.cc
index b6269db1593bd..d21c755330634 100644
--- a/source/extensions/filters/http/kill_request/kill_request_filter.cc
+++ b/source/extensions/filters/http/kill_request/kill_request_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/kill_request/kill_request_filter.h"
+#include "source/extensions/filters/http/kill_request/kill_request_filter.h"
 
 #include <csignal>
 #include <string>
@@ -6,10 +6,9 @@
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/kill_request/kill_request_filter.h b/source/extensions/filters/http/kill_request/kill_request_filter.h
index be84624ea62fb..b97c66fa14b10 100644
--- a/source/extensions/filters/http/kill_request/kill_request_filter.h
+++ b/source/extensions/filters/http/kill_request/kill_request_filter.h
@@ -7,8 +7,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
 
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/local_ratelimit/BUILD b/source/extensions/filters/http/local_ratelimit/BUILD
index d409a424fd6bf..e1842983b4664 100644
--- a/source/extensions/filters/http/local_ratelimit/BUILD
+++ b/source/extensions/filters/http/local_ratelimit/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["local_ratelimit.cc"],
     hdrs = ["local_ratelimit.h"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/http:codes_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:utility_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:headers_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":local_ratelimit_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/local_ratelimit/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/http/local_ratelimit/config.cc b/source/extensions/filters/http/local_ratelimit/config.cc
index a5e629d88055d..15c7107276960 100644
--- a/source/extensions/filters/http/local_ratelimit/config.cc
+++ b/source/extensions/filters/http/local_ratelimit/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/http/local_ratelimit/config.h"
+#include "source/extensions/filters/http/local_ratelimit/config.h"
 
 #include <string>
 
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/local_ratelimit/local_ratelimit.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/local_ratelimit/config.h b/source/extensions/filters/http/local_ratelimit/config.h
index 4ee849e368bea..96ae7caa5b892 100644
--- a/source/extensions/filters/http/local_ratelimit/config.h
+++ b/source/extensions/filters/http/local_ratelimit/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.h"
 #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc b/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc
index 741ec1b3346c0..b216b15075af1 100644
--- a/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc
+++ b/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/local_ratelimit/local_ratelimit.h"
+#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h"
 
 #include <string>
 #include <vector>
 
 #include "envoy/http/codes.h"
 
-#include "common/http/utility.h"
-#include "common/router/config_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/router/config_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/local_ratelimit/local_ratelimit.h b/source/extensions/filters/http/local_ratelimit/local_ratelimit.h
index 380fd212a5052..5b485e6b999fb 100644
--- a/source/extensions/filters/http/local_ratelimit/local_ratelimit.h
+++ b/source/extensions/filters/http/local_ratelimit/local_ratelimit.h
@@ -12,14 +12,13 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/assert.h"
-#include "common/http/header_map_impl.h"
-#include "common/router/header_parser.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/lua/BUILD b/source/extensions/filters/http/lua/BUILD
index c4683e8263534..733ed65b6906a 100644
--- a/source/extensions/filters/http/lua/BUILD
+++ b/source/extensions/filters/http/lua/BUILD
@@ -18,9 +18,9 @@ envoy_cc_library(
     hdrs = ["lua_filter.h"],
     deps = [
         ":wrappers_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:enum_to_int",
         "//source/common/config:datasource_lib",
@@ -40,8 +40,8 @@ envoy_cc_library(
     srcs = ["wrappers.cc"],
     hdrs = ["wrappers.h"],
     deps = [
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/crypto:utility_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:utility_lib",
@@ -56,7 +56,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/lua:lua_filter_lib",
diff --git a/source/extensions/filters/http/lua/config.cc b/source/extensions/filters/http/lua/config.cc
index 6bc518bf66595..6ed6ba6ddcd98 100644
--- a/source/extensions/filters/http/lua/config.cc
+++ b/source/extensions/filters/http/lua/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/lua/config.h"
+#include "source/extensions/filters/http/lua/config.h"
 
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.h"
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/lua/lua_filter.h"
+#include "source/extensions/filters/http/lua/lua_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/lua/config.h b/source/extensions/filters/http/lua/config.h
index b2057c532f2b5..8516a94e9c0e0 100644
--- a/source/extensions/filters/http/lua/config.h
+++ b/source/extensions/filters/http/lua/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.h"
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/lua/lua_filter.cc b/source/extensions/filters/http/lua/lua_filter.cc
index 883101fa0efe8..03e5ae9a8b20c 100644
--- a/source/extensions/filters/http/lua/lua_filter.cc
+++ b/source/extensions/filters/http/lua/lua_filter.cc
@@ -1,16 +1,16 @@
-#include "extensions/filters/http/lua/lua_filter.h"
+#include "source/extensions/filters/http/lua/lua_filter.h"
 
 #include <atomic>
 #include <memory>
 
 #include "envoy/http/codes.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/config/datasource.h"
-#include "common/crypto/utility.h"
-#include "common/http/message_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/config/datasource.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/message_impl.h"
 
 #include "absl/strings/escaping.h"
 
diff --git a/source/extensions/filters/http/lua/lua_filter.h b/source/extensions/filters/http/lua/lua_filter.h
index 5595eb72a41df..4e778a6e07149 100644
--- a/source/extensions/filters/http/lua/lua_filter.h
+++ b/source/extensions/filters/http/lua/lua_filter.h
@@ -4,14 +4,13 @@
 #include "envoy/http/filter.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/crypto/utility.h"
-#include "common/http/utility.h"
-
-#include "extensions/common/utility.h"
-#include "extensions/filters/common/lua/wrappers.h"
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/lua/wrappers.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/common/utility.h"
+#include "source/extensions/filters/common/lua/wrappers.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/lua/wrappers.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/lua/wrappers.cc b/source/extensions/filters/http/lua/wrappers.cc
index 04fa2842ea645..04bd6a7b3eac5 100644
--- a/source/extensions/filters/http/lua/wrappers.cc
+++ b/source/extensions/filters/http/lua/wrappers.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/http/lua/wrappers.h"
+#include "source/extensions/filters/http/lua/wrappers.h"
 
-#include "common/http/header_utility.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/common/lua/wrappers.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/common/lua/wrappers.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/lua/wrappers.h b/source/extensions/filters/http/lua/wrappers.h
index 7168fe7768c78..e04ca24f47392 100644
--- a/source/extensions/filters/http/lua/wrappers.h
+++ b/source/extensions/filters/http/lua/wrappers.h
@@ -3,11 +3,10 @@
 #include "envoy/http/header_map.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/crypto/utility.h"
-
-#include "extensions/common/crypto/crypto_impl.h"
-#include "extensions/filters/common/lua/lua.h"
-#include "extensions/filters/common/lua/wrappers.h"
+#include "source/common/crypto/utility.h"
+#include "source/extensions/common/crypto/crypto_impl.h"
+#include "source/extensions/filters/common/lua/lua.h"
+#include "source/extensions/filters/common/lua/wrappers.h"
 
 #include "openssl/evp.h"
 
diff --git a/source/extensions/filters/http/oauth2/BUILD b/source/extensions/filters/http/oauth2/BUILD
index d7ea3098c4498..705c83c10dbc2 100644
--- a/source/extensions/filters/http/oauth2/BUILD
+++ b/source/extensions/filters/http/oauth2/BUILD
@@ -29,8 +29,8 @@ envoy_cc_library(
     hdrs = ["oauth_client.h"],
     deps = [
         ":oauth_response_cc_proto",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/http:message_lib",
         "//source/common/http:utility_lib",
         "//source/common/protobuf:message_validator_lib",
@@ -45,7 +45,7 @@ envoy_cc_library(
     hdrs = ["filter.h"],
     deps = [
         ":oauth_client",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
@@ -65,7 +65,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":oauth_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/api/v2/auth:pkg_cc_proto",
diff --git a/source/extensions/filters/http/oauth2/config.cc b/source/extensions/filters/http/oauth2/config.cc
index d51d798874e5b..ef8cfc364cb37 100644
--- a/source/extensions/filters/http/oauth2/config.cc
+++ b/source/extensions/filters/http/oauth2/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/oauth2/config.h"
+#include "source/extensions/filters/http/oauth2/config.h"
 
 #include <chrono>
 #include <memory>
@@ -13,11 +13,10 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/oauth2/filter.h"
-#include "extensions/filters/http/oauth2/oauth.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/oauth2/filter.h"
+#include "source/extensions/filters/http/oauth2/oauth.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/oauth2/config.h b/source/extensions/filters/http/oauth2/config.h
index f9f9399f6500f..95200b4d7975c 100644
--- a/source/extensions/filters/http/oauth2/config.h
+++ b/source/extensions/filters/http/oauth2/config.h
@@ -5,8 +5,8 @@
 #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.h"
 #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/oauth2/filter.cc b/source/extensions/filters/http/oauth2/filter.cc
index ee449c7ff4edd..f7731ee44d7a2 100644
--- a/source/extensions/filters/http/oauth2/filter.cc
+++ b/source/extensions/filters/http/oauth2/filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/oauth2/filter.h"
+#include "source/extensions/filters/http/oauth2/filter.h"
 
 #include <algorithm>
 #include <chrono>
@@ -6,19 +6,19 @@
 #include <string>
 #include <vector>
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/common/matchers.h"
-#include "common/crypto/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/matchers.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
diff --git a/source/extensions/filters/http/oauth2/filter.h b/source/extensions/filters/http/oauth2/filter.h
index bd70be95ed2d7..e2e4b88be3b86 100644
--- a/source/extensions/filters/http/oauth2/filter.h
+++ b/source/extensions/filters/http/oauth2/filter.h
@@ -14,18 +14,17 @@
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/matchers.h"
-#include "common/config/datasource.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-#include "common/http/rest_api_fetcher.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
-#include "extensions/filters/http/oauth2/oauth.h"
-#include "extensions/filters/http/oauth2/oauth_client.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/matchers.h"
+#include "source/common/config/datasource.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/rest_api_fetcher.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/oauth2/oauth.h"
+#include "source/extensions/filters/http/oauth2/oauth_client.h"
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/http/oauth2/oauth_client.cc b/source/extensions/filters/http/oauth2/oauth_client.cc
index ec0793587448b..24335ff6c3909 100644
--- a/source/extensions/filters/http/oauth2/oauth_client.cc
+++ b/source/extensions/filters/http/oauth2/oauth_client.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/oauth2/oauth_client.h"
+#include "source/extensions/filters/http/oauth2/oauth_client.h"
 
 #include <chrono>
 
@@ -6,13 +6,12 @@
 #include "envoy/http/message.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
 #include "source/extensions/filters/http/oauth2/oauth_response.pb.h"
 
 namespace Envoy {
diff --git a/source/extensions/filters/http/oauth2/oauth_client.h b/source/extensions/filters/http/oauth2/oauth_client.h
index e270c327236eb..acd680784f4e8 100644
--- a/source/extensions/filters/http/oauth2/oauth_client.h
+++ b/source/extensions/filters/http/oauth2/oauth_client.h
@@ -8,11 +8,10 @@
 #include "envoy/http/message.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/oauth2/oauth.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/oauth2/oauth.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/on_demand/BUILD b/source/extensions/filters/http/on_demand/BUILD
index 5c66187881615..4a1b66d5210f1 100644
--- a/source/extensions/filters/http/on_demand/BUILD
+++ b/source/extensions/filters/http/on_demand/BUILD
@@ -16,9 +16,9 @@ envoy_cc_library(
     srcs = ["on_demand_update.cc"],
     hdrs = ["on_demand_update.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
         "//source/common/http:codes_lib",
@@ -36,7 +36,7 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/on_demand:on_demand_update_lib",
diff --git a/source/extensions/filters/http/on_demand/config.cc b/source/extensions/filters/http/on_demand/config.cc
index 42d07ef4dca68..34fe2125354b0 100644
--- a/source/extensions/filters/http/on_demand/config.cc
+++ b/source/extensions/filters/http/on_demand/config.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/http/on_demand/config.h"
+#include "source/extensions/filters/http/on_demand/config.h"
 
 #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.h"
 
-#include "extensions/filters/http/on_demand/on_demand_update.h"
+#include "source/extensions/filters/http/on_demand/on_demand_update.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/on_demand/config.h b/source/extensions/filters/http/on_demand/config.h
index eb48654ab34c4..2d321290bb8bf 100644
--- a/source/extensions/filters/http/on_demand/config.h
+++ b/source/extensions/filters/http/on_demand/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.h"
 #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/on_demand/on_demand_update.cc b/source/extensions/filters/http/on_demand/on_demand_update.cc
index 2e392846f3b0d..25c952fc386df 100644
--- a/source/extensions/filters/http/on_demand/on_demand_update.cc
+++ b/source/extensions/filters/http/on_demand/on_demand_update.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/http/on_demand/on_demand_update.h"
+#include "source/extensions/filters/http/on_demand/on_demand_update.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/http/codes.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/codes.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/original_src/BUILD b/source/extensions/filters/http/original_src/BUILD
index fe0c2adb6b64c..8b67b11fae92e 100644
--- a/source/extensions/filters/http/original_src/BUILD
+++ b/source/extensions/filters/http/original_src/BUILD
@@ -24,7 +24,7 @@ envoy_cc_library(
     hdrs = ["original_src.h"],
     deps = [
         ":config_lib",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/extensions/filters/common/original_src:socket_option_factory_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
     deps = [
         ":config_lib",
         ":original_src_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/http/original_src/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/http/original_src/config.cc b/source/extensions/filters/http/original_src/config.cc
index d5a28eaebe47b..1c1e4bae381ec 100644
--- a/source/extensions/filters/http/original_src/config.cc
+++ b/source/extensions/filters/http/original_src/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/original_src/config.h"
+#include "source/extensions/filters/http/original_src/config.h"
 
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 
diff --git a/source/extensions/filters/http/original_src/original_src.cc b/source/extensions/filters/http/original_src/original_src.cc
index ef5f5214ef133..a4ef7d19aa50e 100644
--- a/source/extensions/filters/http/original_src/original_src.cc
+++ b/source/extensions/filters/http/original_src/original_src.cc
@@ -1,8 +1,7 @@
-#include "extensions/filters/http/original_src/original_src.h"
+#include "source/extensions/filters/http/original_src/original_src.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/common/original_src/socket_option_factory.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/common/original_src/socket_option_factory.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/original_src/original_src.h b/source/extensions/filters/http/original_src/original_src.h
index 032f93ee63048..4d6ed7db1e815 100644
--- a/source/extensions/filters/http/original_src/original_src.h
+++ b/source/extensions/filters/http/original_src/original_src.h
@@ -3,9 +3,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/network/address.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/http/original_src/config.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/original_src/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/original_src/original_src_config_factory.cc b/source/extensions/filters/http/original_src/original_src_config_factory.cc
index e49efec8596f0..34fbaf9ca6d54 100644
--- a/source/extensions/filters/http/original_src/original_src_config_factory.cc
+++ b/source/extensions/filters/http/original_src/original_src_config_factory.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/original_src/original_src_config_factory.h"
+#include "source/extensions/filters/http/original_src/original_src_config_factory.h"
 
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/original_src/config.h"
-#include "extensions/filters/http/original_src/original_src.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/original_src/config.h"
+#include "source/extensions/filters/http/original_src/original_src.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/original_src/original_src_config_factory.h b/source/extensions/filters/http/original_src/original_src_config_factory.h
index e9c3b6dd39b23..61ea5d341a580 100644
--- a/source/extensions/filters/http/original_src/original_src_config_factory.h
+++ b/source/extensions/filters/http/original_src/original_src_config_factory.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ratelimit/BUILD b/source/extensions/filters/http/ratelimit/BUILD
index bc845c26ed5a7..db1f99e0f37b3 100644
--- a/source/extensions/filters/http/ratelimit/BUILD
+++ b/source/extensions/filters/http/ratelimit/BUILD
@@ -18,8 +18,8 @@ envoy_cc_library(
     hdrs = ["ratelimit.h"],
     deps = [
         ":ratelimit_headers_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/ratelimit:ratelimit_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:enum_to_int",
@@ -47,7 +47,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":ratelimit_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
diff --git a/source/extensions/filters/http/ratelimit/config.cc b/source/extensions/filters/http/ratelimit/config.cc
index c0c393b2aa758..0db542d17a9ac 100644
--- a/source/extensions/filters/http/ratelimit/config.cc
+++ b/source/extensions/filters/http/ratelimit/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/ratelimit/config.h"
+#include "source/extensions/filters/http/ratelimit/config.h"
 
 #include <chrono>
 #include <string>
@@ -7,11 +7,10 @@
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
-#include "extensions/filters/http/ratelimit/ratelimit.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ratelimit/config.h b/source/extensions/filters/http/ratelimit/config.h
index 82d22786acc5c..fa04571715383 100644
--- a/source/extensions/filters/http/ratelimit/config.h
+++ b/source/extensions/filters/http/ratelimit/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ratelimit/ratelimit.cc b/source/extensions/filters/http/ratelimit/ratelimit.cc
index d97b6ea489cbb..2feebe4bfd923 100644
--- a/source/extensions/filters/http/ratelimit/ratelimit.cc
+++ b/source/extensions/filters/http/ratelimit/ratelimit.cc
@@ -1,19 +1,18 @@
-#include "extensions/filters/http/ratelimit/ratelimit.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit.h"
 
 #include <string>
 #include <vector>
 
 #include "envoy/http/codes.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/http/codes.h"
-#include "common/http/header_utility.h"
-#include "common/router/config_impl.h"
-
-#include "extensions/filters/http/ratelimit/ratelimit_headers.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ratelimit/ratelimit.h b/source/extensions/filters/http/ratelimit/ratelimit.h
index fc0341e050e39..bee2d04ff2e07 100644
--- a/source/extensions/filters/http/ratelimit/ratelimit.h
+++ b/source/extensions/filters/http/ratelimit/ratelimit.h
@@ -14,11 +14,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/common/ratelimit/stat_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/common/ratelimit/stat_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/ratelimit/ratelimit_headers.cc b/source/extensions/filters/http/ratelimit/ratelimit_headers.cc
index 097171b108f5b..76644be416df2 100644
--- a/source/extensions/filters/http/ratelimit/ratelimit_headers.cc
+++ b/source/extensions/filters/http/ratelimit/ratelimit_headers.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/http/ratelimit/ratelimit_headers.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "absl/strings/substitute.h"
 
diff --git a/source/extensions/filters/http/ratelimit/ratelimit_headers.h b/source/extensions/filters/http/ratelimit/ratelimit_headers.h
index 047bf495defcf..6717941426560 100644
--- a/source/extensions/filters/http/ratelimit/ratelimit_headers.h
+++ b/source/extensions/filters/http/ratelimit/ratelimit_headers.h
@@ -2,9 +2,8 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/rbac/BUILD b/source/extensions/filters/http/rbac/BUILD
index e14b6506c9e6a..34fcc947532ad 100644
--- a/source/extensions/filters/http/rbac/BUILD
+++ b/source/extensions/filters/http/rbac/BUILD
@@ -14,7 +14,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/rbac:rbac_filter_lib",
@@ -27,8 +27,8 @@ envoy_cc_library(
     srcs = ["rbac_filter.cc"],
     hdrs = ["rbac_filter.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/http:filter_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/http:utility_lib",
         "//source/extensions/filters/common/rbac:engine_lib",
         "//source/extensions/filters/common/rbac:utility_lib",
diff --git a/source/extensions/filters/http/rbac/config.cc b/source/extensions/filters/http/rbac/config.cc
index 4ead41107d5c6..e389ee1030f13 100644
--- a/source/extensions/filters/http/rbac/config.cc
+++ b/source/extensions/filters/http/rbac/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/rbac/config.h"
+#include "source/extensions/filters/http/rbac/config.h"
 
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/rbac/rbac_filter.h"
+#include "source/extensions/filters/http/rbac/rbac_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/rbac/config.h b/source/extensions/filters/http/rbac/config.h
index b4b377d4a226e..b6cc2c959797d 100644
--- a/source/extensions/filters/http/rbac/config.h
+++ b/source/extensions/filters/http/rbac/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/rbac/rbac_filter.cc b/source/extensions/filters/http/rbac/rbac_filter.cc
index bd2b477b468c6..e966285520d82 100644
--- a/source/extensions/filters/http/rbac/rbac_filter.cc
+++ b/source/extensions/filters/http/rbac/rbac_filter.cc
@@ -1,11 +1,10 @@
-#include "extensions/filters/http/rbac/rbac_filter.h"
+#include "source/extensions/filters/http/rbac/rbac_filter.h"
 
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/extensions/filters/http/rbac/rbac_filter.h b/source/extensions/filters/http/rbac/rbac_filter.h
index f70df4c6e8eee..41d38a9a37c1e 100644
--- a/source/extensions/filters/http/rbac/rbac_filter.h
+++ b/source/extensions/filters/http/rbac/rbac_filter.h
@@ -7,10 +7,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/common/rbac/engine_impl.h"
-#include "extensions/filters/common/rbac/utility.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
+#include "source/extensions/filters/common/rbac/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/router/BUILD b/source/extensions/filters/http/router/BUILD
index 8e268cff166c3..e112cb2b87e69 100644
--- a/source/extensions/filters/http/router/BUILD
+++ b/source/extensions/filters/http/router/BUILD
@@ -18,7 +18,7 @@ envoy_cc_extension(
     # This is core Envoy config.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/router:router_lib",
         "//source/common/router:shadow_writer_lib",
         "//source/extensions/filters/http:well_known_names",
diff --git a/source/extensions/filters/http/router/config.cc b/source/extensions/filters/http/router/config.cc
index 4e18fbe802fbf..75d4410ca9c1a 100644
--- a/source/extensions/filters/http/router/config.cc
+++ b/source/extensions/filters/http/router/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/http/router/config.h"
+#include "source/extensions/filters/http/router/config.h"
 
 #include "envoy/extensions/filters/http/router/v3/router.pb.h"
 #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h"
 
-#include "common/router/router.h"
-#include "common/router/shadow_writer_impl.h"
+#include "source/common/router/router.h"
+#include "source/common/router/shadow_writer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/router/config.h b/source/extensions/filters/http/router/config.h
index 604c3423481bf..30f72b0bcadba 100644
--- a/source/extensions/filters/http/router/config.h
+++ b/source/extensions/filters/http/router/config.h
@@ -4,10 +4,9 @@
 #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/set_metadata/BUILD b/source/extensions/filters/http/set_metadata/BUILD
index d4ea191e892d3..7ea6c51a0408f 100644
--- a/source/extensions/filters/http/set_metadata/BUILD
+++ b/source/extensions/filters/http/set_metadata/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["set_metadata_filter.cc"],
     hdrs = ["set_metadata_filter.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/http:utility_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http:well_known_names",
@@ -28,7 +28,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/set_metadata/config.cc b/source/extensions/filters/http/set_metadata/config.cc
index 2d2f35cd2a7ca..cb3ef84cb2247 100644
--- a/source/extensions/filters/http/set_metadata/config.cc
+++ b/source/extensions/filters/http/set_metadata/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/set_metadata/config.h"
+#include "source/extensions/filters/http/set_metadata/config.h"
 
 #include <string>
 
@@ -6,9 +6,8 @@
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/set_metadata/set_metadata_filter.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/set_metadata/config.h b/source/extensions/filters/http/set_metadata/config.h
index 32350b0f6af56..322064407ab66 100644
--- a/source/extensions/filters/http/set_metadata/config.h
+++ b/source/extensions/filters/http/set_metadata/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h"
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/set_metadata/set_metadata_filter.cc b/source/extensions/filters/http/set_metadata/set_metadata_filter.cc
index 98295d3cda3d8..a17bec4c0afb3 100644
--- a/source/extensions/filters/http/set_metadata/set_metadata_filter.cc
+++ b/source/extensions/filters/http/set_metadata/set_metadata_filter.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/http/set_metadata/set_metadata_filter.h"
+#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h"
 
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h"
 
-#include "common/config/well_known_names.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "absl/strings/str_format.h"
 
diff --git a/source/extensions/filters/http/set_metadata/set_metadata_filter.h b/source/extensions/filters/http/set_metadata/set_metadata_filter.h
index a5a0957a9f818..8611980117f2a 100644
--- a/source/extensions/filters/http/set_metadata/set_metadata_filter.h
+++ b/source/extensions/filters/http/set_metadata/set_metadata_filter.h
@@ -6,9 +6,8 @@
 
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/http/squash/BUILD b/source/extensions/filters/http/squash/BUILD
index ef3c4ca805b8a..7798932f8cd78 100644
--- a/source/extensions/filters/http/squash/BUILD
+++ b/source/extensions/filters/http/squash/BUILD
@@ -17,11 +17,11 @@ envoy_cc_library(
     srcs = ["squash_filter.cc"],
     hdrs = ["squash_filter.h"],
     deps = [
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:empty_string",
         "//source/common/common:enum_to_int",
         "//source/common/http:headers_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
diff --git a/source/extensions/filters/http/squash/config.cc b/source/extensions/filters/http/squash/config.cc
index 34dd36353a138..d2420a6bb8381 100644
--- a/source/extensions/filters/http/squash/config.cc
+++ b/source/extensions/filters/http/squash/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/squash/config.h"
+#include "source/extensions/filters/http/squash/config.h"
 
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/squash/squash_filter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/squash/squash_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/squash/config.h b/source/extensions/filters/http/squash/config.h
index eb27a40880d77..4039e7b5dcc98 100644
--- a/source/extensions/filters/http/squash/config.h
+++ b/source/extensions/filters/http/squash/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/squash/squash_filter.cc b/source/extensions/filters/http/squash/squash_filter.cc
index 4efc21a794017..d15077455483e 100644
--- a/source/extensions/filters/http/squash/squash_filter.cc
+++ b/source/extensions/filters/http/squash/squash_filter.cc
@@ -1,19 +1,19 @@
-#include "extensions/filters/http/squash/squash_filter.h"
+#include "source/extensions/filters/http/squash/squash_filter.h"
 
 #include <memory>
 
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 #include "envoy/http/codes.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/json/json_loader.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/filters/http/squash/squash_filter.h b/source/extensions/filters/http/squash/squash_filter.h
index d654e7f220886..6786a6117a741 100644
--- a/source/extensions/filters/http/squash/squash_filter.h
+++ b/source/extensions/filters/http/squash/squash_filter.h
@@ -8,8 +8,8 @@
 #include "envoy/json/json_object.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/http/tap/BUILD b/source/extensions/filters/http/tap/BUILD
index e1e0f6407e30f..aa2a5656b3843 100644
--- a/source/extensions/filters/http/tap/BUILD
+++ b/source/extensions/filters/http/tap/BUILD
@@ -16,8 +16,8 @@ envoy_cc_library(
     name = "tap_config_interface",
     hdrs = ["tap_config.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/http:header_map_interface",
         "//source/extensions/common/tap:tap_interface",
     ],
 )
@@ -41,8 +41,8 @@ envoy_cc_library(
     hdrs = ["tap_filter.h"],
     deps = [
         ":tap_config_interface",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/http:filter_interface",
         "//source/extensions/common/tap:extension_config_base",
         "@envoy_api//envoy/extensions/filters/http/tap/v3:pkg_cc_proto",
     ],
@@ -55,7 +55,7 @@ envoy_cc_extension(
     deps = [
         ":tap_config_impl",
         ":tap_filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
         "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/http/tap/config.cc b/source/extensions/filters/http/tap/config.cc
index 1137022a7ff1f..ab992a89a40ce 100644
--- a/source/extensions/filters/http/tap/config.cc
+++ b/source/extensions/filters/http/tap/config.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/http/tap/config.h"
+#include "source/extensions/filters/http/tap/config.h"
 
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.h"
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/tap/tap_config_impl.h"
-#include "extensions/filters/http/tap/tap_filter.h"
+#include "source/extensions/filters/http/tap/tap_config_impl.h"
+#include "source/extensions/filters/http/tap/tap_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/tap/config.h b/source/extensions/filters/http/tap/config.h
index 105ca1d552b5b..c4b2ed2aae0d2 100644
--- a/source/extensions/filters/http/tap/config.h
+++ b/source/extensions/filters/http/tap/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.h"
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/tap/tap_config.h b/source/extensions/filters/http/tap/tap_config.h
index 5bbbf97ba3223..7eadb86ba623d 100644
--- a/source/extensions/filters/http/tap/tap_config.h
+++ b/source/extensions/filters/http/tap/tap_config.h
@@ -4,7 +4,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/http/header_map.h"
 
-#include "extensions/common/tap/tap.h"
+#include "source/extensions/common/tap/tap.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/tap/tap_config_impl.cc b/source/extensions/filters/http/tap/tap_config_impl.cc
index abcd825cc3307..7078e5f0438dc 100644
--- a/source/extensions/filters/http/tap/tap_config_impl.cc
+++ b/source/extensions/filters/http/tap/tap_config_impl.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/http/tap/tap_config_impl.h"
+#include "source/extensions/filters/http/tap/tap_config_impl.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/http.pb.h"
 
-#include "common/common/assert.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/tap/tap_config_impl.h b/source/extensions/filters/http/tap/tap_config_impl.h
index 1b579b633c0bf..d79ef4cc4842a 100644
--- a/source/extensions/filters/http/tap/tap_config_impl.h
+++ b/source/extensions/filters/http/tap/tap_config_impl.h
@@ -5,10 +5,9 @@
 #include "envoy/data/tap/v3/http.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/common/tap/tap_config_base.h"
-#include "extensions/filters/http/tap/tap_config.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/tap/tap_config_base.h"
+#include "source/extensions/filters/http/tap/tap_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/tap/tap_filter.cc b/source/extensions/filters/http/tap/tap_filter.cc
index 3e7cf36c193bf..d64b3407fde3a 100644
--- a/source/extensions/filters/http/tap/tap_filter.cc
+++ b/source/extensions/filters/http/tap/tap_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/tap/tap_filter.h"
+#include "source/extensions/filters/http/tap/tap_filter.h"
 
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.h"
 
diff --git a/source/extensions/filters/http/tap/tap_filter.h b/source/extensions/filters/http/tap/tap_filter.h
index 585d1af8b81f7..a6ea1a5059f22 100644
--- a/source/extensions/filters/http/tap/tap_filter.h
+++ b/source/extensions/filters/http/tap/tap_filter.h
@@ -6,8 +6,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "extensions/common/tap/extension_config_base.h"
-#include "extensions/filters/http/tap/tap_config.h"
+#include "source/extensions/common/tap/extension_config_base.h"
+#include "source/extensions/filters/http/tap/tap_config.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/http/wasm/BUILD b/source/extensions/filters/http/wasm/BUILD
index db3a6d09196ad..5688db36d75e6 100644
--- a/source/extensions/filters/http/wasm/BUILD
+++ b/source/extensions/filters/http/wasm/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     hdrs = ["wasm_filter.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/extensions/common/wasm:wasm_lib",
         "//source/extensions/filters/http:well_known_names",
         "@envoy_api//envoy/extensions/filters/http/wasm/v3:pkg_cc_proto",
@@ -32,7 +32,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":wasm_filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
         "//source/extensions/common/wasm:wasm_lib",
diff --git a/source/extensions/filters/http/wasm/config.cc b/source/extensions/filters/http/wasm/config.cc
index f46b7cf0692f0..06a02611e6cc7 100644
--- a/source/extensions/filters/http/wasm/config.cc
+++ b/source/extensions/filters/http/wasm/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/http/wasm/config.h"
+#include "source/extensions/filters/http/wasm/config.h"
 
 #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/http/wasm/wasm_filter.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/http/wasm/wasm_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/wasm/config.h b/source/extensions/filters/http/wasm/config.h
index 319aee96f9ca5..a8b3d788fb95b 100644
--- a/source/extensions/filters/http/wasm/config.h
+++ b/source/extensions/filters/http/wasm/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.h"
 #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/wasm/wasm_filter.cc b/source/extensions/filters/http/wasm/wasm_filter.cc
index a8921975fe483..90cd4c6bacd7b 100644
--- a/source/extensions/filters/http/wasm/wasm_filter.cc
+++ b/source/extensions/filters/http/wasm/wasm_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/wasm/wasm_filter.h"
+#include "source/extensions/filters/http/wasm/wasm_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/wasm/wasm_filter.h b/source/extensions/filters/http/wasm/wasm_filter.h
index cd633e505f7d4..4adec781bce05 100644
--- a/source/extensions/filters/http/wasm/wasm_filter.h
+++ b/source/extensions/filters/http/wasm/wasm_filter.h
@@ -7,9 +7,9 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/common/wasm/plugin.h"
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/http/well_known_names.h b/source/extensions/filters/http/well_known_names.h
index 609e13f5bb496..c30ad55af493c 100644
--- a/source/extensions/filters/http/well_known_names.h
+++ b/source/extensions/filters/http/well_known_names.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/config/well_known_names.h"
+#include "source/common/config/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/http_inspector/BUILD b/source/extensions/filters/listener/http_inspector/BUILD
index 8426d64e32bf2..9fae74fd8e66c 100644
--- a/source/extensions/filters/listener/http_inspector/BUILD
+++ b/source/extensions/filters/listener/http_inspector/BUILD
@@ -17,10 +17,10 @@ envoy_cc_library(
     hdrs = ["http_inspector.h"],
     external_deps = ["http_parser"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:headers_lib",
@@ -33,8 +33,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     deps = [
         ":http_inspector_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/listener:well_known_names",
         "@envoy_api//envoy/extensions/filters/listener/http_inspector/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/listener/http_inspector/config.cc b/source/extensions/filters/listener/http_inspector/config.cc
index 247e1f20a8072..503b04f47b1bf 100644
--- a/source/extensions/filters/listener/http_inspector/config.cc
+++ b/source/extensions/filters/listener/http_inspector/config.cc
@@ -3,8 +3,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/listener/http_inspector/http_inspector.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/http_inspector/http_inspector.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/http_inspector/http_inspector.cc b/source/extensions/filters/listener/http_inspector/http_inspector.cc
index 3f3c2c4d24264..2a69f38c77714 100644
--- a/source/extensions/filters/listener/http_inspector/http_inspector.cc
+++ b/source/extensions/filters/listener/http_inspector/http_inspector.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/listener/http_inspector/http_inspector.h"
+#include "source/extensions/filters/listener/http_inspector/http_inspector.h"
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/network/listen_socket.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_split.h"
diff --git a/source/extensions/filters/listener/http_inspector/http_inspector.h b/source/extensions/filters/listener/http_inspector/http_inspector.h
index 796add803b8fa..b43422f9e66ed 100644
--- a/source/extensions/filters/listener/http_inspector/http_inspector.h
+++ b/source/extensions/filters/listener/http_inspector/http_inspector.h
@@ -8,7 +8,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/extensions/filters/listener/original_dst/BUILD b/source/extensions/filters/listener/original_dst/BUILD
index 7ee4f6e013c32..68c1a0c7108f7 100644
--- a/source/extensions/filters/listener/original_dst/BUILD
+++ b/source/extensions/filters/listener/original_dst/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["original_dst.cc"],
     hdrs = ["original_dst.h"],
     deps = [
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/network:upstream_socket_options_filter_state_lib",
@@ -35,8 +35,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":original_dst_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/listener:well_known_names",
         "@envoy_api//envoy/extensions/filters/listener/original_dst/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/listener/original_dst/config.cc b/source/extensions/filters/listener/original_dst/config.cc
index cad8e5cd044b3..f0f813450805c 100644
--- a/source/extensions/filters/listener/original_dst/config.cc
+++ b/source/extensions/filters/listener/original_dst/config.cc
@@ -5,8 +5,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/listener/original_dst/original_dst.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/original_dst/original_dst.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_dst/original_dst.cc b/source/extensions/filters/listener/original_dst/original_dst.cc
index ba4741d6f8da4..f1465fad803e2 100644
--- a/source/extensions/filters/listener/original_dst/original_dst.cc
+++ b/source/extensions/filters/listener/original_dst/original_dst.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/listener/original_dst/original_dst.h"
+#include "source/extensions/filters/listener/original_dst/original_dst.h"
 
 #include "envoy/network/listen_socket.h"
 
-#include "common/common/assert.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/upstream_socket_options_filter_state.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_dst/original_dst.h b/source/extensions/filters/listener/original_dst/original_dst.h
index f067bfed92a9c..1732fbffaa009 100644
--- a/source/extensions/filters/listener/original_dst/original_dst.h
+++ b/source/extensions/filters/listener/original_dst/original_dst.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/filter.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_src/BUILD b/source/extensions/filters/listener/original_src/BUILD
index 4b952500fa44f..08396b5b4d644 100644
--- a/source/extensions/filters/listener/original_src/BUILD
+++ b/source/extensions/filters/listener/original_src/BUILD
@@ -24,10 +24,10 @@ envoy_cc_library(
     hdrs = ["original_src.h"],
     deps = [
         ":config_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/extensions/filters/common/original_src:socket_option_factory_lib",
@@ -41,8 +41,8 @@ envoy_cc_extension(
     deps = [
         ":config_lib",
         ":original_src_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/listener:well_known_names",
         "@envoy_api//envoy/extensions/filters/listener/original_src/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/listener/original_src/config.cc b/source/extensions/filters/listener/original_src/config.cc
index 10ec27e4a4c6c..6fa308bfd1313 100644
--- a/source/extensions/filters/listener/original_src/config.cc
+++ b/source/extensions/filters/listener/original_src/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/original_src/config.h"
+#include "source/extensions/filters/listener/original_src/config.h"
 
 #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h"
 
diff --git a/source/extensions/filters/listener/original_src/original_src.cc b/source/extensions/filters/listener/original_src/original_src.cc
index a8793761cfb1b..eefba846fcc8f 100644
--- a/source/extensions/filters/listener/original_src/original_src.cc
+++ b/source/extensions/filters/listener/original_src/original_src.cc
@@ -1,11 +1,10 @@
-#include "extensions/filters/listener/original_src/original_src.h"
+#include "source/extensions/filters/listener/original_src/original_src.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/connection.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/common/original_src/socket_option_factory.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/common/original_src/socket_option_factory.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_src/original_src.h b/source/extensions/filters/listener/original_src/original_src.h
index f201644f88106..5aaf6988e3dc2 100644
--- a/source/extensions/filters/listener/original_src/original_src.h
+++ b/source/extensions/filters/listener/original_src/original_src.h
@@ -3,9 +3,8 @@
 #include "envoy/network/address.h"
 #include "envoy/network/filter.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/listener/original_src/config.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/listener/original_src/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_src/original_src_config_factory.cc b/source/extensions/filters/listener/original_src/original_src_config_factory.cc
index 157e1a92efdd0..77baa3fea072c 100644
--- a/source/extensions/filters/listener/original_src/original_src_config_factory.cc
+++ b/source/extensions/filters/listener/original_src/original_src_config_factory.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/listener/original_src/original_src_config_factory.h"
+#include "source/extensions/filters/listener/original_src/original_src_config_factory.h"
 
 #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h"
 #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/listener/original_src/config.h"
-#include "extensions/filters/listener/original_src/original_src.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/original_src/config.h"
+#include "source/extensions/filters/listener/original_src/original_src.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/original_src/original_src_config_factory.h b/source/extensions/filters/listener/original_src/original_src_config_factory.h
index 94197935ab077..5bddfb52f90e0 100644
--- a/source/extensions/filters/listener/original_src/original_src_config_factory.h
+++ b/source/extensions/filters/listener/original_src/original_src_config_factory.h
@@ -3,7 +3,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/proxy_protocol/BUILD b/source/extensions/filters/listener/proxy_protocol/BUILD
index 6cff8506baed7..eef90aa458eb7 100644
--- a/source/extensions/filters/listener/proxy_protocol/BUILD
+++ b/source/extensions/filters/listener/proxy_protocol/BUILD
@@ -20,9 +20,9 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -45,8 +45,8 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/listener:well_known_names",
         "//source/extensions/filters/listener/proxy_protocol:proxy_protocol_lib",
         "@envoy_api//envoy/extensions/filters/listener/proxy_protocol/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/listener/proxy_protocol/config.cc b/source/extensions/filters/listener/proxy_protocol/config.cc
index 4641fcd6c9bf6..d63cce1d2f63f 100644
--- a/source/extensions/filters/listener/proxy_protocol/config.cc
+++ b/source/extensions/filters/listener/proxy_protocol/config.cc
@@ -5,8 +5,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc
index 320337fcba16a..dbe8d31442022 100644
--- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc
+++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -13,17 +13,16 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 using Envoy::Extensions::Common::ProxyProtocol::PROXY_PROTO_V1_SIGNATURE;
 using Envoy::Extensions::Common::ProxyProtocol::PROXY_PROTO_V1_SIGNATURE_LEN;
diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h
index 6255309c31234..469c838f9b83f 100644
--- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h
+++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h
@@ -6,9 +6,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "proxy_protocol_header.h"
diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
index c451c8f5e1c7c..f72258ce0ff55 100644
--- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
+++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/address.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/tls_inspector/BUILD b/source/extensions/filters/listener/tls_inspector/BUILD
index 109d783b2c4f0..cda19d6f83a60 100644
--- a/source/extensions/filters/listener/tls_inspector/BUILD
+++ b/source/extensions/filters/listener/tls_inspector/BUILD
@@ -22,10 +22,10 @@ envoy_cc_library(
         "//visibility:public",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -40,8 +40,8 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/listener:well_known_names",
         "//source/extensions/filters/listener/tls_inspector:tls_inspector_lib",
         "@envoy_api//envoy/extensions/filters/listener/tls_inspector/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/listener/tls_inspector/config.cc b/source/extensions/filters/listener/tls_inspector/config.cc
index 058a5ddaf7c56..468fbe4962641 100644
--- a/source/extensions/filters/listener/tls_inspector/config.cc
+++ b/source/extensions/filters/listener/tls_inspector/config.cc
@@ -5,8 +5,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc
index f2adbaf36367e..c2798827f6c91 100644
--- a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc
+++ b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
 
 #include <cstdint>
 #include <string>
@@ -10,8 +10,8 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/str_join.h"
 #include "openssl/ssl.h"
diff --git a/source/extensions/filters/listener/tls_inspector/tls_inspector.h b/source/extensions/filters/listener/tls_inspector/tls_inspector.h
index 9784ea10b6417..a31e814ffc0e4 100644
--- a/source/extensions/filters/listener/tls_inspector/tls_inspector.h
+++ b/source/extensions/filters/listener/tls_inspector/tls_inspector.h
@@ -6,7 +6,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "openssl/ssl.h"
 
diff --git a/source/extensions/filters/listener/well_known_names.h b/source/extensions/filters/listener/well_known_names.h
index 56c86d52620cb..25966a56e43d7 100644
--- a/source/extensions/filters/listener/well_known_names.h
+++ b/source/extensions/filters/listener/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/client_ssl_auth/BUILD b/source/extensions/filters/network/client_ssl_auth/BUILD
index de0b01ec4bab0..8c9169f3fc8e7 100644
--- a/source/extensions/filters/network/client_ssl_auth/BUILD
+++ b/source/extensions/filters/network/client_ssl_auth/BUILD
@@ -17,12 +17,12 @@ envoy_cc_library(
     srcs = ["client_ssl_auth.cc"],
     hdrs = ["client_ssl_auth.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
         "//source/common/http:headers_lib",
@@ -42,7 +42,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":client_ssl_auth",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/network/client_ssl_auth/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc
index bceb77b412ae7..1fb12918e1f7c 100644
--- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc
+++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
+#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
 
 #include <chrono>
 #include <cstdint>
@@ -8,14 +8,14 @@
 #include "envoy/network/connection.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/json/json_loader.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h
index 53422e5f48d89..19b3caea0a8e8 100644
--- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h
+++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h
@@ -13,10 +13,10 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/rest_api_fetcher.h"
-#include "common/network/cidr_range.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/rest_api_fetcher.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/node_hash_set.h"
 
diff --git a/source/extensions/filters/network/client_ssl_auth/config.cc b/source/extensions/filters/network/client_ssl_auth/config.cc
index 23a5d8dfa6c29..f974b275274fa 100644
--- a/source/extensions/filters/network/client_ssl_auth/config.cc
+++ b/source/extensions/filters/network/client_ssl_auth/config.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/network/client_ssl_auth/config.h"
+#include "source/extensions/filters/network/client_ssl_auth/config.h"
 
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h"
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h"
 #include "envoy/network/connection.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
+#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/client_ssl_auth/config.h b/source/extensions/filters/network/client_ssl_auth/config.h
index 2bb3d7a25dded..eaccae4f5d583 100644
--- a/source/extensions/filters/network/client_ssl_auth/config.h
+++ b/source/extensions/filters/network/client_ssl_auth/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h"
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/BUILD b/source/extensions/filters/network/common/BUILD
index c8b8dd24f51f5..be7c50d2fa1f0 100644
--- a/source/extensions/filters/network/common/BUILD
+++ b/source/extensions/filters/network/common/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     # Used by core.  TODO(#9953) clean up.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/common:utility_lib",
     ],
 )
@@ -25,7 +25,7 @@ envoy_cc_library(
     # Used by core.  TODO(#9953) clean up.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:macros",
         "//source/extensions/common:utility_lib",
         "//source/extensions/filters/network:well_known_names",
diff --git a/source/extensions/filters/network/common/factory_base.h b/source/extensions/filters/network/common/factory_base.h
index 9e818369b4a8e..20067d0c383c6 100644
--- a/source/extensions/filters/network/common/factory_base.h
+++ b/source/extensions/filters/network/common/factory_base.h
@@ -4,7 +4,7 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/BUILD b/source/extensions/filters/network/common/redis/BUILD
index 497286700ff2b..4561a35a52e57 100644
--- a/source/extensions/filters/network/common/redis/BUILD
+++ b/source/extensions/filters/network/common/redis/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "codec_interface",
     hdrs = ["codec.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -49,7 +49,7 @@ envoy_cc_library(
     deps = [
         ":codec_lib",
         ":redis_command_stats_lib",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ],
 )
 
@@ -61,10 +61,10 @@ envoy_cc_library(
         ":client_interface",
         ":codec_lib",
         ":utility_lib",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/stats:timespan_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/router:router_interface",
+        "//envoy/stats:timespan_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/network:filter_lib",
@@ -92,8 +92,8 @@ envoy_cc_library(
     deps = [
         ":codec_interface",
         ":supported_commands_lib",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:utility_lib",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:timespan_lib",
@@ -116,8 +116,8 @@ envoy_cc_library(
     deps = [
         ":codec_lib",
         ":fault_interface",
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/network/common/redis/client.h b/source/extensions/filters/network/common/redis/client.h
index f0c573f92f824..dbf3a0b317f15 100644
--- a/source/extensions/filters/network/common/redis/client.h
+++ b/source/extensions/filters/network/common/redis/client.h
@@ -4,8 +4,8 @@
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/filters/network/common/redis/codec_impl.h"
-#include "extensions/filters/network/common/redis/redis_command_stats.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
+#include "source/extensions/filters/network/common/redis/redis_command_stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/client_impl.cc b/source/extensions/filters/network/common/redis/client_impl.cc
index 6cdc7b8ad0077..0efea010b9106 100644
--- a/source/extensions/filters/network/common/redis/client_impl.cc
+++ b/source/extensions/filters/network/common/redis/client_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 
diff --git a/source/extensions/filters/network/common/redis/client_impl.h b/source/extensions/filters/network/common/redis/client_impl.h
index ca0eb5f21dbe6..2c5fc289cfb0e 100644
--- a/source/extensions/filters/network/common/redis/client_impl.h
+++ b/source/extensions/filters/network/common/redis/client_impl.h
@@ -7,16 +7,15 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/hash.h"
-#include "common/network/filter_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/const_singleton.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/hash.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/codec.h b/source/extensions/filters/network/common/redis/codec.h
index fa256cd6dc4aa..c66c1136c8a9e 100644
--- a/source/extensions/filters/network/common/redis/codec.h
+++ b/source/extensions/filters/network/common/redis/codec.h
@@ -7,8 +7,8 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/codec_impl.cc b/source/extensions/filters/network/common/redis/codec_impl.cc
index a668a7868e263..83a7ecabcef38 100644
--- a/source/extensions/filters/network/common/redis/codec_impl.cc
+++ b/source/extensions/filters/network/common/redis/codec_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/common/redis/codec_impl.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
 
 #include <cstdint>
 #include <memory>
@@ -7,9 +7,9 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
 
 #include "absl/container/fixed_array.h"
 
diff --git a/source/extensions/filters/network/common/redis/codec_impl.h b/source/extensions/filters/network/common/redis/codec_impl.h
index 125f703acf147..a55cfd695992c 100644
--- a/source/extensions/filters/network/common/redis/codec_impl.h
+++ b/source/extensions/filters/network/common/redis/codec_impl.h
@@ -5,9 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/common/redis/codec.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/fault_impl.cc b/source/extensions/filters/network/common/redis/fault_impl.cc
index 02b4c5aba52ed..b5d00bb99ee76 100644
--- a/source/extensions/filters/network/common/redis/fault_impl.cc
+++ b/source/extensions/filters/network/common/redis/fault_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/common/redis/fault_impl.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/fault_impl.h b/source/extensions/filters/network/common/redis/fault_impl.h
index 2774c2798eb27..5ec3978bf7a23 100644
--- a/source/extensions/filters/network/common/redis/fault_impl.h
+++ b/source/extensions/filters/network/common/redis/fault_impl.h
@@ -8,10 +8,9 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/protobuf/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/common/redis/fault.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/common/redis/fault.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/redis_command_stats.cc b/source/extensions/filters/network/common/redis/redis_command_stats.cc
index 5a6509cf3ae6c..9e67ab1e2ce53 100644
--- a/source/extensions/filters/network/common/redis/redis_command_stats.cc
+++ b/source/extensions/filters/network/common/redis/redis_command_stats.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/network/common/redis/redis_command_stats.h"
+#include "source/extensions/filters/network/common/redis/redis_command_stats.h"
 
-#include "common/stats/timespan_impl.h"
-#include "common/stats/utility.h"
-
-#include "extensions/filters/network/common/redis/supported_commands.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/redis_command_stats.h b/source/extensions/filters/network/common/redis/redis_command_stats.h
index 5dddb9f8303c9..fd80c5ac850c5 100644
--- a/source/extensions/filters/network/common/redis/redis_command_stats.h
+++ b/source/extensions/filters/network/common/redis/redis_command_stats.h
@@ -6,9 +6,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/network/common/redis/codec.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/supported_commands.h b/source/extensions/filters/network/common/redis/supported_commands.h
index 9e8a0f1aeafdb..5e0b5f26bb827 100644
--- a/source/extensions/filters/network/common/redis/supported_commands.h
+++ b/source/extensions/filters/network/common/redis/supported_commands.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/extensions/filters/network/common/redis/utility.cc b/source/extensions/filters/network/common/redis/utility.cc
index 773196dd70e21..3eb644f3285ab 100644
--- a/source/extensions/filters/network/common/redis/utility.cc
+++ b/source/extensions/filters/network/common/redis/utility.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/common/redis/utility.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/redis/utility.h b/source/extensions/filters/network/common/redis/utility.h
index ca5774d2d3a6c..7f98bfbb444f5 100644
--- a/source/extensions/filters/network/common/redis/utility.h
+++ b/source/extensions/filters/network/common/redis/utility.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/common/utility.h b/source/extensions/filters/network/common/utility.h
index 54a458aa7b62e..1f43a2375c2ca 100644
--- a/source/extensions/filters/network/common/utility.h
+++ b/source/extensions/filters/network/common/utility.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "common/common/macros.h"
-
-#include "extensions/common/utility.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/common/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/direct_response/BUILD b/source/extensions/filters/network/direct_response/BUILD
index 5a4b40483b4fc..a80985231941c 100644
--- a/source/extensions/filters/network/direct_response/BUILD
+++ b/source/extensions/filters/network/direct_response/BUILD
@@ -17,8 +17,8 @@ envoy_cc_library(
     srcs = ["filter.cc"],
     hdrs = ["filter.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -30,8 +30,8 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     deps = [
         ":filter",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/config:datasource_lib",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
diff --git a/source/extensions/filters/network/direct_response/config.cc b/source/extensions/filters/network/direct_response/config.cc
index ff680dc835714..d06d7521d1a2d 100644
--- a/source/extensions/filters/network/direct_response/config.cc
+++ b/source/extensions/filters/network/direct_response/config.cc
@@ -3,11 +3,10 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/config/datasource.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/direct_response/filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/direct_response/filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/direct_response/filter.cc b/source/extensions/filters/network/direct_response/filter.cc
index 25cc20206d152..78063c0624e68 100644
--- a/source/extensions/filters/network/direct_response/filter.cc
+++ b/source/extensions/filters/network/direct_response/filter.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/direct_response/filter.h"
+#include "source/extensions/filters/network/direct_response/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/direct_response/filter.h b/source/extensions/filters/network/direct_response/filter.h
index e87dd07ae0186..ef6449ae0c0b1 100644
--- a/source/extensions/filters/network/direct_response/filter.h
+++ b/source/extensions/filters/network/direct_response/filter.h
@@ -3,7 +3,7 @@
 #include "envoy/network/connection.h"
 #include "envoy/network/filter.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/BUILD b/source/extensions/filters/network/dubbo_proxy/BUILD
index 49ac684e27208..78e9fccc36903 100644
--- a/source/extensions/filters/network/dubbo_proxy/BUILD
+++ b/source/extensions/filters/network/dubbo_proxy/BUILD
@@ -18,7 +18,7 @@ envoy_cc_library(
         "hessian2_codec_object_codec_lib",
     ],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/singleton:const_singleton",
     ],
 )
@@ -30,7 +30,7 @@ envoy_cc_library(
         ":message_lib",
         ":metadata_lib",
         ":serializer_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/singleton:const_singleton",
@@ -43,7 +43,7 @@ envoy_cc_library(
     hdrs = ["dubbo_protocol_impl.h"],
     deps = [
         ":protocol_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/singleton:const_singleton",
     ],
 )
@@ -58,8 +58,8 @@ envoy_cc_library(
         ":hessian_utils_lib",
         ":message_lib",
         ":metadata_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/config:typed_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/singleton:const_singleton",
@@ -98,9 +98,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":conn_manager_lib",
-        "//include/envoy/registry",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/registry",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:utility_lib",
         "//source/common/config:utility_lib",
         "//source/extensions/filters/network:well_known_names",
@@ -146,8 +146,8 @@ envoy_cc_library(
     hdrs = ["decoder_event_handler.h"],
     deps = [
         ":metadata_lib",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
@@ -156,8 +156,8 @@ envoy_cc_library(
     name = "stats_lib",
     hdrs = ["stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
     ],
 )
 
@@ -170,7 +170,7 @@ envoy_cc_library(
         ":metadata_lib",
         ":protocol_interface",
         ":serializer_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface",
     ],
@@ -184,7 +184,7 @@ envoy_cc_library(
         ":metadata_lib",
         ":protocol_interface",
         ":serializer_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface",
     ],
 )
@@ -207,12 +207,12 @@ envoy_cc_library(
         ":dubbo_protocol_impl_lib",
         ":heartbeat_response_lib",
         ":stats_lib",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:assert_lib",
diff --git a/source/extensions/filters/network/dubbo_proxy/active_message.cc b/source/extensions/filters/network/dubbo_proxy/active_message.cc
index e0818cf76b18c..8366759269eaa 100644
--- a/source/extensions/filters/network/dubbo_proxy/active_message.cc
+++ b/source/extensions/filters/network/dubbo_proxy/active_message.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/network/dubbo_proxy/active_message.h"
+#include "source/extensions/filters/network/dubbo_proxy/active_message.h"
 
-#include "common/stats/timespan_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/conn_manager.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/active_message.h b/source/extensions/filters/network/dubbo_proxy/active_message.h
index 2870e8d501d79..9a043d8656d2b 100644
--- a/source/extensions/filters/network/dubbo_proxy/active_message.h
+++ b/source/extensions/filters/network/dubbo_proxy/active_message.h
@@ -5,17 +5,16 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/decoder.h"
-#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
-#include "extensions/filters/network/dubbo_proxy/stats.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/extensions/filters/network/dubbo_proxy/stats.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/app_exception.cc b/source/extensions/filters/network/dubbo_proxy/app_exception.cc
index dc5a8a0830128..88047298999f6 100644
--- a/source/extensions/filters/network/dubbo_proxy/app_exception.cc
+++ b/source/extensions/filters/network/dubbo_proxy/app_exception.cc
@@ -1,8 +1,7 @@
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/app_exception.h b/source/extensions/filters/network/dubbo_proxy/app_exception.h
index 50419b57c6805..2073392ead6d9 100644
--- a/source/extensions/filters/network/dubbo_proxy/app_exception.h
+++ b/source/extensions/filters/network/dubbo_proxy/app_exception.h
@@ -2,12 +2,11 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/config.cc b/source/extensions/filters/network/dubbo_proxy/config.cc
index 0a6f494921522..16e592128143c 100644
--- a/source/extensions/filters/network/dubbo_proxy/config.cc
+++ b/source/extensions/filters/network/dubbo_proxy/config.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/network/dubbo_proxy/config.h"
+#include "source/extensions/filters/network/dubbo_proxy/config.h"
 
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/filters/network/dubbo_proxy/conn_manager.h"
-#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h"
-#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
-#include "extensions/filters/network/dubbo_proxy/stats.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/dubbo_proxy/stats.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/config.h b/source/extensions/filters/network/dubbo_proxy/config.h
index df04009a2b02e..a3bfb453f8ffa 100644
--- a/source/extensions/filters/network/dubbo_proxy/config.h
+++ b/source/extensions/filters/network/dubbo_proxy/config.h
@@ -5,12 +5,12 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/dubbo_proxy/conn_manager.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h"
-#include "extensions/filters/network/dubbo_proxy/router/router_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/conn_manager.cc b/source/extensions/filters/network/dubbo_proxy/conn_manager.cc
index a21f6350bcaef..3e259a18a6cb7 100644
--- a/source/extensions/filters/network/dubbo_proxy/conn_manager.cc
+++ b/source/extensions/filters/network/dubbo_proxy/conn_manager.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/network/dubbo_proxy/conn_manager.h"
+#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h"
 
 #include <cstdint>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
-#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/conn_manager.h b/source/extensions/filters/network/dubbo_proxy/conn_manager.h
index f09ebfa1ac54e..827f74571f8fb 100644
--- a/source/extensions/filters/network/dubbo_proxy/conn_manager.h
+++ b/source/extensions/filters/network/dubbo_proxy/conn_manager.h
@@ -9,15 +9,14 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/dubbo_proxy/active_message.h"
-#include "extensions/filters/network/dubbo_proxy/decoder.h"
-#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
-#include "extensions/filters/network/dubbo_proxy/stats.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/dubbo_proxy/active_message.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/extensions/filters/network/dubbo_proxy/stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/decoder.cc b/source/extensions/filters/network/dubbo_proxy/decoder.cc
index 3bd1e79097e23..8ffab1751d33e 100644
--- a/source/extensions/filters/network/dubbo_proxy/decoder.cc
+++ b/source/extensions/filters/network/dubbo_proxy/decoder.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/dubbo_proxy/decoder.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/decoder.h b/source/extensions/filters/network/dubbo_proxy/decoder.h
index d180ba13e4e0c..32d72f155c8f1 100644
--- a/source/extensions/filters/network/dubbo_proxy/decoder.h
+++ b/source/extensions/filters/network/dubbo_proxy/decoder.h
@@ -2,12 +2,11 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h b/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h
index 0da2344ac1239..8d5b0497d7d4c 100644
--- a/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h
+++ b/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h
@@ -3,10 +3,9 @@
 #include "envoy/common/pure.h"
 #include "envoy/network/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc
index 32572652625fb..f9234ea5f3229 100644
--- a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc
+++ b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 #include "hessian2/object.hpp"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h
index 0bdb7697d15cb..c39fb51a01775 100644
--- a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h
+++ b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc
index daaacfe2be4f9..01d86199fc64c 100644
--- a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc
+++ b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
 
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h
index 47d4bb0062f25..4422a49bc0fc4 100644
--- a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h
+++ b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/filters/BUILD b/source/extensions/filters/network/dubbo_proxy/filters/BUILD
index d2c9fd1ff03c1..83e22a8518239 100644
--- a/source/extensions/filters/network/dubbo_proxy/filters/BUILD
+++ b/source/extensions/filters/network/dubbo_proxy/filters/BUILD
@@ -12,9 +12,9 @@ envoy_cc_library(
     name = "filter_interface",
     hdrs = ["filter.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/extensions/filters/network/dubbo_proxy:decoder_events_lib",
         "//source/extensions/filters/network/dubbo_proxy:metadata_lib",
         "//source/extensions/filters/network/dubbo_proxy:protocol_interface",
@@ -28,8 +28,8 @@ envoy_cc_library(
     hdrs = ["filter_config.h"],
     deps = [
         ":filter_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:macros",
         "//source/common/protobuf:cc_wkt_protos",
     ],
diff --git a/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h b/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h
index 4591ca9aac823..b00d669dec079 100644
--- a/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h
+++ b/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h
@@ -5,9 +5,8 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/dubbo_proxy/filters/filter_config.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/filters/filter.h b/source/extensions/filters/network/dubbo_proxy/filters/filter.h
index 7ff4cbf5a0301..14324e48df230 100644
--- a/source/extensions/filters/network/dubbo_proxy/filters/filter.h
+++ b/source/extensions/filters/network/dubbo_proxy/filters/filter.h
@@ -8,12 +8,12 @@
 #include "envoy/network/connection.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
-#include "extensions/filters/network/dubbo_proxy/message.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h b/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h
index 2138d44bb062b..9d1fa415baa43 100644
--- a/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h
+++ b/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h
@@ -6,10 +6,9 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/macros.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h b/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h
index 45528e57e3736..bc88a5e0af3d7 100644
--- a/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h
+++ b/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc
index 69df071a35271..138c5646f8845 100644
--- a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc
+++ b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h"
+#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h
index 7c76f6c0d6746..9164262c6679e 100644
--- a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h
+++ b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc
index c75a7427c0c74..9ba4a958066ba 100644
--- a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc
+++ b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/message.h b/source/extensions/filters/network/dubbo_proxy/message.h
index 3aa194a8c922a..5f36d05b808b2 100644
--- a/source/extensions/filters/network/dubbo_proxy/message.h
+++ b/source/extensions/filters/network/dubbo_proxy/message.h
@@ -5,7 +5,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/extensions/filters/network/dubbo_proxy/message_impl.cc b/source/extensions/filters/network/dubbo_proxy/message_impl.cc
index 5e76711ee832b..73f5e68e14c70 100644
--- a/source/extensions/filters/network/dubbo_proxy/message_impl.cc
+++ b/source/extensions/filters/network/dubbo_proxy/message_impl.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/message_impl.h b/source/extensions/filters/network/dubbo_proxy/message_impl.h
index 952cbb3dc5c80..2b9092d41c579 100644
--- a/source/extensions/filters/network/dubbo_proxy/message_impl.h
+++ b/source/extensions/filters/network/dubbo_proxy/message_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/http/header_map.h"
 
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
-#include "extensions/filters/network/dubbo_proxy/message.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/metadata.h b/source/extensions/filters/network/dubbo_proxy/metadata.h
index 698b50283ec6b..647c412d2cefb 100644
--- a/source/extensions/filters/network/dubbo_proxy/metadata.h
+++ b/source/extensions/filters/network/dubbo_proxy/metadata.h
@@ -3,11 +3,10 @@
 #include <memory>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/protocol.h b/source/extensions/filters/network/dubbo_proxy/protocol.h
index 09f16d4420da5..aa3d1192bd6ca 100644
--- a/source/extensions/filters/network/dubbo_proxy/protocol.h
+++ b/source/extensions/filters/network/dubbo_proxy/protocol.h
@@ -5,14 +5,13 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/config/typed_config.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/serializer.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/serializer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/protocol_constants.h b/source/extensions/filters/network/dubbo_proxy/protocol_constants.h
index e7b787831e37c..6bad4ff29c0d4 100644
--- a/source/extensions/filters/network/dubbo_proxy/protocol_constants.h
+++ b/source/extensions/filters/network/dubbo_proxy/protocol_constants.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/router/BUILD b/source/extensions/filters/network/dubbo_proxy/router/BUILD
index 4227ca25fcf5a..2b79d6b1adf3a 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/BUILD
+++ b/source/extensions/filters/network/dubbo_proxy/router/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "router_interface",
     hdrs = ["router.h"],
     deps = [
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
         "//source/extensions/filters/network/dubbo_proxy:metadata_lib",
     ],
 )
@@ -22,8 +22,8 @@ envoy_cc_library(
     hdrs = ["route.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/config:utility_lib",
         "//source/common/singleton:const_singleton",
         "//source/extensions/filters/network/dubbo_proxy:metadata_lib",
@@ -38,7 +38,7 @@ envoy_cc_library(
     deps = [
         ":route_matcher_interface",
         ":router_interface",
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
         "//source/common/common:logger_lib",
         "//source/common/common:matchers_lib",
         "//source/common/http:header_utility_lib",
@@ -57,7 +57,7 @@ envoy_cc_library(
     hdrs = ["config.h"],
     deps = [
         ":router_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/network/dubbo_proxy/filters:factory_base_lib",
         "//source/extensions/filters/network/dubbo_proxy/filters:filter_config_interface",
         "//source/extensions/filters/network/dubbo_proxy/filters:well_known_names",
@@ -71,10 +71,10 @@ envoy_cc_library(
     hdrs = ["router_impl.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:thread_local_cluster_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:thread_local_cluster_interface",
         "//source/common/common:logger_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/router:metadatamatchcriteria_lib",
diff --git a/source/extensions/filters/network/dubbo_proxy/router/config.cc b/source/extensions/filters/network/dubbo_proxy/router/config.cc
index b82e9bd02768b..c89cbc3788e87 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/config.cc
+++ b/source/extensions/filters/network/dubbo_proxy/router/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/dubbo_proxy/router/config.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/config.h"
 
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/network/dubbo_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/config.h b/source/extensions/filters/network/dubbo_proxy/router/config.h
index 2406514fdca35..99391f8ca4d04 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/config.h
+++ b/source/extensions/filters/network/dubbo_proxy/router/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h"
 
-#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h"
-#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/route.h b/source/extensions/filters/network/dubbo_proxy/router/route.h
index 247cdf480f161..f4346afda93ba 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/route.h
+++ b/source/extensions/filters/network/dubbo_proxy/router/route.h
@@ -8,11 +8,10 @@
 #include "envoy/router/router.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/config/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc
index 7a5f5d26f944d..904d7d1eb77b8 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc
+++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h"
 
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h
index 79ab71db3b135..1a36230b8c5b3 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h
+++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h
@@ -8,15 +8,14 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h"
 #include "envoy/type/v3/range.pb.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/http/header_utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/router/route.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/route.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/dubbo_proxy/router/router.h b/source/extensions/filters/network/dubbo_proxy/router/router.h
index 37887be6058de..e9f2ce15374d3 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/router.h
+++ b/source/extensions/filters/network/dubbo_proxy/router/router.h
@@ -5,7 +5,7 @@
 
 #include "envoy/router/router.h"
 
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc
index 6b9bc51861019..05eaa49570fdc 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc
+++ b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/dubbo_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h"
 
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/router/router_impl.h b/source/extensions/filters/network/dubbo_proxy/router/router_impl.h
index f7683788b2626..65f4500843798 100644
--- a/source/extensions/filters/network/dubbo_proxy/router/router_impl.h
+++ b/source/extensions/filters/network/dubbo_proxy/router/router_impl.h
@@ -6,11 +6,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/tcp/conn_pool.h"
 
-#include "common/common/logger.h"
-#include "common/upstream/load_balancer_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/dubbo_proxy/serializer.h b/source/extensions/filters/network/dubbo_proxy/serializer.h
index 8b12ccd43dc4b..753c49b0fb2d5 100644
--- a/source/extensions/filters/network/dubbo_proxy/serializer.h
+++ b/source/extensions/filters/network/dubbo_proxy/serializer.h
@@ -5,13 +5,12 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/config/typed_config.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/dubbo_proxy/message.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
-#include "extensions/filters/network/dubbo_proxy/protocol_constants.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/dubbo_proxy/message.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/echo/BUILD b/source/extensions/filters/network/echo/BUILD
index 2352cb8089531..e0a91ea30b2c9 100644
--- a/source/extensions/filters/network/echo/BUILD
+++ b/source/extensions/filters/network/echo/BUILD
@@ -17,9 +17,9 @@ envoy_cc_library(
     srcs = ["echo.cc"],
     hdrs = ["echo.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
     ],
@@ -34,8 +34,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":echo",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/network/echo/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/network/echo/config.cc b/source/extensions/filters/network/echo/config.cc
index 119b1252d8931..f15984e24199b 100644
--- a/source/extensions/filters/network/echo/config.cc
+++ b/source/extensions/filters/network/echo/config.cc
@@ -3,9 +3,9 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/echo/echo.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/echo/echo.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/echo/echo.cc b/source/extensions/filters/network/echo/echo.cc
index 60baf5f694bd5..674e162450518 100644
--- a/source/extensions/filters/network/echo/echo.cc
+++ b/source/extensions/filters/network/echo/echo.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/echo/echo.h"
+#include "source/extensions/filters/network/echo/echo.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/connection.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/echo/echo.h b/source/extensions/filters/network/echo/echo.h
index 64957aa827830..7d51e2b294aab 100644
--- a/source/extensions/filters/network/echo/echo.h
+++ b/source/extensions/filters/network/echo/echo.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/filter.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ext_authz/BUILD b/source/extensions/filters/network/ext_authz/BUILD
index 7ceb93fa7b805..ec33b570f98b5 100644
--- a/source/extensions/filters/network/ext_authz/BUILD
+++ b/source/extensions/filters/network/ext_authz/BUILD
@@ -17,11 +17,11 @@ envoy_cc_library(
     srcs = ["ext_authz.cc"],
     hdrs = ["ext_authz.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:matchers_lib",
         "//source/common/tracing:http_tracer_lib",
@@ -38,7 +38,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/network:well_known_names",
diff --git a/source/extensions/filters/network/ext_authz/config.cc b/source/extensions/filters/network/ext_authz/config.cc
index 65e852f6a181f..a8447f45342a1 100644
--- a/source/extensions/filters/network/ext_authz/config.cc
+++ b/source/extensions/filters/network/ext_authz/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/ext_authz/config.h"
+#include "source/extensions/filters/network/ext_authz/config.h"
 
 #include <chrono>
 #include <string>
@@ -9,12 +9,11 @@
 #include "envoy/network/connection.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz.h"
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
-#include "extensions/filters/network/ext_authz/ext_authz.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/extensions/filters/network/ext_authz/ext_authz.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ext_authz/config.h b/source/extensions/filters/network/ext_authz/config.h
index 84ff872df5b96..17dc86e184a25 100644
--- a/source/extensions/filters/network/ext_authz/config.h
+++ b/source/extensions/filters/network/ext_authz/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.h"
 #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ext_authz/ext_authz.cc b/source/extensions/filters/network/ext_authz/ext_authz.cc
index f19cd3bb0eb90..7b187472a3548 100644
--- a/source/extensions/filters/network/ext_authz/ext_authz.cc
+++ b/source/extensions/filters/network/ext_authz/ext_authz.cc
@@ -1,14 +1,13 @@
-#include "extensions/filters/network/ext_authz/ext_authz.h"
+#include "source/extensions/filters/network/ext_authz/ext_authz.h"
 
 #include <cstdint>
 #include <string>
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ext_authz/ext_authz.h b/source/extensions/filters/network/ext_authz/ext_authz.h
index 89aa7b36892dc..d055d493f524f 100644
--- a/source/extensions/filters/network/ext_authz/ext_authz.h
+++ b/source/extensions/filters/network/ext_authz/ext_authz.h
@@ -14,10 +14,9 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/matchers.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz.h"
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/common/common/matchers.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/http_connection_manager/BUILD b/source/extensions/filters/network/http_connection_manager/BUILD
index 46867ac644bbc..5751aa3967848 100644
--- a/source/extensions/filters/network/http_connection_manager/BUILD
+++ b/source/extensions/filters/network/http_connection_manager/BUILD
@@ -22,17 +22,17 @@ envoy_cc_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":dependency_manager",
-        "//include/envoy/config:config_provider_manager_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:original_ip_detection_interface",
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/registry",
-        "//include/envoy/router:route_config_provider_manager_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/config:config_provider_manager_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:original_ip_detection_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/registry",
+        "//envoy/router:route_config_provider_manager_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:options_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
diff --git a/source/extensions/filters/network/http_connection_manager/config.cc b/source/extensions/filters/network/http_connection_manager/config.cc
index 9995ac7e7fea2..c30836230797f 100644
--- a/source/extensions/filters/network/http_connection_manager/config.cc
+++ b/source/extensions/filters/network/http_connection_manager/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
 
 #include <chrono>
 #include <memory>
@@ -17,31 +17,31 @@
 #include "envoy/type/tracing/v3/custom_tag.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/filter/http/filter_config_discovery_impl.h"
-#include "common/http/conn_manager_config.h"
-#include "common/http/conn_manager_utility.h"
-#include "common/http/default_server_string.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http1/settings.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/request_id_extension_impl.h"
-#include "common/http/utility.h"
-#include "common/local_reply/local_reply.h"
-#include "common/protobuf/utility.h"
-#include "common/router/rds_impl.h"
-#include "common/router/scoped_rds.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/tracing/http_tracer_manager_impl.h"
-#include "common/tracing/tracer_config_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/conn_manager_utility.h"
+#include "source/common/http/default_server_string.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http1/settings.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/request_id_extension_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/local_reply/local_reply.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/router/scoped_rds.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/tracing/http_tracer_manager_impl.h"
+#include "source/common/tracing/tracer_config_impl.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/codec_impl.h"
+#include "source/common/quic/codec_impl.h"
 #endif
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/http_connection_manager/config.h b/source/extensions/filters/network/http_connection_manager/config.h
index 1e4e93445f61d..b2b8ae2a9e275 100644
--- a/source/extensions/filters/network/http_connection_manager/config.h
+++ b/source/extensions/filters/network/http_connection_manager/config.h
@@ -18,22 +18,21 @@
 #include "envoy/router/route_config_provider_manager.h"
 #include "envoy/tracing/http_tracer_manager.h"
 
-#include "common/common/logger.h"
-#include "common/http/conn_manager_config.h"
-#include "common/http/conn_manager_impl.h"
-#include "common/http/date_provider_impl.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/http3/codec_stats.h"
-#include "common/json/json_loader.h"
-#include "common/local_reply/local_reply.h"
-#include "common/router/rds_impl.h"
-#include "common/router/scoped_rds.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/http_connection_manager/dependency_manager.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/http3/codec_stats.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/local_reply/local_reply.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/router/scoped_rds.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/http_connection_manager/dependency_manager.cc b/source/extensions/filters/network/http_connection_manager/dependency_manager.cc
index d84e117557f7c..526fa46d60628 100644
--- a/source/extensions/filters/network/http_connection_manager/dependency_manager.cc
+++ b/source/extensions/filters/network/http_connection_manager/dependency_manager.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/http_connection_manager/dependency_manager.h"
+#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h"
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/substitute.h"
diff --git a/source/extensions/filters/network/kafka/BUILD b/source/extensions/filters/network/kafka/BUILD
index ccc2401ace47e..a6f2677a6075d 100644
--- a/source/extensions/filters/network/kafka/BUILD
+++ b/source/extensions/filters/network/kafka/BUILD
@@ -37,9 +37,9 @@ envoy_cc_library(
     deps = [
         ":kafka_request_codec_lib",
         ":kafka_response_codec_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
     ],
@@ -226,7 +226,7 @@ envoy_cc_library(
     ],
     deps = [
         ":kafka_types_lib",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:byte_order_lib",
         "//source/common/common:safe_memcpy_lib",
     ],
diff --git a/source/extensions/filters/network/kafka/broker/config.cc b/source/extensions/filters/network/kafka/broker/config.cc
index a90922243f145..5e8620728f66c 100644
--- a/source/extensions/filters/network/kafka/broker/config.cc
+++ b/source/extensions/filters/network/kafka/broker/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/kafka/broker/config.h"
+#include "source/extensions/filters/network/kafka/broker/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/filters/network/kafka/broker/filter.h"
+#include "source/extensions/filters/network/kafka/broker/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/broker/config.h b/source/extensions/filters/network/kafka/broker/config.h
index 38fb1e01861e0..62ed619aedece 100644
--- a/source/extensions/filters/network/kafka/broker/config.h
+++ b/source/extensions/filters/network/kafka/broker/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h"
 #include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/broker/filter.cc b/source/extensions/filters/network/kafka/broker/filter.cc
index e55f4f1b29ba9..88427ea6f35d8 100644
--- a/source/extensions/filters/network/kafka/broker/filter.cc
+++ b/source/extensions/filters/network/kafka/broker/filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/broker/filter.h"
+#include "source/extensions/filters/network/kafka/broker/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/broker/filter.h b/source/extensions/filters/network/kafka/broker/filter.h
index dc2c4eef3990b..57c63de0dcf04 100644
--- a/source/extensions/filters/network/kafka/broker/filter.h
+++ b/source/extensions/filters/network/kafka/broker/filter.h
@@ -3,13 +3,12 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/kafka/external/request_metrics.h"
-#include "extensions/filters/network/kafka/external/response_metrics.h"
-#include "extensions/filters/network/kafka/parser.h"
-#include "extensions/filters/network/kafka/request_codec.h"
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/kafka/external/request_metrics.h"
+#include "source/extensions/filters/network/kafka/external/response_metrics.h"
+#include "source/extensions/filters/network/kafka/parser.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/filters/network/kafka/kafka_request.h b/source/extensions/filters/network/kafka/kafka_request.h
index ff9f57282af36..3c9cc414083e0 100644
--- a/source/extensions/filters/network/kafka/kafka_request.h
+++ b/source/extensions/filters/network/kafka/kafka_request.h
@@ -2,9 +2,9 @@
 
 #include "envoy/common/exception.h"
 
-#include "extensions/filters/network/kafka/external/serialization_composite.h"
-#include "extensions/filters/network/kafka/serialization.h"
-#include "extensions/filters/network/kafka/tagged_fields.h"
+#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
+#include "source/extensions/filters/network/kafka/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.cc b/source/extensions/filters/network/kafka/kafka_request_parser.cc
index 811c051182c3c..c713dad186a39 100644
--- a/source/extensions/filters/network/kafka/kafka_request_parser.cc
+++ b/source/extensions/filters/network/kafka/kafka_request_parser.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/kafka_request_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.h b/source/extensions/filters/network/kafka/kafka_request_parser.h
index 15d304b8d187f..8afdc769de085 100644
--- a/source/extensions/filters/network/kafka/kafka_request_parser.h
+++ b/source/extensions/filters/network/kafka/kafka_request_parser.h
@@ -4,11 +4,10 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/network/kafka/kafka_request.h"
-#include "extensions/filters/network/kafka/parser.h"
-#include "extensions/filters/network/kafka/tagged_fields.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/network/kafka/kafka_request.h"
+#include "source/extensions/filters/network/kafka/parser.h"
+#include "source/extensions/filters/network/kafka/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_response.h b/source/extensions/filters/network/kafka/kafka_response.h
index e53ae70de0dad..805d46defb698 100644
--- a/source/extensions/filters/network/kafka/kafka_response.h
+++ b/source/extensions/filters/network/kafka/kafka_response.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "extensions/filters/network/kafka/external/serialization_composite.h"
-#include "extensions/filters/network/kafka/serialization.h"
-#include "extensions/filters/network/kafka/tagged_fields.h"
+#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
+#include "source/extensions/filters/network/kafka/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.cc b/source/extensions/filters/network/kafka/kafka_response_parser.cc
index 3adbb1b287779..dc0a8a9b1f983 100644
--- a/source/extensions/filters/network/kafka/kafka_response_parser.cc
+++ b/source/extensions/filters/network/kafka/kafka_response_parser.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/kafka_response_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.h b/source/extensions/filters/network/kafka/kafka_response_parser.h
index 428511bac592c..ab3fd2d66b1df 100644
--- a/source/extensions/filters/network/kafka/kafka_response_parser.h
+++ b/source/extensions/filters/network/kafka/kafka_response_parser.h
@@ -3,9 +3,9 @@
 #include <map>
 #include <memory>
 
-#include "extensions/filters/network/kafka/kafka_response.h"
-#include "extensions/filters/network/kafka/parser.h"
-#include "extensions/filters/network/kafka/tagged_fields.h"
+#include "source/extensions/filters/network/kafka/kafka_response.h"
+#include "source/extensions/filters/network/kafka/parser.h"
+#include "source/extensions/filters/network/kafka/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/parser.h b/source/extensions/filters/network/kafka/parser.h
index f131a32426599..a9cb67458be78 100644
--- a/source/extensions/filters/network/kafka/parser.h
+++ b/source/extensions/filters/network/kafka/parser.h
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 b/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2
index d82c23864fd73..0d2da9aaa7c50 100644
--- a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2
+++ b/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2
@@ -3,9 +3,9 @@
   Defines default Kafka request resolver, that uses request parsers in (also generated)
   'requests.h'.
 #}
-#include "extensions/filters/network/kafka/external/requests.h"
-#include "extensions/filters/network/kafka/kafka_request_parser.h"
-#include "extensions/filters/network/kafka/parser.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
+#include "source/extensions/filters/network/kafka/parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 b/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2
index b89df698a5d79..0256e370dca6d 100644
--- a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2
+++ b/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2
@@ -3,8 +3,8 @@
   Defines default Kafka response resolver, that uses response parsers in (also generated)
   'responses.h'.
 #}
-#include "extensions/filters/network/kafka/external/responses.h"
-#include "extensions/filters/network/kafka/kafka_response_parser.h"
+#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/requests_h.j2 b/source/extensions/filters/network/kafka/protocol/requests_h.j2
index ff85d19410d07..e6b4fd42976c4 100644
--- a/source/extensions/filters/network/kafka/protocol/requests_h.j2
+++ b/source/extensions/filters/network/kafka/protocol/requests_h.j2
@@ -22,8 +22,8 @@
     (because partition data is present in every FetchRequestTopic version).
 #}
 #pragma once
-#include "extensions/filters/network/kafka/kafka_request.h"
-#include "extensions/filters/network/kafka/kafka_request_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_request.h"
+#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/responses_h.j2 b/source/extensions/filters/network/kafka/protocol/responses_h.j2
index d7a3d6a63391a..099e6c014c03b 100644
--- a/source/extensions/filters/network/kafka/protocol/responses_h.j2
+++ b/source/extensions/filters/network/kafka/protocol/responses_h.j2
@@ -23,8 +23,8 @@
   - AbortedTransaction & its Deserializers (starting with version 4).
 #}
 #pragma once
-#include "extensions/filters/network/kafka/kafka_response.h"
-#include "extensions/filters/network/kafka/kafka_response_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_response.h"
+#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/request_codec.cc b/source/extensions/filters/network/kafka/request_codec.cc
index 398f0116131ce..f389cecad74b9 100644
--- a/source/extensions/filters/network/kafka/request_codec.cc
+++ b/source/extensions/filters/network/kafka/request_codec.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/kafka/request_codec.h b/source/extensions/filters/network/kafka/request_codec.h
index 1c69637029ae1..07fa4b2b90e0d 100644
--- a/source/extensions/filters/network/kafka/request_codec.h
+++ b/source/extensions/filters/network/kafka/request_codec.h
@@ -3,10 +3,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 
-#include "extensions/filters/network/kafka/codec.h"
-#include "extensions/filters/network/kafka/kafka_request.h"
-#include "extensions/filters/network/kafka/kafka_request_parser.h"
-#include "extensions/filters/network/kafka/parser.h"
+#include "source/extensions/filters/network/kafka/codec.h"
+#include "source/extensions/filters/network/kafka/kafka_request.h"
+#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
+#include "source/extensions/filters/network/kafka/parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/response_codec.cc b/source/extensions/filters/network/kafka/response_codec.cc
index 8c41f407da8eb..ccde039bb9514 100644
--- a/source/extensions/filters/network/kafka/response_codec.cc
+++ b/source/extensions/filters/network/kafka/response_codec.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/response_codec.h b/source/extensions/filters/network/kafka/response_codec.h
index 767426c4b7df5..688defdc75b1b 100644
--- a/source/extensions/filters/network/kafka/response_codec.h
+++ b/source/extensions/filters/network/kafka/response_codec.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/network/kafka/codec.h"
-#include "extensions/filters/network/kafka/kafka_response_parser.h"
+#include "source/extensions/filters/network/kafka/codec.h"
+#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/serialization.cc b/source/extensions/filters/network/kafka/serialization.cc
index 1f1d2643f3a8b..f34f6b0d652a2 100644
--- a/source/extensions/filters/network/kafka/serialization.cc
+++ b/source/extensions/filters/network/kafka/serialization.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/serialization.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/serialization.h b/source/extensions/filters/network/kafka/serialization.h
index 6e2fe85f145b1..cab81a0acf238 100644
--- a/source/extensions/filters/network/kafka/serialization.h
+++ b/source/extensions/filters/network/kafka/serialization.h
@@ -9,12 +9,11 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/pure.h"
 
-#include "common/common/byte_order.h"
-#include "common/common/fmt.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-
-#include "extensions/filters/network/kafka/kafka_types.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/network/kafka/kafka_types.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 b/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2
index 83a7be7a25f35..0f4e7065c41cb 100644
--- a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2
+++ b/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2
@@ -16,11 +16,11 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/pure.h"
 
-#include "common/common/byte_order.h"
-#include "common/common/fmt.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/fmt.h"
 
-#include "extensions/filters/network/kafka/kafka_types.h"
-#include "extensions/filters/network/kafka/serialization.h"
+#include "source/extensions/filters/network/kafka/kafka_types.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/kafka/tagged_fields.h b/source/extensions/filters/network/kafka/tagged_fields.h
index 0678d9053f326..6ace5ce2fccad 100644
--- a/source/extensions/filters/network/kafka/tagged_fields.h
+++ b/source/extensions/filters/network/kafka/tagged_fields.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "extensions/filters/network/kafka/serialization.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
 
 /**
  * This header file provides serialization support for tagged fields structure added in 2.4.
diff --git a/source/extensions/filters/network/local_ratelimit/BUILD b/source/extensions/filters/network/local_ratelimit/BUILD
index c0b757dc8c6e1..9bcc59be68831 100644
--- a/source/extensions/filters/network/local_ratelimit/BUILD
+++ b/source/extensions/filters/network/local_ratelimit/BUILD
@@ -17,11 +17,11 @@ envoy_cc_library(
     srcs = ["local_ratelimit.cc"],
     hdrs = ["local_ratelimit.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/protobuf:utility_lib",
         "//source/common/runtime:runtime_lib",
         "//source/extensions/filters/common/local_ratelimit:local_ratelimit_lib",
diff --git a/source/extensions/filters/network/local_ratelimit/config.cc b/source/extensions/filters/network/local_ratelimit/config.cc
index e8b7e05d3d685..e9d2c907bd102 100644
--- a/source/extensions/filters/network/local_ratelimit/config.cc
+++ b/source/extensions/filters/network/local_ratelimit/config.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/local_ratelimit/config.h"
+#include "source/extensions/filters/network/local_ratelimit/config.h"
 
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h"
 
-#include "extensions/filters/network/local_ratelimit/local_ratelimit.h"
+#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/local_ratelimit/config.h b/source/extensions/filters/network/local_ratelimit/config.h
index ca03d81d9398b..d96fb762e8f59 100644
--- a/source/extensions/filters/network/local_ratelimit/config.h
+++ b/source/extensions/filters/network/local_ratelimit/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc b/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc
index 2876797639276..9f462aa9b289f 100644
--- a/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc
+++ b/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/local_ratelimit/local_ratelimit.h"
+#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h"
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/local_ratelimit/local_ratelimit.h b/source/extensions/filters/network/local_ratelimit/local_ratelimit.h
index f8ac072724594..61166d1991dba 100644
--- a/source/extensions/filters/network/local_ratelimit/local_ratelimit.h
+++ b/source/extensions/filters/network/local_ratelimit/local_ratelimit.h
@@ -6,10 +6,9 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/thread_synchronizer.h"
-#include "common/runtime/runtime_protos.h"
-
-#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/common/runtime/runtime_protos.h"
+#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/BUILD b/source/extensions/filters/network/mongo_proxy/BUILD
index 04a32f0729016..651d4d6ed20f2 100644
--- a/source/extensions/filters/network/mongo_proxy/BUILD
+++ b/source/extensions/filters/network/mongo_proxy/BUILD
@@ -15,7 +15,7 @@ envoy_extension_package()
 envoy_cc_library(
     name = "bson_interface",
     hdrs = ["bson.h"],
-    deps = ["//include/envoy/buffer:buffer_interface"],
+    deps = ["//envoy/buffer:buffer_interface"],
 )
 
 envoy_cc_library(
@@ -30,7 +30,7 @@ envoy_cc_library(
     hdrs = ["bson_impl.h"],
     deps = [
         ":bson_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:byte_order_lib",
         "//source/common/common:hex_lib",
@@ -46,7 +46,7 @@ envoy_cc_library(
     deps = [
         ":bson_lib",
         ":codec_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
     ],
@@ -61,15 +61,15 @@ envoy_cc_library(
         ":codec_lib",
         ":mongo_stats_lib",
         ":utility_lib",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:drain_decision_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/common:time_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:drain_decision_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -87,7 +87,7 @@ envoy_cc_library(
     srcs = ["mongo_stats.cc"],
     hdrs = ["mongo_stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:utility_lib",
     ],
@@ -109,7 +109,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":proxy_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
         "@envoy_api//envoy/extensions/filters/network/mongo_proxy/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/network/mongo_proxy/bson_impl.cc b/source/extensions/filters/network/mongo_proxy/bson_impl.cc
index de0b9170b22b9..3f6d10d827c7c 100644
--- a/source/extensions/filters/network/mongo_proxy/bson_impl.cc
+++ b/source/extensions/filters/network/mongo_proxy/bson_impl.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
 
 #include <cstdint>
 #include <sstream>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/byte_order.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/bson_impl.h b/source/extensions/filters/network/mongo_proxy/bson_impl.h
index 57e44c951d443..38bc2b91bc297 100644
--- a/source/extensions/filters/network/mongo_proxy/bson_impl.h
+++ b/source/extensions/filters/network/mongo_proxy/bson_impl.h
@@ -7,10 +7,9 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-
-#include "extensions/filters/network/mongo_proxy/bson.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/network/mongo_proxy/bson.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/codec.h b/source/extensions/filters/network/mongo_proxy/codec.h
index b6221ba30bd07..8588b86b36e2c 100644
--- a/source/extensions/filters/network/mongo_proxy/codec.h
+++ b/source/extensions/filters/network/mongo_proxy/codec.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "extensions/filters/network/mongo_proxy/bson.h"
+#include "source/extensions/filters/network/mongo_proxy/bson.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/codec_impl.cc b/source/extensions/filters/network/mongo_proxy/codec_impl.cc
index d56fe7ff4e319..8a4ad294284f6 100644
--- a/source/extensions/filters/network/mongo_proxy/codec_impl.cc
+++ b/source/extensions/filters/network/mongo_proxy/codec_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mongo_proxy/codec_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/codec_impl.h"
 
 #include <cstdint>
 #include <list>
@@ -9,10 +9,9 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/codec_impl.h b/source/extensions/filters/network/mongo_proxy/codec_impl.h
index 4a404d14089ea..6041dbcdf4c65 100644
--- a/source/extensions/filters/network/mongo_proxy/codec_impl.h
+++ b/source/extensions/filters/network/mongo_proxy/codec_impl.h
@@ -5,9 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mongo_proxy/codec.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mongo_proxy/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/config.cc b/source/extensions/filters/network/mongo_proxy/config.cc
index ecdc60644888e..79597c01087ed 100644
--- a/source/extensions/filters/network/mongo_proxy/config.cc
+++ b/source/extensions/filters/network/mongo_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mongo_proxy/config.h"
+#include "source/extensions/filters/network/mongo_proxy/config.h"
 
 #include <memory>
 
@@ -7,9 +7,8 @@
 #include "envoy/network/connection.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/mongo_proxy/proxy.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/mongo_proxy/proxy.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/config.h b/source/extensions/filters/network/mongo_proxy/config.h
index f5819c39b453b..59448bfe01e78 100644
--- a/source/extensions/filters/network/mongo_proxy/config.h
+++ b/source/extensions/filters/network/mongo_proxy/config.h
@@ -5,8 +5,8 @@
 #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.h"
 #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc
index aca9ffaf35fd1..fd362d35af42b 100644
--- a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc
+++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mongo_proxy/mongo_stats.h"
+#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h"
 
 #include <memory>
 #include <string>
@@ -6,7 +6,7 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.h b/source/extensions/filters/network/mongo_proxy/mongo_stats.h
index 3df51affd0a4f..5dee147145997 100644
--- a/source/extensions/filters/network/mongo_proxy/mongo_stats.h
+++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.h
@@ -6,8 +6,8 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/proxy.cc b/source/extensions/filters/network/mongo_proxy/proxy.cc
index 8a8042ede4250..86db1078f6599 100644
--- a/source/extensions/filters/network/mongo_proxy/proxy.cc
+++ b/source/extensions/filters/network/mongo_proxy/proxy.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mongo_proxy/proxy.h"
+#include "source/extensions/filters/network/mongo_proxy/proxy.h"
 
 #include <chrono>
 #include <cstdint>
@@ -10,12 +10,11 @@
 #include "envoy/runtime/runtime.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-
-#include "extensions/filters/network/mongo_proxy/codec_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/network/mongo_proxy/codec_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "absl/strings/str_split.h"
 
diff --git a/source/extensions/filters/network/mongo_proxy/proxy.h b/source/extensions/filters/network/mongo_proxy/proxy.h
index 773d4714aa7fa..f049c6d4d6dd8 100644
--- a/source/extensions/filters/network/mongo_proxy/proxy.h
+++ b/source/extensions/filters/network/mongo_proxy/proxy.h
@@ -16,16 +16,15 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/network/filter_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/common/fault/fault_config.h"
-#include "extensions/filters/network/mongo_proxy/codec.h"
-#include "extensions/filters/network/mongo_proxy/mongo_stats.h"
-#include "extensions/filters/network/mongo_proxy/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/common/fault/fault_config.h"
+#include "source/extensions/filters/network/mongo_proxy/codec.h"
+#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h"
+#include "source/extensions/filters/network/mongo_proxy/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/utility.cc b/source/extensions/filters/network/mongo_proxy/utility.cc
index bb45377442887..421eceaa9b641 100644
--- a/source/extensions/filters/network/mongo_proxy/utility.cc
+++ b/source/extensions/filters/network/mongo_proxy/utility.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/mongo_proxy/utility.h"
+#include "source/extensions/filters/network/mongo_proxy/utility.h"
 
 #include <string>
 
 #include "envoy/common/exception.h"
 
-#include "common/json/json_loader.h"
+#include "source/common/json/json_loader.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mongo_proxy/utility.h b/source/extensions/filters/network/mongo_proxy/utility.h
index 3b8a6773601cf..4394640c9e361 100644
--- a/source/extensions/filters/network/mongo_proxy/utility.h
+++ b/source/extensions/filters/network/mongo_proxy/utility.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "extensions/filters/network/mongo_proxy/codec.h"
+#include "source/extensions/filters/network/mongo_proxy/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/BUILD b/source/extensions/filters/network/mysql_proxy/BUILD
index 43d66bdf11c5b..8c2f9316138ac 100644
--- a/source/extensions/filters/network/mysql_proxy/BUILD
+++ b/source/extensions/filters/network/mysql_proxy/BUILD
@@ -23,10 +23,10 @@ envoy_cc_library(
     deps = [
         ":codec_lib",
         ":decoder_lib",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:filter_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/network:filter_lib",
         "//source/extensions/filters/network:well_known_names",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec.h b/source/extensions/filters/network/mysql_proxy/mysql_codec.h
index 5cc863eb8f765..d040ab3fb6dbd 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec.h
@@ -2,8 +2,8 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc
index f8bbab1160c1d..be4739d909f93 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
 
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h
index c6714e1fd8124..fbf3f7b22a723 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h
@@ -1,9 +1,8 @@
 #pragma once
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc
index 3e204058e5dfb..8847de47baf0f 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h
index 37f882003e421..a843e0c85b623 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h
@@ -4,10 +4,9 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc
index 8642a12126aa3..4e515381760ae 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/logger.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h
index 3d76c31d9ccb2..4764770e07040 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h
@@ -1,9 +1,8 @@
 #pragma once
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc
index 90ecd487b48cd..88b2ba5f1ec1b 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h
index 8f33d5eb5ecfa..a507a5ec89398 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h
@@ -1,7 +1,6 @@
 #pragma once
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc
index 0aec54525de71..120669c5f2883 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc
@@ -1,11 +1,10 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h
index ccf2f91debf48..f6128191e3721 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.cc b/source/extensions/filters/network/mysql_proxy/mysql_config.cc
index f2c536e9fd64d..39a68f5f8d267 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_config.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mysql_proxy/mysql_config.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_config.h"
 
 #include <string>
 
@@ -7,9 +7,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.h b/source/extensions/filters/network/mysql_proxy/mysql_config.h
index d0a90364832f2..66e459f901449 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_config.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h"
 #include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/mysql_proxy/mysql_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h b/source/extensions/filters/network/mysql_proxy/mysql_decoder.h
index 6b813e2248f19..6b4f83a2c8cc6 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "extensions/common/sqlutils/sqlutils.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_session.h"
+#include "source/extensions/common/sqlutils/sqlutils.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_session.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc
index aac9e3a6366a1..f958f22aefd27 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc
@@ -1,10 +1,9 @@
-#include "extensions/filters/network/mysql_proxy/mysql_decoder_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h
index 3159e298a66e1..ae787ba777c04 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "extensions/filters/network/mysql_proxy/mysql_decoder.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc
index 602d1e0e8c2cb..a1f6a1da95f50 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/network/mysql_proxy/mysql_filter.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_decoder_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.h b/source/extensions/filters/network/mysql_proxy/mysql_filter.h
index daabb165dde62..6b83b13770f0b 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_filter.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_filter.h
@@ -7,16 +7,15 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_decoder.h"
-#include "extensions/filters/network/mysql_proxy/mysql_session.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_session.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_session.h b/source/extensions/filters/network/mysql_proxy/mysql_session.h
index 41655b7adc6a3..691d582633b11 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_session.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_session.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc b/source/extensions/filters/network/mysql_proxy/mysql_utils.cc
index d72fe8e06d852..d2574cc94fbf7 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc
+++ b/source/extensions/filters/network/mysql_proxy/mysql_utils.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.h b/source/extensions/filters/network/mysql_proxy/mysql_utils.h
index 2a60feb49763b..d8548eed24f01 100644
--- a/source/extensions/filters/network/mysql_proxy/mysql_utils.h
+++ b/source/extensions/filters/network/mysql_proxy/mysql_utils.h
@@ -3,11 +3,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/byte_order.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/BUILD b/source/extensions/filters/network/postgres_proxy/BUILD
index 1367aa5c048a0..89c26a2cf94fa 100644
--- a/source/extensions/filters/network/postgres_proxy/BUILD
+++ b/source/extensions/filters/network/postgres_proxy/BUILD
@@ -29,10 +29,10 @@ envoy_cc_library(
     ],
     repository = "@envoy",
     deps = [
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:filter_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/network:filter_lib",
         "//source/extensions/common/sqlutils:sqlutils_lib",
diff --git a/source/extensions/filters/network/postgres_proxy/config.cc b/source/extensions/filters/network/postgres_proxy/config.cc
index 4e0eeb8c05b15..a1e148da6396b 100644
--- a/source/extensions/filters/network/postgres_proxy/config.cc
+++ b/source/extensions/filters/network/postgres_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/postgres_proxy/config.h"
+#include "source/extensions/filters/network/postgres_proxy/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/config.h b/source/extensions/filters/network/postgres_proxy/config.h
index eada27fed6184..7edb63852575e 100644
--- a/source/extensions/filters/network/postgres_proxy/config.h
+++ b/source/extensions/filters/network/postgres_proxy/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.h"
 #include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/postgres_proxy/postgres_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc b/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc
index f5d144dc48835..7af15c8d305b1 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc
+++ b/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/postgres_proxy/postgres_decoder.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h"
 
 #include <vector>
 
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h b/source/extensions/filters/network/postgres_proxy/postgres_decoder.h
index b8326aaf8bc60..bed146c097a90 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h
+++ b/source/extensions/filters/network/postgres_proxy/postgres_decoder.h
@@ -3,12 +3,11 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/common/sqlutils/sqlutils.h"
-#include "extensions/filters/network/postgres_proxy/postgres_message.h"
-#include "extensions/filters/network/postgres_proxy/postgres_session.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/sqlutils/sqlutils.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_message.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_session.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc b/source/extensions/filters/network/postgres_proxy/postgres_filter.cc
index accc59117c484..71e3388718b17 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc
+++ b/source/extensions/filters/network/postgres_proxy/postgres_filter.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/postgres_proxy/postgres_filter.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/connection.h"
 
-#include "extensions/filters/network/postgres_proxy/postgres_decoder.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.h b/source/extensions/filters/network/postgres_proxy/postgres_filter.h
index f6740b3536ab4..cb89499d47c4f 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_filter.h
+++ b/source/extensions/filters/network/postgres_proxy/postgres_filter.h
@@ -5,10 +5,9 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/postgres_proxy/postgres_decoder.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.cc b/source/extensions/filters/network/postgres_proxy/postgres_message.cc
index 5f7c1f27d8143..340092d489105 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_message.cc
+++ b/source/extensions/filters/network/postgres_proxy/postgres_message.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/postgres_proxy/postgres_message.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_message.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.h b/source/extensions/filters/network/postgres_proxy/postgres_message.h
index 697a2e84ef473..948167892b148 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_message.h
+++ b/source/extensions/filters/network/postgres_proxy/postgres_message.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/source/extensions/filters/network/postgres_proxy/postgres_session.h b/source/extensions/filters/network/postgres_proxy/postgres_session.h
index 46d8632530bc3..b8282d008e168 100644
--- a/source/extensions/filters/network/postgres_proxy/postgres_session.h
+++ b/source/extensions/filters/network/postgres_proxy/postgres_session.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ratelimit/BUILD b/source/extensions/filters/network/ratelimit/BUILD
index 35694dc418b8f..50f8ef0368984 100644
--- a/source/extensions/filters/network/ratelimit/BUILD
+++ b/source/extensions/filters/network/ratelimit/BUILD
@@ -23,11 +23,11 @@ envoy_cc_library(
         "//test/extensions:__subpackages__",
     ],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/tracing:http_tracer_lib",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
         "//source/extensions/filters/network:well_known_names",
@@ -40,7 +40,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
diff --git a/source/extensions/filters/network/ratelimit/config.cc b/source/extensions/filters/network/ratelimit/config.cc
index 1274275f77477..fdf84987e9ff2 100644
--- a/source/extensions/filters/network/ratelimit/config.cc
+++ b/source/extensions/filters/network/ratelimit/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/ratelimit/config.h"
+#include "source/extensions/filters/network/ratelimit/config.h"
 
 #include <chrono>
 #include <string>
@@ -7,11 +7,10 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
-#include "extensions/filters/network/ratelimit/ratelimit.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/extensions/filters/network/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ratelimit/config.h b/source/extensions/filters/network/ratelimit/config.h
index 616696c61b041..8156613a49053 100644
--- a/source/extensions/filters/network/ratelimit/config.h
+++ b/source/extensions/filters/network/ratelimit/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ratelimit/ratelimit.cc b/source/extensions/filters/network/ratelimit/ratelimit.cc
index 1ac7accd7d112..1714f5a4f8ad7 100644
--- a/source/extensions/filters/network/ratelimit/ratelimit.cc
+++ b/source/extensions/filters/network/ratelimit/ratelimit.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/ratelimit/ratelimit.h"
 
 #include <cstdint>
 #include <string>
@@ -6,10 +6,9 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/fmt.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/fmt.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/ratelimit/ratelimit.h b/source/extensions/filters/network/ratelimit/ratelimit.h
index 168be8008ff55..fac416280945c 100644
--- a/source/extensions/filters/network/ratelimit/ratelimit.h
+++ b/source/extensions/filters/network/ratelimit/ratelimit.h
@@ -13,7 +13,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rbac/BUILD b/source/extensions/filters/network/rbac/BUILD
index be7137d0f8d58..200ea6327282d 100644
--- a/source/extensions/filters/network/rbac/BUILD
+++ b/source/extensions/filters/network/rbac/BUILD
@@ -15,8 +15,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":rbac_filter",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
         "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto",
@@ -29,9 +29,9 @@ envoy_cc_library(
     srcs = ["rbac_filter.cc"],
     hdrs = ["rbac_filter.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/extensions/filters/common/rbac:engine_lib",
         "//source/extensions/filters/common/rbac:utility_lib",
diff --git a/source/extensions/filters/network/rbac/config.cc b/source/extensions/filters/network/rbac/config.cc
index f50e490ba378c..b5fc803f5202e 100644
--- a/source/extensions/filters/network/rbac/config.cc
+++ b/source/extensions/filters/network/rbac/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/rbac/config.h"
+#include "source/extensions/filters/network/rbac/config.h"
 
 #include "envoy/config/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
@@ -6,8 +6,8 @@
 #include "envoy/network/connection.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/network/rbac/rbac_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/rbac/rbac_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rbac/config.h b/source/extensions/filters/network/rbac/config.h
index 2555df7bc7a22..ec3ab751627f8 100644
--- a/source/extensions/filters/network/rbac/config.h
+++ b/source/extensions/filters/network/rbac/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rbac/rbac_filter.cc b/source/extensions/filters/network/rbac/rbac_filter.cc
index 3892600c77dcd..705ecf0d417f2 100644
--- a/source/extensions/filters/network/rbac/rbac_filter.cc
+++ b/source/extensions/filters/network/rbac/rbac_filter.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/rbac/rbac_filter.h"
+#include "source/extensions/filters/network/rbac/rbac_filter.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
 #include "envoy/network/connection.h"
 
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/extensions/filters/network/rbac/rbac_filter.h b/source/extensions/filters/network/rbac/rbac_filter.h
index 1faee7c498fdf..d5eabcc2b4737 100644
--- a/source/extensions/filters/network/rbac/rbac_filter.h
+++ b/source/extensions/filters/network/rbac/rbac_filter.h
@@ -5,10 +5,9 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/common/rbac/engine_impl.h"
-#include "extensions/filters/common/rbac/utility.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
+#include "source/extensions/filters/common/rbac/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/BUILD b/source/extensions/filters/network/redis_proxy/BUILD
index 3d70b7f7c3504..0902220618ac6 100644
--- a/source/extensions/filters/network/redis_proxy/BUILD
+++ b/source/extensions/filters/network/redis_proxy/BUILD
@@ -17,7 +17,7 @@ envoy_cc_library(
     name = "command_splitter_interface",
     hdrs = ["command_splitter.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/extensions/filters/network/common/redis:codec_interface",
     ],
 )
@@ -38,7 +38,7 @@ envoy_cc_library(
     name = "conn_pool_interface",
     hdrs = ["conn_pool.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/extensions/filters/network/common/redis:client_interface",
         "//source/extensions/filters/network/common/redis:codec_interface",
     ],
@@ -58,8 +58,8 @@ envoy_cc_library(
         ":command_splitter_interface",
         ":conn_pool_lib",
         ":router_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
@@ -78,9 +78,9 @@ envoy_cc_library(
     deps = [
         ":config_interface",
         ":conn_pool_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/network:address_lib",
@@ -104,9 +104,9 @@ envoy_cc_library(
     hdrs = ["proxy_filter.h"],
     deps = [
         ":command_splitter_interface",
-        "//include/envoy/network:drain_decision_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/network:drain_decision_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/config:datasource_lib",
@@ -125,7 +125,7 @@ envoy_cc_extension(
         "//test/integration:__subpackages__",
     ],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/extensions/common/redis:cluster_refresh_manager_lib",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
@@ -147,8 +147,8 @@ envoy_cc_library(
     hdrs = ["router_impl.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/extensions/filters/network/common/redis:codec_lib",
         "//source/extensions/filters/network/common/redis:supported_commands_lib",
         "//source/extensions/filters/network/common/redis:utility_lib",
diff --git a/source/extensions/filters/network/redis_proxy/command_splitter.h b/source/extensions/filters/network/redis_proxy/command_splitter.h
index 019ae429459ad..b6905db242e39 100644
--- a/source/extensions/filters/network/redis_proxy/command_splitter.h
+++ b/source/extensions/filters/network/redis_proxy/command_splitter.h
@@ -5,7 +5,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/event/dispatcher.h"
 
-#include "extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
index 8b5aa8317cbab..65552d8ae523c 100644
--- a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
+++ b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
@@ -1,8 +1,7 @@
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/common/redis/supported_commands.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.h b/source/extensions/filters/network/redis_proxy/command_splitter_impl.h
index 301daf2450dc9..9c765ea10e3cc 100644
--- a/source/extensions/filters/network/redis_proxy/command_splitter_impl.h
+++ b/source/extensions/filters/network/redis_proxy/command_splitter_impl.h
@@ -8,16 +8,15 @@
 #include "envoy/stats/stats_macros.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/stats/timespan_impl.h"
-
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/fault_impl.h"
-#include "extensions/filters/network/common/redis/utility.h"
-#include "extensions/filters/network/redis_proxy/command_splitter.h"
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
-#include "extensions/filters/network/redis_proxy/router.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/extensions/filters/network/redis_proxy/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/config.cc b/source/extensions/filters/network/redis_proxy/config.cc
index d10e951e7b853..4a6790b7569de 100644
--- a/source/extensions/filters/network/redis_proxy/config.cc
+++ b/source/extensions/filters/network/redis_proxy/config.cc
@@ -1,14 +1,14 @@
-#include "extensions/filters/network/redis_proxy/config.h"
+#include "source/extensions/filters/network/redis_proxy/config.h"
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "extensions/common/redis/cluster_refresh_manager_impl.h"
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/fault_impl.h"
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
-#include "extensions/filters/network/redis_proxy/proxy_filter.h"
-#include "extensions/filters/network/redis_proxy/router_impl.h"
+#include "source/extensions/common/redis/cluster_refresh_manager_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/extensions/filters/network/redis_proxy/proxy_filter.h"
+#include "source/extensions/filters/network/redis_proxy/router_impl.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/extensions/filters/network/redis_proxy/config.h b/source/extensions/filters/network/redis_proxy/config.h
index c3237934fcea1..fc32de5163bcd 100644
--- a/source/extensions/filters/network/redis_proxy/config.h
+++ b/source/extensions/filters/network/redis_proxy/config.h
@@ -8,11 +8,10 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/conn_pool.h b/source/extensions/filters/network/redis_proxy/conn_pool.h
index 385fac2eb5278..4c9246d63838b 100644
--- a/source/extensions/filters/network/redis_proxy/conn_pool.h
+++ b/source/extensions/filters/network/redis_proxy/conn_pool.h
@@ -6,8 +6,8 @@
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
 
 #include "absl/types/variant.h"
 
diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc
index f84a21702f1f9..56a06c67e0753 100644
--- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc
+++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
 
 #include <cstdint>
 #include <memory>
@@ -11,11 +11,10 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/stats/utility.h"
-
-#include "extensions/filters/network/redis_proxy/config.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/filters/network/redis_proxy/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.h b/source/extensions/filters/network/redis_proxy/conn_pool_impl.h
index 60c27afe1c224..76373d33fe9c6 100644
--- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.h
+++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.h
@@ -12,22 +12,20 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/filter_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/const_singleton.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
-
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 #include "source/extensions/clusters/redis/redis_cluster_lb.h"
-
-#include "extensions/common/redis/cluster_refresh_manager.h"
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/codec_impl.h"
-#include "extensions/filters/network/common/redis/utility.h"
-#include "extensions/filters/network/redis_proxy/conn_pool.h"
+#include "source/extensions/common/redis/cluster_refresh_manager.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/extensions/filters/network/redis_proxy/proxy_filter.cc b/source/extensions/filters/network/redis_proxy/proxy_filter.cc
index 54e029813ef07..cbc1be8302c0c 100644
--- a/source/extensions/filters/network/redis_proxy/proxy_filter.cc
+++ b/source/extensions/filters/network/redis_proxy/proxy_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/redis_proxy/proxy_filter.h"
+#include "source/extensions/filters/network/redis_proxy/proxy_filter.h"
 
 #include <cstdint>
 #include <string>
@@ -6,10 +6,10 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/datasource.h"
-#include "common/config/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/proxy_filter.h b/source/extensions/filters/network/redis_proxy/proxy_filter.h
index 103e7c33c9e65..12fbc92555497 100644
--- a/source/extensions/filters/network/redis_proxy/proxy_filter.h
+++ b/source/extensions/filters/network/redis_proxy/proxy_filter.h
@@ -11,10 +11,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/common/redis/codec.h"
-#include "extensions/filters/network/redis_proxy/command_splitter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/common/redis/codec.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/router.h b/source/extensions/filters/network/redis_proxy/router.h
index d1090be1ed8d4..339a672ef6458 100644
--- a/source/extensions/filters/network/redis_proxy/router.h
+++ b/source/extensions/filters/network/redis_proxy/router.h
@@ -6,7 +6,7 @@
 
 #include "envoy/common/pure.h"
 
-#include "extensions/filters/network/redis_proxy/conn_pool.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/redis_proxy/router_impl.cc b/source/extensions/filters/network/redis_proxy/router_impl.cc
index bccb472c8e3af..3e5048737ef1d 100644
--- a/source/extensions/filters/network/redis_proxy/router_impl.cc
+++ b/source/extensions/filters/network/redis_proxy/router_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/redis_proxy/router_impl.h"
+#include "source/extensions/filters/network/redis_proxy/router_impl.h"
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/type/v3/percent.pb.h"
diff --git a/source/extensions/filters/network/redis_proxy/router_impl.h b/source/extensions/filters/network/redis_proxy/router_impl.h
index e60552c5c8791..47a04f9adec86 100644
--- a/source/extensions/filters/network/redis_proxy/router_impl.h
+++ b/source/extensions/filters/network/redis_proxy/router_impl.h
@@ -13,9 +13,9 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/filters/network/common/redis/supported_commands.h"
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
-#include "extensions/filters/network/redis_proxy/router.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/extensions/filters/network/redis_proxy/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/BUILD b/source/extensions/filters/network/rocketmq_proxy/BUILD
index fe9ba3ab5022f..f9ea690d242d8 100644
--- a/source/extensions/filters/network/rocketmq_proxy/BUILD
+++ b/source/extensions/filters/network/rocketmq_proxy/BUILD
@@ -19,8 +19,8 @@ envoy_cc_library(
     name = "stats_interface",
     hdrs = ["stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
     ],
 )
 
@@ -74,7 +74,7 @@ envoy_cc_library(
     ],
     deps = [
         ":protocol_lib",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:filter_interface",
         "//source/common/protobuf:utility_lib",
     ],
 )
@@ -95,11 +95,11 @@ envoy_cc_library(
         ":rocketmq_lib",
         ":stats_interface",
         ":well_known_names",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
@@ -124,8 +124,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":conn_manager_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:logger_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.cc b/source/extensions/filters/network/rocketmq_proxy/active_message.cc
index 2a263fe752bbf..772806a5829c1 100644
--- a/source/extensions/filters/network/rocketmq_proxy/active_message.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/active_message.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/network/rocketmq_proxy/active_message.h"
+#include "source/extensions/filters/network/rocketmq_proxy/active_message.h"
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/topic_route.h"
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.h b/source/extensions/filters/network/rocketmq_proxy/active_message.h
index 1cb83453755c0..cbec9f1071280 100644
--- a/source/extensions/filters/network/rocketmq_proxy/active_message.h
+++ b/source/extensions/filters/network/rocketmq_proxy/active_message.h
@@ -5,14 +5,13 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/rocketmq_proxy/codec.h"
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
-#include "extensions/filters/network/rocketmq_proxy/router/router.h"
-#include "extensions/filters/network/rocketmq_proxy/topic_route.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router.h"
+#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.cc b/source/extensions/filters/network/rocketmq_proxy/codec.cc
index eabf762cdf19d..8255de59d3e1c 100644
--- a/source/extensions/filters/network/rocketmq_proxy/codec.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/codec.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/network/rocketmq_proxy/codec.h"
+#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
 
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.h b/source/extensions/filters/network/rocketmq_proxy/codec.h
index 3f307b8500bbd..5459c380370e6 100644
--- a/source/extensions/filters/network/rocketmq_proxy/codec.h
+++ b/source/extensions/filters/network/rocketmq_proxy/codec.h
@@ -7,11 +7,10 @@
 #include "envoy/common/platform.h"
 #include "envoy/network/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/config.cc b/source/extensions/filters/network/rocketmq_proxy/config.cc
index f4fdbfbaf65a3..938c79edaa716 100644
--- a/source/extensions/filters/network/rocketmq_proxy/config.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
 
 #include <cstdlib>
 
@@ -6,9 +6,9 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/stats.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/stats.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/config.h b/source/extensions/filters/network/rocketmq_proxy/config.h
index 5597a27c08019..5ff3d7e98966a 100644
--- a/source/extensions/filters/network/rocketmq_proxy/config.h
+++ b/source/extensions/filters/network/rocketmq_proxy/config.h
@@ -6,11 +6,11 @@
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h"
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
-#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc b/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc
index f25b57eac0964..8f5ba509f6db4 100644
--- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/connection.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h b/source/extensions/filters/network/rocketmq_proxy/conn_manager.h
index 29f3faf48ad57..e724b15b3393c 100644
--- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h
+++ b/source/extensions/filters/network/rocketmq_proxy/conn_manager.h
@@ -13,12 +13,11 @@
 #include "envoy/stats/timespan.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/rocketmq_proxy/active_message.h"
-#include "extensions/filters/network/rocketmq_proxy/codec.h"
-#include "extensions/filters/network/rocketmq_proxy/stats.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/rocketmq_proxy/active_message.h"
+#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
+#include "source/extensions/filters/network/rocketmq_proxy/stats.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/filters/network/rocketmq_proxy/metadata.h b/source/extensions/filters/network/rocketmq_proxy/metadata.h
index db71356b8064f..a2efeb031bbc5 100644
--- a/source/extensions/filters/network/rocketmq_proxy/metadata.h
+++ b/source/extensions/filters/network/rocketmq_proxy/metadata.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.cc b/source/extensions/filters/network/rocketmq_proxy/protocol.cc
index d3bb8a48d598c..f35a5f68d64fa 100644
--- a/source/extensions/filters/network/rocketmq_proxy/protocol.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/protocol.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
 
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.h b/source/extensions/filters/network/rocketmq_proxy/protocol.h
index 151785193546d..c6a0855627993 100644
--- a/source/extensions/filters/network/rocketmq_proxy/protocol.h
+++ b/source/extensions/filters/network/rocketmq_proxy/protocol.h
@@ -6,11 +6,10 @@
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/network/rocketmq_proxy/metadata.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/network/rocketmq_proxy/metadata.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/BUILD b/source/extensions/filters/network/rocketmq_proxy/router/BUILD
index 8f303861daae2..396e5bc401323 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/BUILD
+++ b/source/extensions/filters/network/rocketmq_proxy/router/BUILD
@@ -12,8 +12,8 @@ envoy_cc_library(
     name = "router_interface",
     hdrs = ["router.h"],
     deps = [
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:load_balancer_interface",
         "//source/common/upstream:load_balancer_lib",
     ],
 )
@@ -24,8 +24,8 @@ envoy_cc_library(
     hdrs = ["router_impl.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:thread_local_cluster_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:thread_local_cluster_interface",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/rocketmq_proxy:conn_manager_lib",
     ],
@@ -37,8 +37,8 @@ envoy_cc_library(
     hdrs = ["route_matcher.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:logger_lib",
         "//source/common/common:matchers_lib",
         "//source/common/http:header_utility_lib",
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc
index 91c66e5887c72..4bb961f5fa391 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc
@@ -1,9 +1,8 @@
-#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
 
-#include "common/router/metadatamatchcriteria_impl.h"
-
-#include "extensions/filters/network/rocketmq_proxy/metadata.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
+#include "source/extensions/filters/network/rocketmq_proxy/metadata.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h
index 6c98427f5a126..06aec7221d250 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h
+++ b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h
@@ -6,11 +6,10 @@
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-#include "common/common/matchers.h"
-#include "common/http/header_utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/router/router.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/header_utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router.h b/source/extensions/filters/network/rocketmq_proxy/router/router.h
index 7ab07d310a976..7a4f9c60db9fd 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/router.h
+++ b/source/extensions/filters/network/rocketmq_proxy/router/router.h
@@ -2,7 +2,7 @@
 
 #include "envoy/tcp/conn_pool.h"
 
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc
index a7351aeadddfa..5086f685d7f63 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h"
-
-#include "common/common/enum_to_int.h"
-
-#include "extensions/filters/network/rocketmq_proxy/active_message.h"
-#include "extensions/filters/network/rocketmq_proxy/codec.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h"
+
+#include "source/common/common/enum_to_int.h"
+#include "source/extensions/filters/network/rocketmq_proxy/active_message.h"
+#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h
index b56960266b286..30e0cdbe07d62 100644
--- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h
+++ b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h
@@ -4,10 +4,9 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/common/logger.h"
-#include "common/upstream/load_balancer_impl.h"
-
-#include "extensions/filters/network/rocketmq_proxy/router/router.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc b/source/extensions/filters/network/rocketmq_proxy/topic_route.cc
index 17a00e3879e90..afe0a828d0adb 100644
--- a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc
+++ b/source/extensions/filters/network/rocketmq_proxy/topic_route.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/rocketmq_proxy/topic_route.h"
+#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.h b/source/extensions/filters/network/rocketmq_proxy/topic_route.h
index 01958aef9a515..6d5622e24366b 100644
--- a/source/extensions/filters/network/rocketmq_proxy/topic_route.h
+++ b/source/extensions/filters/network/rocketmq_proxy/topic_route.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/extensions/filters/network/rocketmq_proxy/well_known_names.h b/source/extensions/filters/network/rocketmq_proxy/well_known_names.h
index 7a02dda1a50db..3c04eed8a30a1 100644
--- a/source/extensions/filters/network/rocketmq_proxy/well_known_names.h
+++ b/source/extensions/filters/network/rocketmq_proxy/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_cluster/BUILD b/source/extensions/filters/network/sni_cluster/BUILD
index f730bd9c49ca6..8c83a5a9c9687 100644
--- a/source/extensions/filters/network/sni_cluster/BUILD
+++ b/source/extensions/filters/network/sni_cluster/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
     srcs = ["sni_cluster.cc"],
     hdrs = ["sni_cluster.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/tcp_proxy",
@@ -28,8 +28,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":sni_cluster",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/network:well_known_names",
         "@envoy_api//envoy/extensions/filters/network/sni_cluster/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/filters/network/sni_cluster/config.cc b/source/extensions/filters/network/sni_cluster/config.cc
index 96bf6ffa28449..5bf4bc53b5044 100644
--- a/source/extensions/filters/network/sni_cluster/config.cc
+++ b/source/extensions/filters/network/sni_cluster/config.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/network/sni_cluster/config.h"
+#include "source/extensions/filters/network/sni_cluster/config.h"
 
 #include "envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.h"
 #include "envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/network/sni_cluster/sni_cluster.h"
+#include "source/extensions/filters/network/sni_cluster/sni_cluster.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_cluster/config.h b/source/extensions/filters/network/sni_cluster/config.h
index 9091e76854010..b2c18d98ef0c1 100644
--- a/source/extensions/filters/network/sni_cluster/config.h
+++ b/source/extensions/filters/network/sni_cluster/config.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_cluster/sni_cluster.cc b/source/extensions/filters/network/sni_cluster/sni_cluster.cc
index 876eca758a942..6fea2639de93f 100644
--- a/source/extensions/filters/network/sni_cluster/sni_cluster.cc
+++ b/source/extensions/filters/network/sni_cluster/sni_cluster.cc
@@ -1,9 +1,9 @@
-#include "extensions/filters/network/sni_cluster/sni_cluster.h"
+#include "source/extensions/filters/network/sni_cluster/sni_cluster.h"
 
 #include "envoy/network/connection.h"
 
-#include "common/common/assert.h"
-#include "common/tcp_proxy/tcp_proxy.h"
+#include "source/common/common/assert.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_cluster/sni_cluster.h b/source/extensions/filters/network/sni_cluster/sni_cluster.h
index d062368ac6664..d5dc62edcc95d 100644
--- a/source/extensions/filters/network/sni_cluster/sni_cluster.h
+++ b/source/extensions/filters/network/sni_cluster/sni_cluster.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/filter.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD b/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD
index ae0181f77f7fa..335b62d0192ca 100644
--- a/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD
+++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
     srcs = ["proxy_filter.cc"],
     hdrs = ["proxy_filter.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/tcp_proxy",
diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc
index 97924d6086c6a..54a7ef5a05a59 100644
--- a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc
+++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/sni_dynamic_forward_proxy/config.h"
+#include "source/extensions/filters/network/sni_dynamic_forward_proxy/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
-#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
+#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h
index c54dc6d569376..f2aea2c4b85fa 100644
--- a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h
+++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.h"
 #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc
index 01089bfca0940..3c8f6e0798906 100644
--- a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc
+++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
 
 #include "envoy/network/connection.h"
 #include "envoy/network/filter.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/common/assert.h"
-#include "common/tcp_proxy/tcp_proxy.h"
+#include "source/common/common/assert.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h
index 0839fe0641898..e7f0de159d20d 100644
--- a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h
+++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h
@@ -4,9 +4,8 @@
 #include "envoy/network/filter.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/tcp_proxy/BUILD b/source/extensions/filters/network/tcp_proxy/BUILD
index ea7360966c411..723dec1481120 100644
--- a/source/extensions/filters/network/tcp_proxy/BUILD
+++ b/source/extensions/filters/network/tcp_proxy/BUILD
@@ -18,7 +18,7 @@ envoy_cc_extension(
     # This is core Envoy config.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/tcp_proxy",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
diff --git a/source/extensions/filters/network/tcp_proxy/config.cc b/source/extensions/filters/network/tcp_proxy/config.cc
index 9543c5683f644..ccdc6e7a69da4 100644
--- a/source/extensions/filters/network/tcp_proxy/config.cc
+++ b/source/extensions/filters/network/tcp_proxy/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/tcp_proxy/config.h"
+#include "source/extensions/filters/network/tcp_proxy/config.h"
 
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/tcp_proxy/tcp_proxy.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/tcp_proxy/config.h b/source/extensions/filters/network/tcp_proxy/config.h
index e4ded4263d925..7c0c4fba6a36a 100644
--- a/source/extensions/filters/network/tcp_proxy/config.h
+++ b/source/extensions/filters/network/tcp_proxy/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/BUILD b/source/extensions/filters/network/thrift_proxy/BUILD
index 37defe986a917..b1fdbe06264ae 100644
--- a/source/extensions/filters/network/thrift_proxy/BUILD
+++ b/source/extensions/filters/network/thrift_proxy/BUILD
@@ -16,7 +16,7 @@ envoy_cc_library(
     deps = [
         ":protocol_interface",
         ":thrift_lib",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -49,7 +49,7 @@ envoy_cc_extension(
         ":protocol_interface",
         ":twitter_protocol_lib",
         ":unframed_transport_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
@@ -72,12 +72,12 @@ envoy_cc_library(
         ":protocol_interface",
         ":stats_lib",
         ":transport_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:linked_object",
@@ -119,7 +119,7 @@ envoy_cc_library(
     deps = [
         ":thrift_lib",
         ":tracing_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "//source/common/common:macros",
         "//source/common/http:header_map_lib",
     ],
@@ -140,7 +140,7 @@ envoy_cc_library(
     deps = [
         ":decoder_events_lib",
         ":protocol_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -157,9 +157,9 @@ envoy_cc_library(
         ":thrift_lib",
         ":thrift_object_interface",
         ":transport_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/registry",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/singleton:const_singleton",
@@ -236,8 +236,8 @@ envoy_cc_library(
     name = "stats_lib",
     hdrs = ["stats.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
     ],
 )
 
@@ -249,9 +249,9 @@ envoy_cc_library(
         ":buffer_helper_lib",
         ":metadata_lib",
         ":thrift_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/registry",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/singleton:const_singleton",
@@ -262,7 +262,7 @@ envoy_cc_library(
     name = "conn_state_lib",
     hdrs = ["conn_state.h"],
     deps = [
-        "//include/envoy/tcp:conn_pool_interface",
+        "//envoy/tcp:conn_pool_interface",
     ],
 )
 
@@ -280,7 +280,7 @@ envoy_cc_library(
     hdrs = ["thrift_object.h"],
     deps = [
         ":thrift_lib",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
diff --git a/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc b/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc
index 33e8d248d2156..6437de01a410d 100644
--- a/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/app_exception_impl.h b/source/extensions/filters/network/thrift_proxy/app_exception_impl.h
index 6ca0012bcaeca..fffacd783d959 100644
--- a/source/extensions/filters/network/thrift_proxy/app_exception_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/app_exception_impl.h
@@ -2,9 +2,9 @@
 
 #include "envoy/common/exception.h"
 
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc
index be1c42bbcfa9e..908560c394477 100644
--- a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc
@@ -1,17 +1,16 @@
-#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
 
 #include <algorithm>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/byte_order.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h
index 51492e804c2d1..c15d50e3de9d2 100644
--- a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h
@@ -4,9 +4,8 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc
index 022c711cbae20..9cad6091a586d 100644
--- a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc
@@ -1,15 +1,14 @@
-#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/header_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h
index 4db0109c88b20..65d8be0c76688 100644
--- a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h
@@ -4,9 +4,8 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc
index 556380f1af440..805ec973e0213 100644
--- a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc
@@ -1,14 +1,13 @@
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
 
 #include <limits>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h
index cfd687ba1878a..a3497aa70a6dd 100644
--- a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h
@@ -5,7 +5,7 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 
-#include "extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/buffer_helper.cc b/source/extensions/filters/network/thrift_proxy/buffer_helper.cc
index 48167e024bede..ca3d209f423bc 100644
--- a/source/extensions/filters/network/thrift_proxy/buffer_helper.cc
+++ b/source/extensions/filters/network/thrift_proxy/buffer_helper.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
-#include "common/common/byte_order.h"
-#include "common/common/safe_memcpy.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/safe_memcpy.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/buffer_helper.h b/source/extensions/filters/network/thrift_proxy/buffer_helper.h
index 90acf982edf0d..c4999001f5aed 100644
--- a/source/extensions/filters/network/thrift_proxy/buffer_helper.h
+++ b/source/extensions/filters/network/thrift_proxy/buffer_helper.h
@@ -3,7 +3,7 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc
index f496db6850bfe..4bab4da2e625f 100644
--- a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc
@@ -1,14 +1,13 @@
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
 
 #include <limits>
 
 #include "envoy/common/exception.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h
index 5d69037d68e25..fb89e613ece3e 100644
--- a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h
@@ -6,7 +6,7 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 
-#include "extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/config.cc b/source/extensions/filters/network/thrift_proxy/config.cc
index dd835c7cf48d2..30dd817e5908b 100644
--- a/source/extensions/filters/network/thrift_proxy/config.cc
+++ b/source/extensions/filters/network/thrift_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/config.h"
+#include "source/extensions/filters/network/thrift_proxy/config.h"
 
 #include <map>
 #include <string>
@@ -8,18 +8,17 @@
 #include "envoy/network/connection.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/decoder.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter_config.h"
-#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h"
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/stats.h"
-#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter_config.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/stats.h"
+#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/config.h b/source/extensions/filters/network/thrift_proxy/config.h
index de2cd2bb4e292..8cc5d722071f4 100644
--- a/source/extensions/filters/network/thrift_proxy/config.h
+++ b/source/extensions/filters/network/thrift_proxy/config.h
@@ -6,11 +6,11 @@
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/thrift_proxy/conn_manager.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/router/router_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/conn_manager.cc b/source/extensions/filters/network/thrift_proxy/conn_manager.cc
index 078f3a8ccbf62..c3de018f2dfda 100644
--- a/source/extensions/filters/network/thrift_proxy/conn_manager.cc
+++ b/source/extensions/filters/network/thrift_proxy/conn_manager.cc
@@ -1,11 +1,11 @@
-#include "extensions/filters/network/thrift_proxy/conn_manager.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/event/dispatcher.h"
 
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/conn_manager.h b/source/extensions/filters/network/thrift_proxy/conn_manager.h
index eb056aaed1221..f4e19152d0aa1 100644
--- a/source/extensions/filters/network/thrift_proxy/conn_manager.h
+++ b/source/extensions/filters/network/thrift_proxy/conn_manager.h
@@ -7,18 +7,17 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/linked_object.h"
-#include "common/common/logger.h"
-#include "common/stats/timespan_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/decoder.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/protocol_converter.h"
-#include "extensions/filters/network/thrift_proxy/stats.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol_converter.h"
+#include "source/extensions/filters/network/thrift_proxy/stats.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 #include "absl/types/any.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/decoder.cc b/source/extensions/filters/network/thrift_proxy/decoder.cc
index 55f23af6ef88e..111703e63da55 100644
--- a/source/extensions/filters/network/thrift_proxy/decoder.cc
+++ b/source/extensions/filters/network/thrift_proxy/decoder.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/thrift_proxy/decoder.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/decoder.h b/source/extensions/filters/network/thrift_proxy/decoder.h
index 6c8b8bef57551..99739221c5104 100644
--- a/source/extensions/filters/network/thrift_proxy/decoder.h
+++ b/source/extensions/filters/network/thrift_proxy/decoder.h
@@ -2,12 +2,11 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/decoder_events.h b/source/extensions/filters/network/thrift_proxy/decoder_events.h
index b5981d6bc1dfb..342f65ece6856 100644
--- a/source/extensions/filters/network/thrift_proxy/decoder_events.h
+++ b/source/extensions/filters/network/thrift_proxy/decoder_events.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/BUILD b/source/extensions/filters/network/thrift_proxy/filters/BUILD
index 36e94c0a648cf..29870cc5a9823 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/BUILD
+++ b/source/extensions/filters/network/thrift_proxy/filters/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     hdrs = ["filter_config.h"],
     deps = [
         ":filter_interface",
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:macros",
         "//source/common/protobuf:cc_wkt_protos",
     ],
@@ -33,9 +33,9 @@ envoy_cc_library(
     name = "filter_interface",
     hdrs = ["filter.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/extensions/filters/network/thrift_proxy:decoder_events_lib",
         "//source/extensions/filters/network/thrift_proxy:protocol_interface",
         "//source/extensions/filters/network/thrift_proxy:thrift_lib",
diff --git a/source/extensions/filters/network/thrift_proxy/filters/factory_base.h b/source/extensions/filters/network/thrift_proxy/filters/factory_base.h
index 3f6f1b144d114..ee75cb7316ae0 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/factory_base.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/factory_base.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/thrift_proxy/filters/filter_config.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/filter.h b/source/extensions/filters/network/thrift_proxy/filters/filter.h
index b8b73ddf517b5..4a75fecad7504 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/filter.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/filter.h
@@ -8,11 +8,11 @@
 #include "envoy/network/connection.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "extensions/filters/network/thrift_proxy/decoder_events.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
-#include "extensions/filters/network/thrift_proxy/thrift.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder_events.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/filter_config.h b/source/extensions/filters/network/thrift_proxy/filters/filter_config.h
index 62d900a8b1d6c..f87669990fd60 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/filter_config.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/filter_config.h
@@ -3,10 +3,9 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/macros.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h b/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h
index dfcdebb8888c1..5858ff46e6c16 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD
index 0d8f61fe19f83..a3b4fa59564ba 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD
+++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["ratelimit.cc"],
     hdrs = ["ratelimit.h"],
     deps = [
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/protobuf:utility_lib",
         "//source/common/tracing:http_tracer_lib",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
@@ -34,7 +34,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":ratelimit_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc
index a3e442de6347a..82217079c8e9a 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc
+++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/filters/ratelimit/config.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h"
 
 #include <chrono>
 #include <string>
@@ -7,11 +7,10 @@
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
-#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h
index aba657fbe6052..b828f30ef8357 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/network/thrift_proxy/filters/factory_base.h"
-#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc
index 7fcfef1f0817d..38107f04d3fc4 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc
+++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc
@@ -1,11 +1,10 @@
-#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
 
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h
index 8fe178752c12b..d796044555e54 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h
@@ -9,11 +9,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit.h"
-#include "extensions/filters/common/ratelimit/stat_names.h"
-#include "extensions/filters/network/thrift_proxy/filters/pass_through_filter.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/common/ratelimit/stat_names.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h b/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h
index 83f672c524f1c..0ae7a352a402c 100644
--- a/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h
+++ b/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc
index b2dfcf1e3b091..40ee57bc3393b 100644
--- a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h
index 786bfce0680b5..4984bb197922a 100644
--- a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc
index 0a548452c8200..cbfb42b0dc08b 100644
--- a/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/thrift_proxy/header_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h"
 
 #include <limits>
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 #include "absl/strings/str_replace.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/header_transport_impl.h b/source/extensions/filters/network/thrift_proxy/header_transport_impl.h
index e7eb6d3e18ac9..b1b48ab9c9ed5 100644
--- a/source/extensions/filters/network/thrift_proxy/header_transport_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/header_transport_impl.h
@@ -4,10 +4,10 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/thrift.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/metadata.h b/source/extensions/filters/network/thrift_proxy/metadata.h
index f99be53d812b5..560952003f92f 100644
--- a/source/extensions/filters/network/thrift_proxy/metadata.h
+++ b/source/extensions/filters/network/thrift_proxy/metadata.h
@@ -8,11 +8,10 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/macros.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/thrift.h"
-#include "extensions/filters/network/thrift_proxy/tracing.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/tracing.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/protocol.h b/source/extensions/filters/network/thrift_proxy/protocol.h
index 3a76799229da8..a9eae7779e1ec 100644
--- a/source/extensions/filters/network/thrift_proxy/protocol.h
+++ b/source/extensions/filters/network/thrift_proxy/protocol.h
@@ -8,16 +8,15 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/thrift_proxy/conn_state.h"
-#include "extensions/filters/network/thrift_proxy/decoder_events.h"
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/thrift.h"
-#include "extensions/filters/network/thrift_proxy/thrift_object.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_state.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder_events.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/protocol_converter.h b/source/extensions/filters/network/thrift_proxy/protocol_converter.h
index 16a2d41115416..62de1a1f9fa75 100644
--- a/source/extensions/filters/network/thrift_proxy/protocol_converter.h
+++ b/source/extensions/filters/network/thrift_proxy/protocol_converter.h
@@ -2,8 +2,8 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/filters/network/thrift_proxy/decoder_events.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder_events.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/BUILD b/source/extensions/filters/network/thrift_proxy/router/BUILD
index a16abad3aeb90..0f15b690aa650 100644
--- a/source/extensions/filters/network/thrift_proxy/router/BUILD
+++ b/source/extensions/filters/network/thrift_proxy/router/BUILD
@@ -15,7 +15,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":router_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/filters/network/thrift_proxy/filters:factory_base_lib",
         "//source/extensions/filters/network/thrift_proxy/filters:filter_config_interface",
         "//source/extensions/filters/network/thrift_proxy/filters:well_known_names",
@@ -28,7 +28,7 @@ envoy_cc_library(
     hdrs = ["router.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
         "//source/extensions/filters/network/thrift_proxy:metadata_lib",
     ],
 )
@@ -38,7 +38,7 @@ envoy_cc_library(
     hdrs = ["router_ratelimit.h"],
     deps = [
         ":router_interface",
-        "//include/envoy/router:router_ratelimit_interface",
+        "//envoy/router:router_ratelimit_interface",
         "//source/extensions/filters/network/thrift_proxy:metadata_lib",
     ],
 )
@@ -50,10 +50,10 @@ envoy_cc_library(
     deps = [
         ":router_interface",
         ":router_ratelimit_lib",
-        "//include/envoy/tcp:conn_pool_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:thread_local_cluster_interface",
+        "//envoy/tcp:conn_pool_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:thread_local_cluster_interface",
         "//source/common/common:logger_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/router:metadatamatchcriteria_lib",
diff --git a/source/extensions/filters/network/thrift_proxy/router/config.cc b/source/extensions/filters/network/thrift_proxy/router/config.cc
index b6a055445aa66..ef94242c89b8d 100644
--- a/source/extensions/filters/network/thrift_proxy/router/config.cc
+++ b/source/extensions/filters/network/thrift_proxy/router/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/thrift_proxy/router/config.h"
+#include "source/extensions/filters/network/thrift_proxy/router/config.h"
 
 #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/network/thrift_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/config.h b/source/extensions/filters/network/thrift_proxy/router/config.h
index 7c712d8621ccb..1ae1a499202b7 100644
--- a/source/extensions/filters/network/thrift_proxy/router/config.h
+++ b/source/extensions/filters/network/thrift_proxy/router/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.h"
 
-#include "extensions/filters/network/thrift_proxy/filters/factory_base.h"
-#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/router.h b/source/extensions/filters/network/thrift_proxy/router/router.h
index 26d2074c6fc0c..d5155cb0c2960 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router.h
+++ b/source/extensions/filters/network/thrift_proxy/router/router.h
@@ -5,7 +5,7 @@
 
 #include "envoy/router/router.h"
 
-#include "extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc
index 131ecb11180c2..7d8580b714e69 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 
 #include <memory>
 
@@ -6,11 +6,10 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/common/utility.h"
-#include "common/router/metadatamatchcriteria_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/common/utility.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "absl/strings/match.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.h b/source/extensions/filters/network/thrift_proxy/router/router_impl.h
index 077ab117873e7..69d2e3a03d475 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.h
@@ -11,15 +11,14 @@
 #include "envoy/tcp/conn_pool.h"
 #include "envoy/upstream/load_balancer.h"
 
-#include "common/common/logger.h"
-#include "common/http/header_utility.h"
-#include "common/upstream/load_balancer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/conn_manager.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
-#include "extensions/filters/network/thrift_proxy/thrift_object.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h
index aca46cd330361..181d644b905bc 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h
+++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h
@@ -8,8 +8,8 @@
 #include "envoy/http/header_map.h"
 #include "envoy/ratelimit/ratelimit.h"
 
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc
index 01d4154a4d087..b510ac9e303b6 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/ratelimit/ratelimit.h"
 
-#include "extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h
index 48f3a4f860c7b..3bdcdadc54c96 100644
--- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h
@@ -7,11 +7,10 @@
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/http/header_utility.h"
-
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
+#include "source/common/http/header_utility.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/thrift.h b/source/extensions/filters/network/thrift_proxy/thrift.h
index e42f1338adc69..3092bceb11b7e 100644
--- a/source/extensions/filters/network/thrift_proxy/thrift.h
+++ b/source/extensions/filters/network/thrift_proxy/thrift.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/assert.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object.h b/source/extensions/filters/network/thrift_proxy/thrift_object.h
index 6c4d9f3555101..ae8ff24067ba9 100644
--- a/source/extensions/filters/network/thrift_proxy/thrift_object.h
+++ b/source/extensions/filters/network/thrift_proxy/thrift_object.h
@@ -6,9 +6,8 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/exception.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc
index 0008f3f58495d..0c02f11a02306 100644
--- a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h
index 700e6b2238393..c9a5386d6fe6d 100644
--- a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "extensions/filters/network/thrift_proxy/decoder.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/thrift_object.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/transport.h b/source/extensions/filters/network/thrift_proxy/transport.h
index d8393cef6870d..64f755df4b1a0 100644
--- a/source/extensions/filters/network/thrift_proxy/transport.h
+++ b/source/extensions/filters/network/thrift_proxy/transport.h
@@ -7,11 +7,10 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/singleton/const_singleton.h"
-
-#include "extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/const_singleton.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc
index 7f1ca57592cdb..b46c87f188045 100644
--- a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
-#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h"
-#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
 #include "absl/strings/str_replace.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h
index 101f016f6b33a..e63ba7545258b 100644
--- a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h
@@ -5,9 +5,8 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc
index 14a47af80f76f..d85e91fed073e 100644
--- a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc
+++ b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h
index 5266d1eaad7e0..bd6280cff19b4 100644
--- a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h
+++ b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h
@@ -4,7 +4,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/wasm/BUILD b/source/extensions/filters/network/wasm/BUILD
index e8a47db2acc8a..6633576aa7a15 100644
--- a/source/extensions/filters/network/wasm/BUILD
+++ b/source/extensions/filters/network/wasm/BUILD
@@ -16,8 +16,8 @@ envoy_cc_library(
     srcs = ["wasm_filter.cc"],
     hdrs = ["wasm_filter.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/extensions/common/wasm:wasm_lib",
         "//source/extensions/filters/network:well_known_names",
         "@envoy_api//envoy/extensions/filters/network/wasm/v3:pkg_cc_proto",
@@ -30,7 +30,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":wasm_filter_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
         "//source/extensions/common/wasm:wasm_lib",
diff --git a/source/extensions/filters/network/wasm/config.cc b/source/extensions/filters/network/wasm/config.cc
index 05f8f1abb854e..925e538cb67eb 100644
--- a/source/extensions/filters/network/wasm/config.cc
+++ b/source/extensions/filters/network/wasm/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/network/wasm/config.h"
+#include "source/extensions/filters/network/wasm/config.h"
 
 #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/network/wasm/wasm_filter.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/network/wasm/wasm_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/wasm/config.h b/source/extensions/filters/network/wasm/config.h
index 12201c56b1874..306bc51918258 100644
--- a/source/extensions/filters/network/wasm/config.h
+++ b/source/extensions/filters/network/wasm/config.h
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.h"
 #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/wasm/wasm_filter.cc b/source/extensions/filters/network/wasm/wasm_filter.cc
index 4aa922071c4a4..862382d10ee13 100644
--- a/source/extensions/filters/network/wasm/wasm_filter.cc
+++ b/source/extensions/filters/network/wasm/wasm_filter.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/wasm/wasm_filter.h"
+#include "source/extensions/filters/network/wasm/wasm_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/wasm/wasm_filter.h b/source/extensions/filters/network/wasm/wasm_filter.h
index 4c482af432e36..ad0d99e5a4a67 100644
--- a/source/extensions/filters/network/wasm/wasm_filter.h
+++ b/source/extensions/filters/network/wasm/wasm_filter.h
@@ -7,8 +7,8 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/well_known_names.h b/source/extensions/filters/network/well_known_names.h
index 7f62193c78969..f73be61a444cf 100644
--- a/source/extensions/filters/network/well_known_names.h
+++ b/source/extensions/filters/network/well_known_names.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/config/well_known_names.h"
+#include "source/common/config/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/BUILD b/source/extensions/filters/network/zookeeper_proxy/BUILD
index 9c72e9961dfe9..b71fbf09d5465 100644
--- a/source/extensions/filters/network/zookeeper_proxy/BUILD
+++ b/source/extensions/filters/network/zookeeper_proxy/BUILD
@@ -25,10 +25,10 @@ envoy_cc_library(
         "utils.h",
     ],
     deps = [
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:filter_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:enum_to_int",
         "//source/common/network:filter_lib",
diff --git a/source/extensions/filters/network/zookeeper_proxy/config.cc b/source/extensions/filters/network/zookeeper_proxy/config.cc
index 33016ac1e3fef..0a980cf96152d 100644
--- a/source/extensions/filters/network/zookeeper_proxy/config.cc
+++ b/source/extensions/filters/network/zookeeper_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/zookeeper_proxy/config.h"
+#include "source/extensions/filters/network/zookeeper_proxy/config.h"
 
 #include <string>
 
@@ -7,9 +7,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/zookeeper_proxy/filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/zookeeper_proxy/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/config.h b/source/extensions/filters/network/zookeeper_proxy/config.h
index c72e28d347c2e..10164f9094e74 100644
--- a/source/extensions/filters/network/zookeeper_proxy/config.h
+++ b/source/extensions/filters/network/zookeeper_proxy/config.h
@@ -3,9 +3,9 @@
 #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.h"
 #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/filters/network/well_known_names.h"
-#include "extensions/filters/network/zookeeper_proxy/filter.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/zookeeper_proxy/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/decoder.cc b/source/extensions/filters/network/zookeeper_proxy/decoder.cc
index 56877b8ac82ef..adfb593afb74a 100644
--- a/source/extensions/filters/network/zookeeper_proxy/decoder.cc
+++ b/source/extensions/filters/network/zookeeper_proxy/decoder.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/network/zookeeper_proxy/decoder.h"
+#include "source/extensions/filters/network/zookeeper_proxy/decoder.h"
 
 #include <string>
 
-#include "common/common/enum_to_int.h"
+#include "source/common/common/enum_to_int.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/decoder.h b/source/extensions/filters/network/zookeeper_proxy/decoder.h
index 85b99fdffbf73..62ca20885c5ee 100644
--- a/source/extensions/filters/network/zookeeper_proxy/decoder.h
+++ b/source/extensions/filters/network/zookeeper_proxy/decoder.h
@@ -5,10 +5,9 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/filters/network/zookeeper_proxy/utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/network/zookeeper_proxy/utils.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.cc b/source/extensions/filters/network/zookeeper_proxy/filter.cc
index b6c38c0ec2971..a32c5052d06ad 100644
--- a/source/extensions/filters/network/zookeeper_proxy/filter.cc
+++ b/source/extensions/filters/network/zookeeper_proxy/filter.cc
@@ -1,18 +1,17 @@
-#include "extensions/filters/network/zookeeper_proxy/filter.h"
+#include "source/extensions/filters/network/zookeeper_proxy/filter.h"
 
 #include <string>
 #include <vector>
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/stats/utility.h"
-
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.h b/source/extensions/filters/network/zookeeper_proxy/filter.h
index dc932764b1569..46c4f0ea8da31 100644
--- a/source/extensions/filters/network/zookeeper_proxy/filter.h
+++ b/source/extensions/filters/network/zookeeper_proxy/filter.h
@@ -11,10 +11,9 @@
 #include "envoy/stats/stats.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/network/zookeeper_proxy/decoder.h"
+#include "source/common/common/logger.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/network/zookeeper_proxy/decoder.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/zookeeper_proxy/utils.cc b/source/extensions/filters/network/zookeeper_proxy/utils.cc
index ed79ecba75bac..cf1c77a8bf190 100644
--- a/source/extensions/filters/network/zookeeper_proxy/utils.cc
+++ b/source/extensions/filters/network/zookeeper_proxy/utils.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/zookeeper_proxy/utils.h"
+#include "source/extensions/filters/network/zookeeper_proxy/utils.h"
 
 #include <string>
 
diff --git a/source/extensions/filters/network/zookeeper_proxy/utils.h b/source/extensions/filters/network/zookeeper_proxy/utils.h
index 7ce749ed86411..dc699afaf548a 100644
--- a/source/extensions/filters/network/zookeeper_proxy/utils.h
+++ b/source/extensions/filters/network/zookeeper_proxy/utils.h
@@ -5,9 +5,9 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/byte_order.h"
-#include "common/common/logger.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/BUILD b/source/extensions/filters/udp/dns_filter/BUILD
index ab44521fdd408..d1445d1f9a40d 100644
--- a/source/extensions/filters/udp/dns_filter/BUILD
+++ b/source/extensions/filters/udp/dns_filter/BUILD
@@ -26,12 +26,12 @@ envoy_cc_library(
     ],
     external_deps = ["ares"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listener_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listener_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/common:matchers_lib",
@@ -54,8 +54,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":dns_filter_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "@envoy_api//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/filters/udp/dns_filter/config.cc b/source/extensions/filters/udp/dns_filter/config.cc
index 242bbab75e9c3..28f00e6a445f2 100644
--- a/source/extensions/filters/udp/dns_filter/config.cc
+++ b/source/extensions/filters/udp/dns_filter/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/udp/dns_filter/config.h"
+#include "source/extensions/filters/udp/dns_filter/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/config.h b/source/extensions/filters/udp/dns_filter/config.h
index 421feb7866754..9278199a26d68 100644
--- a/source/extensions/filters/udp/dns_filter/config.h
+++ b/source/extensions/filters/udp/dns_filter/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/udp/dns_filter/dns_filter.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter.cc b/source/extensions/filters/udp/dns_filter/dns_filter.cc
index 331f280c2f99f..6e4e523397bd4 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter.cc
+++ b/source/extensions/filters/udp/dns_filter/dns_filter.cc
@@ -1,13 +1,12 @@
-#include "extensions/filters/udp/dns_filter/dns_filter.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter.h"
 
 #include "envoy/network/listener.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/config/datasource.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_utils.h"
+#include "source/common/config/datasource.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter.h b/source/extensions/filters/udp/dns_filter/dns_filter.h
index ea12d3b08fe68..618013a0a87bd 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter.h
+++ b/source/extensions/filters/udp/dns_filter/dns_filter.h
@@ -5,13 +5,12 @@
 #include "envoy/network/dns.h"
 #include "envoy/network/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/matchers.h"
-#include "common/config/config_provider_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_resolver.h"
-#include "extensions/filters/udp/dns_filter/dns_parser.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/matchers.h"
+#include "source/common/config/config_provider_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_resolver.h"
+#include "source/extensions/filters/udp/dns_filter/dns_parser.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc
index 2ca86479c3820..76160c4974348 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc
+++ b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/udp/dns_filter/dns_filter_resolver.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_resolver.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h
index bed8585c86c3c..3a32da841c196 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h
+++ b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h
@@ -3,7 +3,7 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/network/dns.h"
 
-#include "extensions/filters/udp/dns_filter/dns_parser.h"
+#include "source/extensions/filters/udp/dns_filter/dns_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc b/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc
index cb22c4483fb3c..97cc6bea985df 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc
+++ b/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc
@@ -1,12 +1,12 @@
-#include "extensions/filters/udp/dns_filter/dns_filter_utils.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
 #include <algorithm>
 
 #include "envoy/common/platform.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/network/address_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_utils.h b/source/extensions/filters/udp/dns_filter/dns_filter_utils.h
index 47f63952b6d2f..f76c9a36aa342 100644
--- a/source/extensions/filters/udp/dns_filter/dns_filter_utils.h
+++ b/source/extensions/filters/udp/dns_filter/dns_filter_utils.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h"
 #include "envoy/network/address.h"
 
-#include "extensions/filters/udp/dns_filter/dns_filter_constants.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.cc b/source/extensions/filters/udp/dns_filter/dns_parser.cc
index 26899ea8ad134..65397af75c19e 100644
--- a/source/extensions/filters/udp/dns_filter/dns_parser.cc
+++ b/source/extensions/filters/udp/dns_filter/dns_parser.cc
@@ -1,12 +1,11 @@
-#include "extensions/filters/udp/dns_filter/dns_parser.h"
+#include "source/extensions/filters/udp/dns_filter/dns_parser.h"
 
 #include "envoy/network/address.h"
 
-#include "common/common/safe_memcpy.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_utils.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
 #include "ares.h"
 
diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.h b/source/extensions/filters/udp/dns_filter/dns_parser.h
index d604f0784ba74..e6a12019d0422 100644
--- a/source/extensions/filters/udp/dns_filter/dns_parser.h
+++ b/source/extensions/filters/udp/dns_filter/dns_parser.h
@@ -7,12 +7,11 @@
 #include "envoy/network/dns.h"
 #include "envoy/network/listener.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/stats/timespan_impl.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_constants.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/BUILD b/source/extensions/filters/udp/udp_proxy/BUILD
index bd8fa7e6b3550..331e28323819e 100644
--- a/source/extensions/filters/udp/udp_proxy/BUILD
+++ b/source/extensions/filters/udp/udp_proxy/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["hash_policy_impl.cc"],
     hdrs = ["hash_policy_impl.h"],
     deps = [
-        "//include/envoy/udp:hash_policy_interface",
+        "//envoy/udp:hash_policy_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:hash_lib",
         "@envoy_api//envoy/extensions/filters/udp/udp_proxy/v3:pkg_cc_proto",
@@ -27,11 +27,11 @@ envoy_cc_library(
     hdrs = ["udp_proxy_filter.h"],
     deps = [
         ":hash_policy_lib",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/network:socket_lib",
         "//source/common/network:socket_option_factory_lib",
@@ -47,8 +47,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":udp_proxy_filter_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "@envoy_api//envoy/extensions/filters/udp/udp_proxy/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/filters/udp/udp_proxy/config.cc b/source/extensions/filters/udp/udp_proxy/config.cc
index 43324d8ced9a1..aa46a14114e10 100644
--- a/source/extensions/filters/udp/udp_proxy/config.cc
+++ b/source/extensions/filters/udp/udp_proxy/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/udp/udp_proxy/config.h"
+#include "source/extensions/filters/udp/udp_proxy/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/config.h b/source/extensions/filters/udp/udp_proxy/config.h
index 36dc5e2b75503..ef3ab1074e4bc 100644
--- a/source/extensions/filters/udp/udp_proxy/config.h
+++ b/source/extensions/filters/udp/udp_proxy/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
+#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc
index 5f6551c521e41..4e6a0a6897d28 100644
--- a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc
+++ b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h"
+#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h
index faae9e3ed4672..9cb9fb3e486ee 100644
--- a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h
+++ b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h"
 #include "envoy/udp/hash_policy.h"
 
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc
index 9d21d784ba575..4ee826eeb3f77 100644
--- a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc
+++ b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
+#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
 
 #include "envoy/network/listener.h"
 
-#include "common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_factory.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h
index 28f037882cbc2..fd20e7025dd2f 100644
--- a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h
+++ b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h
@@ -6,14 +6,13 @@
 #include "envoy/network/filter.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/socket_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/load_balancer_impl.h"
-
-#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h"
 
 #include "absl/container/flat_hash_set.h"
 
diff --git a/source/extensions/grpc_credentials/aws_iam/BUILD b/source/extensions/grpc_credentials/aws_iam/BUILD
index fa66cc2353992..ac63c34674e6e 100644
--- a/source/extensions/grpc_credentials/aws_iam/BUILD
+++ b/source/extensions/grpc_credentials/aws_iam/BUILD
@@ -16,8 +16,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     external_deps = ["grpc"],
     deps = [
-        "//include/envoy/grpc:google_grpc_creds_interface",
-        "//include/envoy/registry",
+        "//envoy/grpc:google_grpc_creds_interface",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/grpc:google_grpc_creds_lib",
diff --git a/source/extensions/grpc_credentials/aws_iam/config.cc b/source/extensions/grpc_credentials/aws_iam/config.cc
index 454e6265204e3..c70140a437cbf 100644
--- a/source/extensions/grpc_credentials/aws_iam/config.cc
+++ b/source/extensions/grpc_credentials/aws_iam/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/grpc_credentials/aws_iam/config.h"
+#include "source/extensions/grpc_credentials/aws_iam/config.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/grpc_service.pb.h"
@@ -7,15 +7,14 @@
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/grpc/google_grpc_creds_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-
-#include "extensions/common/aws/credentials_provider_impl.h"
-#include "extensions/common/aws/region_provider_impl.h"
-#include "extensions/common/aws/signer_impl.h"
-#include "extensions/common/aws/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/extensions/common/aws/credentials_provider_impl.h"
+#include "source/extensions/common/aws/region_provider_impl.h"
+#include "source/extensions/common/aws/signer_impl.h"
+#include "source/extensions/common/aws/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/grpc_credentials/aws_iam/config.h b/source/extensions/grpc_credentials/aws_iam/config.h
index 819a45598ac36..f07ae3fe00296 100644
--- a/source/extensions/grpc_credentials/aws_iam/config.h
+++ b/source/extensions/grpc_credentials/aws_iam/config.h
@@ -5,9 +5,8 @@
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/http/header_map.h"
 
-#include "common/http/message_impl.h"
-
-#include "extensions/common/aws/signer.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/common/aws/signer.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/grpc_credentials/example/BUILD b/source/extensions/grpc_credentials/example/BUILD
index 582844968ee51..01c0e4e8ea23a 100644
--- a/source/extensions/grpc_credentials/example/BUILD
+++ b/source/extensions/grpc_credentials/example/BUILD
@@ -22,8 +22,8 @@ envoy_cc_library(
         "//test/extensions:__subpackages__",
     ],
     deps = [
-        "//include/envoy/grpc:google_grpc_creds_interface",
-        "//include/envoy/registry",
+        "//envoy/grpc:google_grpc_creds_interface",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/grpc:google_grpc_creds_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/source/extensions/grpc_credentials/example/config.cc b/source/extensions/grpc_credentials/example/config.cc
index 8ce8c7891d24d..2645fb07deea3 100644
--- a/source/extensions/grpc_credentials/example/config.cc
+++ b/source/extensions/grpc_credentials/example/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/grpc_credentials/example/config.h"
+#include "source/extensions/grpc_credentials/example/config.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/registry/registry.h"
 
-#include "common/grpc/google_grpc_creds_impl.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/grpc_credentials/file_based_metadata/BUILD b/source/extensions/grpc_credentials/file_based_metadata/BUILD
index 5ffe31ce30b08..ffaa5554b5ce3 100644
--- a/source/extensions/grpc_credentials/file_based_metadata/BUILD
+++ b/source/extensions/grpc_credentials/file_based_metadata/BUILD
@@ -16,8 +16,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     external_deps = ["grpc"],
     deps = [
-        "//include/envoy/grpc:google_grpc_creds_interface",
-        "//include/envoy/registry",
+        "//envoy/grpc:google_grpc_creds_interface",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "//source/common/grpc:common_lib",
         "//source/common/grpc:google_grpc_creds_lib",
diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.cc b/source/extensions/grpc_credentials/file_based_metadata/config.cc
index c05f7cc6d611b..81fa4aa783435 100644
--- a/source/extensions/grpc_credentials/file_based_metadata/config.cc
+++ b/source/extensions/grpc_credentials/file_based_metadata/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/grpc_credentials/file_based_metadata/config.h"
+#include "source/extensions/grpc_credentials/file_based_metadata/config.h"
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h"
@@ -6,11 +6,11 @@
 #include "envoy/grpc/google_grpc_creds.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/datasource.h"
-#include "common/config/utility.h"
-#include "common/grpc/google_grpc_creds_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.h b/source/extensions/grpc_credentials/file_based_metadata/config.h
index 7b844e356500b..2ff1c54a161f8 100644
--- a/source/extensions/grpc_credentials/file_based_metadata/config.h
+++ b/source/extensions/grpc_credentials/file_based_metadata/config.h
@@ -4,7 +4,7 @@
 #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h"
 #include "envoy/grpc/google_grpc_creds.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/grpc_credentials/well_known_names.h b/source/extensions/grpc_credentials/well_known_names.h
new file mode 100644
index 0000000000000..efdbd48d2d729
--- /dev/null
+++ b/source/extensions/grpc_credentials/well_known_names.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace GrpcCredentials {
+
+/**
+ * Well-known gRPC Credentials names.
+ * NOTE: New gRPC Credentials should use the well known name: envoy.grpc_credentials.name.
+ */
+class GrpcCredentialsNameValues {
+public:
+  // Access Token Example.
+  const std::string AccessTokenExample = "envoy.grpc_credentials.access_token_example";
+  // File Based Metadata credentials
+  const std::string FileBasedMetadata = "envoy.grpc_credentials.file_based_metadata";
+  // AWS IAM
+  const std::string AwsIam = "envoy.grpc_credentials.aws_iam";
+};
+
+using GrpcCredentialsNames = ConstSingleton<GrpcCredentialsNameValues>;
+
+} // namespace GrpcCredentials
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/health_checkers/redis/BUILD b/source/extensions/health_checkers/redis/BUILD
index 58d1ad4812a3f..0fd615b9d044e 100644
--- a/source/extensions/health_checkers/redis/BUILD
+++ b/source/extensions/health_checkers/redis/BUILD
@@ -34,8 +34,8 @@ envoy_cc_extension(
     deps = [
         ":redis",
         ":utility",
-        "//include/envoy/registry",
-        "//include/envoy/server:health_checker_config_interface",
+        "//envoy/registry",
+        "//envoy/server:health_checker_config_interface",
         "//source/common/common:assert_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto",
diff --git a/source/extensions/health_checkers/redis/config.cc b/source/extensions/health_checkers/redis/config.cc
index b36a2b6f0118b..880c2b34de770 100644
--- a/source/extensions/health_checkers/redis/config.cc
+++ b/source/extensions/health_checkers/redis/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/health_checkers/redis/config.h"
+#include "source/extensions/health_checkers/redis/config.h"
 
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/health_checkers/redis/utility.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/health_checkers/redis/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/health_checkers/redis/config.h b/source/extensions/health_checkers/redis/config.h
index 919bd158be0b6..ea8820e87b354 100644
--- a/source/extensions/health_checkers/redis/config.h
+++ b/source/extensions/health_checkers/redis/config.h
@@ -7,7 +7,7 @@
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h"
 #include "envoy/server/health_checker_config.h"
 
-#include "extensions/health_checkers/redis/redis.h"
+#include "source/extensions/health_checkers/redis/redis.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/health_checkers/redis/redis.cc b/source/extensions/health_checkers/redis/redis.cc
index 6d188c5e2b06b..29241d2cf1779 100644
--- a/source/extensions/health_checkers/redis/redis.cc
+++ b/source/extensions/health_checkers/redis/redis.cc
@@ -1,4 +1,4 @@
-#include "extensions/health_checkers/redis/redis.h"
+#include "source/extensions/health_checkers/redis/redis.h"
 
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/data/core/v3/health_check_event.pb.h"
diff --git a/source/extensions/health_checkers/redis/redis.h b/source/extensions/health_checkers/redis/redis.h
index 1639e98e9c140..9f7be5bf197c4 100644
--- a/source/extensions/health_checkers/redis/redis.h
+++ b/source/extensions/health_checkers/redis/redis.h
@@ -9,11 +9,10 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.h"
 
-#include "common/upstream/health_checker_base_impl.h"
-
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/redis_proxy/config.h"
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/common/upstream/health_checker_base_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/redis_proxy/config.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/health_checkers/redis/utility.h b/source/extensions/health_checkers/redis/utility.h
index 25bfd98873092..b9c5de5848c2a 100644
--- a/source/extensions/health_checkers/redis/utility.h
+++ b/source/extensions/health_checkers/redis/utility.h
@@ -4,9 +4,9 @@
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.h"
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/health_checkers/well_known_names.h b/source/extensions/health_checkers/well_known_names.h
new file mode 100644
index 0000000000000..5cec910f45e42
--- /dev/null
+++ b/source/extensions/health_checkers/well_known_names.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace HealthCheckers {
+
+/**
+ * Well-known health checker names.
+ * NOTE: New health checkers should use the well known name: envoy.health_checkers.name.
+ */
+class HealthCheckerNameValues {
+public:
+  // Redis health checker.
+  const std::string RedisHealthChecker = "envoy.health_checkers.redis";
+};
+
+using HealthCheckerNames = ConstSingleton<HealthCheckerNameValues>;
+
+} // namespace HealthCheckers
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/http/header_formatters/preserve_case/BUILD b/source/extensions/http/header_formatters/preserve_case/BUILD
index fffdd69fbf5e5..5233d48e41147 100644
--- a/source/extensions/http/header_formatters/preserve_case/BUILD
+++ b/source/extensions/http/header_formatters/preserve_case/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     srcs = ["preserve_case_formatter.cc"],
     hdrs = ["preserve_case_formatter.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "@envoy_api//envoy/extensions/http/header_formatters/preserve_case/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc
index 38d72824a9833..a27b35478f1e9 100644
--- a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc
+++ b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc
@@ -1,4 +1,4 @@
-#include "extensions/http/header_formatters/preserve_case/preserve_case_formatter.h"
+#include "source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h"
 
 #include "envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.h"
 #include "envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.validate.h"
diff --git a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h
index ca78e0a5e2607..d2e3f7da00ff7 100644
--- a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h
+++ b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h
@@ -2,7 +2,7 @@
 
 #include "envoy/http/header_formatter.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/custom_header/BUILD b/source/extensions/http/original_ip_detection/custom_header/BUILD
index 53c86cdc4afbb..1792aec58707a 100644
--- a/source/extensions/http/original_ip_detection/custom_header/BUILD
+++ b/source/extensions/http/original_ip_detection/custom_header/BUILD
@@ -16,7 +16,7 @@ envoy_cc_library(
     # This extension is used from core tests.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:original_ip_detection_interface",
+        "//envoy/http:original_ip_detection_interface",
         "//source/common/network:utility_lib",
         "@envoy_api//envoy/extensions/http/original_ip_detection/custom_header/v3:pkg_cc_proto",
     ],
@@ -30,8 +30,8 @@ envoy_cc_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":custom_header_lib",
-        "//include/envoy/http:original_ip_detection_interface",
-        "//include/envoy/registry",
+        "//envoy/http:original_ip_detection_interface",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/extensions/http/original_ip_detection/custom_header/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/http/original_ip_detection/custom_header/config.cc b/source/extensions/http/original_ip_detection/custom_header/config.cc
index 9dc57e1fefa3d..12a6feef49ef4 100644
--- a/source/extensions/http/original_ip_detection/custom_header/config.cc
+++ b/source/extensions/http/original_ip_detection/custom_header/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/http/original_ip_detection/custom_header/config.h"
+#include "source/extensions/http/original_ip_detection/custom_header/config.h"
 
 #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h"
 #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.validate.h"
 #include "envoy/http/original_ip_detection.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/http/original_ip_detection/custom_header/custom_header.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/custom_header/config.h b/source/extensions/http/original_ip_detection/custom_header/config.h
index ca09b267c5d21..4c460c3a1caaf 100644
--- a/source/extensions/http/original_ip_detection/custom_header/config.h
+++ b/source/extensions/http/original_ip_detection/custom_header/config.h
@@ -4,7 +4,7 @@
 #include "envoy/http/original_ip_detection.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/custom_header/custom_header.cc b/source/extensions/http/original_ip_detection/custom_header/custom_header.cc
index 9e7d9d7e8bcb8..b750651119817 100644
--- a/source/extensions/http/original_ip_detection/custom_header/custom_header.cc
+++ b/source/extensions/http/original_ip_detection/custom_header/custom_header.cc
@@ -1,6 +1,6 @@
-#include "extensions/http/original_ip_detection/custom_header/custom_header.h"
+#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/xff/BUILD b/source/extensions/http/original_ip_detection/xff/BUILD
index 546ba74421664..a3519bca646a1 100644
--- a/source/extensions/http/original_ip_detection/xff/BUILD
+++ b/source/extensions/http/original_ip_detection/xff/BUILD
@@ -16,7 +16,7 @@ envoy_cc_library(
     # This extension is core code.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:original_ip_detection_interface",
+        "//envoy/http:original_ip_detection_interface",
         "//source/common/http:utility_lib",
         "@envoy_api//envoy/extensions/http/original_ip_detection/xff/v3:pkg_cc_proto",
     ],
@@ -30,8 +30,8 @@ envoy_cc_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":xff_lib",
-        "//include/envoy/http:original_ip_detection_interface",
-        "//include/envoy/registry",
+        "//envoy/http:original_ip_detection_interface",
+        "//envoy/registry",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/extensions/http/original_ip_detection/xff/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/http/original_ip_detection/xff/config.cc b/source/extensions/http/original_ip_detection/xff/config.cc
index 449db7f4c0f75..0f657239e3e8b 100644
--- a/source/extensions/http/original_ip_detection/xff/config.cc
+++ b/source/extensions/http/original_ip_detection/xff/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/http/original_ip_detection/xff/config.h"
+#include "source/extensions/http/original_ip_detection/xff/config.h"
 
 #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h"
 #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.validate.h"
 #include "envoy/http/original_ip_detection.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/http/original_ip_detection/xff/xff.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/http/original_ip_detection/xff/xff.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/xff/config.h b/source/extensions/http/original_ip_detection/xff/config.h
index 5a3cc31e52af7..ce04edbbc0d43 100644
--- a/source/extensions/http/original_ip_detection/xff/config.h
+++ b/source/extensions/http/original_ip_detection/xff/config.h
@@ -4,7 +4,7 @@
 #include "envoy/http/original_ip_detection.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/http/original_ip_detection/xff/xff.cc b/source/extensions/http/original_ip_detection/xff/xff.cc
index 70f142bb52dfc..7dd6740d543b4 100644
--- a/source/extensions/http/original_ip_detection/xff/xff.cc
+++ b/source/extensions/http/original_ip_detection/xff/xff.cc
@@ -1,6 +1,6 @@
-#include "extensions/http/original_ip_detection/xff/xff.h"
+#include "source/extensions/http/original_ip_detection/xff/xff.h"
 
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/internal_redirect/allow_listed_routes/BUILD b/source/extensions/internal_redirect/allow_listed_routes/BUILD
index 2d39fb0cc0d93..bb6a1f6091dbd 100644
--- a/source/extensions/internal_redirect/allow_listed_routes/BUILD
+++ b/source/extensions/internal_redirect/allow_listed_routes/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     name = "allow_listed_routes_lib",
     hdrs = ["allow_listed_routes.h"],
     deps = [
-        "//include/envoy/router:internal_redirect_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/router:internal_redirect_interface",
+        "//envoy/stream_info:filter_state_interface",
         "@envoy_api//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg_cc_proto",
     ],
 )
@@ -29,8 +29,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":allow_listed_routes_lib",
-        "//include/envoy/registry",
-        "//include/envoy/router:internal_redirect_interface",
+        "//envoy/registry",
+        "//envoy/router:internal_redirect_interface",
         "@envoy_api//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/internal_redirect/allow_listed_routes/config.cc b/source/extensions/internal_redirect/allow_listed_routes/config.cc
index 55c2d5af81cec..75d517cd9c53b 100644
--- a/source/extensions/internal_redirect/allow_listed_routes/config.cc
+++ b/source/extensions/internal_redirect/allow_listed_routes/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/internal_redirect/allow_listed_routes/config.h"
+#include "source/extensions/internal_redirect/allow_listed_routes/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/router/internal_redirect.h"
diff --git a/source/extensions/internal_redirect/allow_listed_routes/config.h b/source/extensions/internal_redirect/allow_listed_routes/config.h
index 5f5f1d391df75..8f4a5b1515385 100644
--- a/source/extensions/internal_redirect/allow_listed_routes/config.h
+++ b/source/extensions/internal_redirect/allow_listed_routes/config.h
@@ -4,10 +4,9 @@
 #include "envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.validate.h"
 #include "envoy/router/internal_redirect.h"
 
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/internal_redirect/allow_listed_routes/allow_listed_routes.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/internal_redirect/allow_listed_routes/allow_listed_routes.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/internal_redirect/previous_routes/BUILD b/source/extensions/internal_redirect/previous_routes/BUILD
index da43ff408995e..969d1ac9a13b6 100644
--- a/source/extensions/internal_redirect/previous_routes/BUILD
+++ b/source/extensions/internal_redirect/previous_routes/BUILD
@@ -14,8 +14,8 @@ envoy_cc_library(
     srcs = ["previous_routes.cc"],
     hdrs = ["previous_routes.h"],
     deps = [
-        "//include/envoy/router:internal_redirect_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/router:internal_redirect_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -29,8 +29,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":previous_routes_lib",
-        "//include/envoy/registry",
-        "//include/envoy/router:internal_redirect_interface",
+        "//envoy/registry",
+        "//envoy/router:internal_redirect_interface",
         "@envoy_api//envoy/extensions/internal_redirect/previous_routes/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/internal_redirect/previous_routes/config.cc b/source/extensions/internal_redirect/previous_routes/config.cc
index d5d4b67c491ec..5070b9379aaef 100644
--- a/source/extensions/internal_redirect/previous_routes/config.cc
+++ b/source/extensions/internal_redirect/previous_routes/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/internal_redirect/previous_routes/config.h"
+#include "source/extensions/internal_redirect/previous_routes/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/router/internal_redirect.h"
diff --git a/source/extensions/internal_redirect/previous_routes/config.h b/source/extensions/internal_redirect/previous_routes/config.h
index 1fa00bb19a3ae..54f947b02ee6d 100644
--- a/source/extensions/internal_redirect/previous_routes/config.h
+++ b/source/extensions/internal_redirect/previous_routes/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.validate.h"
 #include "envoy/router/internal_redirect.h"
 
-#include "extensions/internal_redirect/previous_routes/previous_routes.h"
+#include "source/extensions/internal_redirect/previous_routes/previous_routes.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/internal_redirect/previous_routes/previous_routes.cc b/source/extensions/internal_redirect/previous_routes/previous_routes.cc
index a29187e29d43c..5194255b5d49c 100644
--- a/source/extensions/internal_redirect/previous_routes/previous_routes.cc
+++ b/source/extensions/internal_redirect/previous_routes/previous_routes.cc
@@ -1,4 +1,4 @@
-#include "extensions/internal_redirect/previous_routes/previous_routes.h"
+#include "source/extensions/internal_redirect/previous_routes/previous_routes.h"
 
 #include "envoy/router/internal_redirect.h"
 #include "envoy/stream_info/filter_state.h"
diff --git a/source/extensions/internal_redirect/safe_cross_scheme/BUILD b/source/extensions/internal_redirect/safe_cross_scheme/BUILD
index 690fa27f64abc..bc464c310b148 100644
--- a/source/extensions/internal_redirect/safe_cross_scheme/BUILD
+++ b/source/extensions/internal_redirect/safe_cross_scheme/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     name = "safe_cross_scheme_lib",
     hdrs = ["safe_cross_scheme.h"],
     deps = [
-        "//include/envoy/router:internal_redirect_interface",
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/router:internal_redirect_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -28,8 +28,8 @@ envoy_cc_extension(
     ],
     deps = [
         ":safe_cross_scheme_lib",
-        "//include/envoy/registry",
-        "//include/envoy/router:internal_redirect_interface",
+        "//envoy/registry",
+        "//envoy/router:internal_redirect_interface",
         "@envoy_api//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/internal_redirect/safe_cross_scheme/config.cc b/source/extensions/internal_redirect/safe_cross_scheme/config.cc
index 43b7664fd7ffc..b3e2d16cfba70 100644
--- a/source/extensions/internal_redirect/safe_cross_scheme/config.cc
+++ b/source/extensions/internal_redirect/safe_cross_scheme/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/internal_redirect/safe_cross_scheme/config.h"
+#include "source/extensions/internal_redirect/safe_cross_scheme/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/router/internal_redirect.h"
diff --git a/source/extensions/internal_redirect/safe_cross_scheme/config.h b/source/extensions/internal_redirect/safe_cross_scheme/config.h
index 63171db70e4f4..36c8385cbce8c 100644
--- a/source/extensions/internal_redirect/safe_cross_scheme/config.h
+++ b/source/extensions/internal_redirect/safe_cross_scheme/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.h"
 #include "envoy/router/internal_redirect.h"
 
-#include "extensions/internal_redirect/safe_cross_scheme/safe_cross_scheme.h"
+#include "source/extensions/internal_redirect/safe_cross_scheme/safe_cross_scheme.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/internal_redirect/well_known_names.h b/source/extensions/internal_redirect/well_known_names.h
new file mode 100644
index 0000000000000..764d70799b39a
--- /dev/null
+++ b/source/extensions/internal_redirect/well_known_names.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace InternalRedirect {
+
+/**
+ * Well-known internal redirect predicate names.
+ */
+class InternalRedirectPredicatesNameValues {
+public:
+  const std::string AllowListedRoutesPredicate =
+      "envoy.internal_redirect_predicates.allow_listed_routes";
+  const std::string PreviousRoutesPredicate = "envoy.internal_redirect_predicates.previous_routes";
+  const std::string SafeCrossSchemePredicate =
+      "envoy.internal_redirect_predicates.safe_cross_scheme";
+};
+
+using InternalRedirectPredicateValues = ConstSingleton<InternalRedirectPredicatesNameValues>;
+
+} // namespace InternalRedirect
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/io_socket/user_space/BUILD b/source/extensions/io_socket/user_space/BUILD
index c430f95989417..334fe51a916e4 100644
--- a/source/extensions/io_socket/user_space/BUILD
+++ b/source/extensions/io_socket/user_space/BUILD
@@ -36,7 +36,7 @@ envoy_cc_library(
     ],
     deps = [
         ":io_handle_lib",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
     ],
 )
 
diff --git a/source/extensions/io_socket/user_space/file_event_impl.cc b/source/extensions/io_socket/user_space/file_event_impl.cc
index 6f116d809bcb8..dcb89c659529d 100644
--- a/source/extensions/io_socket/user_space/file_event_impl.cc
+++ b/source/extensions/io_socket/user_space/file_event_impl.cc
@@ -1,8 +1,7 @@
-#include "extensions/io_socket/user_space/file_event_impl.h"
+#include "source/extensions/io_socket/user_space/file_event_impl.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/io_socket/user_space/io_handle.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/io_socket/user_space/io_handle.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/io_socket/user_space/file_event_impl.h b/source/extensions/io_socket/user_space/file_event_impl.h
index 870339aacf8a1..f02a80689e571 100644
--- a/source/extensions/io_socket/user_space/file_event_impl.h
+++ b/source/extensions/io_socket/user_space/file_event_impl.h
@@ -5,9 +5,8 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/file_event.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/io_socket/user_space/io_handle.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/io_socket/user_space/io_handle.h"
 
 namespace Envoy {
 
diff --git a/source/extensions/io_socket/user_space/io_handle_impl.cc b/source/extensions/io_socket/user_space/io_handle_impl.cc
index 4c487cf5fa9e6..bbdb37e3b09ef 100644
--- a/source/extensions/io_socket/user_space/io_handle_impl.cc
+++ b/source/extensions/io_socket/user_space/io_handle_impl.cc
@@ -1,14 +1,13 @@
-#include "extensions/io_socket/user_space/io_handle_impl.h"
+#include "source/extensions/io_socket/user_space/io_handle_impl.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/platform.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/io_socket/user_space/file_event_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/io_socket/user_space/file_event_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/io_socket/user_space/io_handle_impl.h b/source/extensions/io_socket/user_space/io_handle_impl.h
index d0ceab1d5cf84..71d3248d47223 100644
--- a/source/extensions/io_socket/user_space/io_handle_impl.h
+++ b/source/extensions/io_socket/user_space/io_handle_impl.h
@@ -9,12 +9,11 @@
 #include "envoy/network/address.h"
 #include "envoy/network/io_handle.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/logger.h"
-#include "common/network/io_socket_error_impl.h"
-
-#include "extensions/io_socket/user_space/file_event_impl.h"
-#include "extensions/io_socket/user_space/io_handle.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/extensions/io_socket/user_space/file_event_impl.h"
+#include "source/extensions/io_socket/user_space/io_handle.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/matching/common_inputs/environment_variable/BUILD b/source/extensions/matching/common_inputs/environment_variable/BUILD
index 2dacd62538db4..52a146857ad8d 100644
--- a/source/extensions/matching/common_inputs/environment_variable/BUILD
+++ b/source/extensions/matching/common_inputs/environment_variable/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     name = "input_lib",
     hdrs = ["input.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
+        "//envoy/matcher:matcher_interface",
         "//source/common/common:hash_lib",
     ],
 )
@@ -24,9 +24,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":input_lib",
-        "//include/envoy/matcher:matcher_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/matcher:matcher_interface",
+        "//envoy/registry",
+        "//envoy/server:factory_context_interface",
         "@envoy_api//envoy/extensions/matching/common_inputs/environment_variable/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/matching/common_inputs/environment_variable/config.cc b/source/extensions/matching/common_inputs/environment_variable/config.cc
index a7716e0b0748d..114ebc9e60306 100644
--- a/source/extensions/matching/common_inputs/environment_variable/config.cc
+++ b/source/extensions/matching/common_inputs/environment_variable/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/matching/common_inputs/environment_variable/config.h"
+#include "source/extensions/matching/common_inputs/environment_variable/config.h"
 
 #include <memory>
 
diff --git a/source/extensions/matching/common_inputs/environment_variable/config.h b/source/extensions/matching/common_inputs/environment_variable/config.h
index a583785a31011..b4e66cace2271 100644
--- a/source/extensions/matching/common_inputs/environment_variable/config.h
+++ b/source/extensions/matching/common_inputs/environment_variable/config.h
@@ -5,9 +5,8 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/matching/common_inputs/environment_variable/input.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/matching/common_inputs/environment_variable/input.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/matching/input_matchers/consistent_hashing/BUILD b/source/extensions/matching/input_matchers/consistent_hashing/BUILD
index 0e72af550db3f..a5fc295998e47 100644
--- a/source/extensions/matching/input_matchers/consistent_hashing/BUILD
+++ b/source/extensions/matching/input_matchers/consistent_hashing/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     name = "consistent_hashing_lib",
     hdrs = ["matcher.h"],
     deps = [
-        "//include/envoy/matcher:matcher_interface",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/matcher:matcher_interface",
+        "//envoy/upstream:retry_interface",
         "//source/common/common:hash_lib",
     ],
 )
@@ -25,9 +25,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":consistent_hashing_lib",
-        "//include/envoy/matcher:matcher_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:factory_context_interface",
+        "//envoy/matcher:matcher_interface",
+        "//envoy/registry",
+        "//envoy/server:factory_context_interface",
         "@envoy_api//envoy/extensions/matching/input_matchers/consistent_hashing/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/matching/input_matchers/consistent_hashing/config.cc b/source/extensions/matching/input_matchers/consistent_hashing/config.cc
index 6b9e2e7f7aca6..b493bcec88683 100644
--- a/source/extensions/matching/input_matchers/consistent_hashing/config.cc
+++ b/source/extensions/matching/input_matchers/consistent_hashing/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/matching/input_matchers/consistent_hashing/config.h"
+#include "source/extensions/matching/input_matchers/consistent_hashing/config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/matching/input_matchers/consistent_hashing/config.h b/source/extensions/matching/input_matchers/consistent_hashing/config.h
index ec0f666491902..eb410b0f5b609 100644
--- a/source/extensions/matching/input_matchers/consistent_hashing/config.h
+++ b/source/extensions/matching/input_matchers/consistent_hashing/config.h
@@ -5,9 +5,8 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/matching/input_matchers/consistent_hashing/matcher.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/matching/input_matchers/consistent_hashing/matcher.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/matching/input_matchers/consistent_hashing/matcher.h b/source/extensions/matching/input_matchers/consistent_hashing/matcher.h
index d55e795f3b657..4ef0f6eaa20db 100644
--- a/source/extensions/matching/input_matchers/consistent_hashing/matcher.h
+++ b/source/extensions/matching/input_matchers/consistent_hashing/matcher.h
@@ -2,7 +2,7 @@
 
 #include "envoy/matcher/matcher.h"
 
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/rate_limit_descriptors/expr/BUILD b/source/extensions/rate_limit_descriptors/expr/BUILD
index a1f4dc89d881c..35c818a82cd4a 100644
--- a/source/extensions/rate_limit_descriptors/expr/BUILD
+++ b/source/extensions/rate_limit_descriptors/expr/BUILD
@@ -19,8 +19,8 @@ envoy_cc_extension(
         ],
     }),
     deps = [
-        "//include/envoy/ratelimit:ratelimit_interface",
-        "//include/envoy/registry",
+        "//envoy/ratelimit:ratelimit_interface",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/filters/common/expr:evaluator_lib",
         "@envoy_api//envoy/extensions/rate_limit_descriptors/expr/v3:pkg_cc_proto",
diff --git a/source/extensions/rate_limit_descriptors/expr/config.cc b/source/extensions/rate_limit_descriptors/expr/config.cc
index 57aeda76b92ef..e780574ec813f 100644
--- a/source/extensions/rate_limit_descriptors/expr/config.cc
+++ b/source/extensions/rate_limit_descriptors/expr/config.cc
@@ -1,9 +1,9 @@
-#include "extensions/rate_limit_descriptors/expr/config.h"
+#include "source/extensions/rate_limit_descriptors/expr/config.h"
 
 #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.h"
 #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #if defined(USE_CEL_PARSER)
 #include "parser/parser.h"
diff --git a/source/extensions/rate_limit_descriptors/expr/config.h b/source/extensions/rate_limit_descriptors/expr/config.h
index 6d3967bb82856..da50da1ab14bd 100644
--- a/source/extensions/rate_limit_descriptors/expr/config.h
+++ b/source/extensions/rate_limit_descriptors/expr/config.h
@@ -3,7 +3,7 @@
 #include "envoy/ratelimit/ratelimit.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/request_id/uuid/BUILD b/source/extensions/request_id/uuid/BUILD
index feb49f7a39014..b358c1e32fc29 100644
--- a/source/extensions/request_id/uuid/BUILD
+++ b/source/extensions/request_id/uuid/BUILD
@@ -18,8 +18,8 @@ envoy_cc_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/server:request_id_extension_config_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/server:request_id_extension_config_interface",
         "//source/common/common:random_generator_lib",
         "@envoy_api//envoy/extensions/request_id/uuid/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/request_id/uuid/config.cc b/source/extensions/request_id/uuid/config.cc
index dbddb4c8422bd..9423d8a275649 100644
--- a/source/extensions/request_id/uuid/config.cc
+++ b/source/extensions/request_id/uuid/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/request_id/uuid/config.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "envoy/http/header_map.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/common/random_generator.h"
-#include "common/common/utility.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/common/BUILD b/source/extensions/resource_monitors/common/BUILD
index a17f10b5c3780..0f8e19c757df1 100644
--- a/source/extensions/resource_monitors/common/BUILD
+++ b/source/extensions/resource_monitors/common/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     # This resource monitoring library is considered core code.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/server:resource_monitor_config_interface",
+        "//envoy/server:resource_monitor_config_interface",
         "//source/common/protobuf:utility_lib",
     ],
 )
diff --git a/source/extensions/resource_monitors/common/factory_base.h b/source/extensions/resource_monitors/common/factory_base.h
index 403200a47432b..13bd2e86aa156 100644
--- a/source/extensions/resource_monitors/common/factory_base.h
+++ b/source/extensions/resource_monitors/common/factory_base.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/resource_monitor_config.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/fixed_heap/BUILD b/source/extensions/resource_monitors/fixed_heap/BUILD
index f2be46b297394..108be4816bbe7 100644
--- a/source/extensions/resource_monitors/fixed_heap/BUILD
+++ b/source/extensions/resource_monitors/fixed_heap/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["fixed_heap_monitor.cc"],
     hdrs = ["fixed_heap_monitor.h"],
     deps = [
-        "//include/envoy/server:resource_monitor_config_interface",
+        "//envoy/server:resource_monitor_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/memory:stats_lib",
         "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto",
@@ -27,7 +27,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":fixed_heap_monitor",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/extensions/resource_monitors/common:factory_base_lib",
         "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto",
diff --git a/source/extensions/resource_monitors/fixed_heap/config.cc b/source/extensions/resource_monitors/fixed_heap/config.cc
index df498656e2187..c622892e5d939 100644
--- a/source/extensions/resource_monitors/fixed_heap/config.cc
+++ b/source/extensions/resource_monitors/fixed_heap/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/resource_monitors/fixed_heap/config.h"
+#include "source/extensions/resource_monitors/fixed_heap/config.h"
 
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h"
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/fixed_heap/config.h b/source/extensions/resource_monitors/fixed_heap/config.h
index 98d3858a40e7b..06eb587a50ea2 100644
--- a/source/extensions/resource_monitors/fixed_heap/config.h
+++ b/source/extensions/resource_monitors/fixed_heap/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h"
 #include "envoy/server/resource_monitor_config.h"
 
-#include "extensions/resource_monitors/common/factory_base.h"
+#include "source/extensions/resource_monitors/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc
index b97227e35bea1..106c44620b68d 100644
--- a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc
+++ b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc
@@ -1,9 +1,9 @@
-#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
+#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
 
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h"
 
-#include "common/common/assert.h"
-#include "common/memory/stats.h"
+#include "source/common/common/assert.h"
+#include "source/common/memory/stats.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/injected_resource/BUILD b/source/extensions/resource_monitors/injected_resource/BUILD
index 6bc0e5d4d82e7..5f63612599414 100644
--- a/source/extensions/resource_monitors/injected_resource/BUILD
+++ b/source/extensions/resource_monitors/injected_resource/BUILD
@@ -14,9 +14,9 @@ envoy_cc_library(
     srcs = ["injected_resource_monitor.cc"],
     hdrs = ["injected_resource_monitor.h"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/server:resource_monitor_config_interface",
+        "//envoy/api:api_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/server:resource_monitor_config_interface",
         "//source/common/common:assert_lib",
         "@envoy_api//envoy/extensions/resource_monitors/injected_resource/v3:pkg_cc_proto",
     ],
@@ -28,7 +28,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":injected_resource_monitor",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/extensions/resource_monitors/common:factory_base_lib",
         "@envoy_api//envoy/extensions/resource_monitors/injected_resource/v3:pkg_cc_proto",
diff --git a/source/extensions/resource_monitors/injected_resource/config.cc b/source/extensions/resource_monitors/injected_resource/config.cc
index 2db6abd8b8a9a..df579888074c4 100644
--- a/source/extensions/resource_monitors/injected_resource/config.cc
+++ b/source/extensions/resource_monitors/injected_resource/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/resource_monitors/injected_resource/config.h"
+#include "source/extensions/resource_monitors/injected_resource/config.h"
 
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h"
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/injected_resource/config.h b/source/extensions/resource_monitors/injected_resource/config.h
index 87e54c6b2c294..a9336b988d9f5 100644
--- a/source/extensions/resource_monitors/injected_resource/config.h
+++ b/source/extensions/resource_monitors/injected_resource/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h"
 #include "envoy/server/resource_monitor_config.h"
 
-#include "extensions/resource_monitors/common/factory_base.h"
+#include "source/extensions/resource_monitors/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc
index 46277bff65529..6aa0aeb76858d 100644
--- a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc
+++ b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc
@@ -1,8 +1,8 @@
-#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
+#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
 
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/numbers.h"
 
diff --git a/source/extensions/resource_monitors/well_known_names.h b/source/extensions/resource_monitors/well_known_names.h
new file mode 100644
index 0000000000000..7d43aa98671ab
--- /dev/null
+++ b/source/extensions/resource_monitors/well_known_names.h
@@ -0,0 +1,27 @@
+#pragma once
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace ResourceMonitors {
+
+/**
+ * Well-known resource monitor names.
+ * NOTE: New resource monitors should use the well known name: envoy.resource_monitors.name.
+ */
+class ResourceMonitorNameValues {
+public:
+  // Heap monitor with statically configured max.
+  const std::string FixedHeap = "envoy.resource_monitors.fixed_heap";
+
+  // File-based injected resource monitor.
+  const std::string InjectedResource = "envoy.resource_monitors.injected_resource";
+};
+
+using ResourceMonitorNames = ConstSingleton<ResourceMonitorNameValues>;
+
+} // namespace ResourceMonitors
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/retry/host/omit_canary_hosts/BUILD b/source/extensions/retry/host/omit_canary_hosts/BUILD
index 8e3f446d0848b..6cf826b484f4b 100644
--- a/source/extensions/retry/host/omit_canary_hosts/BUILD
+++ b/source/extensions/retry/host/omit_canary_hosts/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     name = "omit_canary_hosts_predicate_lib",
     hdrs = ["omit_canary_hosts.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
     ],
 )
 
@@ -23,8 +23,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":omit_canary_hosts_predicate_lib",
-        "//include/envoy/registry",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/registry",
+        "//envoy/upstream:retry_interface",
         "@envoy_api//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/retry/host/omit_canary_hosts/config.cc b/source/extensions/retry/host/omit_canary_hosts/config.cc
index 495790ecc7311..24a965d65bb65 100644
--- a/source/extensions/retry/host/omit_canary_hosts/config.cc
+++ b/source/extensions/retry/host/omit_canary_hosts/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/retry/host/omit_canary_hosts/config.h"
+#include "source/extensions/retry/host/omit_canary_hosts/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
diff --git a/source/extensions/retry/host/omit_canary_hosts/config.h b/source/extensions/retry/host/omit_canary_hosts/config.h
index 3f493a9bee7c1..8a5bea9a6a3bb 100644
--- a/source/extensions/retry/host/omit_canary_hosts/config.h
+++ b/source/extensions/retry/host/omit_canary_hosts/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.pb.validate.h"
 #include "envoy/upstream/retry.h"
 
-#include "extensions/retry/host/omit_canary_hosts/omit_canary_hosts.h"
+#include "source/extensions/retry/host/omit_canary_hosts/omit_canary_hosts.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/host/omit_host_metadata/BUILD b/source/extensions/retry/host/omit_host_metadata/BUILD
index 92a916dfa28f1..a40fe7d642ae7 100644
--- a/source/extensions/retry/host/omit_host_metadata/BUILD
+++ b/source/extensions/retry/host/omit_host_metadata/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["omit_host_metadata.cc"],
     hdrs = ["omit_host_metadata.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
         "//source/common/config:well_known_names",
     ],
 )
@@ -25,8 +25,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":omit_host_metadata_predicate_lib",
-        "//include/envoy/registry",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/registry",
+        "//envoy/upstream:retry_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/extensions/retry/host/omit_host_metadata/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/retry/host/omit_host_metadata/config.cc b/source/extensions/retry/host/omit_host_metadata/config.cc
index 035fe69173a15..689c4628ad073 100644
--- a/source/extensions/retry/host/omit_host_metadata/config.cc
+++ b/source/extensions/retry/host/omit_host_metadata/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/retry/host/omit_host_metadata/config.h"
+#include "source/extensions/retry/host/omit_host_metadata/config.h"
 
 #include "envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.h"
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
 
-#include "common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/host/omit_host_metadata/config.h b/source/extensions/retry/host/omit_host_metadata/config.h
index 85cb0734692d3..c7242498e2b52 100644
--- a/source/extensions/retry/host/omit_host_metadata/config.h
+++ b/source/extensions/retry/host/omit_host_metadata/config.h
@@ -4,7 +4,7 @@
 #include "envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.validate.h"
 #include "envoy/upstream/retry.h"
 
-#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
+#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc
index 91559571ef2e9..6c6e8b6481fb2 100644
--- a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc
+++ b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc
@@ -1,6 +1,6 @@
-#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
+#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
 
-#include "common/config/metadata.h"
+#include "source/common/config/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h
index e0e1477cd1622..19ec5c659ebee 100644
--- a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h
+++ b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h
@@ -3,7 +3,7 @@
 #include "envoy/upstream/retry.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/well_known_names.h"
+#include "source/common/config/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/host/previous_hosts/BUILD b/source/extensions/retry/host/previous_hosts/BUILD
index ae6e4dd7859b3..700069ecd9f83 100644
--- a/source/extensions/retry/host/previous_hosts/BUILD
+++ b/source/extensions/retry/host/previous_hosts/BUILD
@@ -13,7 +13,7 @@ envoy_cc_library(
     name = "previous_hosts_predicate_lib",
     hdrs = ["previous_hosts.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
     ],
 )
 
@@ -23,8 +23,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":previous_hosts_predicate_lib",
-        "//include/envoy/registry",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/registry",
+        "//envoy/upstream:retry_interface",
         "@envoy_api//envoy/extensions/retry/host/previous_hosts/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/retry/host/previous_hosts/config.cc b/source/extensions/retry/host/previous_hosts/config.cc
index af216ca4baad2..876f70a02cf05 100644
--- a/source/extensions/retry/host/previous_hosts/config.cc
+++ b/source/extensions/retry/host/previous_hosts/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/retry/host/previous_hosts/config.h"
+#include "source/extensions/retry/host/previous_hosts/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
diff --git a/source/extensions/retry/host/previous_hosts/config.h b/source/extensions/retry/host/previous_hosts/config.h
index 1622242b11021..b57dc57328477 100644
--- a/source/extensions/retry/host/previous_hosts/config.h
+++ b/source/extensions/retry/host/previous_hosts/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.pb.validate.h"
 #include "envoy/upstream/retry.h"
 
-#include "extensions/retry/host/previous_hosts/previous_hosts.h"
+#include "source/extensions/retry/host/previous_hosts/previous_hosts.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/priority/previous_priorities/BUILD b/source/extensions/retry/priority/previous_priorities/BUILD
index 9867c5903fe62..0df95fe8f405d 100644
--- a/source/extensions/retry/priority/previous_priorities/BUILD
+++ b/source/extensions/retry/priority/previous_priorities/BUILD
@@ -14,7 +14,7 @@ envoy_cc_library(
     srcs = ["previous_priorities.cc"],
     hdrs = ["previous_priorities.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
         "//source/common/upstream:load_balancer_lib",
     ],
 )
@@ -25,8 +25,8 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":previous_priorities_lib",
-        "//include/envoy/registry",
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/registry",
+        "//envoy/upstream:retry_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/extensions/retry/priority/previous_priorities/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/retry/priority/previous_priorities/config.cc b/source/extensions/retry/priority/previous_priorities/config.cc
index 39756f51ff86f..7d8e16eb2b073 100644
--- a/source/extensions/retry/priority/previous_priorities/config.cc
+++ b/source/extensions/retry/priority/previous_priorities/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/retry/priority/previous_priorities/config.h"
+#include "source/extensions/retry/priority/previous_priorities/config.h"
 
 #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.h"
 #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.validate.h"
diff --git a/source/extensions/retry/priority/previous_priorities/config.h b/source/extensions/retry/priority/previous_priorities/config.h
index e6c64b94ebf79..b2c47e4f864d7 100644
--- a/source/extensions/retry/priority/previous_priorities/config.h
+++ b/source/extensions/retry/priority/previous_priorities/config.h
@@ -3,9 +3,8 @@
 #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.h"
 #include "envoy/upstream/retry.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/retry/priority/previous_priorities/previous_priorities.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/retry/priority/previous_priorities/previous_priorities.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/priority/previous_priorities/previous_priorities.cc b/source/extensions/retry/priority/previous_priorities/previous_priorities.cc
index e01028e7fc3b2..5599cb66d7155 100644
--- a/source/extensions/retry/priority/previous_priorities/previous_priorities.cc
+++ b/source/extensions/retry/priority/previous_priorities/previous_priorities.cc
@@ -1,4 +1,4 @@
-#include "extensions/retry/priority/previous_priorities/previous_priorities.h"
+#include "source/extensions/retry/priority/previous_priorities/previous_priorities.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/priority/previous_priorities/previous_priorities.h b/source/extensions/retry/priority/previous_priorities/previous_priorities.h
index f626f664a04ca..5cceb5f8fbae8 100644
--- a/source/extensions/retry/priority/previous_priorities/previous_priorities.h
+++ b/source/extensions/retry/priority/previous_priorities/previous_priorities.h
@@ -2,7 +2,7 @@
 
 #include "envoy/upstream/retry.h"
 
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/retry/priority/well_known_names.h b/source/extensions/retry/priority/well_known_names.h
new file mode 100644
index 0000000000000..28698a8b262db
--- /dev/null
+++ b/source/extensions/retry/priority/well_known_names.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace Retry {
+namespace Priority {
+
+/**
+ * Well-known retry priority load names.
+ */
+class RetryPriorityNameValues {
+public:
+  // Previous priority retry priority. Excludes previously attempted priorities during retries.
+  const std::string PreviousPrioritiesRetryPriority = "envoy.retry_priorities.previous_priorities";
+};
+
+using RetryPriorityValues = ConstSingleton<RetryPriorityNameValues>;
+
+} // namespace Priority
+} // namespace Retry
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/stat_sinks/common/statsd/BUILD b/source/extensions/stat_sinks/common/statsd/BUILD
index 5e3d6a771d21e..eb244b17cca61 100644
--- a/source/extensions/stat_sinks/common/statsd/BUILD
+++ b/source/extensions/stat_sinks/common/statsd/BUILD
@@ -13,12 +13,12 @@ envoy_cc_library(
     srcs = ["statsd.cc"],
     hdrs = ["statsd.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
diff --git a/source/extensions/stat_sinks/common/statsd/statsd.cc b/source/extensions/stat_sinks/common/statsd/statsd.cc
index ae37b96f0548c..07b1a5f0fe1f5 100644
--- a/source/extensions/stat_sinks/common/statsd/statsd.cc
+++ b/source/extensions/stat_sinks/common/statsd/statsd.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
 
 #include <chrono>
 #include <cstdint>
@@ -11,15 +11,15 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/network/socket_interface.h"
-#include "common/network/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/strings/str_join.h"
 
diff --git a/source/extensions/stat_sinks/common/statsd/statsd.h b/source/extensions/stat_sinks/common/statsd/statsd.h
index 6abc53bc06611..e93c5aa1c9b86 100644
--- a/source/extensions/stat_sinks/common/statsd/statsd.h
+++ b/source/extensions/stat_sinks/common/statsd/statsd.h
@@ -12,9 +12,9 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/macros.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/macros.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/stat_sinks/dog_statsd/BUILD b/source/extensions/stat_sinks/dog_statsd/BUILD
index 7105afc19f24d..ce75b191dedde 100644
--- a/source/extensions/stat_sinks/dog_statsd/BUILD
+++ b/source/extensions/stat_sinks/dog_statsd/BUILD
@@ -16,7 +16,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
         "//source/extensions/stat_sinks:well_known_names",
diff --git a/source/extensions/stat_sinks/dog_statsd/config.cc b/source/extensions/stat_sinks/dog_statsd/config.cc
index 985eb3e255b05..e31ac22f68e12 100644
--- a/source/extensions/stat_sinks/dog_statsd/config.cc
+++ b/source/extensions/stat_sinks/dog_statsd/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/dog_statsd/config.h"
+#include "source/extensions/stat_sinks/dog_statsd/config.h"
 
 #include <memory>
 
@@ -6,10 +6,9 @@
 #include "envoy/config/metrics/v3/stats.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/network/resolver_impl.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/extensions/stat_sinks/dog_statsd/config.h b/source/extensions/stat_sinks/dog_statsd/config.h
index 037dd4476eff4..69806524bbe6a 100644
--- a/source/extensions/stat_sinks/dog_statsd/config.h
+++ b/source/extensions/stat_sinks/dog_statsd/config.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/instance.h"
 
-#include "server/configuration_impl.h"
+#include "source/server/configuration_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/hystrix/BUILD b/source/extensions/stat_sinks/hystrix/BUILD
index 58fa5ed5ea4b4..3908e49d32724 100644
--- a/source/extensions/stat_sinks/hystrix/BUILD
+++ b/source/extensions/stat_sinks/hystrix/BUILD
@@ -17,7 +17,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":hystrix_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
         "//source/extensions/stat_sinks:well_known_names",
@@ -31,9 +31,9 @@ envoy_cc_library(
     srcs = ["hystrix.cc"],
     hdrs = ["hystrix.h"],
     deps = [
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:logger_lib",
         "//source/common/config:well_known_names",
diff --git a/source/extensions/stat_sinks/hystrix/config.cc b/source/extensions/stat_sinks/hystrix/config.cc
index 4997231b8be89..b9ae021fb9af3 100644
--- a/source/extensions/stat_sinks/hystrix/config.cc
+++ b/source/extensions/stat_sinks/hystrix/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/hystrix/config.h"
+#include "source/extensions/stat_sinks/hystrix/config.h"
 
 #include <memory>
 
@@ -6,10 +6,9 @@
 #include "envoy/config/metrics/v3/stats.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/network/resolver_impl.h"
-
-#include "extensions/stat_sinks/hystrix/hystrix.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/extensions/stat_sinks/hystrix/hystrix.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/hystrix/config.h b/source/extensions/stat_sinks/hystrix/config.h
index cff7ede28a177..1bf144323381b 100644
--- a/source/extensions/stat_sinks/hystrix/config.h
+++ b/source/extensions/stat_sinks/hystrix/config.h
@@ -4,7 +4,7 @@
 
 #include "envoy/server/instance.h"
 
-#include "server/configuration_impl.h"
+#include "source/server/configuration_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/hystrix/hystrix.cc b/source/extensions/stat_sinks/hystrix/hystrix.cc
index dae271c85d0e0..57a22f7e63a7e 100644
--- a/source/extensions/stat_sinks/hystrix/hystrix.cc
+++ b/source/extensions/stat_sinks/hystrix/hystrix.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/hystrix/hystrix.h"
+#include "source/extensions/stat_sinks/hystrix/hystrix.h"
 
 #include <chrono>
 #include <ctime>
@@ -7,11 +7,11 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/config/well_known_names.h"
-#include "common/http/headers.h"
-#include "common/stats/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/headers.h"
+#include "source/common/stats/utility.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
diff --git a/source/extensions/stat_sinks/hystrix/hystrix.h b/source/extensions/stat_sinks/hystrix/hystrix.h
index 796e72d1f97a5..97c5b2b2e7f54 100644
--- a/source/extensions/stat_sinks/hystrix/hystrix.h
+++ b/source/extensions/stat_sinks/hystrix/hystrix.h
@@ -9,7 +9,7 @@
 #include "envoy/stats/histogram.h"
 #include "envoy/stats/sink.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD
index 9b95a7760ae4e..11ffe31b018a1 100644
--- a/source/extensions/stat_sinks/metrics_service/BUILD
+++ b/source/extensions/stat_sinks/metrics_service/BUILD
@@ -16,10 +16,10 @@ envoy_cc_library(
     srcs = ["grpc_metrics_service_impl.cc"],
     hdrs = ["grpc_metrics_service_impl.h"],
     deps = [
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/singleton:instance_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/singleton:instance_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:assert_lib",
         "//source/common/grpc:async_client_lib",
         "@envoy_api//envoy/service/metrics/v3:pkg_cc_proto",
@@ -44,7 +44,7 @@ envoy_cc_extension(
     srcs = ["config.cc"],
     hdrs = ["config.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/extensions/stat_sinks:well_known_names",
diff --git a/source/extensions/stat_sinks/metrics_service/config.cc b/source/extensions/stat_sinks/metrics_service/config.cc
index a17539df4e6fc..a711335b01f75 100644
--- a/source/extensions/stat_sinks/metrics_service/config.cc
+++ b/source/extensions/stat_sinks/metrics_service/config.cc
@@ -1,17 +1,16 @@
-#include "extensions/stat_sinks/metrics_service/config.h"
+#include "source/extensions/stat_sinks/metrics_service/config.h"
 
 #include "envoy/config/metrics/v3/metrics_service.pb.h"
 #include "envoy/config/metrics/v3/metrics_service.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/network/resolver_impl.h"
-
-#include "extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h"
-#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h"
+#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/metrics_service/config.h b/source/extensions/stat_sinks/metrics_service/config.h
index f67eeb2cb538e..aff8e19fa2fc6 100644
--- a/source/extensions/stat_sinks/metrics_service/config.h
+++ b/source/extensions/stat_sinks/metrics_service/config.h
@@ -3,7 +3,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/instance.h"
 
-#include "server/configuration_impl.h"
+#include "source/server/configuration_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc
index 16793caef4800..3987969712f28 100644
--- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc
+++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc
@@ -1,12 +1,12 @@
-#include "extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h"
+#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h"
 
 #include "envoy/config/metrics/v2/metrics_service.pb.h"
 #include "envoy/service/metrics/v2/metrics_service.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/api_version.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_version.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc
index a9042ca77d5da..80ba3889bd7f6 100644
--- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc
+++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
+#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
 
 #include <chrono>
 
@@ -9,9 +9,9 @@
 #include "envoy/stats/stats.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h
index 97161641306f2..e2b74d61cbc41 100644
--- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h
+++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h
@@ -12,8 +12,8 @@
 #include "envoy/stats/stats.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/typed_async_client.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/typed_async_client.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/statsd/BUILD b/source/extensions/stat_sinks/statsd/BUILD
index cdfaddf114db5..8ac0182eba9dd 100644
--- a/source/extensions/stat_sinks/statsd/BUILD
+++ b/source/extensions/stat_sinks/statsd/BUILD
@@ -16,7 +16,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     # Legacy test use. TODO(#9953) clean up.
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/network:address_lib",
         "//source/common/network:resolver_lib",
         "//source/extensions/stat_sinks:well_known_names",
diff --git a/source/extensions/stat_sinks/statsd/config.cc b/source/extensions/stat_sinks/statsd/config.cc
index 3cbea7f511a26..e9656bfdb8e01 100644
--- a/source/extensions/stat_sinks/statsd/config.cc
+++ b/source/extensions/stat_sinks/statsd/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/statsd/config.h"
+#include "source/extensions/stat_sinks/statsd/config.h"
 
 #include <memory>
 
@@ -6,10 +6,9 @@
 #include "envoy/config/metrics/v3/stats.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/network/resolver_impl.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/statsd/config.h b/source/extensions/stat_sinks/statsd/config.h
index 3a709715b2bdb..dbce694b7a79c 100644
--- a/source/extensions/stat_sinks/statsd/config.h
+++ b/source/extensions/stat_sinks/statsd/config.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/instance.h"
 
-#include "server/configuration_impl.h"
+#include "source/server/configuration_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/wasm/BUILD b/source/extensions/stat_sinks/wasm/BUILD
index e8ee99ab1f29b..1747789d6c7a0 100644
--- a/source/extensions/stat_sinks/wasm/BUILD
+++ b/source/extensions/stat_sinks/wasm/BUILD
@@ -17,9 +17,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":wasm_stat_sink_lib",
-        "//include/envoy/registry",
-        "//include/envoy/server:factory_context_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/registry",
+        "//envoy/server:factory_context_interface",
+        "//envoy/server:instance_interface",
         "//source/extensions/common/wasm:wasm_lib",
         "//source/extensions/stat_sinks:well_known_names",
         "//source/server:configuration_lib",
@@ -31,7 +31,7 @@ envoy_cc_library(
     name = "wasm_stat_sink_lib",
     hdrs = ["wasm_stat_sink_impl.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/extensions/common/wasm:wasm_lib",
         "@envoy_api//envoy/extensions/filters/network/wasm/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/stat_sinks/wasm/config.cc b/source/extensions/stat_sinks/wasm/config.cc
index edc89aa62a685..8e1ffd9274d47 100644
--- a/source/extensions/stat_sinks/wasm/config.cc
+++ b/source/extensions/stat_sinks/wasm/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/stat_sinks/wasm/config.h"
+#include "source/extensions/stat_sinks/wasm/config.h"
 
 #include <memory>
 
@@ -6,9 +6,9 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/factory_context.h"
 
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/wasm/config.h b/source/extensions/stat_sinks/wasm/config.h
index 4fbd3d72937a7..8887e7b6ab45d 100644
--- a/source/extensions/stat_sinks/wasm/config.h
+++ b/source/extensions/stat_sinks/wasm/config.h
@@ -5,9 +5,8 @@
 #include "envoy/server/factory_context.h"
 #include "envoy/server/instance.h"
 
-#include "common/config/datasource.h"
-
-#include "server/configuration_impl.h"
+#include "source/common/config/datasource.h"
+#include "source/server/configuration_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h b/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h
index ce3eea40dcd6d..e3099b85874e2 100644
--- a/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h
+++ b/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h
@@ -5,7 +5,7 @@
 #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h"
 #include "envoy/stats/sink.h"
 
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/stat_sinks/well_known_names.h b/source/extensions/stat_sinks/well_known_names.h
index a1f5c7965d03c..a9d663a994a90 100644
--- a/source/extensions/stat_sinks/well_known_names.h
+++ b/source/extensions/stat_sinks/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/common/BUILD b/source/extensions/tracers/common/BUILD
index 450aef98b536f..89e447c456fc6 100644
--- a/source/extensions/tracers/common/BUILD
+++ b/source/extensions/tracers/common/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "factory_base_lib",
     hdrs = ["factory_base.h"],
     deps = [
-        "//include/envoy/server:tracer_config_interface",
+        "//envoy/server:tracer_config_interface",
         "//source/common/config:utility_lib",
     ],
 )
diff --git a/source/extensions/tracers/common/ot/BUILD b/source/extensions/tracers/common/ot/BUILD
index c8b386d0c3c87..c07fd828a0d75 100644
--- a/source/extensions/tracers/common/ot/BUILD
+++ b/source/extensions/tracers/common/ot/BUILD
@@ -18,10 +18,10 @@ envoy_cc_library(
     ],
     external_deps = ["opentracing"],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:trace_driver_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:trace_driver_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:base64_lib",
         "//source/common/common:empty_string",
         "//source/common/http:header_map_lib",
diff --git a/source/extensions/tracers/common/ot/opentracing_driver_impl.cc b/source/extensions/tracers/common/ot/opentracing_driver_impl.cc
index 92a6b07d634f6..aeeb94a489af2 100644
--- a/source/extensions/tracers/common/ot/opentracing_driver_impl.cc
+++ b/source/extensions/tracers/common/ot/opentracing_driver_impl.cc
@@ -1,15 +1,15 @@
-#include "extensions/tracers/common/ot/opentracing_driver_impl.h"
+#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h"
 
 #include <sstream>
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/tracing/common_values.h"
-#include "common/tracing/null_span_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/tracing/common_values.h"
+#include "source/common/tracing/null_span_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/common/ot/opentracing_driver_impl.h b/source/extensions/tracers/common/ot/opentracing_driver_impl.h
index d214d967a287e..582e31ed31d54 100644
--- a/source/extensions/tracers/common/ot/opentracing_driver_impl.h
+++ b/source/extensions/tracers/common/ot/opentracing_driver_impl.h
@@ -5,9 +5,9 @@
 #include "envoy/stats/scope.h"
 #include "envoy/tracing/trace_driver.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/singleton/const_singleton.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/singleton/const_singleton.h"
 
 #include "opentracing/ext/tags.h"
 #include "opentracing/tracer.h"
diff --git a/source/extensions/tracers/datadog/config.cc b/source/extensions/tracers/datadog/config.cc
index cdfcafdddf38f..562df5f645b15 100644
--- a/source/extensions/tracers/datadog/config.cc
+++ b/source/extensions/tracers/datadog/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/datadog/config.h"
+#include "source/extensions/tracers/datadog/config.h"
 
 #include "envoy/config/trace/v3/datadog.pb.h"
 #include "envoy/config/trace/v3/datadog.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/tracers/datadog/datadog_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/datadog/datadog_tracer_impl.h"
 
 #include "datadog/opentracing.h"
 
diff --git a/source/extensions/tracers/datadog/config.h b/source/extensions/tracers/datadog/config.h
index 1808fddff0033..f836916fca63e 100644
--- a/source/extensions/tracers/datadog/config.h
+++ b/source/extensions/tracers/datadog/config.h
@@ -5,7 +5,7 @@
 #include "envoy/config/trace/v3/datadog.pb.h"
 #include "envoy/config/trace/v3/datadog.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.cc b/source/extensions/tracers/datadog/datadog_tracer_impl.cc
index d2806d741ab25..8956afea8351c 100644
--- a/source/extensions/tracers/datadog/datadog_tracer_impl.cc
+++ b/source/extensions/tracers/datadog/datadog_tracer_impl.cc
@@ -1,14 +1,14 @@
-#include "extensions/tracers/datadog/datadog_tracer_impl.h"
+#include "source/extensions/tracers/datadog/datadog_tracer_impl.h"
 
 #include "envoy/config/trace/v3/datadog.pb.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/version/version.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/version/version.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.h b/source/extensions/tracers/datadog/datadog_tracer_impl.h
index 5649c3ef5594b..57276a103c3b7 100644
--- a/source/extensions/tracers/datadog/datadog_tracer_impl.h
+++ b/source/extensions/tracers/datadog/datadog_tracer_impl.h
@@ -8,12 +8,11 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/async_client_utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-#include "common/upstream/cluster_update_tracker.h"
-
-#include "extensions/tracers/common/ot/opentracing_driver_impl.h"
+#include "source/common/http/async_client_utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/upstream/cluster_update_tracker.h"
+#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/dynamic_ot/config.cc b/source/extensions/tracers/dynamic_ot/config.cc
index aabcbba91bbc2..bcecdc2d1db16 100644
--- a/source/extensions/tracers/dynamic_ot/config.cc
+++ b/source/extensions/tracers/dynamic_ot/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/dynamic_ot/config.h"
+#include "source/extensions/tracers/dynamic_ot/config.h"
 
 #include "envoy/config/trace/v3/dynamic_ot.pb.h"
 #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/dynamic_ot/config.h b/source/extensions/tracers/dynamic_ot/config.h
index 4b9a761a262ea..61be3be55c27f 100644
--- a/source/extensions/tracers/dynamic_ot/config.h
+++ b/source/extensions/tracers/dynamic_ot/config.h
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/dynamic_ot.pb.h"
 #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc
index 10b1a0e79cf35..583fbfd6bb6fe 100644
--- a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc
+++ b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc
@@ -1,6 +1,6 @@
-#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
+#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h
index 668e3f99ad739..712283919b365 100644
--- a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h
+++ b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h
@@ -4,7 +4,7 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "extensions/tracers/common/ot/opentracing_driver_impl.h"
+#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h"
 
 #include "opentracing/dynamic_load.h"
 
diff --git a/source/extensions/tracers/lightstep/config.cc b/source/extensions/tracers/lightstep/config.cc
index 49aa98ccaf4a5..3e1c029614a9c 100644
--- a/source/extensions/tracers/lightstep/config.cc
+++ b/source/extensions/tracers/lightstep/config.cc
@@ -1,13 +1,12 @@
-#include "extensions/tracers/lightstep/config.h"
+#include "source/extensions/tracers/lightstep/config.h"
 
 #include "envoy/config/trace/v3/lightstep.pb.h"
 #include "envoy/config/trace/v3/lightstep.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-#include "common/config/datasource.h"
-
-#include "extensions/tracers/lightstep/lightstep_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h"
 
 #include "lightstep/tracer.h"
 
diff --git a/source/extensions/tracers/lightstep/config.h b/source/extensions/tracers/lightstep/config.h
index 33cec8da3d605..9f29aa4860cc5 100644
--- a/source/extensions/tracers/lightstep/config.h
+++ b/source/extensions/tracers/lightstep/config.h
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/lightstep.pb.h"
 #include "envoy/config/trace/v3/lightstep.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc
index 952d24e4284fc..64b07a562963c 100644
--- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc
+++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/lightstep/lightstep_tracer_impl.h"
+#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -7,14 +7,14 @@
 
 #include "envoy/config/trace/v3/lightstep.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/base64.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/message_impl.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h
index 10820e4a3601e..6c7c131245a7f 100644
--- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h
+++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h
@@ -9,16 +9,15 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/message_impl.h"
-#include "common/json/json_loader.h"
-#include "common/protobuf/protobuf.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/upstream/cluster_update_tracker.h"
-
-#include "extensions/tracers/common/ot/opentracing_driver_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/upstream/cluster_update_tracker.h"
+#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h"
 
 #include "lightstep/tracer.h"
 #include "lightstep/transporter.h"
diff --git a/source/extensions/tracers/opencensus/config.cc b/source/extensions/tracers/opencensus/config.cc
index ae6756e9bbfff..bf33e76de2480 100644
--- a/source/extensions/tracers/opencensus/config.cc
+++ b/source/extensions/tracers/opencensus/config.cc
@@ -1,10 +1,10 @@
-#include "extensions/tracers/opencensus/config.h"
+#include "source/extensions/tracers/opencensus/config.h"
 
 #include "envoy/config/trace/v3/opencensus.pb.h"
 #include "envoy/config/trace/v3/opencensus.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/tracers/opencensus/opencensus_tracer_impl.h"
+#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/opencensus/config.h b/source/extensions/tracers/opencensus/config.h
index 5b853f9b9e1dd..da3d534e36256 100644
--- a/source/extensions/tracers/opencensus/config.h
+++ b/source/extensions/tracers/opencensus/config.h
@@ -5,7 +5,7 @@
 #include "envoy/config/trace/v3/opencensus.pb.h"
 #include "envoy/config/trace/v3/opencensus.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc
index ee0fc31e53ee6..82ea4b3c39083 100644
--- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc
+++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc
@@ -1,12 +1,12 @@
-#include "extensions/tracers/opencensus/opencensus_tracer_impl.h"
+#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h"
 
 #include <grpcpp/grpcpp.h>
 
 #include "envoy/config/trace/v3/opencensus.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/base64.h"
-#include "common/common/empty_string.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/empty_string.h"
 
 #include "absl/strings/str_cat.h"
 #include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h"
@@ -25,7 +25,7 @@
 #include "opencensus/trace/trace_params.h"
 
 #ifdef ENVOY_GOOGLE_GRPC
-#include "common/grpc/google_grpc_utils.h"
+#include "source/common/grpc/google_grpc_utils.h"
 #endif
 
 namespace Envoy {
diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h
index 3d4cbf7cdae91..ab0c14d1c5efc 100644
--- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h
+++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h
@@ -5,7 +5,7 @@
 #include "envoy/local_info/local_info.h"
 #include "envoy/tracing/trace_driver.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/skywalking/BUILD b/source/extensions/tracers/skywalking/BUILD
index 1265cd752cfaf..a35573f7d0bed 100644
--- a/source/extensions/tracers/skywalking/BUILD
+++ b/source/extensions/tracers/skywalking/BUILD
@@ -20,7 +20,7 @@ envoy_cc_library(
     ],
     deps = [
         ":skywalking_stats_lib",
-        "//include/envoy/grpc:async_client_manager_interface",
+        "//envoy/grpc:async_client_manager_interface",
         "//source/common/common:backoff_lib",
         "//source/common/grpc:async_client_lib",
         "@envoy_api//envoy/config/trace/v3:pkg_cc_proto",
@@ -42,9 +42,9 @@ envoy_cc_library(
     ],
     deps = [
         ":trace_segment_reporter_lib",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/server:tracer_config_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/common:time_interface",
+        "//envoy/server:tracer_config_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/common:macros",
         "//source/common/http:header_map_lib",
         "//source/common/runtime:runtime_lib",
@@ -59,7 +59,7 @@ envoy_cc_library(
         "skywalking_stats.h",
     ],
     deps = [
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
     ],
 )
 
diff --git a/source/extensions/tracers/skywalking/config.cc b/source/extensions/tracers/skywalking/config.cc
index 12e1b43c01579..eca304c41d4c1 100644
--- a/source/extensions/tracers/skywalking/config.cc
+++ b/source/extensions/tracers/skywalking/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/skywalking/config.h"
+#include "source/extensions/tracers/skywalking/config.h"
 
 #include "envoy/config/trace/v3/skywalking.pb.h"
 #include "envoy/config/trace/v3/skywalking.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/tracers/skywalking/skywalking_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/skywalking/config.h b/source/extensions/tracers/skywalking/config.h
index 0fc1ad8dc9671..26d4fca522ba0 100644
--- a/source/extensions/tracers/skywalking/config.h
+++ b/source/extensions/tracers/skywalking/config.h
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/skywalking.pb.h"
 #include "envoy/config/trace/v3/skywalking.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc b/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc
index fa40d5469717e..7bff0c42991e9 100644
--- a/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc
+++ b/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc
@@ -1,10 +1,10 @@
-#include "extensions/tracers/skywalking/skywalking_tracer_impl.h"
+#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h"
 
 #include <memory>
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/http/path_utility.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/path_utility.h"
 
 #include "cpp2sky/propagation.h"
 
diff --git a/source/extensions/tracers/skywalking/skywalking_tracer_impl.h b/source/extensions/tracers/skywalking/skywalking_tracer_impl.h
index a2443f10d2ba8..aeb4f91434fb5 100644
--- a/source/extensions/tracers/skywalking/skywalking_tracer_impl.h
+++ b/source/extensions/tracers/skywalking/skywalking_tracer_impl.h
@@ -5,10 +5,9 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/tracing/trace_driver.h"
 
+#include "source/extensions/tracers/skywalking/tracer.h"
 #include "source/tracing_context_impl.h"
 
-#include "extensions/tracers/skywalking/tracer.h"
-
 #include "cpp2sky/exception.h"
 
 namespace Envoy {
diff --git a/source/extensions/tracers/skywalking/trace_segment_reporter.cc b/source/extensions/tracers/skywalking/trace_segment_reporter.cc
index 5d81ac68f240f..27fd24fd2522d 100644
--- a/source/extensions/tracers/skywalking/trace_segment_reporter.cc
+++ b/source/extensions/tracers/skywalking/trace_segment_reporter.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/skywalking/trace_segment_reporter.h"
+#include "source/extensions/tracers/skywalking/trace_segment_reporter.h"
 
 #include "envoy/http/header_map.h"
 
diff --git a/source/extensions/tracers/skywalking/trace_segment_reporter.h b/source/extensions/tracers/skywalking/trace_segment_reporter.h
index a54885a756714..db198d2e0c1d8 100644
--- a/source/extensions/tracers/skywalking/trace_segment_reporter.h
+++ b/source/extensions/tracers/skywalking/trace_segment_reporter.h
@@ -5,10 +5,9 @@
 #include "envoy/config/trace/v3/skywalking.pb.h"
 #include "envoy/grpc/async_client_manager.h"
 
-#include "common/common/backoff_strategy.h"
-#include "common/grpc/async_client_impl.h"
-
-#include "extensions/tracers/skywalking/skywalking_stats.h"
+#include "source/common/common/backoff_strategy.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/extensions/tracers/skywalking/skywalking_stats.h"
 
 #include "cpp2sky/tracing_context.h"
 
diff --git a/source/extensions/tracers/skywalking/tracer.cc b/source/extensions/tracers/skywalking/tracer.cc
index bcca619fb886c..3f803c4c09657 100644
--- a/source/extensions/tracers/skywalking/tracer.cc
+++ b/source/extensions/tracers/skywalking/tracer.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/skywalking/tracer.h"
+#include "source/extensions/tracers/skywalking/tracer.h"
 
 #include <string>
 
diff --git a/source/extensions/tracers/skywalking/tracer.h b/source/extensions/tracers/skywalking/tracer.h
index 52e2a24fb18d1..d0e1887277c65 100644
--- a/source/extensions/tracers/skywalking/tracer.h
+++ b/source/extensions/tracers/skywalking/tracer.h
@@ -4,10 +4,9 @@
 
 #include "envoy/tracing/trace_driver.h"
 
-#include "common/tracing/common_values.h"
-#include "common/tracing/null_span_impl.h"
-
-#include "extensions/tracers/skywalking/trace_segment_reporter.h"
+#include "source/common/tracing/common_values.h"
+#include "source/common/tracing/null_span_impl.h"
+#include "source/extensions/tracers/skywalking/trace_segment_reporter.h"
 
 #include "cpp2sky/tracing_context.h"
 #include "cpp2sky/well_known_names.h"
diff --git a/source/extensions/tracers/xray/BUILD b/source/extensions/tracers/xray/BUILD
index 8048e35897e55..a0824d8ea9bce 100644
--- a/source/extensions/tracers/xray/BUILD
+++ b/source/extensions/tracers/xray/BUILD
@@ -39,9 +39,9 @@ envoy_cc_library(
     external_deps = [],
     deps = [
         ":daemon_cc_proto",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/server:tracer_config_interface",
-        "//include/envoy/tracing:trace_driver_interface",
+        "//envoy/common:time_interface",
+        "//envoy/server:tracer_config_interface",
+        "//envoy/tracing:trace_driver_interface",
         "//source/common/common:hex_lib",
         "//source/common/common:macros",
         "//source/common/common:random_generator_lib",
diff --git a/source/extensions/tracers/xray/config.cc b/source/extensions/tracers/xray/config.cc
index ff9bd156ea7f3..f297c5c7d8417 100644
--- a/source/extensions/tracers/xray/config.cc
+++ b/source/extensions/tracers/xray/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/config.h"
+#include "source/extensions/tracers/xray/config.h"
 
 #include <string>
 
@@ -7,10 +7,9 @@
 #include "envoy/config/trace/v3/xray.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-#include "common/config/datasource.h"
-
-#include "extensions/tracers/xray/xray_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/datasource.h"
+#include "source/extensions/tracers/xray/xray_tracer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/config.h b/source/extensions/tracers/xray/config.h
index 00c5b3d5fa8ef..2115608f9eba6 100644
--- a/source/extensions/tracers/xray/config.h
+++ b/source/extensions/tracers/xray/config.h
@@ -2,9 +2,8 @@
 
 #include "envoy/config/trace/v3/xray.pb.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/tracers/common/factory_base.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/daemon_broker.cc b/source/extensions/tracers/xray/daemon_broker.cc
index 7af0945220fef..2734996be51f8 100644
--- a/source/extensions/tracers/xray/daemon_broker.cc
+++ b/source/extensions/tracers/xray/daemon_broker.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/xray/daemon_broker.h"
+#include "source/extensions/tracers/xray/daemon_broker.h"
 
 #include "envoy/network/address.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
 #include "source/extensions/tracers/xray/daemon.pb.h"
 
 namespace Envoy {
diff --git a/source/extensions/tracers/xray/daemon_broker.h b/source/extensions/tracers/xray/daemon_broker.h
index ce261a3c2b79b..35d2e0ee82442 100644
--- a/source/extensions/tracers/xray/daemon_broker.h
+++ b/source/extensions/tracers/xray/daemon_broker.h
@@ -6,7 +6,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/localized_sampling.cc b/source/extensions/tracers/xray/localized_sampling.cc
index b16b3929898aa..e56cfc52b3934 100644
--- a/source/extensions/tracers/xray/localized_sampling.cc
+++ b/source/extensions/tracers/xray/localized_sampling.cc
@@ -1,9 +1,8 @@
-#include "extensions/tracers/xray/localized_sampling.h"
+#include "source/extensions/tracers/xray/localized_sampling.h"
 
-#include "common/http/exception.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/tracers/xray/util.h"
+#include "source/common/http/exception.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/tracers/xray/util.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/localized_sampling.h b/source/extensions/tracers/xray/localized_sampling.h
index f95a3da8fdd14..dc9cde196047a 100644
--- a/source/extensions/tracers/xray/localized_sampling.h
+++ b/source/extensions/tracers/xray/localized_sampling.h
@@ -6,11 +6,10 @@
 
 #include "envoy/common/time.h"
 
-#include "common/common/logger.h"
-#include "common/common/random_generator.h"
-
-#include "extensions/tracers/xray/reservoir.h"
-#include "extensions/tracers/xray/sampling_strategy.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/random_generator.h"
+#include "source/extensions/tracers/xray/reservoir.h"
+#include "source/extensions/tracers/xray/sampling_strategy.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/tracers/xray/reservoir.h b/source/extensions/tracers/xray/reservoir.h
index fc8da633c471f..1230354127cf0 100644
--- a/source/extensions/tracers/xray/reservoir.h
+++ b/source/extensions/tracers/xray/reservoir.h
@@ -4,8 +4,8 @@
 
 #include "envoy/common/time.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/sampling_strategy.h b/source/extensions/tracers/xray/sampling_strategy.h
index 908c28c6414e1..4d744aaef02e4 100644
--- a/source/extensions/tracers/xray/sampling_strategy.h
+++ b/source/extensions/tracers/xray/sampling_strategy.h
@@ -5,7 +5,7 @@
 #include "envoy/common/pure.h"
 #include "envoy/common/random_generator.h"
 
-#include "common/common/macros.h"
+#include "source/common/common/macros.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/tracers/xray/tracer.cc b/source/extensions/tracers/xray/tracer.cc
index 684f36b8b5ea3..b7e1f603fcd62 100644
--- a/source/extensions/tracers/xray/tracer.cc
+++ b/source/extensions/tracers/xray/tracer.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/tracer.h"
+#include "source/extensions/tracers/xray/tracer.h"
 
 #include <algorithm>
 #include <chrono>
@@ -7,10 +7,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/network/listener.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/protobuf/utility.h"
-
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/utility.h"
 #include "source/extensions/tracers/xray/daemon.pb.validate.h"
 
 namespace Envoy {
diff --git a/source/extensions/tracers/xray/tracer.h b/source/extensions/tracers/xray/tracer.h
index 07c6f04bd2b27..7e252f7cfc295 100644
--- a/source/extensions/tracers/xray/tracer.h
+++ b/source/extensions/tracers/xray/tracer.h
@@ -7,14 +7,13 @@
 #include "envoy/common/time.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/hex.h"
-#include "common/common/random_generator.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/tracers/xray/daemon_broker.h"
-#include "extensions/tracers/xray/sampling_strategy.h"
-#include "extensions/tracers/xray/xray_configuration.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/tracers/xray/daemon_broker.h"
+#include "source/extensions/tracers/xray/sampling_strategy.h"
+#include "source/extensions/tracers/xray/xray_configuration.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/source/extensions/tracers/xray/util.cc b/source/extensions/tracers/xray/util.cc
index 65b052d483006..32730fbf6a4b7 100644
--- a/source/extensions/tracers/xray/util.cc
+++ b/source/extensions/tracers/xray/util.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/util.h"
+#include "source/extensions/tracers/xray/util.h"
 
 #include "absl/strings/ascii.h"
 
diff --git a/source/extensions/tracers/xray/xray_configuration.h b/source/extensions/tracers/xray/xray_configuration.h
index 3abcdadd8cd04..104ca39cbc359 100644
--- a/source/extensions/tracers/xray/xray_configuration.h
+++ b/source/extensions/tracers/xray/xray_configuration.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/extensions/tracers/xray/xray_tracer_impl.cc b/source/extensions/tracers/xray/xray_tracer_impl.cc
index 77e240c783a23..22bba12bf348a 100644
--- a/source/extensions/tracers/xray/xray_tracer_impl.cc
+++ b/source/extensions/tracers/xray/xray_tracer_impl.cc
@@ -1,11 +1,10 @@
-#include "extensions/tracers/xray/xray_tracer_impl.h"
+#include "source/extensions/tracers/xray/xray_tracer_impl.h"
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-
-#include "extensions/tracers/xray/localized_sampling.h"
-#include "extensions/tracers/xray/tracer.h"
-#include "extensions/tracers/xray/xray_configuration.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/xray/localized_sampling.h"
+#include "source/extensions/tracers/xray/tracer.h"
+#include "source/extensions/tracers/xray/xray_configuration.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/xray/xray_tracer_impl.h b/source/extensions/tracers/xray/xray_tracer_impl.h
index 8985cc83ccef9..37357dfff8e03 100644
--- a/source/extensions/tracers/xray/xray_tracer_impl.h
+++ b/source/extensions/tracers/xray/xray_tracer_impl.h
@@ -4,8 +4,8 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/tracing/trace_driver.h"
 
-#include "extensions/tracers/xray/tracer.h"
-#include "extensions/tracers/xray/xray_configuration.h"
+#include "source/extensions/tracers/xray/tracer.h"
+#include "source/extensions/tracers/xray/xray_configuration.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD
index 0c39a41bf535a..e7ee5ee6b0c75 100644
--- a/source/extensions/tracers/zipkin/BUILD
+++ b/source/extensions/tracers/zipkin/BUILD
@@ -38,13 +38,13 @@ envoy_cc_library(
         "abseil_optional",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/common:time_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/network:address_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:enum_to_int",
         "//source/common/common:hex_lib",
         "//source/common/common:utility_lib",
diff --git a/source/extensions/tracers/zipkin/config.cc b/source/extensions/tracers/zipkin/config.cc
index b77ab83f4812d..b79a47a4598b2 100644
--- a/source/extensions/tracers/zipkin/config.cc
+++ b/source/extensions/tracers/zipkin/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/zipkin/config.h"
+#include "source/extensions/tracers/zipkin/config.h"
 
 #include "envoy/config/trace/v3/zipkin.pb.h"
 #include "envoy/config/trace/v3/zipkin.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/tracers/zipkin/zipkin_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/config.h b/source/extensions/tracers/zipkin/config.h
index 8c879e64f5243..8c32693e1a256 100644
--- a/source/extensions/tracers/zipkin/config.h
+++ b/source/extensions/tracers/zipkin/config.h
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/zipkin.pb.h"
 #include "envoy/config/trace/v3/zipkin.pb.validate.h"
 
-#include "extensions/tracers/common/factory_base.h"
+#include "source/extensions/tracers/common/factory_base.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/span_buffer.cc b/source/extensions/tracers/zipkin/span_buffer.cc
index df1682e7881ae..e5ab41876cca8 100644
--- a/source/extensions/tracers/zipkin/span_buffer.cc
+++ b/source/extensions/tracers/zipkin/span_buffer.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/zipkin/span_buffer.h"
+#include "source/extensions/tracers/zipkin/span_buffer.h"
 
 #include "envoy/config/trace/v3/zipkin.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/tracers/zipkin/util.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_json_field_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_json_field_names.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_replace.h"
diff --git a/source/extensions/tracers/zipkin/span_buffer.h b/source/extensions/tracers/zipkin/span_buffer.h
index a2267c7b724ff..c1667c609078a 100644
--- a/source/extensions/tracers/zipkin/span_buffer.h
+++ b/source/extensions/tracers/zipkin/span_buffer.h
@@ -2,10 +2,9 @@
 
 #include "envoy/config/trace/v3/zipkin.pb.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/tracers/zipkin/tracer_interface.h"
-#include "extensions/tracers/zipkin/zipkin_core_types.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/tracers/zipkin/tracer_interface.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_types.h"
 
 #include "zipkin.pb.h"
 
diff --git a/source/extensions/tracers/zipkin/span_context.cc b/source/extensions/tracers/zipkin/span_context.cc
index 20841648992b1..aac074542fbbb 100644
--- a/source/extensions/tracers/zipkin/span_context.cc
+++ b/source/extensions/tracers/zipkin/span_context.cc
@@ -1,9 +1,8 @@
-#include "extensions/tracers/zipkin/span_context.h"
+#include "source/extensions/tracers/zipkin/span_context.h"
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/span_context.h b/source/extensions/tracers/zipkin/span_context.h
index c06381272cbe7..615c81e1d0e4a 100644
--- a/source/extensions/tracers/zipkin/span_context.h
+++ b/source/extensions/tracers/zipkin/span_context.h
@@ -2,9 +2,9 @@
 
 #include <regex>
 
-#include "extensions/tracers/zipkin/util.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_core_types.h"
+#include "source/extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_types.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/span_context_extractor.cc b/source/extensions/tracers/zipkin/span_context_extractor.cc
index a9b67503ffd19..a452636587b94 100644
--- a/source/extensions/tracers/zipkin/span_context_extractor.cc
+++ b/source/extensions/tracers/zipkin/span_context_extractor.cc
@@ -1,10 +1,9 @@
-#include "extensions/tracers/zipkin/span_context_extractor.h"
+#include "source/extensions/tracers/zipkin/span_context_extractor.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-
-#include "extensions/tracers/zipkin/span_context.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/zipkin/span_context.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/span_context_extractor.h b/source/extensions/tracers/zipkin/span_context_extractor.h
index 425a0d59973cc..b364d6e528c38 100644
--- a/source/extensions/tracers/zipkin/span_context_extractor.h
+++ b/source/extensions/tracers/zipkin/span_context_extractor.h
@@ -3,7 +3,7 @@
 #include "envoy/common/exception.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/tracer.cc b/source/extensions/tracers/zipkin/tracer.cc
index 90f1f1d72f495..cb156d36b6d50 100644
--- a/source/extensions/tracers/zipkin/tracer.cc
+++ b/source/extensions/tracers/zipkin/tracer.cc
@@ -1,12 +1,11 @@
-#include "extensions/tracers/zipkin/tracer.h"
+#include "source/extensions/tracers/zipkin/tracer.h"
 
 #include <chrono>
 
-#include "common/common/utility.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/zipkin/util.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/tracer.h b/source/extensions/tracers/zipkin/tracer.h
index 109982af7ff08..e29c5446f9aa7 100644
--- a/source/extensions/tracers/zipkin/tracer.h
+++ b/source/extensions/tracers/zipkin/tracer.h
@@ -5,10 +5,10 @@
 #include "envoy/common/time.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "extensions/tracers/zipkin/span_context.h"
-#include "extensions/tracers/zipkin/tracer_interface.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_core_types.h"
+#include "source/extensions/tracers/zipkin/span_context.h"
+#include "source/extensions/tracers/zipkin/tracer_interface.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_types.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/util.cc b/source/extensions/tracers/zipkin/util.cc
index 5263eec00ecc4..53763443576f6 100644
--- a/source/extensions/tracers/zipkin/util.cc
+++ b/source/extensions/tracers/zipkin/util.cc
@@ -1,11 +1,11 @@
-#include "extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/util.h"
 
 #include <chrono>
 #include <random>
 #include <regex>
 
-#include "common/common/hex.h"
-#include "common/common/utility.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
diff --git a/source/extensions/tracers/zipkin/util.h b/source/extensions/tracers/zipkin/util.h
index 0c9158a36423e..80303986034fe 100644
--- a/source/extensions/tracers/zipkin/util.h
+++ b/source/extensions/tracers/zipkin/util.h
@@ -5,8 +5,8 @@
 
 #include "envoy/common/time.h"
 
-#include "common/common/byte_order.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/byte_order.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/zipkin_core_constants.h b/source/extensions/tracers/zipkin/zipkin_core_constants.h
index 0401c39fb142d..03e1ba63a40b6 100644
--- a/source/extensions/tracers/zipkin/zipkin_core_constants.h
+++ b/source/extensions/tracers/zipkin/zipkin_core_constants.h
@@ -4,7 +4,7 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/zipkin_core_types.cc b/source/extensions/tracers/zipkin/zipkin_core_types.cc
index 3128a82586f8b..eb6c17c8382a2 100644
--- a/source/extensions/tracers/zipkin/zipkin_core_types.cc
+++ b/source/extensions/tracers/zipkin/zipkin_core_types.cc
@@ -1,13 +1,12 @@
-#include "extensions/tracers/zipkin/zipkin_core_types.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_types.h"
 
 #include <vector>
 
-#include "common/common/utility.h"
-
-#include "extensions/tracers/zipkin/span_context.h"
-#include "extensions/tracers/zipkin/util.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_json_field_names.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/tracers/zipkin/span_context.h"
+#include "source/extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_json_field_names.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/zipkin_core_types.h b/source/extensions/tracers/zipkin/zipkin_core_types.h
index b87573c8f7bf3..ae70ddff7adc7 100644
--- a/source/extensions/tracers/zipkin/zipkin_core_types.h
+++ b/source/extensions/tracers/zipkin/zipkin_core_types.h
@@ -6,12 +6,11 @@
 #include "envoy/common/time.h"
 #include "envoy/network/address.h"
 
-#include "common/common/assert.h"
-#include "common/common/hex.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/tracers/zipkin/tracer_interface.h"
-#include "extensions/tracers/zipkin/util.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/hex.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/tracers/zipkin/tracer_interface.h"
+#include "source/extensions/tracers/zipkin/util.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
diff --git a/source/extensions/tracers/zipkin/zipkin_json_field_names.h b/source/extensions/tracers/zipkin/zipkin_json_field_names.h
index 95e401992db75..0d178d8203342 100644
--- a/source/extensions/tracers/zipkin/zipkin_json_field_names.h
+++ b/source/extensions/tracers/zipkin/zipkin_json_field_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc
index d25f143cec47e..77c7944550adf 100644
--- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc
+++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc
@@ -1,19 +1,18 @@
-#include "extensions/tracers/zipkin/zipkin_tracer_impl.h"
+#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h"
 
 #include "envoy/config/trace/v3/zipkin.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/zipkin/span_context_extractor.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/zipkin/span_context_extractor.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
index 2649825a3635f..7def3ced8e491 100644
--- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
+++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h
@@ -8,17 +8,16 @@
 #include "envoy/tracing/trace_driver.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/empty_string.h"
-#include "common/http/async_client_utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-#include "common/tracing/common_values.h"
-#include "common/tracing/null_span_impl.h"
-#include "common/upstream/cluster_update_tracker.h"
-
-#include "extensions/tracers/zipkin/span_buffer.h"
-#include "extensions/tracers/zipkin/tracer.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/async_client_utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/tracing/common_values.h"
+#include "source/common/tracing/null_span_impl.h"
+#include "source/common/upstream/cluster_update_tracker.h"
+#include "source/extensions/tracers/zipkin/span_buffer.h"
+#include "source/extensions/tracers/zipkin/tracer.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/alts/BUILD b/source/extensions/transport_sockets/alts/BUILD
index 3e393a3781cc8..2086ef77546e2 100644
--- a/source/extensions/transport_sockets/alts/BUILD
+++ b/source/extensions/transport_sockets/alts/BUILD
@@ -40,8 +40,8 @@ envoy_cc_extension(
     deps = [
         ":tsi_handshaker",
         ":tsi_socket",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/grpc:google_grpc_context_lib",
         "@envoy_api//envoy/extensions/transport_sockets/alts/v3:pkg_cc_proto",
     ],
@@ -71,7 +71,7 @@ envoy_cc_library(
     ],
     deps = [
         ":grpc_tsi_wrapper",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
@@ -88,8 +88,8 @@ envoy_cc_library(
         ":noop_transport_socket_callbacks_lib",
         ":tsi_frame_protector",
         ":tsi_handshaker",
-        "//include/envoy/network:io_handle_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:io_handle_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:watermark_buffer_lib",
         "//source/common/common:cleanup_lib",
@@ -104,7 +104,7 @@ envoy_cc_library(
     name = "noop_transport_socket_callbacks_lib",
     hdrs = ["noop_transport_socket_callbacks.h"],
     deps = [
-        "//include/envoy/network:io_handle_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:io_handle_interface",
+        "//envoy/network:transport_socket_interface",
     ],
 )
diff --git a/source/extensions/transport_sockets/alts/config.cc b/source/extensions/transport_sockets/alts/config.cc
index 90494996aafe9..59f66580110af 100644
--- a/source/extensions/transport_sockets/alts/config.cc
+++ b/source/extensions/transport_sockets/alts/config.cc
@@ -1,17 +1,16 @@
-#include "extensions/transport_sockets/alts/config.h"
+#include "source/extensions/transport_sockets/alts/config.h"
 
 #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.h"
 #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.validate.h"
 #include "envoy/registry/registry.h"
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/common/assert.h"
-#include "common/grpc/google_grpc_context.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/transport_sockets/alts/grpc_tsi.h"
-#include "extensions/transport_sockets/alts/tsi_socket.h"
+#include "source/common/common/assert.h"
+#include "source/common/grpc/google_grpc_context.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/transport_sockets/alts/grpc_tsi.h"
+#include "source/extensions/transport_sockets/alts/tsi_socket.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/str_join.h"
diff --git a/source/extensions/transport_sockets/alts/grpc_tsi.h b/source/extensions/transport_sockets/alts/grpc_tsi.h
index 1acecac58d4de..4b280f0420f93 100644
--- a/source/extensions/transport_sockets/alts/grpc_tsi.h
+++ b/source/extensions/transport_sockets/alts/grpc_tsi.h
@@ -22,7 +22,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/common/c_smart_ptr.h"
+#include "source/common/common/c_smart_ptr.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/alts/tsi_frame_protector.cc b/source/extensions/transport_sockets/alts/tsi_frame_protector.cc
index 2739f2029a981..6e06411f07517 100644
--- a/source/extensions/transport_sockets/alts/tsi_frame_protector.cc
+++ b/source/extensions/transport_sockets/alts/tsi_frame_protector.cc
@@ -1,7 +1,7 @@
-#include "extensions/transport_sockets/alts/tsi_frame_protector.h"
+#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
 
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/source/extensions/transport_sockets/alts/tsi_frame_protector.h b/source/extensions/transport_sockets/alts/tsi_frame_protector.h
index 5ea60bb5a0c76..3b7bfab2bf70a 100644
--- a/source/extensions/transport_sockets/alts/tsi_frame_protector.h
+++ b/source/extensions/transport_sockets/alts/tsi_frame_protector.h
@@ -2,7 +2,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "extensions/transport_sockets/alts/grpc_tsi.h"
+#include "source/extensions/transport_sockets/alts/grpc_tsi.h"
 
 #include "grpc/slice_buffer.h"
 
diff --git a/source/extensions/transport_sockets/alts/tsi_handshaker.cc b/source/extensions/transport_sockets/alts/tsi_handshaker.cc
index 08f14967f40fc..4440fc4011f62 100644
--- a/source/extensions/transport_sockets/alts/tsi_handshaker.cc
+++ b/source/extensions/transport_sockets/alts/tsi_handshaker.cc
@@ -1,7 +1,7 @@
-#include "extensions/transport_sockets/alts/tsi_handshaker.h"
+#include "source/extensions/transport_sockets/alts/tsi_handshaker.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/alts/tsi_handshaker.h b/source/extensions/transport_sockets/alts/tsi_handshaker.h
index 71cd6989e71a9..9408a67bfa68a 100644
--- a/source/extensions/transport_sockets/alts/tsi_handshaker.h
+++ b/source/extensions/transport_sockets/alts/tsi_handshaker.h
@@ -5,9 +5,8 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/c_smart_ptr.h"
-
-#include "extensions/transport_sockets/alts/grpc_tsi.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/extensions/transport_sockets/alts/grpc_tsi.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/alts/tsi_socket.cc b/source/extensions/transport_sockets/alts/tsi_socket.cc
index ce2316921ce79..1e69e0559294a 100644
--- a/source/extensions/transport_sockets/alts/tsi_socket.cc
+++ b/source/extensions/transport_sockets/alts/tsi_socket.cc
@@ -1,9 +1,9 @@
-#include "extensions/transport_sockets/alts/tsi_socket.h"
+#include "source/extensions/transport_sockets/alts/tsi_socket.h"
 
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/alts/tsi_socket.h b/source/extensions/transport_sockets/alts/tsi_socket.h
index 2d74b293d048f..1b4e5def1fc54 100644
--- a/source/extensions/transport_sockets/alts/tsi_socket.h
+++ b/source/extensions/transport_sockets/alts/tsi_socket.h
@@ -2,13 +2,12 @@
 
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/watermark_buffer.h"
-#include "common/network/raw_buffer_socket.h"
-
-#include "extensions/transport_sockets/alts/noop_transport_socket_callbacks.h"
-#include "extensions/transport_sockets/alts/tsi_frame_protector.h"
-#include "extensions/transport_sockets/alts/tsi_handshaker.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/extensions/transport_sockets/alts/noop_transport_socket_callbacks.h"
+#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h"
+#include "source/extensions/transport_sockets/alts/tsi_handshaker.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/common/BUILD b/source/extensions/transport_sockets/common/BUILD
index eee229da12fb2..d333c0993f442 100644
--- a/source/extensions/transport_sockets/common/BUILD
+++ b/source/extensions/transport_sockets/common/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     srcs = ["passthrough.cc"],
     hdrs = ["passthrough.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
diff --git a/source/extensions/transport_sockets/common/passthrough.cc b/source/extensions/transport_sockets/common/passthrough.cc
index 86fc282ed3e36..ba4f61d113e3c 100644
--- a/source/extensions/transport_sockets/common/passthrough.cc
+++ b/source/extensions/transport_sockets/common/passthrough.cc
@@ -1,9 +1,9 @@
-#include "extensions/transport_sockets/common/passthrough.h"
+#include "source/extensions/transport_sockets/common/passthrough.h"
 
 #include "envoy/network/connection.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/common/passthrough.h b/source/extensions/transport_sockets/common/passthrough.h
index 5c338af425a08..ed633024040c2 100644
--- a/source/extensions/transport_sockets/common/passthrough.h
+++ b/source/extensions/transport_sockets/common/passthrough.h
@@ -3,7 +3,7 @@
 #include "envoy/network/connection.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/proxy_protocol/BUILD b/source/extensions/transport_sockets/proxy_protocol/BUILD
index 403fb996e900c..c84e1932ebc6c 100644
--- a/source/extensions/transport_sockets/proxy_protocol/BUILD
+++ b/source/extensions/transport_sockets/proxy_protocol/BUILD
@@ -15,9 +15,9 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":upstream_proxy_protocol",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg_cc_proto",
     ],
@@ -28,8 +28,8 @@ envoy_cc_library(
     srcs = ["proxy_protocol.cc"],
     hdrs = ["proxy_protocol.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/network:address_lib",
         "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib",
diff --git a/source/extensions/transport_sockets/proxy_protocol/config.cc b/source/extensions/transport_sockets/proxy_protocol/config.cc
index e037263c8a4a5..860fdb637c32a 100644
--- a/source/extensions/transport_sockets/proxy_protocol/config.cc
+++ b/source/extensions/transport_sockets/proxy_protocol/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/transport_sockets/proxy_protocol/config.h"
+#include "source/extensions/transport_sockets/proxy_protocol/config.h"
 
 #include "envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.h"
 #include "envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc
index 8ce993c8d30d7..503c7898981db 100644
--- a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc
+++ b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc
@@ -1,14 +1,13 @@
-#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
+#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
 
 #include <sstream>
 
 #include "envoy/config/core/v3/proxy_protocol.pb.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
 
 using envoy::config::core::v3::ProxyProtocolConfig;
 using envoy::config::core::v3::ProxyProtocolConfig_Version;
diff --git a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h
index c4c9a80f629e9..05d787fcea8b6 100644
--- a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h
+++ b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h
@@ -4,10 +4,9 @@
 #include "envoy/network/connection.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-
-#include "extensions/transport_sockets/common/passthrough.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/transport_sockets/common/passthrough.h"
 
 using envoy::config::core::v3::ProxyProtocolConfig;
 using envoy::config::core::v3::ProxyProtocolConfig_Version;
diff --git a/source/extensions/transport_sockets/raw_buffer/BUILD b/source/extensions/transport_sockets/raw_buffer/BUILD
index 9c9ad99107d71..5f27c78663ccf 100644
--- a/source/extensions/transport_sockets/raw_buffer/BUILD
+++ b/source/extensions/transport_sockets/raw_buffer/BUILD
@@ -17,9 +17,9 @@ envoy_cc_extension(
     # This is core Envoy config.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/network:raw_buffer_socket_lib",
         "@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto",
     ],
diff --git a/source/extensions/transport_sockets/raw_buffer/config.cc b/source/extensions/transport_sockets/raw_buffer/config.cc
index b77df99bc96b9..04dc896635301 100644
--- a/source/extensions/transport_sockets/raw_buffer/config.cc
+++ b/source/extensions/transport_sockets/raw_buffer/config.cc
@@ -1,11 +1,11 @@
-#include "extensions/transport_sockets/raw_buffer/config.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
 
 #include <iostream>
 
 #include "envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.h"
 #include "envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.validate.h"
 
-#include "common/network/raw_buffer_socket.h"
+#include "source/common/network/raw_buffer_socket.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/starttls/BUILD b/source/extensions/transport_sockets/starttls/BUILD
index 31b016d9d97cc..31fcfef60a367 100644
--- a/source/extensions/transport_sockets/starttls/BUILD
+++ b/source/extensions/transport_sockets/starttls/BUILD
@@ -18,9 +18,9 @@ envoy_cc_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":starttls_socket_lib",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/config:utility_lib",
         "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto",
     ],
@@ -36,9 +36,9 @@ envoy_cc_library(
         "ssl",
     ],
     deps = [
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
diff --git a/source/extensions/transport_sockets/starttls/config.cc b/source/extensions/transport_sockets/starttls/config.cc
index 2e06edd4ad4d1..f4911dd3b89d1 100644
--- a/source/extensions/transport_sockets/starttls/config.cc
+++ b/source/extensions/transport_sockets/starttls/config.cc
@@ -1,6 +1,6 @@
-#include "extensions/transport_sockets/starttls/config.h"
+#include "source/extensions/transport_sockets/starttls/config.h"
 
-#include "extensions/transport_sockets/starttls/starttls_socket.h"
+#include "source/extensions/transport_sockets/starttls/starttls_socket.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/starttls/config.h b/source/extensions/transport_sockets/starttls/config.h
index 2b5edbbef6d00..d60c9dbf0a50c 100644
--- a/source/extensions/transport_sockets/starttls/config.h
+++ b/source/extensions/transport_sockets/starttls/config.h
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/starttls/starttls_socket.cc b/source/extensions/transport_sockets/starttls/starttls_socket.cc
index c87df0748d766..17c73aec17fd0 100644
--- a/source/extensions/transport_sockets/starttls/starttls_socket.cc
+++ b/source/extensions/transport_sockets/starttls/starttls_socket.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/starttls/starttls_socket.h"
+#include "source/extensions/transport_sockets/starttls/starttls_socket.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/starttls/starttls_socket.h b/source/extensions/transport_sockets/starttls/starttls_socket.h
index 616502b08bfa8..6583cc6a4e85f 100644
--- a/source/extensions/transport_sockets/starttls/starttls_socket.h
+++ b/source/extensions/transport_sockets/starttls/starttls_socket.h
@@ -6,8 +6,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/BUILD b/source/extensions/transport_sockets/tap/BUILD
index 0b2c1be6b9c1a..47437466ea2c4 100644
--- a/source/extensions/transport_sockets/tap/BUILD
+++ b/source/extensions/transport_sockets/tap/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
     name = "tap_config_interface",
     hdrs = ["tap_config.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
+        "//envoy/network:connection_interface",
         "//source/extensions/common/tap:tap_interface",
     ],
 )
@@ -39,7 +39,7 @@ envoy_cc_library(
     hdrs = ["tap.h"],
     deps = [
         ":tap_config_interface",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/common/tap:extension_config_base",
         "//source/extensions/transport_sockets/common:passthrough_lib",
@@ -59,9 +59,9 @@ envoy_cc_extension(
     deps = [
         ":tap_config_impl",
         ":tap_lib",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
diff --git a/source/extensions/transport_sockets/tap/config.cc b/source/extensions/transport_sockets/tap/config.cc
index 9c49f2b8a3bce..f389c8633c22d 100644
--- a/source/extensions/transport_sockets/tap/config.cc
+++ b/source/extensions/transport_sockets/tap/config.cc
@@ -1,15 +1,14 @@
-#include "extensions/transport_sockets/tap/config.h"
+#include "source/extensions/transport_sockets/tap/config.h"
 
 #include "envoy/config/tap/v3/common.pb.h"
 #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h"
 #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/transport_sockets/tap/tap.h"
-#include "extensions/transport_sockets/tap/tap_config_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/transport_sockets/tap/tap.h"
+#include "source/extensions/transport_sockets/tap/tap_config_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/tap.cc b/source/extensions/transport_sockets/tap/tap.cc
index 2f58c23703ce7..4d69a01bda958 100644
--- a/source/extensions/transport_sockets/tap/tap.cc
+++ b/source/extensions/transport_sockets/tap/tap.cc
@@ -1,8 +1,8 @@
-#include "extensions/transport_sockets/tap/tap.h"
+#include "source/extensions/transport_sockets/tap/tap.h"
 
 #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/tap.h b/source/extensions/transport_sockets/tap/tap.h
index 2971c3e846ba6..745b8f0a8c4e1 100644
--- a/source/extensions/transport_sockets/tap/tap.h
+++ b/source/extensions/transport_sockets/tap/tap.h
@@ -4,9 +4,9 @@
 #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h"
 #include "envoy/network/transport_socket.h"
 
-#include "extensions/common/tap/extension_config_base.h"
-#include "extensions/transport_sockets/common/passthrough.h"
-#include "extensions/transport_sockets/tap/tap_config.h"
+#include "source/extensions/common/tap/extension_config_base.h"
+#include "source/extensions/transport_sockets/common/passthrough.h"
+#include "source/extensions/transport_sockets/tap/tap_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/tap_config.h b/source/extensions/transport_sockets/tap/tap_config.h
index 8cbd431db0fe9..da0436eb8126a 100644
--- a/source/extensions/transport_sockets/tap/tap_config.h
+++ b/source/extensions/transport_sockets/tap/tap_config.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/connection.h"
 
-#include "extensions/common/tap/tap.h"
+#include "source/extensions/common/tap/tap.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.cc b/source/extensions/transport_sockets/tap/tap_config_impl.cc
index 4e817ebba294a..7855df9273ff2 100644
--- a/source/extensions/transport_sockets/tap/tap_config_impl.cc
+++ b/source/extensions/transport_sockets/tap/tap_config_impl.cc
@@ -1,9 +1,9 @@
-#include "extensions/transport_sockets/tap/tap_config_impl.h"
+#include "source/extensions/transport_sockets/tap/tap_config_impl.h"
 
 #include "envoy/data/tap/v3/transport.pb.h"
 
-#include "common/common/assert.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.h b/source/extensions/transport_sockets/tap/tap_config_impl.h
index fc883bffa5b76..cf715c3df9733 100644
--- a/source/extensions/transport_sockets/tap/tap_config_impl.h
+++ b/source/extensions/transport_sockets/tap/tap_config_impl.h
@@ -4,8 +4,8 @@
 #include "envoy/data/tap/v3/transport.pb.h"
 #include "envoy/event/timer.h"
 
-#include "extensions/common/tap/tap_config_base.h"
-#include "extensions/transport_sockets/tap/tap_config.h"
+#include "source/extensions/common/tap/tap_config_base.h"
+#include "source/extensions/transport_sockets/tap/tap_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/BUILD b/source/extensions/transport_sockets/tls/BUILD
index 766ba6ff34914..91deb5c164bf1 100644
--- a/source/extensions/transport_sockets/tls/BUILD
+++ b/source/extensions/transport_sockets/tls/BUILD
@@ -19,9 +19,9 @@ envoy_cc_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":ssl_socket_lib",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:transport_socket_config_interface",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
@@ -34,14 +34,14 @@ envoy_cc_library(
     deps = [
         ":context_lib",
         ":utility_lib",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/ssl:handshaker_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
-        "//include/envoy/ssl:ssl_socket_state",
-        "//include/envoy/ssl/private_key:private_key_callbacks_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/ssl:handshaker_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl:ssl_socket_state",
+        "//envoy/ssl/private_key:private_key_callbacks_interface",
+        "//envoy/ssl/private_key:private_key_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:minimal_logger_lib",
@@ -56,8 +56,8 @@ envoy_cc_library(
     hdrs = ["io_handle_bio.h"],
     external_deps = ["ssl"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:io_handle_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:io_handle_interface",
     ],
 )
 
@@ -80,14 +80,14 @@ envoy_cc_library(
         ":io_handle_bio_lib",
         ":ssl_handshaker_lib",
         ":utility_lib",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/ssl:handshaker_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
-        "//include/envoy/ssl:ssl_socket_state",
-        "//include/envoy/ssl/private_key:private_key_callbacks_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/network:connection_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/ssl:handshaker_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl:ssl_socket_state",
+        "//envoy/ssl/private_key:private_key_callbacks_interface",
+        "//envoy/ssl/private_key:private_key_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:minimal_logger_lib",
@@ -107,10 +107,10 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":ssl_handshaker_lib",
-        "//include/envoy/secret:secret_callbacks_interface",
-        "//include/envoy/secret:secret_provider_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:context_config_interface",
+        "//envoy/secret:secret_callbacks_interface",
+        "//envoy/secret:secret_provider_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:context_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/common:matchers_lib",
@@ -144,13 +144,13 @@ envoy_cc_library(
     deps = [
         ":stats_lib",
         ":utility_lib",
-        "//include/envoy/ssl:context_config_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/ssl:context_config_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl/private_key:private_key_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/common:assert_lib",
         "//source/common/common:base64_lib",
         "//source/common/common:hex_lib",
@@ -176,8 +176,8 @@ envoy_cc_library(
         "ssl",
     ],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:stats_macros",
         "//source/common/stats:symbol_table_lib",
         "//source/common/stats:utility_lib",
     ],
diff --git a/source/extensions/transport_sockets/tls/cert_validator/BUILD b/source/extensions/transport_sockets/tls/cert_validator/BUILD
index 2b4901b8d17a9..6fcffd4d9e5f9 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/BUILD
+++ b/source/extensions/transport_sockets/tls/cert_validator/BUILD
@@ -28,8 +28,8 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/ssl:context_config_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl:context_config_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:base64_lib",
         "//source/common/common:hex_lib",
diff --git a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h
index 9b55c1cf6fa1e..efec7cb3aa4e3 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h
+++ b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h
@@ -13,10 +13,9 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/common/matchers.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/matchers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "openssl/ssl.h"
 #include "openssl/x509v3.h"
diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc
index bb97cf0066578..cf4463f6e5a5e 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc
+++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h"
 
 #include <array>
 #include <deque>
@@ -12,23 +12,22 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/common/matchers.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h"
-#include "extensions/transport_sockets/tls/cert_validator/factory.h"
-#include "extensions/transport_sockets/tls/cert_validator/utility.h"
-#include "extensions/transport_sockets/tls/stats.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/matchers.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/factory.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/utility.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/synchronization/mutex.h"
 #include "openssl/ssl.h"
diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h
index ee5f655bae3f1..03a037ef33df7 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h
+++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h
@@ -14,11 +14,10 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/common/matchers.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h"
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/matchers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "absl/synchronization/mutex.h"
 #include "openssl/ssl.h"
diff --git a/source/extensions/transport_sockets/tls/cert_validator/factory.cc b/source/extensions/transport_sockets/tls/cert_validator/factory.cc
index 3ab5267ad4353..b17d5b338536d 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/factory.cc
+++ b/source/extensions/transport_sockets/tls/cert_validator/factory.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/cert_validator/factory.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/factory.h"
 
 #include "envoy/ssl/context_config.h"
 
diff --git a/source/extensions/transport_sockets/tls/cert_validator/factory.h b/source/extensions/transport_sockets/tls/cert_validator/factory.h
index 590bf15fcde95..9a1689ab17138 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/factory.h
+++ b/source/extensions/transport_sockets/tls/cert_validator/factory.h
@@ -3,10 +3,9 @@
 #include "envoy/common/pure.h"
 #include "envoy/ssl/context_config.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h"
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD
index 812d2f17b7d1c..a0723eb783f29 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD
+++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD
@@ -23,8 +23,8 @@ envoy_cc_extension(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/ssl:context_config_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl:context_config_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:base64_lib",
         "//source/common/common:c_smart_ptr_lib",
diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc
index 931fc398f0d65..bebf2a3067f98 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc
+++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h"
 
 #include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.h"
 #include "envoy/network/transport_socket.h"
@@ -6,15 +6,14 @@
 #include "envoy/ssl/context_config.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/config/datasource.h"
-#include "common/config/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/factory.h"
-#include "extensions/transport_sockets/tls/cert_validator/utility.h"
-#include "extensions/transport_sockets/tls/stats.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/factory.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/utility.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "openssl/ssl.h"
 #include "openssl/x509v3.h"
diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h
index 55b2fa3cc05b3..fc3a045d02558 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h
+++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h
@@ -13,12 +13,11 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/common/c_smart_ptr.h"
-#include "common/common/matchers.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h"
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/common/matchers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "openssl/ssl.h"
 #include "openssl/x509v3.h"
diff --git a/source/extensions/transport_sockets/tls/cert_validator/utility.cc b/source/extensions/transport_sockets/tls/cert_validator/utility.cc
index 53a3fd41ecea5..fac07fe3aeacd 100644
--- a/source/extensions/transport_sockets/tls/cert_validator/utility.cc
+++ b/source/extensions/transport_sockets/tls/cert_validator/utility.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/cert_validator/utility.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h b/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h
new file mode 100644
index 0000000000000..4b1cdfa8dfcb9
--- /dev/null
+++ b/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <string>
+
+#include "source/common/singleton/const_singleton.h"
+
+namespace Envoy {
+namespace Extensions {
+namespace TransportSockets {
+namespace Tls {
+
+/**
+ * Well-known certificate validator's names.
+ */
+class CertValidatorValues {
+public:
+  // default certificate validator
+  const std::string Default = "envoy.tls.cert_validator.default";
+
+  // SPIFFE(https://github.com/spiffe/spiffe)
+  const std::string SPIFFE = "envoy.tls.cert_validator.spiffe";
+};
+
+using CertValidatorNames = ConstSingleton<CertValidatorValues>;
+
+} // namespace Tls
+} // namespace TransportSockets
+} // namespace Extensions
+} // namespace Envoy
diff --git a/source/extensions/transport_sockets/tls/config.cc b/source/extensions/transport_sockets/tls/config.cc
index c743f5f6def86..4f4d46526c1f4 100644
--- a/source/extensions/transport_sockets/tls/config.cc
+++ b/source/extensions/transport_sockets/tls/config.cc
@@ -1,12 +1,11 @@
-#include "extensions/transport_sockets/tls/config.h"
+#include "source/extensions/transport_sockets/tls/config.h"
 
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/context_config_impl.cc b/source/extensions/transport_sockets/tls/context_config_impl.cc
index d20f55d817e84..4dae255fa1c37 100644
--- a/source/extensions/transport_sockets/tls/context_config_impl.cc
+++ b/source/extensions/transport_sockets/tls/context_config_impl.cc
@@ -1,18 +1,17 @@
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #include <memory>
 #include <string>
 
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-#include "common/protobuf/utility.h"
-#include "common/secret/sds_api.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/secret/sds_api.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
 
 #include "openssl/ssl.h"
 
diff --git a/source/extensions/transport_sockets/tls/context_config_impl.h b/source/extensions/transport_sockets/tls/context_config_impl.h
index 549575aa0937e..7dcbb0ea8681e 100644
--- a/source/extensions/transport_sockets/tls/context_config_impl.h
+++ b/source/extensions/transport_sockets/tls/context_config_impl.h
@@ -9,9 +9,9 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/ssl/context_config.h"
 
-#include "common/common/empty_string.h"
-#include "common/json/json_loader.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/context_impl.cc b/source/extensions/transport_sockets/tls/context_impl.cc
index 29c82704c8ea4..378097a1aca7a 100644
--- a/source/extensions/transport_sockets/tls/context_impl.cc
+++ b/source/extensions/transport_sockets/tls/context_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,19 +12,18 @@
 #include "envoy/stats/scope.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/fmt.h"
-#include "common/common/hex.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/stats/utility.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/factory.h"
-#include "extensions/transport_sockets/tls/stats.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/stats/utility.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/factory.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/match.h"
diff --git a/source/extensions/transport_sockets/tls/context_impl.h b/source/extensions/transport_sockets/tls/context_impl.h
index 87c830184fe3a..a3b981b68eb6b 100644
--- a/source/extensions/transport_sockets/tls/context_impl.h
+++ b/source/extensions/transport_sockets/tls/context_impl.h
@@ -14,13 +14,12 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/matchers.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ocsp/ocsp.h"
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/matchers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "absl/synchronization/mutex.h"
 #include "openssl/ssl.h"
diff --git a/source/extensions/transport_sockets/tls/context_manager_impl.cc b/source/extensions/transport_sockets/tls/context_manager_impl.cc
index fd0eefe761ea6..7c83121892f2d 100644
--- a/source/extensions/transport_sockets/tls/context_manager_impl.cc
+++ b/source/extensions/transport_sockets/tls/context_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include <algorithm>
 #include <functional>
@@ -6,9 +6,8 @@
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/transport_sockets/tls/context_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/context_manager_impl.h b/source/extensions/transport_sockets/tls/context_manager_impl.h
index 3b680fc91c754..eb8914fc0009d 100644
--- a/source/extensions/transport_sockets/tls/context_manager_impl.h
+++ b/source/extensions/transport_sockets/tls/context_manager_impl.h
@@ -8,7 +8,7 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/io_handle_bio.cc b/source/extensions/transport_sockets/tls/io_handle_bio.cc
index e4867e95c6237..f7ede00cd45a7 100644
--- a/source/extensions/transport_sockets/tls/io_handle_bio.cc
+++ b/source/extensions/transport_sockets/tls/io_handle_bio.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/io_handle_bio.h"
+#include "source/extensions/transport_sockets/tls/io_handle_bio.h"
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/io_handle.h"
diff --git a/source/extensions/transport_sockets/tls/ocsp/BUILD b/source/extensions/transport_sockets/tls/ocsp/BUILD
index e2995afd45cdf..70b250cffe15e 100644
--- a/source/extensions/transport_sockets/tls/ocsp/BUILD
+++ b/source/extensions/transport_sockets/tls/ocsp/BUILD
@@ -15,8 +15,8 @@ envoy_cc_library(
     repository = "",
     deps = [
         ":asn1_utility_lib",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/ssl:context_config_interface",
+        "//envoy/common:time_interface",
+        "//envoy/ssl:context_config_interface",
         "//source/extensions/transport_sockets/tls:utility_lib",
     ],
 )
@@ -27,8 +27,8 @@ envoy_cc_library(
     hdrs = ["asn1_utility.h"],
     repository = "",
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/ssl:context_config_interface",
+        "//envoy/common:time_interface",
+        "//envoy/ssl:context_config_interface",
         "//source/common/common:c_smart_ptr_lib",
     ],
 )
diff --git a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc
index 3da51ed7e9f3f..e152cf8d0f1fd 100644
--- a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc
+++ b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc
@@ -1,6 +1,6 @@
-#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h"
+#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h"
 
-#include "common/common/c_smart_ptr.h"
+#include "source/common/common/c_smart_ptr.h"
 
 #include "absl/strings/ascii.h"
 
diff --git a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h
index 05bea0c2d19b8..061b0fc5f7a9f 100644
--- a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h
+++ b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h
@@ -7,7 +7,7 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/time.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
diff --git a/source/extensions/transport_sockets/tls/ocsp/ocsp.cc b/source/extensions/transport_sockets/tls/ocsp/ocsp.cc
index 32410365916fb..0e493685ab70c 100644
--- a/source/extensions/transport_sockets/tls/ocsp/ocsp.cc
+++ b/source/extensions/transport_sockets/tls/ocsp/ocsp.cc
@@ -1,9 +1,8 @@
-#include "extensions/transport_sockets/tls/ocsp/ocsp.h"
+#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h"
 
-#include "common/common/utility.h"
-
-#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/transport_sockets/tls/private_key/BUILD b/source/extensions/transport_sockets/tls/private_key/BUILD
index f6163ca640126..3d9a42a78c76d 100644
--- a/source/extensions/transport_sockets/tls/private_key/BUILD
+++ b/source/extensions/transport_sockets/tls/private_key/BUILD
@@ -17,10 +17,10 @@ envoy_cc_library(
         "private_key_manager_impl.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/registry",
-        "//include/envoy/ssl/private_key:private_key_config_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/registry",
+        "//envoy/ssl/private_key:private_key_config_interface",
+        "//envoy/ssl/private_key:private_key_interface",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc
index b7103768ce9c1..f886beeaa96ed 100644
--- a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc
+++ b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
 
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/registry/registry.h"
diff --git a/source/extensions/transport_sockets/tls/ssl_handshaker.cc b/source/extensions/transport_sockets/tls/ssl_handshaker.cc
index 766454bbd8794..5361d7b42bc4e 100644
--- a/source/extensions/transport_sockets/tls/ssl_handshaker.cc
+++ b/source/extensions/transport_sockets/tls/ssl_handshaker.cc
@@ -1,13 +1,12 @@
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/hex.h"
-#include "common/http/headers.h"
-
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/hex.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/strings/str_replace.h"
 #include "openssl/err.h"
diff --git a/source/extensions/transport_sockets/tls/ssl_handshaker.h b/source/extensions/transport_sockets/tls/ssl_handshaker.h
index ec43d5a784d56..81577c8181744 100644
--- a/source/extensions/transport_sockets/tls/ssl_handshaker.h
+++ b/source/extensions/transport_sockets/tls/ssl_handshaker.h
@@ -13,9 +13,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/extensions/transport_sockets/tls/ssl_socket.cc b/source/extensions/transport_sockets/tls/ssl_socket.cc
index b7d8a85635124..98c2989b57bf7 100644
--- a/source/extensions/transport_sockets/tls/ssl_socket.cc
+++ b/source/extensions/transport_sockets/tls/ssl_socket.cc
@@ -1,16 +1,15 @@
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/hex.h"
-#include "common/http/headers.h"
-#include "common/runtime/runtime_features.h"
-
-#include "extensions/transport_sockets/tls/io_handle_bio.h"
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/hex.h"
+#include "source/common/http/headers.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/extensions/transport_sockets/tls/io_handle_bio.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/strings/str_replace.h"
 #include "openssl/err.h"
diff --git a/source/extensions/transport_sockets/tls/ssl_socket.h b/source/extensions/transport_sockets/tls/ssl_socket.h
index 203fbe7078493..217c7abcff06e 100644
--- a/source/extensions/transport_sockets/tls/ssl_socket.h
+++ b/source/extensions/transport_sockets/tls/ssl_socket.h
@@ -13,11 +13,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/transport_sockets/tls/context_impl.h"
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/synchronization/mutex.h"
diff --git a/source/extensions/transport_sockets/tls/stats.cc b/source/extensions/transport_sockets/tls/stats.cc
index f162e9db75129..5a5cdc86c0541 100644
--- a/source/extensions/transport_sockets/tls/stats.cc
+++ b/source/extensions/transport_sockets/tls/stats.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
diff --git a/source/extensions/transport_sockets/tls/utility.cc b/source/extensions/transport_sockets/tls/utility.cc
index 1dfa5df48b696..cbc6739c02996 100644
--- a/source/extensions/transport_sockets/tls/utility.cc
+++ b/source/extensions/transport_sockets/tls/utility.cc
@@ -1,10 +1,10 @@
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/safe_memcpy.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/strings/str_join.h"
 #include "openssl/x509v3.h"
diff --git a/source/extensions/transport_sockets/tls/utility.h b/source/extensions/transport_sockets/tls/utility.h
index 3bb48b2aa1481..76824328d46ba 100644
--- a/source/extensions/transport_sockets/tls/utility.h
+++ b/source/extensions/transport_sockets/tls/utility.h
@@ -5,7 +5,7 @@
 
 #include "envoy/ssl/context.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "absl/types/optional.h"
 #include "openssl/ssl.h"
diff --git a/source/extensions/transport_sockets/well_known_names.h b/source/extensions/transport_sockets/well_known_names.h
index ef6e85361feed..c6edb18ab6937 100644
--- a/source/extensions/transport_sockets/well_known_names.h
+++ b/source/extensions/transport_sockets/well_known_names.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/BUILD b/source/extensions/upstreams/http/BUILD
index 247274b2fa85b..bf6272398e7b5 100644
--- a/source/extensions/upstreams/http/BUILD
+++ b/source/extensions/upstreams/http/BUILD
@@ -15,7 +15,7 @@ envoy_cc_extension(
     # This is core Envoy config.
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
         "//source/common/http:utility_lib",
diff --git a/source/extensions/upstreams/http/config.cc b/source/extensions/upstreams/http/config.cc
index fd204bfd75d84..29cde124642b0 100644
--- a/source/extensions/upstreams/http/config.cc
+++ b/source/extensions/upstreams/http/config.cc
@@ -1,4 +1,4 @@
-#include "extensions/upstreams/http/config.h"
+#include "source/extensions/upstreams/http/config.h"
 
 #include <chrono>
 #include <memory>
@@ -9,10 +9,10 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/utility.h"
-#include "common/http/http1/settings.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/http1/settings.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/config.h b/source/extensions/upstreams/http/config.h
index 4668c5d1a38a7..7ae4479c63d2b 100644
--- a/source/extensions/upstreams/http/config.h
+++ b/source/extensions/upstreams/http/config.h
@@ -15,8 +15,8 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/common/logger.h"
-#include "common/protobuf/message_validator_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/protobuf/message_validator_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/generic/config.cc b/source/extensions/upstreams/http/generic/config.cc
index caedb4babd786..b2b02e28ac56a 100644
--- a/source/extensions/upstreams/http/generic/config.cc
+++ b/source/extensions/upstreams/http/generic/config.cc
@@ -1,7 +1,7 @@
-#include "extensions/upstreams/http/generic/config.h"
+#include "source/extensions/upstreams/http/generic/config.h"
 
-#include "extensions/upstreams/http/http/upstream_request.h"
-#include "extensions/upstreams/http/tcp/upstream_request.h"
+#include "source/extensions/upstreams/http/http/upstream_request.h"
+#include "source/extensions/upstreams/http/tcp/upstream_request.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/http/BUILD b/source/extensions/upstreams/http/http/BUILD
index 4a4bd1be575f0..d53b9a92a9dd5 100644
--- a/source/extensions/upstreams/http/http/BUILD
+++ b/source/extensions/upstreams/http/http/BUILD
@@ -34,11 +34,11 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:codes_lib",
diff --git a/source/extensions/upstreams/http/http/config.cc b/source/extensions/upstreams/http/http/config.cc
index a6084a1219d81..620915a11d66b 100644
--- a/source/extensions/upstreams/http/http/config.cc
+++ b/source/extensions/upstreams/http/http/config.cc
@@ -1,6 +1,6 @@
-#include "extensions/upstreams/http/http/config.h"
+#include "source/extensions/upstreams/http/http/config.h"
 
-#include "extensions/upstreams/http/http/upstream_request.h"
+#include "source/extensions/upstreams/http/http/upstream_request.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/http/upstream_request.cc b/source/extensions/upstreams/http/http/upstream_request.cc
index ee411248f853c..4f9c42448d8d2 100644
--- a/source/extensions/upstreams/http/http/upstream_request.cc
+++ b/source/extensions/upstreams/http/http/upstream_request.cc
@@ -1,4 +1,4 @@
-#include "extensions/upstreams/http/http/upstream_request.h"
+#include "source/extensions/upstreams/http/http/upstream_request.h"
 
 #include <cstdint>
 #include <memory>
@@ -10,13 +10,13 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/utility.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/router/router.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/router/router.h"
 
 using Envoy::Router::GenericConnectionPoolCallbacks;
 
diff --git a/source/extensions/upstreams/http/http/upstream_request.h b/source/extensions/upstreams/http/http/upstream_request.h
index 97f0a54c46a6b..a49dc28758904 100644
--- a/source/extensions/upstreams/http/http/upstream_request.h
+++ b/source/extensions/upstreams/http/http/upstream_request.h
@@ -7,10 +7,10 @@
 #include "envoy/http/conn_pool.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/config/well_known_names.h"
-#include "common/router/upstream_request.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/router/upstream_request.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/tcp/BUILD b/source/extensions/upstreams/http/tcp/BUILD
index 95b2d94dbae47..869c0ee5ec6a8 100644
--- a/source/extensions/upstreams/http/tcp/BUILD
+++ b/source/extensions/upstreams/http/tcp/BUILD
@@ -34,9 +34,9 @@ envoy_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:utility_lib",
diff --git a/source/extensions/upstreams/http/tcp/config.cc b/source/extensions/upstreams/http/tcp/config.cc
index 8f0df971dc9f8..b0773c0a95359 100644
--- a/source/extensions/upstreams/http/tcp/config.cc
+++ b/source/extensions/upstreams/http/tcp/config.cc
@@ -1,6 +1,6 @@
-#include "extensions/upstreams/http/tcp/config.h"
+#include "source/extensions/upstreams/http/tcp/config.h"
 
-#include "extensions/upstreams/http/tcp/upstream_request.h"
+#include "source/extensions/upstreams/http/tcp/upstream_request.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/tcp/upstream_request.cc b/source/extensions/upstreams/http/tcp/upstream_request.cc
index 3ec33c73284ea..17d291a1a437a 100644
--- a/source/extensions/upstreams/http/tcp/upstream_request.cc
+++ b/source/extensions/upstreams/http/tcp/upstream_request.cc
@@ -1,20 +1,19 @@
-#include "extensions/upstreams/http/tcp/upstream_request.h"
+#include "source/extensions/upstreams/http/tcp/upstream_request.h"
 
 #include <cstdint>
 #include <memory>
 
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/router/router.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/router/router.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/http/tcp/upstream_request.h b/source/extensions/upstreams/http/tcp/upstream_request.h
index 1b57526400ea7..7cdd070f041a7 100644
--- a/source/extensions/upstreams/http/tcp/upstream_request.h
+++ b/source/extensions/upstreams/http/tcp/upstream_request.h
@@ -7,12 +7,12 @@
 #include "envoy/tcp/conn_pool.h"
 #include "envoy/upstream/thread_local_cluster.h"
 
-#include "common/buffer/watermark_buffer.h"
-#include "common/common/cleanup.h"
-#include "common/common/logger.h"
-#include "common/config/well_known_names.h"
-#include "common/router/upstream_request.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/router/upstream_request.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/upstreams/tcp/generic/config.cc b/source/extensions/upstreams/tcp/generic/config.cc
index 7d708c4a666a1..77625e5fd0404 100644
--- a/source/extensions/upstreams/tcp/generic/config.cc
+++ b/source/extensions/upstreams/tcp/generic/config.cc
@@ -1,9 +1,9 @@
-#include "extensions/upstreams/tcp/generic/config.h"
+#include "source/extensions/upstreams/tcp/generic/config.h"
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/codec_client.h"
-#include "common/tcp_proxy/upstream.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/tcp_proxy/upstream.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/wasm_runtime/null/BUILD b/source/extensions/wasm_runtime/null/BUILD
index 1dbb4846e20b4..d47a3c211516b 100644
--- a/source/extensions/wasm_runtime/null/BUILD
+++ b/source/extensions/wasm_runtime/null/BUILD
@@ -12,7 +12,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
         "@proxy_wasm_cpp_host//:null_lib",
     ],
diff --git a/source/extensions/wasm_runtime/null/config.cc b/source/extensions/wasm_runtime/null/config.cc
index e281a24deb748..62de7669608db 100644
--- a/source/extensions/wasm_runtime/null/config.cc
+++ b/source/extensions/wasm_runtime/null/config.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/null.h"
 
diff --git a/source/extensions/wasm_runtime/v8/BUILD b/source/extensions/wasm_runtime/v8/BUILD
index 45dd6833558f5..708c38aa04481 100644
--- a/source/extensions/wasm_runtime/v8/BUILD
+++ b/source/extensions/wasm_runtime/v8/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
     ] + envoy_select_wasm_v8([
         "@proxy_wasm_cpp_host//:v8_lib",
diff --git a/source/extensions/wasm_runtime/v8/config.cc b/source/extensions/wasm_runtime/v8/config.cc
index 0aabca1fdd08e..c4d77714a9fa9 100644
--- a/source/extensions/wasm_runtime/v8/config.cc
+++ b/source/extensions/wasm_runtime/v8/config.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/v8.h"
 
diff --git a/source/extensions/wasm_runtime/wamr/BUILD b/source/extensions/wasm_runtime/wamr/BUILD
index 69766fad9e4ce..fdf3bc67d150d 100644
--- a/source/extensions/wasm_runtime/wamr/BUILD
+++ b/source/extensions/wasm_runtime/wamr/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
     ] + envoy_select_wasm_wamr([
         "@proxy_wasm_cpp_host//:wamr_lib",
diff --git a/source/extensions/wasm_runtime/wamr/config.cc b/source/extensions/wasm_runtime/wamr/config.cc
index 5b6afb04a197e..4c34aede55558 100644
--- a/source/extensions/wasm_runtime/wamr/config.cc
+++ b/source/extensions/wasm_runtime/wamr/config.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/wamr.h"
 
diff --git a/source/extensions/wasm_runtime/wasmtime/BUILD b/source/extensions/wasm_runtime/wasmtime/BUILD
index 83ee6552fe39a..4db207bd2f4ea 100644
--- a/source/extensions/wasm_runtime/wasmtime/BUILD
+++ b/source/extensions/wasm_runtime/wasmtime/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
     ] + envoy_select_wasm_wasmtime([
         "@proxy_wasm_cpp_host//:wasmtime_lib",
diff --git a/source/extensions/wasm_runtime/wasmtime/config.cc b/source/extensions/wasm_runtime/wasmtime/config.cc
index 9e25ce8e15480..331504f2e44b9 100644
--- a/source/extensions/wasm_runtime/wasmtime/config.cc
+++ b/source/extensions/wasm_runtime/wasmtime/config.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/wasmtime.h"
 
diff --git a/source/extensions/wasm_runtime/wavm/BUILD b/source/extensions/wasm_runtime/wavm/BUILD
index cca25e7aaace4..132957c1ee597 100644
--- a/source/extensions/wasm_runtime/wavm/BUILD
+++ b/source/extensions/wasm_runtime/wavm/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/common/wasm:wasm_runtime_factory_interface",
     ] + envoy_select_wasm_wavm([
         "@proxy_wasm_cpp_host//:wavm_lib",
diff --git a/source/extensions/wasm_runtime/wavm/config.cc b/source/extensions/wasm_runtime/wavm/config.cc
index be53e31f523b1..3a94ccc8831a3 100644
--- a/source/extensions/wasm_runtime/wavm/config.cc
+++ b/source/extensions/wasm_runtime/wavm/config.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/common/wasm/wasm_runtime_factory.h"
+#include "source/extensions/common/wasm/wasm_runtime_factory.h"
 
 #include "include/proxy-wasm/wavm.h"
 
diff --git a/source/extensions/watchdog/profile_action/BUILD b/source/extensions/watchdog/profile_action/BUILD
index 6c0ab2f392d6a..1de6bb89d0755 100644
--- a/source/extensions/watchdog/profile_action/BUILD
+++ b/source/extensions/watchdog/profile_action/BUILD
@@ -17,11 +17,11 @@ envoy_cc_library(
         "abseil_optional",
     ],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/server:guarddog_config_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/api:api_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/server:guarddog_config_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/profiler:profiler_lib",
         "//source/common/protobuf:utility_lib",
         "//source/common/stats:symbol_table_lib",
@@ -35,7 +35,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     deps = [
         ":profile_action_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/common:assert_lib",
         "//source/common/config:utility_lib",
         "//source/common/protobuf",
diff --git a/source/extensions/watchdog/profile_action/config.cc b/source/extensions/watchdog/profile_action/config.cc
index 035fa17641e02..ebf4dfa24e08f 100644
--- a/source/extensions/watchdog/profile_action/config.cc
+++ b/source/extensions/watchdog/profile_action/config.cc
@@ -1,11 +1,10 @@
-#include "extensions/watchdog/profile_action/config.h"
+#include "source/extensions/watchdog/profile_action/config.h"
 
 #include "envoy/registry/registry.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-
-#include "extensions/watchdog/profile_action/profile_action.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/extensions/watchdog/profile_action/profile_action.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/watchdog/profile_action/config.h b/source/extensions/watchdog/profile_action/config.h
index 0ccce8a03b7cd..de821d48fcedd 100644
--- a/source/extensions/watchdog/profile_action/config.h
+++ b/source/extensions/watchdog/profile_action/config.h
@@ -3,7 +3,7 @@
 #include "envoy/extensions/watchdog/profile_action/v3alpha/profile_action.pb.h"
 #include "envoy/server/guarddog_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/watchdog/profile_action/profile_action.cc b/source/extensions/watchdog/profile_action/profile_action.cc
index d324f45da39d8..3d1fc5adc4653 100644
--- a/source/extensions/watchdog/profile_action/profile_action.cc
+++ b/source/extensions/watchdog/profile_action/profile_action.cc
@@ -1,12 +1,12 @@
-#include "extensions/watchdog/profile_action/profile_action.h"
+#include "source/extensions/watchdog/profile_action/profile_action.h"
 
 #include <chrono>
 
 #include "envoy/thread/thread.h"
 
-#include "common/profiler/profiler.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/profiler/profiler.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "absl/strings/str_format.h"
 
diff --git a/source/server/BUILD b/source/server/BUILD
index 38c63fd61a353..dc5d9ad5a8fb6 100644
--- a/source/server/BUILD
+++ b/source/server/BUILD
@@ -31,16 +31,16 @@ envoy_cc_library(
     srcs = ["configuration_impl.cc"],
     hdrs = ["configuration_impl.h"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:tracer_config_interface",
-        "//include/envoy/ssl:context_manager_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:tracer_config_interface",
+        "//envoy/ssl:context_manager_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
@@ -78,16 +78,16 @@ envoy_cc_library(
     ],
     deps = [
         ":active_tcp_listener",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:linked_object",
         "//source/common/common:non_copyable",
         "//source/common/event:deferred_task",
@@ -102,9 +102,9 @@ envoy_cc_library(
         "active_listener_base.h",
     ],
     deps = [
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/stats:timespan_lib",
     ],
 )
@@ -116,17 +116,17 @@ envoy_cc_library(
         "active_tcp_listener.h",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/stats:timespan_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/stats:timespan_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:linked_object",
         "//source/common/common:non_copyable",
@@ -146,13 +146,13 @@ envoy_cc_library(
         "active_udp_listener.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:exception_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:exception_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/server:listener_manager_interface",
         "//source/server:connection_handler_impl",
     ],
 )
@@ -164,11 +164,11 @@ envoy_cc_library(
         "drain_manager_impl.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/server:drain_manager_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/server:drain_manager_interface",
+        "//envoy/server:instance_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
@@ -182,16 +182,16 @@ envoy_cc_library(
     external_deps = ["abseil_optional"],
     deps = [
         ":watchdog_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/common:time_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server:guarddog_config_interface",
-        "//include/envoy/server:guarddog_interface",
-        "//include/envoy/server:watchdog_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/api:api_interface",
+        "//envoy/common:time_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server:guarddog_config_interface",
+        "//envoy/server:guarddog_interface",
+        "//envoy/server:watchdog_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:thread_lib",
@@ -216,13 +216,13 @@ envoy_cc_library(
     hdrs = envoy_select_hot_restart(["hot_restarting_base.h"]),
     deps = [
         ":hot_restart_cc_proto",
-        "//include/envoy/api:os_sys_calls_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/server:hot_restart_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/api:os_sys_calls_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/server:hot_restart_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:options_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:mem_block_builder_lib",
@@ -264,12 +264,12 @@ envoy_cc_library(
     deps = [
         ":hot_restarting_child",
         ":hot_restarting_parent",
-        "//include/envoy/api:os_sys_calls_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/server:hot_restart_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:options_interface",
+        "//envoy/api:os_sys_calls_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/server:hot_restart_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:options_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//source/common/stats:allocator_lib",
@@ -280,7 +280,7 @@ envoy_cc_library(
     name = "hot_restart_nop_lib",
     hdrs = ["hot_restart_nop_impl.h"],
     deps = [
-        "//include/envoy/server:hot_restart_interface",
+        "//envoy/server:hot_restart_interface",
         "//source/common/stats:allocator_lib",
     ],
 )
@@ -308,10 +308,10 @@ envoy_cc_library(
     copts = ["-DHAVE_LONG_LONG"],
     external_deps = ["tclap"],
     deps = [
-        "//include/envoy/network:address_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/network:address_interface",
+        "//envoy/registry",
+        "//envoy/server:options_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:logger_lib",
         "//source/common/common:macros",
@@ -327,9 +327,9 @@ envoy_cc_library(
     srcs = ["overload_manager_impl.cc"],
     hdrs = ["overload_manager_impl.h"],
     deps = [
-        "//include/envoy/server/overload:overload_manager_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/server/overload:overload_manager_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//source/common/common:logger_lib",
         "//source/common/config:utility_lib",
         "//source/common/event:scaled_range_timer_manager_lib",
@@ -344,10 +344,10 @@ envoy_cc_library(
     srcs = ["lds_api.cc"],
     hdrs = ["lds_api.h"],
     deps = [
-        "//include/envoy/config:subscription_factory_interface",
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/init:manager_interface",
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/config:subscription_factory_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/init:manager_interface",
+        "//envoy/server:listener_manager_interface",
         "//source/common/common:cleanup_lib",
         "//source/common/config:api_version_lib",
         "//source/common/config:subscription_base_interface",
@@ -384,13 +384,13 @@ envoy_cc_library(
         ":filter_chain_manager_lib",
         ":lds_api_lib",
         ":transport_socket_config_lib",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/server:api_listener_interface",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/server:worker_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/server:api_listener_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/server:worker_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/common:basic_resource_lib",
         "//source/common/common:empty_string",
@@ -432,9 +432,9 @@ envoy_cc_library(
     hdrs = ["filter_chain_manager_impl.h"],
     deps = [
         ":filter_chain_factory_context_callback",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/server:transport_socket_config_interface",
         "//source/common/common:empty_string",
         "//source/common/config:utility_lib",
         "//source/common/init:manager_lib",
@@ -448,7 +448,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "process_context_lib",
     hdrs = ["process_context_impl.h"],
-    deps = ["//include/envoy/server:process_context_interface"],
+    deps = ["//envoy/server:process_context_interface"],
 )
 
 envoy_cc_library(
@@ -466,7 +466,7 @@ envoy_cc_library(
     name = "resource_monitor_config_lib",
     hdrs = ["resource_monitor_config_impl.h"],
     deps = [
-        "//include/envoy/server:resource_monitor_config_interface",
+        "//envoy/server:resource_monitor_config_interface",
     ],
 )
 
@@ -487,21 +487,21 @@ envoy_cc_library(
         ":listener_manager_lib",
         ":ssl_context_manager_lib",
         ":worker_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:signal_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/server:bootstrap_extension_config_interface",
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server:drain_manager_interface",
-        "//include/envoy/server:fatal_action_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/server:process_context_interface",
-        "//include/envoy/stats:stats_macros",
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:signal_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/server:bootstrap_extension_config_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server:drain_manager_interface",
+        "//envoy/server:fatal_action_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/server:options_interface",
+        "//envoy/server:process_context_interface",
+        "//envoy/stats:stats_macros",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/access_log:access_log_manager_lib",
         "//source/common/api:api_lib",
         "//source/common/common:cleanup_lib",
@@ -541,8 +541,8 @@ envoy_cc_library(
     srcs = ["ssl_context_manager.cc"],
     hdrs = ["ssl_context_manager.h"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/ssl:context_manager_interface",
+        "//envoy/registry",
+        "//envoy/ssl:context_manager_interface",
     ],
 )
 
@@ -555,8 +555,8 @@ envoy_cc_library(
     name = "watchdog_lib",
     hdrs = ["watchdog_impl.h"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/server:watchdog_interface",
+        "//envoy/common:time_interface",
+        "//envoy/server:watchdog_interface",
         "//source/common/common:assert_lib",
     ],
 )
@@ -568,16 +568,16 @@ envoy_cc_library(
     deps = [
         ":connection_handler_lib",
         ":listener_hooks_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:exception_interface",
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server:guarddog_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/server:worker_interface",
-        "//include/envoy/thread:thread_interface",
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:exception_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server:guarddog_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/server:worker_interface",
+        "//envoy/thread:thread_interface",
+        "//envoy/thread_local:thread_local_interface",
     ],
 )
 
@@ -585,7 +585,7 @@ envoy_cc_library(
     name = "transport_socket_config_lib",
     hdrs = ["transport_socket_config_impl.h"],
     deps = [
-        "//include/envoy/server:transport_socket_config_interface",
+        "//envoy/server:transport_socket_config_interface",
     ],
 )
 
@@ -595,7 +595,7 @@ envoy_cc_library(
     hdrs = ["active_raw_udp_listener_config.h"],
     deps = [
         ":connection_handler_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
     ],
 )
 
@@ -603,7 +603,7 @@ envoy_cc_library(
     name = "filter_chain_factory_context_callback",
     hdrs = ["filter_chain_factory_context_callback.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/server/active_raw_udp_listener_config.cc b/source/server/active_raw_udp_listener_config.cc
index 28abfe2ceb314..86de0c3053b07 100644
--- a/source/server/active_raw_udp_listener_config.cc
+++ b/source/server/active_raw_udp_listener_config.cc
@@ -1,10 +1,10 @@
-#include "server/active_raw_udp_listener_config.h"
+#include "source/server/active_raw_udp_listener_config.h"
 
 #include <memory>
 #include <string>
 
-#include "server/active_udp_listener.h"
-#include "server/connection_handler_impl.h"
+#include "source/server/active_udp_listener.h"
+#include "source/server/connection_handler_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/active_tcp_listener.cc b/source/server/active_tcp_listener.cc
index b104bc2e4ef2c..880f234c8a7ba 100644
--- a/source/server/active_tcp_listener.cc
+++ b/source/server/active_tcp_listener.cc
@@ -1,4 +1,4 @@
-#include "server/active_tcp_listener.h"
+#include "source/server/active_tcp_listener.h"
 
 #include <chrono>
 
@@ -7,11 +7,11 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/event/deferred_task.h"
-#include "common/network/connection_impl.h"
-#include "common/network/utility.h"
-#include "common/stats/timespan_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/deferred_task.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/timespan_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/active_tcp_listener.h b/source/server/active_tcp_listener.h
index c698faaa06058..469e1677c999e 100644
--- a/source/server/active_tcp_listener.h
+++ b/source/server/active_tcp_listener.h
@@ -4,10 +4,9 @@
 #include "envoy/event/timer.h"
 #include "envoy/stats/timespan.h"
 
-#include "common/common/linked_object.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "server/active_listener_base.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/server/active_listener_base.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/active_udp_listener.cc b/source/server/active_udp_listener.cc
index ceb01bbcd14e9..c20d2809aa07f 100644
--- a/source/server/active_udp_listener.cc
+++ b/source/server/active_udp_listener.cc
@@ -1,10 +1,10 @@
-#include "server/active_udp_listener.h"
+#include "source/server/active_udp_listener.h"
 
 #include "envoy/network/exception.h"
 #include "envoy/server/listener_manager.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 #include "spdlog/spdlog.h"
 
diff --git a/source/server/active_udp_listener.h b/source/server/active_udp_listener.h
index 08472bc853c57..520663ac4ddf8 100644
--- a/source/server/active_udp_listener.h
+++ b/source/server/active_udp_listener.h
@@ -8,9 +8,8 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/network/listener.h"
 
-#include "common/network/utility.h"
-
-#include "server/active_listener_base.h"
+#include "source/common/network/utility.h"
+#include "source/server/active_listener_base.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/BUILD b/source/server/admin/BUILD
index 1df8446d2a17f..533e22849b45f 100644
--- a/source/server/admin/BUILD
+++ b/source/server/admin/BUILD
@@ -26,15 +26,15 @@ envoy_cc_library(
         ":server_info_handler_lib",
         ":stats_handler_lib",
         ":utils_lib",
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:hot_restart_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/server:listener_manager_interface",
-        "//include/envoy/server:options_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:hot_restart_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/server:listener_manager_interface",
+        "//envoy/server:options_interface",
         "//source/common/access_log:access_log_lib",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
@@ -73,8 +73,8 @@ envoy_cc_library(
     hdrs = ["admin_filter.h"],
     deps = [
         ":utils_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/server:admin_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/server:admin_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:codes_lib",
@@ -87,7 +87,7 @@ envoy_cc_library(
     name = "handler_ctx_lib",
     hdrs = ["handler_ctx.h"],
     deps = [
-        "//include/envoy/server:instance_interface",
+        "//envoy/server:instance_interface",
     ],
 )
 
@@ -99,9 +99,9 @@ envoy_cc_library(
         ":handler_ctx_lib",
         ":prometheus_stats_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/html:utility_lib",
         "//source/common/http:codes_lib",
@@ -129,9 +129,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -146,9 +146,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -162,9 +162,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/http:codes_lib",
@@ -178,8 +178,8 @@ envoy_cc_library(
     hdrs = ["profiling_handler.h"],
     deps = [
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -194,9 +194,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -210,9 +210,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -229,9 +229,9 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -248,9 +248,9 @@ envoy_cc_library(
         ":config_tracker_lib",
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -267,8 +267,8 @@ envoy_cc_library(
     deps = [
         ":handler_ctx_lib",
         ":utils_lib",
-        "//include/envoy/server:admin_interface",
-        "//include/envoy/server:instance_interface",
+        "//envoy/server:admin_interface",
+        "//envoy/server:instance_interface",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
@@ -280,7 +280,7 @@ envoy_cc_library(
     srcs = ["utils.cc"],
     hdrs = ["utils.h"],
     deps = [
-        "//include/envoy/init:manager_interface",
+        "//envoy/init:manager_interface",
         "//source/common/common:enum_to_int",
         "//source/common/http:codes_lib",
         "//source/common/http:header_map_lib",
@@ -294,7 +294,7 @@ envoy_cc_library(
     srcs = ["config_tracker_impl.cc"],
     hdrs = ["config_tracker_impl.h"],
     deps = [
-        "//include/envoy/server:config_tracker_interface",
+        "//envoy/server:config_tracker_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:macros",
     ],
diff --git a/source/server/admin/admin.cc b/source/server/admin/admin.cc
index fbfe86bd22463..4e3ee65c2813a 100644
--- a/source/server/admin/admin.cc
+++ b/source/server/admin/admin.cc
@@ -1,4 +1,4 @@
-#include "server/admin/admin.h"
+#include "source/server/admin/admin.h"
 
 #include <algorithm>
 #include <cstdint>
@@ -15,29 +15,27 @@
 #include "envoy/upstream/outlier_detection.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/mutex_tracer_impl.h"
-#include "common/common/utility.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/html/utility.h"
-#include "common/http/codes.h"
-#include "common/http/conn_manager_utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/memory/utils.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
-
-#include "server/admin/utils.h"
-#include "server/listener_impl.h"
-
-#include "extensions/request_id/uuid/config.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/mutex_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/html/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/conn_manager_utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/memory/utils.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/extensions/request_id/uuid/config.h"
+#include "source/server/admin/utils.h"
+#include "source/server/listener_impl.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_replace.h"
diff --git a/source/server/admin/admin.h b/source/server/admin/admin.h
index 5faa06b141438..5fcaa5ddcf603 100644
--- a/source/server/admin/admin.h
+++ b/source/server/admin/admin.h
@@ -18,38 +18,36 @@
 #include "envoy/upstream/outlier_detection.h"
 #include "envoy/upstream/resource_manager.h"
 
-#include "common/common/assert.h"
-#include "common/common/basic_resource_impl.h"
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/common/macros.h"
-#include "common/http/conn_manager_config.h"
-#include "common/http/conn_manager_impl.h"
-#include "common/http/date_provider_impl.h"
-#include "common/http/default_server_string.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/request_id_extension_impl.h"
-#include "common/http/utility.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/router/scoped_config_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "server/admin/admin_filter.h"
-#include "server/admin/clusters_handler.h"
-#include "server/admin/config_dump_handler.h"
-#include "server/admin/config_tracker_impl.h"
-#include "server/admin/init_dump_handler.h"
-#include "server/admin/listeners_handler.h"
-#include "server/admin/logs_handler.h"
-#include "server/admin/profiling_handler.h"
-#include "server/admin/runtime_handler.h"
-#include "server/admin/server_cmd_handler.h"
-#include "server/admin/server_info_handler.h"
-#include "server/admin/stats_handler.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/basic_resource_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/http/default_server_string.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/request_id_extension_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/router/scoped_config_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/server/admin/admin_filter.h"
+#include "source/server/admin/clusters_handler.h"
+#include "source/server/admin/config_dump_handler.h"
+#include "source/server/admin/config_tracker_impl.h"
+#include "source/server/admin/init_dump_handler.h"
+#include "source/server/admin/listeners_handler.h"
+#include "source/server/admin/logs_handler.h"
+#include "source/server/admin/profiling_handler.h"
+#include "source/server/admin/runtime_handler.h"
+#include "source/server/admin/server_cmd_handler.h"
+#include "source/server/admin/server_info_handler.h"
+#include "source/server/admin/stats_handler.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/admin_filter.cc b/source/server/admin/admin_filter.cc
index c9227f2c725db..ecd5fa6e95624 100644
--- a/source/server/admin/admin_filter.cc
+++ b/source/server/admin/admin_filter.cc
@@ -1,6 +1,6 @@
-#include "server/admin/admin_filter.h"
+#include "source/server/admin/admin_filter.h"
 
-#include "server/admin/utils.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/admin_filter.h b/source/server/admin/admin_filter.h
index 000279f8ff793..0cc9da6069ef3 100644
--- a/source/server/admin/admin_filter.h
+++ b/source/server/admin/admin_filter.h
@@ -6,12 +6,11 @@
 #include "envoy/http/filter.h"
 #include "envoy/server/admin.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/clusters_handler.cc b/source/server/admin/clusters_handler.cc
index 77523012e0dc8..a0425e40c6747 100644
--- a/source/server/admin/clusters_handler.cc
+++ b/source/server/admin/clusters_handler.cc
@@ -1,13 +1,12 @@
-#include "server/admin/clusters_handler.h"
+#include "source/server/admin/clusters_handler.h"
 
 #include "envoy/admin/v3/clusters.pb.h"
 
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/upstream/host_utility.h"
-
-#include "server/admin/utils.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/host_utility.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/clusters_handler.h b/source/server/admin/clusters_handler.h
index efb00e3b2cca7..7786755cbeb6e 100644
--- a/source/server/admin/clusters_handler.h
+++ b/source/server/admin/clusters_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/config_dump_handler.cc b/source/server/admin/config_dump_handler.cc
index 766b86bbe9d2a..69c685d8a6939 100644
--- a/source/server/admin/config_dump_handler.cc
+++ b/source/server/admin/config_dump_handler.cc
@@ -1,13 +1,12 @@
-#include "server/admin/config_dump_handler.h"
+#include "source/server/admin/config_dump_handler.h"
 
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-
-#include "server/admin/utils.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/config_dump_handler.h b/source/server/admin/config_dump_handler.h
index f8b77c4a2e6fb..f1531ddee04a1 100644
--- a/source/server/admin/config_dump_handler.h
+++ b/source/server/admin/config_dump_handler.h
@@ -9,8 +9,8 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/config_tracker_impl.h"
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/config_tracker_impl.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/config_tracker_impl.cc b/source/server/admin/config_tracker_impl.cc
index da1bc875a6ee3..dcd4cf67818eb 100644
--- a/source/server/admin/config_tracker_impl.cc
+++ b/source/server/admin/config_tracker_impl.cc
@@ -1,4 +1,4 @@
-#include "server/admin/config_tracker_impl.h"
+#include "source/server/admin/config_tracker_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/config_tracker_impl.h b/source/server/admin/config_tracker_impl.h
index 3c8ab1c156bfb..9d57ec41cfd4f 100644
--- a/source/server/admin/config_tracker_impl.h
+++ b/source/server/admin/config_tracker_impl.h
@@ -2,8 +2,8 @@
 
 #include "envoy/server/config_tracker.h"
 
-#include "common/common/assert.h"
-#include "common/common/macros.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/macros.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/init_dump_handler.cc b/source/server/admin/init_dump_handler.cc
index 11e40cd4a4668..837625d161804 100644
--- a/source/server/admin/init_dump_handler.cc
+++ b/source/server/admin/init_dump_handler.cc
@@ -1,10 +1,9 @@
-#include "server/admin/init_dump_handler.h"
+#include "source/server/admin/init_dump_handler.h"
 
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-
-#include "server/admin/utils.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/init_dump_handler.h b/source/server/admin/init_dump_handler.h
index bb3683f74ca7a..26156c4e91222 100644
--- a/source/server/admin/init_dump_handler.h
+++ b/source/server/admin/init_dump_handler.h
@@ -7,7 +7,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/listeners_handler.cc b/source/server/admin/listeners_handler.cc
index 510393a17b31c..9e6ddbbc746bc 100644
--- a/source/server/admin/listeners_handler.cc
+++ b/source/server/admin/listeners_handler.cc
@@ -1,12 +1,11 @@
-#include "server/admin/listeners_handler.h"
+#include "source/server/admin/listeners_handler.h"
 
 #include "envoy/admin/v3/listeners.pb.h"
 
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-
-#include "server/admin/utils.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/listeners_handler.h b/source/server/admin/listeners_handler.h
index bf48f86419e58..52d52ea0298b9 100644
--- a/source/server/admin/listeners_handler.h
+++ b/source/server/admin/listeners_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/logs_handler.cc b/source/server/admin/logs_handler.cc
index 353a517947456..e5bc7a54a69f8 100644
--- a/source/server/admin/logs_handler.cc
+++ b/source/server/admin/logs_handler.cc
@@ -1,11 +1,10 @@
-#include "server/admin/logs_handler.h"
+#include "source/server/admin/logs_handler.h"
 
 #include <string>
 
-#include "common/common/fancy_logger.h"
-#include "common/common/logger.h"
-
-#include "server/admin/utils.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/common/logger.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/logs_handler.h b/source/server/admin/logs_handler.h
index 1eea995d88ba2..21359c27c5a8b 100644
--- a/source/server/admin/logs_handler.h
+++ b/source/server/admin/logs_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/profiling_handler.cc b/source/server/admin/profiling_handler.cc
index 243b8292a0af6..e0a3892f23368 100644
--- a/source/server/admin/profiling_handler.cc
+++ b/source/server/admin/profiling_handler.cc
@@ -1,8 +1,7 @@
-#include "server/admin/profiling_handler.h"
+#include "source/server/admin/profiling_handler.h"
 
-#include "common/profiler/profiler.h"
-
-#include "server/admin/utils.h"
+#include "source/common/profiler/profiler.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/prometheus_stats.cc b/source/server/admin/prometheus_stats.cc
index a82d59878d93e..b0b01dc9759ac 100644
--- a/source/server/admin/prometheus_stats.cc
+++ b/source/server/admin/prometheus_stats.cc
@@ -1,8 +1,8 @@
-#include "server/admin/prometheus_stats.h"
+#include "source/server/admin/prometheus_stats.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/macros.h"
-#include "common/stats/histogram_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/macros.h"
+#include "source/common/stats/histogram_impl.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/server/admin/runtime_handler.cc b/source/server/admin/runtime_handler.cc
index a827d8a0994be..1aa3b922b98d8 100644
--- a/source/server/admin/runtime_handler.cc
+++ b/source/server/admin/runtime_handler.cc
@@ -1,13 +1,12 @@
-#include "server/admin/runtime_handler.h"
+#include "source/server/admin/runtime_handler.h"
 
 #include <string>
 #include <vector>
 
-#include "common/common/empty_string.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "server/admin/utils.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/server/admin/utils.h"
 
 #include "absl/container/node_hash_map.h"
 
diff --git a/source/server/admin/runtime_handler.h b/source/server/admin/runtime_handler.h
index 306a356574b3d..30400bec83d1c 100644
--- a/source/server/admin/runtime_handler.h
+++ b/source/server/admin/runtime_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/server_cmd_handler.cc b/source/server/admin/server_cmd_handler.cc
index dfa66a41ee84d..de48307c4daab 100644
--- a/source/server/admin/server_cmd_handler.cc
+++ b/source/server/admin/server_cmd_handler.cc
@@ -1,4 +1,4 @@
-#include "server/admin/server_cmd_handler.h"
+#include "source/server/admin/server_cmd_handler.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/server_cmd_handler.h b/source/server/admin/server_cmd_handler.h
index cddfb94b39176..7d1a9fc33cd18 100644
--- a/source/server/admin/server_cmd_handler.h
+++ b/source/server/admin/server_cmd_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/server_info_handler.cc b/source/server/admin/server_info_handler.cc
index 8f5e357970191..4a3d35f916bfd 100644
--- a/source/server/admin/server_info_handler.cc
+++ b/source/server/admin/server_info_handler.cc
@@ -1,11 +1,10 @@
-#include "server/admin/server_info_handler.h"
+#include "source/server/admin/server_info_handler.h"
 
 #include "envoy/admin/v3/memory.pb.h"
 
-#include "common/memory/stats.h"
-#include "common/version/version.h"
-
-#include "server/admin/utils.h"
+#include "source/common/memory/stats.h"
+#include "source/common/version/version.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/server_info_handler.h b/source/server/admin/server_info_handler.h
index 6a2a29abf3acf..b87c00e0822bb 100644
--- a/source/server/admin/server_info_handler.h
+++ b/source/server/admin/server_info_handler.h
@@ -6,7 +6,7 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "server/admin/handler_ctx.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/stats_handler.cc b/source/server/admin/stats_handler.cc
index 00837e2e393ed..0a9bd56257a43 100644
--- a/source/server/admin/stats_handler.cc
+++ b/source/server/admin/stats_handler.cc
@@ -1,14 +1,13 @@
-#include "server/admin/stats_handler.h"
+#include "source/server/admin/stats_handler.h"
 
 #include "envoy/admin/v3/mutex_stats.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/html/utility.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-
-#include "server/admin/prometheus_stats.h"
-#include "server/admin/utils.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/html/utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/server/admin/prometheus_stats.h"
+#include "source/server/admin/utils.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/stats_handler.h b/source/server/admin/stats_handler.h
index abdb656ed2c94..7934c19c11d1c 100644
--- a/source/server/admin/stats_handler.h
+++ b/source/server/admin/stats_handler.h
@@ -9,9 +9,8 @@
 #include "envoy/server/admin.h"
 #include "envoy/server/instance.h"
 
-#include "common/stats/histogram_impl.h"
-
-#include "server/admin/handler_ctx.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/server/admin/handler_ctx.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/admin/utils.cc b/source/server/admin/utils.cc
index 2402afc47ec2f..109e70fbb39b5 100644
--- a/source/server/admin/utils.cc
+++ b/source/server/admin/utils.cc
@@ -1,7 +1,7 @@
-#include "server/admin/utils.h"
+#include "source/server/admin/utils.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/http/headers.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/http/headers.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/admin/utils.h b/source/server/admin/utils.h
index fc091467450a6..2bbe6d2c20918 100644
--- a/source/server/admin/utils.h
+++ b/source/server/admin/utils.h
@@ -5,9 +5,9 @@
 #include "envoy/admin/v3/server_info.pb.h"
 #include "envoy/init/manager.h"
 
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/api_listener_impl.cc b/source/server/api_listener_impl.cc
index e2bdddd6c445f..7005ec11d0f25 100644
--- a/source/server/api_listener_impl.cc
+++ b/source/server/api_listener_impl.cc
@@ -1,16 +1,14 @@
-#include "server/api_listener_impl.h"
+#include "source/server/api_listener_impl.h"
 
 #include "envoy/config/listener/v3/listener.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/http/conn_manager_impl.h"
-#include "common/network/resolver_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "server/drain_manager_impl.h"
-#include "server/listener_manager_impl.h"
-
-#include "extensions/filters/network/http_connection_manager/config.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
+#include "source/server/drain_manager_impl.h"
+#include "source/server/listener_manager_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/api_listener_impl.h b/source/server/api_listener_impl.h
index 12601aaad1562..c0e2d0bc7c6c0 100644
--- a/source/server/api_listener_impl.h
+++ b/source/server/api_listener_impl.h
@@ -14,14 +14,13 @@
 #include "envoy/server/listener_manager.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/empty_string.h"
-#include "common/common/logger.h"
-#include "common/http/conn_manager_impl.h"
-#include "common/init/manager_impl.h"
-#include "common/network/socket_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "server/filter_chain_manager_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/backtrace.cc b/source/server/backtrace.cc
index 46ca057ee8a96..60602aabfacfc 100644
--- a/source/server/backtrace.cc
+++ b/source/server/backtrace.cc
@@ -1,4 +1,4 @@
-#include "server/backtrace.h"
+#include "source/server/backtrace.h"
 
 #include <iostream>
 
diff --git a/source/server/backtrace.h b/source/server/backtrace.h
index fd391a691c813..21976bf12e889 100644
--- a/source/server/backtrace.h
+++ b/source/server/backtrace.h
@@ -2,8 +2,8 @@
 
 #include <functional>
 
-#include "common/common/logger.h"
-#include "common/version/version.h"
+#include "source/common/common/logger.h"
+#include "source/common/version/version.h"
 
 #include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD
index bcf753dcf197c..f1c14f54e4f0d 100644
--- a/source/server/config_validation/BUILD
+++ b/source/server/config_validation/BUILD
@@ -9,8 +9,8 @@ envoy_cc_library(
     srcs = ["admin.cc"],
     hdrs = ["admin.h"],
     deps = [
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/server:admin_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/server:admin_interface",
         "//source/common/common:assert_lib",
         "//source/common/network:listen_socket_lib",
         "//source/server/admin:config_tracker_lib",
@@ -23,8 +23,8 @@ envoy_cc_library(
     hdrs = ["api.h"],
     deps = [
         ":dispatcher_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/filesystem:filesystem_interface",
+        "//envoy/api:api_interface",
+        "//envoy/filesystem:filesystem_interface",
         "//source/common/api:api_lib",
     ],
 )
@@ -34,7 +34,7 @@ envoy_cc_library(
     srcs = ["cluster_manager.cc"],
     hdrs = ["cluster_manager.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:utility_lib",
         "//source/common/http:context_lib",
         "//source/common/upstream:cluster_manager_lib",
@@ -52,8 +52,8 @@ envoy_cc_library(
         "dns.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:connection_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:connection_interface",
         "//source/common/common:assert_lib",
         "//source/common/event:dispatcher_lib",
     ],
@@ -64,8 +64,8 @@ envoy_cc_library(
     srcs = ["dns.cc"],
     hdrs = ["dns.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:dns_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:dns_interface",
     ],
 )
 
@@ -79,10 +79,10 @@ envoy_cc_library(
         ":api_lib",
         ":cluster_manager_lib",
         ":dns_lib",
-        "//include/envoy/server:drain_manager_interface",
-        "//include/envoy/server:instance_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/server:drain_manager_interface",
+        "//envoy/server:instance_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/access_log:access_log_manager_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
diff --git a/source/server/config_validation/admin.cc b/source/server/config_validation/admin.cc
index 8a0874ee0e119..a7ba41394788a 100644
--- a/source/server/config_validation/admin.cc
+++ b/source/server/config_validation/admin.cc
@@ -1,4 +1,4 @@
-#include "server/config_validation/admin.h"
+#include "source/server/config_validation/admin.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/config_validation/admin.h b/source/server/config_validation/admin.h
index 68a309aee4bb9..45fc2a224f796 100644
--- a/source/server/config_validation/admin.h
+++ b/source/server/config_validation/admin.h
@@ -3,10 +3,9 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/server/admin.h"
 
-#include "common/common/assert.h"
-#include "common/network/listen_socket_impl.h"
-
-#include "server/admin/config_tracker_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/server/admin/config_tracker_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/config_validation/api.cc b/source/server/config_validation/api.cc
index bcf28c69172b1..75f8e755797c2 100644
--- a/source/server/config_validation/api.cc
+++ b/source/server/config_validation/api.cc
@@ -1,8 +1,7 @@
-#include "server/config_validation/api.h"
+#include "source/server/config_validation/api.h"
 
-#include "common/common/assert.h"
-
-#include "server/config_validation/dispatcher.h"
+#include "source/common/common/assert.h"
+#include "source/server/config_validation/dispatcher.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/server/config_validation/api.h b/source/server/config_validation/api.h
index 2d44022c191a3..6725362caa733 100644
--- a/source/server/config_validation/api.h
+++ b/source/server/config_validation/api.h
@@ -4,7 +4,7 @@
 #include "envoy/event/timer.h"
 #include "envoy/filesystem/filesystem.h"
 
-#include "common/api/api_impl.h"
+#include "source/common/api/api_impl.h"
 
 namespace Envoy {
 namespace Api {
diff --git a/source/server/config_validation/cluster_manager.cc b/source/server/config_validation/cluster_manager.cc
index e54aa866f1837..16ab99e868fc0 100644
--- a/source/server/config_validation/cluster_manager.cc
+++ b/source/server/config_validation/cluster_manager.cc
@@ -1,9 +1,9 @@
-#include "server/config_validation/cluster_manager.h"
+#include "source/server/config_validation/cluster_manager.h"
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/server/config_validation/cluster_manager.h b/source/server/config_validation/cluster_manager.h
index 7d9d42d323bfe..60c801a5260da 100644
--- a/source/server/config_validation/cluster_manager.h
+++ b/source/server/config_validation/cluster_manager.h
@@ -6,8 +6,8 @@
 #include "envoy/server/options.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/http/context_impl.h"
-#include "common/upstream/cluster_manager_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/upstream/cluster_manager_impl.h"
 
 namespace Envoy {
 namespace Upstream {
diff --git a/source/server/config_validation/connection.h b/source/server/config_validation/connection.h
index 6fb9839ff890b..c7b2dfc9f8b4b 100644
--- a/source/server/config_validation/connection.h
+++ b/source/server/config_validation/connection.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/network/connection_impl.h"
-
-#include "server/config_validation/dispatcher.h"
+#include "source/common/network/connection_impl.h"
+#include "source/server/config_validation/dispatcher.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/server/config_validation/dispatcher.cc b/source/server/config_validation/dispatcher.cc
index 6bbd96106ea38..a4aacf9dd25e7 100644
--- a/source/server/config_validation/dispatcher.cc
+++ b/source/server/config_validation/dispatcher.cc
@@ -1,8 +1,7 @@
-#include "server/config_validation/dispatcher.h"
+#include "source/server/config_validation/dispatcher.h"
 
-#include "common/common/assert.h"
-
-#include "server/config_validation/connection.h"
+#include "source/common/common/assert.h"
+#include "source/server/config_validation/connection.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/source/server/config_validation/dispatcher.h b/source/server/config_validation/dispatcher.h
index 960e29f1ad30b..5857df0811d7e 100644
--- a/source/server/config_validation/dispatcher.h
+++ b/source/server/config_validation/dispatcher.h
@@ -2,7 +2,7 @@
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/event/dispatcher_impl.h"
+#include "source/common/event/dispatcher_impl.h"
 
 #include "dns.h"
 
diff --git a/source/server/config_validation/dns.cc b/source/server/config_validation/dns.cc
index e9b4f19c46505..c590bf181133b 100644
--- a/source/server/config_validation/dns.cc
+++ b/source/server/config_validation/dns.cc
@@ -1,4 +1,4 @@
-#include "server/config_validation/dns.h"
+#include "source/server/config_validation/dns.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/source/server/config_validation/server.cc b/source/server/config_validation/server.cc
index 100647275b8c7..11ab271ccda32 100644
--- a/source/server/config_validation/server.cc
+++ b/source/server/config_validation/server.cc
@@ -1,18 +1,17 @@
-#include "server/config_validation/server.h"
+#include "source/server/config_validation/server.h"
 
 #include <memory>
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/event/real_time_system.h"
-#include "common/local_info/local_info_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/version/version.h"
-
-#include "server/ssl_context_manager.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/event/real_time_system.h"
+#include "source/common/local_info/local_info_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/version/version.h"
+#include "source/server/ssl_context_manager.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/config_validation/server.h b/source/server/config_validation/server.h
index 6d41f10d2799e..c86de87e278b9 100644
--- a/source/server/config_validation/server.h
+++ b/source/server/config_validation/server.h
@@ -11,24 +11,23 @@
 #include "envoy/ssl/context_manager.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/access_log/access_log_manager_impl.h"
-#include "common/common/assert.h"
-#include "common/common/random_generator.h"
-#include "common/grpc/common.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/router/context_impl.h"
-#include "common/router/rds_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/secret/secret_manager_impl.h"
-#include "common/thread_local/thread_local_impl.h"
-
-#include "server/admin/admin.h"
-#include "server/config_validation/admin.h"
-#include "server/config_validation/api.h"
-#include "server/config_validation/cluster_manager.h"
-#include "server/config_validation/dns.h"
-#include "server/listener_manager_impl.h"
-#include "server/server.h"
+#include "source/common/access_log/access_log_manager_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/grpc/common.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/secret/secret_manager_impl.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/server/admin/admin.h"
+#include "source/server/config_validation/admin.h"
+#include "source/server/config_validation/api.h"
+#include "source/server/config_validation/cluster_manager.h"
+#include "source/server/config_validation/dns.h"
+#include "source/server/listener_manager_impl.h"
+#include "source/server/server.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc
index debbfef503d25..f09586440b423 100644
--- a/source/server/configuration_impl.cc
+++ b/source/server/configuration_impl.cc
@@ -1,4 +1,4 @@
-#include "server/configuration_impl.h"
+#include "source/server/configuration_impl.h"
 
 #include <chrono>
 #include <list>
@@ -16,15 +16,14 @@
 #include "envoy/server/tracer_config.h"
 #include "envoy/ssl/context_manager.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/config/runtime_utility.h"
-#include "common/config/utility.h"
-#include "common/network/socket_option_factory.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/runtime_utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/configuration_impl.h b/source/server/configuration_impl.h
index 5cbdec23bf6a1..58a7474a58723 100644
--- a/source/server/configuration_impl.h
+++ b/source/server/configuration_impl.h
@@ -17,9 +17,9 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/server/instance.h"
 
-#include "common/common/logger.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/connection_handler_impl.cc b/source/server/connection_handler_impl.cc
index 84ea2bbc416fc..e13ca96dbffff 100644
--- a/source/server/connection_handler_impl.cc
+++ b/source/server/connection_handler_impl.cc
@@ -1,14 +1,13 @@
-#include "server/connection_handler_impl.h"
+#include "source/server/connection_handler_impl.h"
 
 #include <chrono>
 
 #include "envoy/event/dispatcher.h"
 #include "envoy/network/filter.h"
 
-#include "common/event/deferred_task.h"
-#include "common/network/utility.h"
-
-#include "server/active_tcp_listener.h"
+#include "source/common/event/deferred_task.h"
+#include "source/common/network/utility.h"
+#include "source/server/active_tcp_listener.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/connection_handler_impl.h b/source/server/connection_handler_impl.h
index 4d73ba79fe219..24ff9cffafde0 100644
--- a/source/server/connection_handler_impl.h
+++ b/source/server/connection_handler_impl.h
@@ -12,7 +12,7 @@
 #include "envoy/server/listener_manager.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/non_copyable.h"
+#include "source/common/common/non_copyable.h"
 
 #include "spdlog/spdlog.h"
 
diff --git a/source/server/drain_manager_impl.cc b/source/server/drain_manager_impl.cc
index 132108b95eaf0..41e8b8db6decb 100644
--- a/source/server/drain_manager_impl.cc
+++ b/source/server/drain_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "server/drain_manager_impl.h"
+#include "source/server/drain_manager_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -7,7 +7,7 @@
 #include "envoy/config/listener/v3/listener.pb.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/drain_manager_impl.h b/source/server/drain_manager_impl.h
index c8056f22396cd..352d0669b38ae 100644
--- a/source/server/drain_manager_impl.h
+++ b/source/server/drain_manager_impl.h
@@ -8,7 +8,7 @@
 #include "envoy/server/drain_manager.h"
 #include "envoy/server/instance.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/filter_chain_manager_impl.cc b/source/server/filter_chain_manager_impl.cc
index f95fd064d6a8b..427b3cb0eeef8 100644
--- a/source/server/filter_chain_manager_impl.cc
+++ b/source/server/filter_chain_manager_impl.cc
@@ -1,15 +1,14 @@
-#include "server/filter_chain_manager_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
 
 #include "envoy/config/listener/v3/listener_components.pb.h"
 
-#include "common/common/cleanup.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/network/socket_interface.h"
-#include "common/protobuf/utility.h"
-
-#include "server/configuration_impl.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/protobuf/utility.h"
+#include "source/server/configuration_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/match.h"
diff --git a/source/server/filter_chain_manager_impl.h b/source/server/filter_chain_manager_impl.h
index f1ef81e98bbca..bb7b9cd32af0b 100644
--- a/source/server/filter_chain_manager_impl.h
+++ b/source/server/filter_chain_manager_impl.h
@@ -12,12 +12,11 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/logger.h"
-#include "common/init/manager_impl.h"
-#include "common/network/cidr_range.h"
-#include "common/network/lc_trie.h"
-
-#include "server/filter_chain_factory_context_callback.h"
+#include "source/common/common/logger.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/lc_trie.h"
+#include "source/server/filter_chain_factory_context_callback.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/source/server/guarddog_impl.cc b/source/server/guarddog_impl.cc
index fbc3e59a46822..d3c08388b4bd8 100644
--- a/source/server/guarddog_impl.cc
+++ b/source/server/guarddog_impl.cc
@@ -1,4 +1,4 @@
-#include "server/guarddog_impl.h"
+#include "source/server/guarddog_impl.h"
 
 #include <sys/types.h>
 
@@ -15,15 +15,14 @@
 #include "envoy/stats/scope.h"
 #include "envoy/watchdog/v3alpha/abort_action.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/lock_guard.h"
-#include "common/common/logger.h"
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "server/watchdog_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/server/watchdog_impl.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/source/server/guarddog_impl.h b/source/server/guarddog_impl.h
index b6a4fb4759774..065fa66c9e180 100644
--- a/source/server/guarddog_impl.h
+++ b/source/server/guarddog_impl.h
@@ -13,12 +13,11 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/event/libevent.h"
-
-#include "server/watchdog_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/libevent.h"
+#include "source/server/watchdog_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/source/server/hot_restart_impl.cc b/source/server/hot_restart_impl.cc
index 56db575789856..ab9e28f38618a 100644
--- a/source/server/hot_restart_impl.cc
+++ b/source/server/hot_restart_impl.cc
@@ -1,4 +1,4 @@
-#include "server/hot_restart_impl.h"
+#include "source/server/hot_restart_impl.h"
 
 #include <sys/prctl.h>
 #include <sys/types.h>
@@ -13,10 +13,10 @@
 #include "envoy/event/file_event.h"
 #include "envoy/server/instance.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/api/os_sys_calls_impl_hot_restart.h"
-#include "common/common/fmt.h"
-#include "common/common/lock_guard.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl_hot_restart.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/lock_guard.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/server/hot_restart_impl.h b/source/server/hot_restart_impl.h
index 309b6e766484f..63545c8fd1b0c 100644
--- a/source/server/hot_restart_impl.h
+++ b/source/server/hot_restart_impl.h
@@ -11,11 +11,10 @@
 #include "envoy/common/platform.h"
 #include "envoy/server/hot_restart.h"
 
-#include "common/common/assert.h"
-#include "common/stats/allocator_impl.h"
-
-#include "server/hot_restarting_child.h"
-#include "server/hot_restarting_parent.h"
+#include "source/common/common/assert.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/server/hot_restarting_child.h"
+#include "source/server/hot_restarting_parent.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restart_nop_impl.h b/source/server/hot_restart_nop_impl.h
index 5e52501855827..28369b3b1ac6e 100644
--- a/source/server/hot_restart_nop_impl.h
+++ b/source/server/hot_restart_nop_impl.h
@@ -4,8 +4,8 @@
 
 #include "envoy/server/hot_restart.h"
 
-#include "common/common/thread.h"
-#include "common/stats/allocator_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/allocator_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_base.cc b/source/server/hot_restarting_base.cc
index ea8424f1778ec..22e8286ca02d2 100644
--- a/source/server/hot_restarting_base.cc
+++ b/source/server/hot_restarting_base.cc
@@ -1,11 +1,11 @@
-#include "server/hot_restarting_base.h"
-
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/mem_block_builder.h"
-#include "common/common/safe_memcpy.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/stats/utility.h"
+#include "source/server/hot_restarting_base.h"
+
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/mem_block_builder.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_base.h b/source/server/hot_restarting_base.h
index 1d1fac8c921c3..16eefe9392829 100644
--- a/source/server/hot_restarting_base.h
+++ b/source/server/hot_restarting_base.h
@@ -15,7 +15,7 @@
 #include "envoy/server/options.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_child.cc b/source/server/hot_restarting_child.cc
index cd673303475b6..ff49a173d5e0e 100644
--- a/source/server/hot_restarting_child.cc
+++ b/source/server/hot_restarting_child.cc
@@ -1,6 +1,6 @@
-#include "server/hot_restarting_child.h"
+#include "source/server/hot_restarting_child.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_child.h b/source/server/hot_restarting_child.h
index 4ac03e4182c01..f2a7056874d2d 100644
--- a/source/server/hot_restarting_child.h
+++ b/source/server/hot_restarting_child.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/stats/stat_merger.h"
-
-#include "server/hot_restarting_base.h"
+#include "source/common/stats/stat_merger.h"
+#include "source/server/hot_restarting_base.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_parent.cc b/source/server/hot_restarting_parent.cc
index 6898c0db9999e..d399bc7b16ac9 100644
--- a/source/server/hot_restarting_parent.cc
+++ b/source/server/hot_restarting_parent.cc
@@ -1,14 +1,13 @@
-#include "server/hot_restarting_parent.h"
+#include "source/server/hot_restarting_parent.h"
 
 #include "envoy/server/instance.h"
 
-#include "common/memory/stats.h"
-#include "common/network/utility.h"
-#include "common/stats/stat_merger.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
-
-#include "server/listener_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/stat_merger.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
+#include "source/server/listener_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/hot_restarting_parent.h b/source/server/hot_restarting_parent.h
index 298ff426aea11..d838d8e72ac58 100644
--- a/source/server/hot_restarting_parent.h
+++ b/source/server/hot_restarting_parent.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/common/hash.h"
-
-#include "server/hot_restarting_base.h"
+#include "source/common/common/hash.h"
+#include "source/server/hot_restarting_base.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/lds_api.cc b/source/server/lds_api.cc
index f6a16585fa43d..1a1f9f9aed988 100644
--- a/source/server/lds_api.cc
+++ b/source/server/lds_api.cc
@@ -1,4 +1,4 @@
-#include "server/lds_api.h"
+#include "source/server/lds_api.h"
 
 #include "envoy/admin/v3/config_dump.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"
@@ -7,11 +7,11 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/config/api_version.h"
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "absl/container/node_hash_set.h"
 #include "absl/strings/str_join.h"
diff --git a/source/server/lds_api.h b/source/server/lds_api.h
index 3474a50389040..05a4db0a29f56 100644
--- a/source/server/lds_api.h
+++ b/source/server/lds_api.h
@@ -12,9 +12,9 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/logger.h"
-#include "common/config/subscription_base.h"
-#include "common/init/target_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/subscription_base.h"
+#include "source/common/init/target_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/listener_impl.cc b/source/server/listener_impl.cc
index 852dbe5d4137c..3192d28392502 100644
--- a/source/server/listener_impl.cc
+++ b/source/server/listener_impl.cc
@@ -1,4 +1,4 @@
-#include "server/listener_impl.h"
+#include "source/server/listener_impl.h"
 
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/listener/v3/listener.pb.h"
@@ -10,32 +10,30 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/stats/scope.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/config/utility.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-
-#include "server/active_raw_udp_listener_config.h"
-#include "server/configuration_impl.h"
-#include "server/drain_manager_impl.h"
-#include "server/filter_chain_manager_impl.h"
-#include "server/listener_manager_impl.h"
-#include "server/transport_socket_config_impl.h"
-
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/extensions/filters/listener/well_known_names.h"
+#include "source/server/active_raw_udp_listener_config.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/drain_manager_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
+#include "source/server/listener_manager_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/active_quic_listener.h"
-#include "common/quic/udp_gso_batch_writer.h"
+#include "source/common/quic/active_quic_listener.h"
+#include "source/common/quic/udp_gso_batch_writer.h"
 #endif
 
 namespace Envoy {
diff --git a/source/server/listener_impl.h b/source/server/listener_impl.h
index 10f5e3a4a760f..d04613f030692 100644
--- a/source/server/listener_impl.h
+++ b/source/server/listener_impl.h
@@ -13,17 +13,16 @@
 #include "envoy/server/listener_manager.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/basic_resource_impl.h"
-#include "common/common/logger.h"
-#include "common/init/manager_impl.h"
-#include "common/init/target_impl.h"
-
-#include "server/filter_chain_manager_impl.h"
+#include "source/common/common/basic_resource_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/init/target_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
 
 #include "absl/base/call_once.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/quic_stat_names.h"
+#include "source/common/quic/quic_stat_names.h"
 #endif
 
 namespace Envoy {
diff --git a/source/server/listener_manager_impl.cc b/source/server/listener_manager_impl.cc
index c9fa407fd7912..1b7921886a70c 100644
--- a/source/server/listener_manager_impl.cc
+++ b/source/server/listener_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "server/listener_manager_impl.h"
+#include "source/server/listener_manager_impl.h"
 
 #include <algorithm>
 
@@ -13,28 +13,28 @@
 #include "envoy/server/transport_socket_config.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/network/filter_matcher.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/network/filter_matcher.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #if defined(ENVOY_ENABLE_QUIC)
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 #endif
 
-#include "server/api_listener_impl.h"
-#include "server/configuration_impl.h"
-#include "server/drain_manager_impl.h"
-#include "server/filter_chain_manager_impl.h"
-#include "server/transport_socket_config_impl.h"
+#include "source/server/api_listener_impl.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/drain_manager_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/listener_manager_impl.h b/source/server/listener_manager_impl.h
index ad09d62ffb0e2..8b1ee3f1d8b65 100644
--- a/source/server/listener_manager_impl.h
+++ b/source/server/listener_manager_impl.h
@@ -18,13 +18,13 @@
 #include "envoy/server/worker.h"
 #include "envoy/stats/scope.h"
 
-#include "server/filter_chain_factory_context_callback.h"
-#include "server/filter_chain_manager_impl.h"
-#include "server/lds_api.h"
-#include "server/listener_impl.h"
+#include "source/server/filter_chain_factory_context_callback.h"
+#include "source/server/filter_chain_manager_impl.h"
+#include "source/server/lds_api.h"
+#include "source/server/listener_impl.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/quic_stat_names.h"
+#include "source/common/quic/quic_stat_names.h"
 #endif
 
 namespace Envoy {
diff --git a/source/server/options_impl.cc b/source/server/options_impl.cc
index a9b785e1f0b3b..57becc5a89e4a 100644
--- a/source/server/options_impl.cc
+++ b/source/server/options_impl.cc
@@ -1,4 +1,4 @@
-#include "server/options_impl.h"
+#include "source/server/options_impl.h"
 
 #include <chrono>
 #include <cstdint>
@@ -7,13 +7,12 @@
 
 #include "envoy/admin/v3/server_info.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/macros.h"
-#include "common/protobuf/utility.h"
-#include "common/version/version.h"
-
-#include "server/options_impl_platform.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/version/version.h"
+#include "source/server/options_impl_platform.h"
 
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
diff --git a/source/server/options_impl.h b/source/server/options_impl.h
index cd5ac7232e65c..3751747a56111 100644
--- a/source/server/options_impl.h
+++ b/source/server/options_impl.h
@@ -9,7 +9,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/options.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "spdlog/spdlog.h"
 
diff --git a/source/server/options_impl_platform.h b/source/server/options_impl_platform.h
index 7d628d3699025..cbdcb15f20506 100644
--- a/source/server/options_impl_platform.h
+++ b/source/server/options_impl_platform.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 class OptionsImplPlatform : protected Logger::Loggable<Logger::Id::config> {
diff --git a/source/server/options_impl_platform_default.cc b/source/server/options_impl_platform_default.cc
index 3b4cbbe3118e9..2f526e178fbc1 100644
--- a/source/server/options_impl_platform_default.cc
+++ b/source/server/options_impl_platform_default.cc
@@ -1,8 +1,7 @@
 #include <thread>
 
-#include "common/common/logger.h"
-
-#include "server/options_impl_platform.h"
+#include "source/common/common/logger.h"
+#include "source/server/options_impl_platform.h"
 
 namespace Envoy {
 
diff --git a/source/server/options_impl_platform_linux.cc b/source/server/options_impl_platform_linux.cc
index 069c68ab83da1..9365614dc1840 100644
--- a/source/server/options_impl_platform_linux.cc
+++ b/source/server/options_impl_platform_linux.cc
@@ -2,15 +2,14 @@
 #error "Linux platform file is part of non-Linux build."
 #endif
 
-#include "server/options_impl_platform_linux.h"
+#include "source/server/options_impl_platform_linux.h"
 
 #include <sched.h>
 
 #include <thread>
 
-#include "common/api/os_sys_calls_impl_linux.h"
-
-#include "server/options_impl_platform.h"
+#include "source/common/api/os_sys_calls_impl_linux.h"
+#include "source/server/options_impl_platform.h"
 
 namespace Envoy {
 
diff --git a/source/server/overload_manager_impl.cc b/source/server/overload_manager_impl.cc
index 71be8f3c5699d..ee6e479a6d409 100644
--- a/source/server/overload_manager_impl.cc
+++ b/source/server/overload_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "server/overload_manager_impl.h"
+#include "source/server/overload_manager_impl.h"
 
 #include <chrono>
 
@@ -7,13 +7,12 @@
 #include "envoy/config/overload/v3/overload.pb.validate.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/event/scaled_range_timer_manager_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "server/resource_monitor_config_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/event/scaled_range_timer_manager_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/server/resource_monitor_config_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/server/overload_manager_impl.h b/source/server/overload_manager_impl.h
index 730d4ae063913..784308b1f4b89 100644
--- a/source/server/overload_manager_impl.h
+++ b/source/server/overload_manager_impl.h
@@ -15,8 +15,8 @@
 #include "envoy/stats/stats.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/logger.h"
-#include "common/event/scaled_range_timer_manager_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/event/scaled_range_timer_manager_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/container/node_hash_set.h"
diff --git a/source/server/proto_descriptors.cc b/source/server/proto_descriptors.cc
index 2a71693eefe83..d7043ff18feb1 100644
--- a/source/server/proto_descriptors.cc
+++ b/source/server/proto_descriptors.cc
@@ -1,9 +1,9 @@
-#include "server/proto_descriptors.h"
+#include "source/server/proto_descriptors.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/protobuf_link_hacks.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/server/server.cc b/source/server/server.cc
index 6bb30cff35b86..5b8520e2fffc4 100644
--- a/source/server/server.cc
+++ b/source/server/server.cc
@@ -1,4 +1,4 @@
-#include "server/server.h"
+#include "source/server/server.h"
 
 #include <csignal>
 #include <cstdint>
@@ -24,37 +24,36 @@
 #include "envoy/server/options.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/api/api_impl.h"
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/enum_to_int.h"
-#include "common/common/mutex_tracer_impl.h"
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/config/xds_resource.h"
-#include "common/http/codes.h"
-#include "common/local_info/local_info_impl.h"
-#include "common/memory/stats.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/network/socket_interface_impl.h"
-#include "common/network/tcp_listener_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/rds_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/signal/fatal_error_handler.h"
-#include "common/singleton/manager_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/stats/timespan_impl.h"
-#include "common/upstream/cluster_manager_impl.h"
-#include "common/version/version.h"
-
-#include "server/admin/utils.h"
-#include "server/configuration_impl.h"
-#include "server/connection_handler_impl.h"
-#include "server/guarddog_impl.h"
-#include "server/listener_hooks.h"
-#include "server/ssl_context_manager.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/common/mutex_tracer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/config/xds_resource.h"
+#include "source/common/http/codes.h"
+#include "source/common/local_info/local_info_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/socket_interface_impl.h"
+#include "source/common/network/tcp_listener_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/signal/fatal_error_handler.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/stats/timespan_impl.h"
+#include "source/common/upstream/cluster_manager_impl.h"
+#include "source/common/version/version.h"
+#include "source/server/admin/utils.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/connection_handler_impl.h"
+#include "source/server/guarddog_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/ssl_context_manager.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/server.h b/source/server/server.h
index 066fb07a844ca..f40d31880d5b2 100644
--- a/source/server/server.h
+++ b/source/server/server.h
@@ -23,27 +23,26 @@
 #include "envoy/stats/timespan.h"
 #include "envoy/tracing/http_tracer.h"
 
-#include "common/access_log/access_log_manager_impl.h"
-#include "common/common/assert.h"
-#include "common/common/cleanup.h"
-#include "common/common/logger_delegates.h"
-#include "common/grpc/async_client_manager_impl.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/context_impl.h"
-#include "common/init/manager_impl.h"
-#include "common/memory/heap_shrinker.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/router/context_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/secret/secret_manager_impl.h"
-#include "common/upstream/health_discovery_service.h"
-
-#include "server/admin/admin.h"
-#include "server/configuration_impl.h"
-#include "server/listener_hooks.h"
-#include "server/listener_manager_impl.h"
-#include "server/overload_manager_impl.h"
-#include "server/worker_impl.h"
+#include "source/common/access_log/access_log_manager_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/cleanup.h"
+#include "source/common/common/logger_delegates.h"
+#include "source/common/grpc/async_client_manager_impl.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/memory/heap_shrinker.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/secret/secret_manager_impl.h"
+#include "source/common/upstream/health_discovery_service.h"
+#include "source/server/admin/admin.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/listener_manager_impl.h"
+#include "source/server/overload_manager_impl.h"
+#include "source/server/worker_impl.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/types/optional.h"
diff --git a/source/server/ssl_context_manager.cc b/source/server/ssl_context_manager.cc
index 4df41234cd43a..0189da0c6d04e 100644
--- a/source/server/ssl_context_manager.cc
+++ b/source/server/ssl_context_manager.cc
@@ -1,4 +1,4 @@
-#include "server/ssl_context_manager.h"
+#include "source/server/ssl_context_manager.h"
 
 #include "envoy/common/exception.h"
 #include "envoy/registry/registry.h"
diff --git a/source/server/worker_impl.cc b/source/server/worker_impl.cc
index 68fd72defdb99..45e595d457d7e 100644
--- a/source/server/worker_impl.cc
+++ b/source/server/worker_impl.cc
@@ -1,4 +1,4 @@
-#include "server/worker_impl.h"
+#include "source/server/worker_impl.h"
 
 #include <functional>
 #include <memory>
@@ -9,7 +9,7 @@
 #include "envoy/server/configuration.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "server/connection_handler_impl.h"
+#include "source/server/connection_handler_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/source/server/worker_impl.h b/source/server/worker_impl.h
index 22513b594e5d1..ecf1728bfc783 100644
--- a/source/server/worker_impl.h
+++ b/source/server/worker_impl.h
@@ -10,9 +10,8 @@
 #include "envoy/server/worker.h"
 #include "envoy/thread_local/thread_local.h"
 
-#include "common/common/logger.h"
-
-#include "server/listener_hooks.h"
+#include "source/common/common/logger.h"
+#include "source/server/listener_hooks.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/test/benchmark/main.cc b/test/benchmark/main.cc
index 311d1de569869..6ab63fb6a51d7 100644
--- a/test/benchmark/main.cc
+++ b/test/benchmark/main.cc
@@ -2,8 +2,8 @@
 // This is an Envoy driver for benchmarks.
 #include "test/benchmark/main.h"
 
-#include "common/common/logger.h"
-#include "common/common/thread.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/common/access_log/access_log_impl_test.cc b/test/common/access_log/access_log_impl_test.cc
index 495b27f1f2add..a6461165fde22 100644
--- a/test/common/access_log/access_log_impl_test.cc
+++ b/test/common/access_log/access_log_impl_test.cc
@@ -8,11 +8,11 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/config/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/stream_info/utility.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stream_info/utility.h"
 
 #include "test/common/stream_info/test_util.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/access_log/access_log_manager_impl_test.cc b/test/common/access_log/access_log_manager_impl_test.cc
index b5de178505d64..3aea8cae6d402 100644
--- a/test/common/access_log/access_log_manager_impl_test.cc
+++ b/test/common/access_log/access_log_manager_impl_test.cc
@@ -1,7 +1,7 @@
 #include <memory>
 
-#include "common/access_log/access_log_manager_impl.h"
-#include "common/filesystem/file_shared_impl.h"
+#include "source/common/access_log/access_log_manager_impl.h"
+#include "source/common/filesystem/file_shared_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/common/buffer/buffer_fuzz.cc b/test/common/buffer/buffer_fuzz.cc
index 1e8faab75182f..46241032beff0 100644
--- a/test/common/buffer/buffer_fuzz.cc
+++ b/test/common/buffer/buffer_fuzz.cc
@@ -4,11 +4,11 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/memory/stats.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "test/fuzz/utility.h"
 
diff --git a/test/common/buffer/buffer_speed_test.cc b/test/common/buffer/buffer_speed_test.cc
index 653a5bea770ad..458a92098aa00 100644
--- a/test/common/buffer/buffer_speed_test.cc
+++ b/test/common/buffer/buffer_speed_test.cc
@@ -1,5 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/string_view.h"
 #include "benchmark/benchmark.h"
diff --git a/test/common/buffer/buffer_test.cc b/test/common/buffer/buffer_test.cc
index d301d634ce6fa..57d7e402a7d47 100644
--- a/test/common/buffer/buffer_test.cc
+++ b/test/common/buffer/buffer_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/common/buffer/owned_impl_test.cc b/test/common/buffer/owned_impl_test.cc
index 667d37460e306..ea5cf249ae1dd 100644
--- a/test/common/buffer/owned_impl_test.cc
+++ b/test/common/buffer/owned_impl_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/api/io_error.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/buffer/utility.h b/test/common/buffer/utility.h
index 868427de465ad..27913ecf025d5 100644
--- a/test/common/buffer/utility.h
+++ b/test/common/buffer/utility.h
@@ -2,7 +2,7 @@
 
 #include <initializer_list>
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/buffer/watermark_buffer_test.cc b/test/common/buffer/watermark_buffer_test.cc
index 70ddb07d98005..548318a8065ab 100644
--- a/test/common/buffer/watermark_buffer_test.cc
+++ b/test/common/buffer/watermark_buffer_test.cc
@@ -1,9 +1,9 @@
 #include <array>
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/watermark_buffer.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/common/buffer/zero_copy_input_stream_test.cc b/test/common/buffer/zero_copy_input_stream_test.cc
index 9ff0ffd6683ef..7b20ec1b1634e 100644
--- a/test/common/buffer/zero_copy_input_stream_test.cc
+++ b/test/common/buffer/zero_copy_input_stream_test.cc
@@ -1,5 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
 
 #include "test/common/buffer/utility.h"
 
diff --git a/test/common/common/api_version_test.cc b/test/common/common/api_version_test.cc
index 10682206b58b5..8d386ebee601b 100644
--- a/test/common/common/api_version_test.cc
+++ b/test/common/common/api_version_test.cc
@@ -1,4 +1,4 @@
-#include "common/version/api_version.h"
+#include "source/common/version/api_version.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/common/assert2_test.cc b/test/common/common/assert2_test.cc
index 00aa17e957989..99e5f9119ce9b 100644
--- a/test/common/common/assert2_test.cc
+++ b/test/common/common/assert2_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/test_common/logging.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/common/assert_test.cc b/test/common/common/assert_test.cc
index 878c71523efec..d655233e669b5 100644
--- a/test/common/common/assert_test.cc
+++ b/test/common/common/assert_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/test_common/logging.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/common/backoff_strategy_test.cc b/test/common/common/backoff_strategy_test.cc
index bfc540234c7bf..67225242cde97 100644
--- a/test/common/common/backoff_strategy_test.cc
+++ b/test/common/common/backoff_strategy_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/backoff_strategy.h"
+#include "source/common/common/backoff_strategy.h"
 
 #include "test/mocks/common.h"
 
diff --git a/test/common/common/base64_fuzz_test.cc b/test/common/common/base64_fuzz_test.cc
index bf56f713cdfc4..d6a3ef4e3e159 100644
--- a/test/common/common/base64_fuzz_test.cc
+++ b/test/common/common/base64_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/base64.h"
+#include "source/common/common/base64.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/common/base64_test.cc b/test/common/common/base64_test.cc
index 04ad1dfb24b9e..3c6bf92a05740 100644
--- a/test/common/common/base64_test.cc
+++ b/test/common/common/base64_test.cc
@@ -1,7 +1,7 @@
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/base64.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/base64.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/common/common/basic_resource_impl_test.cc b/test/common/common/basic_resource_impl_test.cc
index 60481535d06cd..4a54303bcf1df 100644
--- a/test/common/common/basic_resource_impl_test.cc
+++ b/test/common/common/basic_resource_impl_test.cc
@@ -1,6 +1,6 @@
 #include <limits>
 
-#include "common/common/basic_resource_impl.h"
+#include "source/common/common/basic_resource_impl.h"
 
 #include "test/mocks/runtime/mocks.h"
 
diff --git a/test/common/common/callback_impl_test.cc b/test/common/common/callback_impl_test.cc
index e9a451c8d15ed..6261766e2a2e5 100644
--- a/test/common/common/callback_impl_test.cc
+++ b/test/common/common/callback_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/callback_impl.h"
+#include "source/common/common/callback_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/common/cleanup_test.cc b/test/common/common/cleanup_test.cc
index d76faf78e4453..c000a6ed2b94c 100644
--- a/test/common/common/cleanup_test.cc
+++ b/test/common/common/cleanup_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/cleanup.h"
+#include "source/common/common/cleanup.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/containers_test.cc b/test/common/common/containers_test.cc
index 5bc2c5aec62d8..69128a225d25b 100644
--- a/test/common/common/containers_test.cc
+++ b/test/common/common/containers_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/containers.h"
+#include "source/common/common/containers.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/fmt_test.cc b/test/common/common/fmt_test.cc
index f5b8fd45d9536..73809fad4cf34 100644
--- a/test/common/common/fmt_test.cc
+++ b/test/common/common/fmt_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
diff --git a/test/common/common/hash_fuzz_test.cc b/test/common/common/hash_fuzz_test.cc
index c9d84205831e4..4245ffbc7ec2c 100644
--- a/test/common/common/hash_fuzz_test.cc
+++ b/test/common/common/hash_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/common/hash_test.cc b/test/common/common/hash_test.cc
index 1d3681568d50a..38447086ba842 100644
--- a/test/common/common/hash_test.cc
+++ b/test/common/common/hash_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/hash.h"
+#include "source/common/common/hash.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/hex_test.cc b/test/common/common/hex_test.cc
index ba0829dbe92db..7e012b6fc5dbb 100644
--- a/test/common/common/hex_test.cc
+++ b/test/common/common/hex_test.cc
@@ -3,7 +3,7 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/hex.h"
+#include "source/common/common/hex.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/interval_value_test.cc b/test/common/common/interval_value_test.cc
index 41a6c3fbc0778..42a3b5594a89e 100644
--- a/test/common/common/interval_value_test.cc
+++ b/test/common/common/interval_value_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/interval_value.h"
+#include "source/common/common/interval_value.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/linked_object_test.cc b/test/common/common/linked_object_test.cc
index 351f2f340d3f8..4152c754f32da 100644
--- a/test/common/common/linked_object_test.cc
+++ b/test/common/common/linked_object_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/linked_object.h"
+#include "source/common/common/linked_object.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/lock_guard_test.cc b/test/common/common/lock_guard_test.cc
index 01b677c8dc48c..be786f0738830 100644
--- a/test/common/common/lock_guard_test.cc
+++ b/test/common/common/lock_guard_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/log_macros_test.cc b/test/common/common/log_macros_test.cc
index 58087c6a46f3a..fb5520ff8b3dc 100644
--- a/test/common/common/log_macros_test.cc
+++ b/test/common/common/log_macros_test.cc
@@ -4,8 +4,8 @@
 #include <string>
 #include <thread>
 
-#include "common/common/fancy_logger.h"
-#include "common/common/logger.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/common/logger.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/common/logger_fuzz_test.cc b/test/common/common/logger_fuzz_test.cc
index 0fcfb601556b9..a6a86651bf6d5 100644
--- a/test/common/common/logger_fuzz_test.cc
+++ b/test/common/common/logger_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/common/logger_speed_test.cc b/test/common/common/logger_speed_test.cc
index 55f4275db251c..880eb450a9f7c 100644
--- a/test/common/common/logger_speed_test.cc
+++ b/test/common/common/logger_speed_test.cc
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <string>
 
-#include "common/common/fancy_logger.h"
-#include "common/common/logger.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/common/logger.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/common/logger_test.cc b/test/common/common/logger_test.cc
index 199285aa5ec4a..62fe85f33e811 100644
--- a/test/common/common/logger_test.cc
+++ b/test/common/common/logger_test.cc
@@ -1,8 +1,8 @@
 #include <memory>
 #include <string>
 
-#include "common/common/json_escape_string.h"
-#include "common/common/logger.h"
+#include "source/common/common/json_escape_string.h"
+#include "source/common/common/logger.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/common/common/matchers_test.cc b/test/common/common/matchers_test.cc
index bf7d6732fc95a..bcdf34441acc7 100644
--- a/test/common/common/matchers_test.cc
+++ b/test/common/common/matchers_test.cc
@@ -4,9 +4,9 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 #include "envoy/type/matcher/v3/value.pb.h"
 
-#include "common/common/matchers.h"
-#include "common/config/metadata.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/matchers.h"
+#include "source/common/config/metadata.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/common/mem_block_builder_test.cc b/test/common/common/mem_block_builder_test.cc
index 0fbcdff18be4f..de82a3adc36ec 100644
--- a/test/common/common/mem_block_builder_test.cc
+++ b/test/common/common/mem_block_builder_test.cc
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include "common/common/mem_block_builder.h"
+#include "source/common/common/mem_block_builder.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/mutex_tracer_test.cc b/test/common/common/mutex_tracer_test.cc
index e72fc3a995b94..b86bc848c810c 100644
--- a/test/common/common/mutex_tracer_test.cc
+++ b/test/common/common/mutex_tracer_test.cc
@@ -1,8 +1,8 @@
 #include <chrono>
 #include <thread>
 
-#include "common/common/lock_guard.h"
-#include "common/common/mutex_tracer_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/mutex_tracer_impl.h"
 
 #include "test/test_common/contention.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/common/perf_annotation_disabled_test.cc b/test/common/common/perf_annotation_disabled_test.cc
index b5f67aa756d56..9b7762305cb95 100644
--- a/test/common/common/perf_annotation_disabled_test.cc
+++ b/test/common/common/perf_annotation_disabled_test.cc
@@ -4,7 +4,7 @@
 #undef ENVOY_PERF_ANNOTATION
 #endif
 
-#include "common/common/perf_annotation.h"
+#include "source/common/common/perf_annotation.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/perf_annotation_test.cc b/test/common/common/perf_annotation_test.cc
index 0927ff9717490..78c745e7198f3 100644
--- a/test/common/common/perf_annotation_test.cc
+++ b/test/common/common/perf_annotation_test.cc
@@ -7,7 +7,7 @@
 #define ENVOY_PERF_ANNOTATION
 #endif
 
-#include "common/common/perf_annotation.h"
+#include "source/common/common/perf_annotation.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/phantom_test.cc b/test/common/common/phantom_test.cc
index 482cf42de3c90..c878581870835 100644
--- a/test/common/common/phantom_test.cc
+++ b/test/common/common/phantom_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/phantom.h"
+#include "source/common/common/phantom.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/random_generator_test.cc b/test/common/common/random_generator_test.cc
index 7658080b116b9..249590446e706 100644
--- a/test/common/common/random_generator_test.cc
+++ b/test/common/common/random_generator_test.cc
@@ -1,7 +1,7 @@
 #include <numeric>
 
-#include "common/common/interval_value.h"
-#include "common/common/random_generator.h"
+#include "source/common/common/interval_value.h"
+#include "source/common/common/random_generator.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/common/re_speed_test.cc b/test/common/common/re_speed_test.cc
index 0db62906e281e..4f2161df9fda1 100644
--- a/test/common/common/re_speed_test.cc
+++ b/test/common/common/re_speed_test.cc
@@ -3,7 +3,7 @@
 
 #include <regex>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/string_view.h"
 #include "benchmark/benchmark.h"
diff --git a/test/common/common/regex_test.cc b/test/common/common/regex_test.cc
index e3d5a67eb89d7..5d33d23bafbdf 100644
--- a/test/common/common/regex_test.cc
+++ b/test/common/common/regex_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/common/exception.h"
 #include "envoy/type/matcher/v3/regex.pb.h"
 
-#include "common/common/regex.h"
+#include "source/common/common/regex.h"
 
 #include "test/test_common/logging.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/common/common/safe_memcpy_test.cc b/test/common/common/safe_memcpy_test.cc
index 1f5f39b5518ec..bd0da38da1828 100644
--- a/test/common/common/safe_memcpy_test.cc
+++ b/test/common/common/safe_memcpy_test.cc
@@ -1,10 +1,10 @@
 #include <vector>
 
-#include "common/common/safe_memcpy.h"
-#include "common/grpc/common.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
+#include "source/common/common/safe_memcpy.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/common/scope_tracked_object_stack_test.cc b/test/common/common/scope_tracked_object_stack_test.cc
index 984f66f39bcb1..46fa6908248bb 100644
--- a/test/common/common/scope_tracked_object_stack_test.cc
+++ b/test/common/common/scope_tracked_object_stack_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/common/scope_tracker.h"
 
-#include "common/common/scope_tracked_object_stack.h"
-#include "common/common/utility.h"
+#include "source/common/common/scope_tracked_object_stack.h"
+#include "source/common/common/utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/common/scope_tracker_test.cc b/test/common/common/scope_tracker_test.cc
index ee53c88a537ce..12b7133a06164 100644
--- a/test/common/common/scope_tracker_test.cc
+++ b/test/common/common/scope_tracker_test.cc
@@ -1,8 +1,8 @@
 #include <iostream>
 
-#include "common/api/api_impl.h"
-#include "common/common/scope_tracker.h"
-#include "common/event/dispatcher_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/event/dispatcher_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/common/shared_token_bucket_impl_test.cc b/test/common/common/shared_token_bucket_impl_test.cc
index 2a14019bdfc7d..bceb435fed6b1 100644
--- a/test/common/common/shared_token_bucket_impl_test.cc
+++ b/test/common/common/shared_token_bucket_impl_test.cc
@@ -1,6 +1,6 @@
 #include <chrono>
 
-#include "common/common/shared_token_bucket_impl.h"
+#include "source/common/common/shared_token_bucket_impl.h"
 
 #include "test/test_common/simulated_time_system.h"
 
diff --git a/test/common/common/statusor_test.cc b/test/common/common/statusor_test.cc
index 2b42e3c6bf67a..dd07315ec5f4e 100644
--- a/test/common/common/statusor_test.cc
+++ b/test/common/common/statusor_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/statusor.h"
-#include "common/http/status.h"
+#include "source/common/common/statusor.h"
+#include "source/common/http/status.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/common/stl_helpers_test.cc b/test/common/common/stl_helpers_test.cc
index 40915d4bba124..8f4b297c74055 100644
--- a/test/common/common/stl_helpers_test.cc
+++ b/test/common/common/stl_helpers_test.cc
@@ -1,6 +1,6 @@
 #include <sstream>
 
-#include "common/common/stl_helpers.h"
+#include "source/common/common/stl_helpers.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/common/thread_id_test.cc b/test/common/common/thread_id_test.cc
index 5c5687ecd4daa..1d03cd7dbc1a1 100644
--- a/test/common/common/thread_id_test.cc
+++ b/test/common/common/thread_id_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 #include "test/test_common/thread_factory_for_test.h"
 
diff --git a/test/common/common/thread_test.cc b/test/common/common/thread_test.cc
index 9dac043921f72..8cfc1c6ac771b 100644
--- a/test/common/common/thread_test.cc
+++ b/test/common/common/thread_test.cc
@@ -1,7 +1,7 @@
 #include <functional>
 
-#include "common/common/thread.h"
-#include "common/common/thread_synchronizer.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/thread_synchronizer.h"
 
 #include "test/test_common/thread_factory_for_test.h"
 
diff --git a/test/common/common/token_bucket_impl_test.cc b/test/common/common/token_bucket_impl_test.cc
index 30e273c024075..c3d25a4c2b274 100644
--- a/test/common/common/token_bucket_impl_test.cc
+++ b/test/common/common/token_bucket_impl_test.cc
@@ -1,6 +1,6 @@
 #include <chrono>
 
-#include "common/common/token_bucket_impl.h"
+#include "source/common/common/token_bucket_impl.h"
 
 #include "test/test_common/simulated_time_system.h"
 
diff --git a/test/common/common/utility_fuzz_test.cc b/test/common/common/utility_fuzz_test.cc
index c4f468c917257..049311dd7f974 100644
--- a/test/common/common/utility_fuzz_test.cc
+++ b/test/common/common/utility_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/common/utility_speed_test.cc b/test/common/common/utility_speed_test.cc
index a0563263b0768..ce9d8c790330b 100644
--- a/test/common/common/utility_speed_test.cc
+++ b/test/common/common/utility_speed_test.cc
@@ -3,8 +3,8 @@
 
 #include <random>
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
 
 #include "absl/strings/string_view.h"
 #include "benchmark/benchmark.h"
diff --git a/test/common/common/utility_test.cc b/test/common/common/utility_test.cc
index a69a00e3ae4fa..344f45aba0f0a 100644
--- a/test/common/common/utility_test.cc
+++ b/test/common/common/utility_test.cc
@@ -7,7 +7,7 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/common/version_test.cc b/test/common/common/version_test.cc
index 379d539b85ddb..dec9a8a26cb86 100644
--- a/test/common/common/version_test.cc
+++ b/test/common/common/version_test.cc
@@ -1,4 +1,4 @@
-#include "common/version/version.h"
+#include "source/common/version/version.h"
 
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
diff --git a/test/common/config/BUILD b/test/common/config/BUILD
index d0b7264f8d5dd..a7c5aaf0e4470 100644
--- a/test/common/config/BUILD
+++ b/test/common/config/BUILD
@@ -257,7 +257,7 @@ envoy_cc_test_library(
     srcs = ["http_subscription_test_harness.h"],
     deps = [
         ":subscription_test_harness",
-        "//include/envoy/http:async_client_interface",
+        "//envoy/http:async_client_interface",
         "//source/common/common:utility_lib",
         "//source/common/config:http_subscription_lib",
         "//source/common/config:utility_lib",
@@ -353,7 +353,7 @@ envoy_cc_test(
     name = "metadata_test",
     srcs = ["metadata_test.cc"],
     deps = [
-        "//include/envoy/common:base_includes",
+        "//envoy/common:base_includes",
         "//source/common/config:metadata_lib",
         "//source/common/config:well_known_names",
         "//source/common/protobuf:utility_lib",
@@ -403,7 +403,7 @@ envoy_cc_test(
     name = "registry_test",
     srcs = ["registry_test.cc"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
+        "//envoy/config:typed_config_interface",
         "//test/test_common:logging_lib",
         "//test/test_common:utility_lib",
     ],
diff --git a/test/common/config/api_type_oracle_test.cc b/test/common/config/api_type_oracle_test.cc
index 327d4dc32e541..97aa001ff5a1c 100644
--- a/test/common/config/api_type_oracle_test.cc
+++ b/test/common/config/api_type_oracle_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.h"
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h"
 
-#include "common/config/api_type_oracle.h"
+#include "source/common/config/api_type_oracle.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/config/config_provider_impl_test.cc b/test/common/config/config_provider_impl_test.cc
index b9d5070623847..6b3d6d36cc0f7 100644
--- a/test/common/config/config_provider_impl_test.cc
+++ b/test/common/config/config_provider_impl_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/config_provider_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/config_provider_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/config/dummy_config.pb.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/common/config/context_provider_impl_test.cc b/test/common/config/context_provider_impl_test.cc
index 93142d769a400..f2f103ac4b1b9 100644
--- a/test/common/config/context_provider_impl_test.cc
+++ b/test/common/config/context_provider_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/config/context_provider_impl.h"
+#include "source/common/config/context_provider_impl.h"
 
 #include "test/common/config/xds_test_utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/datasource_test.cc b/test/common/config/datasource_test.cc
index 8e2900b38c4a4..8a5d0a632c974 100644
--- a/test/common/config/datasource_test.cc
+++ b/test/common/config/datasource_test.cc
@@ -1,10 +1,10 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/core/v3/base.pb.validate.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/datasource.h"
-#include "common/http/message_impl.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/datasource.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/init/mocks.h"
diff --git a/test/common/config/decoded_resource_impl_test.cc b/test/common/config/decoded_resource_impl_test.cc
index 2bb1020869c7c..7ac26933f101d 100644
--- a/test/common/config/decoded_resource_impl_test.cc
+++ b/test/common/config/decoded_resource_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/config/decoded_resource_impl.h"
+#include "source/common/config/decoded_resource_impl.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/delta_subscription_impl_test.cc b/test/common/config/delta_subscription_impl_test.cc
index 3498a57cf964d..92e11a0f7f214 100644
--- a/test/common/config/delta_subscription_impl_test.cc
+++ b/test/common/config/delta_subscription_impl_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/config/api_version.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/config/api_version.h"
 
 #include "test/common/config/delta_subscription_test_harness.h"
 
diff --git a/test/common/config/delta_subscription_state_test.cc b/test/common/config/delta_subscription_state_test.cc
index cc33dc4a5758f..fea85b717740c 100644
--- a/test/common/config/delta_subscription_state_test.cc
+++ b/test/common/config/delta_subscription_state_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/delta_subscription_state.h"
-#include "common/config/utility.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/config/delta_subscription_state.h"
+#include "source/common/config/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/config/delta_subscription_test_harness.h b/test/common/config/delta_subscription_test_harness.h
index 080f7f29450f4..e74e33f40230e 100644
--- a/test/common/config/delta_subscription_test_harness.h
+++ b/test/common/config/delta_subscription_test_harness.h
@@ -7,10 +7,10 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/grpc_subscription_impl.h"
-#include "common/config/new_grpc_mux_impl.h"
-#include "common/config/version_converter.h"
-#include "common/grpc/common.h"
+#include "source/common/config/grpc_subscription_impl.h"
+#include "source/common/config/new_grpc_mux_impl.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/grpc/common.h"
 
 #include "test/common/config/subscription_test_harness.h"
 #include "test/mocks/common.h"
diff --git a/test/common/config/filesystem_subscription_test_harness.h b/test/common/config/filesystem_subscription_test_harness.h
index 9c372725207ef..c516809ed16a2 100644
--- a/test/common/config/filesystem_subscription_test_harness.h
+++ b/test/common/config/filesystem_subscription_test_harness.h
@@ -6,10 +6,10 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/filesystem_subscription_impl.h"
-#include "common/config/utility.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/filesystem_subscription_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/config/subscription_test_harness.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/common/config/grpc_mux_impl_test.cc b/test/common/config/grpc_mux_impl_test.cc
index 8e1ac0945f698..a1bfef4722dbd 100644
--- a/test/common/config/grpc_mux_impl_test.cc
+++ b/test/common/config/grpc_mux_impl_test.cc
@@ -5,14 +5,14 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/api_version.h"
-#include "common/config/grpc_mux_impl.h"
-#include "common/config/protobuf_link_hacks.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/protobuf.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/config/grpc_stream_test.cc b/test/common/config/grpc_stream_test.cc
index ecd38d75d0b63..5128a21b2a3bc 100644
--- a/test/common/config/grpc_stream_test.cc
+++ b/test/common/config/grpc_stream_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/grpc_stream.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/config/grpc_stream.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/config/grpc_subscription_test_harness.h b/test/common/config/grpc_subscription_test_harness.h
index c105ec9d7ed8d..aa6aea0e5686c 100644
--- a/test/common/config/grpc_subscription_test_harness.h
+++ b/test/common/config/grpc_subscription_test_harness.h
@@ -8,11 +8,11 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/hash.h"
-#include "common/config/api_version.h"
-#include "common/config/grpc_mux_impl.h"
-#include "common/config/grpc_subscription_impl.h"
-#include "common/config/version_converter.h"
+#include "source/common/common/hash.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/config/grpc_subscription_impl.h"
+#include "source/common/config/version_converter.h"
 
 #include "test/common/config/subscription_test_harness.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/common/config/http_subscription_test_harness.h b/test/common/config/http_subscription_test_harness.h
index cdb0266c5a926..b168ea3ab436b 100644
--- a/test/common/config/http_subscription_test_harness.h
+++ b/test/common/config/http_subscription_test_harness.h
@@ -8,12 +8,12 @@
 #include "envoy/http/async_client.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/utility.h"
-#include "common/config/http_subscription_impl.h"
-#include "common/config/utility.h"
-#include "common/http/message_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/http_subscription_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/config/subscription_test_harness.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/common/config/metadata_test.cc b/test/common/config/metadata_test.cc
index ee3c6b273ebf4..72ad06f6dfe71 100644
--- a/test/common/config/metadata_test.cc
+++ b/test/common/config/metadata_test.cc
@@ -1,9 +1,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/test_common/registry.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/new_grpc_mux_impl_test.cc b/test/common/config/new_grpc_mux_impl_test.cc
index 3240986c1075e..ffb61f051dc4d 100644
--- a/test/common/config/new_grpc_mux_impl_test.cc
+++ b/test/common/config/new_grpc_mux_impl_test.cc
@@ -5,12 +5,12 @@
 #include "envoy/event/timer.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/config/new_grpc_mux_impl.h"
-#include "common/config/protobuf_link_hacks.h"
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/new_grpc_mux_impl.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/config/opaque_resource_decoder_impl_test.cc b/test/common/config/opaque_resource_decoder_impl_test.cc
index 9aded46538bac..f36e20f614177 100644
--- a/test/common/config/opaque_resource_decoder_impl_test.cc
+++ b/test/common/config/opaque_resource_decoder_impl_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
 
-#include "common/config/opaque_resource_decoder_impl.h"
-#include "common/protobuf/message_validator_impl.h"
+#include "source/common/config/opaque_resource_decoder_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/config/pausable_ack_queue_test.cc b/test/common/config/pausable_ack_queue_test.cc
index f817cc7ff52ae..f984193bf8371 100644
--- a/test/common/config/pausable_ack_queue_test.cc
+++ b/test/common/config/pausable_ack_queue_test.cc
@@ -1,4 +1,4 @@
-#include "common/config/pausable_ack_queue.h"
+#include "source/common/config/pausable_ack_queue.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/config/registry_test.cc b/test/common/config/registry_test.cc
index be6ea155d8bd7..53d6979a42a69 100644
--- a/test/common/config/registry_test.cc
+++ b/test/common/config/registry_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/fmt.h"
+#include "source/common/common/fmt.h"
 
 #include "test/test_common/logging.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/runtime_utility_test.cc b/test/common/config/runtime_utility_test.cc
index 1e886ba80eb66..a479be40d55de 100644
--- a/test/common/config/runtime_utility_test.cc
+++ b/test/common/config/runtime_utility_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/config/runtime_utility.h"
+#include "source/common/config/runtime_utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/config/subscription_factory_impl_test.cc b/test/common/config/subscription_factory_impl_test.cc
index a9d7e7e0c1bb8..f41376504c025 100644
--- a/test/common/config/subscription_factory_impl_test.cc
+++ b/test/common/config/subscription_factory_impl_test.cc
@@ -8,8 +8,8 @@
 #include "envoy/config/endpoint/v3/endpoint.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/subscription_factory_impl.h"
-#include "common/config/xds_resource.h"
+#include "source/common/config/subscription_factory_impl.h"
+#include "source/common/config/xds_resource.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/config/subscription_test_harness.h b/test/common/config/subscription_test_harness.h
index 5b0fe24a49d2d..e1b5421da711d 100644
--- a/test/common/config/subscription_test_harness.h
+++ b/test/common/config/subscription_test_harness.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/config/utility.h"
+#include "source/common/config/utility.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/config/ttl_test.cc b/test/common/config/ttl_test.cc
index 14e6edd6023a6..f96741ac720b1 100644
--- a/test/common/config/ttl_test.cc
+++ b/test/common/config/ttl_test.cc
@@ -1,6 +1,6 @@
 #include <chrono>
 
-#include "common/config/ttl.h"
+#include "source/common/config/ttl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/config/type_to_endpoint_test.cc b/test/common/config/type_to_endpoint_test.cc
index f163d832218cd..1dd24c0c03083 100644
--- a/test/common/config/type_to_endpoint_test.cc
+++ b/test/common/config/type_to_endpoint_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/api/v2/rds.pb.h"
 #include "envoy/service/route/v3/rds.pb.h"
 
-#include "common/config/type_to_endpoint.h"
+#include "source/common/config/type_to_endpoint.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc
index 4f12e71d87a38..cd2ff60b96f36 100644
--- a/test/common/config/utility_test.cc
+++ b/test/common/config/utility_test.cc
@@ -6,11 +6,11 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/extensions/filters/http/cors/v3/cors.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/config/api_version.h"
-#include "common/config/utility.h"
-#include "common/config/well_known_names.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/common/config/version_converter_test.cc b/test/common/config/version_converter_test.cc
index 1c7e949fb6257..fd8689567c098 100644
--- a/test/common/config/version_converter_test.cc
+++ b/test/common/config/version_converter_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/well_known.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/well_known.h"
 
 #include "test/common/config/version_converter.pb.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/watch_map_test.cc b/test/common/config/watch_map_test.cc
index 6443180110064..1d8398091b058 100644
--- a/test/common/config/watch_map_test.cc
+++ b/test/common/config/watch_map_test.cc
@@ -6,7 +6,7 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/watch_map.h"
+#include "source/common/config/watch_map.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/config/watched_directory_test.cc b/test/common/config/watched_directory_test.cc
index 8988306d4ad4d..b22dd7dbb9833 100644
--- a/test/common/config/watched_directory_test.cc
+++ b/test/common/config/watched_directory_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/filesystem/watcher.h"
 
-#include "common/config/watched_directory.h"
+#include "source/common/config/watched_directory.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/filesystem/mocks.h"
diff --git a/test/common/config/xds_context_params_test.cc b/test/common/config/xds_context_params_test.cc
index 50d96431f501c..825cc6b9b8b34 100644
--- a/test/common/config/xds_context_params_test.cc
+++ b/test/common/config/xds_context_params_test.cc
@@ -1,4 +1,4 @@
-#include "common/config/xds_context_params.h"
+#include "source/common/config/xds_context_params.h"
 
 #include "test/common/config/xds_test_utility.h"
 #include "test/test_common/logging.h"
diff --git a/test/common/config/xds_resource_test.cc b/test/common/config/xds_resource_test.cc
index 4331f69d783f1..0cbe0954743f3 100644
--- a/test/common/config/xds_resource_test.cc
+++ b/test/common/config/xds_resource_test.cc
@@ -1,4 +1,4 @@
-#include "common/config/xds_resource.h"
+#include "source/common/config/xds_resource.h"
 
 #include "test/common/config/xds_test_utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/conn_pool/conn_pool_base_test.cc b/test/common/conn_pool/conn_pool_base_test.cc
index 4b756ede0d01e..5d8d64d359db3 100644
--- a/test/common/conn_pool/conn_pool_base_test.cc
+++ b/test/common/conn_pool/conn_pool_base_test.cc
@@ -1,4 +1,4 @@
-#include "common/conn_pool/conn_pool_base.h"
+#include "source/common/conn_pool/conn_pool_base.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/crypto/get_sha_256_digest_fuzz_test.cc b/test/common/crypto/get_sha_256_digest_fuzz_test.cc
index 085778d4e41c4..7440deab10312 100644
--- a/test/common/crypto/get_sha_256_digest_fuzz_test.cc
+++ b/test/common/crypto/get_sha_256_digest_fuzz_test.cc
@@ -1,5 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/crypto/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/crypto/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/crypto/utility_test.cc b/test/common/crypto/utility_test.cc
index 53390d77ccee9..e30dda5bf7679 100644
--- a/test/common/crypto/utility_test.cc
+++ b/test/common/crypto/utility_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-
-#include "extensions/common/crypto/crypto_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/extensions/common/crypto/crypto_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/crypto/verify_signature_fuzz_test.cc b/test/common/crypto/verify_signature_fuzz_test.cc
index c64fa2436ecb8..153c04d5f5dbf 100644
--- a/test/common/crypto/verify_signature_fuzz_test.cc
+++ b/test/common/crypto/verify_signature_fuzz_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
 
 #include "test/common/crypto/verify_signature_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/event/BUILD b/test/common/event/BUILD
index d5448366b593a..c42e8e1aff1ea 100644
--- a/test/common/event/BUILD
+++ b/test/common/event/BUILD
@@ -30,7 +30,7 @@ envoy_cc_test(
     name = "file_event_impl_test",
     srcs = ["file_event_impl_test.cc"],
     deps = [
-        "//include/envoy/event:file_event_interface",
+        "//envoy/event:file_event_interface",
         "//source/common/event:dispatcher_includes",
         "//source/common/event:dispatcher_lib",
         "//source/common/stats:isolated_store_lib",
diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc
index 9525ed6ad61c1..240a9485196fd 100644
--- a/test/common/event/dispatcher_impl_test.cc
+++ b/test/common/event/dispatcher_impl_test.cc
@@ -3,15 +3,15 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/thread/thread.h"
 
-#include "common/api/api_impl.h"
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/lock_guard.h"
-#include "common/common/scope_tracker.h"
-#include "common/common/utility.h"
-#include "common/event/deferred_task.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/event/timer_impl.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/deferred_task.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/timer_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/server/watch_dog.h"
diff --git a/test/common/event/file_event_impl_test.cc b/test/common/event/file_event_impl_test.cc
index 1dc8eae1984dd..67986afab8da6 100644
--- a/test/common/event/file_event_impl_test.cc
+++ b/test/common/event/file_event_impl_test.cc
@@ -2,9 +2,9 @@
 
 #include "envoy/event/file_event.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/event/scaled_range_timer_manager_impl_test.cc b/test/common/event/scaled_range_timer_manager_impl_test.cc
index ca89c39fbd971..dbd7ca897a12f 100644
--- a/test/common/event/scaled_range_timer_manager_impl_test.cc
+++ b/test/common/event/scaled_range_timer_manager_impl_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/event/timer.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/event/scaled_range_timer_manager_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/scaled_range_timer_manager_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/wrapped_dispatcher.h"
diff --git a/test/common/filesystem/directory_test.cc b/test/common/filesystem/directory_test.cc
index 0efd2d81543f4..ec47699d6a895 100644
--- a/test/common/filesystem/directory_test.cc
+++ b/test/common/filesystem/directory_test.cc
@@ -3,7 +3,7 @@
 #include <stack>
 #include <string>
 
-#include "common/filesystem/directory.h"
+#include "source/common/filesystem/directory.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/filesystem/filesystem_impl_test.cc b/test/common/filesystem/filesystem_impl_test.cc
index bc406b6d0f18f..fe21296388147 100644
--- a/test/common/filesystem/filesystem_impl_test.cc
+++ b/test/common/filesystem/filesystem_impl_test.cc
@@ -2,9 +2,9 @@
 #include <filesystem>
 #include <string>
 
-#include "common/common/assert.h"
-#include "common/common/utility.h"
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/common/filesystem/watcher_impl_test.cc b/test/common/filesystem/watcher_impl_test.cc
index 7928de7d2b4f7..d110ad4b8f256 100644
--- a/test/common/filesystem/watcher_impl_test.cc
+++ b/test/common/filesystem/watcher_impl_test.cc
@@ -1,9 +1,9 @@
 #include <cstdint>
 #include <fstream>
 
-#include "common/common/assert.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/filesystem/watcher_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/filesystem/watcher_impl.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/filter/http/filter_config_discovery_impl_test.cc b/test/common/filter/http/filter_config_discovery_impl_test.cc
index 33cff50a28367..3446c4bc338fb 100644
--- a/test/common/filter/http/filter_config_discovery_impl_test.cc
+++ b/test/common/filter/http/filter_config_discovery_impl_test.cc
@@ -8,9 +8,9 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/utility.h"
-#include "common/filter/http/filter_config_discovery_impl.h"
-#include "common/json/json_loader.h"
+#include "source/common/config/utility.h"
+#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/json/json_loader.h"
 
 #include "test/mocks/init/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/common/formatter/command_extension.cc b/test/common/formatter/command_extension.cc
index 724650d1811a4..007a204f4f450 100644
--- a/test/common/formatter/command_extension.cc
+++ b/test/common/formatter/command_extension.cc
@@ -1,6 +1,6 @@
 #include "test/common/formatter/command_extension.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Formatter {
diff --git a/test/common/formatter/command_extension.h b/test/common/formatter/command_extension.h
index 2abba003d9b2c..4a91f071630ae 100644
--- a/test/common/formatter/command_extension.h
+++ b/test/common/formatter/command_extension.h
@@ -5,7 +5,7 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/registry/registry.h"
 
-#include "common/formatter/substitution_formatter.h"
+#include "source/common/formatter/substitution_formatter.h"
 
 namespace Envoy {
 namespace Formatter {
diff --git a/test/common/formatter/substitution_format_string_test.cc b/test/common/formatter/substitution_format_string_test.cc
index 31924dbd19f44..017622bdd5cd8 100644
--- a/test/common/formatter/substitution_format_string_test.cc
+++ b/test/common/formatter/substitution_format_string_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/core/v3/substitution_format_string.pb.validate.h"
 
-#include "common/formatter/substitution_format_string.h"
+#include "source/common/formatter/substitution_format_string.h"
 
 #include "test/common/formatter/command_extension.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/formatter/substitution_formatter_fuzz_test.cc b/test/common/formatter/substitution_formatter_fuzz_test.cc
index afdbb48de80bc..f92a34885023d 100644
--- a/test/common/formatter/substitution_formatter_fuzz_test.cc
+++ b/test/common/formatter/substitution_formatter_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/formatter/substitution_formatter.h"
+#include "source/common/formatter/substitution_formatter.h"
 
 #include "test/common/formatter/substitution_formatter_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/formatter/substitution_formatter_speed_test.cc b/test/common/formatter/substitution_formatter_speed_test.cc
index 8fbb0573e8c5f..320bd7d8878fd 100644
--- a/test/common/formatter/substitution_formatter_speed_test.cc
+++ b/test/common/formatter/substitution_formatter_speed_test.cc
@@ -1,5 +1,5 @@
-#include "common/formatter/substitution_formatter.h"
-#include "common/network/address_impl.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/network/address_impl.h"
 
 #include "test/common/stream_info/test_util.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/formatter/substitution_formatter_test.cc b/test/common/formatter/substitution_formatter_test.cc
index df374eaef4a8a..84426e669fae4 100644
--- a/test/common/formatter/substitution_formatter_test.cc
+++ b/test/common/formatter/substitution_formatter_test.cc
@@ -7,14 +7,14 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/formatter/substitution_formatter.h"
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/string_accessor_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/formatter/substitution_formatter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/string_accessor_impl.h"
 
 #include "test/common/formatter/command_extension.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc
index a2ef2f7a34204..0f67ac316d542 100644
--- a/test/common/grpc/async_client_impl_test.cc
+++ b/test/common/grpc/async_client_impl_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/grpc/async_client_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_impl.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/tracing/mocks.h"
diff --git a/test/common/grpc/async_client_manager_impl_test.cc b/test/common/grpc/async_client_manager_impl_test.cc
index 72d8507ed81e4..9f748cac04272 100644
--- a/test/common/grpc/async_client_manager_impl_test.cc
+++ b/test/common/grpc/async_client_manager_impl_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/api/api_impl.h"
-#include "common/grpc/async_client_manager_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/grpc/async_client_manager_impl.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/mocks/thread_local/mocks.h"
diff --git a/test/common/grpc/codec_fuzz_test.cc b/test/common/grpc/codec_fuzz_test.cc
index 782ab1b1eba53..1d75425e7bbcd 100644
--- a/test/common/grpc/codec_fuzz_test.cc
+++ b/test/common/grpc/codec_fuzz_test.cc
@@ -1,5 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/codec.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/fuzz/utility.h"
diff --git a/test/common/grpc/codec_test.cc b/test/common/grpc/codec_test.cc
index e85b973be4a93..c028559bc828d 100644
--- a/test/common/grpc/codec_test.cc
+++ b/test/common/grpc/codec_test.cc
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/codec.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/codec.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/proto/helloworld.pb.h"
diff --git a/test/common/grpc/common_test.cc b/test/common/grpc/common_test.cc
index 4a54ee4b6bbbe..259f39a9797ff 100644
--- a/test/common/grpc/common_test.cc
+++ b/test/common/grpc/common_test.cc
@@ -1,9 +1,9 @@
 #include "envoy/common/platform.h"
 
-#include "common/grpc/common.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
 
 #include "test/mocks/stream_info/mocks.h"
 #include "test/proto/helloworld.pb.h"
diff --git a/test/common/grpc/context_impl_test.cc b/test/common/grpc/context_impl_test.cc
index c7ccd34768039..02b76d8ac6c5c 100644
--- a/test/common/grpc/context_impl_test.cc
+++ b/test/common/grpc/context_impl_test.cc
@@ -1,11 +1,11 @@
 #include "envoy/common/platform.h"
 
-#include "common/grpc/common.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/mocks/upstream/cluster_info.h"
 #include "test/test_common/global.h"
diff --git a/test/common/grpc/google_async_client_cache_test.cc b/test/common/grpc/google_async_client_cache_test.cc
index 6d36ff2efb749..6646efc7bc499 100644
--- a/test/common/grpc/google_async_client_cache_test.cc
+++ b/test/common/grpc/google_async_client_cache_test.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/google_async_client_cache.h"
+#include "source/common/grpc/google_async_client_cache.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc
index c54e2d2aea5b0..977d734e2fff3 100644
--- a/test/common/grpc/google_async_client_impl_test.cc
+++ b/test/common/grpc/google_async_client_impl_test.cc
@@ -1,12 +1,12 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/api_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/grpc/google_async_client_impl.h"
-#include "common/network/address_impl.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/grpc/google_async_client_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/tracing/mocks.h"
diff --git a/test/common/grpc/google_grpc_creds_test.cc b/test/common/grpc/google_grpc_creds_test.cc
index 8c3b4efdefd48..e405adc834d79 100644
--- a/test/common/grpc/google_grpc_creds_test.cc
+++ b/test/common/grpc/google_grpc_creds_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/grpc/google_grpc_creds_impl.h"
+#include "source/common/grpc/google_grpc_creds_impl.h"
 
 #include "test/common/grpc/utility.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/common/grpc/google_grpc_utils_test.cc b/test/common/grpc/google_grpc_utils_test.cc
index 5bf3264a329a2..0724577e883e2 100644
--- a/test/common/grpc/google_grpc_utils_test.cc
+++ b/test/common/grpc/google_grpc_utils_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/common/platform.h"
 
-#include "common/grpc/google_grpc_utils.h"
+#include "source/common/grpc/google_grpc_utils.h"
 
 #include "test/proto/helloworld.pb.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/grpc/grpc_client_integration.h b/test/common/grpc/grpc_client_integration.h
index 112b73f965456..0c559cf699242 100644
--- a/test/common/grpc/grpc_client_integration.h
+++ b/test/common/grpc/grpc_client_integration.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/grpc/grpc_client_integration_test.cc b/test/common/grpc/grpc_client_integration_test.cc
index 578f489b848b0..96be74c4871ac 100644
--- a/test/common/grpc/grpc_client_integration_test.cc
+++ b/test/common/grpc/grpc_client_integration_test.cc
@@ -1,7 +1,7 @@
 #ifdef ENVOY_GOOGLE_GRPC
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/grpc/google_async_client_impl.h"
+#include "source/common/grpc/google_async_client_impl.h"
 
 #endif
 
diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h
index 7bb886864082a..619c2b4d13cb2 100644
--- a/test/common/grpc/grpc_client_integration_test_harness.h
+++ b/test/common/grpc/grpc_client_integration_test_harness.h
@@ -7,26 +7,26 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/api_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/grpc/async_client_impl.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/context_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/grpc/async_client_impl.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/context_impl.h"
 
 #ifdef ENVOY_GOOGLE_GRPC
-#include "common/grpc/google_async_client_impl.h"
+#include "source/common/grpc/google_async_client_impl.h"
 #endif
 
-#include "common/http/async_client_impl.h"
-#include "common/http/codes.h"
-#include "common/http/http2/conn_pool.h"
-#include "common/network/connection_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/router/context_impl.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/http2/conn_pool.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/common/grpc/utility.h"
diff --git a/test/common/html/utility_test.cc b/test/common/html/utility_test.cc
index 8eb83bc3cc602..410e24b8bb22a 100644
--- a/test/common/html/utility_test.cc
+++ b/test/common/html/utility_test.cc
@@ -1,4 +1,4 @@
-#include "common/html/utility.h"
+#include "source/common/html/utility.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/http/BUILD b/test/common/http/BUILD
index 615595df3b935..c677569328d2a 100644
--- a/test/common/http/BUILD
+++ b/test/common/http/BUILD
@@ -156,8 +156,8 @@ envoy_cc_test_library(
     srcs = ["common.cc"],
     hdrs = ["common.h"],
     deps = [
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:codec_client_lib",
         "//test/mocks:common_lib",
         "//test/mocks/event:event_mocks",
diff --git a/test/common/http/alternate_protocols_cache_impl_test.cc b/test/common/http/alternate_protocols_cache_impl_test.cc
index 88347e98bac3e..4abc98ddb5be4 100644
--- a/test/common/http/alternate_protocols_cache_impl_test.cc
+++ b/test/common/http/alternate_protocols_cache_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/alternate_protocols_cache_impl.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
 
 #include "test/test_common/simulated_time_system.h"
 
diff --git a/test/common/http/alternate_protocols_cache_manager_test.cc b/test/common/http/alternate_protocols_cache_manager_test.cc
index 7eb16ef48c8df..c26570eac76fa 100644
--- a/test/common/http/alternate_protocols_cache_manager_test.cc
+++ b/test/common/http/alternate_protocols_cache_manager_test.cc
@@ -1,5 +1,5 @@
-#include "common/http/alternate_protocols_cache_manager_impl.h"
-#include "common/singleton/manager_impl.h"
+#include "source/common/http/alternate_protocols_cache_manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "test/mocks/thread_local/mocks.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc
index cf7a3a027a70e..ea82b2993aad9 100644
--- a/test/common/http/async_client_impl_test.cc
+++ b/test/common/http/async_client_impl_test.cc
@@ -6,12 +6,12 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/async_client_impl.h"
-#include "common/http/context_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/router/context_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/router/context_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/common/http/async_client_utility_test.cc b/test/common/http/async_client_utility_test.cc
index afcfc0ef0d0e2..fc4e64bc793fd 100644
--- a/test/common/http/async_client_utility_test.cc
+++ b/test/common/http/async_client_utility_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/async_client_utility.h"
+#include "source/common/http/async_client_utility.h"
 
 #include "test/mocks/http/mocks.h"
 
diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc
index 55e0b3c4d221a..25a854defb3bc 100644
--- a/test/common/http/codec_client_test.cc
+++ b/test/common/http/codec_client_test.cc
@@ -1,13 +1,13 @@
 #include <memory>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/http/codec_client.h"
-#include "common/http/exception.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/utility.h"
-#include "common/stream_info/stream_info_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/exception.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/http/codec_impl_fuzz_test.cc b/test/common/http/codec_impl_fuzz_test.cc
index 8471fed61f472..41453259059a3 100644
--- a/test/common/http/codec_impl_fuzz_test.cc
+++ b/test/common/http/codec_impl_fuzz_test.cc
@@ -9,13 +9,13 @@
 
 #include <functional>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/conn_manager_utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/conn_manager_utility.h"
 
 #include "test/common/http/codec_impl_fuzz.pb.validate.h"
 #include "test/common/http/http2/codec_impl_test_util.h"
diff --git a/test/common/http/codec_wrappers_test.cc b/test/common/http/codec_wrappers_test.cc
index 02e47262da653..c2599039112f0 100644
--- a/test/common/http/codec_wrappers_test.cc
+++ b/test/common/http/codec_wrappers_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/codec_wrappers.h"
+#include "source/common/http/codec_wrappers.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/http/codes_speed_test.cc b/test/common/http/codes_speed_test.cc
index f6730603abc6a..c6ed25738f55c 100644
--- a/test/common/http/codes_speed_test.cc
+++ b/test/common/http/codes_speed_test.cc
@@ -8,9 +8,9 @@
 
 #include "envoy/stats/stats.h"
 
-#include "common/http/codes.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/http/codes.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/http/codes_test.cc b/test/common/http/codes_test.cc
index b55876a3e340a..dffc2f57ef81b 100644
--- a/test/common/http/codes_test.cc
+++ b/test/common/http/codes_test.cc
@@ -5,9 +5,9 @@
 
 #include "envoy/stats/stats.h"
 
-#include "common/common/empty_string.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/test_common/printers.h"
diff --git a/test/common/http/common.h b/test/common/http/common.h
index 06385cbc6c12a..b23c14535845c 100644
--- a/test/common/http/common.h
+++ b/test/common/http/common.h
@@ -4,7 +4,7 @@
 
 #include "envoy/http/conn_pool.h"
 
-#include "common/http/codec_client.h"
+#include "source/common/http/codec_client.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/http/conn_manager_impl_fuzz_test.cc b/test/common/http/conn_manager_impl_fuzz_test.cc
index dd9c7e1525984..6af101e44ee98 100644
--- a/test/common/http/conn_manager_impl_fuzz_test.cc
+++ b/test/common/http/conn_manager_impl_fuzz_test.cc
@@ -14,14 +14,14 @@
 // * Fuzz config settings
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/http/conn_manager_impl.h"
-#include "common/http/context_impl.h"
-#include "common/http/date_provider_impl.h"
-#include "common/http/exception.h"
-#include "common/http/header_utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/http/conn_manager_impl_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/http/conn_manager_impl_test_base.cc b/test/common/http/conn_manager_impl_test_base.cc
index 92e74ac4c97a5..5cce6546afe8a 100644
--- a/test/common/http/conn_manager_impl_test_base.cc
+++ b/test/common/http/conn_manager_impl_test_base.cc
@@ -1,6 +1,6 @@
 #include "test/common/http/conn_manager_impl_test_base.h"
 
-#include "extensions/request_id/uuid/config.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "test/common/http/xff_extension.h"
 
diff --git a/test/common/http/conn_manager_impl_test_base.h b/test/common/http/conn_manager_impl_test_base.h
index 18b04e5176032..98a4b95b6e6f8 100644
--- a/test/common/http/conn_manager_impl_test_base.h
+++ b/test/common/http/conn_manager_impl_test_base.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "common/http/conn_manager_impl.h"
-#include "common/http/context_impl.h"
-#include "common/http/date_provider_impl.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/http/conn_manager_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc
index a53c9fe67a090..7948e3d19def4 100644
--- a/test/common/http/conn_manager_utility_test.cc
+++ b/test/common/http/conn_manager_utility_test.cc
@@ -4,15 +4,14 @@
 #include "envoy/http/request_id_extension.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/random_generator.h"
-#include "common/http/conn_manager_utility.h"
-#include "common/http/header_utility.h"
-#include "common/http/headers.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/runtime/runtime_impl.h"
-
-#include "extensions/request_id/uuid/config.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/http/conn_manager_utility.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "test/common/http/custom_header_extension.h"
 #include "test/common/http/xff_extension.h"
diff --git a/test/common/http/conn_pool_grid_test.cc b/test/common/http/conn_pool_grid_test.cc
index d52fd391620af..e5cf18bcd986d 100644
--- a/test/common/http/conn_pool_grid_test.cc
+++ b/test/common/http/conn_pool_grid_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/http/alternate_protocols_cache.h"
 
-#include "common/http/alternate_protocols_cache_impl.h"
-#include "common/http/conn_pool_grid.h"
+#include "source/common/http/alternate_protocols_cache_impl.h"
+#include "source/common/http/conn_pool_grid.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
@@ -597,7 +597,7 @@ TEST_F(ConnectivityGridWithAlternateProtocolsCacheImplTest, SuccessWithoutHttp3N
 } // namespace
 } // namespace Http
 } // namespace Envoy
-#include "extensions/quic_listeners/quiche/quic_transport_socket_factory.h"
+#include "source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h"
 namespace Envoy {
 namespace Http {
 namespace {
diff --git a/test/common/http/custom_header_extension.cc b/test/common/http/custom_header_extension.cc
index 33bb73e363064..c49dcbac0f8ca 100644
--- a/test/common/http/custom_header_extension.cc
+++ b/test/common/http/custom_header_extension.cc
@@ -1,6 +1,6 @@
 #include "test/common/http/custom_header_extension.h"
 
-#include "extensions/http/original_ip_detection/custom_header/custom_header.h"
+#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h"
 
 namespace Envoy {
 
diff --git a/test/common/http/date_provider_impl_test.cc b/test/common/http/date_provider_impl_test.cc
index 42312ad6af6e2..176483304d16e 100644
--- a/test/common/http/date_provider_impl_test.cc
+++ b/test/common/http/date_provider_impl_test.cc
@@ -1,7 +1,7 @@
 #include <chrono>
 
-#include "common/http/date_provider_impl.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/thread_local/mocks.h"
diff --git a/test/common/http/filter_manager_test.cc b/test/common/http/filter_manager_test.cc
index 477184462d001..8587b0f50ac85 100644
--- a/test/common/http/filter_manager_test.cc
+++ b/test/common/http/filter_manager_test.cc
@@ -4,12 +4,12 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/stream_info/filter_state.h"
 
-#include "common/http/filter_manager.h"
-#include "common/http/matching/inputs.h"
-#include "common/matcher/exact_map_matcher.h"
-#include "common/matcher/matcher.h"
-#include "common/stream_info/filter_state_impl.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/http/filter_manager.h"
+#include "source/common/http/matching/inputs.h"
+#include "source/common/matcher/exact_map_matcher.h"
+#include "source/common/matcher/matcher.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/http/header_map_impl_fuzz_test.cc b/test/common/http/header_map_impl_fuzz_test.cc
index abbe77e6ca1ce..d769eb2258796 100644
--- a/test/common/http/header_map_impl_fuzz_test.cc
+++ b/test/common/http/header_map_impl_fuzz_test.cc
@@ -1,8 +1,8 @@
 #include <functional>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/common/http/header_map_impl_fuzz.pb.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/http/header_map_impl_speed_test.cc b/test/common/http/header_map_impl_speed_test.cc
index b5a0d985387ff..e131ecd9e5e9b 100644
--- a/test/common/http/header_map_impl_speed_test.cc
+++ b/test/common/http/header_map_impl_speed_test.cc
@@ -1,5 +1,5 @@
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/http/header_map_impl_test.cc b/test/common/http/header_map_impl_test.cc
index 9a1fef6241458..36ca86676e454 100644
--- a/test/common/http/header_map_impl_test.cc
+++ b/test/common/http/header_map_impl_test.cc
@@ -2,9 +2,9 @@
 #include <memory>
 #include <string>
 
-#include "common/http/header_list_view.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
+#include "source/common/http/header_list_view.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/common/http/header_utility_test.cc b/test/common/http/header_utility_test.cc
index ae873f46493f0..59a52bd5c3aef 100644
--- a/test/common/http/header_utility_test.cc
+++ b/test/common/http/header_utility_test.cc
@@ -5,8 +5,8 @@
 #include "envoy/http/protocol.h"
 #include "envoy/json/json_object.h"
 
-#include "common/http/header_utility.h"
-#include "common/json/json_loader.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/json/json_loader.h"
 
 #include "test/test_common/test_runtime.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/http/http1/BUILD b/test/common/http/http1/BUILD
index bb66b74b8ffd8..200909ceeb1e0 100644
--- a/test/common/http/http1/BUILD
+++ b/test/common/http/http1/BUILD
@@ -20,8 +20,8 @@ envoy_cc_test(
     name = "codec_impl_test",
     srcs = ["codec_impl_test.cc"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/http:exception_lib",
diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc
index 5131df3481254..f73c17d08eacd 100644
--- a/test/common/http/http1/codec_impl_test.cc
+++ b/test/common/http/http1/codec_impl_test.cc
@@ -7,12 +7,12 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/http/codec.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/utility.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc
index 2c461685b04e7..809ceb21e5145 100644
--- a/test/common/http/http1/conn_pool_test.cc
+++ b/test/common/http/http1/conn_pool_test.cc
@@ -4,14 +4,14 @@
 #include "envoy/http/codec.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/http/codec_client.h"
-#include "common/http/http1/conn_pool.h"
-#include "common/http/utility.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/http1/conn_pool.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/http/http1/header_formatter_test.cc b/test/common/http/http1/header_formatter_test.cc
index d5ce38f1bfcf6..ba2abdf3e741c 100644
--- a/test/common/http/http1/header_formatter_test.cc
+++ b/test/common/http/http1/header_formatter_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/http1/header_formatter.h"
+#include "source/common/http/http1/header_formatter.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/http/http2/BUILD b/test/common/http/http2/BUILD
index e9648e1aebeaf..075f7607ea42d 100644
--- a/test/common/http/http2/BUILD
+++ b/test/common/http/http2/BUILD
@@ -81,7 +81,7 @@ envoy_cc_test_library(
         "nghttp2",
     ],
     deps = [
-        "//include/envoy/http:metadata_interface_with_external_headers",
+        "//envoy/http:metadata_interface_with_external_headers",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:hex_lib",
@@ -144,7 +144,7 @@ envoy_cc_test(
     name = "http2_frame_test",
     srcs = ["http2_frame_test.cc"],
     deps = [
-        "//include/envoy/http:metadata_interface",
+        "//envoy/http:metadata_interface",
         "//source/common/http/http2:metadata_encoder_lib",
         "//test/common/http/http2:http2_frame",
     ],
diff --git a/test/common/http/http2/codec_impl_test.cc b/test/common/http/http2/codec_impl_test.cc
index 0752c0796fff6..9f00436e71625 100644
--- a/test/common/http/http2/codec_impl_test.cc
+++ b/test/common/http/http2/codec_impl_test.cc
@@ -5,11 +5,11 @@
 #include "envoy/http/codec.h"
 #include "envoy/stats/scope.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/utility.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http2/codec_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http2/codec_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/http/http2/http2_frame.h"
diff --git a/test/common/http/http2/codec_impl_test_util.h b/test/common/http/http2/codec_impl_test_util.h
index 3273ad221f6a1..c95c7776a7068 100644
--- a/test/common/http/http2/codec_impl_test_util.h
+++ b/test/common/http/http2/codec_impl_test_util.h
@@ -2,8 +2,8 @@
 
 #include "envoy/http/codec.h"
 
-#include "common/http/http2/codec_impl.h"
-#include "common/http/utility.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/utility.h"
 
 #include "test/mocks/common.h"
 
diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc
index f29d0d83209eb..e83eaabf94861 100644
--- a/test/common/http/http2/conn_pool_test.cc
+++ b/test/common/http/http2/conn_pool_test.cc
@@ -2,11 +2,11 @@
 #include <memory>
 #include <vector>
 
-#include "common/event/dispatcher_impl.h"
-#include "common/http/http2/conn_pool.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/http/http2/conn_pool.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/http/http2/frame_replay.cc b/test/common/http/http2/frame_replay.cc
index b0aa61e14ff07..8a604884330fe 100644
--- a/test/common/http/http2/frame_replay.cc
+++ b/test/common/http/http2/frame_replay.cc
@@ -1,8 +1,8 @@
 #include "test/common/http/http2/frame_replay.h"
 
-#include "common/common/hex.h"
-#include "common/common/macros.h"
-#include "common/http/utility.h"
+#include "source/common/common/hex.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/utility.h"
 
 #include "test/common/http/common.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/http/http2/frame_replay.h b/test/common/http/http2/frame_replay.h
index e07f18fa74367..17b2958f7f86a 100644
--- a/test/common/http/http2/frame_replay.h
+++ b/test/common/http/http2/frame_replay.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/http/http2/frame_replay_test.cc b/test/common/http/http2/frame_replay_test.cc
index 91a2ba4894e13..b9914633939ed 100644
--- a/test/common/http/http2/frame_replay_test.cc
+++ b/test/common/http/http2/frame_replay_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/exception.h"
+#include "source/common/http/exception.h"
 
 #include "test/common/http/common.h"
 #include "test/common/http/http2/codec_impl_test_util.h"
diff --git a/test/common/http/http2/http2_frame.cc b/test/common/http/http2/http2_frame.cc
index 266f7680dc45c..4a1c4b17b7673 100644
--- a/test/common/http/http2/http2_frame.cc
+++ b/test/common/http/http2/http2_frame.cc
@@ -4,7 +4,7 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/hex.h"
+#include "source/common/common/hex.h"
 
 #include "nghttp2/nghttp2.h"
 
diff --git a/test/common/http/http2/http2_frame.h b/test/common/http/http2/http2_frame.h
index 370316fc787cf..54f8fe5491bbf 100644
--- a/test/common/http/http2/http2_frame.h
+++ b/test/common/http/http2/http2_frame.h
@@ -6,7 +6,7 @@
 
 #include "envoy/http/metadata_interface.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/test/common/http/http2/http2_frame_test.cc b/test/common/http/http2/http2_frame_test.cc
index 7de8769d8cd33..b559e5b640dd8 100644
--- a/test/common/http/http2/http2_frame_test.cc
+++ b/test/common/http/http2/http2_frame_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/http/metadata_interface.h"
 
-#include "common/http/http2/metadata_encoder.h"
+#include "source/common/http/http2/metadata_encoder.h"
 
 #include "test/common/http/http2/http2_frame.h"
 
diff --git a/test/common/http/http2/metadata_encoder_decoder_test.cc b/test/common/http/http2/metadata_encoder_decoder_test.cc
index ffcea4f852123..d954778be1719 100644
--- a/test/common/http/http2/metadata_encoder_decoder_test.cc
+++ b/test/common/http/http2/metadata_encoder_decoder_test.cc
@@ -1,10 +1,10 @@
 #include "envoy/http/metadata_interface.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/logger.h"
-#include "common/common/random_generator.h"
-#include "common/http/http2/metadata_decoder.h"
-#include "common/http/http2/metadata_encoder.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/http/http2/metadata_decoder.h"
+#include "source/common/http/http2/metadata_encoder.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/common/http/http2/protocol_constraints_test.cc b/test/common/http/http2/protocol_constraints_test.cc
index f3308759b9e96..c31c3a254a1cc 100644
--- a/test/common/http/http2/protocol_constraints_test.cc
+++ b/test/common/http/http2/protocol_constraints_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/utility.h"
-#include "common/http/http2/protocol_constraints.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/http2/protocol_constraints.h"
 
 #include "test/common/stats/stat_test_utility.h"
 
diff --git a/test/common/http/http2/request_header_fuzz_test.cc b/test/common/http/http2/request_header_fuzz_test.cc
index 90b8cdd758e3d..dc8d2a094adf5 100644
--- a/test/common/http/http2/request_header_fuzz_test.cc
+++ b/test/common/http/http2/request_header_fuzz_test.cc
@@ -2,7 +2,7 @@
 // stateless and focuses only on HEADERS. This technique also plays well with
 // uncompressed HEADERS fuzzing.
 
-#include "common/http/exception.h"
+#include "source/common/http/exception.h"
 
 #include "test/common/http/http2/codec_impl_test_util.h"
 #include "test/common/http/http2/frame_replay.h"
diff --git a/test/common/http/http2/response_header_fuzz_test.cc b/test/common/http/http2/response_header_fuzz_test.cc
index 93e1baff480bb..0935ab0017ef2 100644
--- a/test/common/http/http2/response_header_fuzz_test.cc
+++ b/test/common/http/http2/response_header_fuzz_test.cc
@@ -2,7 +2,7 @@
 // stateless and focuses only on HEADERS. This technique also plays well with
 // uncompressed HEADERS fuzzing.
 
-#include "common/http/exception.h"
+#include "source/common/http/exception.h"
 
 #include "test/common/http/common.h"
 #include "test/common/http/http2/codec_impl_test_util.h"
diff --git a/test/common/http/http3/conn_pool_test.cc b/test/common/http/http3/conn_pool_test.cc
index 3c16ae1d6eb78..547aa28be636f 100644
--- a/test/common/http/http3/conn_pool_test.cc
+++ b/test/common/http/http3/conn_pool_test.cc
@@ -1,5 +1,5 @@
-#include "common/http/http3/conn_pool.h"
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/http/http3/conn_pool.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/http/http3_status_tracker_test.cc b/test/common/http/http3_status_tracker_test.cc
index 0fce5f482172d..774612a15fbfc 100644
--- a/test/common/http/http3_status_tracker_test.cc
+++ b/test/common/http/http3_status_tracker_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/http3_status_tracker.h"
+#include "source/common/http/http3_status_tracker.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/http/match_wrapper/config_test.cc b/test/common/http/match_wrapper/config_test.cc
index 3a79a21b01aee..db2681a143995 100644
--- a/test/common/http/match_wrapper/config_test.cc
+++ b/test/common/http/match_wrapper/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/server/factory_context.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/http/match_wrapper/config.h"
+#include "source/common/http/match_wrapper/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/registry.h"
diff --git a/test/common/http/matching/inputs_test.cc b/test/common/http/matching/inputs_test.cc
index e7697d2e83bcc..fac4211722c9f 100644
--- a/test/common/http/matching/inputs_test.cc
+++ b/test/common/http/matching/inputs_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/http/filter.h"
 
-#include "common/http/matching/data_impl.h"
-#include "common/http/matching/inputs.h"
+#include "source/common/http/matching/data_impl.h"
+#include "source/common/http/matching/inputs.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/http/mixed_conn_pool_test.cc b/test/common/http/mixed_conn_pool_test.cc
index e5fa9c30887b7..3f22bfc5b876c 100644
--- a/test/common/http/mixed_conn_pool_test.cc
+++ b/test/common/http/mixed_conn_pool_test.cc
@@ -1,7 +1,7 @@
 #include <memory>
 
-#include "common/http/mixed_conn_pool.h"
-#include "common/http/utility.h"
+#include "source/common/http/mixed_conn_pool.h"
+#include "source/common/http/utility.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/http/path_utility_fuzz_test.cc b/test/common/http/path_utility_fuzz_test.cc
index 3ae691e7ecf77..4833a420e081e 100644
--- a/test/common/http/path_utility_fuzz_test.cc
+++ b/test/common/http/path_utility_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/path_utility.h"
+#include "source/common/http/path_utility.h"
 
 #include "test/common/http/path_utility_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/http/path_utility_test.cc b/test/common/http/path_utility_test.cc
index 3934b1469ed5d..b1384e9573937 100644
--- a/test/common/http/path_utility_test.cc
+++ b/test/common/http/path_utility_test.cc
@@ -2,7 +2,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/http/path_utility.h"
+#include "source/common/http/path_utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/http/status_test.cc b/test/common/http/status_test.cc
index 152cc1925fa64..1d70d91684ad3 100644
--- a/test/common/http/status_test.cc
+++ b/test/common/http/status_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/status.h"
+#include "source/common/http/status.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/http/user_agent_test.cc b/test/common/http/user_agent_test.cc
index 26d01b81a4a13..2a9c40481216b 100644
--- a/test/common/http/user_agent_test.cc
+++ b/test/common/http/user_agent_test.cc
@@ -1,5 +1,5 @@
-#include "common/http/header_map_impl.h"
-#include "common/http/user_agent.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/user_agent.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/common/http/utility_fuzz_test.cc b/test/common/http/utility_fuzz_test.cc
index 2b665893f50f3..ca362680fb9f6 100644
--- a/test/common/http/utility_fuzz_test.cc
+++ b/test/common/http/utility_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 
 #include "test/common/http/utility_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc
index edd4a52d137d5..32149b467c395 100644
--- a/test/common/http/utility_test.cc
+++ b/test/common/http/utility_test.cc
@@ -6,12 +6,12 @@
 #include "envoy/config/core/v3/protocol.pb.h"
 #include "envoy/config/core/v3/protocol.pb.validate.h"
 
-#include "common/common/fmt.h"
-#include "common/http/exception.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http1/settings.h"
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/exception.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http1/settings.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/protobuf/mocks.h"
diff --git a/test/common/http/xff_extension.cc b/test/common/http/xff_extension.cc
index 3cca217790578..1c07e6804cef3 100644
--- a/test/common/http/xff_extension.cc
+++ b/test/common/http/xff_extension.cc
@@ -1,6 +1,6 @@
 #include "test/common/http/xff_extension.h"
 
-#include "extensions/http/original_ip_detection/xff/xff.h"
+#include "source/extensions/http/original_ip_detection/xff/xff.h"
 
 namespace Envoy {
 
diff --git a/test/common/init/manager_impl_test.cc b/test/common/init/manager_impl_test.cc
index 28465b1d2a160..d2fc77f5a5894 100644
--- a/test/common/init/manager_impl_test.cc
+++ b/test/common/init/manager_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/init/manager_impl.h"
+#include "source/common/init/manager_impl.h"
 
 #include "test/mocks/init/mocks.h"
 
diff --git a/test/common/json/json_fuzz_test.cc b/test/common/json/json_fuzz_test.cc
index 40087ae74355b..bcc062f3c460b 100644
--- a/test/common/json/json_fuzz_test.cc
+++ b/test/common/json/json_fuzz_test.cc
@@ -1,5 +1,5 @@
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/fuzz/utility.h"
diff --git a/test/common/json/json_loader_test.cc b/test/common/json/json_loader_test.cc
index e26fa010c8353..232f4b57c4940 100644
--- a/test/common/json/json_loader_test.cc
+++ b/test/common/json/json_loader_test.cc
@@ -1,8 +1,8 @@
 #include <string>
 #include <vector>
 
-#include "common/json/json_loader.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/local_info/local_info_impl_test.cc b/test/common/local_info/local_info_impl_test.cc
index dbfcb45730866..87743f1384223 100644
--- a/test/common/local_info/local_info_impl_test.cc
+++ b/test/common/local_info/local_info_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/local_info/local_info_impl.h"
+#include "source/common/local_info/local_info_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 
diff --git a/test/common/local_reply/local_reply_test.cc b/test/common/local_reply/local_reply_test.cc
index 64afad622bd1a..854eb24bcb983 100644
--- a/test/common/local_reply/local_reply_test.cc
+++ b/test/common/local_reply/local_reply_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.h"
 #include "envoy/http/codes.h"
 
-#include "common/http/header_utility.h"
-#include "common/local_reply/local_reply.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/local_reply/local_reply.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/common/matcher/exact_map_matcher_test.cc b/test/common/matcher/exact_map_matcher_test.cc
index 0d7745a4cb95f..354ae67682c15 100644
--- a/test/common/matcher/exact_map_matcher_test.cc
+++ b/test/common/matcher/exact_map_matcher_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/config/core/v3/extension.pb.h"
 
-#include "common/matcher/exact_map_matcher.h"
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/exact_map_matcher.h"
+#include "source/common/matcher/matcher.h"
 
 #include "test/common/matcher/test_utility.h"
 
diff --git a/test/common/matcher/field_matcher_test.cc b/test/common/matcher/field_matcher_test.cc
index 133da5ae8a4ff..44c40d8c86247 100644
--- a/test/common/matcher/field_matcher_test.cc
+++ b/test/common/matcher/field_matcher_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/matcher/matcher.h"
 
-#include "common/matcher/field_matcher.h"
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/field_matcher.h"
+#include "source/common/matcher/matcher.h"
 
 #include "test/common/matcher/test_utility.h"
 
diff --git a/test/common/matcher/list_matcher_test.cc b/test/common/matcher/list_matcher_test.cc
index f9f4f3a89f6bd..760028756e811 100644
--- a/test/common/matcher/list_matcher_test.cc
+++ b/test/common/matcher/list_matcher_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/matcher/matcher.h"
 
-#include "common/matcher/list_matcher.h"
+#include "source/common/matcher/list_matcher.h"
 
 #include "test/common/matcher/test_utility.h"
 
diff --git a/test/common/matcher/matcher_test.cc b/test/common/matcher/matcher_test.cc
index 1bbc395806788..69d6d32ebf6cd 100644
--- a/test/common/matcher/matcher_test.cc
+++ b/test/common/matcher/matcher_test.cc
@@ -6,9 +6,9 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/registry/registry.h"
 
-#include "common/matcher/list_matcher.h"
-#include "common/matcher/matcher.h"
-#include "common/protobuf/utility.h"
+#include "source/common/matcher/list_matcher.h"
+#include "source/common/matcher/matcher.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/matcher/test_utility.h"
 #include "test/mocks/matcher/mocks.h"
diff --git a/test/common/matcher/test_utility.h b/test/common/matcher/test_utility.h
index 46dcd4bf5935e..24a8e08a40ae3 100644
--- a/test/common/matcher/test_utility.h
+++ b/test/common/matcher/test_utility.h
@@ -3,7 +3,7 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/protobuf/message_validator.h"
 
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/matcher.h"
 
 #include "test/test_common/registry.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/matcher/value_input_matcher_test.cc b/test/common/matcher/value_input_matcher_test.cc
index ebad39332489a..e9d080d31efc7 100644
--- a/test/common/matcher/value_input_matcher_test.cc
+++ b/test/common/matcher/value_input_matcher_test.cc
@@ -1,4 +1,4 @@
-#include "common/matcher/value_input_matcher.h"
+#include "source/common/matcher/value_input_matcher.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/memory/debug_test.cc b/test/common/memory/debug_test.cc
index bd33b91f51e19..ce137b79613ef 100644
--- a/test/common/memory/debug_test.cc
+++ b/test/common/memory/debug_test.cc
@@ -1,4 +1,4 @@
-#include "common/memory/stats.h"
+#include "source/common/memory/stats.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/memory/heap_shrinker_test.cc b/test/common/memory/heap_shrinker_test.cc
index 346a74899ff97..c6c7780a53b8f 100644
--- a/test/common/memory/heap_shrinker_test.cc
+++ b/test/common/memory/heap_shrinker_test.cc
@@ -1,6 +1,6 @@
-#include "common/event/dispatcher_impl.h"
-#include "common/memory/heap_shrinker.h"
-#include "common/memory/stats.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/memory/heap_shrinker.h"
+#include "source/common/memory/stats.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/network/BUILD b/test/common/network/BUILD
index e38f0aa74ff2e..ce5f097cd5f5e 100644
--- a/test/common/network/BUILD
+++ b/test/common/network/BUILD
@@ -105,10 +105,10 @@ envoy_cc_test(
     }),
     external_deps = ["abseil_synchronization"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:dns_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:dns_interface",
         "//source/common/event:dispatcher_includes",
-        "//include/envoy/event:file_event_interface",
+        "//envoy/event:file_event_interface",
         "//source/common/stats:isolated_store_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/network:address_lib",
@@ -139,9 +139,9 @@ envoy_cc_test(
     # https://gist.github.com/wrowe/24fe5b93b58bb444bce7ecc134905395
     tags = ["fails_on_clang_cl"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:dns_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:dns_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/event:dispatcher_includes",
         "//source/common/event:dispatcher_lib",
diff --git a/test/common/network/addr_family_aware_socket_option_impl_test.cc b/test/common/network/addr_family_aware_socket_option_impl_test.cc
index 14a2ea9dd8081..cdea9a34f4801 100644
--- a/test/common/network/addr_family_aware_socket_option_impl_test.cc
+++ b/test/common/network/addr_family_aware_socket_option_impl_test.cc
@@ -1,10 +1,10 @@
 #include "envoy/common/platform.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/addr_family_aware_socket_option_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/network/utility.h"
+#include "source/common/network/addr_family_aware_socket_option_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/network/socket_option_test.h"
 
diff --git a/test/common/network/address_impl_speed_test.cc b/test/common/network/address_impl_speed_test.cc
index 2d7f61af838b9..c4005ac4c86c1 100644
--- a/test/common/network/address_impl_speed_test.cc
+++ b/test/common/network/address_impl_speed_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/fmt.h"
-#include "common/network/address_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/network/address_impl.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/network/address_impl_test.cc b/test/common/network/address_impl_test.cc
index 5284464bb165a..86af3022cc583 100644
--- a/test/common/network/address_impl_test.cc
+++ b/test/common/network/address_impl_test.cc
@@ -5,12 +5,12 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/apple_dns_impl_test.cc b/test/common/network/apple_dns_impl_test.cc
index 75f666576da06..d2f00c15cdb29 100644
--- a/test/common/network/apple_dns_impl_test.cc
+++ b/test/common/network/apple_dns_impl_test.cc
@@ -10,11 +10,11 @@
 #include "envoy/network/address.h"
 #include "envoy/network/dns.h"
 
-#include "common/common/random_generator.h"
-#include "common/network/address_impl.h"
-#include "common/network/apple_dns_impl.h"
-#include "common/network/utility.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/apple_dns_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/cidr_range_test.cc b/test/common/network/cidr_range_test.cc
index 29e48106e8857..6232e910ddfbb 100644
--- a/test/common/network/cidr_range_test.cc
+++ b/test/common/network/cidr_range_test.cc
@@ -4,11 +4,11 @@
 #include "envoy/common/exception.h"
 #include "envoy/common/platform.h"
 
-#include "common/common/fmt.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/network/cidr_range.h"
-#include "common/network/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/utility.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc
index b4109d17fb6fd..63f5a10898aef 100644
--- a/test/common/network/connection_impl_test.cc
+++ b/test/common/network/connection_impl_test.cc
@@ -7,18 +7,18 @@
 #include "envoy/event/scaled_range_timer_manager.h"
 #include "envoy/network/address.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/connection_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/utility.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc
index 8305acf032d81..e3c1401c673b2 100644
--- a/test/common/network/dns_impl_test.cc
+++ b/test/common/network/dns_impl_test.cc
@@ -9,15 +9,15 @@
 #include "envoy/network/address.h"
 #include "envoy/network/dns.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/utility.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/dns_impl.h"
-#include "common/network/filter_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/utility.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/dns_impl.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc
index f5e931a5b955b..4016b3ae82a4d 100644
--- a/test/common/network/filter_manager_impl_test.cc
+++ b/test/common/network/filter_manager_impl_test.cc
@@ -4,12 +4,11 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/filter_manager_impl.h"
-#include "common/tcp_proxy/tcp_proxy.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/filters/network/ratelimit/ratelimit.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/filter_manager_impl.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/filters/network/ratelimit/ratelimit.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/extensions/filters/common/ratelimit/mocks.h"
diff --git a/test/common/network/filter_matcher_test.cc b/test/common/network/filter_matcher_test.cc
index 0039642c0cba4..30208c83dc79b 100644
--- a/test/common/network/filter_matcher_test.cc
+++ b/test/common/network/filter_matcher_test.cc
@@ -1,5 +1,5 @@
-#include "common/network/address_impl.h"
-#include "common/network/filter_matcher.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/filter_matcher.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/common/network/io_socket_handle_impl_integration_test.cc b/test/common/network/io_socket_handle_impl_integration_test.cc
index 93d563999ab8a..31d8ac67de946 100644
--- a/test/common/network/io_socket_handle_impl_integration_test.cc
+++ b/test/common/network/io_socket_handle_impl_integration_test.cc
@@ -1,5 +1,5 @@
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/common/network/io_socket_handle_impl_test.cc b/test/common/network/io_socket_handle_impl_test.cc
index 86bdd8df5d189..6ce655b63029a 100644
--- a/test/common/network/io_socket_handle_impl_test.cc
+++ b/test/common/network/io_socket_handle_impl_test.cc
@@ -1,8 +1,8 @@
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_error_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/lc_trie_speed_test.cc b/test/common/network/lc_trie_speed_test.cc
index 24d52fe0fcaab..7a524fe0f135b 100644
--- a/test/common/network/lc_trie_speed_test.cc
+++ b/test/common/network/lc_trie_speed_test.cc
@@ -1,5 +1,5 @@
-#include "common/network/lc_trie.h"
-#include "common/network/utility.h"
+#include "source/common/network/lc_trie.h"
+#include "source/common/network/utility.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/network/lc_trie_test.cc b/test/common/network/lc_trie_test.cc
index e0cf9ac43532c..c2da7417c96df 100644
--- a/test/common/network/lc_trie_test.cc
+++ b/test/common/network/lc_trie_test.cc
@@ -1,9 +1,9 @@
 #include <memory>
 
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/cidr_range.h"
-#include "common/network/lc_trie.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/cidr_range.h"
+#include "source/common/network/lc_trie.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/network/listen_socket_impl_test.cc b/test/common/network/listen_socket_impl_test.cc
index 9f50128898d82..7e787507020fe 100644
--- a/test/common/network/listen_socket_impl_test.cc
+++ b/test/common/network/listen_socket_impl_test.cc
@@ -5,11 +5,11 @@
 #include "envoy/network/exception.h"
 #include "envoy/network/socket.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_interface_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_interface_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc
index cea2b1ed13f01..15deae2a43210 100644
--- a/test/common/network/listener_impl_test.cc
+++ b/test/common/network/listener_impl_test.cc
@@ -3,10 +3,10 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/exception.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/tcp_listener_impl.h"
-#include "common/network/utility.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/tcp_listener_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/common/network/listener_impl_test_base.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/network/listener_impl_test_base.h b/test/common/network/listener_impl_test_base.h
index 8f3ee21b87278..a00ae01b67b54 100644
--- a/test/common/network/listener_impl_test_base.h
+++ b/test/common/network/listener_impl_test_base.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "common/event/dispatcher_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/test_common/network_utility.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/network/raw_buffer_socket_test.cc b/test/common/network/raw_buffer_socket_test.cc
index f28e54f53bc98..4304277b1b2d8 100644
--- a/test/common/network/raw_buffer_socket_test.cc
+++ b/test/common/network/raw_buffer_socket_test.cc
@@ -1,4 +1,4 @@
-#include "common/network/raw_buffer_socket.h"
+#include "source/common/network/raw_buffer_socket.h"
 
 #include "test/test_common/network_utility.h"
 
diff --git a/test/common/network/resolver_impl_test.cc b/test/common/network/resolver_impl_test.cc
index c9d9b3fce9019..77b0ec2583148 100644
--- a/test/common/network/resolver_impl_test.cc
+++ b/test/common/network/resolver_impl_test.cc
@@ -7,9 +7,9 @@
 #include "envoy/network/resolver.h"
 #include "envoy/registry/registry.h"
 
-#include "common/common/thread.h"
-#include "common/network/address_impl.h"
-#include "common/network/resolver_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/resolver_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/common/network/socket_option_factory_test.cc b/test/common/network/socket_option_factory_test.cc
index 30ee22cd15c15..a32fae30b85a7 100644
--- a/test/common/network/socket_option_factory_test.cc
+++ b/test/common/network/socket_option_factory_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/network/socket_option_test.h b/test/common/network/socket_option_test.h
index e780c3e2ec2a3..c2a60bc1bf372 100644
--- a/test/common/network/socket_option_test.h
+++ b/test/common/network/socket_option_test.h
@@ -2,9 +2,9 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/network/transport_socket_options_impl_test.cc b/test/common/network/transport_socket_options_impl_test.cc
index 213c6778b0373..8bf0b4bd2f164 100644
--- a/test/common/network/transport_socket_options_impl_test.cc
+++ b/test/common/network/transport_socket_options_impl_test.cc
@@ -1,10 +1,10 @@
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/application_protocol.h"
-#include "common/network/proxy_protocol_filter_state.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/proxy_protocol_filter_state.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/network/udp_fuzz.cc b/test/common/network/udp_fuzz.cc
index ca1d2d41c3be5..f1768976306fc 100644
--- a/test/common/network/udp_fuzz.cc
+++ b/test/common/network/udp_fuzz.cc
@@ -2,13 +2,13 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/network/udp_listener_impl_test_base.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/network/udp_listener_impl_batch_writer_test.cc b/test/common/network/udp_listener_impl_batch_writer_test.cc
index f69c3146a9654..43197a66ecc27 100644
--- a/test/common/network/udp_listener_impl_batch_writer_test.cc
+++ b/test/common/network/udp_listener_impl_batch_writer_test.cc
@@ -21,13 +21,13 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/utility.h"
 
-#include "common/quic/udp_gso_batch_writer.h"
+#include "source/common/quic/udp_gso_batch_writer.h"
 
 #include "test/common/network/udp_listener_impl_test_base.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/network/udp_listener_impl_test.cc b/test/common/network/udp_listener_impl_test.cc
index 1ac4dcb2936f5..5cdfa54c831ca 100644
--- a/test/common/network/udp_listener_impl_test.cc
+++ b/test/common/network/udp_listener_impl_test.cc
@@ -6,13 +6,13 @@
 #include "envoy/api/os_sys_calls.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/network/udp_listener_impl_test_base.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/network/udp_listener_impl_test_base.h b/test/common/network/udp_listener_impl_test_base.h
index 671a30b563709..527018259cfa4 100644
--- a/test/common/network/udp_listener_impl_test_base.h
+++ b/test/common/network/udp_listener_impl_test_base.h
@@ -7,12 +7,12 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/network/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/network/listener_impl_test_base.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/network/utility_fuzz_test.cc b/test/common/network/utility_fuzz_test.cc
index 8d49667a24e0e..1302614c7a8fb 100644
--- a/test/common/network/utility_fuzz_test.cc
+++ b/test/common/network/utility_fuzz_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/core/v3/address.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/network/utility_test.cc b/test/common/network/utility_test.cc
index 45c196f56314a..33b3eb8490858 100644
--- a/test/common/network/utility_test.cc
+++ b/test/common/network/utility_test.cc
@@ -6,9 +6,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/config/core/v3/address.pb.h"
 
-#include "common/common/thread.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/thread.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/network/win32_redirect_records_option_test.cc b/test/common/network/win32_redirect_records_option_test.cc
index 643cfd4fab328..405e7df3a9361 100644
--- a/test/common/network/win32_redirect_records_option_test.cc
+++ b/test/common/network/win32_redirect_records_option_test.cc
@@ -1,8 +1,8 @@
-#include "common/common/scalar_to_byte_vector.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/network/utility.h"
-#include "common/network/win32_redirect_records_option_impl.h"
+#include "source/common/common/scalar_to_byte_vector.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/utility.h"
+#include "source/common/network/win32_redirect_records_option_impl.h"
 
 #include "test/common/network/socket_option_test.h"
 
diff --git a/test/common/protobuf/message_validator_impl_test.cc b/test/common/protobuf/message_validator_impl_test.cc
index d558799cc4406..73dd2dbcba6b9 100644
--- a/test/common/protobuf/message_validator_impl_test.cc
+++ b/test/common/protobuf/message_validator_impl_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/protobuf/message_validator_impl.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/logging.h"
diff --git a/test/common/protobuf/utility_test.cc b/test/common/protobuf/utility_test.cc
index 45983670a0035..92480788872d5 100644
--- a/test/common/protobuf/utility_test.cc
+++ b/test/common/protobuf/utility_test.cc
@@ -14,12 +14,12 @@
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/base64.h"
-#include "common/config/api_version.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/config/api_version.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/init/mocks.h"
diff --git a/test/common/protobuf/value_util_fuzz_test.cc b/test/common/protobuf/value_util_fuzz_test.cc
index fec766f9e505f..1999427d5ca9a 100644
--- a/test/common/protobuf/value_util_fuzz_test.cc
+++ b/test/common/protobuf/value_util_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD
index 950bd64e15802..03d1e625d5e10 100644
--- a/test/common/quic/BUILD
+++ b/test/common/quic/BUILD
@@ -141,7 +141,7 @@ envoy_cc_test(
         ":quic_test_utils_for_envoy_lib",
         ":test_proof_source_lib",
         ":test_utils_lib",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/quic:codec_lib",
         "//source/common/quic:envoy_quic_alarm_factory_lib",
         "//source/common/quic:envoy_quic_connection_helper_lib",
@@ -169,7 +169,7 @@ envoy_cc_test(
     deps = [
         ":quic_test_utils_for_envoy_lib",
         ":test_utils_lib",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/quic:codec_lib",
         "//source/common/quic:envoy_quic_alarm_factory_lib",
         "//source/common/quic:envoy_quic_client_connection_lib",
@@ -214,7 +214,7 @@ envoy_cc_test(
         ":quic_test_utils_for_envoy_lib",
         ":test_proof_source_lib",
         ":test_utils_lib",
-        "//include/envoy/stats:stats_macros",
+        "//envoy/stats:stats_macros",
         "//source/common/quic:envoy_quic_alarm_factory_lib",
         "//source/common/quic:envoy_quic_connection_helper_lib",
         "//source/common/quic:envoy_quic_dispatcher_lib",
diff --git a/test/common/quic/active_quic_listener_test.cc b/test/common/quic/active_quic_listener_test.cc
index 6cbda761c2df2..37599ed769dbc 100644
--- a/test/common/quic/active_quic_listener_test.cc
+++ b/test/common/quic/active_quic_listener_test.cc
@@ -20,14 +20,14 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "server/configuration_impl.h"
-#include "common/common/logger.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/quic/active_quic_listener.h"
-#include "common/http/utility.h"
+#include "source/server/configuration_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/quic/active_quic_listener.h"
+#include "source/common/http/utility.h"
 #include "test/common/quic/test_utils.h"
 #include "test/common/quic/test_proof_source.h"
 #include "test/test_common/simulated_time_system.h"
@@ -40,9 +40,9 @@
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "common/quic/platform/envoy_quic_clock.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/udp_gso_batch_writer.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/udp_gso_batch_writer.h"
 
 using testing::Return;
 using testing::ReturnRef;
diff --git a/test/common/quic/client_connection_factory_impl_test.cc b/test/common/quic/client_connection_factory_impl_test.cc
index b7d26e2e2f40c..d7b453044da90 100644
--- a/test/common/quic/client_connection_factory_impl_test.cc
+++ b/test/common/quic/client_connection_factory_impl_test.cc
@@ -1,5 +1,5 @@
-#include "common/quic/client_connection_factory_impl.h"
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/quic/envoy_quic_alarm_test.cc b/test/common/quic/envoy_quic_alarm_test.cc
index 53fe6108bc5b4..f90f8eb2a4e69 100644
--- a/test/common/quic/envoy_quic_alarm_test.cc
+++ b/test/common/quic/envoy_quic_alarm_test.cc
@@ -1,6 +1,6 @@
-#include "common/quic/envoy_quic_alarm.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/envoy_quic_alarm.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/quic/envoy_quic_client_session_test.cc b/test/common/quic/envoy_quic_client_session_test.cc
index fbcc51df8c5c5..cca2f306f0610 100644
--- a/test/common/quic/envoy_quic_client_session_test.cc
+++ b/test/common/quic/envoy_quic_client_session_test.cc
@@ -12,12 +12,12 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_client_session.h"
-#include "common/quic/envoy_quic_client_connection.h"
-#include "common/quic/codec_impl.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/codec_impl.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_utils.h"
 #include "test/common/quic/test_utils.h"
 
 #include "envoy/stats/stats_macros.h"
diff --git a/test/common/quic/envoy_quic_client_stream_test.cc b/test/common/quic/envoy_quic_client_stream_test.cc
index 23b3f8aa8d774..47046ddd1d85b 100644
--- a/test/common/quic/envoy_quic_client_stream_test.cc
+++ b/test/common/quic/envoy_quic_client_stream_test.cc
@@ -1,8 +1,8 @@
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_client_connection.h"
-#include "common/quic/envoy_quic_client_stream.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/envoy_quic_client_stream.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 #include "test/common/quic/test_utils.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/quic/envoy_quic_dispatcher_test.cc b/test/common/quic/envoy_quic_dispatcher_test.cc
index e9b3844bd903b..43e0aba25394a 100644
--- a/test/common/quic/envoy_quic_dispatcher_test.cc
+++ b/test/common/quic/envoy_quic_dispatcher_test.cc
@@ -18,22 +18,22 @@
 
 #include <memory>
 
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/network/listen_socket_impl.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/network/listen_socket_impl.h"
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/environment.h"
 #include "test/mocks/network/mocks.h"
 #include "test/test_common/utility.h"
 #include "test/test_common/network_utility.h"
-#include "common/quic/platform/envoy_quic_clock.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/envoy_quic_dispatcher.h"
-#include "common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_dispatcher.h"
+#include "source/common/quic/envoy_quic_server_session.h"
 #include "test/common/quic/test_proof_source.h"
 #include "test/common/quic/test_utils.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "server/configuration_impl.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/server/configuration_impl.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/common/quic/envoy_quic_proof_source_test.cc b/test/common/quic/envoy_quic_proof_source_test.cc
index 960d385d2b2f7..30837b4fddc05 100644
--- a/test/common/quic/envoy_quic_proof_source_test.cc
+++ b/test/common/quic/envoy_quic_proof_source_test.cc
@@ -2,11 +2,10 @@
 #include <string>
 #include <vector>
 
-#include "common/quic/envoy_quic_proof_source.h"
-#include "common/quic/envoy_quic_proof_verifier.h"
-#include "common/quic/envoy_quic_utils.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/common/quic/envoy_quic_proof_source.h"
+#include "source/common/quic/envoy_quic_proof_verifier.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/ssl/mocks.h"
diff --git a/test/common/quic/envoy_quic_proof_verifier_test.cc b/test/common/quic/envoy_quic_proof_verifier_test.cc
index 6b42341fa685d..49dd9696e2fb8 100644
--- a/test/common/quic/envoy_quic_proof_verifier_test.cc
+++ b/test/common/quic/envoy_quic_proof_verifier_test.cc
@@ -1,9 +1,8 @@
 #include <algorithm>
 #include <memory>
 
-#include "common/quic/envoy_quic_proof_verifier.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/common/quic/envoy_quic_proof_verifier.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #include "test/mocks/ssl/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/common/quic/envoy_quic_server_session_test.cc b/test/common/quic/envoy_quic_server_session_test.cc
index 6f13cf9359b0c..211145b465f6a 100644
--- a/test/common/quic/envoy_quic_server_session_test.cc
+++ b/test/common/quic/envoy_quic_server_session_test.cc
@@ -21,19 +21,19 @@
 
 #include <string>
 
-#include "common/quic/envoy_quic_server_session.h"
-#include "common/quic/envoy_quic_server_stream.h"
-#include "common/quic/envoy_quic_server_connection.h"
-#include "common/quic/codec_impl.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/codec_impl.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_utils.h"
 #include "test/common/quic/test_proof_source.h"
 #include "test/common/quic/test_utils.h"
 
 #include "envoy/stats/stats_macros.h"
-#include "common/event/libevent_scheduler.h"
-#include "server/configuration_impl.h"
+#include "source/common/event/libevent_scheduler.h"
+#include "source/server/configuration_impl.h"
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/http/stream_decoder.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/quic/envoy_quic_server_stream_test.cc b/test/common/quic/envoy_quic_server_stream_test.cc
index 31738861bbd2c..70a7e075fb5ad 100644
--- a/test/common/quic/envoy_quic_server_stream_test.cc
+++ b/test/common/quic/envoy_quic_server_stream_test.cc
@@ -14,15 +14,15 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/event/libevent_scheduler.h"
-#include "common/http/headers.h"
-#include "server/active_listener_base.h"
-
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_server_connection.h"
-#include "common/quic/envoy_quic_server_session.h"
-#include "common/quic/envoy_quic_server_stream.h"
+#include "source/common/event/libevent_scheduler.h"
+#include "source/common/http/headers.h"
+#include "source/server/active_listener_base.h"
+
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/envoy_quic_server_session.h"
+#include "source/common/quic/envoy_quic_server_stream.h"
 
 #include "test/common/quic/test_utils.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/quic/envoy_quic_session_cache_test.cc b/test/common/quic/envoy_quic_session_cache_test.cc
index d2129d14cf105..5490b0d491afa 100644
--- a/test/common/quic/envoy_quic_session_cache_test.cc
+++ b/test/common/quic/envoy_quic_session_cache_test.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_session_cache.h"
+#include "source/common/quic/envoy_quic_session_cache.h"
 
 #include "absl/strings/escaping.h"
 #include "gmock/gmock.h"
diff --git a/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc b/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc
index 8ef33da4392cc..431c3de997eed 100644
--- a/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc
+++ b/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_simulated_watermark_buffer.h"
+#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/quic/envoy_quic_utils_test.cc b/test/common/quic/envoy_quic_utils_test.cc
index 7d032b4253717..20a1dfe989690 100644
--- a/test/common/quic/envoy_quic_utils_test.cc
+++ b/test/common/quic/envoy_quic_utils_test.cc
@@ -1,4 +1,4 @@
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
diff --git a/test/common/quic/envoy_quic_writer_test.cc b/test/common/quic/envoy_quic_writer_test.cc
index 87c345962c332..4e8d47cf6a829 100644
--- a/test/common/quic/envoy_quic_writer_test.cc
+++ b/test/common/quic/envoy_quic_writer_test.cc
@@ -3,10 +3,10 @@
 #include <memory>
 #include <string>
 
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_error_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/quic/envoy_quic_packet_writer.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/quic/envoy_quic_packet_writer.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/common/quic/platform/BUILD b/test/common/quic/platform/BUILD
index 56d9684c40343..4abda32750b67 100644
--- a/test/common/quic/platform/BUILD
+++ b/test/common/quic/platform/BUILD
@@ -90,7 +90,7 @@ envoy_cc_test_library(
     deps = [
         ":quic_platform_expect_bug_impl_lib",
         ":quic_platform_thread_impl_lib",
-        "//include/envoy/network:address_interface",
+        "//envoy/network:address_interface",
         "//source/common/quic/platform:quic_platform_base_impl_lib",
         "//test/test_common:environment_lib",
     ],
@@ -143,7 +143,7 @@ envoy_cc_test_library(
     hdrs = ["quic_test_mem_slice_vector_impl.h"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
         "@com_googlesource_quiche//:quic_platform_mem_slice_span",
     ],
 )
@@ -166,7 +166,7 @@ envoy_cc_test_library(
     hdrs = ["quic_thread_impl.h"],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/thread:thread_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/common:assert_lib",
         "//test/test_common:thread_factory_for_test_lib",
     ],
diff --git a/test/common/quic/platform/envoy_quic_clock_test.cc b/test/common/quic/platform/envoy_quic_clock_test.cc
index 8f5f7da8bb902..cc21b603ec00a 100644
--- a/test/common/quic/platform/envoy_quic_clock_test.cc
+++ b/test/common/quic/platform/envoy_quic_clock_test.cc
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "common/quic/platform/envoy_quic_clock.h"
+#include "source/common/quic/platform/envoy_quic_clock.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/test_time.h"
diff --git a/test/common/quic/platform/epoll_bug_impl.h b/test/common/quic/platform/epoll_bug_impl.h
index 82af224c5f3d7..f8620b6f949a9 100644
--- a/test/common/quic/platform/epoll_bug_impl.h
+++ b/test/common/quic/platform/epoll_bug_impl.h
@@ -6,6 +6,6 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quiche_bug_tracker_impl.h"
+#include "source/common/quic/platform/quiche_bug_tracker_impl.h"
 
 #define EPOLL_BUG_IMPL QUICHE_BUG_IMPL
diff --git a/test/common/quic/platform/epoll_logging_impl.h b/test/common/quic/platform/epoll_logging_impl.h
index 6e71f936d8002..60d79a5f37379 100644
--- a/test/common/quic/platform/epoll_logging_impl.h
+++ b/test/common/quic/platform/epoll_logging_impl.h
@@ -6,7 +6,7 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/quic/platform/quic_logging_impl.h"
+#include "source/common/quic/platform/quic_logging_impl.h"
 
 namespace epoll_server {
 
diff --git a/test/common/quic/platform/http2_platform_test.cc b/test/common/quic/platform/http2_platform_test.cc
index 07d9ba0117624..c25c0e1c0a845 100644
--- a/test/common/quic/platform/http2_platform_test.cc
+++ b/test/common/quic/platform/http2_platform_test.cc
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/common/quic/platform/quic_mock_log_impl.h b/test/common/quic/platform/quic_mock_log_impl.h
index 7af284120362b..10970412086d2 100644
--- a/test/common/quic/platform/quic_mock_log_impl.h
+++ b/test/common/quic/platform/quic_mock_log_impl.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "gmock/gmock.h"
 #include "quiche/quic/platform/api/quic_logging.h"
diff --git a/test/common/quic/platform/quic_platform_test.cc b/test/common/quic/platform/quic_platform_test.cc
index 22f8f9c21adc4..3a94398280bf0 100644
--- a/test/common/quic/platform/quic_platform_test.cc
+++ b/test/common/quic/platform/quic_platform_test.cc
@@ -8,10 +8,10 @@
 
 #include <fstream>
 
-#include "common/memory/stats.h"
-#include "common/network/socket_impl.h"
-#include "common/network/utility.h"
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/common/quic/platform/quic_epoll_clock.h"
diff --git a/test/common/quic/platform/quic_port_utils_impl.cc b/test/common/quic/platform/quic_port_utils_impl.cc
index 75f8709fb3930..c67686bcc52f0 100644
--- a/test/common/quic/platform/quic_port_utils_impl.cc
+++ b/test/common/quic/platform/quic_port_utils_impl.cc
@@ -8,8 +8,8 @@
 
 #include "envoy/network/address.h"
 
-#include "common/common/assert.h"
-#include "common/network/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/utility.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/common/quic/platform/quic_test_impl.h b/test/common/quic/platform/quic_test_impl.h
index 3782acc9d8fff..8de91ce0e1e39 100644
--- a/test/common/quic/platform/quic_test_impl.h
+++ b/test/common/quic/platform/quic_test_impl.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/common/quic/platform/quic_test_mem_slice_vector_impl.h b/test/common/quic/platform/quic_test_mem_slice_vector_impl.h
index a2c5595b7bc4e..1f727111d2563 100644
--- a/test/common/quic/platform/quic_test_mem_slice_vector_impl.h
+++ b/test/common/quic/platform/quic_test_mem_slice_vector_impl.h
@@ -6,8 +6,8 @@
 // consumed or referenced directly by other Envoy code. It serves purely as a
 // porting layer for QUICHE.
 
-#include "common/buffer/buffer_impl.h"
-#include "common/quic/platform/quic_mem_slice_span_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/quic/platform/quic_mem_slice_span_impl.h"
 
 namespace quic {
 namespace test {
diff --git a/test/common/quic/platform/quic_thread_impl.h b/test/common/quic/platform/quic_thread_impl.h
index e2d87917b1c33..0f692cc1e3d98 100644
--- a/test/common/quic/platform/quic_thread_impl.h
+++ b/test/common/quic/platform/quic_thread_impl.h
@@ -10,7 +10,7 @@
 
 #include "envoy/thread/thread.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/test_common/thread_factory_for_test.h"
 
diff --git a/test/common/quic/platform/spdy_platform_test.cc b/test/common/quic/platform/spdy_platform_test.cc
index d79e1d86f0ae2..a33572c1a6971 100644
--- a/test/common/quic/platform/spdy_platform_test.cc
+++ b/test/common/quic/platform/spdy_platform_test.cc
@@ -1,7 +1,7 @@
 #include <functional>
 #include <string>
 
-#include "common/quic/platform/quiche_flags_impl.h"
+#include "source/common/quic/platform/quiche_flags_impl.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/common/quic/quic_io_handle_wrapper_test.cc b/test/common/quic/quic_io_handle_wrapper_test.cc
index 2ef58610f06f8..899f7903d5892 100644
--- a/test/common/quic/quic_io_handle_wrapper_test.cc
+++ b/test/common/quic/quic_io_handle_wrapper_test.cc
@@ -3,8 +3,8 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/network/address_impl.h"
-#include "common/quic/quic_io_handle_wrapper.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/quic/quic_io_handle_wrapper.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/io_handle.h"
diff --git a/test/common/quic/quic_stat_names_test.cc b/test/common/quic/quic_stat_names_test.cc
index 4eeda27eabddb..a330050792de7 100644
--- a/test/common/quic/quic_stat_names_test.cc
+++ b/test/common/quic/quic_stat_names_test.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "common/quic/quic_stat_names.h"
+#include "source/common/quic/quic_stat_names.h"
 
 #include "test/mocks/stats/mocks.h"
 
diff --git a/test/common/quic/test_proof_source.h b/test/common/quic/test_proof_source.h
index 9fd60b6ec8df6..b4a8a8348223b 100644
--- a/test/common/quic/test_proof_source.h
+++ b/test/common/quic/test_proof_source.h
@@ -16,7 +16,7 @@
 #include <memory>
 
 #include "test/mocks/network/mocks.h"
-#include "common/quic/envoy_quic_proof_source_base.h"
+#include "source/common/quic/envoy_quic_proof_source_base.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/test/common/quic/test_proof_verifier.h b/test/common/quic/test_proof_verifier.h
index eeb8e12124dea..3a0596a87b310 100644
--- a/test/common/quic/test_proof_verifier.h
+++ b/test/common/quic/test_proof_verifier.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/quic/envoy_quic_proof_verifier_base.h"
+#include "source/common/quic/envoy_quic_proof_verifier_base.h"
 
 namespace Envoy {
 namespace Quic {
diff --git a/test/common/quic/test_utils.h b/test/common/quic/test_utils.h
index 0c54ed2eb4d8a..ec7249ffd39e0 100644
--- a/test/common/quic/test_utils.h
+++ b/test/common/quic/test_utils.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "common/quic/envoy_quic_client_connection.h"
-#include "common/quic/envoy_quic_server_connection.h"
-#include "common/quic/quic_filter_manager_connection_impl.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/envoy_quic_server_connection.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
@@ -24,7 +24,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 #include "test/test_common/environment.h"
 
 namespace Envoy {
diff --git a/test/common/router/BUILD b/test/common/router/BUILD
index eabd2de01e82d..d3be91e2bf11d 100644
--- a/test/common/router/BUILD
+++ b/test/common/router/BUILD
@@ -135,8 +135,8 @@ envoy_cc_test(
         "abseil_strings",
     ],
     deps = [
-        "//include/envoy/config:subscription_interface",
-        "//include/envoy/init:manager_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/init:manager_interface",
         "//source/common/config:api_version_lib",
         "//source/common/config:utility_lib",
         "//source/common/http:message_lib",
diff --git a/test/common/router/config_impl_headermap_benchmark_test.cc b/test/common/router/config_impl_headermap_benchmark_test.cc
index 2e8bd3fcd2fab..755f858c88378 100644
--- a/test/common/router/config_impl_headermap_benchmark_test.cc
+++ b/test/common/router/config_impl_headermap_benchmark_test.cc
@@ -2,8 +2,8 @@
 #include "envoy/config/route/v3/route.pb.validate.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/router/config_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/config_impl.h"
 
 #include "test/mocks/server/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/router/config_impl_speed_test.cc b/test/common/router/config_impl_speed_test.cc
index 0405138615654..8361844e80271 100644
--- a/test/common/router/config_impl_speed_test.cc
+++ b/test/common/router/config_impl_speed_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/config/route/v3/route.pb.validate.h"
 
-#include "common/common/assert.h"
-#include "common/router/config_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/router/config_impl.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc
index 9068e78cacaa2..d9f63bc39b3c5 100644
--- a/test/common/router/config_impl_test.cc
+++ b/test/common/router/config_impl_test.cc
@@ -12,14 +12,14 @@
 #include "envoy/server/filter_config.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/network/address_impl.h"
-#include "common/router/config_impl.h"
-#include "common/router/string_accessor_impl.h"
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "test/common/router/route_fuzz.pb.h"
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
diff --git a/test/common/router/header_formatter_test.cc b/test/common/router/header_formatter_test.cc
index 47385fb9dad99..f9ec6d274c757 100644
--- a/test/common/router/header_formatter_test.cc
+++ b/test/common/router/header_formatter_test.cc
@@ -6,14 +6,14 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/http/protocol.h"
 
-#include "common/config/metadata.h"
-#include "common/config/utility.h"
-#include "common/http/header_utility.h"
-#include "common/network/address_impl.h"
-#include "common/router/header_formatter.h"
-#include "common/router/header_parser.h"
-#include "common/router/string_accessor_impl.h"
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/router/header_formatter.h"
+#include "source/common/router/header_parser.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "test/common/stream_info/test_int_accessor.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/common/router/header_parser_fuzz_test.cc b/test/common/router/header_parser_fuzz_test.cc
index 172e67da9415e..528846cf0691f 100644
--- a/test/common/router/header_parser_fuzz_test.cc
+++ b/test/common/router/header_parser_fuzz_test.cc
@@ -1,5 +1,5 @@
-#include "common/http/header_map_impl.h"
-#include "common/router/header_parser.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/header_parser.h"
 
 #include "test/common/router/header_parser_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc
index e6fba0e46f5a5..551593ca21e52 100644
--- a/test/common/router/rds_impl_test.cc
+++ b/test/common/router/rds_impl_test.cc
@@ -9,11 +9,10 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/utility.h"
-#include "common/json/json_loader.h"
-#include "common/router/rds_impl.h"
-
-#include "server/admin/admin.h"
+#include "source/common/config/utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/router/rds_impl.h"
+#include "source/server/admin/admin.h"
 
 #include "test/mocks/init/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/common/router/reset_header_parser_test.cc b/test/common/router/reset_header_parser_test.cc
index bb6135390db47..059dcc861fd22 100644
--- a/test/common/router/reset_header_parser_test.cc
+++ b/test/common/router/reset_header_parser_test.cc
@@ -2,8 +2,8 @@
 #include "envoy/http/protocol.h"
 #include "envoy/json/json_object.h"
 
-#include "common/json/json_loader.h"
-#include "common/router/reset_header_parser.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/router/reset_header_parser.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc
index 05221252b26ef..fd0ed209c656d 100644
--- a/test/common/router/retry_state_impl_test.cc
+++ b/test/common/router/retry_state_impl_test.cc
@@ -3,10 +3,10 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/stats/stats.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/router/reset_header_parser.h"
-#include "common/router/retry_state_impl.h"
-#include "common/upstream/resource_manager_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/reset_header_parser.h"
+#include "source/common/router/retry_state_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/router/mocks.h"
diff --git a/test/common/router/route_fuzz_test.cc b/test/common/router/route_fuzz_test.cc
index 2ab76c31756b0..e74cbc4d233a2 100644
--- a/test/common/router/route_fuzz_test.cc
+++ b/test/common/router/route_fuzz_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/route/v3/route.pb.validate.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/router/config_impl.h"
+#include "source/common/router/config_impl.h"
 
 #include "test/common/router/route_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/router/router_2_test.cc b/test/common/router/router_2_test.cc
index 450683b9410ad..7374f26837923 100644
--- a/test/common/router/router_2_test.cc
+++ b/test/common/router/router_2_test.cc
@@ -1,4 +1,4 @@
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "test/common/router/router_test_base.h"
 
diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc
index 7532eeecade74..01127c1a07971 100644
--- a/test/common/router/router_ratelimit_test.cc
+++ b/test/common/router/router_ratelimit_test.cc
@@ -6,11 +6,11 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/config/route/v3/route_components.pb.validate.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/config_impl.h"
-#include "common/router/router_ratelimit.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/router_ratelimit.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/ratelimit/mocks.h"
diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc
index 7807890659fc5..1b58a3dfdecac 100644
--- a/test/common/router/router_test.cc
+++ b/test/common/router/router_test.cc
@@ -11,24 +11,24 @@
 #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/http/context_impl.h"
-#include "common/network/application_protocol.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_socket_options_filter_state.h"
-#include "common/network/upstream_subject_alt_names.h"
-#include "common/network/utility.h"
-#include "common/network/win32_redirect_records_option_impl.h"
-#include "common/router/config_impl.h"
-#include "common/router/debug_config.h"
-#include "common/router/router.h"
-#include "common/stream_info/uint32_accessor_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
+#include "source/common/network/upstream_subject_alt_names.h"
+#include "source/common/network/utility.h"
+#include "source/common/network/win32_redirect_records_option_impl.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/debug_config.h"
+#include "source/common/router/router.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/router/router_test_base.h"
diff --git a/test/common/router/router_test_base.cc b/test/common/router/router_test_base.cc
index c3be7f152d369..d6e0f7df1420b 100644
--- a/test/common/router/router_test_base.cc
+++ b/test/common/router/router_test_base.cc
@@ -1,6 +1,6 @@
 #include "test/common/router/router_test_base.h"
 
-#include "common/router/debug_config.h"
+#include "source/common/router/debug_config.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/test/common/router/router_test_base.h b/test/common/router/router_test_base.h
index fdff1e8a0a283..846e84157bf1c 100644
--- a/test/common/router/router_test_base.h
+++ b/test/common/router/router_test_base.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "common/http/context_impl.h"
-#include "common/router/router.h"
-#include "common/stream_info/uint32_accessor_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/router/router.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/common.h"
diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc
index a16c05fd6ba26..e9d2260504d90 100644
--- a/test/common/router/router_upstream_log_test.cc
+++ b/test/common/router/router_upstream_log_test.cc
@@ -6,9 +6,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/filters/http/router/v3/router.pb.h"
 
-#include "common/network/utility.h"
-#include "common/router/router.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/router/router.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/common/router/scoped_config_impl_test.cc b/test/common/router/scoped_config_impl_test.cc
index cc7adfd1adcb1..adc94be82b900 100644
--- a/test/common/router/scoped_config_impl_test.cc
+++ b/test/common/router/scoped_config_impl_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/config/route/v3/scoped_route.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/router/scoped_config_impl.h"
+#include "source/common/router/scoped_config_impl.h"
 
 #include "test/mocks/router/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/router/scoped_rds_test.cc b/test/common/router/scoped_rds_test.cc
index db6a538785872..60808295f024e 100644
--- a/test/common/router/scoped_rds_test.cc
+++ b/test/common/router/scoped_rds_test.cc
@@ -13,10 +13,10 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/api_version.h"
-#include "common/config/grpc_mux_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/router/scoped_rds.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/router/scoped_rds.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/protobuf/mocks.h"
diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc
index 7a5f000ebc5ae..e1e680e36b271 100644
--- a/test/common/router/shadow_writer_impl_test.cc
+++ b/test/common/router/shadow_writer_impl_test.cc
@@ -1,9 +1,9 @@
 #include <chrono>
 #include <string>
 
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/router/shadow_writer_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/router/shadow_writer_impl.h"
 
 #include "test/mocks/upstream/cluster_manager.h"
 
diff --git a/test/common/router/string_accessor_impl_test.cc b/test/common/router/string_accessor_impl_test.cc
index 558782b4b8452..57ba334da1639 100644
--- a/test/common/router/string_accessor_impl_test.cc
+++ b/test/common/router/string_accessor_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/router/string_accessor_impl.h"
+#include "source/common/router/string_accessor_impl.h"
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
diff --git a/test/common/router/upstream_request_test.cc b/test/common/router/upstream_request_test.cc
index 638249e92c7be..4b38122ed075f 100644
--- a/test/common/router/upstream_request_test.cc
+++ b/test/common/router/upstream_request_test.cc
@@ -1,6 +1,6 @@
-#include "common/common/utility.h"
-#include "common/network/utility.h"
-#include "common/router/upstream_request.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/router/upstream_request.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/router/router_filter_interface.h"
diff --git a/test/common/router/vhds_test.cc b/test/common/router/vhds_test.cc
index e819381f1e2a7..28e933675b189 100644
--- a/test/common/router/vhds_test.cc
+++ b/test/common/router/vhds_test.cc
@@ -7,11 +7,10 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/router/rds_impl.h"
-
-#include "server/admin/admin.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/router/rds_impl.h"
+#include "source/server/admin/admin.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/init/mocks.h"
diff --git a/test/common/runtime/runtime_flag_override_noop_test.cc b/test/common/runtime/runtime_flag_override_noop_test.cc
index ab19fac7293bf..47dc3c61ded58 100644
--- a/test/common/runtime/runtime_flag_override_noop_test.cc
+++ b/test/common/runtime/runtime_flag_override_noop_test.cc
@@ -1,4 +1,4 @@
-#include "common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/common/runtime/runtime_flag_override_test.cc b/test/common/runtime/runtime_flag_override_test.cc
index 6d90407e38573..19d64c30fe5a6 100644
--- a/test/common/runtime/runtime_flag_override_test.cc
+++ b/test/common/runtime/runtime_flag_override_test.cc
@@ -1,4 +1,4 @@
-#include "common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_features.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc
index 0f220455ef218..1a47f278903d9 100644
--- a/test/common/runtime/runtime_impl_test.cc
+++ b/test/common/runtime/runtime_impl_test.cc
@@ -7,9 +7,9 @@
 #include "envoy/service/runtime/v3/rtds.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/config/runtime_utility.h"
-#include "common/runtime/runtime_features.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/config/runtime_utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/common.h"
@@ -29,7 +29,7 @@
 #include "gtest/gtest.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/envoy_quic_utils.h"
+#include "source/common/quic/envoy_quic_utils.h"
 #endif
 
 using testing::_;
diff --git a/test/common/runtime/runtime_protos_test.cc b/test/common/runtime/runtime_protos_test.cc
index 95cdf87dee84a..bc0e4d956ba7b 100644
--- a/test/common/runtime/runtime_protos_test.cc
+++ b/test/common/runtime/runtime_protos_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/config/core/v3/base.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/runtime/runtime_protos.h"
+#include "source/common/runtime/runtime_protos.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/runtime/utility.h b/test/common/runtime/utility.h
index ba1bb9f1b3981..a61b28a8ee19a 100644
--- a/test/common/runtime/utility.h
+++ b/test/common/runtime/utility.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/runtime/runtime_features.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/common/runtime/runtime_impl.h"
 
 namespace Envoy {
 namespace Runtime {
diff --git a/test/common/secret/sds_api_test.cc b/test/common/secret/sds_api_test.cc
index 1c8b495fd6a5b..84e0d6159153c 100644
--- a/test/common/secret/sds_api_test.cc
+++ b/test/common/secret/sds_api_test.cc
@@ -6,11 +6,11 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/service/secret/v3/sds.pb.h"
 
-#include "common/config/datasource.h"
-#include "common/config/filesystem_subscription_impl.h"
-#include "common/secret/sds_api.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/config/datasource.h"
+#include "source/common/config/filesystem_subscription_impl.h"
+#include "source/common/secret/sds_api.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/common/secret/secret_manager_impl_test.cc b/test/common/secret/secret_manager_impl_test.cc
index aab0883268ad5..cf9d9fb2d9604 100644
--- a/test/common/secret/secret_manager_impl_test.cc
+++ b/test/common/secret/secret_manager_impl_test.cc
@@ -6,13 +6,13 @@
 #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/common/base64.h"
-#include "common/common/logger.h"
-#include "common/config/api_version.h"
-#include "common/secret/sds_api.h"
-#include "common/secret/secret_manager_impl.h"
-#include "common/ssl/certificate_validation_context_config_impl.h"
-#include "common/ssl/tls_certificate_config_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/api_version.h"
+#include "source/common/secret/sds_api.h"
+#include "source/common/secret/secret_manager_impl.h"
+#include "source/common/ssl/certificate_validation_context_config_impl.h"
+#include "source/common/ssl/tls_certificate_config_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/server/config_tracker.h"
diff --git a/test/common/shared_pool/shared_pool_test.cc b/test/common/shared_pool/shared_pool_test.cc
index 8fbb564188523..c82f6d2dcfda8 100644
--- a/test/common/shared_pool/shared_pool_test.cc
+++ b/test/common/shared_pool/shared_pool_test.cc
@@ -1,7 +1,7 @@
 #include <thread>
 
-#include "common/event/timer_impl.h"
-#include "common/shared_pool/shared_pool.h"
+#include "source/common/event/timer_impl.h"
+#include "source/common/shared_pool/shared_pool.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/test_common/thread_factory_for_test.h"
diff --git a/test/common/signal/fatal_action_test.cc b/test/common/signal/fatal_action_test.cc
index 1e276f016e4a7..5565c592eee5f 100644
--- a/test/common/signal/fatal_action_test.cc
+++ b/test/common/signal/fatal_action_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/server/fatal_action_config.h"
 
-#include "common/signal/fatal_action.h"
-#include "common/signal/fatal_error_handler.h"
+#include "source/common/signal/fatal_action.h"
+#include "source/common/signal/fatal_error_handler.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/signal/signals_test.cc b/test/common/signal/signals_test.cc
index f2e5ddde8c8dc..6595959000211 100644
--- a/test/common/signal/signals_test.cc
+++ b/test/common/signal/signals_test.cc
@@ -5,8 +5,8 @@
 
 #include "envoy/common/scope_tracker.h"
 
-#include "common/signal/fatal_error_handler.h"
-#include "common/signal/signal_action.h"
+#include "source/common/signal/fatal_error_handler.h"
+#include "source/common/signal/signal_action.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/singleton/manager_impl_test.cc b/test/common/singleton/manager_impl_test.cc
index aa5796ae79c1b..d3184bae8f580 100644
--- a/test/common/singleton/manager_impl_test.cc
+++ b/test/common/singleton/manager_impl_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/singleton/threadsafe_singleton_test.cc b/test/common/singleton/threadsafe_singleton_test.cc
index a6dba199526ed..3ec2bfe718bd3 100644
--- a/test/common/singleton/threadsafe_singleton_test.cc
+++ b/test/common/singleton/threadsafe_singleton_test.cc
@@ -1,9 +1,9 @@
 #include <memory>
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-#include "common/singleton/threadsafe_singleton.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/common/singleton/threadsafe_singleton.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/test_common/threadsafe_singleton_injector.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD
index 53f7d41fc4466..e7b87df994711 100644
--- a/test/common/stats/BUILD
+++ b/test/common/stats/BUILD
@@ -99,7 +99,7 @@ envoy_cc_test_library(
         "abseil_strings",
     ],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/common:assert_lib",
         "//source/common/memory:stats_lib",
         "//source/common/stats:isolated_store_lib",
@@ -131,7 +131,7 @@ envoy_cc_test(
 envoy_cc_test(
     name = "refcount_ptr_test",
     srcs = ["refcount_ptr_test.cc"],
-    deps = ["//include/envoy/stats:refcount_ptr_interface"],
+    deps = ["//envoy/stats:refcount_ptr_interface"],
 )
 
 envoy_cc_test(
diff --git a/test/common/stats/allocator_impl_test.cc b/test/common/stats/allocator_impl_test.cc
index 571e53fd6810d..83fb85d68ea8d 100644
--- a/test/common/stats/allocator_impl_test.cc
+++ b/test/common/stats/allocator_impl_test.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "common/stats/allocator_impl.h"
+#include "source/common/stats/allocator_impl.h"
 
 #include "test/test_common/logging.h"
 #include "test/test_common/thread_factory_for_test.h"
diff --git a/test/common/stats/histogram_impl_test.cc b/test/common/stats/histogram_impl_test.cc
index 085e3d9a5a1ad..b55f25c83497f 100644
--- a/test/common/stats/histogram_impl_test.cc
+++ b/test/common/stats/histogram_impl_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/stats/histogram_impl.h"
+#include "source/common/stats/histogram_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stats/isolated_store_impl_test.cc b/test/common/stats/isolated_store_impl_test.cc
index 3e2c6dd083a1e..f3a3e0a31dcd2 100644
--- a/test/common/stats/isolated_store_impl_test.cc
+++ b/test/common/stats/isolated_store_impl_test.cc
@@ -2,9 +2,9 @@
 
 #include "envoy/stats/stats_macros.h"
 
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/null_counter.h"
-#include "common/stats/null_gauge.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/null_counter.h"
+#include "source/common/stats/null_gauge.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/test/common/stats/make_elements_helper.cc b/test/common/stats/make_elements_helper.cc
index d7d4538248040..2999ade8dcf45 100644
--- a/test/common/stats/make_elements_helper.cc
+++ b/test/common/stats/make_elements_helper.cc
@@ -1,4 +1,4 @@
-#include "common/stats/utility.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/test/common/stats/make_elements_helper.h b/test/common/stats/make_elements_helper.h
index 218fa6f7aec6d..bf08331cd9af3 100644
--- a/test/common/stats/make_elements_helper.h
+++ b/test/common/stats/make_elements_helper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/stats/utility.h"
+#include "source/common/stats/utility.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/test/common/stats/metric_impl_test.cc b/test/common/stats/metric_impl_test.cc
index 30f20a61ee3af..dfa2656696d35 100644
--- a/test/common/stats/metric_impl_test.cc
+++ b/test/common/stats/metric_impl_test.cc
@@ -1,7 +1,7 @@
 #include <string>
 
-#include "common/stats/allocator_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/common/stats/recent_lookups_speed_test.cc b/test/common/stats/recent_lookups_speed_test.cc
index 2d3c0f5e4ef3d..a39327db0875b 100644
--- a/test/common/stats/recent_lookups_speed_test.cc
+++ b/test/common/stats/recent_lookups_speed_test.cc
@@ -20,9 +20,9 @@
 // BM_LookupsNoEvictions       45662 ns        45662 ns        15329
 // BM_LookupsAllEvictions      83015 ns        83015 ns         8435
 
-#include "common/common/random_generator.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/stats/recent_lookups.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stats/recent_lookups.h"
 
 #include "absl/strings/str_cat.h"
 #include "benchmark/benchmark.h"
diff --git a/test/common/stats/recent_lookups_test.cc b/test/common/stats/recent_lookups_test.cc
index 3e9bed9ff2368..1ac2e7ffeb0a1 100644
--- a/test/common/stats/recent_lookups_test.cc
+++ b/test/common/stats/recent_lookups_test.cc
@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <string>
 
-#include "common/common/utility.h"
-#include "common/stats/recent_lookups.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/recent_lookups.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/common/stats/stat_merger_fuzz_test.cc b/test/common/stats/stat_merger_fuzz_test.cc
index bd3e6b2dbc071..947c484a1ff59 100644
--- a/test/common/stats/stat_merger_fuzz_test.cc
+++ b/test/common/stats/stat_merger_fuzz_test.cc
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "common/stats/stat_merger.h"
+#include "source/common/stats/stat_merger.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/stats/stat_merger_test.cc b/test/common/stats/stat_merger_test.cc
index 092fc531597b3..ae9ff052dab1f 100644
--- a/test/common/stats/stat_merger_test.cc
+++ b/test/common/stats/stat_merger_test.cc
@@ -1,8 +1,8 @@
 #include <memory>
 
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/stat_merger.h"
-#include "common/stats/thread_local_store.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/stat_merger.h"
+#include "source/common/stats/thread_local_store.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stats/stat_test_utility.cc b/test/common/stats/stat_test_utility.cc
index 4b8b678a115e8..9f9438a7bf9a5 100644
--- a/test/common/stats/stat_test_utility.cc
+++ b/test/common/stats/stat_test_utility.cc
@@ -1,7 +1,7 @@
 #include "test/common/stats/stat_test_utility.h"
 
-#include "common/common/assert.h"
-#include "common/memory/stats.h"
+#include "source/common/common/assert.h"
+#include "source/common/memory/stats.h"
 
 namespace Envoy {
 namespace Stats {
diff --git a/test/common/stats/stat_test_utility.h b/test/common/stats/stat_test_utility.h
index 745f4900f2178..213775d4bb218 100644
--- a/test/common/stats/stat_test_utility.h
+++ b/test/common/stats/stat_test_utility.h
@@ -2,9 +2,9 @@
 
 #include "envoy/stats/store.h"
 
-#include "common/common/logger.h"
-#include "common/memory/stats.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/memory/stats.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/test_common/global.h"
 
diff --git a/test/common/stats/stats_matcher_impl_test.cc b/test/common/stats/stats_matcher_impl_test.cc
index e51bf335462f7..87b806cd9f133 100644
--- a/test/common/stats/stats_matcher_impl_test.cc
+++ b/test/common/stats/stats_matcher_impl_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/stats/stats_matcher_impl.h"
+#include "source/common/stats/stats_matcher_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stats/symbol_table_fuzz_test.cc b/test/common/stats/symbol_table_fuzz_test.cc
index 3d5ac4df99bc3..cab1bda492c27 100644
--- a/test/common/stats/symbol_table_fuzz_test.cc
+++ b/test/common/stats/symbol_table_fuzz_test.cc
@@ -1,8 +1,8 @@
 #include <algorithm>
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/common/stats/symbol_table_impl_test.cc b/test/common/stats/symbol_table_impl_test.cc
index 7fd540803a151..0f8dd73fedae5 100644
--- a/test/common/stats/symbol_table_impl_test.cc
+++ b/test/common/stats/symbol_table_impl_test.cc
@@ -1,9 +1,9 @@
 #include <string>
 
-#include "common/common/macros.h"
-#include "common/common/mutex_tracer_impl.h"
-#include "common/memory/stats.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/mutex_tracer_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/logging.h"
diff --git a/test/common/stats/symbol_table_speed_test.cc b/test/common/stats/symbol_table_speed_test.cc
index f5806c69964ed..c5450bb98a5f5 100644
--- a/test/common/stats/symbol_table_speed_test.cc
+++ b/test/common/stats/symbol_table_speed_test.cc
@@ -3,11 +3,11 @@
 //
 // NOLINT(namespace-envoy)
 
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "test/common/stats/make_elements_helper.h"
 #include "test/test_common/utility.h"
diff --git a/test/common/stats/tag_extractor_impl_speed_test.cc b/test/common/stats/tag_extractor_impl_speed_test.cc
index b9dd469db7541..d391a96f1b8fd 100644
--- a/test/common/stats/tag_extractor_impl_speed_test.cc
+++ b/test/common/stats/tag_extractor_impl_speed_test.cc
@@ -42,9 +42,9 @@
 
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/common/assert.h"
-#include "common/config/well_known_names.h"
-#include "common/stats/tag_producer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/stats/tag_producer_impl.h"
 
 #include "benchmark/benchmark.h"
 
diff --git a/test/common/stats/tag_extractor_impl_test.cc b/test/common/stats/tag_extractor_impl_test.cc
index e798c0df9522b..b259b461663b6 100644
--- a/test/common/stats/tag_extractor_impl_test.cc
+++ b/test/common/stats/tag_extractor_impl_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/config/well_known_names.h"
-#include "common/stats/tag_extractor_impl.h"
-#include "common/stats/tag_producer_impl.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/stats/tag_extractor_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stats/tag_producer_impl_test.cc b/test/common/stats/tag_producer_impl_test.cc
index 9ac1902354fac..db7be62da02f5 100644
--- a/test/common/stats/tag_producer_impl_test.cc
+++ b/test/common/stats/tag_producer_impl_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/config/well_known_names.h"
-#include "common/stats/tag_producer_impl.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/stats/tag_producer_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stats/thread_local_store_speed_test.cc b/test/common/stats/thread_local_store_speed_test.cc
index 20aa7f503a29a..8ce08a84d052e 100644
--- a/test/common/stats/thread_local_store_speed_test.cc
+++ b/test/common/stats/thread_local_store_speed_test.cc
@@ -3,14 +3,14 @@
 
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/allocator_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/tag_producer_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/thread_local/thread_local_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/thread_local/thread_local_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc
index 68733239e5b09..b6ee2c6a1a4ff 100644
--- a/test/common/stats/thread_local_store_test.cc
+++ b/test/common/stats/thread_local_store_test.cc
@@ -5,14 +5,14 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 #include "envoy/stats/histogram.h"
 
-#include "common/common/c_smart_ptr.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/memory/stats.h"
-#include "common/stats/stats_matcher_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/tag_producer_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/thread_local/thread_local_impl.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/stats/stats_matcher_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/tag_producer_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/thread_local/thread_local_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/stats/utility_fuzz_test.cc b/test/common/stats/utility_fuzz_test.cc
index eebdceab396d0..7c302624c740b 100644
--- a/test/common/stats/utility_fuzz_test.cc
+++ b/test/common/stats/utility_fuzz_test.cc
@@ -1,8 +1,8 @@
 #include <string>
 #include <vector>
 
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/utility.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/common/stats/utility_test.cc b/test/common/stats/utility_test.cc
index 3c4bda7d122d1..ccd88004e0000 100644
--- a/test/common/stats/utility_test.cc
+++ b/test/common/stats/utility_test.cc
@@ -2,10 +2,10 @@
 
 #include "envoy/stats/stats_macros.h"
 
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/null_counter.h"
-#include "common/stats/null_gauge.h"
-#include "common/stats/thread_local_store.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/null_counter.h"
+#include "source/common/stats/null_gauge.h"
+#include "source/common/stats/thread_local_store.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/test/common/stream_info/BUILD b/test/common/stream_info/BUILD
index 8f2a194a22cdf..92d905fa1c828 100644
--- a/test/common/stream_info/BUILD
+++ b/test/common/stream_info/BUILD
@@ -23,8 +23,8 @@ envoy_cc_test(
     srcs = ["stream_info_impl_test.cc"],
     deps = [
         ":test_int_accessor_lib",
-        "//include/envoy/http:protocol_interface",
-        "//include/envoy/upstream:host_description_interface",
+        "//envoy/http:protocol_interface",
+        "//envoy/upstream:host_description_interface",
         "//source/common/stream_info:stream_info_lib",
         "//test/mocks/router:router_mocks",
         "//test/mocks/ssl:ssl_mocks",
@@ -38,7 +38,7 @@ envoy_cc_test_library(
     name = "test_int_accessor_lib",
     hdrs = ["test_int_accessor.h"],
     deps = [
-        "//include/envoy/stream_info:filter_state_interface",
+        "//envoy/stream_info:filter_state_interface",
     ],
 )
 
@@ -46,8 +46,8 @@ envoy_cc_test_library(
     name = "test_util",
     hdrs = ["test_util.h"],
     deps = [
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:random_generator_lib",
         "//source/common/runtime:runtime_lib",
diff --git a/test/common/stream_info/filter_state_impl_test.cc b/test/common/stream_info/filter_state_impl_test.cc
index 24590fa7c3715..f9e6a538d8e5b 100644
--- a/test/common/stream_info/filter_state_impl_test.cc
+++ b/test/common/stream_info/filter_state_impl_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/common/exception.h"
 
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/stream_info/stream_info_impl_test.cc b/test/common/stream_info/stream_info_impl_test.cc
index c9dce6241f3d7..88b2c04fb38c9 100644
--- a/test/common/stream_info/stream_info_impl_test.cc
+++ b/test/common/stream_info/stream_info_impl_test.cc
@@ -5,9 +5,9 @@
 #include "envoy/stream_info/filter_state.h"
 #include "envoy/upstream/host_description.h"
 
-#include "common/common/fmt.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/common/stream_info/test_int_accessor.h"
 #include "test/mocks/router/mocks.h"
diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h
index ba4324645ee33..f585568b7df06 100644
--- a/test/common/stream_info/test_util.h
+++ b/test/common/stream_info/test_util.h
@@ -3,12 +3,11 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/common/assert.h"
-#include "common/common/random_generator.h"
-#include "common/network/socket_impl.h"
-#include "common/stream_info/filter_state_impl.h"
-
-#include "extensions/request_id/uuid/config.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "test/test_common/simulated_time_system.h"
 
diff --git a/test/common/stream_info/uint32_accessor_impl_test.cc b/test/common/stream_info/uint32_accessor_impl_test.cc
index f9979892dbd35..156d89a3e3ca7 100644
--- a/test/common/stream_info/uint32_accessor_impl_test.cc
+++ b/test/common/stream_info/uint32_accessor_impl_test.cc
@@ -1,4 +1,4 @@
-#include "common/stream_info/uint32_accessor_impl.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/stream_info/utility_test.cc b/test/common/stream_info/utility_test.cc
index 05ace21094334..2cf533db85607 100644
--- a/test/common/stream_info/utility_test.cc
+++ b/test/common/stream_info/utility_test.cc
@@ -1,5 +1,5 @@
-#include "common/network/address_impl.h"
-#include "common/stream_info/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/stream_info/utility.h"
 
 #include "test/mocks/stream_info/mocks.h"
 
diff --git a/test/common/tcp/conn_pool_test.cc b/test/common/tcp/conn_pool_test.cc
index 1b7796b8e6fc2..1399e589cc96f 100644
--- a/test/common/tcp/conn_pool_test.cc
+++ b/test/common/tcp/conn_pool_test.cc
@@ -1,12 +1,12 @@
 #include <memory>
 #include <vector>
 
-#include "common/event/dispatcher_impl.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/utility.h"
-#include "common/tcp/conn_pool.h"
-#include "common/tcp/original_conn_pool.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/tcp/conn_pool.h"
+#include "source/common/tcp/original_conn_pool.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc
index e90aed32be433..3fd3d169f2904 100644
--- a/test/common/tcp_proxy/tcp_proxy_test.cc
+++ b/test/common/tcp_proxy/tcp_proxy_test.cc
@@ -12,17 +12,17 @@
 #include "envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.h"
 #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/application_protocol.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/network/upstream_socket_options_filter_state.h"
-#include "common/network/win32_redirect_records_option_impl.h"
-#include "common/router/metadatamatchcriteria_impl.h"
-#include "common/tcp_proxy/tcp_proxy.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/network/upstream_socket_options_filter_state.h"
+#include "source/common/network/win32_redirect_records_option_impl.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/tcp_proxy/tcp_proxy_test_base.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/tcp_proxy/tcp_proxy_test_base.h b/test/common/tcp_proxy/tcp_proxy_test_base.h
index e02e75d14048c..cb1c62a9a59d5 100644
--- a/test/common/tcp_proxy/tcp_proxy_test_base.h
+++ b/test/common/tcp_proxy/tcp_proxy_test_base.h
@@ -14,14 +14,14 @@
 #include "envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.h"
 #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/application_protocol.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/upstream_server_name.h"
-#include "common/router/metadatamatchcriteria_impl.h"
-#include "common/tcp_proxy/tcp_proxy.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/application_protocol.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/upstream_server_name.h"
+#include "source/common/router/metadatamatchcriteria_impl.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/common/tcp_proxy/upstream_test.cc b/test/common/tcp_proxy/upstream_test.cc
index d1fd2972886a1..ce4184067be55 100644
--- a/test/common/tcp_proxy/upstream_test.cc
+++ b/test/common/tcp_proxy/upstream_test.cc
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "common/tcp_proxy/upstream.h"
+#include "source/common/tcp_proxy/upstream.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/common/thread_local/thread_local_impl_test.cc b/test/common/thread_local/thread_local_impl_test.cc
index 89a13a6263efa..f6937240803d4 100644
--- a/test/common/thread_local/thread_local_impl_test.cc
+++ b/test/common/thread_local/thread_local_impl_test.cc
@@ -1,7 +1,7 @@
-#include "common/common/thread.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/thread_local/thread_local_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/thread_local/thread_local_impl.h"
 
 #include "test/mocks/event/mocks.h"
 
diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc
index 7942815006ec6..256270dffe70a 100644
--- a/test/common/tracing/http_tracer_impl_test.cc
+++ b/test/common/tracing/http_tracer_impl_test.cc
@@ -5,13 +5,13 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/type/tracing/v3/custom_tag.pb.h"
 
-#include "common/common/base64.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/tracing/http_tracer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/tracing/http_tracer_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/common/tracing/http_tracer_manager_impl_test.cc b/test/common/tracing/http_tracer_manager_impl_test.cc
index 2b49433879b45..a7c564d4eb2f2 100644
--- a/test/common/tracing/http_tracer_manager_impl_test.cc
+++ b/test/common/tracing/http_tracer_manager_impl_test.cc
@@ -1,6 +1,6 @@
-#include "common/tracing/http_tracer_impl.h"
-#include "common/tracing/http_tracer_manager_impl.h"
-#include "common/tracing/tracer_config_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/common/tracing/http_tracer_manager_impl.h"
+#include "source/common/tracing/tracer_config_impl.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/mocks/server/tracer_factory.h"
diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD
index c4964177d10fb..16fd761aa7394 100644
--- a/test/common/upstream/BUILD
+++ b/test/common/upstream/BUILD
@@ -71,7 +71,7 @@ envoy_cc_test(
     name = "conn_pool_map_impl_test",
     srcs = ["conn_pool_map_impl_test.cc"],
     deps = [
-        "//include/envoy/http:conn_pool_interface",
+        "//envoy/http:conn_pool_interface",
         "//source/common/upstream:conn_pool_map_impl_lib",
         "//test/mocks:common_lib",
         "//test/mocks/event:event_mocks",
@@ -210,7 +210,7 @@ envoy_cc_test(
     name = "host_stats_test",
     srcs = ["host_stats_test.cc"],
     deps = [
-        "//include/envoy/upstream:host_description_interface",
+        "//envoy/upstream:host_description_interface",
     ],
 )
 
@@ -425,7 +425,7 @@ envoy_cc_test(
     external_deps = ["abseil_optional"],
     deps = [
         ":utility_lib",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/network:utility_lib",
         "//source/common/upstream:outlier_detection_lib",
         "//source/common/upstream:upstream_includes",
@@ -449,7 +449,7 @@ envoy_cc_test(
     name = "priority_conn_pool_map_impl_test",
     srcs = ["priority_conn_pool_map_impl_test.cc"],
     deps = [
-        "//include/envoy/http:conn_pool_interface",
+        "//envoy/http:conn_pool_interface",
         "//source/common/upstream:priority_conn_pool_map_impl_lib",
         "//test/mocks:common_lib",
         "//test/mocks/event:event_mocks",
@@ -463,7 +463,7 @@ envoy_cc_test(
     name = "resource_manager_impl_test",
     srcs = ["resource_manager_impl_test.cc"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/upstream:resource_manager_lib",
         "//test/mocks/runtime:runtime_mocks",
         "//test/mocks/stats:stats_mocks",
@@ -475,7 +475,7 @@ envoy_cc_test(
     srcs = ["ring_hash_lb_test.cc"],
     deps = [
         ":utility_lib",
-        "//include/envoy/router:router_interface",
+        "//envoy/router:router_interface",
         "//source/common/network:utility_lib",
         "//source/common/upstream:ring_hash_lb_lib",
         "//source/common/upstream:upstream_includes",
@@ -574,7 +574,7 @@ envoy_cc_test(
     name = "transport_socket_matcher_test",
     srcs = ["transport_socket_matcher_test.cc"],
     deps = [
-        "//include/envoy/api:api_interface",
+        "//envoy/api:api_interface",
         "//source/common/config:metadata_lib",
         "//source/common/network:transport_socket_options_lib",
         "//source/common/upstream:transport_socket_match_lib",
@@ -598,9 +598,9 @@ envoy_cc_test(
         "@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",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/config:metadata_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/network:utility_lib",
@@ -635,7 +635,7 @@ envoy_cc_test_library(
     name = "utility_lib",
     hdrs = ["utility.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/json:json_loader_lib",
         "//source/common/network:utility_lib",
         "//source/common/stats:stats_lib",
@@ -654,8 +654,8 @@ envoy_cc_test_library(
     hdrs = ["test_cluster_manager.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/api:api_lib",
         "//source/common/config:utility_lib",
         "//source/common/event:dispatcher_lib",
@@ -698,10 +698,10 @@ envoy_cc_test(
     srcs = ["cluster_factory_impl_test.cc"],
     deps = [
         ":utility_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/config:metadata_lib",
         "//source/common/event:dispatcher_lib",
         "//source/common/json:json_loader_lib",
diff --git a/test/common/upstream/bounded_load_hlb_test.cc b/test/common/upstream/bounded_load_hlb_test.cc
index 312d45fc34b95..c9d0b9a7899b3 100644
--- a/test/common/upstream/bounded_load_hlb_test.cc
+++ b/test/common/upstream/bounded_load_hlb_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/upstream/thread_aware_lb_impl.h"
+#include "source/common/upstream/thread_aware_lb_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/upstream/mocks.h"
diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc
index 9fd535fa72041..33eaee18fa92d 100644
--- a/test/common/upstream/cds_api_impl_test.cc
+++ b/test/common/upstream/cds_api_impl_test.cc
@@ -7,9 +7,9 @@
 #include "envoy/config/core/v3/config_source.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/cds_api_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/cds_api_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/protobuf/mocks.h"
diff --git a/test/common/upstream/cluster_factory_impl_test.cc b/test/common/upstream/cluster_factory_impl_test.cc
index 883bd761f012b..8ae0c5cad5f5c 100644
--- a/test/common/upstream/cluster_factory_impl_test.cc
+++ b/test/common/upstream/cluster_factory_impl_test.cc
@@ -10,11 +10,10 @@
 #include "envoy/http/codec.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/network/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/integration/clusters/cluster_factory_config.pb.validate.h"
diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc
index 87803a5bf7ebc..4357ca2dccfc9 100644
--- a/test/common/upstream/cluster_manager_impl_test.cc
+++ b/test/common/upstream/cluster_manager_impl_test.cc
@@ -4,11 +4,10 @@
 #include "envoy/config/cluster/v3/cluster.pb.validate.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/resolver_impl.h"
-#include "common/router/context_impl.h"
-
-#include "extensions/transport_sockets/raw_buffer/config.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
 
 #include "test/common/upstream/test_cluster_manager.h"
 #include "test/mocks/http/conn_pool.h"
diff --git a/test/common/upstream/cluster_update_tracker_test.cc b/test/common/upstream/cluster_update_tracker_test.cc
index 7081841e0ae79..c97ac7831db18 100644
--- a/test/common/upstream/cluster_update_tracker_test.cc
+++ b/test/common/upstream/cluster_update_tracker_test.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/cluster_update_tracker.h"
+#include "source/common/upstream/cluster_update_tracker.h"
 
 #include "test/mocks/upstream/cluster_manager.h"
 #include "test/mocks/upstream/thread_local_cluster.h"
diff --git a/test/common/upstream/conn_pool_map_impl_test.cc b/test/common/upstream/conn_pool_map_impl_test.cc
index 64c518b2fc687..6ce14d2becd6a 100644
--- a/test/common/upstream/conn_pool_map_impl_test.cc
+++ b/test/common/upstream/conn_pool_map_impl_test.cc
@@ -3,7 +3,7 @@
 
 #include "envoy/http/conn_pool.h"
 
-#include "common/upstream/conn_pool_map_impl.h"
+#include "source/common/upstream/conn_pool_map_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/upstream/edf_scheduler_test.cc b/test/common/upstream/edf_scheduler_test.cc
index a0f0b92168c89..7eac13bc8153e 100644
--- a/test/common/upstream/edf_scheduler_test.cc
+++ b/test/common/upstream/edf_scheduler_test.cc
@@ -1,4 +1,4 @@
-#include "common/upstream/edf_scheduler.h"
+#include "source/common/upstream/edf_scheduler.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/common/upstream/eds_speed_test.cc b/test/common/upstream/eds_speed_test.cc
index 32e94e7d1e44c..e6da3c12a1ec2 100644
--- a/test/common/upstream/eds_speed_test.cc
+++ b/test/common/upstream/eds_speed_test.cc
@@ -8,14 +8,13 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/grpc_mux_impl.h"
-#include "common/config/grpc_subscription_impl.h"
-#include "common/config/protobuf_link_hacks.h"
-#include "common/config/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/eds.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/config/grpc_mux_impl.h"
+#include "source/common/config/grpc_subscription_impl.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/eds.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/benchmark/main.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc
index 0a25e8436edab..93a31a2b6095c 100644
--- a/test/common/upstream/eds_test.cc
+++ b/test/common/upstream/eds_test.cc
@@ -7,11 +7,10 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/eds.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/eds.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc
index 0dfa0fc64af69..7f0801af4a6f8 100644
--- a/test/common/upstream/hds_test.cc
+++ b/test/common/upstream/hds_test.cc
@@ -5,13 +5,12 @@
 #include "envoy/service/health/v3/hds.pb.h"
 #include "envoy/type/v3/http.pb.h"
 
-#include "common/protobuf/protobuf.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/health_discovery_service.h"
-#include "common/upstream/transport_socket_match_impl.h"
-
-#include "extensions/transport_sockets/raw_buffer/config.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/health_discovery_service.h"
+#include "source/common/upstream/transport_socket_match_impl.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/upstream/health_check_fuzz.cc b/test/common/upstream/health_check_fuzz.cc
index 6a14b35fe3b9c..e0f3d3ad094a7 100644
--- a/test/common/upstream/health_check_fuzz.cc
+++ b/test/common/upstream/health_check_fuzz.cc
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <memory>
 
-#include "common/grpc/common.h"
+#include "source/common/grpc/common.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/fuzz/utility.h"
diff --git a/test/common/upstream/health_check_fuzz_test_utils.h b/test/common/upstream/health_check_fuzz_test_utils.h
index 833df01ad95ec..936e51cc53224 100644
--- a/test/common/upstream/health_check_fuzz_test_utils.h
+++ b/test/common/upstream/health_check_fuzz_test_utils.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "common/upstream/health_checker_impl.h"
+#include "source/common/upstream/health_checker_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc
index 5cba4b980a27c..35e224aa28752 100644
--- a/test/common/upstream/health_checker_impl_test.cc
+++ b/test/common/upstream/health_checker_impl_test.cc
@@ -10,15 +10,15 @@
 #include "envoy/data/core/v3/health_check_event.pb.h"
 #include "envoy/upstream/health_check_host_monitor.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/common.h"
-#include "common/http/headers.h"
-#include "common/json/json_loader.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/health_checker_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/headers.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/common.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/host_utility_test.cc b/test/common/upstream/host_utility_test.cc
index 3e4e81d7bbb18..f31ee62514ce2 100644
--- a/test/common/upstream/host_utility_test.cc
+++ b/test/common/upstream/host_utility_test.cc
@@ -1,6 +1,6 @@
-#include "common/network/utility.h"
-#include "common/upstream/host_utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/host_utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/load_balancer_benchmark.cc b/test/common/upstream/load_balancer_benchmark.cc
index 4d536e187b646..f5530701f434e 100644
--- a/test/common/upstream/load_balancer_benchmark.cc
+++ b/test/common/upstream/load_balancer_benchmark.cc
@@ -4,12 +4,12 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/common/random_generator.h"
-#include "common/memory/stats.h"
-#include "common/upstream/maglev_lb.h"
-#include "common/upstream/ring_hash_lb.h"
-#include "common/upstream/subset_lb.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/memory/stats.h"
+#include "source/common/upstream/maglev_lb.h"
+#include "source/common/upstream/ring_hash_lb.h"
+#include "source/common/upstream/subset_lb.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/benchmark/main.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/load_balancer_fuzz_base.h b/test/common/upstream/load_balancer_fuzz_base.h
index d478cffcf3c0a..727da689047b5 100644
--- a/test/common/upstream/load_balancer_fuzz_base.h
+++ b/test/common/upstream/load_balancer_fuzz_base.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "test/common/upstream/load_balancer_fuzz.pb.validate.h"
 #include "test/fuzz/random.h"
diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc
index 6135f6f9534a2..77b391e6e090b 100644
--- a/test/common/upstream/load_balancer_impl_test.cc
+++ b/test/common/upstream/load_balancer_impl_test.cc
@@ -6,9 +6,9 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/network/utility.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc
index ef431232f63bd..28ded32dd029a 100644
--- a/test/common/upstream/load_balancer_simulation_test.cc
+++ b/test/common/upstream/load_balancer_simulation_test.cc
@@ -7,11 +7,11 @@
 #include "envoy/config/core/v3/health_check.pb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/common/random_generator.h"
-#include "common/network/utility.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc
index 46105592c00a3..81edc2ed4377a 100644
--- a/test/common/upstream/load_stats_reporter_test.cc
+++ b/test/common/upstream/load_stats_reporter_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/config/endpoint/v3/load_report.pb.h"
 #include "envoy/service/load_stats/v3/lrs.pb.h"
 
-#include "common/upstream/load_stats_reporter.h"
+#include "source/common/upstream/load_stats_reporter.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc
index 095ec4974c30c..ce94bf6e2184a 100644
--- a/test/common/upstream/logical_dns_cluster_test.cc
+++ b/test/common/upstream/logical_dns_cluster_test.cc
@@ -10,11 +10,10 @@
 #include "envoy/stats/scope.h"
 #include "envoy/upstream/health_check_host_monitor.h"
 
-#include "common/network/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/logical_dns_cluster.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/logical_dns_cluster.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/maglev_lb_test.cc b/test/common/upstream/maglev_lb_test.cc
index 8dd1de142c543..46315da016dbf 100644
--- a/test/common/upstream/maglev_lb_test.cc
+++ b/test/common/upstream/maglev_lb_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/upstream/maglev_lb.h"
+#include "source/common/upstream/maglev_lb.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc
index 1a9743ebd595e..440a2aa25b58c 100644
--- a/test/common/upstream/original_dst_cluster_test.cc
+++ b/test/common/upstream/original_dst_cluster_test.cc
@@ -8,13 +8,12 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/original_dst_cluster.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/original_dst_cluster.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc
index a5641f643f220..46e3166c77a7d 100644
--- a/test/common/upstream/outlier_detection_impl_test.cc
+++ b/test/common/upstream/outlier_detection_impl_test.cc
@@ -8,9 +8,9 @@
 #include "envoy/config/cluster/v3/outlier_detection.pb.h"
 #include "envoy/data/cluster/v3/outlier_detection_event.pb.h"
 
-#include "common/network/utility.h"
-#include "common/upstream/outlier_detection_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/outlier_detection_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/common/upstream/priority_conn_pool_map_impl_test.cc b/test/common/upstream/priority_conn_pool_map_impl_test.cc
index fbe98e4d17e1c..60252e332c58c 100644
--- a/test/common/upstream/priority_conn_pool_map_impl_test.cc
+++ b/test/common/upstream/priority_conn_pool_map_impl_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/http/conn_pool.h"
 
-#include "common/upstream/priority_conn_pool_map_impl.h"
+#include "source/common/upstream/priority_conn_pool_map_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/upstream/resource_manager_impl_test.cc b/test/common/upstream/resource_manager_impl_test.cc
index f92cf3009d63c..726a7f41eb74e 100644
--- a/test/common/upstream/resource_manager_impl_test.cc
+++ b/test/common/upstream/resource_manager_impl_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/stats/stats.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/upstream/resource_manager_impl.h"
+#include "source/common/upstream/resource_manager_impl.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc
index 7e8ff95141ab5..e9071eb1f5a25 100644
--- a/test/common/upstream/ring_hash_lb_test.cc
+++ b/test/common/upstream/ring_hash_lb_test.cc
@@ -6,9 +6,9 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/router/router.h"
 
-#include "common/network/utility.h"
-#include "common/upstream/ring_hash_lb.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/ring_hash_lb.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc
index 3ab29348bc9d8..8d5204287ea5d 100644
--- a/test/common/upstream/subset_lb_test.cc
+++ b/test/common/upstream/subset_lb_test.cc
@@ -8,10 +8,10 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/logger.h"
-#include "common/config/metadata.h"
-#include "common/upstream/subset_lb.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/config/metadata.h"
+#include "source/common/upstream/subset_lb.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/common/upstream/test_cluster_manager.h b/test/common/upstream/test_cluster_manager.h
index 55b51ee3e01fd..03a7cf951d4c8 100644
--- a/test/common/upstream/test_cluster_manager.h
+++ b/test/common/upstream/test_cluster_manager.h
@@ -10,20 +10,19 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/api/api_impl.h"
-#include "common/config/utility.h"
-#include "common/http/context_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/cluster_manager_impl.h"
-#include "common/upstream/subset_lb.h"
-
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/cluster_manager_impl.h"
+#include "source/common/upstream/subset_lb.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/transport_socket_matcher_test.cc b/test/common/upstream/transport_socket_matcher_test.cc
index b564192f860eb..caa0adc9c73e1 100644
--- a/test/common/upstream/transport_socket_matcher_test.cc
+++ b/test/common/upstream/transport_socket_matcher_test.cc
@@ -8,11 +8,10 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/metadata.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/upstream/transport_socket_match_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/upstream/transport_socket_match_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/transport_socket_factory_context.h"
diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc
index ef1e342c7a7d0..d147e4ccc8c99 100644
--- a/test/common/upstream/upstream_impl_test.cc
+++ b/test/common/upstream/upstream_impl_test.cc
@@ -16,13 +16,12 @@
 #include "envoy/upstream/health_check_host_monitor.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/metadata.h"
-#include "common/network/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/static_cluster.h"
-#include "common/upstream/strict_dns_cluster.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/network/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/static_cluster.h"
+#include "source/common/upstream/strict_dns_cluster.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/common/upstream/utility.h b/test/common/upstream/utility.h
index 3ea7b61391351..e3f3a18a11f72 100644
--- a/test/common/upstream/utility.h
+++ b/test/common/upstream/utility.h
@@ -8,12 +8,12 @@
 #include "envoy/config/endpoint/v3/endpoint_components.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/utility.h"
-#include "common/config/metadata.h"
-#include "common/config/well_known_names.h"
-#include "common/json/json_loader.h"
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/metadata.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/common/watchdog/BUILD b/test/common/watchdog/BUILD
index 85edbe118222e..e1539697f6670 100644
--- a/test/common/watchdog/BUILD
+++ b/test/common/watchdog/BUILD
@@ -15,9 +15,9 @@ envoy_cc_test(
         "abseil_synchronization",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:guarddog_config_interface",
+        "//envoy/common:time_interface",
+        "//envoy/registry",
+        "//envoy/server:guarddog_config_interface",
         "//source/common/watchdog:abort_action_config",
         "//source/common/watchdog:abort_action_lib",
         "//test/common/stats:stat_test_utility_lib",
@@ -31,8 +31,8 @@ envoy_cc_test(
     name = "abort_action_config_test",
     srcs = ["abort_action_config_test.cc"],
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:guarddog_config_interface",
+        "//envoy/registry",
+        "//envoy/server:guarddog_config_interface",
         "//source/common/watchdog:abort_action_config",
         "//source/common/watchdog:abort_action_lib",
         "//test/common/stats:stat_test_utility_lib",
diff --git a/test/common/watchdog/abort_action_config_test.cc b/test/common/watchdog/abort_action_config_test.cc
index 9bec9ec8133a4..f456687abc02d 100644
--- a/test/common/watchdog/abort_action_config_test.cc
+++ b/test/common/watchdog/abort_action_config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/server/guarddog_config.h"
 #include "envoy/watchdog/v3alpha/abort_action.pb.h"
 
-#include "common/watchdog/abort_action_config.h"
+#include "source/common/watchdog/abort_action_config.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/common/watchdog/abort_action_test.cc b/test/common/watchdog/abort_action_test.cc
index 7f2f1bf4606e1..ebdbb8c870312 100644
--- a/test/common/watchdog/abort_action_test.cc
+++ b/test/common/watchdog/abort_action_test.cc
@@ -8,8 +8,8 @@
 #include "envoy/thread/thread.h"
 #include "envoy/watchdog/v3alpha/abort_action.pb.h"
 
-#include "common/watchdog/abort_action.h"
-#include "common/watchdog/abort_action_config.h"
+#include "source/common/watchdog/abort_action.h"
+#include "source/common/watchdog/abort_action_config.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/config/utility.cc b/test/config/utility.cc
index e2124db36d2f2..6357327f5b171 100644
--- a/test/config/utility.cc
+++ b/test/config/utility.cc
@@ -15,9 +15,9 @@
 #include "envoy/http/codec.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/assert.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/config/integration/certs/client_ecdsacert_hash.h"
 #include "test/config/integration/certs/clientcert_hash.h"
diff --git a/test/config/utility.h b/test/config/utility.h
index 7981f91641fbd..1953fd9832e95 100644
--- a/test/config/utility.h
+++ b/test/config/utility.h
@@ -17,10 +17,10 @@
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h"
 #include "envoy/http/codes.h"
 
-#include "common/config/api_version.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/server_stats.h"
 
diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc
index 61cb500c1253f..e7b227a0d27f4 100644
--- a/test/config_test/config_test.cc
+++ b/test/config_test/config_test.cc
@@ -6,13 +6,12 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/listener/v3/listener_components.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_features.h"
-
-#include "server/config_validation/server.h"
-#include "server/configuration_impl.h"
-#include "server/options_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/server/config_validation/server.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/options_impl.h"
 
 #include "test/integration/server.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc
index ca52b4b768ba3..37e0d561d8dc1 100644
--- a/test/config_test/example_configs_test.cc
+++ b/test/config_test/example_configs_test.cc
@@ -1,4 +1,4 @@
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 #include "test/config_test/config_test.h"
 #include "test/test_common/environment.h"
diff --git a/test/exe/main_common_test.cc b/test/exe/main_common_test.cc
index c814950b3771a..70c3ad4a4b2c1 100644
--- a/test/exe/main_common_test.cc
+++ b/test/exe/main_common_test.cc
@@ -1,15 +1,13 @@
 #include "envoy/common/platform.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/mutex_tracer_impl.h"
-#include "common/common/random_generator.h"
-#include "common/common/thread.h"
-#include "common/runtime/runtime_impl.h"
-
-#include "exe/main_common.h"
-#include "exe/platform_impl.h"
-
-#include "server/options_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/mutex_tracer_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/common/thread.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/exe/main_common.h"
+#include "source/exe/platform_impl.h"
+#include "source/server/options_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/contention.h"
@@ -20,7 +18,7 @@
 #include "gtest/gtest.h"
 
 #ifdef ENVOY_HANDLE_SIGNALS
-#include "common/signal/signal_action.h"
+#include "source/common/signal/signal_action.h"
 #endif
 
 #include "absl/synchronization/notification.h"
diff --git a/test/exe/platform_impl_test.cc b/test/exe/platform_impl_test.cc
index 955a55710eb84..862631309b357 100644
--- a/test/exe/platform_impl_test.cc
+++ b/test/exe/platform_impl_test.cc
@@ -1,4 +1,4 @@
-#include "exe/platform_impl.h"
+#include "source/exe/platform_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/utility.h"
diff --git a/test/exe/terminate_handler_test.cc b/test/exe/terminate_handler_test.cc
index d48782242ae99..501f8218ccafa 100644
--- a/test/exe/terminate_handler_test.cc
+++ b/test/exe/terminate_handler_test.cc
@@ -1,4 +1,4 @@
-#include "exe/terminate_handler.h"
+#include "source/exe/terminate_handler.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/access_loggers/common/access_log_base_test.cc b/test/extensions/access_loggers/common/access_log_base_test.cc
index 4b43d05dfbaf2..0214596696165 100644
--- a/test/extensions/access_loggers/common/access_log_base_test.cc
+++ b/test/extensions/access_loggers/common/access_log_base_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/access_loggers/common/access_log_base.h"
+#include "source/extensions/access_loggers/common/access_log_base.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/access_loggers/common/grpc_access_logger_test.cc b/test/extensions/access_loggers/common/grpc_access_logger_test.cc
index 74ad5a13345f3..992803c3fd7e3 100644
--- a/test/extensions/access_loggers/common/grpc_access_logger_test.cc
+++ b/test/extensions/access_loggers/common/grpc_access_logger_test.cc
@@ -5,12 +5,11 @@
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/service/accesslog/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/typed_async_client.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/grpc_access_logger.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/typed_async_client.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/grpc_access_logger.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/extensions/access_loggers/file/config_test.cc b/test/extensions/access_loggers/file/config_test.cc
index 3eff3f56f70cd..4126b865e7ef5 100644
--- a/test/extensions/access_loggers/file/config_test.cc
+++ b/test/extensions/access_loggers/file/config_test.cc
@@ -2,11 +2,10 @@
 #include "envoy/extensions/access_loggers/file/v3/file.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
-#include "extensions/access_loggers/file/config.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/extensions/access_loggers/file/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc
index e470423856dbe..65fe0cd6185b5 100644
--- a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc
+++ b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc
@@ -5,9 +5,8 @@
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 #include "envoy/service/accesslog/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-
-#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc b/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc
index e24d70df36b0c..53b655b54c778 100644
--- a/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc
+++ b/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 
-#include "extensions/access_loggers/grpc/grpc_access_log_utils.h"
+#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h"
 
 #include "test/mocks/stream_info/mocks.h"
 
diff --git a/test/extensions/access_loggers/grpc/http_config_test.cc b/test/extensions/access_loggers/grpc/http_config_test.cc
index 63ef230d80b0b..c4d7db133a78a 100644
--- a/test/extensions/access_loggers/grpc/http_config_test.cc
+++ b/test/extensions/access_loggers/grpc/http_config_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/server/access_log_config.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
+#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc
index b475d85155a3e..42969c35dfa4e 100644
--- a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc
+++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc
@@ -3,12 +3,11 @@
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/network/address_impl.h"
-#include "common/router/string_accessor_impl.h"
-#include "common/stream_info/uint32_accessor_impl.h"
-
-#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/common/stream_info/uint32_accessor_impl.h"
+#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc
index f2daefe122107..0699fc5e81f9d 100644
--- a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc
+++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc
@@ -3,10 +3,10 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/accesslog/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/version/version.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc
index 0e700eb4603ea..2bec4fd81fcce 100644
--- a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc
+++ b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc
@@ -4,10 +4,10 @@
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 #include "envoy/service/accesslog/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/version/version.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/access_loggers/open_telemetry/BUILD b/test/extensions/access_loggers/open_telemetry/BUILD
index 12b6b55caf82e..765d9005a9673 100644
--- a/test/extensions/access_loggers/open_telemetry/BUILD
+++ b/test/extensions/access_loggers/open_telemetry/BUILD
@@ -33,7 +33,7 @@ envoy_extension_cc_test(
     srcs = ["access_log_impl_test.cc"],
     extension_name = "envoy.access_loggers.open_telemetry",
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/protobuf",
         "//source/common/router:string_accessor_lib",
         "//source/extensions/access_loggers/open_telemetry:access_log_lib",
diff --git a/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc b/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc
index 5cce3f6e8f0f8..933daaf8ed710 100644
--- a/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc
+++ b/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc
@@ -5,12 +5,11 @@
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/router/string_accessor_impl.h"
-
-#include "extensions/access_loggers/open_telemetry/access_log_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc b/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc
index eead9606d55b1..66c62fccf311f 100644
--- a/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc
+++ b/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc
@@ -3,10 +3,10 @@
 #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/version/version.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/access_loggers/open_telemetry/config_test.cc b/test/extensions/access_loggers/open_telemetry/config_test.cc
index 4082eeabfe867..35017d2831544 100644
--- a/test/extensions/access_loggers/open_telemetry/config_test.cc
+++ b/test/extensions/access_loggers/open_telemetry/config_test.cc
@@ -4,8 +4,8 @@
 #include "envoy/server/access_log_config.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/access_loggers/open_telemetry/access_log_impl.h"
-#include "extensions/access_loggers/open_telemetry/config.h"
+#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc
index 5a5c9e70a8857..4b42d1e5de54c 100644
--- a/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc
+++ b/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc
@@ -3,9 +3,8 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-
-#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/access_loggers/stream/stream_test_base.h b/test/extensions/access_loggers/stream/stream_test_base.h
index 4abfe6a07749c..6a55c3c81f034 100644
--- a/test/extensions/access_loggers/stream/stream_test_base.h
+++ b/test/extensions/access_loggers/stream/stream_test_base.h
@@ -1,11 +1,10 @@
 #include "envoy/extensions/access_loggers/stream/v3/stream.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
-#include "extensions/access_loggers/stream/config.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/extensions/access_loggers/stream/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/access_loggers/wasm/config_test.cc b/test/extensions/access_loggers/wasm/config_test.cc
index 367481d0bd582..690834d707a84 100644
--- a/test/extensions/access_loggers/wasm/config_test.cc
+++ b/test/extensions/access_loggers/wasm/config_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/extensions/access_loggers/wasm/v3/wasm.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/access_loggers/wasm/config.h"
-#include "extensions/access_loggers/wasm/wasm_access_log_impl.h"
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/access_loggers/wasm/config.h"
+#include "source/extensions/access_loggers/wasm/wasm_access_log_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/bootstrap/wasm/BUILD b/test/extensions/bootstrap/wasm/BUILD
index e5fa8e7895d2e..39623df4f7692 100644
--- a/test/extensions/bootstrap/wasm/BUILD
+++ b/test/extensions/bootstrap/wasm/BUILD
@@ -71,7 +71,7 @@ envoy_extension_cc_test(
     ]),
     extension_name = "envoy.bootstrap.wasm",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/stats:isolated_store_lib",
         "//source/extensions/bootstrap/wasm:config",
         "//source/extensions/common/wasm:wasm_lib",
diff --git a/test/extensions/bootstrap/wasm/config_test.cc b/test/extensions/bootstrap/wasm/config_test.cc
index c956e3abec49f..2995eedc00ebe 100644
--- a/test/extensions/bootstrap/wasm/config_test.cc
+++ b/test/extensions/bootstrap/wasm/config_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/extensions/wasm/v3/wasm.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/bootstrap/wasm/config.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/bootstrap/wasm/config.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/extensions/bootstrap/wasm/wasm_integration_test.cc b/test/extensions/bootstrap/wasm/wasm_integration_test.cc
index 28b8b9dbb31c0..e2bff1c817be2 100644
--- a/test/extensions/bootstrap/wasm/wasm_integration_test.cc
+++ b/test/extensions/bootstrap/wasm/wasm_integration_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/integration/http_protocol_integration.h"
diff --git a/test/extensions/bootstrap/wasm/wasm_speed_test.cc b/test/extensions/bootstrap/wasm/wasm_speed_test.cc
index db5acab7a2d87..9e14a8f7703a1 100644
--- a/test/extensions/bootstrap/wasm/wasm_speed_test.cc
+++ b/test/extensions/bootstrap/wasm/wasm_speed_test.cc
@@ -4,10 +4,9 @@
  * Run with:
  * `bazel run --config=libc++ -c opt //test/extensions/bootstrap/wasm:wasm_speed_test`
  */
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/mocks/server/mocks.h"
 #include "test/mocks/upstream/mocks.h"
diff --git a/test/extensions/bootstrap/wasm/wasm_test.cc b/test/extensions/bootstrap/wasm/wasm_test.cc
index 3550045fd555e..0ccd91dd7c73b 100644
--- a/test/extensions/bootstrap/wasm/wasm_test.cc
+++ b/test/extensions/bootstrap/wasm/wasm_test.cc
@@ -1,7 +1,6 @@
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/clusters/aggregate/cluster_integration_test.cc b/test/extensions/clusters/aggregate/cluster_integration_test.cc
index b2181452bca61..e7dbaecfbbccb 100644
--- a/test/extensions/clusters/aggregate/cluster_integration_test.cc
+++ b/test/extensions/clusters/aggregate/cluster_integration_test.cc
@@ -2,9 +2,9 @@
 #include "envoy/grpc/status.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/protobuf_link_hacks.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/clusters/aggregate/cluster_test.cc b/test/extensions/clusters/aggregate/cluster_test.cc
index 02e765cae956c..4842befab521f 100644
--- a/test/extensions/clusters/aggregate/cluster_test.cc
+++ b/test/extensions/clusters/aggregate/cluster_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h"
 
-#include "common/singleton/manager_impl.h"
-
-#include "extensions/clusters/aggregate/cluster.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/extensions/clusters/aggregate/cluster.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/protobuf/mocks.h"
diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc
index 853793ddfa60c..90e23cc8ee680 100644
--- a/test/extensions/clusters/aggregate/cluster_update_test.cc
+++ b/test/extensions/clusters/aggregate/cluster_update_test.cc
@@ -2,12 +2,11 @@
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h"
 
-#include "common/router/context_impl.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-#include "common/upstream/cluster_manager_impl.h"
-
-#include "extensions/clusters/aggregate/cluster.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/common/upstream/cluster_manager_impl.h"
+#include "source/extensions/clusters/aggregate/cluster.h"
 
 #include "test/common/upstream/test_cluster_manager.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc
index 875be42f3e1f2..0544523a3be1f 100644
--- a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc
+++ b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc
@@ -2,10 +2,9 @@
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h"
 #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h"
 
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-
-#include "extensions/clusters/dynamic_forward_proxy/cluster.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/extensions/common/dynamic_forward_proxy/mocks.h"
diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD
index 47ee1e321d2ae..1da66450566d4 100644
--- a/test/extensions/clusters/redis/BUILD
+++ b/test/extensions/clusters/redis/BUILD
@@ -56,7 +56,7 @@ envoy_extension_cc_test(
     srcs = ["redis_cluster_lb_test.cc"],
     extension_name = "envoy.clusters.redis",
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/event:dispatcher_lib",
         "//source/common/network:utility_lib",
         "//source/common/upstream:cluster_factory_lib",
@@ -107,7 +107,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/upstream:cluster_factory_lib",
         "//source/common/upstream:upstream_lib",
         "//source/extensions/clusters/redis:redis_cluster",
diff --git a/test/extensions/clusters/redis/redis_cluster_integration_test.cc b/test/extensions/clusters/redis/redis_cluster_integration_test.cc
index a91ba22a32061..960c8d1f9338c 100644
--- a/test/extensions/clusters/redis/redis_cluster_integration_test.cc
+++ b/test/extensions/clusters/redis/redis_cluster_integration_test.cc
@@ -3,9 +3,8 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/common/macros.h"
-
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
 
 #include "test/integration/integration.h"
 
diff --git a/test/extensions/clusters/redis/redis_cluster_lb_test.cc b/test/extensions/clusters/redis/redis_cluster_lb_test.cc
index 1b7abc6bb9420..bcf65ba833766 100644
--- a/test/extensions/clusters/redis/redis_cluster_lb_test.cc
+++ b/test/extensions/clusters/redis/redis_cluster_lb_test.cc
@@ -1,8 +1,7 @@
 #include <memory>
 
 #include "source/extensions/clusters/redis/redis_cluster_lb.h"
-
-#include "extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/client.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc
index a42aed2c05898..4bc85dd7150fe 100644
--- a/test/extensions/clusters/redis/redis_cluster_test.cc
+++ b/test/extensions/clusters/redis/redis_cluster_test.cc
@@ -11,10 +11,9 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/utility.h"
-#include "common/singleton/manager_impl.h"
-#include "common/upstream/logical_dns_cluster.h"
-
+#include "source/common/network/utility.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/upstream/logical_dns_cluster.h"
 #include "source/extensions/clusters/redis/redis_cluster.h"
 
 #include "test/common/upstream/utility.h"
diff --git a/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc b/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc
index a180f9ef16a83..ee2c035950805 100644
--- a/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc
+++ b/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc
@@ -1,6 +1,5 @@
-#include "common/common/fmt.h"
-
-#include "extensions/common/aws/utility.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/common/aws/utility.h"
 
 #include "test/integration/integration.h"
 #include "test/integration/utility.h"
diff --git a/test/extensions/common/aws/credentials_provider_impl_test.cc b/test/extensions/common/aws/credentials_provider_impl_test.cc
index 8c92d9e3b9f13..6e4cc0819c9c0 100644
--- a/test/extensions/common/aws/credentials_provider_impl_test.cc
+++ b/test/extensions/common/aws/credentials_provider_impl_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/aws/credentials_provider_impl.h"
+#include "source/extensions/common/aws/credentials_provider_impl.h"
 
 #include "test/extensions/common/aws/mocks.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/extensions/common/aws/credentials_provider_test.cc b/test/extensions/common/aws/credentials_provider_test.cc
index e2aff11b2f52c..8a4ee220f3f64 100644
--- a/test/extensions/common/aws/credentials_provider_test.cc
+++ b/test/extensions/common/aws/credentials_provider_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/aws/credentials_provider.h"
+#include "source/extensions/common/aws/credentials_provider.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/common/aws/mocks.h b/test/extensions/common/aws/mocks.h
index 05f7562197107..d990409b4327e 100644
--- a/test/extensions/common/aws/mocks.h
+++ b/test/extensions/common/aws/mocks.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/common/aws/credentials_provider.h"
-#include "extensions/common/aws/signer.h"
+#include "source/extensions/common/aws/credentials_provider.h"
+#include "source/extensions/common/aws/signer.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/common/aws/region_provider_impl_test.cc b/test/extensions/common/aws/region_provider_impl_test.cc
index 8ab728258616f..8ea7b6386817f 100644
--- a/test/extensions/common/aws/region_provider_impl_test.cc
+++ b/test/extensions/common/aws/region_provider_impl_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/aws/region_provider_impl.h"
+#include "source/extensions/common/aws/region_provider_impl.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/extensions/common/aws/signer_impl_test.cc b/test/extensions/common/aws/signer_impl_test.cc
index fb8625febbfc8..b3c060529ff85 100644
--- a/test/extensions/common/aws/signer_impl_test.cc
+++ b/test/extensions/common/aws/signer_impl_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/http/message_impl.h"
-
-#include "extensions/common/aws/signer_impl.h"
-#include "extensions/common/aws/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/common/aws/signer_impl.h"
+#include "source/extensions/common/aws/utility.h"
 
 #include "test/extensions/common/aws/mocks.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/common/aws/utility_test.cc b/test/extensions/common/aws/utility_test.cc
index 040bca0272fdd..1f115d9baff27 100644
--- a/test/extensions/common/aws/utility_test.cc
+++ b/test/extensions/common/aws/utility_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/aws/utility.h"
+#include "source/extensions/common/aws/utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc
index 4943270fac263..25f4b42fc4c6d 100644
--- a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc
+++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc
@@ -2,11 +2,10 @@
 #include "envoy/config/core/v3/resolver.pb.h"
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "common/config/utility.h"
-#include "common/network/resolver_impl.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
-#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h"
 
 #include "test/extensions/common/dynamic_forward_proxy/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc
index 5ed57a7b46069..d6b07242ee0e5 100644
--- a/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc
+++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "common/config/utility.h"
-
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
-#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h"
 
 #include "test/extensions/common/dynamic_forward_proxy/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/common/dynamic_forward_proxy/mocks.h b/test/extensions/common/dynamic_forward_proxy/mocks.h
index 064864f93f827..d65583e21c596 100644
--- a/test/extensions/common/dynamic_forward_proxy/mocks.h
+++ b/test/extensions/common/dynamic_forward_proxy/mocks.h
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
 
 #include "test/mocks/upstream/basic_resource_limit.h"
 
diff --git a/test/extensions/common/matcher/matcher_test.cc b/test/extensions/common/matcher/matcher_test.cc
index 28f6752eb24a0..6531884fe8300 100644
--- a/test/extensions/common/matcher/matcher_test.cc
+++ b/test/extensions/common/matcher/matcher_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/config/common/matcher/v3/matcher.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/common/matcher/matcher.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/common/matcher/matcher.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc b/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc
index 86461d5107811..ca334234a4ef1 100644
--- a/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc
+++ b/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/network/address.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
 
 #include "test/mocks/network/connection.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc
index 537665926a91c..f739c187f0da0 100644
--- a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc
+++ b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc
@@ -1,15 +1,13 @@
 #include "envoy/network/address.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/basic_resource_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/listen_socket_impl.h"
-
-#include "server/connection_handler_impl.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/basic_resource_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/server/connection_handler_impl.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/common/redis/cluster_refresh_manager_test.cc b/test/extensions/common/redis/cluster_refresh_manager_test.cc
index ea07e16243847..e54c77037d82f 100644
--- a/test/extensions/common/redis/cluster_refresh_manager_test.cc
+++ b/test/extensions/common/redis/cluster_refresh_manager_test.cc
@@ -1,12 +1,10 @@
 #include <atomic>
 #include <chrono>
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-
-#include "exe/platform_impl.h"
-
-#include "extensions/common/redis/cluster_refresh_manager_impl.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/exe/platform_impl.h"
+#include "source/extensions/common/redis/cluster_refresh_manager_impl.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/extensions/filters/network/redis_proxy/mocks.h"
diff --git a/test/extensions/common/redis/mocks.h b/test/extensions/common/redis/mocks.h
index 9c90c98703e78..7c90754f9948b 100644
--- a/test/extensions/common/redis/mocks.h
+++ b/test/extensions/common/redis/mocks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "extensions/common/redis/cluster_refresh_manager.h"
+#include "source/extensions/common/redis/cluster_refresh_manager.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/common/sqlutils/sqlutils_test.cc b/test/extensions/common/sqlutils/sqlutils_test.cc
index 2ab95360367fa..ad73ebe47bb7a 100644
--- a/test/extensions/common/sqlutils/sqlutils_test.cc
+++ b/test/extensions/common/sqlutils/sqlutils_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/sqlutils/sqlutils.h"
+#include "source/extensions/common/sqlutils/sqlutils.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/common/tap/admin_test.cc b/test/extensions/common/tap/admin_test.cc
index 020f563600d5f..58cfe3da4d941 100644
--- a/test/extensions/common/tap/admin_test.cc
+++ b/test/extensions/common/tap/admin_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/tap/v3/common.pb.h"
 
-#include "extensions/common/tap/admin.h"
+#include "source/extensions/common/tap/admin.h"
 
 #include "test/mocks/server/admin.h"
 #include "test/mocks/server/admin_stream.h"
diff --git a/test/extensions/common/tap/common.h b/test/extensions/common/tap/common.h
index 6429527f1a9a9..6e5cdfcb75b4b 100644
--- a/test/extensions/common/tap/common.h
+++ b/test/extensions/common/tap/common.h
@@ -2,9 +2,8 @@
 
 #include "envoy/data/tap/v3/wrapper.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/common/tap/tap.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/common/tap/tap.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/common/tap/tap_config_base_test.cc b/test/extensions/common/tap/tap_config_base_test.cc
index 75ccec5a1595f..1216a756fd3a2 100644
--- a/test/extensions/common/tap/tap_config_base_test.cc
+++ b/test/extensions/common/tap/tap_config_base_test.cc
@@ -4,9 +4,8 @@
 #include "envoy/data/tap/v3/common.pb.h"
 #include "envoy/data/tap/v3/wrapper.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/common/tap/tap_config_base.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/common/tap/tap_config_base.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/common/utility_test.cc b/test/extensions/common/utility_test.cc
index 562a195370421..7a61dc4863028 100644
--- a/test/extensions/common/utility_test.cc
+++ b/test/extensions/common/utility_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/common/utility.h"
+#include "source/extensions/common/utility.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/test_common/logging.h"
diff --git a/test/extensions/common/wasm/plugin_test.cc b/test/extensions/common/wasm/plugin_test.cc
index 2b219066935f0..b5c15da516050 100644
--- a/test/extensions/common/wasm/plugin_test.cc
+++ b/test/extensions/common/wasm/plugin_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/common/exception.h"
 
-#include "extensions/common/wasm/plugin.h"
+#include "source/extensions/common/wasm/plugin.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/common/wasm/test_data/test_context_cpp.cc b/test/extensions/common/wasm/test_data/test_context_cpp.cc
index 07d9d418f26d5..e790fd1011b35 100644
--- a/test/extensions/common/wasm/test_data/test_context_cpp.cc
+++ b/test/extensions/common/wasm/test_data/test_context_cpp.cc
@@ -8,7 +8,7 @@
 #include "proxy_wasm_intrinsics.h"
 #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(CommonWasmTestContextCpp)
diff --git a/test/extensions/common/wasm/wasm_speed_test.cc b/test/extensions/common/wasm/wasm_speed_test.cc
index a71102453f954..d9e65579547db 100644
--- a/test/extensions/common/wasm/wasm_speed_test.cc
+++ b/test/extensions/common/wasm/wasm_speed_test.cc
@@ -1,7 +1,6 @@
-#include "common/common/thread.h"
-#include "common/common/thread_synchronizer.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/thread_synchronizer.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/mocks/server/mocks.h"
 #include "test/mocks/upstream/mocks.h"
diff --git a/test/extensions/common/wasm/wasm_test.cc b/test/extensions/common/wasm/wasm_test.cc
index 795ab9f77fd63..4ef385ed47897 100644
--- a/test/extensions/common/wasm/wasm_test.cc
+++ b/test/extensions/common/wasm/wasm_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/server/lifecycle_notifier.h"
 
-#include "common/common/hex.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/common/hex.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/common/wasm/wasm_vm_test.cc b/test/extensions/common/wasm/wasm_vm_test.cc
index 46edd6dfe3ca2..4e06cefdca7e7 100644
--- a/test/extensions/common/wasm/wasm_vm_test.cc
+++ b/test/extensions/common/wasm/wasm_vm_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/registry/registry.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/common/wasm/wasm_vm.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/common/wasm/wasm_vm.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc b/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc
index 8a26cd53e1251..1e6949eb89188 100644
--- a/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc
+++ b/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/compression/brotli/compressor/config.h"
-#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/compression/brotli/compressor/config.h"
+#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc b/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc
index cd5d3ee1fd2a3..c03884f35f9f8 100644
--- a/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc
+++ b/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h"
-#include "extensions/compression/brotli/decompressor/config.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h"
+#include "source/extensions/compression/brotli/decompressor/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc b/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc
index 7d5046e1c7447..2e4670913ba02 100644
--- a/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc
+++ b/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/common/hex.h"
-
-#include "extensions/compression/gzip/compressor/config.h"
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/hex.h"
+#include "source/extensions/compression/gzip/compressor/config.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/compression/gzip/compressor_fuzz_test.cc b/test/extensions/compression/gzip/compressor_fuzz_test.cc
index bdaa5283e53af..73c592cb1f812 100644
--- a/test/extensions/compression/gzip/compressor_fuzz_test.cc
+++ b/test/extensions/compression/gzip/compressor_fuzz_test.cc
@@ -1,9 +1,8 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc b/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc
index 43ae89d42fd0b..0346118a2b224 100644
--- a/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc
+++ b/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc
@@ -1,9 +1,8 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/common/hex.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/hex.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/common/expr/context_test.cc b/test/extensions/filters/common/expr/context_test.cc
index 5d949add5b933..dc3e58b62bbb1 100644
--- a/test/extensions/filters/common/expr/context_test.cc
+++ b/test/extensions/filters/common/expr/context_test.cc
@@ -1,10 +1,9 @@
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/router/string_accessor_impl.h"
-#include "common/stream_info/filter_state_impl.h"
-
-#include "extensions/filters/common/expr/cel_state.h"
-#include "extensions/filters/common/expr/context.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/extensions/filters/common/expr/cel_state.h"
+#include "source/extensions/filters/common/expr/context.h"
 
 #include "test/mocks/ssl/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/common/expr/evaluator_fuzz_test.cc b/test/extensions/filters/common/expr/evaluator_fuzz_test.cc
index 6c3867747eded..108e7211a36dd 100644
--- a/test/extensions/filters/common/expr/evaluator_fuzz_test.cc
+++ b/test/extensions/filters/common/expr/evaluator_fuzz_test.cc
@@ -1,6 +1,5 @@
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 #include "test/common/stream_info/test_util.h"
 #include "test/extensions/filters/common/expr/evaluator_fuzz.pb.validate.h"
diff --git a/test/extensions/filters/common/expr/evaluator_test.cc b/test/extensions/filters/common/expr/evaluator_test.cc
index ab4da05f04f7b..784462960246d 100644
--- a/test/extensions/filters/common/expr/evaluator_test.cc
+++ b/test/extensions/filters/common/expr/evaluator_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/expr/evaluator.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc
index ff72b173d61ea..b85ae8e15b24e 100644
--- a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc
+++ b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/service/auth/v3/external_auth.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/common/ext_authz/check_request_utils.h"
-#include "extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/common/ext_authz/check_request_utils.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc
index 2601533b8d701..f771573698d1e 100644
--- a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc
+++ b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/service/auth/v3/external_auth.pb.h"
 #include "envoy/type/v3/http_status.pb.h"
 
-#include "common/grpc/common.h"
-#include "common/http/headers.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/extensions/filters/common/ext_authz/test_common.h"
diff --git a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc
index 97e51e11a505c..96d0be2f7b171 100644
--- a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc
+++ b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc
@@ -1,13 +1,12 @@
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h"
 #include "envoy/service/auth/v3/external_auth.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/extensions/filters/common/ext_authz/test_common.h"
diff --git a/test/extensions/filters/common/ext_authz/mocks.h b/test/extensions/filters/common/ext_authz/mocks.h
index 900d64d7d0fdf..1a3462d532f64 100644
--- a/test/extensions/filters/common/ext_authz/mocks.h
+++ b/test/extensions/filters/common/ext_authz/mocks.h
@@ -5,7 +5,7 @@
 
 #include "envoy/service/auth/v3/external_auth.pb.h"
 
-#include "extensions/filters/common/ext_authz/ext_authz.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/common/ext_authz/test_common.h b/test/extensions/filters/common/ext_authz/test_common.h
index 358f3a9a5fb8e..5d1e72222713d 100644
--- a/test/extensions/filters/common/ext_authz/test_common.h
+++ b/test/extensions/filters/common/ext_authz/test_common.h
@@ -4,9 +4,8 @@
 #include "envoy/service/auth/v3/external_auth.pb.h"
 #include "envoy/type/v3/http_status.pb.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/common/fault/fault_config_test.cc b/test/extensions/filters/common/fault/fault_config_test.cc
index 784aa2d88ab46..053d10284274d 100644
--- a/test/extensions/filters/common/fault/fault_config_test.cc
+++ b/test/extensions/filters/common/fault/fault_config_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/common/fault/v3/fault.pb.h"
 
-#include "extensions/filters/common/fault/fault_config.h"
+#include "source/extensions/filters/common/fault/fault_config.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc b/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc
index f35cf5b325b53..c857bbe74a1ca 100644
--- a/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc
+++ b/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
+#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/common/lua/lua_test.cc b/test/extensions/filters/common/lua/lua_test.cc
index ab7ef7da3bafd..473a280022a64 100644
--- a/test/extensions/filters/common/lua/lua_test.cc
+++ b/test/extensions/filters/common/lua/lua_test.cc
@@ -1,8 +1,7 @@
 #include <memory>
 
-#include "common/thread_local/thread_local_impl.h"
-
-#include "extensions/filters/common/lua/lua.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/extensions/filters/common/lua/lua.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/thread_local/mocks.h"
diff --git a/test/extensions/filters/common/lua/lua_wrappers.h b/test/extensions/filters/common/lua/lua_wrappers.h
index c129f34544cf4..b7c1dfb4bb50b 100644
--- a/test/extensions/filters/common/lua/lua_wrappers.h
+++ b/test/extensions/filters/common/lua/lua_wrappers.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "extensions/filters/common/lua/lua.h"
+#include "source/extensions/filters/common/lua/lua.h"
 
 #include "test/mocks/thread_local/mocks.h"
 
diff --git a/test/extensions/filters/common/lua/wrappers_test.cc b/test/extensions/filters/common/lua/wrappers_test.cc
index bbb334ef4d3dc..565843d7e14c0 100644
--- a/test/extensions/filters/common/lua/wrappers_test.cc
+++ b/test/extensions/filters/common/lua/wrappers_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/common/lua/wrappers.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/common/lua/wrappers.h"
 
 #include "test/extensions/filters/common/lua/lua_wrappers.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc
index eed0724bc198c..7159e32273659 100644
--- a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc
+++ b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/network/address.h"
 
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/original_src/original_src_socket_option.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/original_src/original_src_socket_option.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/common/ratelimit/BUILD b/test/extensions/filters/common/ratelimit/BUILD
index 8a11ca96f8e6d..ace59c86ebd86 100644
--- a/test/extensions/filters/common/ratelimit/BUILD
+++ b/test/extensions/filters/common/ratelimit/BUILD
@@ -29,7 +29,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/ratelimit:ratelimit_interface",
+        "//envoy/ratelimit:ratelimit_interface",
         "//source/extensions/filters/common/ratelimit:ratelimit_client_interface",
     ],
 )
diff --git a/test/extensions/filters/common/ratelimit/mocks.h b/test/extensions/filters/common/ratelimit/mocks.h
index 325f61cc79d74..57b5246d69be3 100644
--- a/test/extensions/filters/common/ratelimit/mocks.h
+++ b/test/extensions/filters/common/ratelimit/mocks.h
@@ -6,7 +6,7 @@
 #include "envoy/ratelimit/ratelimit.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc
index c4cd2b9d420e8..00c87f500904a 100644
--- a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc
+++ b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc
@@ -6,11 +6,10 @@
 #include "envoy/service/ratelimit/v3/rls.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/common/rbac/engine_impl_test.cc b/test/extensions/filters/common/rbac/engine_impl_test.cc
index ec9f787f35754..87e10cfb23d62 100644
--- a/test/extensions/filters/common/rbac/engine_impl_test.cc
+++ b/test/extensions/filters/common/rbac/engine_impl_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/config/rbac/v3/rbac.pb.h"
 #include "envoy/config/rbac/v3/rbac.pb.validate.h"
 
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/rbac/engine_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/ssl/mocks.h"
diff --git a/test/extensions/filters/common/rbac/matchers_test.cc b/test/extensions/filters/common/rbac/matchers_test.cc
index 5b1293b4677d3..ed39ff132283d 100644
--- a/test/extensions/filters/common/rbac/matchers_test.cc
+++ b/test/extensions/filters/common/rbac/matchers_test.cc
@@ -4,10 +4,9 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/type/matcher/v3/metadata.pb.h"
 
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/expr/evaluator.h"
-#include "extensions/filters/common/rbac/matchers.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/expr/evaluator.h"
+#include "source/extensions/filters/common/rbac/matchers.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/ssl/mocks.h"
diff --git a/test/extensions/filters/common/rbac/mocks.h b/test/extensions/filters/common/rbac/mocks.h
index a99e97aa9ea69..354a1e5dab153 100644
--- a/test/extensions/filters/common/rbac/mocks.h
+++ b/test/extensions/filters/common/rbac/mocks.h
@@ -2,7 +2,7 @@
 
 #include "envoy/config/rbac/v3/rbac.pb.h"
 
-#include "extensions/filters/common/rbac/engine_impl.h"
+#include "source/extensions/filters/common/rbac/engine_impl.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/common/rbac/utility_test.cc b/test/extensions/filters/common/rbac/utility_test.cc
index 35e3aad87140a..1bc4f7de17547 100644
--- a/test/extensions/filters/common/rbac/utility_test.cc
+++ b/test/extensions/filters/common/rbac/utility_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/common/rbac/utility.h"
+#include "source/extensions/filters/common/rbac/utility.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc
index 893512059cf52..4d1231966960e 100644
--- a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc
+++ b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc
@@ -1,6 +1,6 @@
 #include "test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc
index e05cbea0ce56d..c8df10baca50e 100644
--- a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc
+++ b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h"
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h"
 
-#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc b/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc
index 43246c1c3df09..9dbe2187e50e9 100644
--- a/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc
+++ b/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc
@@ -5,11 +5,10 @@
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h"
 #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
-#include "extensions/filters/http/adaptive_concurrency/controller/controller.h"
-#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h"
+#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/filters/http/admission_control/admission_control_filter_test.cc b/test/extensions/filters/http/admission_control/admission_control_filter_test.cc
index 847c0c0bb8a9b..a26dedf252da8 100644
--- a/test/extensions/filters/http/admission_control/admission_control_filter_test.cc
+++ b/test/extensions/filters/http/admission_control/admission_control_filter_test.cc
@@ -4,12 +4,11 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 #include "envoy/grpc/status.h"
 
-#include "common/common/enum_to_int.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/http/admission_control/admission_control.h"
-#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h"
-#include "extensions/filters/http/admission_control/thread_local_controller.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/http/admission_control/admission_control.h"
+#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h"
+#include "source/extensions/filters/http/admission_control/thread_local_controller.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc
index a7e8d83f97cfb..5ac69fef7e1fe 100644
--- a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc
+++ b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc
@@ -1,4 +1,4 @@
-#include "common/grpc/common.h"
+#include "source/common/grpc/common.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/filters/http/admission_control/config_test.cc b/test/extensions/filters/http/admission_control/config_test.cc
index 13d73551462ea..2ce74fa135f1c 100644
--- a/test/extensions/filters/http/admission_control/config_test.cc
+++ b/test/extensions/filters/http/admission_control/config_test.cc
@@ -3,11 +3,10 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/http/admission_control/admission_control.h"
-#include "extensions/filters/http/admission_control/config.h"
-#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/http/admission_control/admission_control.h"
+#include "source/extensions/filters/http/admission_control/config.h"
+#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/admission_control/controller_test.cc b/test/extensions/filters/http/admission_control/controller_test.cc
index bf88a7037431d..8c9593501fe18 100644
--- a/test/extensions/filters/http/admission_control/controller_test.cc
+++ b/test/extensions/filters/http/admission_control/controller_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 
-#include "extensions/filters/http/admission_control/thread_local_controller.h"
+#include "source/extensions/filters/http/admission_control/thread_local_controller.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc b/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc
index 888497a1363e9..7e3725daed477 100644
--- a/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc
+++ b/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h"
 #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h"
 
-#include "common/common/enum_to_int.h"
-
-#include "extensions/filters/http/admission_control/admission_control.h"
-#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/extensions/filters/http/admission_control/admission_control.h"
+#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/http/aws_lambda/arn_test.cc b/test/extensions/filters/http/aws_lambda/arn_test.cc
index 8f20f9af7767e..f8b580c5ed6b2 100644
--- a/test/extensions/filters/http/aws_lambda/arn_test.cc
+++ b/test/extensions/filters/http/aws_lambda/arn_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h"
+#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
diff --git a/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc b/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc
index ccc8114a45e3e..a9d74ea695f6c 100644
--- a/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc
+++ b/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/http/filter.h"
 
+#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h"
 #include "source/extensions/filters/http/aws_lambda/request_response.pb.validate.h"
-
-#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/common/aws/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/aws_lambda/config_test.cc b/test/extensions/filters/http/aws_lambda/config_test.cc
index 752f763292b61..c889caec26597 100644
--- a/test/extensions/filters/http/aws_lambda/config_test.cc
+++ b/test/extensions/filters/http/aws_lambda/config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.h"
 #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h"
 
-#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h"
-#include "extensions/filters/http/aws_lambda/config.h"
+#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h"
+#include "source/extensions/filters/http/aws_lambda/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc b/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc
index 2e730a8a70406..a8343b6d37229 100644
--- a/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc
+++ b/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/http/filter.h"
 
-#include "extensions/common/aws/signer.h"
-#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
+#include "source/extensions/common/aws/signer.h"
+#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h"
 
 #include "test/extensions/common/aws/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/aws_request_signing/config_test.cc b/test/extensions/filters/http/aws_request_signing/config_test.cc
index 7d86e759b77e3..58842ca8fd4d6 100644
--- a/test/extensions/filters/http/aws_request_signing/config_test.cc
+++ b/test/extensions/filters/http/aws_request_signing/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h"
 #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h"
 
-#include "extensions/filters/http/aws_request_signing/config.h"
+#include "source/extensions/filters/http/aws_request_signing/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/bandwidth_limit/config_test.cc b/test/extensions/filters/http/bandwidth_limit/config_test.cc
index 29675d090fa9b..b98ea7ca4d67f 100644
--- a/test/extensions/filters/http/bandwidth_limit/config_test.cc
+++ b/test/extensions/filters/http/bandwidth_limit/config_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
-#include "extensions/filters/http/bandwidth_limit/config.h"
+#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
+#include "source/extensions/filters/http/bandwidth_limit/config.h"
 
 #include "test/mocks/server/mocks.h"
 
diff --git a/test/extensions/filters/http/bandwidth_limit/filter_test.cc b/test/extensions/filters/http/bandwidth_limit/filter_test.cc
index 497a9472f8d3e..daffe9076ea34 100644
--- a/test/extensions/filters/http/bandwidth_limit/filter_test.cc
+++ b/test/extensions/filters/http/bandwidth_limit/filter_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.h"
 
-#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
+#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h"
 
 #include "test/mocks/http/mocks.h"
 
diff --git a/test/extensions/filters/http/buffer/BUILD b/test/extensions/filters/http/buffer/BUILD
index e635afb7ce098..cf7467c62b2bc 100644
--- a/test/extensions/filters/http/buffer/BUILD
+++ b/test/extensions/filters/http/buffer/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["buffer_filter_test.cc"],
     extension_name = "envoy.filters.http.buffer",
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/http:header_map_lib",
         "//source/common/stats:stats_lib",
         "//source/extensions/filters/http/buffer:buffer_filter_lib",
diff --git a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc
index 48f58baed8e79..cb910c2d17798 100644
--- a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc
+++ b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/http_protocol_integration.h"
 
diff --git a/test/extensions/filters/http/buffer/buffer_filter_test.cc b/test/extensions/filters/http/buffer/buffer_filter_test.cc
index 34ce1e2211b6d..49ba8fbfd6bfe 100644
--- a/test/extensions/filters/http/buffer/buffer_filter_test.cc
+++ b/test/extensions/filters/http/buffer/buffer_filter_test.cc
@@ -4,11 +4,10 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/runtime/runtime_impl.h"
-
-#include "extensions/filters/http/buffer/buffer_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/extensions/filters/http/buffer/buffer_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/buffer/config_test.cc b/test/extensions/filters/http/buffer/config_test.cc
index 268fe142931b8..912210a0df4b6 100644
--- a/test/extensions/filters/http/buffer/config_test.cc
+++ b/test/extensions/filters/http/buffer/config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h"
 
-#include "extensions/filters/http/buffer/buffer_filter.h"
-#include "extensions/filters/http/buffer/config.h"
+#include "source/extensions/filters/http/buffer/buffer_filter.h"
+#include "source/extensions/filters/http/buffer/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/cache/BUILD b/test/extensions/filters/http/cache/BUILD
index 5b5398ab23aac..38c7a634ffce2 100644
--- a/test/extensions/filters/http/cache/BUILD
+++ b/test/extensions/filters/http/cache/BUILD
@@ -24,7 +24,7 @@ envoy_extension_cc_test(
     extension_name = "envoy.filters.http.cache",
     deps = [
         ":common",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/http:header_map_lib",
         "//source/extensions/filters/http/cache:cache_headers_utils_lib",
         "//test/test_common:simulated_time_system_lib",
diff --git a/test/extensions/filters/http/cache/cache_custom_headers_test.cc b/test/extensions/filters/http/cache/cache_custom_headers_test.cc
index 2b939613b16e2..f7d54b16cb43a 100644
--- a/test/extensions/filters/http/cache/cache_custom_headers_test.cc
+++ b/test/extensions/filters/http/cache/cache_custom_headers_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cache/cache_custom_headers.h"
+#include "source/extensions/filters/http/cache/cache_custom_headers.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/http/cache/cache_filter_test.cc b/test/extensions/filters/http/cache/cache_filter_test.cc
index 1a75379b0c990..ff8357b0d4f00 100644
--- a/test/extensions/filters/http/cache/cache_filter_test.cc
+++ b/test/extensions/filters/http/cache/cache_filter_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/event/dispatcher.h"
 
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/cache/cache_filter.h"
-#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/cache/cache_filter.h"
+#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
 
 #include "test/extensions/filters/http/cache/common.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/cache/cache_headers_utils_test.cc b/test/extensions/filters/http/cache/cache_headers_utils_test.cc
index 14a2c10282ce6..2c0795195efee 100644
--- a/test/extensions/filters/http/cache/cache_headers_utils_test.cc
+++ b/test/extensions/filters/http/cache/cache_headers_utils_test.cc
@@ -4,12 +4,11 @@
 
 #include "envoy/common/time.h"
 
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/header_utility.h"
-
-#include "extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
 
 #include "test/extensions/filters/http/cache/common.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/http/cache/cacheability_utils_test.cc b/test/extensions/filters/http/cache/cacheability_utils_test.cc
index 797f8e6858037..79b4b3f836a95 100644
--- a/test/extensions/filters/http/cache/cacheability_utils_test.cc
+++ b/test/extensions/filters/http/cache/cacheability_utils_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/http/header_map.h"
 
-#include "extensions/filters/http/cache/cacheability_utils.h"
+#include "source/extensions/filters/http/cache/cacheability_utils.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/http/cache/common.h b/test/extensions/filters/http/cache/common.h
index d5c9c2bdd40e8..7b81ac7618c07 100644
--- a/test/extensions/filters/http/cache/common.h
+++ b/test/extensions/filters/http/cache/common.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "extensions/filters/http/cache/cache_headers_utils.h"
-#include "extensions/filters/http/cache/http_cache.h"
-#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/extensions/filters/http/cache/http_cache.h"
+#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/http/cache/config_test.cc b/test/extensions/filters/http/cache/config_test.cc
index e254044455a00..0991f842a2f7d 100644
--- a/test/extensions/filters/http/cache/config_test.cc
+++ b/test/extensions/filters/http/cache/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/cache/simple_http_cache/v3alpha/config.pb.h"
 
-#include "extensions/filters/http/cache/cache_filter.h"
-#include "extensions/filters/http/cache/config.h"
+#include "source/extensions/filters/http/cache/cache_filter.h"
+#include "source/extensions/filters/http/cache/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/cache/http_cache_test.cc b/test/extensions/filters/http/cache/http_cache_test.cc
index a68708da301cc..9ccc413033f9e 100644
--- a/test/extensions/filters/http/cache/http_cache_test.cc
+++ b/test/extensions/filters/http/cache/http_cache_test.cc
@@ -1,8 +1,8 @@
 #include <chrono>
 #include <string>
 
-#include "extensions/filters/http/cache/cache_headers_utils.h"
-#include "extensions/filters/http/cache/http_cache.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/extensions/filters/http/cache/http_cache.h"
 
 #include "test/extensions/filters/http/cache/common.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc b/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc
index cd534b1c6fe3f..0e895d0c6efae 100644
--- a/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc
+++ b/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/http/header_map.h"
 #include "envoy/registry/registry.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/cache/cache_headers_utils.h"
-#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/cache/cache_headers_utils.h"
+#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h"
 
 #include "test/extensions/filters/http/cache/common.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/http/cdn_loop/BUILD b/test/extensions/filters/http/cdn_loop/BUILD
index d39c244e72a97..288d89e90399e 100644
--- a/test/extensions/filters/http/cdn_loop/BUILD
+++ b/test/extensions/filters/http/cdn_loop/BUILD
@@ -42,8 +42,8 @@ envoy_cc_test(
     name = "filter_test",
     srcs = ["filter_test.cc"],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:filter_interface",
         "//source/extensions/filters/http/cdn_loop:filter_lib",
         "//test/mocks/http:http_mocks",
         "//test/test_common:utility_lib",
diff --git a/test/extensions/filters/http/cdn_loop/config_test.cc b/test/extensions/filters/http/cdn_loop/config_test.cc
index 288936bb2abb3..ffcc776c9004b 100644
--- a/test/extensions/filters/http/cdn_loop/config_test.cc
+++ b/test/extensions/filters/http/cdn_loop/config_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.pb.h"
 
-#include "extensions/filters/http/cdn_loop/config.h"
-#include "extensions/filters/http/cdn_loop/filter.h"
+#include "source/extensions/filters/http/cdn_loop/config.h"
+#include "source/extensions/filters/http/cdn_loop/filter.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/cdn_loop/filter_test.cc b/test/extensions/filters/http/cdn_loop/filter_test.cc
index a4bd33ef3d043..e71661ee5a371 100644
--- a/test/extensions/filters/http/cdn_loop/filter_test.cc
+++ b/test/extensions/filters/http/cdn_loop/filter_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/http/codes.h"
 #include "envoy/http/filter.h"
 
-#include "extensions/filters/http/cdn_loop/filter.h"
+#include "source/extensions/filters/http/cdn_loop/filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc b/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc
index 7d5f53f8bbc42..cac7480dab7fd 100644
--- a/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc
+++ b/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc
@@ -1,6 +1,5 @@
-#include "common/common/statusor.h"
-
-#include "extensions/filters/http/cdn_loop/parser.h"
+#include "source/common/common/statusor.h"
+#include "source/extensions/filters/http/cdn_loop/parser.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/fuzz/utility.h"
diff --git a/test/extensions/filters/http/cdn_loop/parser_test.cc b/test/extensions/filters/http/cdn_loop/parser_test.cc
index cdd43ebfa224c..0adbf02a2cfc7 100644
--- a/test/extensions/filters/http/cdn_loop/parser_test.cc
+++ b/test/extensions/filters/http/cdn_loop/parser_test.cc
@@ -1,6 +1,6 @@
 #include <sstream>
 
-#include "extensions/filters/http/cdn_loop/parser.h"
+#include "source/extensions/filters/http/cdn_loop/parser.h"
 
 #include "test/test_common/status_utility.h"
 
diff --git a/test/extensions/filters/http/cdn_loop/utils_test.cc b/test/extensions/filters/http/cdn_loop/utils_test.cc
index 95a4ab1415a36..a27ee285baa15 100644
--- a/test/extensions/filters/http/cdn_loop/utils_test.cc
+++ b/test/extensions/filters/http/cdn_loop/utils_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/cdn_loop/utils.h"
+#include "source/extensions/filters/http/cdn_loop/utils.h"
 
 #include "test/test_common/status_utility.h"
 
diff --git a/test/extensions/filters/http/common/BUILD b/test/extensions/filters/http/common/BUILD
index 2462cf2b78577..94ac2e75954b9 100644
--- a/test/extensions/filters/http/common/BUILD
+++ b/test/extensions/filters/http/common/BUILD
@@ -32,7 +32,7 @@ envoy_cc_test_library(
     name = "empty_http_filter_config_lib",
     hdrs = ["empty_http_filter_config.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
     ],
 )
 
@@ -56,7 +56,7 @@ envoy_cc_test(
     name = "stream_rate_limiter_test",
     srcs = ["stream_rate_limiter_test.cc"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/http:header_map_lib",
diff --git a/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc b/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc
index 9056ddc0ac3d7..e23253457845b 100644
--- a/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc
+++ b/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h"
 
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/filters/http/common/compressor/compressor.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/filters/http/common/compressor/compressor.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/common/compressor/compressor_filter_test.cc b/test/extensions/filters/http/common/compressor/compressor_filter_test.cc
index 37513d45a968a..8df7d9580a6cb 100644
--- a/test/extensions/filters/http/common/compressor/compressor_filter_test.cc
+++ b/test/extensions/filters/http/common/compressor/compressor_filter_test.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/common/compressor/compressor.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/common/compressor/compressor.h"
 
 #include "test/mocks/compression/compressor/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc b/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc
index fc351d6994e56..7a69927526ee1 100644
--- a/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc
+++ b/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc
@@ -5,8 +5,8 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/utility.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/extensions/filters/http/common/empty_http_filter_config.h b/test/extensions/filters/http/common/empty_http_filter_config.h
index 1baa88a905048..45f59857829dc 100644
--- a/test/extensions/filters/http/common/empty_http_filter_config.h
+++ b/test/extensions/filters/http/common/empty_http_filter_config.h
@@ -4,7 +4,7 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD
index e647e4354c4bf..6e761a6e627f8 100644
--- a/test/extensions/filters/http/common/fuzz/BUILD
+++ b/test/extensions/filters/http/common/fuzz/BUILD
@@ -27,7 +27,7 @@ envoy_cc_test_library(
     name = "http_filter_fuzzer_lib",
     hdrs = ["http_filter_fuzzer.h"],
     deps = [
-        "//include/envoy/http:filter_interface",
+        "//envoy/http:filter_interface",
         "//source/common/http:utility_lib",
         "//test/fuzz:common_proto_cc_proto",
         "//test/fuzz:utility_lib",
diff --git a/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc b/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc
index 429e34191ba16..0257fbd6fd21c 100644
--- a/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc
+++ b/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc
@@ -1,7 +1,6 @@
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/config/utility.h"
 #include "test/extensions/filters/http/common/fuzz/filter_fuzz.pb.validate.h"
diff --git a/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h b/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h
index dba20989d343d..861c50f4220a8 100644
--- a/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h
+++ b/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h
@@ -2,7 +2,7 @@
 
 #include "envoy/http/filter.h"
 
-#include "common/http/utility.h"
+#include "source/common/http/utility.h"
 
 #include "test/fuzz/common.pb.h"
 #include "test/fuzz/utility.h"
diff --git a/test/extensions/filters/http/common/fuzz/uber_filter.cc b/test/extensions/filters/http/common/fuzz/uber_filter.cc
index d43c2f403c772..748c84b311cc6 100644
--- a/test/extensions/filters/http/common/fuzz/uber_filter.cc
+++ b/test/extensions/filters/http/common/fuzz/uber_filter.cc
@@ -1,11 +1,11 @@
 #include "test/extensions/filters/http/common/fuzz/uber_filter.h"
 
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/http/message_impl.h"
-#include "common/http/utility.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc
index 11a2c7bc1a1f6..b6436058bf275 100644
--- a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc
+++ b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc
@@ -3,10 +3,9 @@
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 #include "envoy/extensions/filters/http/tap/v3/tap.pb.h"
 
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/filters/http/common/utility.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/filters/http/common/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/http/common/fuzz/uber_filter.h"
 #include "test/proto/bookstore.pb.h"
diff --git a/test/extensions/filters/http/common/jwks_fetcher_test.cc b/test/extensions/filters/http/common/jwks_fetcher_test.cc
index cd3604aa40bf5..aad2ac07b636c 100644
--- a/test/extensions/filters/http/common/jwks_fetcher_test.cc
+++ b/test/extensions/filters/http/common/jwks_fetcher_test.cc
@@ -3,10 +3,9 @@
 
 #include "envoy/config/core/v3/http_uri.pb.h"
 
-#include "common/http/message_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/common/jwks_fetcher.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
 
 #include "test/extensions/filters/http/common/mock.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/common/mock.h b/test/extensions/filters/http/common/mock.h
index 53b35de15b100..3aa0bb3b2b04d 100644
--- a/test/extensions/filters/http/common/mock.h
+++ b/test/extensions/filters/http/common/mock.h
@@ -2,9 +2,8 @@
 
 #include "envoy/config/core/v3/http_uri.pb.h"
 
-#include "common/http/message_impl.h"
-
-#include "extensions/filters/http/common/jwks_fetcher.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
 
 #include "test/mocks/upstream/mocks.h"
 
diff --git a/test/extensions/filters/http/common/stream_rate_limiter_test.cc b/test/extensions/filters/http/common/stream_rate_limiter_test.cc
index 3048add956433..97f18f5957ca1 100644
--- a/test/extensions/filters/http/common/stream_rate_limiter_test.cc
+++ b/test/extensions/filters/http/common/stream_rate_limiter_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/event/dispatcher.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-
-#include "extensions/filters/http/common/stream_rate_limiter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/extensions/filters/http/common/stream_rate_limiter.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/common/utility_test.cc b/test/extensions/filters/http/common/utility_test.cc
index 7b8923309180d..ac70604ea55ec 100644
--- a/test/extensions/filters/http/common/utility_test.cc
+++ b/test/extensions/filters/http/common/utility_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/http/common/utility.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/common/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/composite/filter_test.cc b/test/extensions/filters/http/composite/filter_test.cc
index 019d303aae294..cb608c7094017 100644
--- a/test/extensions/filters/http/composite/filter_test.cc
+++ b/test/extensions/filters/http/composite/filter_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/http/metadata_interface.h"
 
-#include "extensions/filters/http/composite/filter.h"
+#include "source/extensions/filters/http/composite/filter.h"
 
 #include "test/mocks/http/mocks.h"
 
diff --git a/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc b/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc
index a95e6accf74f4..598870b32f867 100644
--- a/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc
+++ b/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/event/timer.h"
 
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/http/compressor/compressor_filter_test.cc b/test/extensions/filters/http/compressor/compressor_filter_test.cc
index 7f209da033ef8..54ba0bbd58bdd 100644
--- a/test/extensions/filters/http/compressor/compressor_filter_test.cc
+++ b/test/extensions/filters/http/compressor/compressor_filter_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/compressor/compressor_filter.h"
+#include "source/extensions/filters/http/compressor/compressor_filter.h"
 
 #include "test/mocks/compression/compressor/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/compressor/config_test.cc b/test/extensions/filters/http/compressor/config_test.cc
index aec2806eb9b3a..66a2fe10b4e15 100644
--- a/test/extensions/filters/http/compressor/config_test.cc
+++ b/test/extensions/filters/http/compressor/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/compressor/config.h"
+#include "source/extensions/filters/http/compressor/config.h"
 
 #include "test/extensions/filters/http/compressor/mock_compressor_library.pb.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/cors/cors_filter_test.cc b/test/extensions/filters/http/cors/cors_filter_test.cc
index 85e7f92a1389e..116b45c00ae2f 100644
--- a/test/extensions/filters/http/cors/cors_filter_test.cc
+++ b/test/extensions/filters/http/cors/cors_filter_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/matchers.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/cors/cors_filter.h"
+#include "source/common/common/matchers.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/cors/cors_filter.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/csrf/csrf_filter_test.cc b/test/extensions/filters/http/csrf/csrf_filter_test.cc
index cf38c0d858c25..0db5cd8376fe6 100644
--- a/test/extensions/filters/http/csrf/csrf_filter_test.cc
+++ b/test/extensions/filters/http/csrf/csrf_filter_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/csrf/csrf_filter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/csrf/csrf_filter.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc b/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc
index be1cb8384aa95..30c6f5117ee75 100644
--- a/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc
+++ b/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/event/timer.h"
 
-#include "extensions/compression/gzip/compressor/config.h"
+#include "source/extensions/compression/gzip/compressor/config.h"
 
 #include "test/integration/http_integration.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/decompressor/decompressor_filter_test.cc b/test/extensions/filters/http/decompressor/decompressor_filter_test.cc
index bd8f8891d3ec3..f29fc45142b57 100644
--- a/test/extensions/filters/http/decompressor/decompressor_filter_test.cc
+++ b/test/extensions/filters/http/decompressor/decompressor_filter_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h"
 
-#include "common/http/headers.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/decompressor/decompressor_filter.h"
+#include "source/common/http/headers.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/decompressor/decompressor_filter.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/compression/decompressor/mocks.h"
diff --git a/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc
index 8ee82c862744d..56430a51168d7 100644
--- a/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc
+++ b/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
-#include "extensions/filters/http/dynamic_forward_proxy/config.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc
index b7d8a69818960..297fb4f33538d 100644
--- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc
+++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/integration/http_integration.h"
 #include "test/integration/ssl_utility.h"
diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc
index 275a603dc8b33..d0102583ef900 100644
--- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc
+++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc
@@ -1,9 +1,9 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h"
 
-#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
-#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/common/dynamic_forward_proxy/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/dynamo/config_test.cc b/test/extensions/filters/http/dynamo/config_test.cc
index e1ed56fbcb8a0..aca5c3a776546 100644
--- a/test/extensions/filters/http/dynamo/config_test.cc
+++ b/test/extensions/filters/http/dynamo/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.h"
 #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h"
 
-#include "extensions/filters/http/dynamo/config.h"
+#include "source/extensions/filters/http/dynamo/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc
index 7519814552c69..612537e8c1578 100644
--- a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc
+++ b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc
@@ -1,10 +1,9 @@
 #include <memory>
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/dynamo/dynamo_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/dynamo/dynamo_filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc b/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc
index 69d616ddebc6d..eb215ad9b8410 100644
--- a/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc
+++ b/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc
@@ -1,10 +1,9 @@
 #include <string>
 #include <vector>
 
-#include "common/http/header_map_impl.h"
-#include "common/json/json_loader.h"
-
-#include "extensions/filters/http/dynamo/dynamo_request_parser.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/dynamo/dynamo_stats_test.cc b/test/extensions/filters/http/dynamo/dynamo_stats_test.cc
index d479f4a1092fe..f8fbc1c1a4c7f 100644
--- a/test/extensions/filters/http/dynamo/dynamo_stats_test.cc
+++ b/test/extensions/filters/http/dynamo/dynamo_stats_test.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "extensions/filters/http/dynamo/dynamo_stats.h"
+#include "source/extensions/filters/http/dynamo/dynamo_stats.h"
 
 #include "test/mocks/stats/mocks.h"
 
diff --git a/test/extensions/filters/http/ext_authz/BUILD b/test/extensions/filters/http/ext_authz/BUILD
index 65ea7d623b81a..68483ff45ba7c 100644
--- a/test/extensions/filters/http/ext_authz/BUILD
+++ b/test/extensions/filters/http/ext_authz/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["ext_authz_test.cc"],
     extension_name = "envoy.filters.http.ext_authz",
     deps = [
-        "//include/envoy/http:codes_interface",
+        "//envoy/http:codes_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/http:context_lib",
diff --git a/test/extensions/filters/http/ext_authz/config_test.cc b/test/extensions/filters/http/ext_authz/config_test.cc
index 2204f4985327b..34605409d7a2a 100644
--- a/test/extensions/filters/http/ext_authz/config_test.cc
+++ b/test/extensions/filters/http/ext_authz/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/filters/http/ext_authz/config.h"
+#include "source/extensions/filters/http/ext_authz/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
index 21b3ec0438ac3..7d851c33e4380 100644
--- a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
+++ b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc
@@ -3,9 +3,8 @@
 #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h"
 #include "envoy/service/auth/v3/external_auth.pb.h"
 
-#include "common/common/macros.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/macros.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/filters/http/ext_authz/ext_authz_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_test.cc
index 2544068ff083f..a2d5b70aaf78c 100644
--- a/test/extensions/filters/http/ext_authz/ext_authz_test.cc
+++ b/test/extensions/filters/http/ext_authz/ext_authz_test.cc
@@ -9,16 +9,15 @@
 #include "envoy/service/auth/v3/external_auth.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/http/context_impl.h"
-#include "common/http/headers.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/ext_authz/ext_authz.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/ext_authz/ext_authz.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD
index 898226637fad4..cf71d4bf2dfde 100644
--- a/test/extensions/filters/http/ext_proc/BUILD
+++ b/test/extensions/filters/http/ext_proc/BUILD
@@ -115,7 +115,7 @@ envoy_extension_cc_test_library(
     hdrs = ["utils.h"],
     extension_name = "envoy.filters.http.ext_proc",
     deps = [
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//test/test_common:utility_lib",
         "@com_google_absl//absl/strings:str_format",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/test/extensions/filters/http/ext_proc/client_test.cc b/test/extensions/filters/http/ext_proc/client_test.cc
index 8612f937e2d19..4e7d3b0c0eb78 100644
--- a/test/extensions/filters/http/ext_proc/client_test.cc
+++ b/test/extensions/filters/http/ext_proc/client_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/ext_proc/client_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/ext_proc/client_impl.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/extensions/filters/http/ext_proc/config_test.cc b/test/extensions/filters/http/ext_proc/config_test.cc
index df07f8b25c789..bb87b9fb6545d 100644
--- a/test/extensions/filters/http/ext_proc/config_test.cc
+++ b/test/extensions/filters/http/ext_proc/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/ext_proc/config.h"
+#include "source/extensions/filters/http/ext_proc/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc
index 0b9150a3ecaa0..a730287d6519e 100644
--- a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc
+++ b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/network/address.h"
 #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h"
 
-#include "extensions/filters/http/ext_proc/config.h"
+#include "source/extensions/filters/http/ext_proc/config.h"
 
 #include "test/common/http/common.h"
 #include "test/extensions/filters/http/ext_proc/utils.h"
diff --git a/test/extensions/filters/http/ext_proc/filter_test.cc b/test/extensions/filters/http/ext_proc/filter_test.cc
index 804d1cb4ba4cb..73640c79af78b 100644
--- a/test/extensions/filters/http/ext_proc/filter_test.cc
+++ b/test/extensions/filters/http/ext_proc/filter_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h"
 
-#include "extensions/filters/http/ext_proc/ext_proc.h"
+#include "source/extensions/filters/http/ext_proc/ext_proc.h"
 
 #include "test/common/http/common.h"
 #include "test/extensions/filters/http/ext_proc/mock_server.h"
diff --git a/test/extensions/filters/http/ext_proc/mock_server.h b/test/extensions/filters/http/ext_proc/mock_server.h
index 07d0b1aeb259e..bb479d175e290 100644
--- a/test/extensions/filters/http/ext_proc/mock_server.h
+++ b/test/extensions/filters/http/ext_proc/mock_server.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "extensions/filters/http/ext_proc/client.h"
+#include "source/extensions/filters/http/ext_proc/client.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/http/ext_proc/mutation_utils_test.cc b/test/extensions/filters/http/ext_proc/mutation_utils_test.cc
index 4096fcc68a267..abed79419dae1 100644
--- a/test/extensions/filters/http/ext_proc/mutation_utils_test.cc
+++ b/test/extensions/filters/http/ext_proc/mutation_utils_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/ext_proc/mutation_utils.h"
+#include "source/extensions/filters/http/ext_proc/mutation_utils.h"
 
 #include "test/extensions/filters/http/ext_proc/utils.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/ext_proc/ordering_test.cc b/test/extensions/filters/http/ext_proc/ordering_test.cc
index 0ae4543296dfb..7d5437049051b 100644
--- a/test/extensions/filters/http/ext_proc/ordering_test.cc
+++ b/test/extensions/filters/http/ext_proc/ordering_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/http/header_map.h"
 
-#include "extensions/filters/http/ext_proc/ext_proc.h"
+#include "source/extensions/filters/http/ext_proc/ext_proc.h"
 
 #include "test/common/http/common.h"
 #include "test/extensions/filters/http/ext_proc/mock_server.h"
diff --git a/test/extensions/filters/http/fault/BUILD b/test/extensions/filters/http/fault/BUILD
index e100845921d59..189fa95ded56b 100644
--- a/test/extensions/filters/http/fault/BUILD
+++ b/test/extensions/filters/http/fault/BUILD
@@ -18,7 +18,7 @@ envoy_extension_cc_test(
     extension_name = "envoy.filters.http.fault",
     deps = [
         ":utility_lib",
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/http:header_map_lib",
diff --git a/test/extensions/filters/http/fault/config_test.cc b/test/extensions/filters/http/fault/config_test.cc
index 080e5a3e41de7..440bd0ccae85b 100644
--- a/test/extensions/filters/http/fault/config_test.cc
+++ b/test/extensions/filters/http/fault/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "extensions/filters/http/fault/config.h"
+#include "source/extensions/filters/http/fault/config.h"
 
 #include "test/extensions/filters/http/fault/utility.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/fault/fault_filter_test.cc b/test/extensions/filters/http/fault/fault_filter_test.cc
index 07d16bd6d41af..7ce69276d0300 100644
--- a/test/extensions/filters/http/fault/fault_filter_test.cc
+++ b/test/extensions/filters/http/fault/fault_filter_test.cc
@@ -9,13 +9,12 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/fault/fault_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/fault/fault_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/common/http/common.h"
 #include "test/extensions/filters/http/fault/utility.h"
diff --git a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc
index 8c890afcaf7eb..b1dd30299e995 100644
--- a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc
+++ b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_http1_bridge/config.h"
+#include "source/extensions/filters/http/grpc_http1_bridge/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc
index 6c7d238247950..96f7fb3aac75a 100644
--- a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc
+++ b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc
@@ -1,9 +1,8 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/global.h"
diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc
index 33acd2fef2563..a23d934f7465d 100644
--- a/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc
+++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h"
 
-#include "extensions/filters/http/grpc_http1_reverse_bridge/config.h"
-#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/config.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc
index 43cb6339eef46..fa637080f754b 100644
--- a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc
+++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h"
 
-#include "common/http/message_impl.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/integration/http_integration.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc
index 8f0f31ca60d4c..0a404a3c611ae 100644
--- a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc
+++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc
@@ -3,13 +3,12 @@
 
 #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/codec.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
-
-#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc
index 164649e3228ab..05186021d7606 100644
--- a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc
+++ b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h"
 
-#include "extensions/filters/http/grpc_json_transcoder/config.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc
index 065d599f1fdd8..c255c138a8c50 100644
--- a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc
+++ b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/http/message_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/integration/http_integration.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc b/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc
index 6a69e0770cd1c..0db9a705508ed 100644
--- a/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc
+++ b/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
-
-#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h"
 
 #include "test/proto/bookstore.pb.h"
 
diff --git a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc
index 1de0a48874d59..8e194cfb2b648 100644
--- a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc
+++ b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc
@@ -4,14 +4,13 @@
 
 #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/proto/bookstore.pb.h"
diff --git a/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc b/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc
index e72c8beaa24ff..263ef7e1db617 100644
--- a/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc
+++ b/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc
@@ -1,6 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/http/grpc_stats/config_test.cc b/test/extensions/filters/http/grpc_stats/config_test.cc
index 3b4f1cdb00ad5..5ebeaadd07330 100644
--- a/test/extensions/filters/http/grpc_stats/config_test.cc
+++ b/test/extensions/filters/http/grpc_stats/config_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.h"
 #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.h"
 
-#include "common/grpc/common.h"
-
-#include "extensions/filters/http/grpc_stats/grpc_stats_filter.h"
+#include "source/common/grpc/common.h"
+#include "source/extensions/filters/http/grpc_stats/grpc_stats_filter.h"
 
 #include "test/common/buffer/utility.h"
 #include "test/common/stream_info/test_util.h"
diff --git a/test/extensions/filters/http/grpc_web/config_test.cc b/test/extensions/filters/http/grpc_web/config_test.cc
index 0ad9da56c86f5..32c7d656ec78c 100644
--- a/test/extensions/filters/http/grpc_web/config_test.cc
+++ b/test/extensions/filters/http/grpc_web/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/grpc_web/config.h"
+#include "source/extensions/filters/http/grpc_web/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc
index 701f97662a9e5..057875885b730 100644
--- a/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc
+++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc
@@ -1,8 +1,7 @@
 #include <memory>
 
-#include "common/common/base64.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/base64.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/integration/http_integration.h"
 
diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc
index bbc401405cf97..243815d0b282f 100644
--- a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc
+++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc
@@ -1,16 +1,15 @@
 #include "envoy/http/filter.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/base64.h"
-#include "common/common/empty_string.h"
-#include "common/common/utility.h"
-#include "common/grpc/common.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/http/grpc_web/grpc_web_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/test_common/global.h"
diff --git a/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc b/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc
index e17b55409ec89..3b4ee572bce9b 100644
--- a/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc
+++ b/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/event/timer.h"
 
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/http/gzip/gzip_filter_test.cc b/test/extensions/filters/http/gzip/gzip_filter_test.cc
index b138cae4520ef..49150c7a80114 100644
--- a/test/extensions/filters/http/gzip/gzip_filter_test.cc
+++ b/test/extensions/filters/http/gzip/gzip_filter_test.cc
@@ -2,13 +2,12 @@
 
 #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h"
 
-#include "common/common/hex.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h"
-#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
-#include "extensions/filters/http/gzip/config.h"
-#include "extensions/filters/http/gzip/gzip_filter.h"
+#include "source/common/common/hex.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h"
+#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h"
+#include "source/extensions/filters/http/gzip/config.h"
+#include "source/extensions/filters/http/gzip/gzip_filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/header_to_metadata/config_test.cc b/test/extensions/filters/http/header_to_metadata/config_test.cc
index 3b7771b4ce231..1bdabcc02a472 100644
--- a/test/extensions/filters/http/header_to_metadata/config_test.cc
+++ b/test/extensions/filters/http/header_to_metadata/config_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h"
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h"
 
-#include "extensions/filters/http/header_to_metadata/config.h"
-#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
+#include "source/extensions/filters/http/header_to_metadata/config.h"
+#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc
index 9a88da9ee0500..ac4e978ec9b93 100644
--- a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc
+++ b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc
@@ -2,12 +2,11 @@
 
 #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h"
 
-#include "common/common/base64.h"
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/base64.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/http/health_check/config_test.cc b/test/extensions/filters/http/health_check/config_test.cc
index dcf4e37fb0c88..d3e697276fb29 100644
--- a/test/extensions/filters/http/health_check/config_test.cc
+++ b/test/extensions/filters/http/health_check/config_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.h"
 #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h"
 
-#include "extensions/filters/http/health_check/config.h"
+#include "source/extensions/filters/http/health_check/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/health_check/health_check_test.cc b/test/extensions/filters/http/health_check/health_check_test.cc
index 47693910d0cd6..b61685e8d6776 100644
--- a/test/extensions/filters/http/health_check/health_check_test.cc
+++ b/test/extensions/filters/http/health_check/health_check_test.cc
@@ -3,11 +3,10 @@
 
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_utility.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/filters/http/health_check/health_check.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/filters/http/health_check/health_check.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/upstream/cluster_info.h"
diff --git a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc
index d6af41e9a4f25..a19ac094a9a82 100644
--- a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc
+++ b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc
@@ -2,11 +2,10 @@
 
 #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc
index 55a4ed14cc67f..b0f17d751e411 100644
--- a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc
+++ b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "extensions/filters/http/jwt_authn/filter_config.h"
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "test/extensions/filters/http/jwt_authn/mock.h"
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
diff --git a/test/extensions/filters/http/jwt_authn/authenticator_test.cc b/test/extensions/filters/http/jwt_authn/authenticator_test.cc
index 41d7d2253cbd3..f5cbb8a66e327 100644
--- a/test/extensions/filters/http/jwt_authn/authenticator_test.cc
+++ b/test/extensions/filters/http/jwt_authn/authenticator_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/config/core/v3/http_uri.pb.h"
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/http/message_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/common/jwks_fetcher.h"
-#include "extensions/filters/http/jwt_authn/authenticator.h"
-#include "extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/common/jwks_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/authenticator.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
 
 #include "test/extensions/filters/http/common/mock.h"
 #include "test/extensions/filters/http/jwt_authn/mock.h"
diff --git a/test/extensions/filters/http/jwt_authn/extractor_test.cc b/test/extensions/filters/http/jwt_authn/extractor_test.cc
index 849d331f38808..b7dee6776f559 100644
--- a/test/extensions/filters/http/jwt_authn/extractor_test.cc
+++ b/test/extensions/filters/http/jwt_authn/extractor_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/jwt_authn/extractor.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/jwt_authn/extractor.h"
 
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/jwt_authn/filter_config_test.cc b/test/extensions/filters/http/jwt_authn/filter_config_test.cc
index f221bc089f778..c651c932e6db6 100644
--- a/test/extensions/filters/http/jwt_authn/filter_config_test.cc
+++ b/test/extensions/filters/http/jwt_authn/filter_config_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/router/string_accessor_impl.h"
-#include "common/stream_info/filter_state_impl.h"
-
-#include "extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
 
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc
index c9e3a406a1e02..5159fa09af7df 100644
--- a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc
+++ b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h"
 
-#include "extensions/filters/http/jwt_authn/filter_config.h"
-#include "extensions/filters/http/jwt_authn/filter_factory.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/extensions/filters/http/jwt_authn/filter_factory.h"
 
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc
index 0a5792d1c1f76..ccc0b181f87c0 100644
--- a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc
+++ b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc
@@ -2,10 +2,9 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/router/string_accessor_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/router/string_accessor_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
diff --git a/test/extensions/filters/http/jwt_authn/filter_test.cc b/test/extensions/filters/http/jwt_authn/filter_test.cc
index 8983d94aafd2e..d5249b74107f1 100644
--- a/test/extensions/filters/http/jwt_authn/filter_test.cc
+++ b/test/extensions/filters/http/jwt_authn/filter_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "extensions/filters/http/jwt_authn/filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/jwt_authn/filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/http/jwt_authn/mock.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc
index 0ccbe3aac770f..d68164e6ae11a 100644
--- a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc
+++ b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "test/extensions/filters/http/jwt_authn/mock.h"
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
diff --git a/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc b/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc
index 1d21e254d7f94..7973c40f05790 100644
--- a/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc
+++ b/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h"
 
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc
index 6c22ec49a54bc..1c98f2ec7606d 100644
--- a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc
+++ b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc
@@ -3,10 +3,9 @@
 
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/protobuf/utility.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/http/jwt_authn/jwks_cache.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/http/jwt_authn/jwks_cache.h"
 
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/http/jwt_authn/matcher_test.cc b/test/extensions/filters/http/jwt_authn/matcher_test.cc
index a48933e5fbf5e..3718832e80237 100644
--- a/test/extensions/filters/http/jwt_authn/matcher_test.cc
+++ b/test/extensions/filters/http/jwt_authn/matcher_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/jwt_authn/matcher.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/jwt_authn/matcher.h"
 
 #include "test/extensions/filters/http/jwt_authn/mock.h"
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
diff --git a/test/extensions/filters/http/jwt_authn/mock.h b/test/extensions/filters/http/jwt_authn/mock.h
index bf06cd0b2f190..a4924033d4587 100644
--- a/test/extensions/filters/http/jwt_authn/mock.h
+++ b/test/extensions/filters/http/jwt_authn/mock.h
@@ -2,10 +2,9 @@
 
 #include <memory>
 
-#include "common/http/message_impl.h"
-
-#include "extensions/filters/http/jwt_authn/authenticator.h"
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/filters/http/jwt_authn/authenticator.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "test/mocks/upstream/cluster_manager.h"
 
diff --git a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc
index becc7e3daa835..bdf518ea2c7b8 100644
--- a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc
+++ b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h"
 
-#include "extensions/filters/http/jwt_authn/filter_config.h"
-#include "extensions/filters/http/jwt_authn/verifier.h"
+#include "source/extensions/filters/http/jwt_authn/filter_config.h"
+#include "source/extensions/filters/http/jwt_authn/verifier.h"
 
 #include "test/extensions/filters/http/jwt_authn/mock.h"
 #include "test/extensions/filters/http/jwt_authn/test_common.h"
diff --git a/test/extensions/filters/http/kill_request/BUILD b/test/extensions/filters/http/kill_request/BUILD
index 0d724b113f116..624937a925abb 100644
--- a/test/extensions/filters/http/kill_request/BUILD
+++ b/test/extensions/filters/http/kill_request/BUILD
@@ -17,7 +17,7 @@ envoy_extension_cc_test(
     srcs = ["kill_request_filter_test.cc"],
     extension_name = "envoy.filters.http.kill_request",
     deps = [
-        "//include/envoy/http:metadata_interface",
+        "//envoy/http:metadata_interface",
         "//source/common/buffer:buffer_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/kill_request:kill_request_filter_lib",
diff --git a/test/extensions/filters/http/kill_request/kill_request_config_test.cc b/test/extensions/filters/http/kill_request/kill_request_config_test.cc
index f4f6a62aab64e..af20c428f1e9f 100644
--- a/test/extensions/filters/http/kill_request/kill_request_config_test.cc
+++ b/test/extensions/filters/http/kill_request/kill_request_config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "extensions/filters/http/kill_request/kill_request_config.h"
+#include "source/extensions/filters/http/kill_request/kill_request_config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/kill_request/kill_request_filter_test.cc b/test/extensions/filters/http/kill_request/kill_request_filter_test.cc
index 2b9483bdc0256..75044710a7e88 100644
--- a/test/extensions/filters/http/kill_request/kill_request_filter_test.cc
+++ b/test/extensions/filters/http/kill_request/kill_request_filter_test.cc
@@ -2,10 +2,9 @@
 #include "envoy/http/metadata_interface.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/kill_request/kill_request_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/kill_request/kill_request_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/local_ratelimit/config_test.cc b/test/extensions/filters/http/local_ratelimit/config_test.cc
index 55cc18229969f..d10e3963d9987 100644
--- a/test/extensions/filters/http/local_ratelimit/config_test.cc
+++ b/test/extensions/filters/http/local_ratelimit/config_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/http/local_ratelimit/config.h"
-#include "extensions/filters/http/local_ratelimit/local_ratelimit.h"
+#include "source/extensions/filters/http/local_ratelimit/config.h"
+#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h"
 
 #include "test/mocks/server/mocks.h"
 
diff --git a/test/extensions/filters/http/local_ratelimit/filter_test.cc b/test/extensions/filters/http/local_ratelimit/filter_test.cc
index 1614b0520aaa1..939cebf025baf 100644
--- a/test/extensions/filters/http/local_ratelimit/filter_test.cc
+++ b/test/extensions/filters/http/local_ratelimit/filter_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.h"
 
-#include "extensions/filters/http/local_ratelimit/local_ratelimit.h"
+#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/filters/http/lua/config_test.cc b/test/extensions/filters/http/lua/config_test.cc
index c01772b2a2222..7cb6dbd44dbad 100644
--- a/test/extensions/filters/http/lua/config_test.cc
+++ b/test/extensions/filters/http/lua/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.h"
 #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h"
 
-#include "extensions/filters/http/lua/config.h"
+#include "source/extensions/filters/http/lua/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/lua/lua_filter_test.cc b/test/extensions/filters/http/lua/lua_filter_test.cc
index 0471c8745845e..cb7cf9807d7a9 100644
--- a/test/extensions/filters/http/lua/lua_filter_test.cc
+++ b/test/extensions/filters/http/lua/lua_filter_test.cc
@@ -3,11 +3,10 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/message_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/filters/http/lua/lua_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/filters/http/lua/lua_filter.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/lua/lua_integration_test.cc b/test/extensions/filters/http/lua/lua_integration_test.cc
index d7197868d842e..49ba0f0a82758 100644
--- a/test/extensions/filters/http/lua/lua_integration_test.cc
+++ b/test/extensions/filters/http/lua/lua_integration_test.cc
@@ -1,7 +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 "extensions/filters/http/well_known_names.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/lua/wrappers_test.cc b/test/extensions/filters/http/lua/wrappers_test.cc
index 2097b2696452d..ca10e89bf79b9 100644
--- a/test/extensions/filters/http/lua/wrappers_test.cc
+++ b/test/extensions/filters/http/lua/wrappers_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/http/utility.h"
-#include "common/network/address_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/filters/http/lua/wrappers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/filters/http/lua/wrappers.h"
 
 #include "test/extensions/filters/common/lua/lua_wrappers.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/http/oauth2/config_test.cc b/test/extensions/filters/http/oauth2/config_test.cc
index bbe7860802c35..74dfe5daa6c42 100644
--- a/test/extensions/filters/http/oauth2/config_test.cc
+++ b/test/extensions/filters/http/oauth2/config_test.cc
@@ -3,11 +3,10 @@
 
 #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.h"
 
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/secret/secret_provider_impl.h"
-
-#include "extensions/filters/http/oauth2/config.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/secret/secret_provider_impl.h"
+#include "source/extensions/filters/http/oauth2/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/oauth2/filter_test.cc b/test/extensions/filters/http/oauth2/filter_test.cc
index 521d28dff3cb2..9179db9d6686f 100644
--- a/test/extensions/filters/http/oauth2/filter_test.cc
+++ b/test/extensions/filters/http/oauth2/filter_test.cc
@@ -6,13 +6,12 @@
 #include "envoy/http/async_client.h"
 #include "envoy/http/message.h"
 
-#include "common/common/macros.h"
-#include "common/http/message_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/secret/secret_manager_impl.h"
-
-#include "extensions/filters/http/oauth2/filter.h"
+#include "source/common/common/macros.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/secret/secret_manager_impl.h"
+#include "source/extensions/filters/http/oauth2/filter.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/filters/http/oauth2/oauth_integration_test.cc b/test/extensions/filters/http/oauth2/oauth_integration_test.cc
index fe2cc0649334a..34198a73eb15e 100644
--- a/test/extensions/filters/http/oauth2/oauth_integration_test.cc
+++ b/test/extensions/filters/http/oauth2/oauth_integration_test.cc
@@ -1,11 +1,9 @@
-#include "common/crypto/utility.h"
-#include "common/http/utility.h"
-#include "common/protobuf/utility.h"
-
+#include "source/common/crypto/utility.h"
+#include "source/common/http/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/oauth2/filter.h"
 #include "source/extensions/filters/http/oauth2/oauth_response.pb.h"
 
-#include "extensions/filters/http/oauth2/filter.h"
-
 #include "test/integration/http_integration.h"
 
 #include "absl/strings/escaping.h"
diff --git a/test/extensions/filters/http/oauth2/oauth_test.cc b/test/extensions/filters/http/oauth2/oauth_test.cc
index f0a72cdfd4b2d..d7f9a29d443b8 100644
--- a/test/extensions/filters/http/oauth2/oauth_test.cc
+++ b/test/extensions/filters/http/oauth2/oauth_test.cc
@@ -1,11 +1,10 @@
 #include <memory>
 #include <string>
 
-#include "common/http/message_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/oauth2/oauth.h"
-#include "extensions/filters/http/oauth2/oauth_client.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/oauth2/oauth.h"
+#include "source/extensions/filters/http/oauth2/oauth_client.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/filters/http/on_demand/on_demand_filter_test.cc b/test/extensions/filters/http/on_demand/on_demand_filter_test.cc
index d2978064b2d9b..fffb9ea7c7b14 100644
--- a/test/extensions/filters/http/on_demand/on_demand_filter_test.cc
+++ b/test/extensions/filters/http/on_demand/on_demand_filter_test.cc
@@ -1,8 +1,7 @@
 #include <memory>
 
-#include "common/http/header_map_impl.h"
-
-#include "extensions/filters/http/on_demand/on_demand_update.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/filters/http/on_demand/on_demand_update.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/http/original_src/config_test.cc b/test/extensions/filters/http/original_src/config_test.cc
index 1b805e1f6c9e7..6607f387e11a3 100644
--- a/test/extensions/filters/http/original_src/config_test.cc
+++ b/test/extensions/filters/http/original_src/config_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 
-#include "extensions/filters/http/original_src/config.h"
+#include "source/extensions/filters/http/original_src/config.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc
index 4967371847dd8..8830e2d0a1e7f 100644
--- a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc
+++ b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc
@@ -1,9 +1,9 @@
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h"
 
-#include "extensions/filters/http/original_src/config.h"
-#include "extensions/filters/http/original_src/original_src.h"
-#include "extensions/filters/http/original_src/original_src_config_factory.h"
+#include "source/extensions/filters/http/original_src/config.h"
+#include "source/extensions/filters/http/original_src/original_src.h"
+#include "source/extensions/filters/http/original_src/original_src_config_factory.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/http/original_src/original_src_test.cc b/test/extensions/filters/http/original_src/original_src_test.cc
index 3fb9abc51e988..c8b9d1c5c5983 100644
--- a/test/extensions/filters/http/original_src/original_src_test.cc
+++ b/test/extensions/filters/http/original_src/original_src_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h"
 
-#include "common/network/socket_option_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/http/original_src/original_src.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/http/original_src/original_src.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/filters/http/ratelimit/config_test.cc b/test/extensions/filters/http/ratelimit/config_test.cc
index 232dcebf416f4..17d7bfd7db45b 100644
--- a/test/extensions/filters/http/ratelimit/config_test.cc
+++ b/test/extensions/filters/http/ratelimit/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/http/ratelimit/config.h"
+#include "source/extensions/filters/http/ratelimit/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc
index 9acc0ca72cbaa..9fba19f41da66 100644
--- a/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc
+++ b/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc
@@ -1,7 +1,7 @@
 #include <string>
 #include <vector>
 
-#include "extensions/filters/http/ratelimit/ratelimit_headers.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h"
 
 #include "test/extensions/filters/common/ratelimit/utils.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc
index aab0ff2a93e32..c54b35a01d02e 100644
--- a/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc
+++ b/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc
@@ -5,12 +5,11 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/ratelimit/v3/rls.pb.h"
 
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-
-#include "extensions/filters/http/ratelimit/config.h"
-#include "extensions/filters/http/ratelimit/ratelimit_headers.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/extensions/filters/http/ratelimit/config.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/extensions/filters/common/ratelimit/utils.h"
diff --git a/test/extensions/filters/http/ratelimit/ratelimit_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_test.cc
index 1dccd4f065384..0c79a7512cd17 100644
--- a/test/extensions/filters/http/ratelimit/ratelimit_test.cc
+++ b/test/extensions/filters/http/ratelimit/ratelimit_test.cc
@@ -4,13 +4,12 @@
 
 #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/http/context_impl.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/http/ratelimit/ratelimit.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/http/ratelimit/ratelimit.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/common/ratelimit/mocks.h"
 #include "test/extensions/filters/common/ratelimit/utils.h"
diff --git a/test/extensions/filters/http/rbac/config_test.cc b/test/extensions/filters/http/rbac/config_test.cc
index 318a6e2f10334..8871521627f5c 100644
--- a/test/extensions/filters/http/rbac/config_test.cc
+++ b/test/extensions/filters/http/rbac/config_test.cc
@@ -2,8 +2,8 @@
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h"
 
-#include "extensions/filters/common/rbac/engine.h"
-#include "extensions/filters/http/rbac/config.h"
+#include "source/extensions/filters/common/rbac/engine.h"
+#include "source/extensions/filters/http/rbac/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/rbac/mocks.h b/test/extensions/filters/http/rbac/mocks.h
index f888cd06e4f02..7932a02fea4dc 100644
--- a/test/extensions/filters/http/rbac/mocks.h
+++ b/test/extensions/filters/http/rbac/mocks.h
@@ -2,8 +2,8 @@
 
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 
-#include "extensions/filters/common/rbac/utility.h"
-#include "extensions/filters/http/rbac/rbac_filter.h"
+#include "source/extensions/filters/common/rbac/utility.h"
+#include "source/extensions/filters/http/rbac/rbac_filter.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc
index 0913b37ba4cbc..248764e2138bc 100644
--- a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc
+++ b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/integration/http_protocol_integration.h"
 
diff --git a/test/extensions/filters/http/rbac/rbac_filter_test.cc b/test/extensions/filters/http/rbac/rbac_filter_test.cc
index dbc99bce28391..286b8bc7826ea 100644
--- a/test/extensions/filters/http/rbac/rbac_filter_test.cc
+++ b/test/extensions/filters/http/rbac/rbac_filter_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/config/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h"
 
-#include "common/config/metadata.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/rbac/utility.h"
-#include "extensions/filters/http/rbac/rbac_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/config/metadata.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/rbac/utility.h"
+#include "source/extensions/filters/http/rbac/rbac_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/extensions/filters/common/rbac/mocks.h"
 #include "test/extensions/filters/http/rbac/mocks.h"
diff --git a/test/extensions/filters/http/router/auto_sni_integration_test.cc b/test/extensions/filters/http/router/auto_sni_integration_test.cc
index 6515e1aff0007..25328614681fe 100644
--- a/test/extensions/filters/http/router/auto_sni_integration_test.cc
+++ b/test/extensions/filters/http/router/auto_sni_integration_test.cc
@@ -5,8 +5,8 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/integration/http_integration.h"
 
diff --git a/test/extensions/filters/http/router/config_test.cc b/test/extensions/filters/http/router/config_test.cc
index 6b6aaeca8d7c8..af752c3192d4f 100644
--- a/test/extensions/filters/http/router/config_test.cc
+++ b/test/extensions/filters/http/router/config_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/router/config.h"
+#include "source/extensions/filters/http/router/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/set_metadata/config_test.cc b/test/extensions/filters/http/set_metadata/config_test.cc
index f702cabd708b4..11cc4ba63bb47 100644
--- a/test/extensions/filters/http/set_metadata/config_test.cc
+++ b/test/extensions/filters/http/set_metadata/config_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h"
 #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h"
 
-#include "extensions/filters/http/set_metadata/config.h"
-#include "extensions/filters/http/set_metadata/set_metadata_filter.h"
+#include "source/extensions/filters/http/set_metadata/config.h"
+#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc b/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc
index ad644a71e419b..cbe351e458a5f 100644
--- a/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc
+++ b/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc
@@ -1,9 +1,8 @@
 #include <memory>
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/set_metadata/set_metadata_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/http/squash/BUILD b/test/extensions/filters/http/squash/BUILD
index b3930a3e2bfb0..93034042f372e 100644
--- a/test/extensions/filters/http/squash/BUILD
+++ b/test/extensions/filters/http/squash/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["squash_filter_test.cc"],
     extension_name = "envoy.filters.http.squash",
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/common/http:header_map_lib",
         "//source/common/stats:stats_lib",
         "//source/extensions/filters/http/squash:squash_filter_lib",
diff --git a/test/extensions/filters/http/squash/config_test.cc b/test/extensions/filters/http/squash/config_test.cc
index 814421f72cbe5..8964bb665308c 100644
--- a/test/extensions/filters/http/squash/config_test.cc
+++ b/test/extensions/filters/http/squash/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h"
 
-#include "extensions/filters/http/squash/config.h"
+#include "source/extensions/filters/http/squash/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/http/squash/squash_filter_integration_test.cc b/test/extensions/filters/http/squash/squash_filter_integration_test.cc
index 06c87e4e5e314..83f10a7069c66 100644
--- a/test/extensions/filters/http/squash/squash_filter_integration_test.cc
+++ b/test/extensions/filters/http/squash/squash_filter_integration_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/filters/http/squash/squash_filter_test.cc b/test/extensions/filters/http/squash/squash_filter_test.cc
index 260ba53ca2a14..be5d8d852bfe3 100644
--- a/test/extensions/filters/http/squash/squash_filter_test.cc
+++ b/test/extensions/filters/http/squash/squash_filter_test.cc
@@ -5,10 +5,9 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/extensions/filters/http/squash/v3/squash.pb.h"
 
-#include "common/http/message_impl.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/http/squash/squash_filter.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/http/squash/squash_filter.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/upstream/cluster_manager.h"
diff --git a/test/extensions/filters/http/tap/common.h b/test/extensions/filters/http/tap/common.h
index babcf8282df43..cef4d148677db 100644
--- a/test/extensions/filters/http/tap/common.h
+++ b/test/extensions/filters/http/tap/common.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "extensions/filters/http/tap/tap_config.h"
+#include "source/extensions/filters/http/tap/tap_config.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/extensions/filters/http/tap/tap_config_impl_test.cc b/test/extensions/filters/http/tap/tap_config_impl_test.cc
index 4e3763e9520e0..7f6d813c158d3 100644
--- a/test/extensions/filters/http/tap/tap_config_impl_test.cc
+++ b/test/extensions/filters/http/tap/tap_config_impl_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/http/tap/tap_config_impl.h"
+#include "source/extensions/filters/http/tap/tap_config_impl.h"
 
 #include "test/extensions/common/tap/common.h"
 #include "test/extensions/filters/http/tap/common.h"
diff --git a/test/extensions/filters/http/tap/tap_filter_test.cc b/test/extensions/filters/http/tap/tap_filter_test.cc
index 7ed0f1afb77fe..06ca5fcbff38b 100644
--- a/test/extensions/filters/http/tap/tap_filter_test.cc
+++ b/test/extensions/filters/http/tap/tap_filter_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/http/tap/config.h"
-#include "extensions/filters/http/tap/tap_filter.h"
+#include "source/extensions/filters/http/tap/config.h"
+#include "source/extensions/filters/http/tap/tap_filter.h"
 
 #include "test/extensions/filters/http/tap/common.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/wasm/config_test.cc b/test/extensions/filters/http/wasm/config_test.cc
index 35be66bca4743..346b2ebac2930 100644
--- a/test/extensions/filters/http/wasm/config_test.cc
+++ b/test/extensions/filters/http/wasm/config_test.cc
@@ -2,14 +2,13 @@
 
 #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h"
 
-#include "common/common/base64.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-#include "common/http/message_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/http/wasm/config.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/http/wasm/config.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc
index bdaf73f7f5654..9d16ab30a81e3 100644
--- a/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc
index 27d0e0626ff43..b93d60b7a0c22 100644
--- a/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc
index 7aa7c7d687a2e..7c861dbc9f924 100644
--- a/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_cpp.cc
index 69f19e2c8b53d..f049ee8bc6b69 100644
--- a/test/extensions/filters/http/wasm/test_data/test_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_cpp.cc
@@ -9,7 +9,7 @@
 #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
 #include "source/extensions/common/wasm/ext/declare_property.pb.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #include "absl/base/casts.h"
 #endif
 
diff --git a/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc
index 1c85aaf6592a1..e80830f05c256 100644
--- a/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc
index 30d85abc4a2dc..e0ebbe048ca2d 100644
--- a/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc
index 44fa5e19f9892..bd32bb4691d82 100644
--- a/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc
index f557eb143859c..2ce27d3398404 100644
--- a/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc
index 6ecf802903d9b..d3b9e51fe8d31 100644
--- a/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc
index 454932b9f556b..e6b61cc79c861 100644
--- a/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc
+++ b/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc
@@ -6,7 +6,7 @@
 #ifndef NULL_PLUGIN
 #include "proxy_wasm_intrinsics_lite.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(HttpWasmTestCpp)
diff --git a/test/extensions/filters/http/wasm/wasm_filter_test.cc b/test/extensions/filters/http/wasm/wasm_filter_test.cc
index 57c62919f32b9..eb27bc111d040 100644
--- a/test/extensions/filters/http/wasm/wasm_filter_test.cc
+++ b/test/extensions/filters/http/wasm/wasm_filter_test.cc
@@ -1,6 +1,5 @@
-#include "common/http/message_impl.h"
-
-#include "extensions/filters/http/wasm/wasm_filter.h"
+#include "source/common/http/message_impl.h"
+#include "source/extensions/filters/http/wasm/wasm_filter.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/network/connection.h"
diff --git a/test/extensions/filters/listener/common/fuzz/BUILD b/test/extensions/filters/listener/common/fuzz/BUILD
index 556c46b372950..760575dbe87fa 100644
--- a/test/extensions/filters/listener/common/fuzz/BUILD
+++ b/test/extensions/filters/listener/common/fuzz/BUILD
@@ -22,7 +22,7 @@ envoy_cc_test_library(
     deps = [
         ":listener_filter_fakes",
         ":listener_filter_fuzzer_proto_cc_proto",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:filter_interface",
         "//test/mocks/network:network_mocks",
         "//test/test_common:threadsafe_singleton_injector_lib",
     ],
diff --git a/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h b/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h
index 94df5757a3c00..602202240eb36 100644
--- a/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h
+++ b/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/io_socket_handle_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc
index 97e76d527d958..5db28f3b92760 100644
--- a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc
+++ b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/listener/http_inspector/http_inspector.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/extensions/filters/listener/http_inspector/http_inspector.h"
+#include "source/extensions/filters/listener/well_known_names.h"
 
 #include "test/mocks/server/listener_factory_context.h"
 
diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc
index bf581af093f4f..624475651551d 100644
--- a/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc
+++ b/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/http_inspector/http_inspector.h"
+#include "source/extensions/filters/listener/http_inspector/http_inspector.h"
 
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h"
diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_test.cc
index d0216ef9a71bc..8499c8e3428d4 100644
--- a/test/extensions/filters/listener/http_inspector/http_inspector_test.cc
+++ b/test/extensions/filters/listener/http_inspector/http_inspector_test.cc
@@ -1,8 +1,7 @@
-#include "common/common/hex.h"
-#include "common/http/utility.h"
-#include "common/network/io_socket_handle_impl.h"
-
-#include "extensions/filters/listener/http_inspector/http_inspector.h"
+#include "source/common/common/hex.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/extensions/filters/listener/http_inspector/http_inspector.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
index 820310876c589..49ccc85a71e3a 100644
--- a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
+++ b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/original_dst/original_dst.h"
+#include "source/extensions/filters/listener/original_dst/original_dst.h"
 
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h"
diff --git a/test/extensions/filters/listener/original_src/config_test.cc b/test/extensions/filters/listener/original_src/config_test.cc
index 30c7e74c98f0d..6c0bd7563c6cb 100644
--- a/test/extensions/filters/listener/original_src/config_test.cc
+++ b/test/extensions/filters/listener/original_src/config_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h"
 
-#include "extensions/filters/listener/original_src/config.h"
+#include "source/extensions/filters/listener/original_src/config.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc
index eac36949aa96d..a2febfc6f7f3d 100644
--- a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc
+++ b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/listener/original_src/config.h"
-#include "extensions/filters/listener/original_src/original_src.h"
-#include "extensions/filters/listener/original_src/original_src_config_factory.h"
+#include "source/extensions/filters/listener/original_src/config.h"
+#include "source/extensions/filters/listener/original_src/original_src.h"
+#include "source/extensions/filters/listener/original_src/original_src_config_factory.h"
 
 #include "test/mocks/server/listener_factory_context.h"
 
diff --git a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
index 4e1ec600aa883..2e3c8dc5a646a 100644
--- a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
+++ b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/original_src/original_src.h"
+#include "source/extensions/filters/listener/original_src/original_src.h"
 
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/original_src/original_src_fuzz_test.pb.validate.h"
diff --git a/test/extensions/filters/listener/original_src/original_src_test.cc b/test/extensions/filters/listener/original_src/original_src_test.cc
index 212d16331aa3c..ede0069b8876e 100644
--- a/test/extensions/filters/listener/original_src/original_src_test.cc
+++ b/test/extensions/filters/listener/original_src/original_src_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h"
 
-#include "common/network/socket_option_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/listener/original_src/original_src.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/listener/original_src/original_src.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc
index 8129d8fb8721e..4e0cbced1409c 100644
--- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc
+++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
 
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.pb.validate.h"
diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc
index 2ab7186e8b163..d85d973b94de7 100644
--- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc
+++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc
@@ -6,19 +6,17 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/tcp_listener_impl.h"
-#include "common/network/utility.h"
-
-#include "server/connection_handler_impl.h"
-
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
-#include "extensions/filters/listener/well_known_names.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/tcp_listener_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/extensions/filters/listener/well_known_names.h"
+#include "source/server/connection_handler_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc
index 00f1e37aa50c8..15426aa9aff58 100644
--- a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc
+++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc
@@ -1,11 +1,10 @@
 #include <vector>
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/http/utility.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
-
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
 
 #include "test/extensions/filters/listener/tls_inspector/tls_utility.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc
index 8b801582d7256..fc4b4f1ae2620 100644
--- a/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc
+++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
 
 #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h"
 #include "test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.pb.validate.h"
diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc
index 82f9d48112668..6e119c87dcd92 100644
--- a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc
+++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc
@@ -1,7 +1,6 @@
-#include "common/http/utility.h"
-#include "common/network/io_socket_handle_impl.h"
-
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
 
 #include "test/extensions/filters/listener/tls_inspector/tls_utility.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/extensions/filters/listener/tls_inspector/tls_utility.cc b/test/extensions/filters/listener/tls_inspector/tls_utility.cc
index 70ed11b1f48cd..c3777c479fdf2 100644
--- a/test/extensions/filters/listener/tls_inspector/tls_utility.cc
+++ b/test/extensions/filters/listener/tls_inspector/tls_utility.cc
@@ -1,6 +1,6 @@
 #include "test/extensions/filters/listener/tls_inspector/tls_utility.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "openssl/ssl.h"
 
diff --git a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc
index 7bb1cda809942..bad7675a9e2c3 100644
--- a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc
+++ b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc
@@ -5,10 +5,9 @@
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h"
 #include "envoy/runtime/runtime.h"
 
-#include "common/http/message_impl.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/network/client_ssl_auth/config_test.cc b/test/extensions/filters/network/client_ssl_auth/config_test.cc
index b7c3d9fa5cc74..7c03c47be47b0 100644
--- a/test/extensions/filters/network/client_ssl_auth/config_test.cc
+++ b/test/extensions/filters/network/client_ssl_auth/config_test.cc
@@ -2,10 +2,9 @@
 #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/client_ssl_auth/config.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/client_ssl_auth/config.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc b/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc
index 2582fe207c09f..03d6ba34f76c3 100644
--- a/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc
+++ b/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc
@@ -1,7 +1,6 @@
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/config/utility.h"
 #include "test/extensions/filters/network/common/fuzz/network_readfilter_fuzz.pb.validate.h"
diff --git a/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc b/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc
index c2f203091707a..e7eb67c58ebb4 100644
--- a/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc
+++ b/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc
@@ -1,7 +1,6 @@
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/config/utility.h"
 #include "test/extensions/filters/network/common/fuzz/network_writefilter_fuzz.pb.validate.h"
diff --git a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc
index e1b845312e554..2fa4d315176d1 100644
--- a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc
+++ b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc
@@ -2,9 +2,9 @@
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 
-#include "extensions/filters/common/ratelimit/ratelimit_impl.h"
-#include "extensions/filters/network/common/utility.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h"
+#include "source/extensions/filters/network/common/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/common/ext_authz/test_common.h"
 #include "test/extensions/filters/network/common/fuzz/uber_readfilter.h"
diff --git a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc
index 911caa250c522..350673901bfef 100644
--- a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc
+++ b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/network/common/utility.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/network/common/fuzz/uber_writefilter.h"
 
diff --git a/test/extensions/filters/network/common/fuzz/uber_readfilter.cc b/test/extensions/filters/network/common/fuzz/uber_readfilter.cc
index 4d126b8d1cdc7..2179484abcda6 100644
--- a/test/extensions/filters/network/common/fuzz/uber_readfilter.cc
+++ b/test/extensions/filters/network/common/fuzz/uber_readfilter.cc
@@ -1,8 +1,8 @@
 #include "test/extensions/filters/network/common/fuzz/uber_readfilter.h"
 
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
-#include "common/network/address_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/network/address_impl.h"
 
 using testing::Return;
 
diff --git a/test/extensions/filters/network/common/fuzz/uber_readfilter.h b/test/extensions/filters/network/common/fuzz/uber_readfilter.h
index 62415490aa5fc..eee06955fce8e 100644
--- a/test/extensions/filters/network/common/fuzz/uber_readfilter.h
+++ b/test/extensions/filters/network/common/fuzz/uber_readfilter.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/filter.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/extensions/filters/network/common/fuzz/network_readfilter_fuzz.pb.validate.h"
 #include "test/extensions/filters/network/common/fuzz/utils/fakes.h"
diff --git a/test/extensions/filters/network/common/fuzz/uber_writefilter.cc b/test/extensions/filters/network/common/fuzz/uber_writefilter.cc
index b1c99c4fd8465..da4979656e822 100644
--- a/test/extensions/filters/network/common/fuzz/uber_writefilter.cc
+++ b/test/extensions/filters/network/common/fuzz/uber_writefilter.cc
@@ -1,7 +1,7 @@
 #include "test/extensions/filters/network/common/fuzz/uber_writefilter.h"
 
-#include "common/config/utility.h"
-#include "common/config/version_converter.h"
+#include "source/common/config/utility.h"
+#include "source/common/config/version_converter.h"
 
 using testing::_;
 using testing::Return;
diff --git a/test/extensions/filters/network/common/fuzz/uber_writefilter.h b/test/extensions/filters/network/common/fuzz/uber_writefilter.h
index 135d3e7d23f53..788e7858cbd53 100644
--- a/test/extensions/filters/network/common/fuzz/uber_writefilter.h
+++ b/test/extensions/filters/network/common/fuzz/uber_writefilter.h
@@ -2,7 +2,7 @@
 
 #include "envoy/network/filter.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/extensions/filters/network/common/fuzz/network_writefilter_fuzz.pb.validate.h"
 #include "test/extensions/filters/network/common/fuzz/utils/fakes.h"
diff --git a/test/extensions/filters/network/common/redis/client_impl_test.cc b/test/extensions/filters/network/common/redis/client_impl_test.cc
index 953aa9374fbd5..8096c08cc7f03 100644
--- a/test/extensions/filters/network/common/redis/client_impl_test.cc
+++ b/test/extensions/filters/network/common/redis/client_impl_test.cc
@@ -2,12 +2,11 @@
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/extensions/filters/network/common/redis/test_utils.h"
diff --git a/test/extensions/filters/network/common/redis/codec_impl_test.cc b/test/extensions/filters/network/common/redis/codec_impl_test.cc
index f1a919380cd5f..7d5097db8858b 100644
--- a/test/extensions/filters/network/common/redis/codec_impl_test.cc
+++ b/test/extensions/filters/network/common/redis/codec_impl_test.cc
@@ -1,9 +1,8 @@
 #include <vector>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-
-#include "extensions/filters/network/common/redis/codec_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/common/redis/fault_test.cc b/test/extensions/filters/network/common/redis/fault_test.cc
index a80caf5c2d2a3..da80a05d7a9f5 100644
--- a/test/extensions/filters/network/common/redis/fault_test.cc
+++ b/test/extensions/filters/network/common/redis/fault_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/random_generator.h"
 
-#include "common/common/assert.h"
-
-#include "extensions/filters/network/common/redis/fault_impl.h"
+#include "source/common/common/assert.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/filters/network/common/redis/mocks.cc b/test/extensions/filters/network/common/redis/mocks.cc
index 0def373cffade..419137b413ebe 100644
--- a/test/extensions/filters/network/common/redis/mocks.cc
+++ b/test/extensions/filters/network/common/redis/mocks.cc
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/common/redis/mocks.h b/test/extensions/filters/network/common/redis/mocks.h
index 4f8f11bdaa4b5..e79464e5baef9 100644
--- a/test/extensions/filters/network/common/redis/mocks.h
+++ b/test/extensions/filters/network/common/redis/mocks.h
@@ -4,8 +4,8 @@
 #include <list>
 #include <string>
 
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/codec_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/extensions/filters/network/common/redis/test_utils.h b/test/extensions/filters/network/common/redis/test_utils.h
index 7afb3a214bdc4..6d18e9dfb9719 100644
--- a/test/extensions/filters/network/common/redis/test_utils.h
+++ b/test/extensions/filters/network/common/redis/test_utils.h
@@ -6,7 +6,7 @@
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/common/utility_test.cc b/test/extensions/filters/network/common/utility_test.cc
index cf9cd19868099..05c6e9d815a7f 100644
--- a/test/extensions/filters/network/common/utility_test.cc
+++ b/test/extensions/filters/network/common/utility_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/network/common/utility.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/common/utility.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/direct_response/direct_response_test.cc b/test/extensions/filters/network/direct_response/direct_response_test.cc
index f6d92d4e03526..061e39d25920c 100644
--- a/test/extensions/filters/network/direct_response/direct_response_test.cc
+++ b/test/extensions/filters/network/direct_response/direct_response_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/network/direct_response/v3/config.pb.validate.h"
 
-#include "extensions/filters/network/direct_response/filter.h"
+#include "source/extensions/filters/network/direct_response/filter.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc b/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc
index 49403617d9f91..94ec6b6acceec 100644
--- a/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc
@@ -1,10 +1,10 @@
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 
diff --git a/test/extensions/filters/network/dubbo_proxy/config_test.cc b/test/extensions/filters/network/dubbo_proxy/config_test.cc
index d98fe3feef351..ef59a8fb49c1a 100644
--- a/test/extensions/filters/network/dubbo_proxy/config_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h"
 
-#include "extensions/filters/network/dubbo_proxy/config.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter_config.h"
+#include "source/extensions/filters/network/dubbo_proxy/config.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter_config.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc b/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc
index 44240f4c48845..1c0e9b10e3723 100644
--- a/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc
@@ -1,14 +1,13 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/config.h"
-#include "extensions/filters/network/dubbo_proxy/conn_manager.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/config.h"
+#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/decoder_test.cc b/test/extensions/filters/network/dubbo_proxy/decoder_test.cc
index c18cb691c9ebc..396cc35188cc7 100644
--- a/test/extensions/filters/network/dubbo_proxy/decoder_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/decoder_test.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/dubbo_proxy/decoder.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/extensions/filters/network/dubbo_proxy/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc
index 19113bba6b5b2..142d5400e2dd3 100644
--- a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc
@@ -1,6 +1,6 @@
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/extensions/filters/network/dubbo_proxy/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc
index 2501f0adfabac..9f57e392df534 100644
--- a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/extensions/filters/network/dubbo_proxy/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc b/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc
index 1313da2da0669..30fc8a976a50a 100644
--- a/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h"
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 
diff --git a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc
index daf167ef1deac..e291687293dc1 100644
--- a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/common/exception.h"
 
-#include "extensions/filters/network/dubbo_proxy/hessian_utils.h"
+#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc
index 82767f6cb8db4..24c4feaa5e20f 100644
--- a/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/metadata_test.cc b/test/extensions/filters/network/dubbo_proxy/metadata_test.cc
index c014b7ff5611c..bd2e2acc56d8b 100644
--- a/test/extensions/filters/network/dubbo_proxy/metadata_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/metadata_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/metadata.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/metadata.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/dubbo_proxy/mocks.cc b/test/extensions/filters/network/dubbo_proxy/mocks.cc
index 4cd21e654dc9f..f42a21a3ee129 100644
--- a/test/extensions/filters/network/dubbo_proxy/mocks.cc
+++ b/test/extensions/filters/network/dubbo_proxy/mocks.cc
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/dubbo_proxy/mocks.h b/test/extensions/filters/network/dubbo_proxy/mocks.h
index fa741daa20932..cee1ae8aa0bbe 100644
--- a/test/extensions/filters/network/dubbo_proxy/mocks.h
+++ b/test/extensions/filters/network/dubbo_proxy/mocks.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/dubbo_proxy/decoder.h"
-#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
-#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h"
-#include "extensions/filters/network/dubbo_proxy/filters/filter.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/router/router.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder.h"
+#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc
index 31a4ef785cee5..a523468d69a2e 100644
--- a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.validate.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc
index 6f9c65ffb4290..38bdbac682682 100644
--- a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h"
 #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h"
 
-#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
-#include "extensions/filters/network/dubbo_proxy/router/config.h"
+#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/config.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/router_test.cc b/test/extensions/filters/network/dubbo_proxy/router_test.cc
index 2cce1608f030a..81d1f37280d4e 100644
--- a/test/extensions/filters/network/dubbo_proxy/router_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/router_test.cc
@@ -1,10 +1,10 @@
 #include <memory>
 
-#include "extensions/filters/network/dubbo_proxy/app_exception.h"
-#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
-#include "extensions/filters/network/dubbo_proxy/message_impl.h"
-#include "extensions/filters/network/dubbo_proxy/protocol.h"
-#include "extensions/filters/network/dubbo_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/app_exception.h"
+#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/message_impl.h"
+#include "source/extensions/filters/network/dubbo_proxy/protocol.h"
+#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h"
 
 #include "test/extensions/filters/network/dubbo_proxy/mocks.h"
 #include "test/extensions/filters/network/dubbo_proxy/utility.h"
diff --git a/test/extensions/filters/network/dubbo_proxy/utility.h b/test/extensions/filters/network/dubbo_proxy/utility.h
index 5005a44af2cca..302266a06935f 100644
--- a/test/extensions/filters/network/dubbo_proxy/utility.h
+++ b/test/extensions/filters/network/dubbo_proxy/utility.h
@@ -2,8 +2,8 @@
 
 #include <initializer_list>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/byte_order.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/byte_order.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/ext_authz/config_test.cc b/test/extensions/filters/network/ext_authz/config_test.cc
index 9cdb483aa7ac4..5960ec93088bf 100644
--- a/test/extensions/filters/network/ext_authz/config_test.cc
+++ b/test/extensions/filters/network/ext_authz/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h"
 #include "envoy/stats/scope.h"
 
-#include "extensions/filters/network/ext_authz/config.h"
+#include "source/extensions/filters/network/ext_authz/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc
index 5760a2d4805c6..93f55a7f85b29 100644
--- a/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc
+++ b/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/network/ext_authz/ext_authz.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/network/ext_authz/ext_authz.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/extensions/filters/network/ext_authz/ext_authz_fuzz.pb.validate.h"
diff --git a/test/extensions/filters/network/ext_authz/ext_authz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_test.cc
index 053d84d3c04a2..b3b30010f320b 100644
--- a/test/extensions/filters/network/ext_authz/ext_authz_test.cc
+++ b/test/extensions/filters/network/ext_authz/ext_authz_test.cc
@@ -6,13 +6,12 @@
 #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h"
 #include "envoy/stats/stats.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/ext_authz/ext_authz.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/ext_authz/ext_authz.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/common/ext_authz/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc
index 4764d75b92280..3c0e659844a28 100644
--- a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc
+++ b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
 
 #include "test/extensions/filters/network/http_connection_manager/config_test_base.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc
index e9bc5386ede34..e3bc4a6b5f63c 100644
--- a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc
+++ b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/filters/common/dependency/v3/dependency.pb.h"
 
-#include "extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
 
 #include "test/extensions/filters/network/http_connection_manager/config_test_base.h"
 #include "test/mocks/config/mocks.h"
diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc
index 6137c357640e7..2477db6bf4fc2 100644
--- a/test/extensions/filters/network/http_connection_manager/config_test.cc
+++ b/test/extensions/filters/network/http_connection_manager/config_test.cc
@@ -7,10 +7,9 @@
 #include "envoy/server/request_id_extension_config.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/network/http_connection_manager/config.h"
-#include "extensions/request_id/uuid/config.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "test/extensions/filters/network/http_connection_manager/config.pb.h"
 #include "test/extensions/filters/network/http_connection_manager/config.pb.validate.h"
diff --git a/test/extensions/filters/network/http_connection_manager/config_test_base.h b/test/extensions/filters/network/http_connection_manager/config_test_base.h
index a4554a42d6703..1737bd1622531 100644
--- a/test/extensions/filters/network/http_connection_manager/config_test_base.h
+++ b/test/extensions/filters/network/http_connection_manager/config_test_base.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include "common/filter/http/filter_config_discovery_impl.h"
-#include "common/http/date_provider_impl.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
-#include "extensions/filters/network/http_connection_manager/config.h"
+#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/http/date_provider_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
 
 #include "test/extensions/filters/network/http_connection_manager/config.pb.h"
 #include "test/extensions/filters/network/http_connection_manager/config.pb.validate.h"
diff --git a/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc b/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc
index f1b6275227418..a4404666356a1 100644
--- a/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc
+++ b/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/http_connection_manager/dependency_manager.h"
+#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/broker/BUILD b/test/extensions/filters/network/kafka/broker/BUILD
index cc64251e3f593..f6f4fae2df47c 100644
--- a/test/extensions/filters/network/kafka/broker/BUILD
+++ b/test/extensions/filters/network/kafka/broker/BUILD
@@ -26,7 +26,7 @@ envoy_extension_cc_test(
     srcs = ["filter_unit_test.cc"],
     extension_name = "envoy.filters.network.kafka_broker",
     deps = [
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:timer_interface",
         "//source/extensions/filters/network/kafka:kafka_broker_filter_lib",
         "//test/mocks/network:network_mocks",
         "//test/mocks/stats:stats_mocks",
diff --git a/test/extensions/filters/network/kafka/broker/config_unit_test.cc b/test/extensions/filters/network/kafka/broker/config_unit_test.cc
index e464acad0b960..4d447883174e7 100644
--- a/test/extensions/filters/network/kafka/broker/config_unit_test.cc
+++ b/test/extensions/filters/network/kafka/broker/config_unit_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/broker/config.h"
+#include "source/extensions/filters/network/kafka/broker/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc b/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc
index 2c0606ae91e9f..17ef7a3f084a2 100644
--- a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc
+++ b/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc
@@ -3,12 +3,11 @@
  * messages properly.
  */
 
-#include "common/common/utility.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/kafka/broker/filter.h"
-#include "extensions/filters/network/kafka/external/requests.h"
-#include "extensions/filters/network/kafka/external/responses.h"
+#include "source/common/common/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/kafka/broker/filter.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/external/responses.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
diff --git a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
index 0555fe75f625e..d62ca8a68700a 100644
--- a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
+++ b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/event/timer.h"
 
-#include "extensions/filters/network/kafka/broker/filter.h"
-#include "extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/broker/filter.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/extensions/filters/network/kafka/buffer_based_test.h b/test/extensions/filters/network/kafka/buffer_based_test.h
index 612f484df5bae..a762fb3a9ec74 100644
--- a/test/extensions/filters/network/kafka/buffer_based_test.h
+++ b/test/extensions/filters/network/kafka/buffer_based_test.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/kafka/serialization.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/string_view.h"
diff --git a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
index cb20b878098f6..deeb6309bea91 100644
--- a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
+++ b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/kafka_request_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
index b905fc326f449..17615be344ff8 100644
--- a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
+++ b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/kafka_response_parser.h"
+#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/message_utilities.h b/test/extensions/filters/network/kafka/message_utilities.h
index 4aabb18d1dba8..6fc0e1728b21e 100644
--- a/test/extensions/filters/network/kafka/message_utilities.h
+++ b/test/extensions/filters/network/kafka/message_utilities.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "extensions/filters/network/kafka/kafka_request.h"
-#include "extensions/filters/network/kafka/kafka_response.h"
+#include "source/extensions/filters/network/kafka/kafka_request.h"
+#include "source/extensions/filters/network/kafka/kafka_response.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/metrics_integration_test.cc b/test/extensions/filters/network/kafka/metrics_integration_test.cc
index 252644485c994..84a331a76003f 100644
--- a/test/extensions/filters/network/kafka/metrics_integration_test.cc
+++ b/test/extensions/filters/network/kafka/metrics_integration_test.cc
@@ -1,5 +1,5 @@
-#include "extensions/filters/network/kafka/external/request_metrics.h"
-#include "extensions/filters/network/kafka/external/response_metrics.h"
+#include "source/extensions/filters/network/kafka/external/request_metrics.h"
+#include "source/extensions/filters/network/kafka/external/response_metrics.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/extensions/filters/network/kafka/message_utilities.h"
diff --git a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
index 4c29ff3730766..99b32400be79a 100644
--- a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
@@ -9,8 +9,8 @@
   - capture messages received in callback,
   - verify that captured messages are identical to the ones sent.
 #}
-#include "extensions/filters/network/kafka/external/requests.h"
-#include "extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 b/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2
index f43926d575870..90a3ab46c8947 100644
--- a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2
@@ -5,7 +5,7 @@
 
 #include "test/extensions/filters/network/kafka/message_utilities.h"
 
-#include "extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
index ec96a4d90047c..4157eec181d24 100644
--- a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
@@ -3,8 +3,8 @@
   For every request, we want to check if it can be serialized and deserialized properly.
 #}
 
-#include "extensions/filters/network/kafka/external/requests.h"
-#include "extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/external/requests.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
index f366452cf19f6..d03e40e2b8537 100644
--- a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
@@ -9,8 +9,8 @@
   - capture messages received in callback,
   - verify that captured messages are identical to the ones sent.
 #}
-#include "extensions/filters/network/kafka/external/responses.h"
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 b/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2
index 783299f9f95b2..af412270c1858 100644
--- a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2
@@ -5,7 +5,7 @@
 
 #include "test/extensions/filters/network/kafka/message_utilities.h"
 
-#include "extensions/filters/network/kafka/external/responses.h"
+#include "source/extensions/filters/network/kafka/external/responses.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
index 84fff592eb344..cf5d552721acf 100644
--- a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
+++ b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
@@ -3,8 +3,8 @@
   For every response, we want to check if it can be serialized and deserialized properly.
 #}
 
-#include "extensions/filters/network/kafka/external/responses.h"
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 
diff --git a/test/extensions/filters/network/kafka/request_codec_integration_test.cc b/test/extensions/filters/network/kafka/request_codec_integration_test.cc
index 8a7ae9b7a7a36..ceb475b450630 100644
--- a/test/extensions/filters/network/kafka/request_codec_integration_test.cc
+++ b/test/extensions/filters/network/kafka/request_codec_integration_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/request_codec_unit_test.cc b/test/extensions/filters/network/kafka/request_codec_unit_test.cc
index 9d9c0734262f5..0e6ad23ce5f06 100644
--- a/test/extensions/filters/network/kafka/request_codec_unit_test.cc
+++ b/test/extensions/filters/network/kafka/request_codec_unit_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/request_codec.h"
+#include "source/extensions/filters/network/kafka/request_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 
diff --git a/test/extensions/filters/network/kafka/response_codec_integration_test.cc b/test/extensions/filters/network/kafka/response_codec_integration_test.cc
index 287ba9f1855a7..191d738297f2b 100644
--- a/test/extensions/filters/network/kafka/response_codec_integration_test.cc
+++ b/test/extensions/filters/network/kafka/response_codec_integration_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
diff --git a/test/extensions/filters/network/kafka/response_codec_unit_test.cc b/test/extensions/filters/network/kafka/response_codec_unit_test.cc
index 07dc116aab068..d05f42e9a9a25 100644
--- a/test/extensions/filters/network/kafka/response_codec_unit_test.cc
+++ b/test/extensions/filters/network/kafka/response_codec_unit_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/response_codec.h"
+#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "test/extensions/filters/network/kafka/buffer_based_test.h"
 
diff --git a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 b/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2
index 84a27de86c3d9..884f5dcfd81c7 100644
--- a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2
+++ b/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2
@@ -5,7 +5,7 @@
   Covers the corner case of 0 delegates, and then uses templating to create tests for 1..N cases.
 #}
 
-#include "extensions/filters/network/kafka/external/serialization_composite.h"
+#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
 
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
 
diff --git a/test/extensions/filters/network/kafka/serialization_test.cc b/test/extensions/filters/network/kafka/serialization_test.cc
index c7e28d14ca879..41306d143ee3d 100644
--- a/test/extensions/filters/network/kafka/serialization_test.cc
+++ b/test/extensions/filters/network/kafka/serialization_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/kafka/tagged_fields.h"
+#include "source/extensions/filters/network/kafka/tagged_fields.h"
 
 #include "test/extensions/filters/network/kafka/serialization_utilities.h"
 
diff --git a/test/extensions/filters/network/kafka/serialization_utilities.h b/test/extensions/filters/network/kafka/serialization_utilities.h
index 5c252ab4a8709..d2fb902b8294d 100644
--- a/test/extensions/filters/network/kafka/serialization_utilities.h
+++ b/test/extensions/filters/network/kafka/serialization_utilities.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/kafka/serialization.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/kafka/serialization.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/string_view.h"
diff --git a/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc b/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc
index 5e597bb552ade..c13c03b5f8760 100644
--- a/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc
+++ b/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/common/exception.h"
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/local_ratelimit/local_ratelimit.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h"
 
 #include "test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz.pb.validate.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc b/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc
index d764a1bab8ec3..50568d622f69c 100644
--- a/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc
+++ b/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h"
 #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/local_ratelimit/local_ratelimit.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc b/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc
index 9bbe1a1bbc660..9738daeb121a1 100644
--- a/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc
+++ b/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc
@@ -1,8 +1,7 @@
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc b/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc
index 1c960dd871501..c92c68cd1630e 100644
--- a/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc
+++ b/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc
@@ -1,10 +1,9 @@
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/json/json_loader.h"
-
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
-#include "extensions/filters/network/mongo_proxy/codec_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/codec_impl.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/extensions/filters/network/mongo_proxy/config_test.cc b/test/extensions/filters/network/mongo_proxy/config_test.cc
index dd852f46445df..58b289a9176f2 100644
--- a/test/extensions/filters/network/mongo_proxy/config_test.cc
+++ b/test/extensions/filters/network/mongo_proxy/config_test.cc
@@ -4,7 +4,7 @@
 #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "extensions/filters/network/mongo_proxy/config.h"
+#include "source/extensions/filters/network/mongo_proxy/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/mongo_proxy/proxy_test.cc b/test/extensions/filters/network/mongo_proxy/proxy_test.cc
index 82c777a0288ab..b59f4cc2bfebc 100644
--- a/test/extensions/filters/network/mongo_proxy/proxy_test.cc
+++ b/test/extensions/filters/network/mongo_proxy/proxy_test.cc
@@ -7,11 +7,11 @@
 #include "envoy/stats/stats.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
-#include "extensions/filters/network/mongo_proxy/codec_impl.h"
-#include "extensions/filters/network/mongo_proxy/mongo_stats.h"
-#include "extensions/filters/network/mongo_proxy/proxy.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/codec_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h"
+#include "source/extensions/filters/network/mongo_proxy/proxy.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/common/stream_info/test_util.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/extensions/filters/network/mongo_proxy/utility_test.cc b/test/extensions/filters/network/mongo_proxy/utility_test.cc
index db1ad741325cd..39c834b834913 100644
--- a/test/extensions/filters/network/mongo_proxy/utility_test.cc
+++ b/test/extensions/filters/network/mongo_proxy/utility_test.cc
@@ -1,8 +1,8 @@
 #include <string>
 
-#include "extensions/filters/network/mongo_proxy/bson_impl.h"
-#include "extensions/filters/network/mongo_proxy/codec_impl.h"
-#include "extensions/filters/network/mongo_proxy/utility.h"
+#include "source/extensions/filters/network/mongo_proxy/bson_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/codec_impl.h"
+#include "source/extensions/filters/network/mongo_proxy/utility.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc
index de44f2f75683f..7529af8de0c5e 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
 
 #include "gtest/gtest.h"
 #include "mysql_test_utils.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc
index eb302970e10f4..60a064b5d46ca 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
 
 #include "gtest/gtest.h"
 #include "mysql_test_utils.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc
index 0c02dd9dfacb1..d06aad773f1d2 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 #include "gtest/gtest.h"
 #include "mysql_test_utils.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc
index 807182dfa86e9..3d1add37faf0c 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 #include "gtest/gtest.h"
 #include "mysql_test_utils.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc
index 73ca39b616bc5..906d6f2b55303 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc
@@ -1,11 +1,10 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc
index d4fcee04b9eb1..c2d9c346a1227 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc
@@ -1,8 +1,7 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_filter.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc
index cb47a0fdf61fb..185198aa85875 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
 
 #include "gtest/gtest.h"
 #include "mysql_test_utils.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc
index 0a9ddd0a8e246..f2799c5fb2308 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc
@@ -1,8 +1,8 @@
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
 
 #include "test/integration/fake_upstream.h"
 #include "test/integration/integration.h"
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc
index 7f19ebabab7bd..989e0ebef708a 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc
+++ b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc
@@ -1,13 +1,12 @@
 #include "mysql_test_utils.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
-#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
-#include "extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h
index e83c2dec0e026..996cc92ff918c 100644
--- a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h
+++ b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "extensions/filters/network/mysql_proxy/mysql_codec.h"
+#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
 
 #include "fmt/format.h"
 
diff --git a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc
index 9170a69e84844..cc7f65cdcd035 100644
--- a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc
+++ b/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc
@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "extensions/filters/network/postgres_proxy/postgres_decoder.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h"
 
 #include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h"
 
diff --git a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc
index 0b09e50bea60a..1214dc4c661e3 100644
--- a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc
+++ b/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc
@@ -3,8 +3,8 @@
 
 #include <tuple>
 
-#include "extensions/filters/network/postgres_proxy/postgres_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc
index 3500083442f47..ec7b8e1b713ba 100644
--- a/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc
+++ b/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc
@@ -1,9 +1,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/postgres_proxy/postgres_message.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/postgres_proxy/postgres_message.h"
 
 #include "fmt/printf.h"
 
diff --git a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h b/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h
index adabc27e8d2c4..0ee1614ec180f 100644
--- a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h
+++ b/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/ratelimit/config_test.cc b/test/extensions/filters/network/ratelimit/config_test.cc
index 279dafdf000ec..f26e832f62551 100644
--- a/test/extensions/filters/network/ratelimit/config_test.cc
+++ b/test/extensions/filters/network/ratelimit/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/network/ratelimit/config.h"
+#include "source/extensions/filters/network/ratelimit/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/network/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/ratelimit/ratelimit_test.cc
index d0a5741b5c2d8..c59ba01e37a19 100644
--- a/test/extensions/filters/network/ratelimit/ratelimit_test.cc
+++ b/test/extensions/filters/network/ratelimit/ratelimit_test.cc
@@ -5,10 +5,9 @@
 #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/stats/stats.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/ratelimit/ratelimit.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/common/ratelimit/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/rbac/config_test.cc b/test/extensions/filters/network/rbac/config_test.cc
index ace7d65fb7b15..134392d492652 100644
--- a/test/extensions/filters/network/rbac/config_test.cc
+++ b/test/extensions/filters/network/rbac/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h"
 
-#include "extensions/filters/network/rbac/config.h"
+#include "source/extensions/filters/network/rbac/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/filters/network/rbac/filter_test.cc b/test/extensions/filters/network/rbac/filter_test.cc
index 218a0f22e774a..0bcf52baa8d6f 100644
--- a/test/extensions/filters/network/rbac/filter_test.cc
+++ b/test/extensions/filters/network/rbac/filter_test.cc
@@ -3,11 +3,10 @@
 #include "envoy/config/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
 
-#include "common/network/utility.h"
-
-#include "extensions/filters/common/rbac/utility.h"
-#include "extensions/filters/network/rbac/rbac_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/common/rbac/utility.h"
+#include "source/extensions/filters/network/rbac/rbac_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/filters/network/rbac/integration_test.cc b/test/extensions/filters/network/rbac/integration_test.cc
index ba77509e45aab..39bf4386bdd99 100644
--- a/test/extensions/filters/network/rbac/integration_test.cc
+++ b/test/extensions/filters/network/rbac/integration_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h"
 #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h"
 
-#include "extensions/filters/network/rbac/config.h"
+#include "source/extensions/filters/network/rbac/config.h"
 
 #include "test/integration/integration.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc b/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc
index 3b6dee686f250..7cafe805d3c63 100644
--- a/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc
+++ b/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc
@@ -5,12 +5,11 @@
 #include <string>
 #include <vector>
 
-#include "common/common/fmt.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/supported_commands.h"
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
 
 #include "test/extensions/filters/network/redis_proxy/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc b/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc
index 794b4b8b41b42..0feefb51b924a 100644
--- a/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc
+++ b/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc
@@ -5,13 +5,12 @@
 #include <string>
 #include <vector>
 
-#include "common/common/fmt.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/common/redis/client_impl.h"
-#include "extensions/filters/network/common/redis/supported_commands.h"
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
-#include "extensions/filters/network/redis_proxy/router_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/common/redis/client_impl.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/extensions/filters/network/redis_proxy/router_impl.h"
 
 #include "test/test_common/simulated_time_system.h"
 
diff --git a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc
index f0d8177a6f9ae..9d56735abdce3 100644
--- a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc
+++ b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc
@@ -3,12 +3,11 @@
 #include <string>
 #include <vector>
 
-#include "common/common/fmt.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/filters/network/common/redis/fault_impl.h"
-#include "extensions/filters/network/common/redis/supported_commands.h"
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
+#include "source/extensions/filters/network/common/redis/supported_commands.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/extensions/filters/network/redis_proxy/mocks.h"
diff --git a/test/extensions/filters/network/redis_proxy/config_test.cc b/test/extensions/filters/network/redis_proxy/config_test.cc
index 798c8f573fda7..b57c1c772549e 100644
--- a/test/extensions/filters/network/redis_proxy/config_test.cc
+++ b/test/extensions/filters/network/redis_proxy/config_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/redis_proxy/config.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/redis_proxy/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc
index 1963c3ab2b20e..594771b5a098b 100644
--- a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc
+++ b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc
@@ -6,11 +6,10 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/filters/network/common/redis/utility.h"
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/filters/network/common/redis/utility.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
 
 #include "test/extensions/clusters/redis/mocks.h"
 #include "test/extensions/common/redis/mocks.h"
diff --git a/test/extensions/filters/network/redis_proxy/mocks.h b/test/extensions/filters/network/redis_proxy/mocks.h
index e90842bba06da..0bbb1e1931d03 100644
--- a/test/extensions/filters/network/redis_proxy/mocks.h
+++ b/test/extensions/filters/network/redis_proxy/mocks.h
@@ -4,13 +4,13 @@
 #include <list>
 #include <string>
 
-#include "extensions/common/redis/cluster_refresh_manager.h"
-#include "extensions/filters/network/common/redis/client.h"
-#include "extensions/filters/network/common/redis/codec_impl.h"
-#include "extensions/filters/network/common/redis/fault.h"
-#include "extensions/filters/network/redis_proxy/command_splitter.h"
-#include "extensions/filters/network/redis_proxy/conn_pool.h"
-#include "extensions/filters/network/redis_proxy/router.h"
+#include "source/extensions/common/redis/cluster_refresh_manager.h"
+#include "source/extensions/filters/network/common/redis/client.h"
+#include "source/extensions/filters/network/common/redis/codec_impl.h"
+#include "source/extensions/filters/network/common/redis/fault.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool.h"
+#include "source/extensions/filters/network/redis_proxy/router.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc
index 1dba30ee201e4..36face2a38742 100644
--- a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc
+++ b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc
@@ -3,7 +3,7 @@
 
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 
-#include "extensions/filters/network/redis_proxy/proxy_filter.h"
+#include "source/extensions/filters/network/redis_proxy/proxy_filter.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/extensions/filters/network/common/redis/mocks.h"
diff --git a/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc b/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc
index 4b014fc08c1be..404651366b7cc 100644
--- a/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc
+++ b/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc
@@ -1,10 +1,9 @@
 #include <sstream>
 #include <vector>
 
-#include "common/common/fmt.h"
-
-#include "extensions/filters/network/common/redis/fault_impl.h"
-#include "extensions/filters/network/redis_proxy/command_splitter_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/extensions/filters/network/common/redis/fault_impl.h"
+#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h"
 
 #include "test/integration/integration.h"
 
diff --git a/test/extensions/filters/network/redis_proxy/router_impl_test.cc b/test/extensions/filters/network/redis_proxy/router_impl_test.cc
index 6e9f402ae0289..87e5b704a2f18 100644
--- a/test/extensions/filters/network/redis_proxy/router_impl_test.cc
+++ b/test/extensions/filters/network/redis_proxy/router_impl_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "extensions/filters/network/redis_proxy/conn_pool_impl.h"
-#include "extensions/filters/network/redis_proxy/router_impl.h"
+#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h"
+#include "source/extensions/filters/network/redis_proxy/router_impl.h"
 
 #include "test/extensions/filters/network/common/redis/mocks.h"
 #include "test/extensions/filters/network/redis_proxy/mocks.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc b/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc
index 3dfc65ca1ee18..3720074f1b576 100644
--- a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc
@@ -1,10 +1,9 @@
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/network/rocketmq_proxy/active_message.h"
-#include "extensions/filters/network/rocketmq_proxy/config.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/network/rocketmq_proxy/active_message.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
 
 #include "test/extensions/filters/network/rocketmq_proxy/utility.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc b/test/extensions/filters/network/rocketmq_proxy/codec_test.cc
index 902584b5b3fc5..9c8fe92beb238 100644
--- a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/codec_test.cc
@@ -1,9 +1,8 @@
-#include "common/common/empty_string.h"
-#include "common/common/enum_to_int.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/codec.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/enum_to_int.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
 
 #include "test/extensions/filters/network/rocketmq_proxy/utility.h"
 
diff --git a/test/extensions/filters/network/rocketmq_proxy/config_test.cc b/test/extensions/filters/network/rocketmq_proxy/config_test.cc
index 3030522c9eb72..592ae5de01f83 100644
--- a/test/extensions/filters/network/rocketmq_proxy/config_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h"
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h"
 
-#include "extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
 
 #include "test/mocks/local_info/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc b/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc
index 272706d89f951..44e3c1a9d64e3 100644
--- a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/network/connection.h"
 
-#include "extensions/filters/network/rocketmq_proxy/config.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.cc b/test/extensions/filters/network/rocketmq_proxy/mocks.cc
index 80d4fe73291c8..aea79d23d4e11 100644
--- a/test/extensions/filters/network/rocketmq_proxy/mocks.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/mocks.cc
@@ -1,6 +1,6 @@
 #include "test/extensions/filters/network/rocketmq_proxy/mocks.h"
 
-#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.h b/test/extensions/filters/network/rocketmq_proxy/mocks.h
index 8debb71f82170..23302611dc287 100644
--- a/test/extensions/filters/network/rocketmq_proxy/mocks.h
+++ b/test/extensions/filters/network/rocketmq_proxy/mocks.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/network/rocketmq_proxy/active_message.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/active_message.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
 
 #include "test/mocks/upstream/cluster_manager.h"
 
diff --git a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc b/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc
index d22099f24fc6f..057b6dcc10d76 100644
--- a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc
@@ -1,6 +1,5 @@
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/protocol.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/protocol.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc b/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc
index 947e67481f9bc..620fb5432124d 100644
--- a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h"
 #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.h"
 
-#include "extensions/filters/network/rocketmq_proxy/metadata.h"
-#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
+#include "source/extensions/filters/network/rocketmq_proxy/metadata.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/network/rocketmq_proxy/router_test.cc b/test/extensions/filters/network/rocketmq_proxy/router_test.cc
index b258426e9b763..49521a9c4763f 100644
--- a/test/extensions/filters/network/rocketmq_proxy/router_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/router_test.cc
@@ -1,7 +1,7 @@
-#include "extensions/filters/network/rocketmq_proxy/config.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
-#include "extensions/filters/network/rocketmq_proxy/router/router.h"
-#include "extensions/filters/network/rocketmq_proxy/well_known_names.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/router/router.h"
+#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h"
 
 #include "test/extensions/filters/network/rocketmq_proxy/mocks.h"
 #include "test/extensions/filters/network/rocketmq_proxy/utility.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc b/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc
index 5cc9af4b845bc..e1c64375c7407 100644
--- a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc
@@ -1,6 +1,5 @@
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/rocketmq_proxy/topic_route.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h"
 
 #include "absl/container/node_hash_map.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/rocketmq_proxy/utility.h b/test/extensions/filters/network/rocketmq_proxy/utility.h
index df702e09aadcd..ffbc286bc18b1 100644
--- a/test/extensions/filters/network/rocketmq_proxy/utility.h
+++ b/test/extensions/filters/network/rocketmq_proxy/utility.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/network/rocketmq_proxy/config.h"
-#include "extensions/filters/network/rocketmq_proxy/conn_manager.h"
+#include "source/extensions/filters/network/rocketmq_proxy/config.h"
+#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc b/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc
index 61c9a79ee681c..198bdee679592 100644
--- a/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc
+++ b/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc
@@ -1,7 +1,6 @@
-#include "common/tcp_proxy/tcp_proxy.h"
-
-#include "extensions/filters/network/sni_cluster/config.h"
-#include "extensions/filters/network/sni_cluster/sni_cluster.h"
+#include "source/common/tcp_proxy/tcp_proxy.h"
+#include "source/extensions/filters/network/sni_cluster/config.h"
+#include "source/extensions/filters/network/sni_cluster/sni_cluster.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc
index ef4d92e831372..8a6d9c62a224e 100644
--- a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc
+++ b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc
@@ -3,8 +3,8 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/integration/http_integration.h"
 #include "test/integration/ssl_utility.h"
diff --git a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc
index 4d9d35cb87ce4..5eda1b49de6b9 100644
--- a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc
+++ b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.h"
 #include "envoy/network/connection.h"
 
-#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/common/dynamic_forward_proxy/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/extensions/filters/network/tcp_proxy/config_test.cc b/test/extensions/filters/network/tcp_proxy/config_test.cc
index 1de0240088ee4..201379a7ce6b0 100644
--- a/test/extensions/filters/network/tcp_proxy/config_test.cc
+++ b/test/extensions/filters/network/tcp_proxy/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h"
 
-#include "extensions/filters/network/tcp_proxy/config.h"
+#include "source/extensions/filters/network/tcp_proxy/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/test_runtime.h"
diff --git a/test/extensions/filters/network/thrift_proxy/BUILD b/test/extensions/filters/network/thrift_proxy/BUILD
index b4bb10f1d2d2d..7ae593821a98f 100644
--- a/test/extensions/filters/network/thrift_proxy/BUILD
+++ b/test/extensions/filters/network/thrift_proxy/BUILD
@@ -286,7 +286,7 @@ envoy_extension_cc_test(
     deps = [
         ":mocks",
         ":utility_lib",
-        "//include/envoy/common:base_includes",
+        "//envoy/common:base_includes",
         "//source/common/network:address_lib",
         "//source/extensions/filters/network/thrift_proxy:config",
         "//source/extensions/filters/network/thrift_proxy/router:config",
diff --git a/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc b/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc
index 245ecd9423abb..fe93f96cbcc60 100644
--- a/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc
@@ -1,6 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 
diff --git a/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc
index cec16c3a59486..9b5bde2c707bc 100644
--- a/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc
index e451dbdd6f85f..024dcb5fc3eb7 100644
--- a/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc
index a3ea1d80a0cbc..e828b0b346df9 100644
--- a/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc b/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc
index 0f2a1b0cdb3ad..1b0e133b1a24b 100644
--- a/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc
index 9033c7e124143..a4e32077836a9 100644
--- a/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/config_test.cc b/test/extensions/filters/network/thrift_proxy/config_test.cc
index aa52a2143ed4b..9ff67f65ef2b9 100644
--- a/test/extensions/filters/network/thrift_proxy/config_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/config_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h"
 
-#include "extensions/filters/network/thrift_proxy/config.h"
-#include "extensions/filters/network/thrift_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/config.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc
index d02028fd90e03..7ac6ee7bf94b8 100644
--- a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc
@@ -3,14 +3,13 @@
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
-#include "extensions/filters/network/thrift_proxy/config.h"
-#include "extensions/filters/network/thrift_proxy/conn_manager.h"
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/header_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/config.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
diff --git a/test/extensions/filters/network/thrift_proxy/conn_state_test.cc b/test/extensions/filters/network/thrift_proxy/conn_state_test.cc
index 5a875e9cc9875..bdbe9e504bff7 100644
--- a/test/extensions/filters/network/thrift_proxy/conn_state_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/conn_state_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/conn_state.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_state.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/thrift_proxy/decoder_test.cc b/test/extensions/filters/network/thrift_proxy/decoder_test.cc
index 87f505b06e2c4..a0ef74a6d207a 100644
--- a/test/extensions/filters/network/thrift_proxy/decoder_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/decoder_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/decoder.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/decoder.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc b/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc
index bd0952258bbce..abf5a15bc569e 100644
--- a/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc
@@ -1,7 +1,7 @@
 #include <memory>
 #include <string>
 
-#include "extensions/filters/network/thrift_proxy/filters/pass_through_filter.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
index 30c4f38d12c8d..6a374d68fb5d5 100644
--- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h"
 
-#include "extensions/filters/network/thrift_proxy/filters/ratelimit/config.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/mocks/server/factory_context.h"
diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
index 07db070f0d77f..b4bda29851fef 100644
--- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
@@ -4,13 +4,12 @@
 
 #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/http/headers.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
-#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/http/headers.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h"
 
 #include "test/extensions/filters/common/ratelimit/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
diff --git a/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc
index f3afa26d2f101..37b4c164039a0 100644
--- a/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc
index 73a60b91ec5d5..33cc7e7fb4f6c 100644
--- a/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/header_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/integration.h b/test/extensions/filters/network/thrift_proxy/integration.h
index 6010c6e64fbe5..977348c1863b5 100644
--- a/test/extensions/filters/network/thrift_proxy/integration.h
+++ b/test/extensions/filters/network/thrift_proxy/integration.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
 
 #include "test/integration/integration.h"
 
diff --git a/test/extensions/filters/network/thrift_proxy/integration_test.cc b/test/extensions/filters/network/thrift_proxy/integration_test.cc
index 16dddb2b31635..5f7cb2c41b158 100644
--- a/test/extensions/filters/network/thrift_proxy/integration_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/integration_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "extensions/filters/network/thrift_proxy/buffer_helper.h"
+#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h"
 
 #include "test/extensions/filters/network/thrift_proxy/integration.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/metadata_test.cc b/test/extensions/filters/network/thrift_proxy/metadata_test.cc
index 17bd4a0aaeb8c..6ca84143e6dce 100644
--- a/test/extensions/filters/network/thrift_proxy/metadata_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/metadata_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/mocks.cc b/test/extensions/filters/network/thrift_proxy/mocks.cc
index 0f177cc79e506..8e93ace6f0c3e 100644
--- a/test/extensions/filters/network/thrift_proxy/mocks.cc
+++ b/test/extensions/filters/network/thrift_proxy/mocks.cc
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/thrift_proxy/mocks.h b/test/extensions/filters/network/thrift_proxy/mocks.h
index 7db68172d259a..b55d4bc466a9c 100644
--- a/test/extensions/filters/network/thrift_proxy/mocks.h
+++ b/test/extensions/filters/network/thrift_proxy/mocks.h
@@ -2,15 +2,15 @@
 
 #include "envoy/router/router.h"
 
-#include "extensions/filters/network/thrift_proxy/conn_manager.h"
-#include "extensions/filters/network/thrift_proxy/conn_state.h"
-#include "extensions/filters/network/thrift_proxy/filters/factory_base.h"
-#include "extensions/filters/network/thrift_proxy/filters/filter.h"
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/protocol.h"
-#include "extensions/filters/network/thrift_proxy/router/router.h"
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
-#include "extensions/filters/network/thrift_proxy/transport.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
+#include "source/extensions/filters/network/thrift_proxy/conn_state.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/protocol.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h"
+#include "source/extensions/filters/network/thrift_proxy/transport.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
index 079f646d3a913..d7623f2418d28 100644
--- a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/extensions/filters/network/thrift_proxy/v3/route.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/route.pb.validate.h"
 
-#include "common/config/metadata.h"
-
-#include "extensions/filters/network/thrift_proxy/router/config.h"
-#include "extensions/filters/network/thrift_proxy/router/router_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/router/config.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
index 57b205f02981d..9e5c6a1bcb01f 100644
--- a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
@@ -6,12 +6,11 @@
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h"
 #include "envoy/ratelimit/ratelimit.h"
 
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/filters/network/thrift_proxy/config.h"
-#include "extensions/filters/network/thrift_proxy/metadata.h"
-#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/filters/network/thrift_proxy/config.h"
+#include "source/extensions/filters/network/thrift_proxy/metadata.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/mocks/ratelimit/mocks.h"
diff --git a/test/extensions/filters/network/thrift_proxy/router_test.cc b/test/extensions/filters/network/thrift_proxy/router_test.cc
index 738e271abba5a..a072c214b57ab 100644
--- a/test/extensions/filters/network/thrift_proxy/router_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/router_test.cc
@@ -4,12 +4,11 @@
 #include "envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.h"
 #include "envoy/tcp/conn_pool.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/app_exception_impl.h"
-#include "extensions/filters/network/thrift_proxy/config.h"
-#include "extensions/filters/network/thrift_proxy/router/config.h"
-#include "extensions/filters/network/thrift_proxy/router/router_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/config.h"
+#include "source/extensions/filters/network/thrift_proxy/router/config.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc b/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc
index a79d30505644e..9d9a206c1f87c 100644
--- a/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc
@@ -1,6 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/mocks.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc
index 0c50426b0fef6..9bead20a44bae 100644
--- a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 
-#include "extensions/filters/network/well_known_names.h"
+#include "source/extensions/filters/network/well_known_names.h"
 
 #include "test/extensions/filters/network/thrift_proxy/integration.h"
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
diff --git a/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc
index 061fbe1ddb1b0..266991ccade2d 100644
--- a/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc
@@ -2,10 +2,9 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h"
-#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc
index 48097a6f1c2a6..76a23f643c8bf 100644
--- a/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc
@@ -1,6 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
 #include "test/extensions/filters/network/thrift_proxy/utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/extensions/filters/network/thrift_proxy/utility.h b/test/extensions/filters/network/thrift_proxy/utility.h
index e19bfdf869e58..a19f9ef1b057e 100644
--- a/test/extensions/filters/network/thrift_proxy/utility.h
+++ b/test/extensions/filters/network/thrift_proxy/utility.h
@@ -4,10 +4,9 @@
 
 #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/byte_order.h"
-
-#include "extensions/filters/network/thrift_proxy/thrift.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/byte_order.h"
+#include "source/extensions/filters/network/thrift_proxy/thrift.h"
 
 #include "test/common/buffer/utility.h"
 
diff --git a/test/extensions/filters/network/wasm/config_test.cc b/test/extensions/filters/network/wasm/config_test.cc
index 103068ba279a1..c7bb849f8ae6a 100644
--- a/test/extensions/filters/network/wasm/config_test.cc
+++ b/test/extensions/filters/network/wasm/config_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h"
 
-#include "common/common/base64.h"
-#include "common/common/hex.h"
-#include "common/crypto/utility.h"
-
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/network/wasm/config.h"
-#include "extensions/filters/network/wasm/wasm_filter.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/hex.h"
+#include "source/common/crypto/utility.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/network/wasm/config.h"
+#include "source/extensions/filters/network/wasm/wasm_filter.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/filters/network/wasm/wasm_filter_test.cc b/test/extensions/filters/network/wasm/wasm_filter_test.cc
index f0ab349395019..4203cc9de8fc9 100644
--- a/test/extensions/filters/network/wasm/wasm_filter_test.cc
+++ b/test/extensions/filters/network/wasm/wasm_filter_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/server/lifecycle_notifier.h"
 
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/filters/network/wasm/wasm_filter.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/filters/network/wasm/wasm_filter.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/filters/network/zookeeper_proxy/config_test.cc b/test/extensions/filters/network/zookeeper_proxy/config_test.cc
index b133a8f5075b2..e88dbacd1ab06 100644
--- a/test/extensions/filters/network/zookeeper_proxy/config_test.cc
+++ b/test/extensions/filters/network/zookeeper_proxy/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.h"
 #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.h"
 
-#include "extensions/filters/network/zookeeper_proxy/config.h"
+#include "source/extensions/filters/network/zookeeper_proxy/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/filters/network/zookeeper_proxy/filter_test.cc b/test/extensions/filters/network/zookeeper_proxy/filter_test.cc
index 3a6eefd8e28bb..fec443f62bf45 100644
--- a/test/extensions/filters/network/zookeeper_proxy/filter_test.cc
+++ b/test/extensions/filters/network/zookeeper_proxy/filter_test.cc
@@ -1,7 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/zookeeper_proxy/decoder.h"
-#include "extensions/filters/network/zookeeper_proxy/filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/zookeeper_proxy/decoder.h"
+#include "source/extensions/filters/network/zookeeper_proxy/filter.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc
index 193173020d693..5963d50ebf1a7 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc
@@ -1,6 +1,5 @@
-#include "common/common/logger.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/fuzz/utility.h"
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc
index 9ddf0a3833d3b..0da3872a1ab95 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "extensions/filters/udp/dns_filter/dns_filter.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter.h"
 
 #include "test/integration/integration.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc
index 1ee2c6573ee36..8643b4b4ff289 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h"
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_constants.h"
-#include "extensions/filters/udp/dns_filter/dns_filter_utils.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc
index b6a50496a7f31..e6226227a6153 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc
@@ -1,6 +1,6 @@
 #include "dns_filter_test_utils.h"
 
-#include "common/common/random_generator.h"
+#include "source/common/common/random_generator.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h
index 378abbe431860..c0d2aea785149 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "extensions/filters/udp/dns_filter/dns_filter.h"
-#include "extensions/filters/udp/dns_filter/dns_filter_constants.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc
index f891e0f8402ff..856ba795d293b 100644
--- a/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc
+++ b/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h"
 #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h"
 
-#include "common/network/address_impl.h"
-
-#include "extensions/filters/udp/dns_filter/dns_filter_utils.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc b/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc
index 5090f38f09efa..c9e739d22c62f 100644
--- a/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc
+++ b/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc
@@ -2,10 +2,9 @@
 
 #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h"
 
-#include "common/common/hash.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h"
+#include "source/common/common/hash.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc
index c0f78a1b9b744..8e56df53c6cec 100644
--- a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc
+++ b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h"
 #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.h"
 
-#include "common/common/hash.h"
-#include "common/network/socket_impl.h"
-#include "common/network/socket_option_impl.h"
-
-#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
+#include "source/common/common/hash.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/socket.h"
diff --git a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc
index 09bfe76927176..e5d0768530c79 100644
--- a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc
+++ b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc
@@ -1,9 +1,9 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/config/grpc_credential/v3/aws_iam.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/common/utility.h"
-#include "common/grpc/google_async_client_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/utility.h"
+#include "source/common/grpc/google_async_client_impl.h"
 
 #include "test/common/grpc/grpc_client_integration_test_harness.h"
 #include "test/integration/fake_upstream.h"
diff --git a/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc b/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc
index 6016c8c6df31f..f47cb58056a5d 100644
--- a/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc
+++ b/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/config/core/v3/grpc_service.pb.h"
 #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/grpc/google_async_client_impl.h"
-
-#include "extensions/grpc_credentials/file_based_metadata/config.h"
+#include "source/common/common/fmt.h"
+#include "source/common/grpc/google_async_client_impl.h"
+#include "source/extensions/grpc_credentials/file_based_metadata/config.h"
 
 #include "test/common/grpc/grpc_client_integration_test_harness.h"
 #include "test/integration/fake_upstream.h"
diff --git a/test/extensions/health_checkers/redis/config_test.cc b/test/extensions/health_checkers/redis/config_test.cc
index e248faebf51af..fbd5db3ee52e0 100644
--- a/test/extensions/health_checkers/redis/config_test.cc
+++ b/test/extensions/health_checkers/redis/config_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "common/upstream/health_checker_impl.h"
-
-#include "extensions/health_checkers/redis/config.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/extensions/health_checkers/redis/config.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/extensions/health_checkers/redis/redis_test.cc b/test/extensions/health_checkers/redis/redis_test.cc
index f1beb870b5818..a5c012bbf8bbf 100644
--- a/test/extensions/health_checkers/redis/redis_test.cc
+++ b/test/extensions/health_checkers/redis/redis_test.cc
@@ -4,8 +4,8 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h"
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 
-#include "extensions/health_checkers/redis/redis.h"
-#include "extensions/health_checkers/redis/utility.h"
+#include "source/extensions/health_checkers/redis/redis.h"
+#include "source/extensions/health_checkers/redis/utility.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/extensions/filters/network/common/redis/mocks.h"
diff --git a/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc b/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc
index ca7ba4c5a8943..053425ec8835c 100644
--- a/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc
+++ b/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/http/header_formatters/preserve_case/preserve_case_formatter.h"
+#include "source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/http/original_ip_detection/custom_header/BUILD b/test/extensions/http/original_ip_detection/custom_header/BUILD
index 7a02e5ec778f1..955c20b4e62c7 100644
--- a/test/extensions/http/original_ip_detection/custom_header/BUILD
+++ b/test/extensions/http/original_ip_detection/custom_header/BUILD
@@ -28,7 +28,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.http.original_ip_detection.custom_header",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/http/original_ip_detection/custom_header:config",
         "//source/extensions/http/original_ip_detection/custom_header:custom_header_lib",
         "//test/mocks/server:factory_context_mocks",
diff --git a/test/extensions/http/original_ip_detection/custom_header/config_test.cc b/test/extensions/http/original_ip_detection/custom_header/config_test.cc
index 54e42644c053b..83346697de765 100644
--- a/test/extensions/http/original_ip_detection/custom_header/config_test.cc
+++ b/test/extensions/http/original_ip_detection/custom_header/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/http/original_ip_detection/custom_header/config.h"
+#include "source/extensions/http/original_ip_detection/custom_header/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc b/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc
index e1a14c133d73d..1ef2722a602a1 100644
--- a/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc
+++ b/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h"
 
-#include "common/network/utility.h"
-
-#include "extensions/http/original_ip_detection/custom_header/custom_header.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/http/original_ip_detection/xff/BUILD b/test/extensions/http/original_ip_detection/xff/BUILD
index 14d79ac5cb50d..90bcb1b5eef25 100644
--- a/test/extensions/http/original_ip_detection/xff/BUILD
+++ b/test/extensions/http/original_ip_detection/xff/BUILD
@@ -28,7 +28,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.http.original_ip_detection.xff",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/http/original_ip_detection/xff:config",
         "//source/extensions/http/original_ip_detection/xff:xff_lib",
         "//test/mocks/server:factory_context_mocks",
diff --git a/test/extensions/http/original_ip_detection/xff/config_test.cc b/test/extensions/http/original_ip_detection/xff/config_test.cc
index 0f7f1ace9632d..5a8ebaa3783ba 100644
--- a/test/extensions/http/original_ip_detection/xff/config_test.cc
+++ b/test/extensions/http/original_ip_detection/xff/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/http/original_ip_detection/xff/config.h"
+#include "source/extensions/http/original_ip_detection/xff/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/http/original_ip_detection/xff/xff_test.cc b/test/extensions/http/original_ip_detection/xff/xff_test.cc
index f03ac1a307ca7..9920d4a6d5ce9 100644
--- a/test/extensions/http/original_ip_detection/xff/xff_test.cc
+++ b/test/extensions/http/original_ip_detection/xff/xff_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h"
 
-#include "extensions/http/original_ip_detection/xff/xff.h"
+#include "source/extensions/http/original_ip_detection/xff/xff.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/internal_redirect/previous_routes/config_test.cc b/test/extensions/internal_redirect/previous_routes/config_test.cc
index 076b1069e4e4d..244792e950812 100644
--- a/test/extensions/internal_redirect/previous_routes/config_test.cc
+++ b/test/extensions/internal_redirect/previous_routes/config_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/router/internal_redirect.h"
 
-#include "common/stream_info/filter_state_impl.h"
-
-#include "extensions/internal_redirect/previous_routes/config.h"
+#include "source/common/stream_info/filter_state_impl.h"
+#include "source/extensions/internal_redirect/previous_routes/config.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/io_socket/user_space/BUILD b/test/extensions/io_socket/user_space/BUILD
index dc9dc2bdc90dd..e06b8c87b40b4 100644
--- a/test/extensions/io_socket/user_space/BUILD
+++ b/test/extensions/io_socket/user_space/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["file_event_impl_test.cc"],
     extension_name = "envoy.io_socket.user_space",
     deps = [
-        "//include/envoy/event:file_event_interface",
+        "//envoy/event:file_event_interface",
         "//source/common/event:dispatcher_includes",
         "//source/common/event:dispatcher_lib",
         "//source/extensions/io_socket/user_space:file_event_lib",
diff --git a/test/extensions/io_socket/user_space/file_event_impl_test.cc b/test/extensions/io_socket/user_space/file_event_impl_test.cc
index 5d136b2bb0264..56bf7d51ab689 100644
--- a/test/extensions/io_socket/user_space/file_event_impl_test.cc
+++ b/test/extensions/io_socket/user_space/file_event_impl_test.cc
@@ -2,10 +2,9 @@
 
 #include "envoy/event/file_event.h"
 
-#include "common/event/dispatcher_impl.h"
-
-#include "extensions/io_socket/user_space/file_event_impl.h"
-#include "extensions/io_socket/user_space/io_handle.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/extensions/io_socket/user_space/file_event_impl.h"
+#include "source/extensions/io_socket/user_space/io_handle.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/io_socket/user_space/io_handle_impl_test.cc b/test/extensions/io_socket/user_space/io_handle_impl_test.cc
index 790c7a0734ed4..150e25c8a685a 100644
--- a/test/extensions/io_socket/user_space/io_handle_impl_test.cc
+++ b/test/extensions/io_socket/user_space/io_handle_impl_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/event/file_event.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fancy_logger.h"
-#include "common/network/address_impl.h"
-
-#include "extensions/io_socket/user_space/io_handle_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/io_socket/user_space/io_handle_impl.h"
 
 #include "test/mocks/event/mocks.h"
 
diff --git a/test/extensions/matching/common_inputs/environment_variable/config_test.cc b/test/extensions/matching/common_inputs/environment_variable/config_test.cc
index f8a697979c9e2..75262a46e3325 100644
--- a/test/extensions/matching/common_inputs/environment_variable/config_test.cc
+++ b/test/extensions/matching/common_inputs/environment_variable/config_test.cc
@@ -1,6 +1,5 @@
-#include "common/config/utility.h"
-
-#include "extensions/matching/common_inputs/environment_variable/config.h"
+#include "source/common/config/utility.h"
+#include "source/extensions/matching/common_inputs/environment_variable/config.h"
 
 #include "test/mocks/server/factory_context.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/matching/common_inputs/environment_variable/input_test.cc b/test/extensions/matching/common_inputs/environment_variable/input_test.cc
index 7c0bcc9768c1d..dbc874448e043 100644
--- a/test/extensions/matching/common_inputs/environment_variable/input_test.cc
+++ b/test/extensions/matching/common_inputs/environment_variable/input_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/matching/common_inputs/environment_variable/input.h"
+#include "source/extensions/matching/common_inputs/environment_variable/input.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc
index 21722bed990f7..06eaab24b53c2 100644
--- a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc
+++ b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/matching/input_matchers/consistent_hashing/config.h"
+#include "source/extensions/matching/input_matchers/consistent_hashing/config.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc b/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc
index c070a2c3c7299..98d4ea3a92735 100644
--- a/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc
+++ b/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/matching/input_matchers/consistent_hashing/matcher.h"
+#include "source/extensions/matching/input_matchers/consistent_hashing/matcher.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/rate_limit_descriptors/expr/config_test.cc b/test/extensions/rate_limit_descriptors/expr/config_test.cc
index d68981ede37d2..57094c6805e62 100644
--- a/test/extensions/rate_limit_descriptors/expr/config_test.cc
+++ b/test/extensions/rate_limit_descriptors/expr/config_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.h"
 #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.h"
 
-#include "common/protobuf/utility.h"
-#include "common/router/router_ratelimit.h"
-
-#include "extensions/rate_limit_descriptors/expr/config.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/router_ratelimit.h"
+#include "source/extensions/rate_limit_descriptors/expr/config.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/ratelimit/mocks.h"
diff --git a/test/extensions/request_id/uuid/config_test.cc b/test/extensions/request_id/uuid/config_test.cc
index 346c88b4c1a97..1e31e1a40c259 100644
--- a/test/extensions/request_id/uuid/config_test.cc
+++ b/test/extensions/request_id/uuid/config_test.cc
@@ -1,8 +1,7 @@
 #include <string>
 
-#include "common/common/random_generator.h"
-
-#include "extensions/request_id/uuid/config.h"
+#include "source/common/common/random_generator.h"
+#include "source/extensions/request_id/uuid/config.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD
index e4a1cd62d61cd..430aa5a151cd0 100644
--- a/test/extensions/resource_monitors/fixed_heap/BUILD
+++ b/test/extensions/resource_monitors/fixed_heap/BUILD
@@ -27,7 +27,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.resource_monitors.fixed_heap",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/stats:isolated_store_lib",
         "//source/extensions/resource_monitors/fixed_heap:config",
         "//source/server:resource_monitor_config_lib",
diff --git a/test/extensions/resource_monitors/fixed_heap/config_test.cc b/test/extensions/resource_monitors/fixed_heap/config_test.cc
index 39fc8333b003d..c26aa094cf441 100644
--- a/test/extensions/resource_monitors/fixed_heap/config_test.cc
+++ b/test/extensions/resource_monitors/fixed_heap/config_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "server/resource_monitor_config_impl.h"
-
-#include "extensions/resource_monitors/fixed_heap/config.h"
+#include "source/extensions/resource_monitors/fixed_heap/config.h"
+#include "source/server/resource_monitor_config_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/server/options.h"
diff --git a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc
index 1d5eb84c22c86..24b451ee6fe72 100644
--- a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc
+++ b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h"
 
-#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
+#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h"
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
diff --git a/test/extensions/resource_monitors/injected_resource/BUILD b/test/extensions/resource_monitors/injected_resource/BUILD
index 31112db9bb11f..ec6773c832198 100644
--- a/test/extensions/resource_monitors/injected_resource/BUILD
+++ b/test/extensions/resource_monitors/injected_resource/BUILD
@@ -45,7 +45,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.resource_monitors.injected_resource",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/event:dispatcher_lib",
         "//source/common/stats:isolated_store_lib",
         "//source/extensions/resource_monitors/injected_resource:config",
diff --git a/test/extensions/resource_monitors/injected_resource/config_test.cc b/test/extensions/resource_monitors/injected_resource/config_test.cc
index f2fbeb7ecb9f8..c0ffe5118cab1 100644
--- a/test/extensions/resource_monitors/injected_resource/config_test.cc
+++ b/test/extensions/resource_monitors/injected_resource/config_test.cc
@@ -2,11 +2,9 @@
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/event/dispatcher_impl.h"
-
-#include "server/resource_monitor_config_impl.h"
-
-#include "extensions/resource_monitors/injected_resource/config.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/extensions/resource_monitors/injected_resource/config.h"
+#include "source/server/resource_monitor_config_impl.h"
 
 #include "test/mocks/server/options.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc
index c68cc32c22706..dc1292401c5e0 100644
--- a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc
+++ b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc
@@ -6,7 +6,7 @@
 #include "envoy/config/overload/v3/overload.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #include "test/config/integration/certs/clientcert_hash.h"
 #include "test/config/utility.h"
diff --git a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc
index 1391893d97932..400f97a4d11b2 100644
--- a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc
+++ b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc
@@ -1,11 +1,9 @@
 #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "server/resource_monitor_config_impl.h"
-
-#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h"
+#include "source/server/resource_monitor_config_impl.h"
 
 #include "test/mocks/server/options.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/retry/host/omit_canary_hosts/config_test.cc b/test/extensions/retry/host/omit_canary_hosts/config_test.cc
index ad08812c97950..aae083d6ac8f7 100644
--- a/test/extensions/retry/host/omit_canary_hosts/config_test.cc
+++ b/test/extensions/retry/host/omit_canary_hosts/config_test.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
 
-#include "extensions/retry/host/omit_canary_hosts/config.h"
+#include "source/extensions/retry/host/omit_canary_hosts/config.h"
 
 #include "test/mocks/upstream/host.h"
 
diff --git a/test/extensions/retry/host/omit_host_metadata/config_test.cc b/test/extensions/retry/host/omit_host_metadata/config_test.cc
index 399ab587b57aa..9ea84a3a35bfb 100644
--- a/test/extensions/retry/host/omit_host_metadata/config_test.cc
+++ b/test/extensions/retry/host/omit_host_metadata/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
 
-#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
+#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h"
 
 #include "test/mocks/upstream/host.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/retry/host/previous_hosts/config_test.cc b/test/extensions/retry/host/previous_hosts/config_test.cc
index a706e2665489d..5e24b59fc2895 100644
--- a/test/extensions/retry/host/previous_hosts/config_test.cc
+++ b/test/extensions/retry/host/previous_hosts/config_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
 
-#include "common/network/address_impl.h"
-
-#include "extensions/retry/host/previous_hosts/config.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/retry/host/previous_hosts/config.h"
 
 #include "test/mocks/upstream/host.h"
 
diff --git a/test/extensions/retry/host/previous_hosts/integration_test.cc b/test/extensions/retry/host/previous_hosts/integration_test.cc
index 12925d0906d7b..a433ad4e224b6 100644
--- a/test/extensions/retry/host/previous_hosts/integration_test.cc
+++ b/test/extensions/retry/host/previous_hosts/integration_test.cc
@@ -1,5 +1,5 @@
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/http_integration.h"
 
diff --git a/test/extensions/retry/priority/previous_priorities/config_test.cc b/test/extensions/retry/priority/previous_priorities/config_test.cc
index 2b7e88d8cacd3..c4ce6d6386d18 100644
--- a/test/extensions/retry/priority/previous_priorities/config_test.cc
+++ b/test/extensions/retry/priority/previous_priorities/config_test.cc
@@ -2,9 +2,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/upstream/retry.h"
 
-#include "common/protobuf/message_validator_impl.h"
-
-#include "extensions/retry/priority/previous_priorities/config.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/extensions/retry/priority/previous_priorities/config.h"
 
 #include "test/mocks/upstream/host.h"
 #include "test/mocks/upstream/host_set.h"
diff --git a/test/extensions/stats_sinks/common/statsd/statsd_test.cc b/test/extensions/stats_sinks/common/statsd/statsd_test.cc
index df6d10b649bbe..bdcb16fb02389 100644
--- a/test/extensions/stats_sinks/common/statsd/statsd_test.cc
+++ b/test/extensions/stats_sinks/common/statsd/statsd_test.cc
@@ -2,10 +2,9 @@
 #include <memory>
 #include <string>
 
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc b/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc
index 8d80c48b1d4dc..2b38075aa0622 100644
--- a/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc
+++ b/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc
@@ -3,12 +3,11 @@
 #include <string>
 #include <vector>
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/mocks/thread_local/mocks.h"
diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD
index a9a0057336fac..ee4ba39c66a10 100644
--- a/test/extensions/stats_sinks/dog_statsd/BUILD
+++ b/test/extensions/stats_sinks/dog_statsd/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.stat_sinks.dog_statsd",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/stat_sinks/dog_statsd:config",
         "//test/mocks/server:instance_mocks",
diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc
index cdb68d6e938b9..6a7e285bf5f11 100644
--- a/test/extensions/stats_sinks/dog_statsd/config_test.cc
+++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc
@@ -2,12 +2,11 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/well_known_names.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
-#include "extensions/stat_sinks/dog_statsd/config.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/extensions/stat_sinks/dog_statsd/config.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD
index 766094848f2a5..f00954626dbe4 100644
--- a/test/extensions/stats_sinks/hystrix/BUILD
+++ b/test/extensions/stats_sinks/hystrix/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.stat_sinks.hystrix",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/stat_sinks/hystrix:config",
         "//test/mocks/server:instance_mocks",
diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc
index 5a3c4c007e9f3..9a5b78b7024f9 100644
--- a/test/extensions/stats_sinks/hystrix/config_test.cc
+++ b/test/extensions/stats_sinks/hystrix/config_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/config/metrics/v3/stats.pb.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/utility.h"
-
-#include "extensions/stat_sinks/hystrix/config.h"
-#include "extensions/stat_sinks/hystrix/hystrix.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/stat_sinks/hystrix/config.h"
+#include "source/extensions/stat_sinks/hystrix/hystrix.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/stats_sinks/hystrix/hystrix_test.cc b/test/extensions/stats_sinks/hystrix/hystrix_test.cc
index c6b72f1a5078c..59d205a387731 100644
--- a/test/extensions/stats_sinks/hystrix/hystrix_test.cc
+++ b/test/extensions/stats_sinks/hystrix/hystrix_test.cc
@@ -2,9 +2,8 @@
 #include <memory>
 #include <sstream>
 
-#include "common/json/json_loader.h"
-
-#include "extensions/stat_sinks/hystrix/hystrix.h"
+#include "source/common/json/json_loader.h"
+#include "source/extensions/stat_sinks/hystrix/hystrix.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/admin.h"
diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD
index 20c0b58c158ac..3e666619dbb38 100644
--- a/test/extensions/stats_sinks/metrics_service/BUILD
+++ b/test/extensions/stats_sinks/metrics_service/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.stat_sinks.metrics_service",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/extensions/stat_sinks/metrics_service:config",
         "//test/test_common:utility_lib",
     ],
diff --git a/test/extensions/stats_sinks/metrics_service/config_test.cc b/test/extensions/stats_sinks/metrics_service/config_test.cc
index 0813088261b39..a9d557639e077 100644
--- a/test/extensions/stats_sinks/metrics_service/config_test.cc
+++ b/test/extensions/stats_sinks/metrics_service/config_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/registry/registry.h"
 
-#include "extensions/stat_sinks/metrics_service/config.h"
+#include "source/extensions/stat_sinks/metrics_service/config.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc
index 1ccf1bacdb59b..769983b8e1437 100644
--- a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc
+++ b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/service/metrics/v3/metrics_service.pb.h"
 
-#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
+#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc
index a66de95bf8573..2f43d87e8cc77 100644
--- a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc
+++ b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc
@@ -2,10 +2,10 @@
 #include "envoy/config/metrics/v3/metrics_service.pb.h"
 #include "envoy/service/metrics/v3/metrics_service.pb.h"
 
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/stats/histogram_impl.h"
-#include "common/version/version.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/extensions/stats_sinks/statsd/BUILD b/test/extensions/stats_sinks/statsd/BUILD
index b1c56f0466d8b..763e189dd5237 100644
--- a/test/extensions/stats_sinks/statsd/BUILD
+++ b/test/extensions/stats_sinks/statsd/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.stat_sinks.statsd",
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/stat_sinks/statsd:config",
         "//test/mocks/server:instance_mocks",
diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc
index 398ec890fc566..cbf1c02d6030c 100644
--- a/test/extensions/stats_sinks/statsd/config_test.cc
+++ b/test/extensions/stats_sinks/statsd/config_test.cc
@@ -3,12 +3,11 @@
 #include "envoy/network/address.h"
 #include "envoy/registry/registry.h"
 
-#include "common/config/well_known_names.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/stat_sinks/common/statsd/statsd.h"
-#include "extensions/stat_sinks/statsd/config.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/stat_sinks/common/statsd/statsd.h"
+#include "source/extensions/stat_sinks/statsd/config.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/stats_sinks/wasm/config_test.cc b/test/extensions/stats_sinks/wasm/config_test.cc
index 04d159cf541b6..0887d1b1ecb14 100644
--- a/test/extensions/stats_sinks/wasm/config_test.cc
+++ b/test/extensions/stats_sinks/wasm/config_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/extensions/stat_sinks/wasm/v3/wasm.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/common/wasm/wasm.h"
-#include "extensions/stat_sinks/wasm/config.h"
-#include "extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/common/wasm/wasm.h"
+#include "source/extensions/stat_sinks/wasm/config.h"
+#include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/server/mocks.h"
diff --git a/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc b/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc
index 1491d1512464b..7350cca93f3c6 100644
--- a/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc
+++ b/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc
@@ -7,7 +7,7 @@
 #include "proxy_wasm_intrinsics.h"
 #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h"
 #else
-#include "extensions/common/wasm/ext/envoy_null_plugin.h"
+#include "source/extensions/common/wasm/ext/envoy_null_plugin.h"
 #endif
 
 START_WASM_PLUGIN(CommonWasmTestContextCpp)
diff --git a/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc b/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc
index a87170efe6924..42e336089f34d 100644
--- a/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc
+++ b/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/server/lifecycle_notifier.h"
 
-#include "extensions/common/wasm/wasm.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/extensions/common/wasm/wasm_runtime.h"
 #include "test/mocks/upstream/mocks.h"
diff --git a/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc b/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc
index 1c7a49fe42556..f0cda348224e7 100644
--- a/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc
+++ b/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "extensions/tracers/common/ot/opentracing_driver_impl.h"
+#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/extensions/tracers/datadog/config_test.cc b/test/extensions/tracers/datadog/config_test.cc
index b591004204317..38b39d11439e9 100644
--- a/test/extensions/tracers/datadog/config_test.cc
+++ b/test/extensions/tracers/datadog/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/trace/v3/datadog.pb.validate.h"
 #include "envoy/config/trace/v3/http_tracer.pb.h"
 
-#include "extensions/tracers/datadog/config.h"
+#include "source/extensions/tracers/datadog/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc
index 6ab6d15075aaa..9018a16bd4977 100644
--- a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc
+++ b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc
@@ -5,14 +5,13 @@
 
 #include "envoy/config/trace/v3/datadog.pb.h"
 
-#include "common/common/base64.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/datadog/datadog_tracer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/datadog/datadog_tracer_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc
index 3ccabd8b3a3b7..52b3dd02aa211 100644
--- a/test/extensions/tracers/dynamic_ot/config_test.cc
+++ b/test/extensions/tracers/dynamic_ot/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h"
 #include "envoy/config/trace/v3/http_tracer.pb.h"
 
-#include "extensions/tracers/dynamic_ot/config.h"
+#include "source/extensions/tracers/dynamic_ot/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc b/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc
index 775270a09b698..49c64a013ce34 100644
--- a/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc
+++ b/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc
@@ -1,8 +1,7 @@
 #include <memory>
 
-#include "common/http/header_map_impl.h"
-
-#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc
index 94ff62d27dce2..2e290d88edde1 100644
--- a/test/extensions/tracers/lightstep/config_test.cc
+++ b/test/extensions/tracers/lightstep/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/trace/v3/lightstep.pb.h"
 #include "envoy/config/trace/v3/lightstep.pb.validate.h"
 
-#include "extensions/tracers/lightstep/config.h"
+#include "source/extensions/tracers/lightstep/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc
index 8f3a869325a4c..5fce7e07e4d58 100644
--- a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc
+++ b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc
@@ -5,16 +5,15 @@
 
 #include "envoy/config/trace/v3/lightstep.pb.h"
 
-#include "common/common/base64.h"
-#include "common/grpc/common.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/lightstep/lightstep_tracer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/tracers/opencensus/config_test.cc b/test/extensions/tracers/opencensus/config_test.cc
index ecb6b5d99c1c4..e6fe23920dbb9 100644
--- a/test/extensions/tracers/opencensus/config_test.cc
+++ b/test/extensions/tracers/opencensus/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/opencensus.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/tracers/opencensus/config.h"
+#include "source/extensions/tracers/opencensus/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/opencensus/tracer_test.cc b/test/extensions/tracers/opencensus/tracer_test.cc
index 67cba33bfb85a..b642bfac2d6ff 100644
--- a/test/extensions/tracers/opencensus/tracer_test.cc
+++ b/test/extensions/tracers/opencensus/tracer_test.cc
@@ -7,9 +7,8 @@
 
 #include "envoy/config/trace/v3/opencensus.pb.h"
 
-#include "common/common/base64.h"
-
-#include "extensions/tracers/opencensus/opencensus_tracer_impl.h"
+#include "source/common/common/base64.h"
+#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/tracers/skywalking/config_test.cc b/test/extensions/tracers/skywalking/config_test.cc
index f865525e09a3b..a81b1d376900d 100644
--- a/test/extensions/tracers/skywalking/config_test.cc
+++ b/test/extensions/tracers/skywalking/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/trace/v3/skywalking.pb.h"
 #include "envoy/config/trace/v3/skywalking.pb.validate.h"
 
-#include "extensions/tracers/skywalking/config.h"
+#include "source/extensions/tracers/skywalking/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/skywalking/skywalking_test_helper.h b/test/extensions/tracers/skywalking/skywalking_test_helper.h
index 51b25531d2d0d..7af27e5a0c077 100644
--- a/test/extensions/tracers/skywalking/skywalking_test_helper.h
+++ b/test/extensions/tracers/skywalking/skywalking_test_helper.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "common/common/base64.h"
-#include "common/common/hex.h"
-
+#include "source/common/common/base64.h"
+#include "source/common/common/hex.h"
 #include "source/tracing_context_impl.h"
 
 #include "test/test_common/utility.h"
diff --git a/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc b/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc
index 985c366ea1b92..83efd4ed11807 100644
--- a/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc
+++ b/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/skywalking/skywalking_tracer_impl.h"
+#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h"
 
 #include "test/extensions/tracers/skywalking/skywalking_test_helper.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc b/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc
index 8026d8d6d7af6..51f41313caa75 100644
--- a/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc
+++ b/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/skywalking/trace_segment_reporter.h"
+#include "source/extensions/tracers/skywalking/trace_segment_reporter.h"
 
 #include "test/extensions/tracers/skywalking/skywalking_test_helper.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/tracers/skywalking/tracer_test.cc b/test/extensions/tracers/skywalking/tracer_test.cc
index 26b68d4c73fa0..53f6a1d66eb31 100644
--- a/test/extensions/tracers/skywalking/tracer_test.cc
+++ b/test/extensions/tracers/skywalking/tracer_test.cc
@@ -1,6 +1,5 @@
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/skywalking/tracer.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/skywalking/tracer.h"
 
 #include "test/extensions/tracers/skywalking/skywalking_test_helper.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc
index 26b613eaec3a9..ef146def35bb2 100644
--- a/test/extensions/tracers/xray/config_test.cc
+++ b/test/extensions/tracers/xray/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/xray.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/tracers/xray/config.h"
+#include "source/extensions/tracers/xray/config.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/mocks/server/tracer_factory.h"
diff --git a/test/extensions/tracers/xray/fuzz_test.cc b/test/extensions/tracers/xray/fuzz_test.cc
index cbec8697ea8bb..f338be4080c73 100644
--- a/test/extensions/tracers/xray/fuzz_test.cc
+++ b/test/extensions/tracers/xray/fuzz_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/util.h"
+#include "source/extensions/tracers/xray/util.h"
 
 #include "test/fuzz/fuzz_runner.h"
 
diff --git a/test/extensions/tracers/xray/localized_sampling_test.cc b/test/extensions/tracers/xray/localized_sampling_test.cc
index d6056d7c6a3a0..c52fc80703fb5 100644
--- a/test/extensions/tracers/xray/localized_sampling_test.cc
+++ b/test/extensions/tracers/xray/localized_sampling_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/localized_sampling.h"
+#include "source/extensions/tracers/xray/localized_sampling.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/extensions/tracers/xray/tracer_test.cc b/test/extensions/tracers/xray/tracer_test.cc
index 3ff68ddbdddca..51c8a5ef66cd1 100644
--- a/test/extensions/tracers/xray/tracer_test.cc
+++ b/test/extensions/tracers/xray/tracer_test.cc
@@ -3,12 +3,10 @@
 
 #include "envoy/common/time.h"
 
-#include "common/protobuf/utility.h"
-
+#include "source/common/protobuf/utility.h"
 #include "source/extensions/tracers/xray/daemon.pb.h"
-
-#include "extensions/tracers/xray/tracer.h"
-#include "extensions/tracers/xray/xray_configuration.h"
+#include "source/extensions/tracers/xray/tracer.h"
+#include "source/extensions/tracers/xray/xray_configuration.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/mocks/tracing/mocks.h"
diff --git a/test/extensions/tracers/xray/util_test.cc b/test/extensions/tracers/xray/util_test.cc
index 9a5622dd4653c..9e06ad8828d35 100644
--- a/test/extensions/tracers/xray/util_test.cc
+++ b/test/extensions/tracers/xray/util_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/tracers/xray/util.h"
+#include "source/extensions/tracers/xray/util.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/tracers/xray/xray_tracer_impl_test.cc b/test/extensions/tracers/xray/xray_tracer_impl_test.cc
index ecfcd97767fc4..ba64f355aa97b 100644
--- a/test/extensions/tracers/xray/xray_tracer_impl_test.cc
+++ b/test/extensions/tracers/xray/xray_tracer_impl_test.cc
@@ -1,8 +1,8 @@
 #include <string>
 
-#include "extensions/tracers/xray/tracer.h"
-#include "extensions/tracers/xray/xray_configuration.h"
-#include "extensions/tracers/xray/xray_tracer_impl.h"
+#include "source/extensions/tracers/xray/tracer.h"
+#include "source/extensions/tracers/xray/xray_configuration.h"
+#include "source/extensions/tracers/xray/xray_tracer_impl.h"
 
 #include "test/mocks/server/tracer_factory_context.h"
 #include "test/mocks/thread_local/mocks.h"
diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD
index 9bd108b3801fd..81e5dcae4c080 100644
--- a/test/extensions/tracers/zipkin/BUILD
+++ b/test/extensions/tracers/zipkin/BUILD
@@ -23,8 +23,8 @@ envoy_extension_cc_test(
     extension_name = "envoy.tracers.zipkin",
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/common:time_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/common:hex_lib",
         "//source/common/common:utility_lib",
         "//source/common/network:address_lib",
diff --git a/test/extensions/tracers/zipkin/config_test.cc b/test/extensions/tracers/zipkin/config_test.cc
index 945a0e172d446..c3f9a71e46e68 100644
--- a/test/extensions/tracers/zipkin/config_test.cc
+++ b/test/extensions/tracers/zipkin/config_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/config/trace/v3/zipkin.pb.validate.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/tracers/zipkin/config.h"
+#include "source/extensions/tracers/zipkin/config.h"
 
 #include "test/mocks/server/tracer_factory.h"
 #include "test/mocks/server/tracer_factory_context.h"
diff --git a/test/extensions/tracers/zipkin/span_buffer_test.cc b/test/extensions/tracers/zipkin/span_buffer_test.cc
index 9af90529a713a..9ccb9c7b3fc03 100644
--- a/test/extensions/tracers/zipkin/span_buffer_test.cc
+++ b/test/extensions/tracers/zipkin/span_buffer_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/config/trace/v3/zipkin.pb.h"
 
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "extensions/tracers/zipkin/span_buffer.h"
-#include "extensions/tracers/zipkin/util.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/extensions/tracers/zipkin/span_buffer.h"
+#include "source/extensions/tracers/zipkin/util.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/tracers/zipkin/span_context_extractor_test.cc b/test/extensions/tracers/zipkin/span_context_extractor_test.cc
index 17977d4451c9f..1b6f41bf6ea01 100644
--- a/test/extensions/tracers/zipkin/span_context_extractor_test.cc
+++ b/test/extensions/tracers/zipkin/span_context_extractor_test.cc
@@ -1,7 +1,6 @@
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/zipkin/span_context.h"
-#include "extensions/tracers/zipkin/span_context_extractor.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/zipkin/span_context.h"
+#include "source/extensions/tracers/zipkin/span_context_extractor.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/tracers/zipkin/tracer_test.cc b/test/extensions/tracers/zipkin/tracer_test.cc
index 0aa869154e4fe..5ec104e2679c2 100644
--- a/test/extensions/tracers/zipkin/tracer_test.cc
+++ b/test/extensions/tracers/zipkin/tracer_test.cc
@@ -1,11 +1,10 @@
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/runtime/runtime_impl.h"
-
-#include "extensions/tracers/zipkin/tracer.h"
-#include "extensions/tracers/zipkin/util.h"
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/extensions/tracers/zipkin/tracer.h"
+#include "source/extensions/tracers/zipkin/util.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc
index cc4470820f24a..c31407a161e58 100644
--- a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc
+++ b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc
@@ -1,9 +1,8 @@
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_core_types.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_types.h"
 
 #include "test/test_common/simulated_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc
index 451637ce50c3c..059fb6063a0b7 100644
--- a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc
+++ b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc
@@ -5,14 +5,13 @@
 
 #include "envoy/config/trace/v3/zipkin.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/message_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/tracing/http_tracer_impl.h"
-
-#include "extensions/tracers/zipkin/zipkin_core_constants.h"
-#include "extensions/tracers/zipkin/zipkin_tracer_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/tracing/http_tracer_impl.h"
+#include "source/extensions/tracers/zipkin/zipkin_core_constants.h"
+#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/local_info/mocks.h"
diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD
index 3c3234d59ebb9..2abf137535c3c 100644
--- a/test/extensions/transport_sockets/alts/BUILD
+++ b/test/extensions/transport_sockets/alts/BUILD
@@ -40,7 +40,7 @@ envoy_extension_cc_test(
     srcs = ["tsi_handshaker_test.cc"],
     extension_name = "envoy.transport_sockets.alts",
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/extensions/transport_sockets/alts:tsi_handshaker",
         "//test/mocks/buffer:buffer_mocks",
         "//test/mocks/event:event_mocks",
@@ -52,7 +52,7 @@ envoy_extension_cc_test(
     srcs = ["tsi_socket_test.cc"],
     extension_name = "envoy.transport_sockets.alts",
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
         "//source/extensions/transport_sockets/alts:tsi_socket",
         "//test/mocks/buffer:buffer_mocks",
         "//test/mocks/event:event_mocks",
diff --git a/test/extensions/transport_sockets/alts/alts_integration_test.cc b/test/extensions/transport_sockets/alts/alts_integration_test.cc
index 92624f9181271..7571ef6560ab1 100644
--- a/test/extensions/transport_sockets/alts/alts_integration_test.cc
+++ b/test/extensions/transport_sockets/alts/alts_integration_test.cc
@@ -1,10 +1,9 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.h"
 
-#include "common/common/thread.h"
-
-#include "extensions/transport_sockets/alts/config.h"
-#include "extensions/transport_sockets/alts/tsi_socket.h"
+#include "source/common/common/thread.h"
+#include "source/extensions/transport_sockets/alts/config.h"
+#include "source/extensions/transport_sockets/alts/tsi_socket.h"
 
 #ifdef major
 #undef major
diff --git a/test/extensions/transport_sockets/alts/config_test.cc b/test/extensions/transport_sockets/alts/config_test.cc
index a3c233ad78224..625994ba5404e 100644
--- a/test/extensions/transport_sockets/alts/config_test.cc
+++ b/test/extensions/transport_sockets/alts/config_test.cc
@@ -1,7 +1,6 @@
-#include "common/protobuf/protobuf.h"
-#include "common/singleton/manager_impl.h"
-
-#include "extensions/transport_sockets/alts/config.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/extensions/transport_sockets/alts/config.h"
 
 #include "test/mocks/server/transport_socket_factory_context.h"
 
diff --git a/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc b/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc
index 5f3f31307192a..a0179d1a651a5 100644
--- a/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc
+++ b/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc
@@ -1,8 +1,7 @@
 #include "envoy/network/transport_socket.h"
 
-#include "common/network/io_socket_handle_impl.h"
-
-#include "extensions/transport_sockets/alts/noop_transport_socket_callbacks.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/extensions/transport_sockets/alts/noop_transport_socket_callbacks.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc
index 26e4941a626cd..186fc012b4113 100644
--- a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc
+++ b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc
@@ -1,6 +1,5 @@
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/transport_sockets/alts/tsi_frame_protector.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc
index 0b1afa2e0acce..ded6f76c69b97 100644
--- a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc
+++ b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/alts/tsi_handshaker.h"
+#include "source/extensions/transport_sockets/alts/tsi_handshaker.h"
 
 #include "test/mocks/event/mocks.h"
 
diff --git a/test/extensions/transport_sockets/alts/tsi_socket_test.cc b/test/extensions/transport_sockets/alts/tsi_socket_test.cc
index 046ff9d4032ae..b41069b6d6bc9 100644
--- a/test/extensions/transport_sockets/alts/tsi_socket_test.cc
+++ b/test/extensions/transport_sockets/alts/tsi_socket_test.cc
@@ -1,6 +1,6 @@
 
 
-#include "extensions/transport_sockets/alts/tsi_socket.h"
+#include "source/extensions/transport_sockets/alts/tsi_socket.h"
 
 #include "test/mocks/network/mocks.h"
 
diff --git a/test/extensions/transport_sockets/common/passthrough_test.cc b/test/extensions/transport_sockets/common/passthrough_test.cc
index cc983e0900e53..6dd45ae0f689f 100644
--- a/test/extensions/transport_sockets/common/passthrough_test.cc
+++ b/test/extensions/transport_sockets/common/passthrough_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/transport_sockets/common/passthrough.h"
+#include "source/extensions/transport_sockets/common/passthrough.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/transport_sockets/proxy_protocol/BUILD b/test/extensions/transport_sockets/proxy_protocol/BUILD
index fe2198041e436..4f9e6c504b665 100644
--- a/test/extensions/transport_sockets/proxy_protocol/BUILD
+++ b/test/extensions/transport_sockets/proxy_protocol/BUILD
@@ -16,7 +16,7 @@ envoy_extension_cc_test(
     srcs = ["proxy_protocol_test.cc"],
     extension_name = "envoy.transport_sockets.upstream_proxy_protocol",
     deps = [
-        "//include/envoy/network:proxy_protocol_options_lib",
+        "//envoy/network:proxy_protocol_options_lib",
         "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib",
         "//source/extensions/transport_sockets/proxy_protocol:upstream_proxy_protocol",
         "//test/mocks/buffer:buffer_mocks",
diff --git a/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc b/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc
index d23ad4a8961fc..eed0cc8ee1f7e 100644
--- a/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc
+++ b/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/config/core/v3/proxy_protocol.pb.h"
 #include "envoy/network/proxy_protocol.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/transport_socket_options_impl.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
-#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/network/io_handle.h"
diff --git a/test/extensions/transport_sockets/starttls/starttls_integration_test.cc b/test/extensions/transport_sockets/starttls/starttls_integration_test.cc
index 54394a8881ec2..9ee6e9ad3b3f9 100644
--- a/test/extensions/transport_sockets/starttls/starttls_integration_test.cc
+++ b/test/extensions/transport_sockets/starttls/starttls_integration_test.cc
@@ -3,10 +3,9 @@
 #include "envoy/network/filter.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/network/connection_impl.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/transport_sockets/raw_buffer/config.h"
+#include "source/common/network/connection_impl.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
 
 #include "test/config/utility.h"
 #include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.h"
diff --git a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc
index 28f51201395b0..4a69c58f17a32 100644
--- a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc
+++ b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc
@@ -5,9 +5,8 @@
 #include "envoy/extensions/transport_sockets/starttls/v3/starttls.pb.validate.h"
 #include "envoy/network/connection.h"
 
-#include "common/network/transport_socket_options_impl.h"
-
-#include "extensions/transport_sockets/starttls/starttls_socket.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/extensions/transport_sockets/starttls/starttls_socket.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/network/transport_socket.h"
diff --git a/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc b/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc
index d00af9e2389a0..ef6fa8c257c94 100644
--- a/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc
+++ b/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc
@@ -1,12 +1,11 @@
 #include "envoy/network/filter.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/network/connection_impl.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/transport_sockets/starttls/starttls_socket.h"
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/network/connection_impl.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/transport_sockets/starttls/starttls_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/config/utility.h"
 #include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.h"
diff --git a/test/extensions/transport_sockets/tap/tap_config_impl_test.cc b/test/extensions/transport_sockets/tap/tap_config_impl_test.cc
index b753b610f8201..3ed31cd6c2d62 100644
--- a/test/extensions/transport_sockets/tap/tap_config_impl_test.cc
+++ b/test/extensions/transport_sockets/tap/tap_config_impl_test.cc
@@ -1,6 +1,5 @@
-#include "common/network/address_impl.h"
-
-#include "extensions/transport_sockets/tap/tap_config_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/extensions/transport_sockets/tap/tap_config_impl.h"
 
 #include "test/extensions/common/tap/common.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/extensions/transport_sockets/tls/BUILD b/test/extensions/transport_sockets/tls/BUILD
index 46a64c50bbdfc..5c40298b8bc7d 100644
--- a/test/extensions/transport_sockets/tls/BUILD
+++ b/test/extensions/transport_sockets/tls/BUILD
@@ -28,7 +28,7 @@ envoy_cc_test(
     shard_count = 4,
     deps = [
         ":test_private_key_method_provider_test_lib",
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/common:empty_string",
         "//source/common/event:dispatcher_includes",
@@ -151,11 +151,11 @@ envoy_cc_test_library(
     ],
     external_deps = ["ssl"],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl/private_key:private_key_config_interface",
-        "//include/envoy/ssl/private_key:private_key_interface",
+        "//envoy/api:api_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl/private_key:private_key_config_interface",
+        "//envoy/ssl/private_key:private_key_interface",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
diff --git a/test/extensions/transport_sockets/tls/cert_validator/BUILD b/test/extensions/transport_sockets/tls/cert_validator/BUILD
index b16c619783155..7fd2c97084a17 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/BUILD
+++ b/test/extensions/transport_sockets/tls/cert_validator/BUILD
@@ -51,8 +51,8 @@ envoy_cc_test_library(
     name = "test_common",
     hdrs = ["test_common.h"],
     deps = [
-        "//include/envoy/ssl:context_config_interface",
-        "//include/envoy/ssl:ssl_socket_extended_info_interface",
+        "//envoy/ssl:context_config_interface",
+        "//envoy/ssl:ssl_socket_extended_info_interface",
         "//source/common/common:macros",
         "//test/test_common:utility_lib",
     ],
diff --git a/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc b/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc
index 6dcad995b36cd..44f8ff0e4e355 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc
+++ b/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc
@@ -1,7 +1,7 @@
 #include <string>
 #include <vector>
 
-#include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_test_utility.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc b/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc
index c06317b92f7b5..94cf5e7063fa4 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc
+++ b/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "extensions/transport_sockets/tls/cert_validator/factory.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/factory.h"
 
 #include "test/extensions/transport_sockets/tls/cert_validator/test_common.h"
 
diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc
index caacf4ba6b851..47acf98c4f533 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc
+++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/integration/integration.h"
 
diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc
index 3d014605254d7..cf77bdf3737a8 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc
+++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc
@@ -5,11 +5,10 @@
 
 #include "envoy/common/exception.h"
 
-#include "common/common/c_smart_ptr.h"
-#include "common/event/real_time_system.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h"
-#include "extensions/transport_sockets/tls/stats.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/event/real_time_system.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h"
+#include "source/extensions/transport_sockets/tls/stats.h"
 
 #include "test/extensions/transport_sockets/tls/cert_validator/test_common.h"
 #include "test/extensions/transport_sockets/tls/ssl_test_utility.h"
diff --git a/test/extensions/transport_sockets/tls/cert_validator/test_common.h b/test/extensions/transport_sockets/tls/cert_validator/test_common.h
index 9dac1b35cfb1b..c0cc7f28425fd 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/test_common.h
+++ b/test/extensions/transport_sockets/tls/cert_validator/test_common.h
@@ -3,8 +3,8 @@
 #include "envoy/ssl/context_config.h"
 #include "envoy/ssl/ssl_socket_extended_info.h"
 
-#include "common/common/macros.h"
-#include "common/common/matchers.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/matchers.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc b/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc
index d97d0f161f1e0..842fa24509ad1 100644
--- a/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc
+++ b/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc
@@ -1,6 +1,5 @@
-#include "common/common/c_smart_ptr.h"
-
-#include "extensions/transport_sockets/tls/cert_validator/utility.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/utility.h"
 
 #include "gtest/gtest.h"
 #include "openssl/ssl.h"
diff --git a/test/extensions/transport_sockets/tls/context_impl_test.cc b/test/extensions/transport_sockets/tls/context_impl_test.cc
index 6cb28fcd05f10..ef8fa8f72f485 100644
--- a/test/extensions/transport_sockets/tls/context_impl_test.cc
+++ b/test/extensions/transport_sockets/tls/context_impl_test.cc
@@ -6,14 +6,13 @@
 #include "envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.h"
 #include "envoy/type/matcher/v3/string.pb.h"
 
-#include "common/common/base64.h"
-#include "common/json/json_loader.h"
-#include "common/secret/sds_api.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_impl.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/common/base64.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/secret/sds_api.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_certs_test.h"
 #include "test/extensions/transport_sockets/tls/ssl_test_utility.h"
diff --git a/test/extensions/transport_sockets/tls/handshaker_factory_test.cc b/test/extensions/transport_sockets/tls/handshaker_factory_test.cc
index ef430d0d3db04..23903a2b73fa9 100644
--- a/test/extensions/transport_sockets/tls/handshaker_factory_test.cc
+++ b/test/extensions/transport_sockets/tls/handshaker_factory_test.cc
@@ -3,14 +3,12 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/ssl/handshaker.h"
 
-#include "common/stream_info/stream_info_impl.h"
-
-#include "server/process_context_impl.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/server/process_context_impl.h"
 
 #include "test/mocks/network/connection.h"
 #include "test/mocks/server/transport_socket_factory_context.h"
diff --git a/test/extensions/transport_sockets/tls/handshaker_test.cc b/test/extensions/transport_sockets/tls/handshaker_test.cc
index 82484f56dda0c..514109e2c70be 100644
--- a/test/extensions/transport_sockets/tls/handshaker_test.cc
+++ b/test/extensions/transport_sockets/tls/handshaker_test.cc
@@ -3,9 +3,8 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/ssl/handshaker.h"
 
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_certs_test.h"
 #include "test/mocks/network/connection.h"
diff --git a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc
index ff3a3212ef033..02d5e1240a025 100644
--- a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc
+++ b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc
@@ -12,13 +12,12 @@
 #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/network/connection_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_handshaker.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_handshaker.h"
 
 #include "test/extensions/common/tap/common.h"
 #include "test/integration/autonomous_upstream.h"
diff --git a/test/extensions/transport_sockets/tls/io_handle_bio_test.cc b/test/extensions/transport_sockets/tls/io_handle_bio_test.cc
index d0e845e44ad8a..155e8c0b07086 100644
--- a/test/extensions/transport_sockets/tls/io_handle_bio_test.cc
+++ b/test/extensions/transport_sockets/tls/io_handle_bio_test.cc
@@ -1,6 +1,5 @@
-#include "common/network/io_socket_error_impl.h"
-
-#include "extensions/transport_sockets/tls/io_handle_bio.h"
+#include "source/common/network/io_socket_error_impl.h"
+#include "source/extensions/transport_sockets/tls/io_handle_bio.h"
 
 #include "test/mocks/network/io_handle.h"
 
diff --git a/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc b/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc
index 85f0024627e30..163f3248e72c1 100644
--- a/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc
+++ b/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc
@@ -1,6 +1,6 @@
 #include <limits>
 
-#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h"
+#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc b/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc
index 78e813060d867..56acea5b0730a 100644
--- a/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc
+++ b/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc
@@ -1,7 +1,6 @@
-#include "common/filesystem/filesystem_impl.h"
-
-#include "extensions/transport_sockets/tls/ocsp/ocsp.h"
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/common/filesystem/filesystem_impl.h"
+#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_test_utility.h"
 #include "test/test_common/environment.h"
diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc
index 6ef7400a757ad..432216c5daa09 100644
--- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc
+++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc
@@ -7,20 +7,19 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/transport_socket_options_impl.h"
-#include "common/network/utility.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_impl.h"
-#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/transport_socket_options_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_certs_test.h"
 #include "test/extensions/transport_sockets/tls/test_data/ca_cert_info.h"
diff --git a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h
index 44bcece41f1f8..efe94936d2f3a 100644
--- a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h
+++ b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h
@@ -6,8 +6,8 @@
 #include "envoy/ssl/private_key/private_key.h"
 #include "envoy/ssl/private_key/private_key_config.h"
 
-#include "common/config/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/protobuf/utility.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc b/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc
index f1e90313b0ca8..690909fb9ac67 100644
--- a/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc
+++ b/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc
@@ -1,4 +1,4 @@
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/extensions/transport_sockets/tls/utility_test.cc b/test/extensions/transport_sockets/tls/utility_test.cc
index 32077060c04fc..531599c01be59 100644
--- a/test/extensions/transport_sockets/tls/utility_test.cc
+++ b/test/extensions/transport_sockets/tls/utility_test.cc
@@ -1,7 +1,7 @@
 #include <string>
 #include <vector>
 
-#include "extensions/transport_sockets/tls/utility.h"
+#include "source/extensions/transport_sockets/tls/utility.h"
 
 #include "test/extensions/transport_sockets/tls/ssl_test_utility.h"
 #include "test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h"
diff --git a/test/extensions/upstreams/http/config_test.cc b/test/extensions/upstreams/http/config_test.cc
index ee7e055953313..cd91d8c55f675 100644
--- a/test/extensions/upstreams/http/config_test.cc
+++ b/test/extensions/upstreams/http/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/upstreams/http/config.h"
+#include "source/extensions/upstreams/http/config.h"
 
 #include "test/mocks/protobuf/mocks.h"
 
diff --git a/test/extensions/upstreams/http/tcp/upstream_request_test.cc b/test/extensions/upstreams/http/tcp/upstream_request_test.cc
index 676030dc8748a..fad02b44fe118 100644
--- a/test/extensions/upstreams/http/tcp/upstream_request_test.cc
+++ b/test/extensions/upstreams/http/tcp/upstream_request_test.cc
@@ -1,11 +1,10 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/router/config_impl.h"
-#include "common/router/router.h"
-#include "common/router/upstream_request.h"
-
-#include "extensions/common/proxy_protocol/proxy_protocol_header.h"
-#include "extensions/upstreams/http/tcp/upstream_request.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/router/router.h"
+#include "source/common/router/upstream_request.h"
+#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h"
+#include "source/extensions/upstreams/http/tcp/upstream_request.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/common.h"
diff --git a/test/extensions/upstreams/tcp/generic/config_test.cc b/test/extensions/upstreams/tcp/generic/config_test.cc
index f4a69e2c7a5fd..2e8a638356db5 100644
--- a/test/extensions/upstreams/tcp/generic/config_test.cc
+++ b/test/extensions/upstreams/tcp/generic/config_test.cc
@@ -1,4 +1,4 @@
-#include "extensions/upstreams/tcp/generic/config.h"
+#include "source/extensions/upstreams/tcp/generic/config.h"
 
 #include "test/mocks/tcp/mocks.h"
 #include "test/mocks/upstream/cluster_manager.h"
diff --git a/test/extensions/watchdog/profile_action/BUILD b/test/extensions/watchdog/profile_action/BUILD
index fb8c662ea7bc7..866d8b63d747a 100644
--- a/test/extensions/watchdog/profile_action/BUILD
+++ b/test/extensions/watchdog/profile_action/BUILD
@@ -19,9 +19,9 @@ envoy_extension_cc_test(
         "abseil_synchronization",
     ],
     deps = [
-        "//include/envoy/common:time_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:guarddog_config_interface",
+        "//envoy/common:time_interface",
+        "//envoy/registry",
+        "//envoy/server:guarddog_config_interface",
         "//source/common/filesystem:directory_lib",
         "//source/common/profiler:profiler_lib",
         "//source/extensions/watchdog/profile_action:config",
@@ -41,8 +41,8 @@ envoy_extension_cc_test(
     srcs = ["config_test.cc"],
     extension_name = "envoy.watchdog.profile_action",
     deps = [
-        "//include/envoy/registry",
-        "//include/envoy/server:guarddog_config_interface",
+        "//envoy/registry",
+        "//envoy/server:guarddog_config_interface",
         "//source/extensions/watchdog/profile_action:config",
         "//source/extensions/watchdog/profile_action:profile_action_lib",
         "//test/common/stats:stat_test_utility_lib",
diff --git a/test/extensions/watchdog/profile_action/config_test.cc b/test/extensions/watchdog/profile_action/config_test.cc
index 2603eeec2f57c..157128a62af99 100644
--- a/test/extensions/watchdog/profile_action/config_test.cc
+++ b/test/extensions/watchdog/profile_action/config_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/guarddog_config.h"
 
-#include "extensions/watchdog/profile_action/config.h"
+#include "source/extensions/watchdog/profile_action/config.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/extensions/watchdog/profile_action/profile_action_test.cc b/test/extensions/watchdog/profile_action/profile_action_test.cc
index 40f9085eff04b..d35bea645dc18 100644
--- a/test/extensions/watchdog/profile_action/profile_action_test.cc
+++ b/test/extensions/watchdog/profile_action/profile_action_test.cc
@@ -8,12 +8,11 @@
 #include "envoy/server/guarddog_config.h"
 #include "envoy/thread/thread.h"
 
-#include "common/common/assert.h"
-#include "common/filesystem/directory.h"
-#include "common/profiler/profiler.h"
-
-#include "extensions/watchdog/profile_action/config.h"
-#include "extensions/watchdog/profile_action/profile_action.h"
+#include "source/common/common/assert.h"
+#include "source/common/filesystem/directory.h"
+#include "source/common/profiler/profiler.h"
+#include "source/extensions/watchdog/profile_action/config.h"
+#include "source/extensions/watchdog/profile_action/profile_action.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD
index 6c3ef4f966961..6a8ea1e891d59 100644
--- a/test/fuzz/BUILD
+++ b/test/fuzz/BUILD
@@ -78,7 +78,7 @@ envoy_cc_test_library(
     name = "random_lib",
     hdrs = ["random.h"],
     deps = [
-        "//include/envoy/common:random_generator_interface",
+        "//envoy/common:random_generator_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
     ],
diff --git a/test/fuzz/fuzz_runner.cc b/test/fuzz/fuzz_runner.cc
index bda9446b39e9c..618116a2f382d 100644
--- a/test/fuzz/fuzz_runner.cc
+++ b/test/fuzz/fuzz_runner.cc
@@ -1,11 +1,10 @@
 #include "test/fuzz/fuzz_runner.h"
 
-#include "common/common/thread.h"
-#include "common/common/utility.h"
-#include "common/event/libevent.h"
-#include "common/http/http2/codec_impl.h"
-
-#include "exe/process_wide.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
+#include "source/common/event/libevent.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/exe/process_wide.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/fuzz/main.cc b/test/fuzz/main.cc
index d1c98eb6eed9f..b339336620de3 100644
--- a/test/fuzz/main.cc
+++ b/test/fuzz/main.cc
@@ -12,8 +12,8 @@
 // neat, as we get features likes --gtest_filter to select over the corpus
 // and the reporting features of gtest.
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/test_common/environment.h"
@@ -22,7 +22,7 @@
 #include "absl/debugging/symbolize.h"
 
 #ifdef ENVOY_HANDLE_SIGNALS
-#include "common/signal/signal_action.h"
+#include "source/common/signal/signal_action.h"
 #endif
 
 #include "gtest/gtest.h"
diff --git a/test/fuzz/random.h b/test/fuzz/random.h
index 574f1f804f379..bcf738bf262fa 100644
--- a/test/fuzz/random.h
+++ b/test/fuzz/random.h
@@ -7,8 +7,8 @@
 
 #include "envoy/common/random_generator.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 namespace Random {
diff --git a/test/fuzz/utility.h b/test/fuzz/utility.h
index cfa95039e1149..002eab8571a74 100644
--- a/test/fuzz/utility.h
+++ b/test/fuzz/utility.h
@@ -2,10 +2,10 @@
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/common/empty_string.h"
-#include "common/network/resolver_impl.h"
-#include "common/network/socket_impl.h"
-#include "common/network/utility.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/network/resolver_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/common/stream_info/test_util.h"
 #include "test/fuzz/common.pb.h"
diff --git a/test/integration/BUILD b/test/integration/BUILD
index baacc7c864d40..dbea0c188ff02 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -179,7 +179,7 @@ envoy_cc_test(
     srcs = ["cluster_filter_integration_test.cc"],
     deps = [
         ":integration_lib",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:filter_interface",
         "//source/extensions/filters/network/tcp_proxy:config",
         "//test/config:utility_lib",
         "//test/test_common:registry_lib",
@@ -537,7 +537,7 @@ envoy_cc_test(
     ],
     deps = [
         ":http_protocol_integration_lib",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//source/common/stats:histogram_lib",
         "//source/common/stats:stats_matcher_lib",
         "//source/extensions/filters/http/buffer:config",
@@ -558,7 +558,7 @@ envoy_cc_test_library(
         "test_host_predicate_config.h",
     ],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
     ],
 )
 
@@ -576,7 +576,7 @@ envoy_cc_test_library(
     deps = [
         ":integration_lib",
         ":test_host_predicate_lib",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:thread_annotations",
         "//source/common/network:socket_option_lib",
         "//source/extensions/filters/http/on_demand:config",
@@ -640,10 +640,10 @@ envoy_cc_test_library(
         "integration_stream_decoder.h",
     ],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/http:metadata_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/http:metadata_interface",
         "//source/common/common:dump_state_utils",
         "//test/test_common:utility_lib",
     ],
@@ -659,11 +659,11 @@ envoy_cc_test_library(
     ],
     deps = [
         ":utility_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:address_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/network:socket_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:address_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/network:socket_interface",
         "//test/mocks/buffer:buffer_mocks",
         "//test/test_common:network_utility_lib",
         "//test/test_common:utility_lib",
@@ -679,13 +679,13 @@ envoy_cc_test_library(
         "fake_upstream.h",
     ],
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/grpc:status",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/api:api_interface",
+        "//envoy/grpc:status",
+        "//envoy/http:codec_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/common:basic_resource_lib",
@@ -784,13 +784,13 @@ envoy_cc_test_library(
     deps = [
         ":server_stats_interface",
         ":tcp_dump",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/server:process_context_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/server:options_interface",
+        "//envoy/server:process_context_interface",
+        "//envoy/stats:stats_interface",
         "//source/common/api:api_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:lock_guard_lib",
@@ -847,19 +847,19 @@ envoy_cc_test_library(
         ":integration_stream_decoder_lib",
         ":integration_tcp_client_lib",
         ":utility_lib",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/grpc:status",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server:hot_restart_interface",
-        "//include/envoy/server:options_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/thread:thread_interface",
+        "//envoy/api:api_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/grpc:status",
+        "//envoy/http:codec_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server:hot_restart_interface",
+        "//envoy/server:options_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/thread:thread_interface",
         "//source/common/api:api_lib",
         "//source/common/buffer:buffer_lib",
         "//source/common/buffer:zero_copy_input_stream_lib",
@@ -1054,7 +1054,7 @@ envoy_cc_test(
     deps = [
         ":http_integration_lib",
         ":integration_lib",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/config:metadata_lib",
         "//source/common/json:json_loader_lib",
         "//source/common/network:utility_lib",
@@ -1146,8 +1146,8 @@ envoy_cc_test_library(
     name = "server_stats_interface",
     hdrs = ["server_stats.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/stats:stats_interface",
     ],
 )
 
@@ -1223,7 +1223,7 @@ envoy_cc_test(
     ],
     deps = [
         ":http_integration_lib",
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/grpc:common_lib",
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
@@ -1298,8 +1298,8 @@ envoy_cc_test(
     ],
     deps = [
         ":integration_lib",
-        "//include/envoy/server:filter_config_interface",
-        "//include/envoy/tcp:conn_pool_interface",
+        "//envoy/server:filter_config_interface",
+        "//envoy/tcp:conn_pool_interface",
         "//test/server:utility_lib",
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
@@ -1632,8 +1632,8 @@ envoy_cc_test(
     srcs = ["cx_limit_integration_test.cc"],
     deps = [
         ":http_integration_lib",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/network:filter_interface",
+        "//envoy/registry",
         "//source/extensions/filters/network/tcp_proxy:config",
         "//test/config:utility_lib",
         "//test/test_common:logging_lib",
diff --git a/test/integration/ads_integration.cc b/test/integration/ads_integration.cc
index 5d19303690533..dfa3b81539b94 100644
--- a/test/integration/ads_integration.cc
+++ b/test/integration/ads_integration.cc
@@ -8,9 +8,9 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/config/protobuf_link_hacks.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/test_common/network_utility.h"
 #include "test/test_common/resources.h"
diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc
index 739b6d9f896b6..f8045c2ad55a7 100644
--- a/test/integration/ads_integration_test.cc
+++ b/test/integration/ads_integration_test.cc
@@ -6,11 +6,11 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/grpc/status.h"
 
-#include "common/config/protobuf_link_hacks.h"
-#include "common/config/version_converter.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/version/version.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/version/version.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/ads_integration.h"
diff --git a/test/integration/alpn_selection_integration_test.cc b/test/integration/alpn_selection_integration_test.cc
index 052bc5e14f752..da784ec70e3cf 100644
--- a/test/integration/alpn_selection_integration_test.cc
+++ b/test/integration/alpn_selection_integration_test.cc
@@ -2,11 +2,10 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/http/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/http/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/integration/http_integration.h"
 
diff --git a/test/integration/base_integration_test.cc b/test/integration/base_integration_test.cc
index 012197a98f1fd..6ecfd4acd819d 100644
--- a/test/integration/base_integration_test.cc
+++ b/test/integration/base_integration_test.cc
@@ -15,15 +15,14 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/common/thread.h"
-#include "common/config/api_version.h"
-#include "common/event/libevent.h"
-#include "common/network/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/api_version.h"
+#include "source/common/event/libevent.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/base_integration_test.h b/test/integration/base_integration_test.h
index 37230364cd60a..0a76bb8da54e2 100644
--- a/test/integration/base_integration_test.h
+++ b/test/integration/base_integration_test.h
@@ -8,10 +8,9 @@
 #include "envoy/server/process_context.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/config/version_converter.h"
-
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/version_converter.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/config/utility.h"
diff --git a/test/integration/buffer_accounting_integration_test.cc b/test/integration/buffer_accounting_integration_test.cc
index 1ccfdb1121336..b11c916e568be 100644
--- a/test/integration/buffer_accounting_integration_test.cc
+++ b/test/integration/buffer_accounting_integration_test.cc
@@ -5,7 +5,7 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/network/address.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/tracked_watermark_buffer.h"
diff --git a/test/integration/cds_integration_test.cc b/test/integration/cds_integration_test.cc
index 0377cdcb1da2d..4b62e426f0215 100644
--- a/test/integration/cds_integration_test.cc
+++ b/test/integration/cds_integration_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/protobuf_link_hacks.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/cluster_upstream_extension_integration_test.cc b/test/integration/cluster_upstream_extension_integration_test.cc
index dfbc519933ddc..163d628a175bc 100644
--- a/test/integration/cluster_upstream_extension_integration_test.cc
+++ b/test/integration/cluster_upstream_extension_integration_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/router/router.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/integration/fake_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/clusters/BUILD b/test/integration/clusters/BUILD
index 97b137eb75f70..2279cb450a9d4 100644
--- a/test/integration/clusters/BUILD
+++ b/test/integration/clusters/BUILD
@@ -19,10 +19,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":cluster_factory_config_proto_cc_proto",
-        "//include/envoy/api:api_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/api:api_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/event:dispatcher_lib",
         "//source/common/network:utility_lib",
         "//source/common/singleton:manager_impl_lib",
diff --git a/test/integration/clusters/custom_static_cluster.h b/test/integration/clusters/custom_static_cluster.h
index 7b6c7dafa96ae..8b91386ac0d4f 100644
--- a/test/integration/clusters/custom_static_cluster.h
+++ b/test/integration/clusters/custom_static_cluster.h
@@ -11,10 +11,9 @@
 #include "envoy/http/codec.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/network/address_impl.h"
-#include "common/upstream/cluster_factory_impl.h"
-
-#include "server/transport_socket_config_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/upstream/cluster_factory_impl.h"
+#include "source/server/transport_socket_config_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/integration/clusters/cluster_factory_config.pb.h"
diff --git a/test/integration/custom_cluster_integration_test.cc b/test/integration/custom_cluster_integration_test.cc
index ecd21ccddf05d..74e4b9d7eed8f 100644
--- a/test/integration/custom_cluster_integration_test.cc
+++ b/test/integration/custom_cluster_integration_test.cc
@@ -1,8 +1,8 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 
-#include "common/network/address_impl.h"
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "test/config/utility.h"
 #include "test/integration/clusters/cluster_factory_config.pb.h"
diff --git a/test/integration/cx_limit_integration_test.cc b/test/integration/cx_limit_integration_test.cc
index 7f0639bf95dd8..fd3c1bbb6fb1f 100644
--- a/test/integration/cx_limit_integration_test.cc
+++ b/test/integration/cx_limit_integration_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/network/filter.h"
 #include "envoy/registry/registry.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 #include "test/config/utility.h"
 #include "test/integration/integration.h"
diff --git a/test/integration/dynamic_validation_integration_test.cc b/test/integration/dynamic_validation_integration_test.cc
index d9cde92eeffec..e6f7c5dddc53d 100644
--- a/test/integration/dynamic_validation_integration_test.cc
+++ b/test/integration/dynamic_validation_integration_test.cc
@@ -3,7 +3,7 @@
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h"
 
-#include "extensions/filters/network/common/factory_base.h"
+#include "source/extensions/filters/network/common/factory_base.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/environment.h"
diff --git a/test/integration/eds_integration_test.cc b/test/integration/eds_integration_test.cc
index ddef6576eab4d..455f1f39e7337 100644
--- a/test/integration/eds_integration_test.cc
+++ b/test/integration/eds_integration_test.cc
@@ -5,7 +5,7 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/type/v3/http.pb.h"
 
-#include "common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/load_balancer_impl.h"
 
 #include "test/config/utility.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/fake_upstream.cc b/test/integration/fake_upstream.cc
index eea2fabc5cf2d..a945b00471128 100644
--- a/test/integration/fake_upstream.cc
+++ b/test/integration/fake_upstream.cc
@@ -5,21 +5,21 @@
 #include <memory>
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/config/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_factory.h"
-#include "common/network/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/network/utility.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/codec_impl.h"
+#include "source/common/quic/codec_impl.h"
 #endif
 
-#include "server/connection_handler_impl.h"
+#include "source/server/connection_handler_impl.h"
 
 #include "test/test_common/network_utility.h"
 #include "test/test_common/utility.h"
diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h
index 5ae48faf275bf..580da4db816b3 100644
--- a/test/integration/fake_upstream.h
+++ b/test/integration/fake_upstream.h
@@ -15,32 +15,32 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/scope.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/zero_copy_input_stream_impl.h"
-#include "common/common/basic_resource_impl.h"
-#include "common/common/callback_impl.h"
-#include "common/common/linked_object.h"
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-#include "common/config/utility.h"
-#include "common/grpc/codec.h"
-#include "common/grpc/common.h"
-#include "common/http/http1/codec_impl.h"
-#include "common/http/http2/codec_impl.h"
-#include "common/http/http3/codec_stats.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/filter_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/zero_copy_input_stream_impl.h"
+#include "source/common/common/basic_resource_impl.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/common/linked_object.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/utility.h"
+#include "source/common/grpc/codec.h"
+#include "source/common/grpc/common.h"
+#include "source/common/http/http1/codec_impl.h"
+#include "source/common/http/http2/codec_impl.h"
+#include "source/common/http/http3/codec_stats.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/filter_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #if defined(ENVOY_ENABLE_QUIC)
-#include "common/quic/active_quic_listener.h"
-#include "common/quic/quic_stat_names.h"
+#include "source/common/quic/active_quic_listener.h"
+#include "source/common/quic/quic_stat_names.h"
 #endif
 
-#include "server/active_raw_udp_listener_config.h"
+#include "source/server/active_raw_udp_listener_config.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/test_time_system.h"
diff --git a/test/integration/filter_manager_integration_test.cc b/test/integration/filter_manager_integration_test.cc
index 2640f5a17472f..ee5db8d4674ca 100644
--- a/test/integration/filter_manager_integration_test.cc
+++ b/test/integration/filter_manager_integration_test.cc
@@ -9,9 +9,8 @@
 #include "envoy/network/filter.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/network/common/factory_base.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/network/common/factory_base.h"
 
 #include "test/integration/filter_manager_integration_test.pb.h"
 #include "test/integration/filter_manager_integration_test.pb.validate.h"
diff --git a/test/integration/filters/BUILD b/test/integration/filters/BUILD
index b7ec16e374bf3..52477e4957a21 100644
--- a/test/integration/filters/BUILD
+++ b/test/integration/filters/BUILD
@@ -16,9 +16,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -31,9 +31,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -46,9 +46,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -61,9 +61,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -76,9 +76,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -91,9 +91,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -106,9 +106,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -120,9 +120,9 @@ envoy_cc_test_library(
         "add_trailers_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -134,9 +134,9 @@ envoy_cc_test_library(
         "backpressure_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -149,9 +149,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -163,10 +163,10 @@ envoy_cc_test_library(
         "eds_ready_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/http:header_map_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/http:header_map_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/stats:symbol_table_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -179,9 +179,9 @@ envoy_cc_test_library(
         "modify_buffer_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -193,9 +193,9 @@ envoy_cc_test_library(
         "on_local_reply_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -208,9 +208,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -222,8 +222,8 @@ envoy_cc_test_library(
         "pause_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/common/network:connection_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -237,8 +237,8 @@ envoy_cc_test_library(
     ],
     tags = ["nofips"],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/common/quic:quic_filter_manager_connection_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -254,9 +254,9 @@ envoy_cc_test_library(
         "process_context_filter.h",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:process_context_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:process_context_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -269,8 +269,8 @@ envoy_cc_test_library(
     ],
     deps = [
         ":set_response_code_filter_config_proto_cc_proto",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
@@ -288,8 +288,8 @@ envoy_cc_test_library(
     ],
     deps = [
         ":set_is_terminal_filter_config_proto_cc_proto",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
@@ -312,9 +312,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":stop_and_continue_filter_config_proto_cc_proto",
-        "//include/envoy/common:scope_tracker_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/common:scope_tracker_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/common/common:scope_tracker",
         "//source/common/network:connection_lib",
         "//source/extensions/filters/http/common:factory_base_lib",
@@ -329,8 +329,8 @@ envoy_cc_test_library(
         "common.h",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
         "//test/test_common:utility_lib",
     ],
@@ -342,9 +342,9 @@ envoy_cc_test_library(
         "request_metadata_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -356,8 +356,8 @@ envoy_cc_test_library(
         "random_pause_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
         "//source/common/network:connection_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -371,9 +371,9 @@ envoy_cc_test_library(
         "response_metadata_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -386,10 +386,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -402,10 +402,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -418,10 +418,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -434,10 +434,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -449,9 +449,9 @@ envoy_cc_test_library(
         "encoder_decoder_buffer_filter.cc",
     ],
     deps = [
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
@@ -466,7 +466,7 @@ envoy_cc_test_library(
         "test_socket_interface.h",
     ],
     deps = [
-        "//include/envoy/network:socket_interface",
+        "//envoy/network:socket_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:utility_lib",
         "//source/common/network:address_lib",
@@ -483,9 +483,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/http:header_utility_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -499,10 +499,10 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:listen_socket_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:listen_socket_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/network:address_lib",
@@ -518,9 +518,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/common/router:delegating_route_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
@@ -535,9 +535,9 @@ envoy_cc_test_library(
     ],
     deps = [
         ":common_lib",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/registry",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/registry",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/extensions/filters/http/common:empty_http_filter_config_lib",
     ],
diff --git a/test/integration/filters/add_body_filter.cc b/test/integration/filters/add_body_filter.cc
index 51faeb1e7b198..0f8b968e1417a 100644
--- a/test/integration/filters/add_body_filter.cc
+++ b/test/integration/filters/add_body_filter.cc
@@ -4,9 +4,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/add_trailers_filter.cc b/test/integration/filters/add_trailers_filter.cc
index 744750aa4a47e..f97b1ad5153b0 100644
--- a/test/integration/filters/add_trailers_filter.cc
+++ b/test/integration/filters/add_trailers_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/address_restore_listener_filter.cc b/test/integration/filters/address_restore_listener_filter.cc
index c769994b9644d..f0d6945019760 100644
--- a/test/integration/filters/address_restore_listener_filter.cc
+++ b/test/integration/filters/address_restore_listener_filter.cc
@@ -4,8 +4,8 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 
diff --git a/test/integration/filters/backpressure_filter.cc b/test/integration/filters/backpressure_filter.cc
index e5eb9ec6ea9af..b45ec99917367 100644
--- a/test/integration/filters/backpressure_filter.cc
+++ b/test/integration/filters/backpressure_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/call_decodedata_once_filter.cc b/test/integration/filters/call_decodedata_once_filter.cc
index 520dbad96b821..adecc086186f4 100644
--- a/test/integration/filters/call_decodedata_once_filter.cc
+++ b/test/integration/filters/call_decodedata_once_filter.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/clear_route_cache_filter.cc b/test/integration/filters/clear_route_cache_filter.cc
index 31102ee3c7ebb..95d39a9611314 100644
--- a/test/integration/filters/clear_route_cache_filter.cc
+++ b/test/integration/filters/clear_route_cache_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/continue_after_local_reply_filter.cc b/test/integration/filters/continue_after_local_reply_filter.cc
index be79f0c84ccf2..acad17b278fc0 100644
--- a/test/integration/filters/continue_after_local_reply_filter.cc
+++ b/test/integration/filters/continue_after_local_reply_filter.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/continue_headers_only_inject_body_filter.cc b/test/integration/filters/continue_headers_only_inject_body_filter.cc
index 22f1519a3a14a..b26bb93a639b5 100644
--- a/test/integration/filters/continue_headers_only_inject_body_filter.cc
+++ b/test/integration/filters/continue_headers_only_inject_body_filter.cc
@@ -4,9 +4,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/decode_headers_return_stop_all_filter.cc b/test/integration/filters/decode_headers_return_stop_all_filter.cc
index 91edadb751537..96481d7112e5a 100644
--- a/test/integration/filters/decode_headers_return_stop_all_filter.cc
+++ b/test/integration/filters/decode_headers_return_stop_all_filter.cc
@@ -6,9 +6,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/eds_ready_filter.cc b/test/integration/filters/eds_ready_filter.cc
index 2eaaf0b8e43ab..4c78e2e5fa43d 100644
--- a/test/integration/filters/eds_ready_filter.cc
+++ b/test/integration/filters/eds_ready_filter.cc
@@ -6,9 +6,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/encode_headers_return_stop_all_filter.cc b/test/integration/filters/encode_headers_return_stop_all_filter.cc
index 2254204ec1003..8d55d6c8252ef 100644
--- a/test/integration/filters/encode_headers_return_stop_all_filter.cc
+++ b/test/integration/filters/encode_headers_return_stop_all_filter.cc
@@ -6,9 +6,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/encoder_decoder_buffer_filter.cc b/test/integration/filters/encoder_decoder_buffer_filter.cc
index 22050f5cfcf38..da1019e45220c 100644
--- a/test/integration/filters/encoder_decoder_buffer_filter.cc
+++ b/test/integration/filters/encoder_decoder_buffer_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/invalid_header_filter.cc b/test/integration/filters/invalid_header_filter.cc
index 7c11203566624..ca3aef326c441 100644
--- a/test/integration/filters/invalid_header_filter.cc
+++ b/test/integration/filters/invalid_header_filter.cc
@@ -4,9 +4,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/http/header_utility.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/http/header_utility.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/local_reply_during_encoding_data_filter.cc b/test/integration/filters/local_reply_during_encoding_data_filter.cc
index 34066ba57c83f..be325b1c1d21f 100644
--- a/test/integration/filters/local_reply_during_encoding_data_filter.cc
+++ b/test/integration/filters/local_reply_during_encoding_data_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/local_reply_during_encoding_filter.cc b/test/integration/filters/local_reply_during_encoding_filter.cc
index 54a6fadce8e95..34f78c6baf607 100644
--- a/test/integration/filters/local_reply_during_encoding_filter.cc
+++ b/test/integration/filters/local_reply_during_encoding_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/local_reply_with_metadata_filter.cc b/test/integration/filters/local_reply_with_metadata_filter.cc
index 07580be29c6af..68647dc3bbec6 100644
--- a/test/integration/filters/local_reply_with_metadata_filter.cc
+++ b/test/integration/filters/local_reply_with_metadata_filter.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/metadata_stop_all_filter.cc b/test/integration/filters/metadata_stop_all_filter.cc
index c7da739574179..8289bc6a0ef52 100644
--- a/test/integration/filters/metadata_stop_all_filter.cc
+++ b/test/integration/filters/metadata_stop_all_filter.cc
@@ -6,9 +6,8 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/modify_buffer_filter.cc b/test/integration/filters/modify_buffer_filter.cc
index 1124cb96052ae..daffa70497e77 100644
--- a/test/integration/filters/modify_buffer_filter.cc
+++ b/test/integration/filters/modify_buffer_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/on_local_reply_filter.cc b/test/integration/filters/on_local_reply_filter.cc
index c47f053903c65..75a3b712b130a 100644
--- a/test/integration/filters/on_local_reply_filter.cc
+++ b/test/integration/filters/on_local_reply_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/passthrough_filter.cc b/test/integration/filters/passthrough_filter.cc
index ee828a51d0f84..215446233dd99 100644
--- a/test/integration/filters/passthrough_filter.cc
+++ b/test/integration/filters/passthrough_filter.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/pause_filter.cc b/test/integration/filters/pause_filter.cc
index b7f9aa1a3c360..307372a0def65 100644
--- a/test/integration/filters/pause_filter.cc
+++ b/test/integration/filters/pause_filter.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/registry/registry.h"
 
-#include "common/network/connection_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/network/connection_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/pause_filter_for_quic.cc b/test/integration/filters/pause_filter_for_quic.cc
index de63bd7e47d5f..d7d9943c2ca1f 100644
--- a/test/integration/filters/pause_filter_for_quic.cc
+++ b/test/integration/filters/pause_filter_for_quic.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/registry/registry.h"
 
-#include "common/quic/quic_filter_manager_connection_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/quic/quic_filter_manager_connection_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/process_context_filter.cc b/test/integration/filters/process_context_filter.cc
index 25772dac574db..74c9322bc978a 100644
--- a/test/integration/filters/process_context_filter.cc
+++ b/test/integration/filters/process_context_filter.cc
@@ -8,7 +8,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/random_pause_filter.cc b/test/integration/filters/random_pause_filter.cc
index e1a370ca015ca..2a674237d92e9 100644
--- a/test/integration/filters/random_pause_filter.cc
+++ b/test/integration/filters/random_pause_filter.cc
@@ -2,9 +2,8 @@
 
 #include "envoy/registry/registry.h"
 
-#include "common/network/connection_impl.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/network/connection_impl.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/test_common/utility.h"
diff --git a/test/integration/filters/remove_response_headers.cc b/test/integration/filters/remove_response_headers.cc
index 20043cf7fd4b2..b342d05419431 100644
--- a/test/integration/filters/remove_response_headers.cc
+++ b/test/integration/filters/remove_response_headers.cc
@@ -1,7 +1,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/request_metadata_filter.cc b/test/integration/filters/request_metadata_filter.cc
index ff4e7ba2033e3..2f56f16592330 100644
--- a/test/integration/filters/request_metadata_filter.cc
+++ b/test/integration/filters/request_metadata_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/response_metadata_filter.cc b/test/integration/filters/response_metadata_filter.cc
index a45aa8c7586b6..73fdee7008ec7 100644
--- a/test/integration/filters/response_metadata_filter.cc
+++ b/test/integration/filters/response_metadata_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 
diff --git a/test/integration/filters/set_is_terminal_filter.cc b/test/integration/filters/set_is_terminal_filter.cc
index bc693629451fb..6b8a835d4254e 100644
--- a/test/integration/filters/set_is_terminal_filter.cc
+++ b/test/integration/filters/set_is_terminal_filter.cc
@@ -3,8 +3,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/integration/filters/set_is_terminal_filter_config.pb.h"
 #include "test/integration/filters/set_is_terminal_filter_config.pb.validate.h"
diff --git a/test/integration/filters/set_response_code_filter.cc b/test/integration/filters/set_response_code_filter.cc
index e9964b8a58e53..b18c4fe6a6923 100644
--- a/test/integration/filters/set_response_code_filter.cc
+++ b/test/integration/filters/set_response_code_filter.cc
@@ -3,8 +3,8 @@
 #include "envoy/http/filter.h"
 #include "envoy/registry/registry.h"
 
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/integration/filters/set_response_code_filter_config.pb.h"
 #include "test/integration/filters/set_response_code_filter_config.pb.validate.h"
diff --git a/test/integration/filters/set_route_filter.cc b/test/integration/filters/set_route_filter.cc
index 04d8a4977ba39..cebf7d91ba0b2 100644
--- a/test/integration/filters/set_route_filter.cc
+++ b/test/integration/filters/set_route_filter.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/filters/stop_iteration_and_continue_filter.cc b/test/integration/filters/stop_iteration_and_continue_filter.cc
index 3a1f91be901a6..8a9f79873e794 100644
--- a/test/integration/filters/stop_iteration_and_continue_filter.cc
+++ b/test/integration/filters/stop_iteration_and_continue_filter.cc
@@ -6,10 +6,9 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/scope_tracker.h"
-
-#include "extensions/filters/http/common/factory_base.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/scope_tracker.h"
+#include "source/extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/integration/filters/stop_and_continue_filter_config.pb.h"
 #include "test/integration/filters/stop_and_continue_filter_config.pb.validate.h"
diff --git a/test/integration/filters/test_socket_interface.cc b/test/integration/filters/test_socket_interface.cc
index 5adde112b4fee..cf0c1aa8a0de5 100644
--- a/test/integration/filters/test_socket_interface.cc
+++ b/test/integration/filters/test_socket_interface.cc
@@ -6,9 +6,9 @@
 #include "envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.h"
 #include "envoy/network/socket.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/utility.h"
-#include "common/network/address_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/network/address_impl.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/test/integration/filters/test_socket_interface.h b/test/integration/filters/test_socket_interface.h
index 07980b5a9e59a..905b227dae254 100644
--- a/test/integration/filters/test_socket_interface.h
+++ b/test/integration/filters/test_socket_interface.h
@@ -5,8 +5,8 @@
 #include "envoy/network/address.h"
 #include "envoy/network/socket.h"
 
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/socket_interface_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/socket_interface_impl.h"
 
 #include "absl/types/optional.h"
 
diff --git a/test/integration/filters/wait_for_whole_request_and_response.cc b/test/integration/filters/wait_for_whole_request_and_response.cc
index c9fd346073250..8c6ef178e1194 100644
--- a/test/integration/filters/wait_for_whole_request_and_response.cc
+++ b/test/integration/filters/wait_for_whole_request_and_response.cc
@@ -4,7 +4,7 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/filters/common.h"
diff --git a/test/integration/h1_fuzz.cc b/test/integration/h1_fuzz.cc
index 892af55567773..6b3c1530868eb 100644
--- a/test/integration/h1_fuzz.cc
+++ b/test/integration/h1_fuzz.cc
@@ -2,8 +2,8 @@
 
 #include <functional>
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/environment.h"
diff --git a/test/integration/h1_fuzz.h b/test/integration/h1_fuzz.h
index 2d993f6b49022..fac23385806cd 100644
--- a/test/integration/h1_fuzz.h
+++ b/test/integration/h1_fuzz.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/integration/capture_fuzz.pb.h"
diff --git a/test/integration/h2_fuzz.cc b/test/integration/h2_fuzz.cc
index ba3c39adfc313..c08417c2b4fbe 100644
--- a/test/integration/h2_fuzz.cc
+++ b/test/integration/h2_fuzz.cc
@@ -2,9 +2,9 @@
 
 #include <functional>
 
-#include "common/common/assert.h"
-#include "common/common/base64.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/base64.h"
+#include "source/common/common/logger.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/integration/h2_fuzz.h b/test/integration/h2_fuzz.h
index 97a19b9ebc272..c17f784f807e3 100644
--- a/test/integration/h2_fuzz.h
+++ b/test/integration/h2_fuzz.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/logger.h"
 
 #include "test/common/http/http2/http2_frame.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/integration/hds_integration_test.cc b/test/integration/hds_integration_test.cc
index 15ef2c8f36d1e..0f137953f886a 100644
--- a/test/integration/hds_integration_test.cc
+++ b/test/integration/hds_integration_test.cc
@@ -7,11 +7,11 @@
 #include "envoy/type/v3/http.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/metadata.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/health_checker_impl.h"
-#include "common/upstream/health_discovery_service.h"
+#include "source/common/config/metadata.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/health_checker_impl.h"
+#include "source/common/upstream/health_discovery_service.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/config/utility.h"
diff --git a/test/integration/header_casing_integration_test.cc b/test/integration/header_casing_integration_test.cc
index f16994578c98b..12fb3fc10ec3e 100644
--- a/test/integration/header_casing_integration_test.cc
+++ b/test/integration/header_casing_integration_test.cc
@@ -1,7 +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 "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/integration/http_integration.h"
 
diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc
index 0d6c37098d2cb..0abf8213f4d4e 100644
--- a/test/integration/header_integration_test.cc
+++ b/test/integration/header_integration_test.cc
@@ -6,10 +6,10 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/config/metadata.h"
-#include "common/http/exception.h"
-#include "common/protobuf/protobuf.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/exception.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "test/integration/http_integration.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/integration/hotrestart_main.cc b/test/integration/hotrestart_main.cc
index 75f72cc364366..2a52e812a92b1 100644
--- a/test/integration/hotrestart_main.cc
+++ b/test/integration/hotrestart_main.cc
@@ -1,6 +1,5 @@
-#include "common/stats/utility.h"
-
-#include "exe/main_common.h"
+#include "source/common/stats/utility.h"
+#include "source/exe/main_common.h"
 
 // NOLINT(namespace-envoy)
 
diff --git a/test/integration/http2_flood_integration_test.cc b/test/integration/http2_flood_integration_test.cc
index 31ceac494591f..2e20e34a56484 100644
--- a/test/integration/http2_flood_integration_test.cc
+++ b/test/integration/http2_flood_integration_test.cc
@@ -5,10 +5,10 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/random_generator.h"
-#include "common/http/header_map_impl.h"
-#include "common/network/socket_option_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/network/socket_option_impl.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc
index 02b2870a6a5ff..d6cdb86a8e5a4 100644
--- a/test/integration/http_integration.cc
+++ b/test/integration/http_integration.cc
@@ -16,24 +16,24 @@
 #include "envoy/network/address.h"
 #include "envoy/registry/registry.h"
 
-#include "common/api/api_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/thread_annotations.h"
-#include "common/http/headers.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread_annotations.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/client_connection_factory_impl.h"
 #endif
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/integration/autonomous_upstream.h"
diff --git a/test/integration/http_integration.h b/test/integration/http_integration.h
index c6f709aa189b5..d8a15756bc09f 100644
--- a/test/integration/http_integration.h
+++ b/test/integration/http_integration.h
@@ -4,9 +4,9 @@
 #include <memory>
 #include <string>
 
-#include "common/http/codec_client.h"
-#include "common/http/http3/quic_client_connection_factory.h"
-#include "common/network/filter_impl.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/http/http3/quic_client_connection_factory.h"
+#include "source/common/network/filter_impl.h"
 
 #include "test/common/http/http2/http2_frame.h"
 #include "test/integration/integration.h"
diff --git a/test/integration/integration_admin_test.cc b/test/integration/integration_admin_test.cc
index 886de0503a204..65da9c1fb119a 100644
--- a/test/integration/integration_admin_test.cc
+++ b/test/integration/integration_admin_test.cc
@@ -9,11 +9,11 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/fmt.h"
-#include "common/config/api_version.h"
-#include "common/profiler/profiler.h"
-#include "common/stats/histogram_impl.h"
-#include "common/stats/stats_matcher_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/api_version.h"
+#include "source/common/profiler/profiler.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/stats_matcher_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/integration_admin_test.h b/test/integration/integration_admin_test.h
index 487ac3b3c63ec..194c54d02ae00 100644
--- a/test/integration/integration_admin_test.h
+++ b/test/integration/integration_admin_test.h
@@ -3,7 +3,7 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/json/json_loader.h"
+#include "source/common/json/json_loader.h"
 
 #include "test/integration/http_protocol_integration.h"
 #include "test/test_common/utility.h"
diff --git a/test/integration/integration_stream_decoder.cc b/test/integration/integration_stream_decoder.cc
index bc40535a5fe47..b4cc939b87bfe 100644
--- a/test/integration/integration_stream_decoder.cc
+++ b/test/integration/integration_stream_decoder.cc
@@ -10,7 +10,7 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/http/header_map.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/integration/integration_stream_decoder.h b/test/integration/integration_stream_decoder.h
index 74d06a75e544c..317ea6e1c8473 100644
--- a/test/integration/integration_stream_decoder.h
+++ b/test/integration/integration_stream_decoder.h
@@ -9,7 +9,7 @@
 #include "envoy/http/header_map.h"
 #include "envoy/http/metadata_interface.h"
 
-#include "common/common/dump_state_utils.h"
+#include "source/common/common/dump_state_utils.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/integration/integration_tcp_client.cc b/test/integration/integration_tcp_client.cc
index aabf2a957d956..a6535265c00f3 100644
--- a/test/integration/integration_tcp_client.cc
+++ b/test/integration/integration_tcp_client.cc
@@ -12,9 +12,9 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/timer.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fmt.h"
-#include "common/network/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/network/utility.h"
 
 #include "test/integration/utility.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc
index c2406ddb79ac5..ccc4850097cf7 100644
--- a/test/integration/integration_test.cc
+++ b/test/integration/integration_test.cc
@@ -7,11 +7,11 @@
 #include "envoy/config/route/v3/route_components.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/integration/filters/process_context_filter.h"
diff --git a/test/integration/listener_filter_integration_test.cc b/test/integration/listener_filter_integration_test.cc
index 3a1ae8fd54847..558109f8fde34 100644
--- a/test/integration/listener_filter_integration_test.cc
+++ b/test/integration/listener_filter_integration_test.cc
@@ -5,11 +5,10 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/extensions/access_loggers/file/v3/file.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/listener/tls_inspector/tls_inspector.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/config/api_version.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/integration/integration.h"
 #include "test/integration/ssl_utility.h"
diff --git a/test/integration/listener_lds_integration_test.cc b/test/integration/listener_lds_integration_test.cc
index 5907b8216055a..498f9f2a22bba 100644
--- a/test/integration/listener_lds_integration_test.cc
+++ b/test/integration/listener_lds_integration_test.cc
@@ -8,8 +8,8 @@
 #include "envoy/network/connection.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/config/version_converter.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/version_converter.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/multiplexed_integration_test.cc b/test/integration/multiplexed_integration_test.cc
index 080d01dffac98..cf9980620f788 100644
--- a/test/integration/multiplexed_integration_test.cc
+++ b/test/integration/multiplexed_integration_test.cc
@@ -7,9 +7,9 @@
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/random_generator.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/integration/filters/stop_and_continue_filter_config.pb.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/multiplexed_upstream_integration_test.cc b/test/integration/multiplexed_upstream_integration_test.cc
index 8118928ad1cca..d32fbfebb92af 100644
--- a/test/integration/multiplexed_upstream_integration_test.cc
+++ b/test/integration/multiplexed_upstream_integration_test.cc
@@ -5,7 +5,7 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 #include "test/integration/autonomous_upstream.h"
 #include "test/test_common/printers.h"
diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc
index 6a5c46f3836c5..4b9e1cdf7732b 100644
--- a/test/integration/protocol_integration_test.cc
+++ b/test/integration/protocol_integration_test.cc
@@ -15,16 +15,16 @@
 #include "envoy/http/header_map.h"
 #include "envoy/registry/registry.h"
 
-#include "common/api/api_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/thread_annotations.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
-#include "common/network/utility.h"
-#include "common/protobuf/utility.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/thread_annotations.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/common/http/http2/http2_frame.h"
 #include "test/common/upstream/utility.h"
diff --git a/test/integration/proxy_proto_integration_test.cc b/test/integration/proxy_proto_integration_test.cc
index 6a5f060303858..27d0a8afcc39e 100644
--- a/test/integration/proxy_proto_integration_test.cc
+++ b/test/integration/proxy_proto_integration_test.cc
@@ -5,7 +5,7 @@
 #include "envoy/extensions/access_loggers/file/v3/file.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/test_common/network_utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/integration/proxy_proto_integration_test.h b/test/integration/proxy_proto_integration_test.h
index 3a719ad44aaf0..cfce0d5534616 100644
--- a/test/integration/proxy_proto_integration_test.h
+++ b/test/integration/proxy_proto_integration_test.h
@@ -2,9 +2,8 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/http/codec_client.h"
-
-#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"
+#include "source/common/http/codec_client.h"
+#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h"
 
 #include "test/integration/fake_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/quic_http_integration_test.cc b/test/integration/quic_http_integration_test.cc
index 5f5a580094ef3..1f774f1e69df8 100644
--- a/test/integration/quic_http_integration_test.cc
+++ b/test/integration/quic_http_integration_test.cc
@@ -27,18 +27,18 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "common/quic/client_connection_factory_impl.h"
-#include "common/quic/envoy_quic_client_session.h"
-#include "common/quic/envoy_quic_client_connection.h"
-#include "common/quic/envoy_quic_proof_verifier.h"
-#include "common/quic/envoy_quic_connection_helper.h"
-#include "common/quic/envoy_quic_alarm_factory.h"
-#include "common/quic/envoy_quic_packet_writer.h"
-#include "common/quic/envoy_quic_utils.h"
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/envoy_quic_client_session.h"
+#include "source/common/quic/envoy_quic_client_connection.h"
+#include "source/common/quic/envoy_quic_proof_verifier.h"
+#include "source/common/quic/envoy_quic_connection_helper.h"
+#include "source/common/quic/envoy_quic_alarm_factory.h"
+#include "source/common/quic/envoy_quic_packet_writer.h"
+#include "source/common/quic/envoy_quic_utils.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 #include "test/common/quic/test_utils.h"
 #include "test/config/integration/certs/clientcert_hash.h"
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #if defined(ENVOY_CONFIG_COVERAGE)
 #define DISABLE_UNDER_COVERAGE return
diff --git a/test/integration/scoped_rds_integration_test.cc b/test/integration/scoped_rds_integration_test.cc
index 7a90c3e003df1..6daa40e230a84 100644
--- a/test/integration/scoped_rds_integration_test.cc
+++ b/test/integration/scoped_rds_integration_test.cc
@@ -6,8 +6,8 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/config/version_converter.h"
+#include "source/common/config/api_version.h"
+#include "source/common/config/version_converter.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/sds_dynamic_integration_test.cc b/test/integration/sds_dynamic_integration_test.cc
index f4af19bc4f97e..79d9dc47a589c 100644
--- a/test/integration/sds_dynamic_integration_test.cc
+++ b/test/integration/sds_dynamic_integration_test.cc
@@ -9,19 +9,19 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/service/secret/v3/sds.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/http/utility.h"
-#include "common/network/connection_impl.h"
-#include "common/network/utility.h"
+#include "source/common/config/api_version.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/utility.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/client_connection_factory_impl.h"
 #endif
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/config/integration/certs/clientcert_hash.h"
diff --git a/test/integration/sds_generic_secret_integration_test.cc b/test/integration/sds_generic_secret_integration_test.cc
index e830dce4a2344..581870cab2c74 100644
--- a/test/integration/sds_generic_secret_integration_test.cc
+++ b/test/integration/sds_generic_secret_integration_test.cc
@@ -6,8 +6,8 @@
 #include "envoy/secret/secret_provider.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/config/datasource.h"
-#include "common/grpc/common.h"
+#include "source/common/config/datasource.h"
+#include "source/common/grpc/common.h"
 
 #include "test/extensions/filters/http/common/empty_http_filter_config.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/sds_static_integration_test.cc b/test/integration/sds_static_integration_test.cc
index 97636f2516201..47d19d59fa545 100644
--- a/test/integration/sds_static_integration_test.cc
+++ b/test/integration/sds_static_integration_test.cc
@@ -5,13 +5,12 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/thread.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/connection_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/connection_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/config/integration/certs/clientcert_hash.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/server.cc b/test/integration/server.cc
index 8ff6756b261aa..99a5ecbd0732b 100644
--- a/test/integration/server.cc
+++ b/test/integration/server.cc
@@ -5,16 +5,15 @@
 
 #include "envoy/http/header_map.h"
 
-#include "common/common/random_generator.h"
-#include "common/common/thread.h"
-#include "common/local_info/local_info_impl.h"
-#include "common/network/utility.h"
-#include "common/stats/thread_local_store.h"
-#include "common/thread_local/thread_local_impl.h"
-
-#include "server/hot_restart_nop_impl.h"
-#include "server/options_impl.h"
-#include "server/process_context_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/common/thread.h"
+#include "source/common/local_info/local_info_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/server/hot_restart_nop_impl.h"
+#include "source/server/options_impl.h"
+#include "source/server/process_context_impl.h"
 
 #include "test/common/runtime/utility.h"
 #include "test/integration/utility.h"
diff --git a/test/integration/server.h b/test/integration/server.h
index b28b08aaac0e8..a192058fa6e0b 100644
--- a/test/integration/server.h
+++ b/test/integration/server.h
@@ -11,16 +11,15 @@
 #include "envoy/server/process_context.h"
 #include "envoy/stats/stats.h"
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/stats/allocator_impl.h"
-
-#include "server/drain_manager_impl.h"
-#include "server/listener_hooks.h"
-#include "server/options_impl.h"
-#include "server/server.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/stats/allocator_impl.h"
+#include "source/server/drain_manager_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/options_impl.h"
+#include "source/server/server.h"
 
 #include "test/integration/server_stats.h"
 #include "test/integration/tcp_dump.h"
diff --git a/test/integration/socket_interface_integration_test.cc b/test/integration/socket_interface_integration_test.cc
index 235867e577399..63a531a415753 100644
--- a/test/integration/socket_interface_integration_test.cc
+++ b/test/integration/socket_interface_integration_test.cc
@@ -1,6 +1,6 @@
-#include "common/buffer/buffer_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/socket_interface.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/socket_interface.h"
 
 #include "test/integration/integration.h"
 #include "test/test_common/environment.h"
diff --git a/test/integration/socket_interface_swap.h b/test/integration/socket_interface_swap.h
index 77e4fbca342dd..ee4f84db47659 100644
--- a/test/integration/socket_interface_swap.h
+++ b/test/integration/socket_interface_swap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/network/socket_interface.h"
+#include "source/common/network/socket_interface.h"
 
 #include "test/integration/filters/test_socket_interface.h"
 
diff --git a/test/integration/ssl_utility.cc b/test/integration/ssl_utility.cc
index 0cc1f7de4cfbc..36b93b6f81bca 100644
--- a/test/integration/ssl_utility.cc
+++ b/test/integration/ssl_utility.cc
@@ -2,13 +2,12 @@
 
 #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.h"
 
-#include "common/http/utility.h"
-#include "common/json/json_loader.h"
-#include "common/network/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/http/utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/config/utility.h"
 #include "test/integration/server.h"
diff --git a/test/integration/stats_integration_test.cc b/test/integration/stats_integration_test.cc
index 7a6981a5d9a39..43ad25d1096a1 100644
--- a/test/integration/stats_integration_test.cc
+++ b/test/integration/stats_integration_test.cc
@@ -5,8 +5,8 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats.h"
 
-#include "common/config/well_known_names.h"
-#include "common/memory/stats.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/memory/stats.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/config/utility.h"
diff --git a/test/integration/tcp_dump.cc b/test/integration/tcp_dump.cc
index b8d7c84861568..bd31e60606ee1 100644
--- a/test/integration/tcp_dump.cc
+++ b/test/integration/tcp_dump.cc
@@ -7,8 +7,8 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
 
 namespace Envoy {
 
diff --git a/test/integration/tcp_proxy_integration_test.cc b/test/integration/tcp_proxy_integration_test.cc
index 532337a848dc7..687b6ab9241a6 100644
--- a/test/integration/tcp_proxy_integration_test.cc
+++ b/test/integration/tcp_proxy_integration_test.cc
@@ -9,11 +9,10 @@
 #include "envoy/extensions/access_loggers/file/v3/file.pb.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h"
 
-#include "common/config/api_version.h"
-#include "common/network/utility.h"
-
-#include "extensions/filters/network/common/factory_base.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/config/api_version.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/filters/network/common/factory_base.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/integration/ssl_utility.h"
 #include "test/integration/tcp_proxy_integration_test.pb.h"
diff --git a/test/integration/tracked_watermark_buffer.cc b/test/integration/tracked_watermark_buffer.cc
index 3bc07cb7a9252..61c74f79ac755 100644
--- a/test/integration/tracked_watermark_buffer.cc
+++ b/test/integration/tracked_watermark_buffer.cc
@@ -4,7 +4,7 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/thread_local/thread_local_object.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Buffer {
diff --git a/test/integration/tracked_watermark_buffer.h b/test/integration/tracked_watermark_buffer.h
index bc05db5d4ca03..b3402d3c643bd 100644
--- a/test/integration/tracked_watermark_buffer.h
+++ b/test/integration/tracked_watermark_buffer.h
@@ -3,8 +3,8 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/server/instance.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/watermark_buffer.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/integration/tracked_watermark_buffer_test.cc b/test/integration/tracked_watermark_buffer_test.cc
index f38a2968dcc37..c6579bfcddbc1 100644
--- a/test/integration/tracked_watermark_buffer_test.cc
+++ b/test/integration/tracked_watermark_buffer_test.cc
@@ -3,7 +3,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/integration/tracked_watermark_buffer.h"
 #include "test/mocks/common.h"
diff --git a/test/integration/uds_integration_test.cc b/test/integration/uds_integration_test.cc
index b6cef5449b525..11cfcd10efacb 100644
--- a/test/integration/uds_integration_test.cc
+++ b/test/integration/uds_integration_test.cc
@@ -2,9 +2,9 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/test_common/network_utility.h"
 
diff --git a/test/integration/uds_integration_test.h b/test/integration/uds_integration_test.h
index f2961b62eb141..23df1ee7643f7 100644
--- a/test/integration/uds_integration_test.h
+++ b/test/integration/uds_integration_test.h
@@ -4,8 +4,8 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/common/fmt.h"
-#include "common/http/codec_client.h"
+#include "source/common/common/fmt.h"
+#include "source/common/http/codec_client.h"
 
 #include "test/integration/fake_upstream.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/upstreams/BUILD b/test/integration/upstreams/BUILD
index ddf0326374081..238f2fa3d4f4b 100644
--- a/test/integration/upstreams/BUILD
+++ b/test/integration/upstreams/BUILD
@@ -14,11 +14,11 @@ envoy_cc_library(
         "per_host_upstream_config.h",
     ],
     deps = [
-        "//include/envoy/http:codes_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:codes_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:assert_lib",
         "//source/common/http:header_map_lib",
         "//source/common/http:headers_lib",
diff --git a/test/integration/upstreams/per_host_upstream_config.h b/test/integration/upstreams/per_host_upstream_config.h
index bfa8ba5950333..dc5cbbe330490 100644
--- a/test/integration/upstreams/per_host_upstream_config.h
+++ b/test/integration/upstreams/per_host_upstream_config.h
@@ -7,11 +7,10 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/host_description.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/router/router.h"
-#include "common/router/upstream_request.h"
-
-#include "extensions/upstreams/http/http/upstream_request.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/router/router.h"
+#include "source/common/router/upstream_request.h"
+#include "source/extensions/upstreams/http/http/upstream_request.h"
 
 namespace Envoy {
 
diff --git a/test/integration/utility.cc b/test/integration/utility.cc
index 3837236fe2568..e4767d4970288 100644
--- a/test/integration/utility.cc
+++ b/test/integration/utility.cc
@@ -9,20 +9,20 @@
 #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.h"
 #include "envoy/network/connection.h"
 
-#include "common/api/api_impl.h"
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/config/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/http/http3/quic_client_connection_factory.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/config/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/http3/quic_client_connection_factory.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #ifdef ENVOY_ENABLE_QUIC
-#include "common/quic/client_connection_factory_impl.h"
+#include "source/common/quic/client_connection_factory_impl.h"
 #endif
 
 #include "test/common/upstream/utility.h"
diff --git a/test/integration/utility.h b/test/integration/utility.h
index 6fb283dcb1a0e..8f7e36178c91c 100644
--- a/test/integration/utility.h
+++ b/test/integration/utility.h
@@ -11,11 +11,11 @@
 #include "envoy/network/filter.h"
 #include "envoy/server/factory_context.h"
 
-#include "common/common/assert.h"
-#include "common/common/dump_state_utils.h"
-#include "common/common/utility.h"
-#include "common/http/codec_client.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/dump_state_utils.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/codec_client.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/test_time.h"
diff --git a/test/integration/vhds_integration_test.cc b/test/integration/vhds_integration_test.cc
index d2798fe6e2fdc..3af21e7945fea 100644
--- a/test/integration/vhds_integration_test.cc
+++ b/test/integration/vhds_integration_test.cc
@@ -3,9 +3,9 @@
 #include "envoy/grpc/status.h"
 #include "envoy/stats/scope.h"
 
-#include "common/config/protobuf_link_hacks.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/common/grpc/grpc_client_integration.h"
 #include "test/integration/http_integration.h"
diff --git a/test/integration/websocket_integration_test.cc b/test/integration/websocket_integration_test.cc
index bf96e27d49683..c7159200ab9e0 100644
--- a/test/integration/websocket_integration_test.cc
+++ b/test/integration/websocket_integration_test.cc
@@ -5,8 +5,8 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/integration/utility.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/integration/xds_integration_test.cc b/test/integration/xds_integration_test.cc
index c4dd65445a156..114359d2bda31 100644
--- a/test/integration/xds_integration_test.cc
+++ b/test/integration/xds_integration_test.cc
@@ -1,7 +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 "common/buffer/buffer_impl.h"
+#include "source/common/buffer/buffer_impl.h"
 
 #include "test/integration/http_integration.h"
 #include "test/integration/http_protocol_integration.h"
diff --git a/test/integration/xfcc_integration_test.cc b/test/integration/xfcc_integration_test.cc
index 820fb494bea60..19186660db21a 100644
--- a/test/integration/xfcc_integration_test.cc
+++ b/test/integration/xfcc_integration_test.cc
@@ -8,13 +8,12 @@
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 #include "envoy/stats/scope.h"
 
-#include "common/event/dispatcher_impl.h"
-#include "common/http/header_map_impl.h"
-#include "common/network/utility.h"
-
-#include "extensions/transport_sockets/tls/context_config_impl.h"
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/network/utility.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/test_common/network_utility.h"
 #include "test/test_common/printers.h"
diff --git a/test/mocks/BUILD b/test/mocks/BUILD
index ca36c72a401a4..0e0967ddfab87 100644
--- a/test/mocks/BUILD
+++ b/test/mocks/BUILD
@@ -13,9 +13,9 @@ envoy_cc_test_library(
     srcs = ["common.cc"],
     hdrs = ["common.h"],
     deps = [
-        "//include/envoy/common:conn_pool_interface",
-        "//include/envoy/common:random_generator_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:conn_pool_interface",
+        "//envoy/common:random_generator_interface",
+        "//envoy/common:time_interface",
         "//source/common/common:minimal_logger_lib",
         "//test/test_common:test_time_lib",
     ],
diff --git a/test/mocks/access_log/BUILD b/test/mocks/access_log/BUILD
index 6e2ad4141fece..8e43e64d55e97 100644
--- a/test/mocks/access_log/BUILD
+++ b/test/mocks/access_log/BUILD
@@ -13,8 +13,8 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/stream_info:stream_info_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/stream_info:stream_info_interface",
         "//test/mocks/filesystem:filesystem_mocks",
     ],
 )
diff --git a/test/mocks/api/BUILD b/test/mocks/api/BUILD
index e4d44c573e553..c84309a97feb7 100644
--- a/test/mocks/api/BUILD
+++ b/test/mocks/api/BUILD
@@ -14,8 +14,8 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"] + envoy_select_hot_restart(["hot_restart.h"]),
     deps = [
-        "//include/envoy/api:api_interface",
-        "//include/envoy/api:os_sys_calls_interface",
+        "//envoy/api:api_interface",
+        "//envoy/api:os_sys_calls_interface",
         "//source/common/api:os_sys_calls_lib",
         "//source/common/common:assert_lib",
         "//test/mocks/filesystem:filesystem_mocks",
diff --git a/test/mocks/api/hot_restart.h b/test/mocks/api/hot_restart.h
index b9d0504bacc80..dfaabd0efdf7c 100644
--- a/test/mocks/api/hot_restart.h
+++ b/test/mocks/api/hot_restart.h
@@ -2,7 +2,7 @@
 
 #include "envoy/api/os_sys_calls.h"
 
-#include "common/api/os_sys_calls_impl_hot_restart.h"
+#include "source/common/api/os_sys_calls_impl_hot_restart.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc
index c402005a6dde5..dfd9345ae8063 100644
--- a/test/mocks/api/mocks.cc
+++ b/test/mocks/api/mocks.cc
@@ -1,7 +1,7 @@
 #include "mocks.h"
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/api/mocks.h b/test/mocks/api/mocks.h
index 58f623354888c..94b5db59f99c2 100644
--- a/test/mocks/api/mocks.h
+++ b/test/mocks/api/mocks.h
@@ -8,10 +8,10 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/timer.h"
 
-#include "common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
 
 #if defined(__linux__)
-#include "common/api/os_sys_calls_impl_linux.h"
+#include "source/common/api/os_sys_calls_impl_linux.h"
 #endif
 
 #include "test/mocks/common.h"
diff --git a/test/mocks/buffer/mocks.cc b/test/mocks/buffer/mocks.cc
index 8328f870b0632..4f189a5f3400f 100644
--- a/test/mocks/buffer/mocks.cc
+++ b/test/mocks/buffer/mocks.cc
@@ -1,6 +1,6 @@
 #include "test/mocks/buffer/mocks.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 
diff --git a/test/mocks/buffer/mocks.h b/test/mocks/buffer/mocks.h
index 18465118c4baf..cf6b7ef90d869 100644
--- a/test/mocks/buffer/mocks.h
+++ b/test/mocks/buffer/mocks.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/buffer/watermark_buffer.h"
-#include "common/network/io_socket_error_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/buffer/watermark_buffer.h"
+#include "source/common/network/io_socket_error_impl.h"
 
 #include "test/test_common/printers.h"
 #include "test/test_common/utility.h"
diff --git a/test/mocks/common.h b/test/mocks/common.h
index 8cd79da8c53d7..d313358e1fb90 100644
--- a/test/mocks/common.h
+++ b/test/mocks/common.h
@@ -7,7 +7,7 @@
 #include "envoy/common/scope_tracker.h"
 #include "envoy/common/time.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "test/test_common/test_time.h"
 
diff --git a/test/mocks/compression/compressor/BUILD b/test/mocks/compression/compressor/BUILD
index 855752e06a411..a4565c0fa688c 100644
--- a/test/mocks/compression/compressor/BUILD
+++ b/test/mocks/compression/compressor/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/compression/compressor:compressor_config_interface",
-        "//include/envoy/compression/compressor:compressor_interface",
+        "//envoy/compression/compressor:compressor_config_interface",
+        "//envoy/compression/compressor:compressor_interface",
     ],
 )
diff --git a/test/mocks/compression/decompressor/BUILD b/test/mocks/compression/decompressor/BUILD
index 5e308cef1dede..23c012a13d7a4 100644
--- a/test/mocks/compression/decompressor/BUILD
+++ b/test/mocks/compression/decompressor/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/compression/decompressor:decompressor_config_interface",
-        "//include/envoy/compression/decompressor:decompressor_interface",
+        "//envoy/compression/decompressor:decompressor_config_interface",
+        "//envoy/compression/decompressor:decompressor_interface",
     ],
 )
diff --git a/test/mocks/config/BUILD b/test/mocks/config/BUILD
index 9489eda5e1875..198c6c06d2933 100644
--- a/test/mocks/config/BUILD
+++ b/test/mocks/config/BUILD
@@ -13,9 +13,9 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/config:config_provider_manager_interface",
-        "//include/envoy/config:grpc_mux_interface",
-        "//include/envoy/config:subscription_interface",
+        "//envoy/config:config_provider_manager_interface",
+        "//envoy/config:grpc_mux_interface",
+        "//envoy/config:subscription_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/config:config_provider_lib",
         "//source/common/protobuf:utility_lib",
diff --git a/test/mocks/config/mocks.h b/test/mocks/config/mocks.h
index cf7574dc696a8..ae12fa665c6d5 100644
--- a/test/mocks/config/mocks.h
+++ b/test/mocks/config/mocks.h
@@ -8,9 +8,9 @@
 #include "envoy/config/typed_config.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/common/callback_impl.h"
-#include "common/config/config_provider_impl.h"
-#include "common/protobuf/utility.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/config/config_provider_impl.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/test_common/resources.h"
 #include "test/test_common/utility.h"
diff --git a/test/mocks/event/BUILD b/test/mocks/event/BUILD
index b7fd49f8c266f..3ce542748b737 100644
--- a/test/mocks/event/BUILD
+++ b/test/mocks/event/BUILD
@@ -14,17 +14,17 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/event:deferred_deletable",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:file_event_interface",
-        "//include/envoy/event:scaled_range_timer_manager_interface",
-        "//include/envoy/event:signal_interface",
-        "//include/envoy/event:timer_interface",
-        "//include/envoy/network:connection_handler_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:dns_interface",
-        "//include/envoy/network:listener_interface",
-        "//include/envoy/ssl:context_interface",
+        "//envoy/event:deferred_deletable",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:file_event_interface",
+        "//envoy/event:scaled_range_timer_manager_interface",
+        "//envoy/event:signal_interface",
+        "//envoy/event:timer_interface",
+        "//envoy/network:connection_handler_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:dns_interface",
+        "//envoy/network:listener_interface",
+        "//envoy/ssl:context_interface",
         "//test/mocks/buffer:buffer_mocks",
         "//test/test_common:test_time_lib",
     ],
@@ -34,6 +34,6 @@ envoy_cc_test_library(
     name = "wrapped_dispatcher",
     hdrs = ["wrapped_dispatcher.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
+        "//envoy/event:dispatcher_interface",
     ],
 )
diff --git a/test/mocks/event/mocks.h b/test/mocks/event/mocks.h
index a1fd35a319341..7943db8e9db44 100644
--- a/test/mocks/event/mocks.h
+++ b/test/mocks/event/mocks.h
@@ -19,7 +19,7 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/ssl/context.h"
 
-#include "common/common/scope_tracker.h"
+#include "source/common/common/scope_tracker.h"
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/test_common/test_time.h"
diff --git a/test/mocks/filesystem/BUILD b/test/mocks/filesystem/BUILD
index d4c58d07e808f..afb733e838ec6 100644
--- a/test/mocks/filesystem/BUILD
+++ b/test/mocks/filesystem/BUILD
@@ -13,8 +13,8 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/filesystem:filesystem_interface",
-        "//include/envoy/filesystem:watcher_interface",
+        "//envoy/filesystem:filesystem_interface",
+        "//envoy/filesystem:watcher_interface",
         "//source/common/common:thread_lib",
     ],
 )
diff --git a/test/mocks/filesystem/mocks.cc b/test/mocks/filesystem/mocks.cc
index af5d9fcddc7cf..9ce4201006d6e 100644
--- a/test/mocks/filesystem/mocks.cc
+++ b/test/mocks/filesystem/mocks.cc
@@ -1,7 +1,7 @@
 #include "test/mocks/filesystem/mocks.h"
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
 
 namespace Envoy {
 namespace Filesystem {
diff --git a/test/mocks/filesystem/mocks.h b/test/mocks/filesystem/mocks.h
index 71e57f9307bc4..982c0dfb73b76 100644
--- a/test/mocks/filesystem/mocks.h
+++ b/test/mocks/filesystem/mocks.h
@@ -6,7 +6,7 @@
 #include "envoy/filesystem/filesystem.h"
 #include "envoy/filesystem/watcher.h"
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/mocks/grpc/BUILD b/test/mocks/grpc/BUILD
index 972cba77fbe11..c61c03bf4f90b 100644
--- a/test/mocks/grpc/BUILD
+++ b/test/mocks/grpc/BUILD
@@ -13,8 +13,8 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/grpc:async_client_interface",
-        "//include/envoy/grpc:async_client_manager_interface",
+        "//envoy/grpc:async_client_interface",
+        "//envoy/grpc:async_client_manager_interface",
         "//source/common/grpc:typed_async_client_lib",
         "//test/mocks/http:http_mocks",
         "//test/test_common:utility_lib",
diff --git a/test/mocks/grpc/mocks.h b/test/mocks/grpc/mocks.h
index 476ba677f9453..8097d34f6af89 100644
--- a/test/mocks/grpc/mocks.h
+++ b/test/mocks/grpc/mocks.h
@@ -9,7 +9,7 @@
 #include "envoy/grpc/async_client_manager.h"
 #include "envoy/stats/scope.h"
 
-#include "common/grpc/typed_async_client.h"
+#include "source/common/grpc/typed_async_client.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/mocks/http/BUILD b/test/mocks/http/BUILD
index 9b807fe8f3cf3..51c6c7f2fae1d 100644
--- a/test/mocks/http/BUILD
+++ b/test/mocks/http/BUILD
@@ -14,7 +14,7 @@ envoy_cc_mock(
     srcs = ["alternate_protocols_cache.cc"],
     hdrs = ["alternate_protocols_cache.h"],
     deps = [
-        "//include/envoy/http:alternate_protocols_cache_interface",
+        "//envoy/http:alternate_protocols_cache_interface",
     ],
 )
 
@@ -23,7 +23,7 @@ envoy_cc_mock(
     srcs = ["api_listener.cc"],
     hdrs = ["api_listener.h"],
     deps = [
-        "//include/envoy/http:api_listener_interface",
+        "//envoy/http:api_listener_interface",
     ],
 )
 
@@ -32,7 +32,7 @@ envoy_cc_mock(
     srcs = ["conn_pool.cc"],
     hdrs = ["conn_pool.h"],
     deps = [
-        "//include/envoy/http:conn_pool_interface",
+        "//envoy/http:conn_pool_interface",
         "//test/mocks:common_lib",
         "//test/mocks/upstream:host_mocks",
     ],
@@ -50,15 +50,15 @@ envoy_cc_mock(
         ":stream_decoder_mock",
         ":stream_encoder_mock",
         ":stream_mock",
-        "//include/envoy/access_log:access_log_interface",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/http:conn_pool_interface",
-        "//include/envoy/http:filter_interface",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/tracing:http_tracer_interface",
+        "//envoy/access_log:access_log_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/http:conn_pool_interface",
+        "//envoy/http:filter_interface",
+        "//envoy/ssl:connection_interface",
+        "//envoy/tracing:http_tracer_interface",
         "//source/common/http:conn_manager_config_interface",
         "//source/common/http:filter_manager_lib",
         "//source/common/http:header_map_lib",
@@ -75,7 +75,7 @@ envoy_cc_mock(
     srcs = ["stream.cc"],
     hdrs = ["stream.h"],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
     ],
 )
 
@@ -84,7 +84,7 @@ envoy_cc_mock(
     srcs = ["stream_decoder.cc"],
     hdrs = ["stream_decoder.h"],
     deps = [
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
     ],
 )
 
@@ -94,7 +94,7 @@ envoy_cc_mock(
     hdrs = ["stream_encoder.h"],
     deps = [
         ":stream_mock",
-        "//include/envoy/http:codec_interface",
+        "//envoy/http:codec_interface",
         "//source/common/http:header_utility_lib",
     ],
 )
@@ -104,7 +104,7 @@ envoy_cc_test(
     srcs = ["mocks_test.cc"],
     deps = [
         ":http_mocks",
-        "//include/envoy/http:header_map_interface",
+        "//envoy/http:header_map_interface",
         "//test/test_common:utility_lib",
     ],
 )
diff --git a/test/mocks/http/mocks.h b/test/mocks/http/mocks.h
index af7fd0b62e13a..ea45b0b6044ff 100644
--- a/test/mocks/http/mocks.h
+++ b/test/mocks/http/mocks.h
@@ -15,10 +15,10 @@
 #include "envoy/matcher/matcher.h"
 #include "envoy/ssl/connection.h"
 
-#include "common/http/conn_manager_config.h"
-#include "common/http/filter_manager.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
+#include "source/common/http/conn_manager_config.h"
+#include "source/common/http/filter_manager.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/mocks/http/stream_encoder.cc b/test/mocks/http/stream_encoder.cc
index 39970b10d3881..f0fb89bcd66c6 100644
--- a/test/mocks/http/stream_encoder.cc
+++ b/test/mocks/http/stream_encoder.cc
@@ -1,6 +1,6 @@
 #include "test/mocks/http/stream_encoder.h"
 
-#include "common/http/header_utility.h"
+#include "source/common/http/header_utility.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/test/mocks/http/stream_encoder.h b/test/mocks/http/stream_encoder.h
index 3277fe1d8a809..8f783e69b283c 100644
--- a/test/mocks/http/stream_encoder.h
+++ b/test/mocks/http/stream_encoder.h
@@ -2,7 +2,7 @@
 
 #include "envoy/http/codec.h"
 
-#include "common/http/status.h"
+#include "source/common/http/status.h"
 
 #include "test/mocks/http/stream.h"
 
diff --git a/test/mocks/init/BUILD b/test/mocks/init/BUILD
index d2969531ecb67..fd433f677d444 100644
--- a/test/mocks/init/BUILD
+++ b/test/mocks/init/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/init:manager_interface",
+        "//envoy/init:manager_interface",
         "//source/common/init:target_lib",
         "//source/common/init:watcher_lib",
     ],
diff --git a/test/mocks/init/mocks.h b/test/mocks/init/mocks.h
index fc997e4030c49..eaecf0d4c9f14 100644
--- a/test/mocks/init/mocks.h
+++ b/test/mocks/init/mocks.h
@@ -2,8 +2,8 @@
 
 #include "envoy/init/manager.h"
 
-#include "common/init/target_impl.h"
-#include "common/init/watcher_impl.h"
+#include "source/common/init/target_impl.h"
+#include "source/common/init/watcher_impl.h"
 
 #include "absl/container/flat_hash_map.h"
 #include "gmock/gmock.h"
diff --git a/test/mocks/local_info/BUILD b/test/mocks/local_info/BUILD
index cab27ccb858e5..3bfd32510c2dc 100644
--- a/test/mocks/local_info/BUILD
+++ b/test/mocks/local_info/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/local_info:local_info_interface",
+        "//envoy/local_info:local_info_interface",
         "//source/common/network:address_lib",
         "//test/common/stats:stat_test_utility_lib",
         "//test/mocks/config:config_mocks",
diff --git a/test/mocks/local_info/mocks.cc b/test/mocks/local_info/mocks.cc
index b719bad16b43e..ff6a03502cfb3 100644
--- a/test/mocks/local_info/mocks.cc
+++ b/test/mocks/local_info/mocks.cc
@@ -1,6 +1,6 @@
 #include "mocks.h"
 
-#include "common/network/address_impl.h"
+#include "source/common/network/address_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/local_reply/mocks.h b/test/mocks/local_reply/mocks.h
index 44676c92a0744..390c20d76cf53 100644
--- a/test/mocks/local_reply/mocks.h
+++ b/test/mocks/local_reply/mocks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/local_reply/local_reply.h"
+#include "source/common/local_reply/local_reply.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/mocks/matcher/mocks.h b/test/mocks/matcher/mocks.h
index 8a93f6b850f64..3d4ebefa207b9 100644
--- a/test/mocks/matcher/mocks.h
+++ b/test/mocks/matcher/mocks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/matcher/matcher.h"
+#include "source/common/matcher/matcher.h"
 
 #include "gmock/gmock.h"
 
diff --git a/test/mocks/network/BUILD b/test/mocks/network/BUILD
index e37c3a4ec633a..8bc9532c114d4 100644
--- a/test/mocks/network/BUILD
+++ b/test/mocks/network/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["connection.cc"],
     hdrs = ["connection.h"],
     deps = [
-        "//include/envoy/network:connection_interface",
+        "//envoy/network:connection_interface",
         "//source/common/network:filter_manager_lib",
         "//test/mocks/event:event_mocks",
         "//test/mocks/stream_info:stream_info_mocks",
@@ -25,8 +25,8 @@ envoy_cc_mock(
     srcs = ["io_handle.cc"],
     hdrs = ["io_handle.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/network:io_handle_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/network:io_handle_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
@@ -37,7 +37,7 @@ envoy_cc_mock(
     hdrs = ["socket.h"],
     deps = [
         ":io_handle_mocks",
-        "//include/envoy/network:socket_interface",
+        "//envoy/network:socket_interface",
     ],
 )
 
@@ -48,13 +48,13 @@ envoy_cc_mock(
     deps = [
         ":connection_mocks",
         ":transport_socket_mocks",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/network:connection_interface",
-        "//include/envoy/network:drain_decision_interface",
-        "//include/envoy/network:filter_interface",
-        "//include/envoy/network:resolver_interface",
-        "//include/envoy/network:transport_socket_interface",
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/network:connection_interface",
+        "//envoy/network:drain_decision_interface",
+        "//envoy/network:filter_interface",
+        "//envoy/network:resolver_interface",
+        "//envoy/network:transport_socket_interface",
+        "//envoy/server:listener_manager_interface",
         "//source/common/network:address_lib",
         "//source/common/network:utility_lib",
         "//source/common/stats:isolated_store_lib",
@@ -71,7 +71,7 @@ envoy_cc_mock(
     srcs = ["transport_socket.cc"],
     hdrs = ["transport_socket.h"],
     deps = [
-        "//include/envoy/network:transport_socket_interface",
+        "//envoy/network:transport_socket_interface",
         "//source/common/network:utility_lib",
     ],
 )
diff --git a/test/mocks/network/connection.h b/test/mocks/network/connection.h
index 24fe1ee7a3412..3ec78cb5d47b1 100644
--- a/test/mocks/network/connection.h
+++ b/test/mocks/network/connection.h
@@ -5,7 +5,7 @@
 
 #include "envoy/network/connection.h"
 
-#include "common/network/filter_manager_impl.h"
+#include "source/common/network/filter_manager_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/stream_info/mocks.h"
diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc
index 5575eeb722bb6..71a61eb674eea 100644
--- a/test/mocks/network/mocks.cc
+++ b/test/mocks/network/mocks.cc
@@ -5,10 +5,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/server/listener_manager.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/mocks/network/mocks.h b/test/mocks/network/mocks.h
index 9b68638ea21a3..e8861636e9a1a 100644
--- a/test/mocks/network/mocks.h
+++ b/test/mocks/network/mocks.h
@@ -17,9 +17,9 @@
 #include "envoy/network/transport_socket.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/filter_manager_impl.h"
-#include "common/network/socket_interface.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/network/filter_manager_impl.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/event/mocks.h"
 #include "test/mocks/network/connection.h"
diff --git a/test/mocks/protobuf/BUILD b/test/mocks/protobuf/BUILD
index 67b4c15cd6446..fd7416df7bfe2 100644
--- a/test/mocks/protobuf/BUILD
+++ b/test/mocks/protobuf/BUILD
@@ -13,6 +13,6 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/protobuf:message_validator_interface",
     ],
 )
diff --git a/test/mocks/ratelimit/BUILD b/test/mocks/ratelimit/BUILD
index db30620b1edda..a21994defdacb 100644
--- a/test/mocks/ratelimit/BUILD
+++ b/test/mocks/ratelimit/BUILD
@@ -12,6 +12,6 @@ envoy_cc_mock(
     name = "ratelimit_mocks",
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/ratelimit:ratelimit_interface",
+        "//envoy/ratelimit:ratelimit_interface",
     ],
 )
diff --git a/test/mocks/router/BUILD b/test/mocks/router/BUILD
index 4bb335ea67a85..1cfbbf669bf75 100644
--- a/test/mocks/router/BUILD
+++ b/test/mocks/router/BUILD
@@ -13,19 +13,19 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/json:json_object_interface",
-        "//include/envoy/local_info:local_info_interface",
-        "//include/envoy/router:route_config_provider_manager_interface",
-        "//include/envoy/router:router_interface",
-        "//include/envoy/router:router_ratelimit_interface",
-        "//include/envoy/router:scopes_interface",
-        "//include/envoy/router:shadow_writer_interface",
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stream_info:stream_info_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/json:json_object_interface",
+        "//envoy/local_info:local_info_interface",
+        "//envoy/router:route_config_provider_manager_interface",
+        "//envoy/router:router_interface",
+        "//envoy/router:router_ratelimit_interface",
+        "//envoy/router:scopes_interface",
+        "//envoy/router:shadow_writer_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stream_info:stream_info_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//test/mocks:common_lib",
         "//test/mocks/stats:stats_mocks",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h
index dde676d080283..141c3934886ab 100644
--- a/test/mocks/router/mocks.h
+++ b/test/mocks/router/mocks.h
@@ -29,7 +29,7 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/test_common/global.h"
diff --git a/test/mocks/router/router_filter_interface.h b/test/mocks/router/router_filter_interface.h
index a37bf61cffce4..7ca27675a3d53 100644
--- a/test/mocks/router/router_filter_interface.h
+++ b/test/mocks/router/router_filter_interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/router/router.h"
+#include "source/common/router/router.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/mocks/runtime/BUILD b/test/mocks/runtime/BUILD
index a6af7e7570fe8..180056c3d5ac2 100644
--- a/test/mocks/runtime/BUILD
+++ b/test/mocks/runtime/BUILD
@@ -14,8 +14,8 @@ envoy_cc_mock(
     hdrs = ["mocks.h"],
     external_deps = ["abseil_optional"],
     deps = [
-        "//include/envoy/runtime:runtime_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/runtime:runtime_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//test/mocks:common_lib",
         "//test/mocks/stats:stats_mocks",
         "@envoy_api//envoy/type/v3:pkg_cc_proto",
diff --git a/test/mocks/secret/BUILD b/test/mocks/secret/BUILD
index 92a80718db015..9537595a3b2a2 100644
--- a/test/mocks/secret/BUILD
+++ b/test/mocks/secret/BUILD
@@ -13,10 +13,10 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/secret:secret_callbacks_interface",
-        "//include/envoy/secret:secret_manager_interface",
-        "//include/envoy/server:transport_socket_config_interface",
-        "//include/envoy/ssl:tls_certificate_config_interface",
+        "//envoy/secret:secret_callbacks_interface",
+        "//envoy/secret:secret_manager_interface",
+        "//envoy/server:transport_socket_config_interface",
+        "//envoy/ssl:tls_certificate_config_interface",
         "//source/common/secret:secret_provider_impl_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
diff --git a/test/mocks/secret/mocks.cc b/test/mocks/secret/mocks.cc
index 613cb30fa46fd..ecfc940e28305 100644
--- a/test/mocks/secret/mocks.cc
+++ b/test/mocks/secret/mocks.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h"
 
-#include "common/secret/secret_provider_impl.h"
+#include "source/common/secret/secret_provider_impl.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD
index 7f4408de326d1..679f3e6d1b2d2 100644
--- a/test/mocks/server/BUILD
+++ b/test/mocks/server/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["config_tracker.cc"],
     hdrs = ["config_tracker.h"],
     deps = [
-        "//include/envoy/server:configuration_interface",
+        "//envoy/server:configuration_interface",
     ],
 )
 
@@ -22,7 +22,7 @@ envoy_cc_mock(
     srcs = ["admin.cc"],
     hdrs = ["admin.h"],
     deps = [
-        "//include/envoy/server:admin_interface",
+        "//envoy/server:admin_interface",
         "//test/mocks/network:socket_mocks",
         "//test/mocks/server:config_tracker_mocks",
     ],
@@ -33,7 +33,7 @@ envoy_cc_mock(
     srcs = ["bootstrap_extension_factory.cc"],
     hdrs = ["bootstrap_extension_factory.h"],
     deps = [
-        "//include/envoy/server:bootstrap_extension_config_interface",
+        "//envoy/server:bootstrap_extension_config_interface",
     ],
 )
 
@@ -41,7 +41,7 @@ envoy_cc_mock(
     name = "fatal_action_factory_mocks",
     hdrs = ["fatal_action_factory.h"],
     deps = [
-        "//include/envoy/server:fatal_action_interface",
+        "//envoy/server:fatal_action_interface",
     ],
 )
 
@@ -50,7 +50,7 @@ envoy_cc_mock(
     srcs = ["options.cc"],
     hdrs = ["options.h"],
     deps = [
-        "//include/envoy/server:options_interface",
+        "//envoy/server:options_interface",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
     ],
@@ -61,7 +61,7 @@ envoy_cc_mock(
     srcs = ["admin_stream.cc"],
     hdrs = ["admin_stream.h"],
     deps = [
-        "//include/envoy/server:admin_interface",
+        "//envoy/server:admin_interface",
         "//test/mocks/http:http_mocks",
     ],
 )
@@ -71,7 +71,7 @@ envoy_cc_mock(
     srcs = ["drain_manager.cc"],
     hdrs = ["drain_manager.h"],
     deps = [
-        "//include/envoy/server:drain_manager_interface",
+        "//envoy/server:drain_manager_interface",
     ],
 )
 
@@ -80,7 +80,7 @@ envoy_cc_mock(
     srcs = ["watch_dog.cc"],
     hdrs = ["watch_dog.h"],
     deps = [
-        "//include/envoy/server:watchdog_interface",
+        "//envoy/server:watchdog_interface",
     ],
 )
 
@@ -89,7 +89,7 @@ envoy_cc_mock(
     srcs = ["watchdog_config.cc"],
     hdrs = ["watchdog_config.h"],
     deps = [
-        "//include/envoy/server:configuration_interface",
+        "//envoy/server:configuration_interface",
         "//test/test_common:utility_lib",
     ],
 )
@@ -99,7 +99,7 @@ envoy_cc_mock(
     srcs = ["guard_dog.cc"],
     hdrs = ["guard_dog.h"],
     deps = [
-        "//include/envoy/server:guarddog_interface",
+        "//envoy/server:guarddog_interface",
         "//test/mocks/server:watch_dog_mocks",
     ],
 )
@@ -109,7 +109,7 @@ envoy_cc_mock(
     srcs = ["hot_restart.cc"],
     hdrs = ["hot_restart.h"],
     deps = [
-        "//include/envoy/server:instance_interface",
+        "//envoy/server:instance_interface",
         "//test/mocks/stats:stats_mocks",
     ],
 )
@@ -119,8 +119,8 @@ envoy_cc_mock(
     srcs = ["listener_component_factory.cc"],
     hdrs = ["listener_component_factory.h"],
     deps = [
-        "//include/envoy/server:drain_manager_interface",
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/server:drain_manager_interface",
+        "//envoy/server:listener_manager_interface",
         "//test/mocks/network:network_mocks",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
@@ -132,7 +132,7 @@ envoy_cc_mock(
     srcs = ["listener_manager.cc"],
     hdrs = ["listener_manager.h"],
     deps = [
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/server:listener_manager_interface",
     ],
 )
 
@@ -141,7 +141,7 @@ envoy_cc_mock(
     srcs = ["server_lifecycle_notifier.cc"],
     hdrs = ["server_lifecycle_notifier.h"],
     deps = [
-        "//include/envoy/server:lifecycle_notifier_interface",
+        "//envoy/server:lifecycle_notifier_interface",
     ],
 )
 
@@ -150,7 +150,7 @@ envoy_cc_mock(
     srcs = ["worker_factory.cc"],
     hdrs = ["worker_factory.h"],
     deps = [
-        "//include/envoy/server:worker_interface",
+        "//envoy/server:worker_interface",
         "//test/mocks/server:worker_mocks",
     ],
 )
@@ -160,7 +160,7 @@ envoy_cc_mock(
     srcs = ["worker.cc"],
     hdrs = ["worker.h"],
     deps = [
-        "//include/envoy/server:worker_interface",
+        "//envoy/server:worker_interface",
     ],
 )
 
@@ -169,7 +169,7 @@ envoy_cc_mock(
     srcs = ["overload_manager.cc"],
     hdrs = ["overload_manager.h"],
     deps = [
-        "//include/envoy/server/overload:overload_manager_interface",
+        "//envoy/server/overload:overload_manager_interface",
         "//test/mocks/event:event_mocks",
     ],
 )
@@ -179,7 +179,7 @@ envoy_cc_mock(
     srcs = ["instance.cc"],
     hdrs = ["instance.h"],
     deps = [
-        "//include/envoy/server:instance_interface",
+        "//envoy/server:instance_interface",
         "//source/common/grpc:context_lib",
         "//source/common/http:context_lib",
         "//source/common/router:context_lib",
@@ -215,8 +215,8 @@ envoy_cc_mock(
     name = "main_mocks",
     hdrs = ["main.h"],
     deps = [
-        "//include/envoy/server:configuration_interface",
-        "//include/envoy/server/overload:overload_manager_interface",
+        "//envoy/server:configuration_interface",
+        "//envoy/server/overload:overload_manager_interface",
     ],
 )
 
@@ -238,7 +238,7 @@ envoy_cc_mock(
     srcs = ["transport_socket_factory_context.cc"],
     hdrs = ["transport_socket_factory_context.h"],
     deps = [
-        "//include/envoy/server:tracer_config_interface",
+        "//envoy/server:tracer_config_interface",
         "//source/common/secret:secret_manager_impl_lib",
         "//test/mocks/api:api_mocks",
         "//test/mocks/server:config_tracker_mocks",
@@ -252,7 +252,7 @@ envoy_cc_mock(
     srcs = ["listener_factory_context.cc"],
     hdrs = ["listener_factory_context.h"],
     deps = [
-        "//include/envoy/server:listener_manager_interface",
+        "//envoy/server:listener_manager_interface",
         "//test/mocks/server:factory_context_mocks",
     ],
 )
@@ -262,7 +262,7 @@ envoy_cc_mock(
     srcs = ["health_checker_factory_context.cc"],
     hdrs = ["health_checker_factory_context.h"],
     deps = [
-        "//include/envoy/server:health_checker_config_interface",
+        "//envoy/server:health_checker_config_interface",
         "//test/mocks:common_lib",
         "//test/mocks/api:api_mocks",
         "//test/mocks/event:event_mocks",
@@ -280,7 +280,7 @@ envoy_cc_mock(
     srcs = ["filter_chain_factory_context.cc"],
     hdrs = ["filter_chain_factory_context.h"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/router:context_lib",
         "//test/mocks/server:factory_context_mocks",
     ],
@@ -291,8 +291,8 @@ envoy_cc_mock(
     srcs = ["tracer_factory.cc"],
     hdrs = ["tracer_factory.h"],
     deps = [
-        "//include/envoy/protobuf:message_validator_interface",
-        "//include/envoy/server:tracer_config_interface",
+        "//envoy/protobuf:message_validator_interface",
+        "//envoy/server:tracer_config_interface",
     ],
 )
 
@@ -301,7 +301,7 @@ envoy_cc_mock(
     srcs = ["tracer_factory_context.cc"],
     hdrs = ["tracer_factory_context.h"],
     deps = [
-        "//include/envoy/server:configuration_interface",
+        "//envoy/server:configuration_interface",
         "//test/mocks/server:instance_mocks",
         "//test/mocks/server:tracer_factory_mocks",
     ],
diff --git a/test/mocks/server/factory_context.cc b/test/mocks/server/factory_context.cc
index 723019095c708..c8a3e082414cf 100644
--- a/test/mocks/server/factory_context.cc
+++ b/test/mocks/server/factory_context.cc
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/server/factory_context.h b/test/mocks/server/factory_context.h
index 8615ca5242ecc..41f3c20bf4400 100644
--- a/test/mocks/server/factory_context.h
+++ b/test/mocks/server/factory_context.h
@@ -2,9 +2,8 @@
 
 #include "envoy/server/configuration.h"
 
-#include "common/router/context_impl.h"
-
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "admin.h"
 #include "drain_manager.h"
diff --git a/test/mocks/server/instance.cc b/test/mocks/server/instance.cc
index 9b1a728b76c00..ebd079c44b96b 100644
--- a/test/mocks/server/instance.cc
+++ b/test/mocks/server/instance.cc
@@ -1,6 +1,6 @@
 #include "instance.h"
 
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/server/instance.h b/test/mocks/server/instance.h
index 2fd4f2cc28b27..b7eb875363205 100644
--- a/test/mocks/server/instance.h
+++ b/test/mocks/server/instance.h
@@ -2,12 +2,11 @@
 
 #include "envoy/server/instance.h"
 
-#include "common/grpc/context_impl.h"
-#include "common/http/context_impl.h"
-#include "common/router/context_impl.h"
-#include "common/stats/symbol_table_impl.h"
-
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/router/context_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/mocks/server/listener_factory_context.cc b/test/mocks/server/listener_factory_context.cc
index 10ec7dc48156e..bf2cc8992247c 100644
--- a/test/mocks/server/listener_factory_context.cc
+++ b/test/mocks/server/listener_factory_context.cc
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/server/listener_factory_context.h b/test/mocks/server/listener_factory_context.h
index 10e54c6291887..a72237a2eaf4e 100644
--- a/test/mocks/server/listener_factory_context.h
+++ b/test/mocks/server/listener_factory_context.h
@@ -3,7 +3,7 @@
 #include "envoy/server/configuration.h"
 #include "envoy/server/listener_manager.h"
 
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
 
 #include "admin.h"
 #include "drain_manager.h"
diff --git a/test/mocks/server/transport_socket_factory_context.h b/test/mocks/server/transport_socket_factory_context.h
index f14bdd0ac9fe1..ee98720c8d428 100644
--- a/test/mocks/server/transport_socket_factory_context.h
+++ b/test/mocks/server/transport_socket_factory_context.h
@@ -2,7 +2,7 @@
 
 #include "envoy/server/transport_socket_config.h"
 
-#include "common/secret/secret_manager_impl.h"
+#include "source/common/secret/secret_manager_impl.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/ssl/mocks.h"
diff --git a/test/mocks/ssl/BUILD b/test/mocks/ssl/BUILD
index e79694f5224f8..caaa6483ee1eb 100644
--- a/test/mocks/ssl/BUILD
+++ b/test/mocks/ssl/BUILD
@@ -13,12 +13,12 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/ssl:certificate_validation_context_config_interface",
-        "//include/envoy/ssl:connection_interface",
-        "//include/envoy/ssl:context_config_interface",
-        "//include/envoy/ssl:context_interface",
-        "//include/envoy/ssl:context_manager_interface",
-        "//include/envoy/stats:stats_interface",
+        "//envoy/ssl:certificate_validation_context_config_interface",
+        "//envoy/ssl:connection_interface",
+        "//envoy/ssl:context_config_interface",
+        "//envoy/ssl:context_interface",
+        "//envoy/ssl:context_manager_interface",
+        "//envoy/stats:stats_interface",
         "//test/mocks/secret:secret_mocks",
         "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto",
     ],
diff --git a/test/mocks/stats/BUILD b/test/mocks/stats/BUILD
index 2fbabbb328d05..039a42fbd9489 100644
--- a/test/mocks/stats/BUILD
+++ b/test/mocks/stats/BUILD
@@ -13,10 +13,10 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/stats:stats_interface",
-        "//include/envoy/stats:timespan_interface",
-        "//include/envoy/thread_local:thread_local_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/stats:stats_interface",
+        "//envoy/stats:timespan_interface",
+        "//envoy/thread_local:thread_local_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/stats:histogram_lib",
         "//source/common/stats:isolated_store_lib",
         "//source/common/stats:stats_lib",
diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc
index 6af79f0743319..66ed44834fc12 100644
--- a/test/mocks/stats/mocks.cc
+++ b/test/mocks/stats/mocks.cc
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/stats/mocks.h b/test/mocks/stats/mocks.h
index bc43b8d61deae..b83dd3310c4cc 100644
--- a/test/mocks/stats/mocks.h
+++ b/test/mocks/stats/mocks.h
@@ -14,11 +14,11 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/stats/histogram_impl.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stats/store_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stats/timespan_impl.h"
+#include "source/common/stats/histogram_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stats/store_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stats/timespan_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 
diff --git a/test/mocks/stream_info/BUILD b/test/mocks/stream_info/BUILD
index da45abf717cee..ca80a08e3b4e7 100644
--- a/test/mocks/stream_info/BUILD
+++ b/test/mocks/stream_info/BUILD
@@ -13,9 +13,9 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/http:request_id_extension_interface",
-        "//include/envoy/stream_info:stream_info_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:request_id_extension_interface",
+        "//envoy/stream_info:stream_info_interface",
+        "//envoy/upstream:upstream_interface",
         "//test/mocks/upstream:host_mocks",
         "//test/test_common:simulated_time_system_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/test/mocks/stream_info/mocks.cc b/test/mocks/stream_info/mocks.cc
index 17162d885a7bf..4fd097f65f2ff 100644
--- a/test/mocks/stream_info/mocks.cc
+++ b/test/mocks/stream_info/mocks.cc
@@ -1,6 +1,6 @@
 #include "test/mocks/stream_info/mocks.h"
 
-#include "common/network/address_impl.h"
+#include "source/common/network/address_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h
index 62a377ecb97e8..1a0a81b36d9a5 100644
--- a/test/mocks/stream_info/mocks.h
+++ b/test/mocks/stream_info/mocks.h
@@ -4,8 +4,8 @@
 #include "envoy/http/request_id_extension.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "common/network/socket_impl.h"
-#include "common/stream_info/filter_state_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/stream_info/filter_state_impl.h"
 
 #include "test/mocks/upstream/host.h"
 #include "test/test_common/simulated_time_system.h"
diff --git a/test/mocks/tcp/BUILD b/test/mocks/tcp/BUILD
index 263b2e49ba086..b3cbd6903f68f 100644
--- a/test/mocks/tcp/BUILD
+++ b/test/mocks/tcp/BUILD
@@ -13,8 +13,8 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/tcp:conn_pool_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/tcp:conn_pool_interface",
         "//test/mocks:common_lib",
         "//test/mocks/network:network_mocks",
         "//test/mocks/upstream:host_mocks",
diff --git a/test/mocks/thread_local/BUILD b/test/mocks/thread_local/BUILD
index e05b8f6f4b965..1928ad5ce567e 100644
--- a/test/mocks/thread_local/BUILD
+++ b/test/mocks/thread_local/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/thread_local:thread_local_interface",
+        "//envoy/thread_local:thread_local_interface",
         "//test/mocks/event:event_mocks",
     ],
 )
diff --git a/test/mocks/tracing/BUILD b/test/mocks/tracing/BUILD
index 3f4eaf881d4d6..b89ea160d951b 100644
--- a/test/mocks/tracing/BUILD
+++ b/test/mocks/tracing/BUILD
@@ -13,7 +13,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/tracing:http_tracer_interface",
-        "//include/envoy/tracing:http_tracer_manager_interface",
+        "//envoy/tracing:http_tracer_interface",
+        "//envoy/tracing:http_tracer_manager_interface",
     ],
 )
diff --git a/test/mocks/upstream/BUILD b/test/mocks/upstream/BUILD
index 5ab7a4d101098..e7fcdef38adcf 100644
--- a/test/mocks/upstream/BUILD
+++ b/test/mocks/upstream/BUILD
@@ -14,8 +14,8 @@ envoy_cc_mock(
     hdrs = ["cluster_info.h"],
     deps = [
         ":transport_socket_match_mocks",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:thread_lib",
         "//source/common/config:metadata_lib",
         "//source/common/http:utility_lib",
@@ -37,7 +37,7 @@ envoy_cc_mock(
     hdrs = ["host.h"],
     deps = [
         ":cluster_info_mocks",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/network:utility_lib",
         "//test/mocks/network:transport_socket_mocks",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
@@ -50,7 +50,7 @@ envoy_cc_mock(
     srcs = ["transport_socket_match.cc"],
     hdrs = ["transport_socket_match.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/network:raw_buffer_socket_lib",
         "//test/common/stats:stat_test_utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
@@ -62,7 +62,7 @@ envoy_cc_mock(
     srcs = ["load_balancer_context.cc"],
     hdrs = ["load_balancer_context.h"],
     deps = [
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:load_balancer_interface",
     ],
 )
 
@@ -93,12 +93,12 @@ envoy_cc_mock(
         ":thread_aware_load_balancer_mocks",
         ":thread_local_cluster_mocks",
         ":transport_socket_match_mocks",
-        "//include/envoy/http:async_client_interface",
-        "//include/envoy/upstream:cluster_factory_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//include/envoy/upstream:health_checker_interface",
-        "//include/envoy/upstream:load_balancer_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/http:async_client_interface",
+        "//envoy/upstream:cluster_factory_interface",
+        "//envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:health_checker_interface",
+        "//envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/http:header_utility_lib",
         "//source/common/upstream:cluster_factory_lib",
         "//source/common/upstream:health_discovery_service_lib",
@@ -122,7 +122,7 @@ envoy_cc_mock(
     srcs = ["host_set.cc"],
     hdrs = ["host_set.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/common:callback_impl_lib",
         "//source/common/upstream:upstream_lib",
     ],
@@ -133,7 +133,7 @@ envoy_cc_mock(
     srcs = ["priority_set.cc"],
     hdrs = ["priority_set.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//test/mocks/upstream:host_set_mocks",
     ],
 )
@@ -143,7 +143,7 @@ envoy_cc_mock(
     srcs = ["retry_priority.cc"],
     hdrs = ["retry_priority.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
     ],
 )
 
@@ -151,7 +151,7 @@ envoy_cc_mock(
     name = "retry_priority_factory_mocks",
     hdrs = ["retry_priority_factory.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
         "//test/mocks/upstream:retry_priority_mocks",
     ],
 )
@@ -161,7 +161,7 @@ envoy_cc_mock(
     srcs = ["cluster.cc"],
     hdrs = ["cluster.h"],
     deps = [
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:upstream_interface",
         "//test/mocks/upstream:cluster_info_mocks",
     ],
 )
@@ -190,7 +190,7 @@ envoy_cc_mock(
     srcs = ["load_balancer.cc"],
     hdrs = ["load_balancer.h"],
     deps = [
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:load_balancer_interface",
         "//test/mocks/upstream:host_mocks",
     ],
 )
@@ -200,7 +200,7 @@ envoy_cc_mock(
     srcs = ["thread_aware_load_balancer.cc"],
     hdrs = ["thread_aware_load_balancer.h"],
     deps = [
-        "//include/envoy/upstream:load_balancer_interface",
+        "//envoy/upstream:load_balancer_interface",
     ],
 )
 
@@ -209,7 +209,7 @@ envoy_cc_mock(
     srcs = ["thread_local_cluster.cc"],
     hdrs = ["thread_local_cluster.h"],
     deps = [
-        "//include/envoy/upstream:thread_local_cluster_interface",
+        "//envoy/upstream:thread_local_cluster_interface",
         "//test/mocks/http:conn_pool_mocks",
         "//test/mocks/http:http_mocks",
         "//test/mocks/tcp:tcp_mocks",
@@ -223,7 +223,7 @@ envoy_cc_mock(
     srcs = ["cluster_manager_factory.cc"],
     hdrs = ["cluster_manager_factory.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//test/mocks/secret:secret_mocks",
     ],
 )
@@ -233,7 +233,7 @@ envoy_cc_mock(
     srcs = ["cluster_update_callbacks_handle.cc"],
     hdrs = ["cluster_update_callbacks_handle.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ],
 )
 
@@ -242,7 +242,7 @@ envoy_cc_mock(
     srcs = ["cluster_manager.cc"],
     hdrs = ["cluster_manager.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//test/mocks/config:config_mocks",
         "//test/mocks/grpc:grpc_mocks",
         "//test/mocks/http:http_mocks",
@@ -257,7 +257,7 @@ envoy_cc_mock(
     srcs = ["health_checker.cc"],
     hdrs = ["health_checker.h"],
     deps = [
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/upstream:health_checker_interface",
     ],
 )
 
@@ -265,7 +265,7 @@ envoy_cc_mock(
     name = "health_check_event_logger_mocks",
     hdrs = ["health_check_event_logger.h"],
     deps = [
-        "//include/envoy/upstream:health_checker_interface",
+        "//envoy/upstream:health_checker_interface",
         "@envoy_api//envoy/data/core/v3:pkg_cc_proto",
     ],
 )
@@ -275,7 +275,7 @@ envoy_cc_mock(
     srcs = ["cds_api.cc"],
     hdrs = ["cds_api.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ],
 )
 
@@ -284,7 +284,7 @@ envoy_cc_mock(
     srcs = ["cluster_update_callbacks.cc"],
     hdrs = ["cluster_update_callbacks.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
     ],
 )
 
@@ -293,7 +293,7 @@ envoy_cc_mock(
     srcs = ["cluster_info_factory.cc"],
     hdrs = ["cluster_info_factory.h"],
     deps = [
-        "//include/envoy/upstream:cluster_manager_interface",
+        "//envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
     ],
 )
@@ -303,7 +303,7 @@ envoy_cc_mock(
     srcs = ["retry_host_predicate.cc"],
     hdrs = ["retry_host_predicate.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
     ],
 )
 
@@ -311,7 +311,7 @@ envoy_cc_mock(
     name = "test_retry_host_predicate_factory_mocks",
     hdrs = ["test_retry_host_predicate_factory.h"],
     deps = [
-        "//include/envoy/upstream:retry_interface",
+        "//envoy/upstream:retry_interface",
         "//test/mocks/upstream:retry_host_predicate_mocks",
     ],
 )
@@ -321,6 +321,6 @@ envoy_cc_mock(
     srcs = ["basic_resource_limit.cc"],
     hdrs = ["basic_resource_limit.h"],
     deps = [
-        "//include/envoy/common:resource_interface",
+        "//envoy/common:resource_interface",
     ],
 )
diff --git a/test/mocks/upstream/cluster_info.cc b/test/mocks/upstream/cluster_info.cc
index 5e755e1851df0..c24c81d95bc27 100644
--- a/test/mocks/upstream/cluster_info.cc
+++ b/test/mocks/upstream/cluster_info.cc
@@ -6,10 +6,10 @@
 #include "envoy/upstream/host_description.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/config/metadata.h"
-#include "common/http/utility.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/http/utility.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/upstream/upstream_impl.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/test/mocks/upstream/cluster_info.h b/test/mocks/upstream/cluster_info.h
index ab597fade7fa4..060806a376362 100644
--- a/test/mocks/upstream/cluster_info.h
+++ b/test/mocks/upstream/cluster_info.h
@@ -13,11 +13,11 @@
 #include "envoy/upstream/cluster_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/thread.h"
-#include "common/http/http1/codec_stats.h"
-#include "common/http/http2/codec_stats.h"
-#include "common/http/http3/codec_stats.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/http/http1/codec_stats.h"
+#include "source/common/http/http2/codec_stats.h"
+#include "source/common/http/http3/codec_stats.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/mocks/runtime/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/mocks/upstream/cluster_info_factory.h b/test/mocks/upstream/cluster_info_factory.h
index 08144c57154d4..f9f237e490d9e 100644
--- a/test/mocks/upstream/cluster_info_factory.h
+++ b/test/mocks/upstream/cluster_info_factory.h
@@ -2,7 +2,7 @@
 
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/upstream/host.cc b/test/mocks/upstream/host.cc
index 0670abadd5c01..53cab64d27a4c 100644
--- a/test/mocks/upstream/host.cc
+++ b/test/mocks/upstream/host.cc
@@ -1,6 +1,6 @@
 #include "test/mocks/upstream/host.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 using testing::_;
 using testing::Invoke;
diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h
index 82ea4bd8e5df1..2ab0e07a1b0a9 100644
--- a/test/mocks/upstream/host.h
+++ b/test/mocks/upstream/host.h
@@ -9,7 +9,7 @@
 #include "envoy/data/cluster/v3/outlier_detection_event.pb.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/mocks/network/transport_socket.h"
 #include "test/mocks/upstream/cluster_info.h"
diff --git a/test/mocks/upstream/host_set.h b/test/mocks/upstream/host_set.h
index 529d34d387f6e..7fd18d438f0d0 100644
--- a/test/mocks/upstream/host_set.h
+++ b/test/mocks/upstream/host_set.h
@@ -2,8 +2,8 @@
 
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/callback_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h
index 879280b0aef13..433aec61f06e3 100644
--- a/test/mocks/upstream/mocks.h
+++ b/test/mocks/upstream/mocks.h
@@ -12,10 +12,10 @@
 #include "envoy/upstream/health_checker.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/common/callback_impl.h"
-#include "common/upstream/health_discovery_service.h"
-#include "common/upstream/load_balancer_impl.h"
-#include "common/upstream/upstream_impl.h"
+#include "source/common/common/callback_impl.h"
+#include "source/common/upstream/health_discovery_service.h"
+#include "source/common/upstream/load_balancer_impl.h"
+#include "source/common/upstream/upstream_impl.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/grpc/mocks.h"
diff --git a/test/mocks/upstream/transport_socket_match.cc b/test/mocks/upstream/transport_socket_match.cc
index 27a77289b64b5..0f12148f90d3a 100644
--- a/test/mocks/upstream/transport_socket_match.cc
+++ b/test/mocks/upstream/transport_socket_match.cc
@@ -1,6 +1,6 @@
 #include "test/mocks/upstream/transport_socket_match.h"
 
-#include "common/network/raw_buffer_socket.h"
+#include "source/common/network/raw_buffer_socket.h"
 
 using testing::_;
 using testing::Return;
diff --git a/test/server/BUILD b/test/server/BUILD
index 498bc7ecef0bb..c35ef66fa63b9 100644
--- a/test/server/BUILD
+++ b/test/server/BUILD
@@ -125,7 +125,7 @@ envoy_cc_test(
     name = "filter_config_test",
     srcs = ["filter_config_test.cc"],
     deps = [
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "//test/mocks/server:server_mocks",
     ],
@@ -173,7 +173,7 @@ envoy_cc_test(
     size = "small",
     srcs = ["guarddog_impl_test.cc"],
     deps = [
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
         "//source/common/api:api_lib",
         "//source/common/common:macros",
         "//source/common/common:utility_lib",
@@ -193,8 +193,8 @@ envoy_cc_test(
     name = "options_impl_test",
     srcs = ["options_impl_test.cc"],
     deps = [
-        "//include/envoy/config:typed_config_interface",
-        "//include/envoy/server:filter_config_interface",
+        "//envoy/config:typed_config_interface",
+        "//envoy/server:filter_config_interface",
         "//source/common/common:utility_lib",
         "//source/common/stats:stats_lib",
         "//source/extensions/filters/http:well_known_names",
@@ -217,7 +217,7 @@ envoy_cc_test(
     name = "overload_manager_impl_test",
     srcs = ["overload_manager_impl_test.cc"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
         "//source/common/stats:isolated_store_lib",
         "//source/extensions/resource_monitors/common:factory_base_lib",
         "//source/server:overload_manager_lib",
diff --git a/test/server/active_tcp_listener_test.cc b/test/server/active_tcp_listener_test.cc
index cc1e2710f9f2d..9d15d452475b6 100644
--- a/test/server/active_tcp_listener_test.cc
+++ b/test/server/active_tcp_listener_test.cc
@@ -4,12 +4,11 @@
 #include "envoy/network/listener.h"
 #include "envoy/stats/scope.h"
 
-#include "common/network/address_impl.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/utility.h"
-
-#include "server/active_tcp_listener.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/utility.h"
+#include "source/server/active_tcp_listener.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/common.h"
diff --git a/test/server/admin/BUILD b/test/server/admin/BUILD
index 1952d5f6007f4..bd564a1540c6c 100644
--- a/test/server/admin/BUILD
+++ b/test/server/admin/BUILD
@@ -27,8 +27,8 @@ envoy_cc_test(
     srcs = ["admin_test.cc"],
     deps = [
         ":admin_instance_lib",
-        "//include/envoy/json:json_object_interface",
-        "//include/envoy/runtime:runtime_interface",
+        "//envoy/json:json_object_interface",
+        "//envoy/runtime:runtime_interface",
         "//source/common/http:message_lib",
         "//source/common/json:json_loader_lib",
         "//source/common/protobuf",
diff --git a/test/server/admin/admin_filter_test.cc b/test/server/admin/admin_filter_test.cc
index ee51cdecc1698..d7b3cc2ef3de3 100644
--- a/test/server/admin/admin_filter_test.cc
+++ b/test/server/admin/admin_filter_test.cc
@@ -1,4 +1,4 @@
-#include "server/admin/admin_filter.h"
+#include "source/server/admin/admin_filter.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/environment.h"
diff --git a/test/server/admin/admin_instance.cc b/test/server/admin/admin_instance.cc
index e41695c4b0d4f..d63b0887c7467 100644
--- a/test/server/admin/admin_instance.cc
+++ b/test/server/admin/admin_instance.cc
@@ -1,8 +1,7 @@
 #include "test/server/admin/admin_instance.h"
 
-#include "common/access_log/access_log_impl.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 namespace Envoy {
 namespace Server {
diff --git a/test/server/admin/admin_instance.h b/test/server/admin/admin_instance.h
index 7092d973c00e1..b087b926e2183 100644
--- a/test/server/admin/admin_instance.h
+++ b/test/server/admin/admin_instance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "server/admin/admin.h"
+#include "source/server/admin/admin.h"
 
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/runtime/mocks.h"
diff --git a/test/server/admin/admin_test.cc b/test/server/admin/admin_test.cc
index fdcd42ac3e850..b0f8e4532248a 100644
--- a/test/server/admin/admin_test.cc
+++ b/test/server/admin/admin_test.cc
@@ -8,14 +8,13 @@
 #include "envoy/upstream/outlier_detection.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/access_log/access_log_impl.h"
-#include "common/http/message_impl.h"
-#include "common/json/json_loader.h"
-#include "common/protobuf/protobuf.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/upstream_impl.h"
-
-#include "extensions/access_loggers/common/file_access_log_impl.h"
+#include "source/common/access_log/access_log_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/upstream_impl.h"
+#include "source/extensions/access_loggers/common/file_access_log_impl.h"
 
 #include "test/server/admin/admin_instance.h"
 #include "test/test_common/logging.h"
diff --git a/test/server/admin/config_tracker_impl_test.cc b/test/server/admin/config_tracker_impl_test.cc
index 9388c2e2ef112..a666d59a1fbdd 100644
--- a/test/server/admin/config_tracker_impl_test.cc
+++ b/test/server/admin/config_tracker_impl_test.cc
@@ -1,4 +1,4 @@
-#include "server/admin/config_tracker_impl.h"
+#include "source/server/admin/config_tracker_impl.h"
 
 #include "test/mocks/common.h"
 
diff --git a/test/server/admin/logs_handler_test.cc b/test/server/admin/logs_handler_test.cc
index 3103164bb24e4..1325af425d566 100644
--- a/test/server/admin/logs_handler_test.cc
+++ b/test/server/admin/logs_handler_test.cc
@@ -1,5 +1,5 @@
-#include "common/common/fancy_logger.h"
-#include "common/common/logger.h"
+#include "source/common/common/fancy_logger.h"
+#include "source/common/common/logger.h"
 
 #include "test/server/admin/admin_instance.h"
 
diff --git a/test/server/admin/profiling_handler_test.cc b/test/server/admin/profiling_handler_test.cc
index 353bc780e87b7..709675e00a11f 100644
--- a/test/server/admin/profiling_handler_test.cc
+++ b/test/server/admin/profiling_handler_test.cc
@@ -1,4 +1,4 @@
-#include "common/profiler/profiler.h"
+#include "source/common/profiler/profiler.h"
 
 #include "test/server/admin/admin_instance.h"
 #include "test/test_common/logging.h"
diff --git a/test/server/admin/prometheus_stats_test.cc b/test/server/admin/prometheus_stats_test.cc
index bd7ebd530d985..7824218e28bb7 100644
--- a/test/server/admin/prometheus_stats_test.cc
+++ b/test/server/admin/prometheus_stats_test.cc
@@ -1,6 +1,6 @@
 #include <regex>
 
-#include "server/admin/prometheus_stats.h"
+#include "source/server/admin/prometheus_stats.h"
 
 #include "test/mocks/stats/mocks.h"
 #include "test/test_common/utility.h"
diff --git a/test/server/admin/server_info_handler_test.cc b/test/server/admin/server_info_handler_test.cc
index 6bb8902890255..9b7e0fa3643f7 100644
--- a/test/server/admin/server_info_handler_test.cc
+++ b/test/server/admin/server_info_handler_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/admin/v3/memory.pb.h"
 
-#include "extensions/transport_sockets/tls/context_config_impl.h"
+#include "source/extensions/transport_sockets/tls/context_config_impl.h"
 
 #include "test/server/admin/admin_instance.h"
 #include "test/test_common/logging.h"
diff --git a/test/server/admin/stats_handler_test.cc b/test/server/admin/stats_handler_test.cc
index 2f3b02ff75369..cf1dc13118936 100644
--- a/test/server/admin/stats_handler_test.cc
+++ b/test/server/admin/stats_handler_test.cc
@@ -1,8 +1,7 @@
 #include <regex>
 
-#include "common/stats/thread_local_store.h"
-
-#include "server/admin/stats_handler.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/server/admin/stats_handler.h"
 
 #include "test/server/admin/admin_instance.h"
 #include "test/test_common/logging.h"
diff --git a/test/server/api_listener_test.cc b/test/server/api_listener_test.cc
index 477b36dc90694..4572e40a1ce6f 100644
--- a/test/server/api_listener_test.cc
+++ b/test/server/api_listener_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/config/listener/v3/listener.pb.h"
 
-#include "server/api_listener_impl.h"
-#include "server/listener_manager_impl.h"
+#include "source/server/api_listener_impl.h"
+#include "source/server/listener_manager_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/server/backtrace_test.cc b/test/server/backtrace_test.cc
index a83ae4d9a4099..8ba11f5387173 100644
--- a/test/server/backtrace_test.cc
+++ b/test/server/backtrace_test.cc
@@ -1,4 +1,4 @@
-#include "server/backtrace.h"
+#include "source/server/backtrace.h"
 
 #include "test/test_common/logging.h"
 
diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD
index 0f33ffe205e3a..2292906cddb94 100644
--- a/test/server/config_validation/BUILD
+++ b/test/server/config_validation/BUILD
@@ -10,8 +10,8 @@ envoy_cc_test(
     name = "cluster_manager_test",
     srcs = ["cluster_manager_test.cc"],
     deps = [
-        "//include/envoy/upstream:resource_manager_interface",
-        "//include/envoy/upstream:upstream_interface",
+        "//envoy/upstream:resource_manager_interface",
+        "//envoy/upstream:upstream_interface",
         "//source/common/api:api_lib",
         "//source/common/singleton:manager_impl_lib",
         "//source/common/stats:stats_lib",
diff --git a/test/server/config_validation/cluster_manager_test.cc b/test/server/config_validation/cluster_manager_test.cc
index 7f00522f25180..4a5ec1f4fd0d9 100644
--- a/test/server/config_validation/cluster_manager_test.cc
+++ b/test/server/config_validation/cluster_manager_test.cc
@@ -2,14 +2,12 @@
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/upstream.h"
 
-#include "common/api/api_impl.h"
-#include "common/grpc/context_impl.h"
-#include "common/http/context_impl.h"
-#include "common/singleton/manager_impl.h"
-
-#include "server/config_validation/cluster_manager.h"
-
-#include "extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/grpc/context_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/extensions/transport_sockets/tls/context_manager_impl.h"
+#include "source/server/config_validation/cluster_manager.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/server/config_validation/config_fuzz_test.cc b/test/server/config_validation/config_fuzz_test.cc
index e6ce91e4440d5..f2b197ba02eb1 100644
--- a/test/server/config_validation/config_fuzz_test.cc
+++ b/test/server/config_validation/config_fuzz_test.cc
@@ -2,10 +2,9 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/common/thread.h"
-#include "common/network/address_impl.h"
-
-#include "server/config_validation/server.h"
+#include "source/common/common/thread.h"
+#include "source/common/network/address_impl.h"
+#include "source/server/config_validation/server.h"
 
 #include "test/fuzz/fuzz_runner.h"
 #include "test/integration/server.h"
diff --git a/test/server/config_validation/dispatcher_test.cc b/test/server/config_validation/dispatcher_test.cc
index 79abb1c0706e2..608135be22ae0 100644
--- a/test/server/config_validation/dispatcher_test.cc
+++ b/test/server/config_validation/dispatcher_test.cc
@@ -1,13 +1,12 @@
 #include <chrono>
 
-#include "common/common/thread.h"
-#include "common/event/dispatcher_impl.h"
-#include "common/event/libevent.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "server/config_validation/api.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/common/event/libevent.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/server/config_validation/api.h"
 
 #include "test/mocks/common.h"
 #include "test/test_common/environment.h"
diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc
index c7359d97f83c1..14611beda5a60 100644
--- a/test/server/config_validation/server_test.cc
+++ b/test/server/config_validation/server_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "server/config_validation/server.h"
+#include "source/server/config_validation/server.h"
 
 #include "test/integration/server.h"
 #include "test/mocks/server/options.h"
diff --git a/test/server/config_validation/xds_verifier.cc b/test/server/config_validation/xds_verifier.cc
index 4107fd23eabe8..954e2793b249a 100644
--- a/test/server/config_validation/xds_verifier.cc
+++ b/test/server/config_validation/xds_verifier.cc
@@ -1,6 +1,6 @@
 #include "test/server/config_validation/xds_verifier.h"
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 namespace Envoy {
 
diff --git a/test/server/config_validation/xds_verifier.h b/test/server/config_validation/xds_verifier.h
index cfe8968563733..69425f1cd4038 100644
--- a/test/server/config_validation/xds_verifier.h
+++ b/test/server/config_validation/xds_verifier.h
@@ -8,7 +8,7 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/server/config_validation/xds_fuzz.pb.h"
 
diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc
index 6abdd713c0798..d4625db963881 100644
--- a/test/server/configuration_impl_test.cc
+++ b/test/server/configuration_impl_test.cc
@@ -7,15 +7,13 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/metrics/v3/stats.pb.h"
 
-#include "common/api/api_impl.h"
-#include "common/config/well_known_names.h"
-#include "common/json/json_loader.h"
-#include "common/protobuf/utility.h"
-#include "common/upstream/cluster_manager_impl.h"
-
-#include "server/configuration_impl.h"
-
-#include "extensions/stat_sinks/well_known_names.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/config/well_known_names.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/upstream/cluster_manager_impl.h"
+#include "source/extensions/stat_sinks/well_known_names.h"
+#include "source/server/configuration_impl.h"
 
 #include "test/common/upstream/utility.h"
 #include "test/mocks/common.h"
diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc
index c15f984a4e943..b97a3d140c614 100644
--- a/test/server/connection_handler_test.cc
+++ b/test/server/connection_handler_test.cc
@@ -4,18 +4,17 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/scope.h"
 
-#include "common/common/utility.h"
-#include "common/config/utility.h"
-#include "common/network/address_impl.h"
-#include "common/network/connection_balancer_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/udp_listener_impl.h"
-#include "common/network/udp_packet_writer_handler_impl.h"
-#include "common/network/utility.h"
-
-#include "server/active_raw_udp_listener_config.h"
-#include "server/connection_handler_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/utility.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/connection_balancer_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/udp_listener_impl.h"
+#include "source/common/network/udp_packet_writer_handler_impl.h"
+#include "source/common/network/utility.h"
+#include "source/server/active_raw_udp_listener_config.h"
+#include "source/server/connection_handler_impl.h"
 
 #include "test/mocks/access_log/mocks.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/server/drain_manager_impl_test.cc b/test/server/drain_manager_impl_test.cc
index f5a5687af3660..eadddc978abe1 100644
--- a/test/server/drain_manager_impl_test.cc
+++ b/test/server/drain_manager_impl_test.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/config/listener/v3/listener.pb.h"
 
-#include "server/drain_manager_impl.h"
+#include "source/server/drain_manager_impl.h"
 
 #include "test/mocks/server/instance.h"
 
diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc
index 07f12b7812a82..f14ab189beb71 100644
--- a/test/server/filter_chain_benchmark_test.cc
+++ b/test/server/filter_chain_benchmark_test.cc
@@ -7,9 +7,8 @@
 #include "envoy/network/listen_socket.h"
 #include "envoy/protobuf/message_validator.h"
 
-#include "common/network/socket_impl.h"
-
-#include "server/filter_chain_manager_impl.h"
+#include "source/common/network/socket_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
 
 #include "test/benchmark/main.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/server/filter_chain_manager_impl_test.cc b/test/server/filter_chain_manager_impl_test.cc
index c66d80e868190..a329d6e86214c 100644
--- a/test/server/filter_chain_manager_impl_test.cc
+++ b/test/server/filter_chain_manager_impl_test.cc
@@ -9,20 +9,18 @@
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/config/metadata.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "server/configuration_impl.h"
-#include "server/filter_chain_manager_impl.h"
-#include "server/listener_manager_impl.h"
-
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/filter_chain_manager_impl.h"
+#include "source/server/listener_manager_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/drain_manager.h"
diff --git a/test/server/filter_config_test.cc b/test/server/filter_config_test.cc
index 15e89c590020d..71c1318be8f9b 100644
--- a/test/server/filter_config_test.cc
+++ b/test/server/filter_config_test.cc
@@ -1,6 +1,6 @@
 #include "envoy/server/filter_config.h"
 
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "test/mocks/server/factory_context.h"
 
diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc
index d5ff1f4698b4c..53b2dcc962e6a 100644
--- a/test/server/guarddog_impl_test.cc
+++ b/test/server/guarddog_impl_test.cc
@@ -10,12 +10,11 @@
 #include "envoy/server/watchdog.h"
 #include "envoy/thread/thread.h"
 
-#include "common/api/api_impl.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/protobuf/utility.h"
-
-#include "server/guarddog_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/protobuf/utility.h"
+#include "source/server/guarddog_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/server/hot_restart_impl_test.cc b/test/server/hot_restart_impl_test.cc
index 3c61523ebfdf8..a1e29d04b513a 100644
--- a/test/server/hot_restart_impl_test.cc
+++ b/test/server/hot_restart_impl_test.cc
@@ -1,10 +1,9 @@
 #include <memory>
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/api/os_sys_calls_impl_hot_restart.h"
-#include "common/common/hex.h"
-
-#include "server/hot_restart_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl_hot_restart.h"
+#include "source/common/common/hex.h"
+#include "source/server/hot_restart_impl.h"
 
 #include "test/mocks/api/hot_restart.h"
 #include "test/mocks/api/mocks.h"
diff --git a/test/server/hot_restarting_base_test.cc b/test/server/hot_restarting_base_test.cc
index e9f326edf6e56..4bb851d2dfc60 100644
--- a/test/server/hot_restarting_base_test.cc
+++ b/test/server/hot_restarting_base_test.cc
@@ -1,4 +1,4 @@
-#include "server/hot_restarting_base.h"
+#include "source/server/hot_restarting_base.h"
 
 #include "test/mocks/api/mocks.h"
 #include "test/mocks/network/mocks.h"
diff --git a/test/server/hot_restarting_parent_test.cc b/test/server/hot_restarting_parent_test.cc
index 32485e9640927..a403002c44783 100644
--- a/test/server/hot_restarting_parent_test.cc
+++ b/test/server/hot_restarting_parent_test.cc
@@ -1,7 +1,7 @@
 #include <memory>
 
-#include "server/hot_restarting_child.h"
-#include "server/hot_restarting_parent.h"
+#include "source/server/hot_restarting_child.h"
+#include "source/server/hot_restarting_parent.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/instance.h"
diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc
index 1bc639f3e0423..95045d81f2148 100644
--- a/test/server/lds_api_test.cc
+++ b/test/server/lds_api_test.cc
@@ -4,9 +4,8 @@
 #include "envoy/config/listener/v3/listener.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.h"
 
-#include "common/protobuf/utility.h"
-
-#include "server/lds_api.h"
+#include "source/common/protobuf/utility.h"
+#include "source/server/lds_api.h"
 
 #include "test/mocks/config/mocks.h"
 #include "test/mocks/init/mocks.h"
diff --git a/test/server/listener_manager_impl_quic_only_test.cc b/test/server/listener_manager_impl_quic_only_test.cc
index 52e1fee586ef5..60b923887514e 100644
--- a/test/server/listener_manager_impl_quic_only_test.cc
+++ b/test/server/listener_manager_impl_quic_only_test.cc
@@ -2,7 +2,7 @@
 #include "envoy/config/listener/v3/listener.pb.h"
 
 #if defined(ENVOY_ENABLE_QUIC)
-#include "common/quic/quic_transport_socket_factory.h"
+#include "source/common/quic/quic_transport_socket_factory.h"
 #endif
 
 #include "test/server/listener_manager_impl_test.h"
diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc
index 246579d4f1295..40ee2fecc83ff 100644
--- a/test/server/listener_manager_impl_test.cc
+++ b/test/server/listener_manager_impl_test.cc
@@ -15,16 +15,15 @@
 #include "envoy/server/listener_manager.h"
 #include "envoy/stream_info/filter_state.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/config/metadata.h"
-#include "common/init/manager_impl.h"
-#include "common/network/address_impl.h"
-#include "common/network/io_socket_handle_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/protobuf.h"
-
-#include "extensions/filters/listener/original_dst/original_dst.h"
-#include "extensions/transport_sockets/tls/ssl_socket.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/config/metadata.h"
+#include "source/common/init/manager_impl.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/io_socket_handle_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/extensions/filters/listener/original_dst/original_dst.h"
+#include "source/extensions/transport_sockets/tls/ssl_socket.h"
 
 #include "test/mocks/init/mocks.h"
 #include "test/server/utility.h"
diff --git a/test/server/listener_manager_impl_test.h b/test/server/listener_manager_impl_test.h
index 5dff439d8a6d6..26b19f70e672d 100644
--- a/test/server/listener_manager_impl_test.h
+++ b/test/server/listener_manager_impl_test.h
@@ -7,11 +7,10 @@
 #include "envoy/config/listener/v3/listener.pb.h"
 #include "envoy/config/listener/v3/listener_components.pb.h"
 
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_impl.h"
-
-#include "server/configuration_impl.h"
-#include "server/listener_manager_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/listener_manager_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/drain_manager.h"
diff --git a/test/server/options_impl_test.cc b/test/server/options_impl_test.cc
index 9ed6289c323e7..d02acf53bec35 100644
--- a/test/server/options_impl_test.cc
+++ b/test/server/options_impl_test.cc
@@ -13,16 +13,14 @@
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/common/utility.h"
-
-#include "server/options_impl.h"
-
-#include "extensions/filters/http/buffer/buffer_filter.h"
-#include "extensions/filters/http/well_known_names.h"
+#include "source/common/common/utility.h"
+#include "source/extensions/filters/http/buffer/buffer_filter.h"
+#include "source/extensions/filters/http/well_known_names.h"
+#include "source/server/options_impl.h"
 
 #if defined(__linux__)
 #include <sched.h>
-#include "server/options_impl_platform_linux.h"
+#include "source/server/options_impl_platform_linux.h"
 #endif
 #include "test/mocks/api/mocks.h"
 #include "test/test_common/environment.h"
diff --git a/test/server/overload_manager_impl_test.cc b/test/server/overload_manager_impl_test.cc
index 394b6dc96b7d1..7bad384afdd99 100644
--- a/test/server/overload_manager_impl_test.cc
+++ b/test/server/overload_manager_impl_test.cc
@@ -8,11 +8,9 @@
 #include "envoy/server/resource_monitor.h"
 #include "envoy/server/resource_monitor_config.h"
 
-#include "common/stats/isolated_store_impl.h"
-
-#include "server/overload_manager_impl.h"
-
-#include "extensions/resource_monitors/common/factory_base.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/extensions/resource_monitors/common/factory_base.h"
+#include "source/server/overload_manager_impl.h"
 
 #include "test/common/stats/stat_test_utility.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/server/server_fuzz_test.cc b/test/server/server_fuzz_test.cc
index b18dc694832c6..6c60493e65ec5 100644
--- a/test/server/server_fuzz_test.cc
+++ b/test/server/server_fuzz_test.cc
@@ -3,12 +3,11 @@
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 #include "envoy/config/core/v3/address.pb.h"
 
-#include "common/common/random_generator.h"
-#include "common/network/address_impl.h"
-#include "common/thread_local/thread_local_impl.h"
-
-#include "server/listener_hooks.h"
-#include "server/server.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/server.h"
 
 #include "test/common/runtime/utility.h"
 #include "test/fuzz/fuzz_runner.h"
diff --git a/test/server/server_test.cc b/test/server/server_test.cc
index 3d0a17ff62218..263e929758933 100644
--- a/test/server/server_test.cc
+++ b/test/server/server_test.cc
@@ -6,16 +6,15 @@
 #include "envoy/server/bootstrap_extension_config.h"
 #include "envoy/server/fatal_action_config.h"
 
-#include "common/common/assert.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/socket_option_impl.h"
-#include "common/protobuf/protobuf.h"
-#include "common/thread_local/thread_local_impl.h"
-#include "common/version/version.h"
-
-#include "server/process_context_impl.h"
-#include "server/server.h"
+#include "source/common/common/assert.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/socket_option_impl.h"
+#include "source/common/protobuf/protobuf.h"
+#include "source/common/thread_local/thread_local_impl.h"
+#include "source/common/version/version.h"
+#include "source/server/process_context_impl.h"
+#include "source/server/server.h"
 
 #include "test/common/config/dummy_config.pb.h"
 #include "test/common/stats/stat_test_utility.h"
diff --git a/test/server/ssl_context_manager_test.cc b/test/server/ssl_context_manager_test.cc
index 19257fdb9d071..70bc7d6c1a5ce 100644
--- a/test/server/ssl_context_manager_test.cc
+++ b/test/server/ssl_context_manager_test.cc
@@ -1,4 +1,4 @@
-#include "server/ssl_context_manager.h"
+#include "source/server/ssl_context_manager.h"
 
 #include "test/mocks/ssl/mocks.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/server/utility.h b/test/server/utility.h
index 567388492280e..fc5139fff0a16 100644
--- a/test/server/utility.h
+++ b/test/server/utility.h
@@ -5,7 +5,7 @@
 #include "envoy/config/listener/v3/listener.pb.h"
 #include "envoy/config/listener/v3/listener.pb.validate.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/server/worker_impl_test.cc b/test/server/worker_impl_test.cc
index 6fd4291f2d9a2..cf73ebd0b79c5 100644
--- a/test/server/worker_impl_test.cc
+++ b/test/server/worker_impl_test.cc
@@ -1,9 +1,8 @@
 #include "envoy/network/exception.h"
 
-#include "common/api/api_impl.h"
-#include "common/event/dispatcher_impl.h"
-
-#include "server/worker_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/event/dispatcher_impl.h"
+#include "source/server/worker_impl.h"
 
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/server/guard_dog.h"
diff --git a/test/test_common/BUILD b/test/test_common/BUILD
index 50b758d063539..75a5445637854 100644
--- a/test/test_common/BUILD
+++ b/test/test_common/BUILD
@@ -22,7 +22,7 @@ envoy_cc_test_library(
     ],
     deps = [
         ":network_utility_lib",
-        "//include/envoy/server:options_interface",
+        "//envoy/server:options_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:compiler_requirements_lib",
         "//source/common/common:macros",
@@ -44,7 +44,7 @@ envoy_cc_test_library(
     hdrs = ["network_utility.h"],
     deps = [
         ":utility_lib",
-        "//include/envoy/network:filter_interface",
+        "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/network:address_lib",
         "//source/common/network:listen_socket_lib",
@@ -81,7 +81,7 @@ envoy_cc_library(
     srcs = ["printers.cc"],
     hdrs = ["printers.h"],
     deps = [
-        "//include/envoy/network:address_interface",
+        "//envoy/network:address_interface",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:header_map_lib",
     ],
@@ -91,7 +91,7 @@ envoy_cc_test_library(
     name = "registry_lib",
     hdrs = ["registry.h"],
     deps = [
-        "//include/envoy/registry",
+        "//envoy/registry",
     ],
 )
 
@@ -115,9 +115,9 @@ envoy_cc_test_library(
         ":resources_lib",
         ":test_time_lib",
         ":thread_factory_for_test_lib",
-        "//include/envoy/buffer:buffer_interface",
-        "//include/envoy/http:codec_interface",
-        "//include/envoy/network:address_interface",
+        "//envoy/buffer:buffer_interface",
+        "//envoy/http:codec_interface",
+        "//envoy/network:address_interface",
         "//source/common/api:api_lib",
         "//source/common/common:empty_string",
         "//source/common/common:thread_lib",
@@ -251,8 +251,8 @@ envoy_cc_test_library(
     deps = [
         ":global_lib",
         ":only_one_thread_lib",
-        "//include/envoy/event:dispatcher_interface",
-        "//include/envoy/event:timer_interface",
+        "//envoy/event:dispatcher_interface",
+        "//envoy/event:timer_interface",
         "//source/common/common:thread_lib",
     ],
 )
diff --git a/test/test_common/contention.h b/test/test_common/contention.h
index d90ab20d4eea0..e91bbfd61b88a 100644
--- a/test/test_common/contention.h
+++ b/test/test_common/contention.h
@@ -5,9 +5,9 @@
 
 #include "envoy/api/api.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/mutex_tracer_impl.h"
-#include "common/common/thread.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/mutex_tracer_impl.h"
+#include "source/common/common/thread.h"
 
 #include "test/test_common/test_time.h"
 
diff --git a/test/test_common/delegating_route_utility.h b/test/test_common/delegating_route_utility.h
index a8d560c086e1d..2189f88946bbc 100644
--- a/test/test_common/delegating_route_utility.h
+++ b/test/test_common/delegating_route_utility.h
@@ -1,4 +1,4 @@
-#include "common/router/delegating_route_impl.h"
+#include "source/common/router/delegating_route_impl.h"
 
 namespace Envoy {
 namespace Router {
diff --git a/test/test_common/environment.cc b/test/test_common/environment.cc
index 63fffcafc7fab..d2d33a73c4e71 100644
--- a/test/test_common/environment.cc
+++ b/test/test_common/environment.cc
@@ -9,20 +9,20 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/common/assert.h"
-#include "common/common/compiler_requirements.h"
-#include "common/common/logger.h"
-#include "common/common/macros.h"
-#include "common/common/utility.h"
-#include "common/filesystem/directory.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/compiler_requirements.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/macros.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/directory.h"
 
 #include "absl/container/node_hash_map.h"
 
 #ifdef ENVOY_HANDLE_SIGNALS
-#include "common/signal/signal_action.h"
+#include "source/common/signal/signal_action.h"
 #endif
 
-#include "server/options_impl.h"
+#include "source/server/options_impl.h"
 
 #include "test/test_common/file_system_for_test.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/test_common/environment.h b/test/test_common/environment.h
index 935c495c95e55..0aa1cdd632d74 100644
--- a/test/test_common/environment.h
+++ b/test/test_common/environment.h
@@ -7,7 +7,7 @@
 #include "envoy/network/address.h"
 #include "envoy/server/options.h"
 
-#include "common/json/json_loader.h"
+#include "source/common/json/json_loader.h"
 
 #include "absl/container/node_hash_map.h"
 #include "absl/strings/str_cat.h"
diff --git a/test/test_common/file_system_for_test.cc b/test/test_common/file_system_for_test.cc
index c00e82d5835b6..35ea2b1754ea6 100644
--- a/test/test_common/file_system_for_test.cc
+++ b/test/test_common/file_system_for_test.cc
@@ -1,6 +1,6 @@
 #include "test/test_common/file_system_for_test.h"
 
-#include "common/filesystem/filesystem_impl.h"
+#include "source/common/filesystem/filesystem_impl.h"
 
 namespace Envoy {
 
diff --git a/test/test_common/file_system_for_test.h b/test/test_common/file_system_for_test.h
index d3f891e76cb4f..9a8e813c02f34 100644
--- a/test/test_common/file_system_for_test.h
+++ b/test/test_common/file_system_for_test.h
@@ -2,7 +2,7 @@
 
 #include "envoy/filesystem/filesystem.h"
 
-#include "common/filesystem/file_shared_impl.h"
+#include "source/common/filesystem/file_shared_impl.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/test/test_common/global.cc b/test/test_common/global.cc
index 4c827922ee91f..1fdaf758fd6c6 100644
--- a/test/test_common/global.cc
+++ b/test/test_common/global.cc
@@ -1,6 +1,6 @@
 #include "test/test_common/global.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 namespace Envoy {
 namespace Test {
diff --git a/test/test_common/global.h b/test/test_common/global.h
index 872f81e520eba..704bd412ff2f7 100644
--- a/test/test_common/global.h
+++ b/test/test_common/global.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
 
 #include "absl/container/flat_hash_map.h"
 
diff --git a/test/test_common/logging.cc b/test/test_common/logging.cc
index f014241fb198f..3663feb0c83dd 100644
--- a/test/test_common/logging.cc
+++ b/test/test_common/logging.cc
@@ -1,6 +1,6 @@
 #include "test/test_common/logging.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/synchronization/mutex.h"
 
diff --git a/test/test_common/logging.h b/test/test_common/logging.h
index 698fba241aad5..124f553fe7666 100644
--- a/test/test_common/logging.h
+++ b/test/test_common/logging.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
diff --git a/test/test_common/network_utility.cc b/test/test_common/network_utility.cc
index 7e413e3ac5ce5..976f2e2205e65 100644
--- a/test/test_common/network_utility.cc
+++ b/test/test_common/network_utility.cc
@@ -5,15 +5,15 @@
 
 #include "envoy/common/platform.h"
 
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/assert.h"
-#include "common/common/fmt.h"
-#include "common/network/address_impl.h"
-#include "common/network/listen_socket_impl.h"
-#include "common/network/raw_buffer_socket.h"
-#include "common/network/socket_interface.h"
-#include "common/network/socket_option_factory.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/fmt.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/listen_socket_impl.h"
+#include "source/common/network/raw_buffer_socket.h"
+#include "source/common/network/socket_interface.h"
+#include "source/common/network/socket_option_factory.h"
+#include "source/common/runtime/runtime_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/test/test_common/network_utility.h b/test/test_common/network_utility.h
index 8970e790c6b81..47cea59e53ba7 100644
--- a/test/test_common/network_utility.h
+++ b/test/test_common/network_utility.h
@@ -8,7 +8,7 @@
 #include "envoy/network/io_handle.h"
 #include "envoy/network/transport_socket.h"
 
-#include "common/network/utility.h"
+#include "source/common/network/utility.h"
 
 namespace Envoy {
 namespace Network {
diff --git a/test/test_common/network_utility_test.cc b/test/test_common/network_utility_test.cc
index dc40f1d28f2f3..e23575234fa49 100644
--- a/test/test_common/network_utility_test.cc
+++ b/test/test_common/network_utility_test.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "common/api/os_sys_calls_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
 
 #include "test/test_common/environment.h"
 #include "test/test_common/network_utility.h"
diff --git a/test/test_common/only_one_thread.cc b/test/test_common/only_one_thread.cc
index 06cc9855446d8..5b51f7664d408 100644
--- a/test/test_common/only_one_thread.cc
+++ b/test/test_common/only_one_thread.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/thread/thread.h"
 
-#include "common/common/lock_guard.h"
+#include "source/common/common/lock_guard.h"
 
 #include "test/test_common/thread_factory_for_test.h"
 
diff --git a/test/test_common/only_one_thread.h b/test/test_common/only_one_thread.h
index c726ae6d28fa5..fe2a4de752eb5 100644
--- a/test/test_common/only_one_thread.h
+++ b/test/test_common/only_one_thread.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/common/assert.h"
-#include "common/common/thread.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Thread {
diff --git a/test/test_common/printers.cc b/test/test_common/printers.cc
index 8a2ece63ad132..6d671b6696311 100644
--- a/test/test_common/printers.cc
+++ b/test/test_common/printers.cc
@@ -3,8 +3,8 @@
 
 #include <iostream>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/header_map_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Http {
diff --git a/test/test_common/resources.h b/test/test_common/resources.h
index e6508837f3cf9..9dcc8ec54b6be 100644
--- a/test/test_common/resources.h
+++ b/test/test_common/resources.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/singleton/const_singleton.h"
+#include "source/common/singleton/const_singleton.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/test/test_common/simulated_time_system.cc b/test/test_common/simulated_time_system.cc
index b01f13f6e0b35..de3b4e23db0fa 100644
--- a/test/test_common/simulated_time_system.cc
+++ b/test/test_common/simulated_time_system.cc
@@ -4,11 +4,11 @@
 
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/assert.h"
-#include "common/common/lock_guard.h"
-#include "common/event/real_time_system.h"
-#include "common/event/timer_impl.h"
-#include "common/runtime/runtime_features.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/event/real_time_system.h"
+#include "source/common/event/timer_impl.h"
+#include "source/common/runtime/runtime_features.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/test/test_common/simulated_time_system.h b/test/test_common/simulated_time_system.h
index bdd860e13594f..16c09c67299f2 100644
--- a/test/test_common/simulated_time_system.h
+++ b/test/test_common/simulated_time_system.h
@@ -2,9 +2,9 @@
 
 #include "envoy/event/timer.h"
 
-#include "common/common/lock_guard.h"
-#include "common/common/thread.h"
-#include "common/common/utility.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread.h"
+#include "source/common/common/utility.h"
 
 #include "test/test_common/test_time_system.h"
 #include "test/test_common/utility.h"
diff --git a/test/test_common/simulated_time_system_test.cc b/test/test_common/simulated_time_system_test.cc
index f518a1a249853..422669b0725e5 100644
--- a/test/test_common/simulated_time_system_test.cc
+++ b/test/test_common/simulated_time_system_test.cc
@@ -1,7 +1,7 @@
-#include "common/common/thread.h"
-#include "common/event/libevent.h"
-#include "common/event/libevent_scheduler.h"
-#include "common/event/timer_impl.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/libevent.h"
+#include "source/common/event/libevent_scheduler.h"
+#include "source/common/event/timer_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/test_common/test_runtime.h b/test/test_common/test_runtime.h
index 0f270c122d5a1..433292a4f5e0e 100644
--- a/test/test_common/test_runtime.h
+++ b/test/test_common/test_runtime.h
@@ -13,8 +13,8 @@
 
 #include "envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "common/runtime/runtime_impl.h"
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/event/mocks.h"
diff --git a/test/test_common/test_time.cc b/test/test_common/test_time.cc
index 98deac1a959d1..691c48ad8d34d 100644
--- a/test/test_common/test_time.cc
+++ b/test/test_common/test_time.cc
@@ -1,6 +1,6 @@
 #include "test/test_common/test_time.h"
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 #include "test/test_common/global.h"
 
diff --git a/test/test_common/test_time.h b/test/test_common/test_time.h
index 038a44e734c5e..8234584a2ef28 100644
--- a/test/test_common/test_time.h
+++ b/test/test_common/test_time.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/event/real_time_system.h"
+#include "source/common/event/real_time_system.h"
 
 #include "test/test_common/global.h"
 #include "test/test_common/test_time_system.h"
diff --git a/test/test_common/test_time_system.cc b/test/test_common/test_time_system.cc
index a24763e9c07db..3b81864402ca6 100644
--- a/test/test_common/test_time_system.cc
+++ b/test/test_common/test_time_system.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/event/timer.h"
 
-#include "common/common/thread.h"
+#include "source/common/common/thread.h"
 
 namespace Envoy {
 namespace Event {
diff --git a/test/test_common/test_time_system.h b/test/test_common/test_time_system.h
index 932f7083260d3..17a6ac3a7017f 100644
--- a/test/test_common/test_time_system.h
+++ b/test/test_common/test_time_system.h
@@ -4,8 +4,8 @@
 #include "envoy/event/dispatcher.h"
 #include "envoy/event/timer.h"
 
-#include "common/common/assert.h"
-#include "common/common/thread.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/thread.h"
 
 #include "test/test_common/global.h"
 #include "test/test_common/only_one_thread.h"
diff --git a/test/test_common/thread_factory_for_test.cc b/test/test_common/thread_factory_for_test.cc
index 38b966bae0663..55c4d84ed12b8 100644
--- a/test/test_common/thread_factory_for_test.cc
+++ b/test/test_common/thread_factory_for_test.cc
@@ -1,4 +1,4 @@
-#include "common/common/thread_impl.h"
+#include "source/common/common/thread_impl.h"
 
 namespace Envoy {
 
diff --git a/test/test_common/threadsafe_singleton_injector.h b/test/test_common/threadsafe_singleton_injector.h
index b9a0020dc88a3..ae90022d77707 100644
--- a/test/test_common/threadsafe_singleton_injector.h
+++ b/test/test_common/threadsafe_singleton_injector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/singleton/threadsafe_singleton.h"
+#include "source/common/singleton/threadsafe_singleton.h"
 
 namespace Envoy {
 
diff --git a/test/test_common/utility.cc b/test/test_common/utility.cc
index 1b22d4a14ec10..accd549af2031 100644
--- a/test/test_common/utility.cc
+++ b/test/test_common/utility.cc
@@ -20,17 +20,17 @@
 #include "envoy/http/codec.h"
 #include "envoy/service/runtime/v3/rtds.pb.h"
 
-#include "common/api/api_impl.h"
-#include "common/common/fmt.h"
-#include "common/common/lock_guard.h"
-#include "common/common/thread_impl.h"
-#include "common/common/utility.h"
-#include "common/filesystem/directory.h"
-#include "common/filesystem/filesystem_impl.h"
-#include "common/http/header_utility.h"
-#include "common/json/json_loader.h"
-#include "common/network/address_impl.h"
-#include "common/network/utility.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/lock_guard.h"
+#include "source/common/common/thread_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/filesystem/directory.h"
+#include "source/common/filesystem/filesystem_impl.h"
+#include "source/common/http/header_utility.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/network/utility.h"
 
 #include "test/mocks/common.h"
 #include "test/mocks/stats/mocks.h"
diff --git a/test/test_common/utility.h b/test/test_common/utility.h
index a3e79fd5593be..692b7248b768e 100644
--- a/test/test_common/utility.h
+++ b/test/test_common/utility.h
@@ -15,17 +15,17 @@
 #include "envoy/type/matcher/v3/string.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/c_smart_ptr.h"
-#include "common/common/empty_string.h"
-#include "common/common/thread.h"
-#include "common/config/decoded_resource_impl.h"
-#include "common/config/opaque_resource_decoder_impl.h"
-#include "common/config/version_converter.h"
-#include "common/http/header_map_impl.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/symbol_table_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/c_smart_ptr.h"
+#include "source/common/common/empty_string.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/decoded_resource_impl.h"
+#include "source/common/config/opaque_resource_decoder_impl.h"
+#include "source/common/config/version_converter.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/symbol_table_impl.h"
 
 #include "test/test_common/file_system_for_test.h"
 #include "test/test_common/logging.h"
diff --git a/test/test_common/wasm_base.h b/test/test_common/wasm_base.h
index 775197c2ddfea..89e49b16e1e11 100644
--- a/test/test_common/wasm_base.h
+++ b/test/test_common/wasm_base.h
@@ -5,12 +5,11 @@
 #include "envoy/extensions/wasm/v3/wasm.pb.validate.h"
 #include "envoy/server/lifecycle_notifier.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/message_impl.h"
-#include "common/stats/isolated_store_impl.h"
-#include "common/stream_info/stream_info_impl.h"
-
-#include "extensions/common/wasm/wasm.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/message_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
+#include "source/extensions/common/wasm/wasm.h"
 
 #include "test/mocks/grpc/mocks.h"
 #include "test/mocks/http/mocks.h"
diff --git a/test/test_listener.cc b/test/test_listener.cc
index 61e6b6b12bf3c..12dba6668f813 100644
--- a/test/test_listener.cc
+++ b/test/test_listener.cc
@@ -1,6 +1,6 @@
 #include "test/test_listener.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "test/test_common/global.h"
 
diff --git a/test/test_runner.cc b/test/test_runner.cc
index d30a78b0b9e61..c910d4fb505af 100644
--- a/test/test_runner.cc
+++ b/test/test_runner.cc
@@ -2,15 +2,13 @@
 
 #include <regex>
 
-#include "common/common/logger.h"
-#include "common/common/logger_delegates.h"
-#include "common/common/thread.h"
-#include "common/event/libevent.h"
-#include "common/runtime/runtime_features.h"
-
-#include "exe/process_wide.h"
-
-#include "server/backtrace.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/logger_delegates.h"
+#include "source/common/common/thread.h"
+#include "source/common/event/libevent.h"
+#include "source/common/runtime/runtime_features.h"
+#include "source/exe/process_wide.h"
+#include "source/server/backtrace.h"
 
 #include "test/common/runtime/utility.h"
 #include "test/mocks/access_log/mocks.h"
diff --git a/test/tools/config_load_check/config_load_check.cc b/test/tools/config_load_check/config_load_check.cc
index 6b521c3340d46..5dfee0adc3b4d 100644
--- a/test/tools/config_load_check/config_load_check.cc
+++ b/test/tools/config_load_check/config_load_check.cc
@@ -3,11 +3,11 @@
 #include <stdexcept>
 #include <string>
 
-#include "common/common/fmt.h"
-#include "common/common/logger.h"
-#include "common/common/thread.h"
-#include "common/config/protobuf_link_hacks.h"
-#include "common/event/libevent.h"
+#include "source/common/common/fmt.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread.h"
+#include "source/common/config/protobuf_link_hacks.h"
+#include "source/common/event/libevent.h"
 
 #include "test/config_test/config_test.h"
 
diff --git a/test/tools/router_check/router.cc b/test/tools/router_check/router.cc
index 80441856af305..7da0acffffa7b 100644
--- a/test/tools/router_check/router.cc
+++ b/test/tools/router_check/router.cc
@@ -8,12 +8,12 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/random_generator.h"
-#include "common/network/socket_impl.h"
-#include "common/network/utility.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/network/socket_impl.h"
+#include "source/common/network/utility.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/test_common/printers.h"
 
diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h
index 337d54832abc5..3624efcb9cc4f 100644
--- a/test/tools/router_check/router.h
+++ b/test/tools/router_check/router.h
@@ -6,14 +6,14 @@
 #include "envoy/config/route/v3/route.pb.h"
 #include "envoy/type/v3/percent.pb.h"
 
-#include "common/common/logger.h"
-#include "common/common/utility.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/headers.h"
-#include "common/json/json_loader.h"
-#include "common/router/config_impl.h"
-#include "common/stats/symbol_table_impl.h"
-#include "common/stream_info/stream_info_impl.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/utility.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/json/json_loader.h"
+#include "source/common/router/config_impl.h"
+#include "source/common/stats/symbol_table_impl.h"
+#include "source/common/stream_info/stream_info_impl.h"
 
 #include "test/mocks/server/instance.h"
 #include "test/test_common/global.h"
diff --git a/test/tools/router_check/router_check.cc b/test/tools/router_check/router_check.cc
index fea89d3eca983..bba8b036b229e 100644
--- a/test/tools/router_check/router_check.cc
+++ b/test/tools/router_check/router_check.cc
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <string>
 
-#include "exe/platform_impl.h"
+#include "source/exe/platform_impl.h"
 
 #include "test/test_common/test_runtime.h"
 #include "test/tools/router_check/router.h"
diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD
index c0d198f6f5d59..1891bb24a036c 100644
--- a/test/tools/schema_validator/BUILD
+++ b/test/tools/schema_validator/BUILD
@@ -25,7 +25,7 @@ envoy_cc_test_library(
     copts = ["-DHAVE_LONG_LONG"],
     external_deps = ["tclap"],
     deps = [
-        "//include/envoy/api:api_interface",
+        "//envoy/api:api_interface",
         "//source/common/protobuf:utility_lib",
         "//source/common/stats:isolated_store_lib",
         "//test/test_common:utility_lib",
diff --git a/test/tools/schema_validator/validator.cc b/test/tools/schema_validator/validator.cc
index d6d24219cb566..28ab9316a8a19 100644
--- a/test/tools/schema_validator/validator.cc
+++ b/test/tools/schema_validator/validator.cc
@@ -5,7 +5,7 @@
 #include "envoy/service/discovery/v3/discovery.pb.h"
 #include "envoy/service/discovery/v3/discovery.pb.validate.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 #include "tclap/CmdLine.h"
 
diff --git a/test/tools/schema_validator/validator.h b/test/tools/schema_validator/validator.h
index af2dcce0331a1..1e92cce035cb8 100644
--- a/test/tools/schema_validator/validator.h
+++ b/test/tools/schema_validator/validator.h
@@ -4,7 +4,7 @@
 
 #include "envoy/api/api.h"
 
-#include "common/stats/isolated_store_impl.h"
+#include "source/common/stats/isolated_store_impl.h"
 
 #include "test/test_common/utility.h"
 
diff --git a/tools/api_boost/testdata/BUILD b/tools/api_boost/testdata/BUILD
index 148b1b5c47873..f3e1298ff05b8 100644
--- a/tools/api_boost/testdata/BUILD
+++ b/tools/api_boost/testdata/BUILD
@@ -59,7 +59,7 @@ envoy_cc_library(
     name = "validate",
     srcs = ["validate.cc"],
     deps = [
-        "//include/envoy/protobuf:message_validator_interface",
+        "//envoy/protobuf:message_validator_interface",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
diff --git a/tools/api_boost/testdata/validate.cc b/tools/api_boost/testdata/validate.cc
index 7de4b2b65acef..97fbd6bac35d9 100644
--- a/tools/api_boost/testdata/validate.cc
+++ b/tools/api_boost/testdata/validate.cc
@@ -2,7 +2,7 @@
 #include "envoy/api/v2/cluster.pb.validate.h"
 #include "envoy/protobuf/message_validator.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 void foo(Envoy::ProtobufMessage::ValidationVisitor& validator) {
   envoy::api::v2::Cluster msg;
diff --git a/tools/api_boost/testdata/validate.cc.gold b/tools/api_boost/testdata/validate.cc.gold
index f358c7aec7158..5b991b7294e5e 100644
--- a/tools/api_boost/testdata/validate.cc.gold
+++ b/tools/api_boost/testdata/validate.cc.gold
@@ -2,7 +2,7 @@
 #include "envoy/config/cluster/v4alpha/cluster.pb.validate.h"
 #include "envoy/protobuf/message_validator.h"
 
-#include "common/protobuf/utility.h"
+#include "source/common/protobuf/utility.h"
 
 void foo(Envoy::ProtobufMessage::ValidationVisitor& validator) {
   envoy::config::cluster::v4alpha::Cluster msg;
diff --git a/tools/api_versioning/generate_api_version_header.py b/tools/api_versioning/generate_api_version_header.py
index 7d8ab3342983a..a7519ecb02d33 100644
--- a/tools/api_versioning/generate_api_version_header.py
+++ b/tools/api_versioning/generate_api_version_header.py
@@ -9,7 +9,7 @@
 
 FILE_TEMPLATE = string.Template(
     """#pragma once
-#include "common/version/api_version_struct.h"
+#include "source/common/version/api_version_struct.h"
 
 namespace Envoy {
 
diff --git a/tools/bootstrap2pb.cc b/tools/bootstrap2pb.cc
index 5cb2c6c3aeaa0..0c41fd948efb6 100644
--- a/tools/bootstrap2pb.cc
+++ b/tools/bootstrap2pb.cc
@@ -11,15 +11,14 @@
 
 #include "envoy/config/bootstrap/v2/bootstrap.pb.h"
 
-#include "common/api/api_impl.h"
-#include "common/common/assert.h"
-#include "common/common/random_generator.h"
-#include "common/event/real_time_system.h"
-#include "common/protobuf/message_validator_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/stats/isolated_store_impl.h"
-
-#include "exe/platform_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/event/real_time_system.h"
+#include "source/common/protobuf/message_validator_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/stats/isolated_store_impl.h"
+#include "source/exe/platform_impl.h"
 
 // NOLINT(namespace-envoy)
 int main(int argc, char** argv) {
diff --git a/tools/code_format/check_format.py b/tools/code_format/check_format.py
index 3e24b50f261a6..92a00dee80db7 100755
--- a/tools/code_format/check_format.py
+++ b/tools/code_format/check_format.py
@@ -835,12 +835,12 @@ def check_source_line(self, line, file_path, report_error):
             report_error(
                 "Don't use raw try, use TRY_ASSERT_MAIN_THREAD if on the main thread otherwise don't use exceptions."
             )
-        if "__attribute__((packed))" in line and file_path != "./include/envoy/common/platform.h":
+        if "__attribute__((packed))" in line and file_path != "./envoy/common/platform.h":
             # __attribute__((packed)) is not supported by MSVC, we have a PACKED_STRUCT macro that
             # can be used instead
             report_error(
                 "Don't use __attribute__((packed)), use the PACKED_STRUCT macro defined "
-                "in include/envoy/common/platform.h instead")
+                "in envoy/common/platform.h instead")
         if DESIGNATED_INITIALIZER_REGEX.search(line):
             # Designated initializers are not part of the C++14 standard and are not supported
             # by MSVC
diff --git a/tools/envoy_headersplit/code_corpus/fail_mocks.cc b/tools/envoy_headersplit/code_corpus/fail_mocks.cc
index 17fca78fae7f5..7936ece0f66de 100644
--- a/tools/envoy_headersplit/code_corpus/fail_mocks.cc
+++ b/tools/envoy_headersplit/code_corpus/fail_mocks.cc
@@ -7,7 +7,7 @@
 #include "envoy/admin/v3/server_info.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/singleton/manager_impl.h"
+#include "source/common/singleton/manager_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/tools/envoy_headersplit/code_corpus/fake_source_code.cc b/tools/envoy_headersplit/code_corpus/fake_source_code.cc
index ecc63cbca718a..cd8aa71659bae 100644
--- a/tools/envoy_headersplit/code_corpus/fake_source_code.cc
+++ b/tools/envoy_headersplit/code_corpus/fake_source_code.cc
@@ -7,11 +7,11 @@
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/route/v3/route_components.pb.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/http/async_client_impl.h"
-#include "common/http/context_impl.h"
-#include "common/http/headers.h"
-#include "common/http/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/http/async_client_impl.h"
+#include "source/common/http/context_impl.h"
+#include "source/common/http/headers.h"
+#include "source/common/http/utility.h"
 
 #include "test/common/http/common.h"
 #include "test/mocks/buffer/mocks.h"
diff --git a/tools/testdata/check_format/header_order.cc b/tools/testdata/check_format/header_order.cc
index d387bb3415d53..b0aa98c3cd1a0 100644
--- a/tools/testdata/check_format/header_order.cc
+++ b/tools/testdata/check_format/header_order.cc
@@ -1,19 +1,19 @@
 #include "absl/types/optional.h"
-#include "common/api/api_impl.h"
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/utility.h"
-#include "common/version/version.h"
-#include "common/config/resources.h"
-#include "common/config/utility.h"
-#include "common/local_info/local_info_impl.h"
-#include "common/memory/stats.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/rds_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/singleton/manager_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/upstream/cluster_manager_impl.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/version/version.h"
+#include "source/common/config/resources.h"
+#include "source/common/config/utility.h"
+#include "source/common/local_info/local_info_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/upstream/cluster_manager_impl.h"
 #include <cstdint>
 #include "envoy/admin/v2alpha/config_dump.pb.h"
 #include "envoy/config/bootstrap/v2/bootstrap.pb.h"
@@ -25,10 +25,10 @@
 #include "envoy/server/options.h"
 #include "envoy/upstream/cluster_manager.h"
 #include <functional>
-#include "server/configuration_impl.h"
-#include "server/connection_handler_impl.h"
-#include "server/guarddog_impl.h"
-#include "server/listener_hooks.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/connection_handler_impl.h"
+#include "source/server/guarddog_impl.h"
+#include "source/server/listener_hooks.h"
 #include <signal.h>
 #include <string>
 #include <unordered_set>
diff --git a/tools/testdata/check_format/header_order.cc.gold b/tools/testdata/check_format/header_order.cc.gold
index 5f6d6433a91b2..acd9fd1a98611 100644
--- a/tools/testdata/check_format/header_order.cc.gold
+++ b/tools/testdata/check_format/header_order.cc.gold
@@ -15,26 +15,25 @@
 #include "envoy/server/options.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "common/api/api_impl.h"
-#include "common/api/os_sys_calls_impl.h"
-#include "common/common/utility.h"
-#include "common/config/resources.h"
-#include "common/config/utility.h"
-#include "common/local_info/local_info_impl.h"
-#include "common/memory/stats.h"
-#include "common/network/address_impl.h"
-#include "common/protobuf/utility.h"
-#include "common/router/rds_impl.h"
-#include "common/runtime/runtime_impl.h"
-#include "common/singleton/manager_impl.h"
-#include "common/stats/thread_local_store.h"
-#include "common/upstream/cluster_manager_impl.h"
-#include "common/version/version.h"
-
-#include "server/configuration_impl.h"
-#include "server/connection_handler_impl.h"
-#include "server/guarddog_impl.h"
-#include "server/listener_hooks.h"
+#include "source/common/api/api_impl.h"
+#include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/common/utility.h"
+#include "source/common/config/resources.h"
+#include "source/common/config/utility.h"
+#include "source/common/local_info/local_info_impl.h"
+#include "source/common/memory/stats.h"
+#include "source/common/network/address_impl.h"
+#include "source/common/protobuf/utility.h"
+#include "source/common/router/rds_impl.h"
+#include "source/common/runtime/runtime_impl.h"
+#include "source/common/singleton/manager_impl.h"
+#include "source/common/stats/thread_local_store.h"
+#include "source/common/upstream/cluster_manager_impl.h"
+#include "source/common/version/version.h"
+#include "source/server/configuration_impl.h"
+#include "source/server/connection_handler_impl.h"
+#include "source/server/guarddog_impl.h"
+#include "source/server/listener_hooks.h"
 
 #include "absl/types/optional.h"
 
diff --git a/tools/type_whisperer/api_type_db.cc b/tools/type_whisperer/api_type_db.cc
index 4d84bec799bb1..198a3ee4a477c 100644
--- a/tools/type_whisperer/api_type_db.cc
+++ b/tools/type_whisperer/api_type_db.cc
@@ -1,6 +1,6 @@
 #include "tools/type_whisperer/api_type_db.h"
 
-#include "common/protobuf/protobuf.h"
+#include "source/common/protobuf/protobuf.h"
 
 #include "tools/type_whisperer/api_type_db.pb.h"
 #include "udpa/annotations/migrate.pb.h"