diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index aba18f16964f1..2a987bd3c7ba6 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -74,7 +74,6 @@
 ../../../flutter/flow/layers/transform_layer_unittests.cc
 ../../../flutter/flow/mutators_stack_unittests.cc
 ../../../flutter/flow/raster_cache_unittests.cc
-../../../flutter/flow/rtree_unittests.cc
 ../../../flutter/flow/skia_gpu_object_unittests.cc
 ../../../flutter/flow/surface_frame_unittests.cc
 ../../../flutter/flow/testing
@@ -212,7 +211,6 @@
 ../../../flutter/runtime/no_dart_plugin_registrant_unittests.cc
 ../../../flutter/runtime/type_conversions_unittests.cc
 ../../../flutter/shell/common/animator_unittests.cc
-../../../flutter/shell/common/canvas_spy_unittests.cc
 ../../../flutter/shell/common/context_options_unittests.cc
 ../../../flutter/shell/common/dl_op_spy_unittests.cc
 ../../../flutter/shell/common/engine_unittests.cc
@@ -292,6 +290,7 @@
 ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/build/asset_package.py
 ../../../flutter/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
+../../../flutter/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/component_v2_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc
@@ -303,6 +302,7 @@
 ../../../flutter/shell/platform/fuchsia/flutter/platform_view_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/rtree_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_missing_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/tests
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 49f5af8529f2a..c612f38ea0eed 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -841,8 +841,6 @@ ORIGIN: ../../../flutter/flow/raster_cache_key.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/raster_cache_key.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/raster_cache_util.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/raster_cache_util.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/rtree.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/rtree.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/skia_gpu_object.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.h + ../../../flutter/LICENSE
@@ -2188,8 +2186,6 @@ ORIGIN: ../../../flutter/runtime/test_font_data.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/runtime/test_font_data.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/animator.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/animator.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/common/canvas_spy.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/common/canvas_spy.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/context_options.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/context_options.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/dart_native_benchmarks.cc + ../../../flutter/LICENSE
@@ -2903,6 +2899,8 @@ ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h +
 ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc + ../../../flutter/LICENSE
@@ -2947,6 +2945,8 @@ ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.h + ../
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/program_metadata.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/rtree.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/rtree.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/runner.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc + ../../../flutter/LICENSE
@@ -3528,8 +3528,6 @@ FILE: ../../../flutter/flow/raster_cache_key.cc
 FILE: ../../../flutter/flow/raster_cache_key.h
 FILE: ../../../flutter/flow/raster_cache_util.cc
 FILE: ../../../flutter/flow/raster_cache_util.h
-FILE: ../../../flutter/flow/rtree.cc
-FILE: ../../../flutter/flow/rtree.h
 FILE: ../../../flutter/flow/skia_gpu_object.h
 FILE: ../../../flutter/flow/surface.cc
 FILE: ../../../flutter/flow/surface.h
@@ -4878,8 +4876,6 @@ FILE: ../../../flutter/runtime/test_font_data.cc
 FILE: ../../../flutter/runtime/test_font_data.h
 FILE: ../../../flutter/shell/common/animator.cc
 FILE: ../../../flutter/shell/common/animator.h
-FILE: ../../../flutter/shell/common/canvas_spy.cc
-FILE: ../../../flutter/shell/common/canvas_spy.h
 FILE: ../../../flutter/shell/common/context_options.cc
 FILE: ../../../flutter/shell/common/context_options.h
 FILE: ../../../flutter/shell/common/dart_native_benchmarks.cc
@@ -5610,6 +5606,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc
@@ -5654,6 +5652,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/program_metadata.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/rtree.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/rtree.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index 560b067e7e22b..0c3e8a3466a12 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -76,8 +76,6 @@ source_set("flow") {
     "raster_cache_key.h",
     "raster_cache_util.cc",
     "raster_cache_util.h",
-    "rtree.cc",
-    "rtree.h",
     "skia_gpu_object.h",
     "surface.cc",
     "surface.h",
@@ -171,7 +169,6 @@ if (enable_unittests) {
       "layers/transform_layer_unittests.cc",
       "mutators_stack_unittests.cc",
       "raster_cache_unittests.cc",
-      "rtree_unittests.cc",
       "skia_gpu_object_unittests.cc",
       "surface_frame_unittests.cc",
       "testing/mock_layer_unittests.cc",
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
index 99e33b1d6808e..6985c37e5b8c0 100644
--- a/flow/embedded_views.h
+++ b/flow/embedded_views.h
@@ -10,7 +10,6 @@
 
 #include "flutter/display_list/dl_builder.h"
 #include "flutter/display_list/skia/dl_sk_canvas.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/raster_thread_merger.h"
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
index 19009938162fc..c5a4db91e4333 100644
--- a/shell/common/BUILD.gn
+++ b/shell/common/BUILD.gn
@@ -81,8 +81,6 @@ source_set("common") {
   sources = [
     "animator.cc",
     "animator.h",
-    "canvas_spy.cc",
-    "canvas_spy.h",
     "context_options.cc",
     "context_options.h",
     "display_manager.cc",
@@ -295,7 +293,6 @@ if (enable_unittests) {
 
     sources = [
       "animator_unittests.cc",
-      "canvas_spy_unittests.cc",
       "context_options_unittests.cc",
       "dl_op_spy_unittests.cc",
       "engine_unittests.cc",
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h
index db2c77e4b3922..400b43fb91a89 100644
--- a/shell/platform/android/external_view_embedder/external_view_embedder.h
+++ b/shell/platform/android/external_view_embedder/external_view_embedder.h
@@ -9,7 +9,6 @@
 
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/shell/platform/android/context/android_context.h"
 #include "flutter/shell/platform/android/external_view_embedder/surface_pool.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
index 15aaeea0deff0..bf7e607878d1b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "flutter/common/graphics/persistent_cache.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
index 8a4fe6d5340bd..43cb43cf4e33b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWS_INTERNAL_H_
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/shell.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn
index b9b4202306471..2b529a85e49f9 100644
--- a/shell/platform/fuchsia/flutter/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/BUILD.gn
@@ -58,6 +58,8 @@ template("runner_sources") {
     sources = [
       "accessibility_bridge.cc",
       "accessibility_bridge.h",
+      "canvas_spy.cc",
+      "canvas_spy.h",
       "component_v2.cc",
       "component_v2.h",
       "engine.cc",
@@ -94,6 +96,8 @@ template("runner_sources") {
       "pointer_injector_delegate.cc",
       "pointer_injector_delegate.h",
       "program_metadata.h",
+      "rtree.cc",
+      "rtree.h",
       "runner.cc",
       "runner.h",
       "software_surface.cc",
@@ -499,6 +503,7 @@ if (enable_unittests) {
 
     sources = [
       "accessibility_bridge_unittest.cc",
+      "canvas_spy_unittests.cc",
       "component_v2_unittest.cc",
       "flutter_runner_fakes.h",
       "focus_delegate_unittests.cc",
@@ -507,6 +512,7 @@ if (enable_unittests) {
       "platform_view_unittest.cc",
       "pointer_delegate_unittests.cc",
       "pointer_injector_delegate_unittest.cc",
+      "rtree_unittests.cc",
       "tests/engine_unittests.cc",
       "tests/fake_flatland_unittests.cc",
       "tests/fake_session_unittests.cc",
diff --git a/shell/common/canvas_spy.cc b/shell/platform/fuchsia/flutter/canvas_spy.cc
similarity index 99%
rename from shell/common/canvas_spy.cc
rename to shell/platform/fuchsia/flutter/canvas_spy.cc
index 0f9dee034fa53..fe45a8fdebb50 100644
--- a/shell/common/canvas_spy.cc
+++ b/shell/platform/fuchsia/flutter/canvas_spy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/common/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
 
 namespace flutter {
 
diff --git a/shell/common/canvas_spy.h b/shell/platform/fuchsia/flutter/canvas_spy.h
similarity index 98%
rename from shell/common/canvas_spy.h
rename to shell/platform/fuchsia/flutter/canvas_spy.h
index 4bfaef4c7400c..629538dd83df2 100644
--- a/shell/common/canvas_spy.h
+++ b/shell/platform/fuchsia/flutter/canvas_spy.h
@@ -10,8 +10,8 @@
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 #include "third_party/skia/include/utils/SkNoDrawCanvas.h"
 
-#ifndef FLUTTER_SHELL_COMMON_CANVAS_SPY_H_
-#define FLUTTER_SHELL_COMMON_CANVAS_SPY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
 
 namespace flutter {
 
@@ -258,4 +258,4 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_SKIA_EVENT_TRACER_IMPL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
diff --git a/shell/common/canvas_spy_unittests.cc b/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
similarity index 96%
rename from shell/common/canvas_spy_unittests.cc
rename to shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
index 4f135392c41e9..80726fa047e28 100644
--- a/shell/common/canvas_spy_unittests.cc
+++ b/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
 
 #include "gtest/gtest.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h b/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
index 5a3142eb5d2f6..8c794c2c7f6e2 100644
--- a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
+++ b/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
@@ -17,10 +17,10 @@
 #include <vector>
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
-#include "flutter/shell/common/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkRect.h"
diff --git a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
index 6d0bc30061047..378fdf26d1dfb 100644
--- a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
+++ b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
@@ -17,10 +17,10 @@
 #include <vector>
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
-#include "flutter/shell/common/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkPoint.h"
diff --git a/flow/rtree.cc b/shell/platform/fuchsia/flutter/rtree.cc
similarity index 97%
rename from flow/rtree.cc
rename to shell/platform/fuchsia/flutter/rtree.cc
index ff66d52c1762c..c0b1aa3ab08bf 100644
--- a/flow/rtree.cc
+++ b/shell/platform/fuchsia/flutter/rtree.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "rtree.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 
 #include <list>
 
diff --git a/flow/rtree.h b/shell/platform/fuchsia/flutter/rtree.h
similarity index 91%
rename from flow/rtree.h
rename to shell/platform/fuchsia/flutter/rtree.h
index 35c74137243c8..ac5334cbdc8f1 100644
--- a/flow/rtree.h
+++ b/shell/platform/fuchsia/flutter/rtree.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_RTREE_H_
-#define FLUTTER_FLOW_RTREE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
 
 #include <list>
 #include <map>
@@ -62,4 +62,4 @@ class RTreeFactory : public SkBBHFactory {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_RTREE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
diff --git a/flow/rtree_unittests.cc b/shell/platform/fuchsia/flutter/rtree_unittests.cc
similarity index 99%
rename from flow/rtree_unittests.cc
rename to shell/platform/fuchsia/flutter/rtree_unittests.cc
index d1af5bb235d4c..80bcb35bbb5d6 100644
--- a/flow/rtree_unittests.cc
+++ b/shell/platform/fuchsia/flutter/rtree_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "rtree.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 
 #include "flutter/testing/testing.h"
 #include "third_party/skia/include/core/SkCanvas.h"