diff --git a/display_list/benchmarking/dl_benchmarks.h b/display_list/benchmarking/dl_benchmarks.h
index de3107a89c585..b0b33d32ebe88 100644
--- a/display_list/benchmarking/dl_benchmarks.h
+++ b/display_list/benchmarking/dl_benchmarks.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
 
 #include "flutter/display_list/dl_canvas.h"
 #include "flutter/display_list/dl_sampling_options.h"
@@ -587,4 +587,4 @@ void BM_SaveLayer(benchmark::State& state,
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
diff --git a/display_list/benchmarking/dl_complexity.h b/display_list/benchmarking/dl_complexity.h
index 0ccdbffee4e1e..6cbf1de0a3622 100644
--- a/display_list/benchmarking/dl_complexity.h
+++ b/display_list/benchmarking/dl_complexity.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
 
 #include "flutter/display_list/display_list.h"
 
@@ -55,4 +55,4 @@ class DisplayListNaiveComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
diff --git a/display_list/benchmarking/dl_complexity_gl.h b/display_list/benchmarking/dl_complexity_gl.h
index 09d6c8eb41a99..d388c6f6a2547 100644
--- a/display_list/benchmarking/dl_complexity_gl.h
+++ b/display_list/benchmarking/dl_complexity_gl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
 
 #include "flutter/display_list/benchmarking/dl_complexity_helper.h"
 
@@ -99,4 +99,4 @@ class DisplayListGLComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
diff --git a/display_list/benchmarking/dl_complexity_helper.h b/display_list/benchmarking/dl_complexity_helper.h
index 2f7133ed499e4..13253affa2e0a 100644
--- a/display_list/benchmarking/dl_complexity_helper.h
+++ b/display_list/benchmarking/dl_complexity_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
 
 #include "flutter/display_list/benchmarking/dl_complexity.h"
 #include "flutter/display_list/dl_blend_mode.h"
@@ -268,4 +268,4 @@ class ComplexityCalculatorHelper
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
diff --git a/display_list/benchmarking/dl_complexity_metal.h b/display_list/benchmarking/dl_complexity_metal.h
index 90e7b9f69c663..4663b47836cd0 100644
--- a/display_list/benchmarking/dl_complexity_metal.h
+++ b/display_list/benchmarking/dl_complexity_metal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
 
 #include "flutter/display_list/benchmarking/dl_complexity_helper.h"
 
@@ -99,4 +99,4 @@ class DisplayListMetalComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
diff --git a/display_list/dl_attributes.h b/display_list/dl_attributes.h
index 18b06ef3b2dcb..294d8573bdfd3 100644
--- a/display_list/dl_attributes.h
+++ b/display_list/dl_attributes.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
+#define FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
 
 #include <memory>
 
@@ -108,4 +108,4 @@ class DlAttribute {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
diff --git a/display_list/dl_builder.h b/display_list/dl_builder.h
index b6400da3ed70a..69e48cb96d2d6 100644
--- a/display_list/dl_builder.h
+++ b/display_list/dl_builder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
+#define FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/dl_blend_mode.h"
@@ -780,4 +780,4 @@ class DisplayListBuilder final : public virtual DlCanvas,
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
diff --git a/display_list/dl_op_receiver.h b/display_list/dl_op_receiver.h
index 3a13ce6935be6..d15cbba4d8744 100644
--- a/display_list/dl_op_receiver.h
+++ b/display_list/dl_op_receiver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
+#define FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/dl_blend_mode.h"
@@ -269,4 +269,4 @@ class DlOpReceiver {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
diff --git a/display_list/dl_sampling_options.h b/display_list/dl_sampling_options.h
index 4a4e97d502246..3563cf000ae3b 100644
--- a/display_list/dl_sampling_options.h
+++ b/display_list/dl_sampling_options.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
+#define FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
 
 namespace flutter {
 
@@ -23,4 +23,4 @@ enum class DlImageSampling {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
diff --git a/display_list/dl_tile_mode.h b/display_list/dl_tile_mode.h
index c9e137715370a..60132e8b317ae 100644
--- a/display_list/dl_tile_mode.h
+++ b/display_list/dl_tile_mode.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
+#define FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
 
 namespace flutter {
 
@@ -30,4 +30,4 @@ enum class DlTileMode {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
diff --git a/display_list/dl_vertices.h b/display_list/dl_vertices.h
index e89c0d90e2c98..6f7e6443ad6b8 100644
--- a/display_list/dl_vertices.h
+++ b/display_list/dl_vertices.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
+#define FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
 
 #include <memory>
 
@@ -284,4 +284,4 @@ class DlVertices {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
diff --git a/display_list/effects/dl_runtime_effect.h b/display_list/effects/dl_runtime_effect.h
index 2a4cc704f3e20..cfdf172eefec3 100644
--- a/display_list/effects/dl_runtime_effect.h
+++ b/display_list/effects/dl_runtime_effect.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
-#define FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
 
 #include <memory>
 
@@ -82,4 +82,4 @@ class DlRuntimeEffectImpeller final : public DlRuntimeEffect {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
diff --git a/display_list/geometry/dl_region.h b/display_list/geometry/dl_region.h
index dd75b35129042..170a67cbffa92 100644
--- a/display_list/geometry/dl_region.h
+++ b/display_list/geometry/dl_region.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_GEOMETRY_REGION_H_
-#define FLUTTER_DISPLAY_LIST_GEOMETRY_REGION_H_
+#ifndef FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
+#define FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
 
 #include "third_party/skia/include/core/SkRect.h"
 
@@ -170,4 +170,4 @@ class DlRegion {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_GEOMETRY_REGION_H_
+#endif  // FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
diff --git a/display_list/image/dl_image.h b/display_list/image/dl_image.h
index 137fe03ac7acb..aecb58b8f7631 100644
--- a/display_list/image/dl_image.h
+++ b/display_list/image/dl_image.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
+#ifndef FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
+#define FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
 
 #include <memory>
 #include <optional>
@@ -141,4 +141,4 @@ class DlImage : public SkRefCnt {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
+#endif  // FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
diff --git a/display_list/skia/dl_sk_dispatcher.h b/display_list/skia/dl_sk_dispatcher.h
index ee6101291e76a..a9177925aaabd 100644
--- a/display_list/skia/dl_sk_dispatcher.h
+++ b/display_list/skia/dl_sk_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_DISPATCHER_H_
-#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_DISPATCHER_H_
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/dl_op_receiver.h"
@@ -122,4 +122,4 @@ class DlSkCanvasDispatcher : public virtual DlOpReceiver,
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_DISPATCHER_H_
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
diff --git a/display_list/skia/dl_sk_types.h b/display_list/skia/dl_sk_types.h
index 6f66c0629e68a..3348c4ba0aa42 100644
--- a/display_list/skia/dl_sk_types.h
+++ b/display_list/skia/dl_sk_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_TYPES_H_
-#define FLUTTER_DISPLAY_LIST_TYPES_H_
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
 
 #include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -33,4 +33,4 @@
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "third_party/skia/include/effects/SkDiscretePathEffect.h"
 #include "third_party/skia/include/gpu/GrTypes.h"
-#endif  // FLUTTER_DISPLAY_LIST_TYPES_H_
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
diff --git a/display_list/utils/dl_comparable.h b/display_list/utils/dl_comparable.h
index 2e2d7d4f3167e..6273bc703f70f 100644
--- a/display_list/utils/dl_comparable.h
+++ b/display_list/utils/dl_comparable.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
 
 #include <memory>
 
@@ -113,4 +113,4 @@ bool NotEquals(std::shared_ptr<T> a, std::shared_ptr<T> b) {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
diff --git a/display_list/utils/dl_matrix_clip_tracker.h b/display_list/utils/dl_matrix_clip_tracker.h
index 5b4a3fa763cb2..81976a9e858d9 100644
--- a/display_list/utils/dl_matrix_clip_tracker.h
+++ b/display_list/utils/dl_matrix_clip_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
 
 #include <vector>
 
@@ -140,4 +140,4 @@ class DisplayListMatrixClipTracker {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
diff --git a/flow/flow_test_utils.h b/flow/flow_test_utils.h
index a4361813d4ce2..4948f288761ea 100644
--- a/flow/flow_test_utils.h
+++ b/flow/flow_test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_TEST_UTILS_H_
-#define FLUTTER_FLOW_TEST_UTILS_H_
+#ifndef FLUTTER_FLOW_FLOW_TEST_UTILS_H_
+#define FLUTTER_FLOW_FLOW_TEST_UTILS_H_
 
 #include <string>
 
@@ -19,4 +19,4 @@ void SetFontFile(const std::string& dir);
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_TEST_UTILS_H_
+#endif  // FLUTTER_FLOW_FLOW_TEST_UTILS_H_
diff --git a/flow/layers/display_list_raster_cache_item.h b/flow/layers/display_list_raster_cache_item.h
index 5c431e1c54991..e8d8d47c0eb40 100644
--- a/flow/layers/display_list_raster_cache_item.h
+++ b/flow/layers/display_list_raster_cache_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#ifndef FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#define FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
 
 #include <memory>
 #include <optional>
@@ -59,4 +59,4 @@ class DisplayListRasterCacheItem : public RasterCacheItem {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#endif  // FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
diff --git a/flow/layers/layer_raster_cache_item.h b/flow/layers/layer_raster_cache_item.h
index 53e9a65237aef..a99faa7ad4e36 100644
--- a/flow/layers/layer_raster_cache_item.h
+++ b/flow/layers/layer_raster_cache_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
-#define FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
+#ifndef FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
+#define FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
 
 #include <memory>
 #include <optional>
@@ -69,4 +69,4 @@ class LayerRasterCacheItem : public RasterCacheItem {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
+#endif  // FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
diff --git a/flow/stopwatch.h b/flow/stopwatch.h
index 3b64ec5de4fe3..50d731a4e4016 100644
--- a/flow/stopwatch.h
+++ b/flow/stopwatch.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_INSTRUMENTATION_H_
-#define FLUTTER_FLOW_INSTRUMENTATION_H_
+#ifndef FLUTTER_FLOW_STOPWATCH_H_
+#define FLUTTER_FLOW_STOPWATCH_H_
 
 #include <vector>
 
@@ -125,4 +125,4 @@ class StopwatchVisualizer {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_INSTRUMENTATION_H_
+#endif  // FLUTTER_FLOW_STOPWATCH_H_
diff --git a/flow/testing/diff_context_test.h b/flow/testing/diff_context_test.h
index 49ffe039263a0..d626be1523910 100644
--- a/flow/testing/diff_context_test.h
+++ b/flow/testing/diff_context_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_DIFF_CONTEXT_TEST_H_
-#define FLUTTER_SHELL_DIFF_CONTEXT_TEST_H_
+#ifndef FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
+#define FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
 
 #include <utility>
 
@@ -72,4 +72,4 @@ class DiffContextTest : public LayerTest {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_DIFF_CONTEXT_TEST_H_
+#endif  // FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
diff --git a/flow/testing/gl_context_switch_test.h b/flow/testing/gl_context_switch_test.h
index a2d182d86f714..0f933d2bf9f80 100644
--- a/flow/testing/gl_context_switch_test.h
+++ b/flow/testing/gl_context_switch_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
-#define FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
+#ifndef FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
+#define FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "gtest/gtest.h"
@@ -42,4 +42,4 @@ class TestSwitchableGLContext : public SwitchableGLContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
+#endif  // FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
diff --git a/flow/testing/layer_test.h b/flow/testing/layer_test.h
index 9f2cfa04a2d31..00b08fdc56c0a 100644
--- a/flow/testing/layer_test.h
+++ b/flow/testing/layer_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_LAYER_TEST_H_
-#define FLOW_TESTING_LAYER_TEST_H_
+#ifndef FLUTTER_FLOW_TESTING_LAYER_TEST_H_
+#define FLUTTER_FLOW_TESTING_LAYER_TEST_H_
 
 #include "display_list/dl_color.h"
 #include "flutter/flow/layer_snapshot_store.h"
@@ -241,4 +241,4 @@ using LayerTest = LayerTestBase<::testing::Test>;
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_LAYER_TEST_H_
+#endif  // FLUTTER_FLOW_TESTING_LAYER_TEST_H_
diff --git a/flow/testing/mock_embedder.h b/flow/testing/mock_embedder.h
index cd16358234095..b9038d8af6ffa 100644
--- a/flow/testing/mock_embedder.h
+++ b/flow/testing/mock_embedder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_EMBEDDER_H_
-#define FLOW_TESTING_MOCK_EMBEDDER_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
+#define FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
 
 #include "flutter/flow/embedded_views.h"
 
@@ -54,4 +54,4 @@ class MockViewEmbedder : public ExternalViewEmbedder {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_EMBEDDER_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
diff --git a/flow/testing/mock_layer.h b/flow/testing/mock_layer.h
index 54319ab2ff3ea..953a8860bda43 100644
--- a/flow/testing/mock_layer.h
+++ b/flow/testing/mock_layer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_LAYER_H_
-#define FLOW_TESTING_MOCK_LAYER_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
+#define FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
 
 #include <functional>
 #include <memory>
@@ -174,4 +174,4 @@ class MockCacheableLayer : public MockLayer {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_LAYER_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
diff --git a/flow/testing/mock_raster_cache.h b/flow/testing/mock_raster_cache.h
index 908ff2f29789f..749539cd49f7d 100644
--- a/flow/testing/mock_raster_cache.h
+++ b/flow/testing/mock_raster_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_RASTER_CACHE_H_
-#define FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#define FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
 
 #include <vector>
 #include "flutter/flow/layers/layer.h"
@@ -149,4 +149,4 @@ bool RasterCacheItemTryToRasterCache(
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
diff --git a/flow/testing/mock_texture.h b/flow/testing/mock_texture.h
index 70f0991192dec..1c3dd1cdc57fc 100644
--- a/flow/testing/mock_texture.h
+++ b/flow/testing/mock_texture.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_TEXTURE_H_
-#define FLOW_TESTING_MOCK_TEXTURE_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
+#define FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
 
 #include <ostream>
 #include <vector>
@@ -49,4 +49,4 @@ class MockTexture : public Texture {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_TEXTURE_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
diff --git a/flutter_vma/flutter_skia_vma.h b/flutter_vma/flutter_skia_vma.h
index 9faccf030573f..4a9bdaf9c6ed8 100644
--- a/flutter_vma/flutter_skia_vma.h
+++ b/flutter_vma/flutter_skia_vma.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
+#define FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
 
 #include "flutter/flutter_vma/flutter_vma.h"
 
@@ -67,3 +68,5 @@ class FlutterSkiaVulkanMemoryAllocator : public skgpu::VulkanMemoryAllocator {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
diff --git a/flutter_vma/flutter_vma.h b/flutter_vma/flutter_vma.h
index f218c7a876121..75b4e82744b77 100644
--- a/flutter_vma/flutter_vma.h
+++ b/flutter_vma/flutter_vma.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
+#define FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
 
 #include "vk_mem_alloc.h"
+
+#endif  // FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
diff --git a/fml/ascii_trie.h b/fml/ascii_trie.h
index eafbeec8bba91..1c4b52fa54bac 100644
--- a/fml/ascii_trie.h
+++ b/fml/ascii_trie.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_ASCIITRIE_H_
-#define FLUTTER_FML_ASCIITRIE_H_
+#ifndef FLUTTER_FML_ASCII_TRIE_H_
+#define FLUTTER_FML_ASCII_TRIE_H_
 
 #include <memory>
 #include <string>
@@ -37,4 +37,4 @@ class AsciiTrie {
 };
 }  // namespace fml
 
-#endif
+#endif  // FLUTTER_FML_ASCII_TRIE_H_
diff --git a/fml/command_line.h b/fml/command_line.h
index c920da4023b65..67bb7a6129183 100644
--- a/fml/command_line.h
+++ b/fml/command_line.h
@@ -33,8 +33,8 @@
 // mostly explains a.), c. it makes parsing "subcommands", like "my_program
 // --flag_for_my_program subcommand --flag_for_subcommand" saner.
 
-#ifndef LIB_FML_COMMAND_LINE_H_
-#define LIB_FML_COMMAND_LINE_H_
+#ifndef FLUTTER_FML_COMMAND_LINE_H_
+#define FLUTTER_FML_COMMAND_LINE_H_
 
 #include <cstddef>
 #include <initializer_list>
@@ -263,4 +263,4 @@ std::vector<std::string> CommandLineToArgv(const CommandLine& command_line);
 
 }  // namespace fml
 
-#endif  // LIB_FML_COMMAND_LINE_H_
+#endif  // FLUTTER_FML_COMMAND_LINE_H_
diff --git a/fml/cpu_affinity.h b/fml/cpu_affinity.h
index 31b58940a61a1..b4c54c7bbf187 100644
--- a/fml/cpu_affinity.h
+++ b/fml/cpu_affinity.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FML_CPU_AFFINITY_H_
+#define FLUTTER_FML_CPU_AFFINITY_H_
 
 #include <optional>
 #include <string>
@@ -84,3 +85,5 @@ class CPUSpeedTracker {
 std::optional<int64_t> ReadIntFromFile(const std::string& path);
 
 }  // namespace fml
+
+#endif  // FLUTTER_FML_CPU_AFFINITY_H_
diff --git a/fml/memory/task_runner_checker.h b/fml/memory/task_runner_checker.h
index 42dbd60cf411d..67e09b5e1c597 100644
--- a/fml/memory/task_runner_checker.h
+++ b/fml/memory/task_runner_checker.h
@@ -38,4 +38,4 @@ class TaskRunnerChecker final {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_MEMORY_THREAD_CHECKER_H_
+#endif  // FLUTTER_FML_MEMORY_TASK_RUNNER_CHECKER_H_
diff --git a/fml/platform/android/cpu_affinity.h b/fml/platform/android/cpu_affinity.h
index 4ce1e7964aef9..3b7c41dcfb107 100644
--- a/fml/platform/android/cpu_affinity.h
+++ b/fml/platform/android/cpu_affinity.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
+#define FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
 
 #include "flutter/fml/cpu_affinity.h"
 
@@ -15,3 +16,5 @@ std::optional<size_t> AndroidEfficiencyCoreCount();
 bool AndroidRequestAffinity(CpuAffinity affinity);
 
 }  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
diff --git a/fml/platform/darwin/scoped_nsautorelease_pool.h b/fml/platform/darwin/scoped_nsautorelease_pool.h
index 50ad5621d1e2e..8ea4ed7f6213f 100644
--- a/fml/platform/darwin/scoped_nsautorelease_pool.h
+++ b/fml/platform/darwin/scoped_nsautorelease_pool.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASEPOOL_H_
-#define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASEPOOL_H_
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
 
 #include "flutter/fml/macros.h"
 
@@ -23,4 +23,4 @@ class ScopedNSAutoreleasePool {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASEPOOL_H_
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/fml/platform/darwin/string_range_sanitization.h b/fml/platform/darwin/string_range_sanitization.h
index 95c28b76b6380..1290fdd73c0ae 100644
--- a/fml/platform/darwin/string_range_sanitization.h
+++ b/fml/platform/darwin/string_range_sanitization.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
-#define FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
 
 #include <Foundation/Foundation.h>
 
@@ -26,4 +26,4 @@ NSRange RangeForCharactersInRange(NSString* text, NSRange range);
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
diff --git a/fml/platform/fuchsia/task_observers.h b/fml/platform/fuchsia/task_observers.h
index de3c2e47317fe..21596ad299fce 100644
--- a/fml/platform/fuchsia/task_observers.h
+++ b/fml/platform/fuchsia/task_observers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#ifndef FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#define FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
 
 #include <lib/fit/function.h>
 
@@ -37,4 +37,4 @@ void CurrentMessageLoopRemoveAfterTaskObserver(intptr_t key);
 
 }  // namespace fml
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#endif  // FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
diff --git a/fml/platform/linux/timerfd.h b/fml/platform/linux/timerfd.h
index 7ec58ae9df16a..ed035a527aa18 100644
--- a/fml/platform/linux/timerfd.h
+++ b/fml/platform/linux/timerfd.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
-#define FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
+#ifndef FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
+#define FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
 
 #include "flutter/fml/time/time_point.h"
 
@@ -53,4 +53,4 @@ bool TimerDrain(int fd);
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
+#endif  // FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
diff --git a/fml/platform/posix/shared_mutex_posix.h b/fml/platform/posix/shared_mutex_posix.h
index ff1a298f1a09d..6694a33598d8e 100644
--- a/fml/platform/posix/shared_mutex_posix.h
+++ b/fml/platform/posix/shared_mutex_posix.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
-#define FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
+#ifndef FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
+#define FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
 
 #include <shared_mutex>
 
@@ -27,4 +27,4 @@ class SharedMutexPosix : public SharedMutex {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
+#endif  // FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
diff --git a/fml/platform/win/message_loop_win.h b/fml/platform/win/message_loop_win.h
index 233a90a4526b1..2210bb1d85a73 100644
--- a/fml/platform/win/message_loop_win.h
+++ b/fml/platform/win/message_loop_win.h
@@ -44,4 +44,4 @@ class MessageLoopWin : public MessageLoopImpl {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_PLATFORM_GENERIC_MESSAGE_LOOP_GENERIC_H_
+#endif  // FLUTTER_FML_PLATFORM_WIN_MESSAGE_LOOP_WIN_H_
diff --git a/fml/raster_thread_merger.h b/fml/raster_thread_merger.h
index 2fd0bc22e3ab5..56d60407f24db 100644
--- a/fml/raster_thread_merger.h
+++ b/fml/raster_thread_merger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
-#define FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
+#ifndef FLUTTER_FML_RASTER_THREAD_MERGER_H_
+#define FLUTTER_FML_RASTER_THREAD_MERGER_H_
 
 #include <condition_variable>
 #include <mutex>
@@ -143,4 +143,4 @@ class RasterThreadMerger
 
 }  // namespace fml
 
-#endif  // FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
+#endif  // FLUTTER_FML_RASTER_THREAD_MERGER_H_
diff --git a/fml/status.h b/fml/status.h
index 8eed10823f144..c47352826185e 100644
--- a/fml/status.h
+++ b/fml/status.h
@@ -78,4 +78,4 @@ inline std::string_view Status::message() const {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_SIZE_H_
+#endif  // FLUTTER_FML_STATUS_H_
diff --git a/fml/status_or.h b/fml/status_or.h
index 336d1e0f3664b..8c911f93bffe9 100644
--- a/fml/status_or.h
+++ b/fml/status_or.h
@@ -95,4 +95,4 @@ class StatusOr {
 
 }  // namespace fml
 
-#endif
+#endif  // FLUTTER_FML_STATUS_OR_H_
diff --git a/lib/gpu/command_buffer.h b/lib/gpu/command_buffer.h
index 505471045bdf0..2125d75cc1c47 100644
--- a/lib/gpu/command_buffer.h
+++ b/lib/gpu/command_buffer.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
+#define FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
 
 #include "flutter/lib/gpu/context.h"
 #include "flutter/lib/gpu/export.h"
@@ -57,3 +58,5 @@ extern Dart_Handle InternalFlutterGpu_CommandBuffer_Submit(
     Dart_Handle completion_callback);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
diff --git a/lib/gpu/context.h b/lib/gpu/context.h
index 13ec0946bb75a..943686edf12a9 100644
--- a/lib/gpu/context.h
+++ b/lib/gpu/context.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_CONTEXT_H_
+#define FLUTTER_LIB_GPU_CONTEXT_H_
 
 #include "dart_api.h"
 #include "flutter/lib/gpu/export.h"
@@ -67,3 +68,5 @@ extern int InternalFlutterGpu_Context_GetDefaultDepthStencilFormat(
     flutter::gpu::Context* wrapper);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_CONTEXT_H_
diff --git a/lib/gpu/device_buffer.h b/lib/gpu/device_buffer.h
index 44f7ac0c11bef..707d01f150ba4 100644
--- a/lib/gpu/device_buffer.h
+++ b/lib/gpu/device_buffer.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
+#define FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
 
 #include "flutter/lib/gpu/context.h"
 #include "flutter/lib/gpu/export.h"
@@ -62,3 +63,5 @@ extern bool InternalFlutterGpu_DeviceBuffer_Overwrite(
     int destination_offset_in_bytes);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
diff --git a/lib/gpu/export.h b/lib/gpu/export.h
index 488b61c59e41c..fec32a0790db9 100644
--- a/lib/gpu/export.h
+++ b/lib/gpu/export.h
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_EXPORT_H_
+#define FLUTTER_LIB_GPU_EXPORT_H_
 
 #if FML_OS_WIN
 #define FLUTTER_GPU_EXPORT __declspec(dllexport)
 #else  // FML_OS_WIN
 #define FLUTTER_GPU_EXPORT __attribute__((visibility("default")))
 #endif  // FML_OS_WIN
+
+#endif  // FLUTTER_LIB_GPU_EXPORT_H_
diff --git a/lib/gpu/host_buffer.h b/lib/gpu/host_buffer.h
index b386bc962c23b..6066166c922c6 100644
--- a/lib/gpu/host_buffer.h
+++ b/lib/gpu/host_buffer.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_HOST_BUFFER_H_
+#define FLUTTER_LIB_GPU_HOST_BUFFER_H_
 
 #include "flutter/lib/gpu/export.h"
 #include "flutter/lib/ui/dart_wrapper.h"
@@ -49,3 +50,5 @@ extern size_t InternalFlutterGpu_HostBuffer_EmplaceBytes(
     Dart_Handle byte_data);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_HOST_BUFFER_H_
diff --git a/lib/gpu/render_pass.h b/lib/gpu/render_pass.h
index 68b4dc1279808..921480f20d541 100644
--- a/lib/gpu/render_pass.h
+++ b/lib/gpu/render_pass.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_RENDER_PASS_H_
+#define FLUTTER_LIB_GPU_RENDER_PASS_H_
 
 #include <map>
 #include <memory>
@@ -225,3 +226,5 @@ extern bool InternalFlutterGpu_RenderPass_Draw(
     flutter::gpu::RenderPass* wrapper);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_RENDER_PASS_H_
diff --git a/lib/gpu/render_pipeline.h b/lib/gpu/render_pipeline.h
index 2980d16d22243..8d52e70ee601a 100644
--- a/lib/gpu/render_pipeline.h
+++ b/lib/gpu/render_pipeline.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
+#define FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
 
 #include "flutter/lib/gpu/context.h"
 #include "flutter/lib/gpu/export.h"
@@ -50,3 +51,5 @@ extern Dart_Handle InternalFlutterGpu_RenderPipeline_Initialize(
     flutter::gpu::Shader* fragment_shader);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
diff --git a/lib/gpu/shader.h b/lib/gpu/shader.h
index ba453794408be..f4d3ff8748c2f 100644
--- a/lib/gpu/shader.h
+++ b/lib/gpu/shader.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_SHADER_H_
+#define FLUTTER_LIB_GPU_SHADER_H_
 
 #include <memory>
 #include <string>
@@ -77,3 +78,5 @@ extern int InternalFlutterGpu_Shader_GetUniformSlot(
     Dart_Handle name_handle);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SHADER_H_
diff --git a/lib/gpu/shader_library.h b/lib/gpu/shader_library.h
index 92d847b559a8a..7285ae35284f3 100644
--- a/lib/gpu/shader_library.h
+++ b/lib/gpu/shader_library.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
+#define FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
 
 #include <memory>
 #include <string>
@@ -77,3 +78,5 @@ extern Dart_Handle InternalFlutterGpu_ShaderLibrary_GetShader(
     Dart_Handle shader_wrapper);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
diff --git a/lib/gpu/smoketest.h b/lib/gpu/smoketest.h
index d957b9daacf54..895b3dd16a957 100644
--- a/lib/gpu/smoketest.h
+++ b/lib/gpu/smoketest.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_SMOKETEST_H_
+#define FLUTTER_LIB_GPU_SMOKETEST_H_
 
 #include <cstdint>
 
@@ -51,3 +52,5 @@ extern void InternalFlutterGpuTestClass_Method(
     int something);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SMOKETEST_H_
diff --git a/lib/gpu/texture.h b/lib/gpu/texture.h
index b6105fae81b04..a08619b0b6834 100644
--- a/lib/gpu/texture.h
+++ b/lib/gpu/texture.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_GPU_TEXTURE_H_
+#define FLUTTER_LIB_GPU_TEXTURE_H_
 
 #include "flutter/lib/gpu/context.h"
 #include "flutter/lib/gpu/export.h"
@@ -79,3 +80,5 @@ extern Dart_Handle InternalFlutterGpu_Texture_AsImage(
     flutter::gpu::Texture* wrapper);
 
 }  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_TEXTURE_H_
diff --git a/lib/ui/isolate_name_server/isolate_name_server.h b/lib/ui/isolate_name_server/isolate_name_server.h
index 22594cfb6166e..4d0b98a526aae 100644
--- a/lib/ui/isolate_name_server/isolate_name_server.h
+++ b/lib/ui/isolate_name_server/isolate_name_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
-#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
+#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
+#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
 
 #include <map>
 #include <mutex>
@@ -43,4 +43,4 @@ class IsolateNameServer {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
+#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
diff --git a/lib/ui/isolate_name_server/isolate_name_server_natives.h b/lib/ui/isolate_name_server/isolate_name_server_natives.h
index cd7c0a77e4744..65f9aef43e806 100644
--- a/lib/ui/isolate_name_server/isolate_name_server_natives.h
+++ b/lib/ui/isolate_name_server/isolate_name_server_natives.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
-#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
+#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
+#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
 
 #include <string>
 
@@ -21,4 +21,4 @@ class IsolateNameServerNatives {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
+#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
diff --git a/lib/ui/painting/color_filter.h b/lib/ui/painting/color_filter.h
index 3427d3d71e84f..2d43c68995ed7 100644
--- a/lib/ui/painting/color_filter.h
+++ b/lib/ui/painting/color_filter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_COLOR_FILTER_H_
-#define FLUTTER_LIB_UI_COLOR_FILTER_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
+#define FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
 
 #include "flutter/display_list/effects/dl_color_filter.h"
 #include "flutter/lib/ui/dart_wrapper.h"
@@ -36,4 +36,4 @@ class ColorFilter : public RefCountedDartWrappable<ColorFilter> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_COLOR_FILTER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
diff --git a/lib/ui/painting/display_list_deferred_image_gpu_impeller.h b/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
index caed73a7c86f8..e0b79bec8df93 100644
--- a/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
+++ b/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
+#define FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
 
 #include "flutter/common/graphics/texture.h"
 #include "flutter/display_list/image/dl_image.h"
@@ -124,3 +125,5 @@ class DlDeferredImageGPUImpeller final : public DlImage {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
diff --git a/lib/ui/painting/image_generator_registry.h b/lib/ui/painting/image_generator_registry.h
index 96f8dc86a6fc1..09227d7c92592 100644
--- a/lib/ui/painting/image_generator_registry.h
+++ b/lib/ui/painting/image_generator_registry.h
@@ -90,4 +90,4 @@ class ImageGeneratorRegistry {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_GENERATOR_REGISTRY_H_
diff --git a/lib/ui/painting/immutable_buffer.h b/lib/ui/painting/immutable_buffer.h
index daf1d6ca6d2f8..42f825f03edce 100644
--- a/lib/ui/painting/immutable_buffer.h
+++ b/lib/ui/painting/immutable_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
-#define FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
+#define FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
 
 #include <cstdint>
 
@@ -103,4 +103,4 @@ class ImmutableBuffer : public RefCountedDartWrappable<ImmutableBuffer> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
diff --git a/lib/ui/painting/multi_frame_codec.h b/lib/ui/painting/multi_frame_codec.h
index b0fd35c15d66a..4a49b84570b26 100644
--- a/lib/ui/painting/multi_frame_codec.h
+++ b/lib/ui/painting/multi_frame_codec.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
-#define FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
+#define FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/lib/ui/painting/codec.h"
@@ -84,4 +84,4 @@ class MultiFrameCodec : public Codec {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
diff --git a/lib/ui/painting/scene/scene_node.h b/lib/ui/painting/scene/scene_node.h
index ee44e801f7de6..2a44f93459776 100644
--- a/lib/ui/painting/scene/scene_node.h
+++ b/lib/ui/painting/scene/scene_node.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_NODE_H_
-#define FLUTTER_LIB_UI_PAINTING_SCENE_NODE_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
+#define FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
 
 #include <memory>
 #include <string>
@@ -65,4 +65,4 @@ class SceneNode : public RefCountedDartWrappable<SceneNode> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_NODE_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
diff --git a/lib/ui/painting/scene/scene_shader.h b/lib/ui/painting/scene/scene_shader.h
index c3d4be37447d1..0dbb73d8f7233 100644
--- a/lib/ui/painting/scene/scene_shader.h
+++ b/lib/ui/painting/scene/scene_shader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_SHADER_H_
-#define FLUTTER_LIB_UI_PAINTING_SCENE_SHADER_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
+#define FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ class SceneShader : public Shader {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_SHADER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
diff --git a/lib/ui/plugins/callback_cache.h b/lib/ui/plugins/callback_cache.h
index 84a2606c37f61..e9c47fddbd466 100644
--- a/lib/ui/plugins/callback_cache.h
+++ b/lib/ui/plugins/callback_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_CALLBACK_CACHE_H_
-#define FLUTTER_LIB_UI_CALLBACK_CACHE_H_
+#ifndef FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
+#define FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
 
 #include <map>
 #include <memory>
@@ -54,4 +54,4 @@ class DartCallbackCache {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_CALLBACK_CACHE_H_
+#endif  // FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
diff --git a/lib/ui/semantics/custom_accessibility_action.h b/lib/ui/semantics/custom_accessibility_action.h
index 732b30d726b1f..e093c6bae0b90 100644
--- a/lib/ui/semantics/custom_accessibility_action.h
+++ b/lib/ui/semantics/custom_accessibility_action.h
@@ -33,4 +33,4 @@ using CustomAccessibilityActionUpdates =
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_SEMANTICS_LOCAL_CONTEXT_ACTION_H_
+#endif  // FLUTTER_LIB_UI_SEMANTICS_CUSTOM_ACCESSIBILITY_ACTION_H_
diff --git a/lib/ui/volatile_path_tracker.h b/lib/ui/volatile_path_tracker.h
index 1506239c31ac0..aadad44057758 100644
--- a/lib/ui/volatile_path_tracker.h
+++ b/lib/ui/volatile_path_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
-#define FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
+#ifndef FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
+#define FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
 
 #include <deque>
 #include <memory>
@@ -76,4 +76,4 @@ class VolatilePathTracker {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
+#endif  // FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
diff --git a/lib/ui/window/key_data.h b/lib/ui/window/key_data.h
index 6ce44667743b9..0238e63cf8d59 100644
--- a/lib/ui/window/key_data.h
+++ b/lib/ui/window/key_data.h
@@ -76,4 +76,4 @@ struct alignas(8) KeyData {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_WINDOW_POINTER_DATA_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_KEY_DATA_H_
diff --git a/lib/ui/window/key_data_packet.h b/lib/ui/window/key_data_packet.h
index c6d31707d6f5a..9db3ea335bc2c 100644
--- a/lib/ui/window/key_data_packet.h
+++ b/lib/ui/window/key_data_packet.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_WINDOW_KEY_DATA_MESSAGE_H_
-#define FLUTTER_LIB_UI_WINDOW_KEY_DATA_MESSAGE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
+#define FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
 
 #include <functional>
 #include <vector>
@@ -46,4 +46,4 @@ class KeyDataPacket {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_WINDOW_POINTER_DATA_MESSAGE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
diff --git a/lib/ui/window/platform_message.h b/lib/ui/window/platform_message.h
index a732f28764dd8..1e79f037413fe 100644
--- a/lib/ui/window/platform_message.h
+++ b/lib/ui/window/platform_message.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ class PlatformMessage {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
diff --git a/lib/ui/window/platform_message_response.h b/lib/ui/window/platform_message_response.h
index e0404c5adc749..8d5dff9f0fcb9 100644
--- a/lib/ui/window/platform_message_response.h
+++ b/lib/ui/window/platform_message_response.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
 
 #include <vector>
 
@@ -33,4 +33,4 @@ class PlatformMessageResponse
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
diff --git a/lib/ui/window/platform_message_response_dart.h b/lib/ui/window/platform_message_response_dart.h
index f290faf649454..b716f5fc1f806 100644
--- a/lib/ui/window/platform_message_response_dart.h
+++ b/lib/ui/window/platform_message_response_dart.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
@@ -33,4 +33,4 @@ class PlatformMessageResponseDart : public PlatformMessageResponse {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
diff --git a/lib/ui/window/platform_message_response_dart_port.h b/lib/ui/window/platform_message_response_dart_port.h
index f32806980ee48..3652813858252 100644
--- a/lib/ui/window/platform_message_response_dart_port.h
+++ b/lib/ui/window/platform_message_response_dart_port.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
@@ -32,4 +32,4 @@ class PlatformMessageResponseDartPort : public PlatformMessageResponse {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
diff --git a/lib/web_ui/skwasm/export.h b/lib/web_ui/skwasm/export.h
index fe4711aac20f6..fff508157d82e 100644
--- a/lib/web_ui/skwasm/export.h
+++ b/lib/web_ui/skwasm/export.h
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
 
 #include <emscripten.h>
 
 #define SKWASM_EXPORT extern "C" EMSCRIPTEN_KEEPALIVE
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
diff --git a/lib/web_ui/skwasm/helpers.h b/lib/web_ui/skwasm/helpers.h
index c30122f6b3ab4..fbe186a0c8c4c 100644
--- a/lib/web_ui/skwasm/helpers.h
+++ b/lib/web_ui/skwasm/helpers.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
 
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRRect.h"
@@ -58,3 +59,5 @@ inline SkSamplingOptions samplingOptionsForQuality(FilterQuality quality) {
   }
 }
 }  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
diff --git a/lib/web_ui/skwasm/surface.h b/lib/web_ui/skwasm/surface.h
index d99164831e523..3577a947c782a 100644
--- a/lib/web_ui/skwasm/surface.h
+++ b/lib/web_ui/skwasm/surface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ -113,3 +114,5 @@ class Surface {
                                    uint32_t callbackId);
 };
 }  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
diff --git a/lib/web_ui/skwasm/wrappers.h b/lib/web_ui/skwasm/wrappers.h
index db4b31cf86301..8fdee6584ea62 100644
--- a/lib/web_ui/skwasm/wrappers.h
+++ b/lib/web_ui/skwasm/wrappers.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
 
 #include <emscripten/html5_webgl.h>
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -34,3 +35,5 @@ struct FlutterFontCollection {
 };
 
 }  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
diff --git a/runtime/dart_plugin_registrant.h b/runtime/dart_plugin_registrant.h
index f78dfccca8c79..46706a5cf1a34 100644
--- a/runtime/dart_plugin_registrant.h
+++ b/runtime/dart_plugin_registrant.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DART_PLUGIN_REGISTRANT_H_
-#define FLUTTER_DART_PLUGIN_REGISTRANT_H_
+#ifndef FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
+#define FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
 
 #include "third_party/dart/runtime/include/dart_api.h"
 
@@ -23,4 +23,4 @@ bool FindAndInvokeDartPluginRegistrant();
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DART_PLUGIN_REGISTRANT_H_
+#endif  // FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
diff --git a/runtime/isolate_configuration.h b/runtime/isolate_configuration.h
index a4c809ee9fbea..05e2270b266d7 100644
--- a/runtime/isolate_configuration.h
+++ b/runtime/isolate_configuration.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
-#define FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
+#ifndef FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
+#define FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
 
 #include <future>
 #include <memory>
@@ -184,4 +184,4 @@ class IsolateConfiguration {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
+#endif  // FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
diff --git a/testing/canvas_test.h b/testing/canvas_test.h
index c62e7e4310c15..3219dfeba1596 100644
--- a/testing/canvas_test.h
+++ b/testing/canvas_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_CANVAS_TEST_H_
-#define TESTING_CANVAS_TEST_H_
+#ifndef FLUTTER_TESTING_CANVAS_TEST_H_
+#define FLUTTER_TESTING_CANVAS_TEST_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/testing/mock_canvas.h"
@@ -33,4 +33,4 @@ using CanvasTest = CanvasTestBase<::testing::Test>;
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_CANVAS_TEST_H_
+#endif  // FLUTTER_TESTING_CANVAS_TEST_H_
diff --git a/testing/display_list_testing.h b/testing/display_list_testing.h
index 7a7eac9c493d8..0657a5a63d6f4 100644
--- a/testing/display_list_testing.h
+++ b/testing/display_list_testing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_DISPLAY_LIST_TESTING_H_
-#define TESTING_DISPLAY_LIST_TESTING_H_
+#ifndef FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
+#define FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
 
 #include <ostream>
 
@@ -176,4 +176,4 @@ class DisplayListStreamDispatcher final : public DlOpReceiver {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_DISPLAY_LIST_TESTING_H_
+#endif  // FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
diff --git a/testing/mock_canvas.h b/testing/mock_canvas.h
index 4e04240a438ef..9ef5d8c4b14c1 100644
--- a/testing/mock_canvas.h
+++ b/testing/mock_canvas.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_MOCK_CANVAS_H_
-#define TESTING_MOCK_CANVAS_H_
+#ifndef FLUTTER_TESTING_MOCK_CANVAS_H_
+#define FLUTTER_TESTING_MOCK_CANVAS_H_
 
 #include <ostream>
 #include <variant>
@@ -364,4 +364,4 @@ extern std::ostream& operator<<(std::ostream& os,
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_MOCK_CANVAS_H_
+#endif  // FLUTTER_TESTING_MOCK_CANVAS_H_
diff --git a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
index 7a890927193a6..8db549ca77deb 100644
--- a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
+++ b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
@@ -4,8 +4,8 @@
 
 // clang-format off
 
-#ifndef GeneratedPluginRegistrant_h
-#define GeneratedPluginRegistrant_h
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
 
 #import <Flutter/Flutter.h>
 
@@ -16,4 +16,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-#endif /* GeneratedPluginRegistrant_h */
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
diff --git a/testing/test_args.h b/testing/test_args.h
index 0ee5d2a79837a..494359b060ada 100644
--- a/testing/test_args.h
+++ b/testing/test_args.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_TESTING_TEST_ARGS_H_
+#define FLUTTER_TESTING_TEST_ARGS_H_
 
 #include "flutter/fml/command_line.h"
 
@@ -15,3 +16,5 @@ void SetArgsForProcess(int argc, char** argv);
 
 }  // namespace testing
 }  // namespace flutter
+
+#endif  // FLUTTER_TESTING_TEST_ARGS_H_
diff --git a/testing/test_vulkan_surface.h b/testing/test_vulkan_surface.h
index e9c7ed8d27d07..b5c93e9f13f63 100644
--- a/testing/test_vulkan_surface.h
+++ b/testing/test_vulkan_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
-#define FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
+#ifndef FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
+#define FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
 
 #include <memory>
 #include "flutter/testing/test_vulkan_context.h"
@@ -39,4 +39,4 @@ class TestVulkanSurface {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
+#endif  // FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
diff --git a/testing/testing.h b/testing/testing.h
index f3cc80c8e9931..369f66fbe5214 100644
--- a/testing/testing.h
+++ b/testing/testing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_TESTING_H_
-#define TESTING_TESTING_H_
+#ifndef FLUTTER_TESTING_TESTING_H_
+#define FLUTTER_TESTING_TESTING_H_
 
 #include <string>
 #include <vector>
@@ -118,4 +118,4 @@ bool MemsetPatternSetOrCheck(std::vector<uint8_t>& buffer, MemsetPatternOp op);
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_TESTING_H_
+#endif  // FLUTTER_TESTING_TESTING_H_
diff --git a/tools/font_subset/hb_wrappers.h b/tools/font_subset/hb_wrappers.h
index ee27d74b243e5..c393b115fbbe7 100644
--- a/tools/font_subset/hb_wrappers.h
+++ b/tools/font_subset/hb_wrappers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef HB_WRAPPERS_H_
-#define HB_WRAPPERS_H_
+#ifndef FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
+#define FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
 
 #include <hb-subset.h>
 
@@ -34,4 +34,4 @@ using HbSetPtr = std::unique_ptr<hb_set_t, hb_set_deleter>;
 
 };  // namespace HarfbuzzWrappers
 
-#endif  // HB_WRAPPERS_H_s
+#endif  // FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
diff --git a/tools/path_ops/path_ops.h b/tools/path_ops/path_ops.h
index 2565055a36248..5384305b1fe7e 100644
--- a/tools/path_ops/path_ops.h
+++ b/tools/path_ops/path_ops.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
+#define FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPathBuilder.h"
@@ -58,3 +59,5 @@ API void DestroyData(PathData* data);
 
 }  // namespace flutter
 }
+
+#endif  // FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
diff --git a/vulkan/procs/vulkan_handle.h b/vulkan/procs/vulkan_handle.h
index 15b2455887169..df7f064fcbe0a 100644
--- a/vulkan/procs/vulkan_handle.h
+++ b/vulkan/procs/vulkan_handle.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
 
 #include <functional>
 
@@ -76,3 +77,5 @@ class VulkanHandle {
 };
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
diff --git a/vulkan/procs/vulkan_interface.h b/vulkan/procs/vulkan_interface.h
index c0518bc256920..6343af80885b6 100644
--- a/vulkan/procs/vulkan_interface.h
+++ b/vulkan/procs/vulkan_interface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
 
 #include <string>
 
@@ -46,3 +47,5 @@ namespace vulkan {
 std::string VulkanResultToString(VkResult result);
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
diff --git a/vulkan/procs/vulkan_proc_table.h b/vulkan/procs/vulkan_proc_table.h
index 3092bed159a5d..9e3d3a0ed2f67 100644
--- a/vulkan/procs/vulkan_proc_table.h
+++ b/vulkan/procs/vulkan_proc_table.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -178,3 +179,5 @@ class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
 };
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
diff --git a/vulkan/vulkan_skia_proc_table.h b/vulkan/vulkan_skia_proc_table.h
index 9ed988ea51598..ca7a8e3314240 100644
--- a/vulkan/vulkan_skia_proc_table.h
+++ b/vulkan/vulkan_skia_proc_table.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_
+#define FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_
 
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
 
@@ -13,3 +14,5 @@ namespace vulkan {
 GrVkGetProc CreateSkiaGetProc(const fml::RefPtr<vulkan::VulkanProcTable>& vk);
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_