diff --git a/bazel/DEVELOPER.md b/bazel/DEVELOPER.md
index 41a3d5046e048..6830f220a9246 100644
--- a/bazel/DEVELOPER.md
+++ b/bazel/DEVELOPER.md
@@ -22,12 +22,12 @@ be sorted alphabetically by their `name` attribute.
 
 All modules that make up the Envoy binary are statically linked at compile time.
 Many of the modules within Envoy have a pure virtual interface living in
-[`include/envoy`](../include/envoy), implementation sources in
+[`envoy`](../envoy), implementation sources in
 [`source`](../source), mocks in [`test/mocks`](../test/mocks) and
 unit/integration tests in [`test`](../test). The relevant `BUILD` files will
 require updating or to be added in these locations as you extend Envoy.
 
-As an example, consider adding the following interface in `include/envoy/foo/bar.h`:
+As an example, consider adding the following interface in `envoy/foo/bar.h`:
 
 ```c++
 #pragma once
@@ -43,7 +43,7 @@ public:
   ...
 ```
 
-This would require the addition to `include/envoy/foo/BUILD` of the following target:
+This would require the addition to `envoy/foo/BUILD` of the following target:
 
 ```python
 envoy_cc_library(
@@ -51,7 +51,7 @@ envoy_cc_library(
     hdrs = ["bar.h"],
     deps = [
         ":baz_interface",
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 ```
@@ -59,7 +59,7 @@ envoy_cc_library(
 This declares a new target `bar_interface`, where the convention is that pure
 virtual interfaces have their targets suffixed with `_interface`. The header
 `bar.h` is exported to other targets that depend on
-`//include/envoy/foo:bar_interface`. The interface target itself depends on
+`//envoy/foo:bar_interface`. The interface target itself depends on
 `baz_interface` (in the same directory, hence the relative Bazel label) and
 `buffer_interface`.
 
@@ -82,11 +82,11 @@ class BarImpl : public Bar {
 and `source/common/foo/bar_impl.cc`:
 
 ```c++
-#include "common/foo/bar_impl.h"
+#include "source/common/foo/bar_impl.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/foo/bar_internal.h"
-#include "common/foo/baz_impl.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/foo/bar_internal.h"
+#include "source/common/foo/baz_impl.h"
 ...
 ```
 
@@ -102,7 +102,7 @@ envoy_cc_library(
     hdrs = ["bar_impl.h"],
     deps = [
         ":baz_lib",
-        "//include/envoy/foo:bar_interface",
+        "//envoy/foo:bar_interface",
         "//source/common/buffer:buffer_lib",
     ],
 )
@@ -120,7 +120,7 @@ envoy_cc_mock(
     srcs = ["mocks.cc"],
     hdrs = ["mocks.h"],
     deps = [
-        "//include/envoy/foo:bar_interface",
+        "//envoy/foo:bar_interface",
         ...
     ],
 )
diff --git a/bazel/PPROF.md b/bazel/PPROF.md
index ec29881557eb1..c3ad65aca5d8d 100644
--- a/bazel/PPROF.md
+++ b/bazel/PPROF.md
@@ -95,7 +95,7 @@ Example:
 
 ```c++
     // includes
-    #include "common/profiler/profiler.h"
+    #include "source/common/profiler/profiler.h"
     ...
     Function(...) {
         if (!Profiler::Cpu::startProfiler(profile_path)) {
diff --git a/tools/api_versioning/generate_api_version_header_test.py b/tools/api_versioning/generate_api_version_header_test.py
index 6a324ac859074..8035b21ce878e 100644
--- a/tools/api_versioning/generate_api_version_header_test.py
+++ b/tools/api_versioning/generate_api_version_header_test.py
@@ -13,7 +13,7 @@
 class GenerateApiVersionHeaderTest(unittest.TestCase):
     EXPECTED_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/code_format/header_order.py b/tools/code_format/header_order.py
index e365cee84fec1..c47166daef061 100755
--- a/tools/code_format/header_order.py
+++ b/tools/code_format/header_order.py
@@ -56,7 +56,7 @@ def reorder_headers(path):
 
     # Filter for includes that finds the #include of the header file associated with the source file
     # being processed. E.g. if 'path' is source/common/common/hex.cc, this filter matches
-    # "common/common/hex.h".
+    # "source/common/common/hex.h".
     def file_header_filter():
         return lambda f: f.endswith('.h"') and path.endswith(f[1:-3] + '.cc')
 
diff --git a/tools/testdata/check_format/angle_bracket_include.cc b/tools/testdata/check_format/angle_bracket_include.cc
index 2bfc071715785..31a857521890a 100644
--- a/tools/testdata/check_format/angle_bracket_include.cc
+++ b/tools/testdata/check_format/angle_bracket_include.cc
@@ -1,5 +1,5 @@
 namespace Envoy {
 
-#include <common/common/utility.h>
+#include <source/common/common/utility.h>
 
 } // namespace Envoy
diff --git a/tools/testdata/check_format/angle_bracket_include.cc.gold b/tools/testdata/check_format/angle_bracket_include.cc.gold
index 3be5b517b8bf7..b953b0f47646d 100644
--- a/tools/testdata/check_format/angle_bracket_include.cc.gold
+++ b/tools/testdata/check_format/angle_bracket_include.cc.gold
@@ -1,5 +1,5 @@
 namespace Envoy {
 
-#include "common/common/utility.h"
+#include "source/common/common/utility.h"
 
 } // namespace Envoy