diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index b1781c393291f..6c7fb1ab54c0e 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -53,7 +53,6 @@
 ../../../flutter/flow/flow_run_all_unittests.cc
 ../../../flutter/flow/frame_timings_recorder_unittests.cc
 ../../../flutter/flow/gl_context_switch_unittests.cc
-../../../flutter/flow/instrumentation_unittests.cc
 ../../../flutter/flow/layers/backdrop_filter_layer_unittests.cc
 ../../../flutter/flow/layers/checkerboard_layertree_unittests.cc
 ../../../flutter/flow/layers/clip_path_layer_unittests.cc
@@ -75,6 +74,7 @@
 ../../../flutter/flow/mutators_stack_unittests.cc
 ../../../flutter/flow/raster_cache_unittests.cc
 ../../../flutter/flow/skia_gpu_object_unittests.cc
+../../../flutter/flow/stopwatch_unittests.cc
 ../../../flutter/flow/surface_frame_unittests.cc
 ../../../flutter/flow/testing
 ../../../flutter/flow/texture_unittests.cc
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index ef782f31bb79e..ebe4a47eaf704 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -787,8 +787,6 @@ ORIGIN: ../../../flutter/flow/flow_test_utils.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/flow_test_utils.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/frame_timings.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/frame_timings.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/instrumentation.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/instrumentation.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layer_snapshot_store.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layer_snapshot_store.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.cc + ../../../flutter/LICENSE
@@ -846,6 +844,8 @@ 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/skia_gpu_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/surface_frame.cc + ../../../flutter/LICENSE
@@ -3532,8 +3532,6 @@ FILE: ../../../flutter/flow/flow_test_utils.cc
 FILE: ../../../flutter/flow/flow_test_utils.h
 FILE: ../../../flutter/flow/frame_timings.cc
 FILE: ../../../flutter/flow/frame_timings.h
-FILE: ../../../flutter/flow/instrumentation.cc
-FILE: ../../../flutter/flow/instrumentation.h
 FILE: ../../../flutter/flow/layer_snapshot_store.cc
 FILE: ../../../flutter/flow/layer_snapshot_store.h
 FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
@@ -3591,6 +3589,8 @@ FILE: ../../../flutter/flow/raster_cache_key.h
 FILE: ../../../flutter/flow/raster_cache_util.cc
 FILE: ../../../flutter/flow/raster_cache_util.h
 FILE: ../../../flutter/flow/skia_gpu_object.h
+FILE: ../../../flutter/flow/stopwatch.cc
+FILE: ../../../flutter/flow/stopwatch.h
 FILE: ../../../flutter/flow/surface.cc
 FILE: ../../../flutter/flow/surface.h
 FILE: ../../../flutter/flow/surface_frame.cc
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index a394ea08d9406..f52d3251c45d8 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -18,8 +18,6 @@ source_set("flow") {
     "embedded_views.h",
     "frame_timings.cc",
     "frame_timings.h",
-    "instrumentation.cc",
-    "instrumentation.h",
     "layer_snapshot_store.cc",
     "layer_snapshot_store.h",
     "layers/backdrop_filter_layer.cc",
@@ -77,6 +75,8 @@ source_set("flow") {
     "raster_cache_util.cc",
     "raster_cache_util.h",
     "skia_gpu_object.h",
+    "stopwatch.cc",
+    "stopwatch.h",
     "surface.cc",
     "surface.h",
     "surface_frame.cc",
@@ -145,7 +145,6 @@ if (enable_unittests) {
       "flow_test_utils.h",
       "frame_timings_recorder_unittests.cc",
       "gl_context_switch_unittests.cc",
-      "instrumentation_unittests.cc",
       "layers/backdrop_filter_layer_unittests.cc",
       "layers/checkerboard_layertree_unittests.cc",
       "layers/clip_path_layer_unittests.cc",
@@ -167,6 +166,7 @@ if (enable_unittests) {
       "mutators_stack_unittests.cc",
       "raster_cache_unittests.cc",
       "skia_gpu_object_unittests.cc",
+      "stopwatch_unittests.cc",
       "surface_frame_unittests.cc",
       "testing/mock_layer_unittests.cc",
       "testing/mock_texture_unittests.cc",
diff --git a/flow/compositor_context.h b/flow/compositor_context.h
index 4fbab55b190c0..04bb29a1f19e4 100644
--- a/flow/compositor_context.h
+++ b/flow/compositor_context.h
@@ -11,9 +11,9 @@
 #include "flutter/common/graphics/texture.h"
 #include "flutter/flow/diff_context.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/raster_cache.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/raster_thread_merger.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
index eaae9d4279a23..d9864e82dcb3d 100644
--- a/flow/layers/layer.h
+++ b/flow/layers/layer.h
@@ -14,10 +14,10 @@
 #include "flutter/display_list/dl_canvas.h"
 #include "flutter/flow/diff_context.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/layers/layer_state_stack.h"
 #include "flutter/flow/raster_cache.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
diff --git a/flow/layers/performance_overlay_layer.h b/flow/layers/performance_overlay_layer.h
index 62f26754574e0..5fd1c712cb397 100644
--- a/flow/layers/performance_overlay_layer.h
+++ b/flow/layers/performance_overlay_layer.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layers/layer.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/macros.h"
 
 class SkTextBlob;
diff --git a/flow/instrumentation.cc b/flow/stopwatch.cc
similarity index 98%
rename from flow/instrumentation.cc
rename to flow/stopwatch.cc
index c44ac4b91af99..4d28f375a4479 100644
--- a/flow/instrumentation.cc
+++ b/flow/stopwatch.cc
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/instrumentation.h"
+#include "flutter/flow/stopwatch.h"
 
-#include <algorithm>
-
-#include "flutter/display_list/skia/dl_sk_canvas.h"
+#include "include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
diff --git a/flow/instrumentation.h b/flow/stopwatch.h
similarity index 100%
rename from flow/instrumentation.h
rename to flow/stopwatch.h
diff --git a/flow/instrumentation_unittests.cc b/flow/stopwatch_unittests.cc
similarity index 94%
rename from flow/instrumentation_unittests.cc
rename to flow/stopwatch_unittests.cc
index 77f684752e153..76893c7089333 100644
--- a/flow/instrumentation_unittests.cc
+++ b/flow/stopwatch_unittests.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/instrumentation.h"
-#include "gmock/gmock.h"
+#include "flutter/flow/stopwatch.h"
+#include "gmock/gmock.h"  // IWYU pragma: keep
 #include "gtest/gtest.h"
 
 using testing::Return;