diff --git a/analysis_options.yaml b/analysis_options.yaml
index b02fdb1079..ee6bf37fae 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -29,9 +29,6 @@ analyzer:
     # allow self-reference to deprecated members (we do this because otherwise we have
     # to annotate every member in every test, assert, etc, when we deprecate something)
     deprecated_member_use_from_same_package: ignore
-    # TODO(ianh): https://github.com/flutter/flutter/issues/74381
-    # Clean up existing unnecessary imports, and remove line to ignore.
-    unnecessary_import: ignore
     # Turned off until null-safe rollout is complete.
     unnecessary_null_comparison: ignore
   exclude:
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/color_filter_cache.dart b/dev/benchmarks/macrobenchmarks/lib/src/color_filter_cache.dart
index 9c48efbbe7..38a5c43846 100644
--- a/dev/benchmarks/macrobenchmarks/lib/src/color_filter_cache.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/src/color_filter_cache.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui';
 import 'package:flutter/material.dart';
 
 class ColorFilterCachePage extends StatefulWidget {
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/shader_mask_cache.dart b/dev/benchmarks/macrobenchmarks/lib/src/shader_mask_cache.dart
index cb8ef3bd7d..758dae0c35 100644
--- a/dev/benchmarks/macrobenchmarks/lib/src/shader_mask_cache.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/src/shader_mask_cache.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'picture_cache.dart';
 
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
index 56eefd29ee..ba63e75f95 100644
--- a/dev/bots/analyze.dart
+++ b/dev/bots/analyze.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
 import 'dart:convert';
 import 'dart:core' hide print;
 import 'dart:io' hide exit;
diff --git a/dev/tracing_tests/test/common.dart b/dev/tracing_tests/test/common.dart
index 498dc18c63..41e650d9ae 100644
--- a/dev/tracing_tests/test/common.dart
+++ b/dev/tracing_tests/test/common.dart
@@ -4,7 +4,6 @@
 
 import 'dart:developer' as developer;
 import 'dart:isolate' as isolate;
-import 'dart:ui';
 
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart b/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
index d1ef717611..af71248643 100644
--- a/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
+++ b/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for MaterialStateMouseCursor
 
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 
 void main() => runApp(const MyApp());
 
diff --git a/examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart b/examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart
index bc9951175d..8b27bad853 100644
--- a/examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart
+++ b/examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart
@@ -8,7 +8,6 @@
 // THIS SAMPLE ONLY WORKS ON MACOS.
 ////////////////////////////////////
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
diff --git a/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart b/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
index 6357d8d095..9e0b2676b5 100644
--- a/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
+++ b/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for MouseCursor
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 void main() => runApp(const MyApp());
 
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart b/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
index b45b0976e2..830d1b72f7 100644
--- a/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
+++ b/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 // Flutter code sample for FontFeature.FontFeature.localeAware
-import 'dart:ui';
 
 import 'package:flutter/widgets.dart';
 
diff --git a/examples/api/lib/widgets/animated_list/animated_list.0.dart b/examples/api/lib/widgets/animated_list/animated_list.0.dart
index 56f5701509..0debd1509a 100644
--- a/examples/api/lib/widgets/animated_list/animated_list.0.dart
+++ b/examples/api/lib/widgets/animated_list/animated_list.0.dart
@@ -4,7 +4,6 @@
 
 // Flutter code sample for AnimatedList
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 void main() {
diff --git a/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart b/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
index 65a2535790..50fb1bf136 100644
--- a/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
+++ b/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
@@ -4,7 +4,6 @@
 
 // Flutter code sample for SliverAnimatedList
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 void main() => runApp(const SliverAnimatedListSample());
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart b/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
index 1dae19e5d7..1c13a6eb0e 100644
--- a/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
+++ b/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for RawAutocomplete
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const AutocompleteExampleApp());
 
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart b/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
index bdc4803ceb..6f167131dc 100644
--- a/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
+++ b/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for RawAutocomplete
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const AutocompleteExampleApp());
 
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart b/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
index babed5fa0e..7d0e8f6de0 100644
--- a/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
+++ b/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for RawAutocomplete
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const AutocompleteExampleApp());
 
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart b/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
index 02d28a38e4..f7fc71af2f 100644
--- a/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
+++ b/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for RawAutocomplete.focusNode
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const AutocompleteExampleApp());
 
diff --git a/examples/api/lib/widgets/basic/listener.0.dart b/examples/api/lib/widgets/basic/listener.0.dart
index 6e80e1059e..4de71cc14f 100644
--- a/examples/api/lib/widgets/basic/listener.0.dart
+++ b/examples/api/lib/widgets/basic/listener.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for Listener
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const MyApp());
 
diff --git a/examples/api/lib/widgets/basic/mouse_region.0.dart b/examples/api/lib/widgets/basic/mouse_region.0.dart
index 4a540f0909..58d30995c5 100644
--- a/examples/api/lib/widgets/basic/mouse_region.0.dart
+++ b/examples/api/lib/widgets/basic/mouse_region.0.dart
@@ -5,7 +5,6 @@
 // Flutter code sample for MouseRegion
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 void main() => runApp(const MyApp());
 
diff --git a/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart b/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
index 64930d280e..b4d9cea378 100644
--- a/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
+++ b/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
@@ -4,7 +4,6 @@
 
 // Flutter code sample for FocusNode.unfocus
 
-import 'package:flutter/foundation.dart';
 
 import 'package:flutter/material.dart';
 
diff --git a/examples/api/lib/widgets/framework/build_owner.0.dart b/examples/api/lib/widgets/framework/build_owner.0.dart
index 3a029e2df2..180c6fd756 100644
--- a/examples/api/lib/widgets/framework/build_owner.0.dart
+++ b/examples/api/lib/widgets/framework/build_owner.0.dart
@@ -6,7 +6,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter/widgets.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/examples/api/test/flutter_test_config.dart b/examples/api/test/flutter_test_config.dart
index 2028d46c83..69ad13655b 100644
--- a/examples/api/test/flutter_test_config.dart
+++ b/examples/api/test/flutter_test_config.dart
@@ -4,7 +4,6 @@
 
 import 'dart:async';
 
-import 'package:flutter_test/flutter_test.dart';
 
 import 'goldens_io.dart' if (dart.library.html) 'goldens_web.dart' as flutter_goldens;
 
diff --git a/examples/api/test/painting/linear_gradient.0_test.dart b/examples/api/test/painting/linear_gradient.0_test.dart
index 0ba1105f64..a3ced8c877 100644
--- a/examples/api/test/painting/linear_gradient.0_test.dart
+++ b/examples/api/test/painting/linear_gradient.0_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/painting/gradient/linear_gradient.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
diff --git a/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart b/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
index 902c0f272c..5ed743d597 100644
--- a/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
+++ b/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/services/mouse_cursor/mouse_cursor.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
diff --git a/examples/api/test/ui/text/font_feature.0_test.dart b/examples/api/test/ui/text/font_feature.0_test.dart
index edd4db793c..45bccfef8d 100644
--- a/examples/api/test/ui/text/font_feature.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
index 7f57a116ca..0d4a9fb712 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_alternative.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
index 8c2c8007ca..cc949af685 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_alternative_fractions.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
index 81ad5ca594..23a56ed8b3 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_case_sensitive_forms.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
index 018d0da8fa..bd5259d9e4 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_character_variant.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
index a692503b9b..1981ff6c90 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_contextual_alternates.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
index 3473cf0ea5..ec43ecfd9c 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_denominator.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
index ee02b18d46..05bc5b9f21 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_fractions.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
index 58ec89276d..240ab348b5 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_historical_forms.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
index f60ac5704a..7133684d73 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_historical_ligatures.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
index a29abfde1b..80672aadec 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_lining_figures.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
index c8a4d66359..983bbcde71 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_locale_aware.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
index 8a9aa0d737..18b5e20f13 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_notational_forms.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
index 3fb41472f9..5cd59a1306 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_numerators.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
index ea775073f5..5d0fcf87b3 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_oldstyle_figures.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
index 25c926bf4a..c5ae315cbe 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_ordinal_forms.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
index fedcc2f85c..7fe8c04cd9 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_proportional_figures.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
index b1c82600a5..cdfce67d68 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_scientific_inferiors.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
index 7747067251..9481c57a35 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_slashed_zero.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
index ab79d50c92..638a01ec5e 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_stylistic_alternates.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
index c2e0aae7e4..023e9ebbde 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_stylistic_set.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart b/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
index 200e35bf4a..4e6ce35e27 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_stylistic_set.1.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
index 80e7d21605..17d2b27082 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_subscripts.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
index 951b60b70f..f3a01ffe0f 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_superscripts.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
index 7ab5624efc..4fcaf437f6 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_swash.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart b/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
index 57888d4b2f..b2a3d505c4 100644
--- a/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
+++ b/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_api_samples/ui/text/font_feature.font_feature_tabular_figures.0.dart' as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart b/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
index f1ab44d746..0d5438c079 100644
--- a/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
+++ b/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
@@ -5,7 +5,6 @@
 import 'dart:ui' show ImageFilter;
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'colors.dart';
diff --git a/packages/flutter/lib/src/cupertino/desktop_text_selection.dart b/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
index 56f5f6de2b..92174804ea 100644
--- a/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
diff --git a/packages/flutter/lib/src/cupertino/text_selection.dart b/packages/flutter/lib/src/cupertino/text_selection.dart
index 9e3787169f..9bef966df3 100644
--- a/packages/flutter/lib/src/cupertino/text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/text_selection.dart
@@ -4,7 +4,6 @@
 
 import 'dart:math' as math;
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/packages/flutter/lib/src/material/desktop_text_selection.dart b/packages/flutter/lib/src/material/desktop_text_selection.dart
index ad91020237..25a5b7b38b 100644
--- a/packages/flutter/lib/src/material/desktop_text_selection.dart
+++ b/packages/flutter/lib/src/material/desktop_text_selection.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
diff --git a/packages/flutter/lib/src/material/expansion_tile_theme.dart b/packages/flutter/lib/src/material/expansion_tile_theme.dart
index 2f493f2055..e714560f2e 100644
--- a/packages/flutter/lib/src/material/expansion_tile_theme.dart
+++ b/packages/flutter/lib/src/material/expansion_tile_theme.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
diff --git a/packages/flutter/lib/src/material/text_selection.dart b/packages/flutter/lib/src/material/text_selection.dart
index 71da312ec2..9679a21a8b 100644
--- a/packages/flutter/lib/src/material/text_selection.dart
+++ b/packages/flutter/lib/src/material/text_selection.dart
@@ -4,7 +4,6 @@
 
 import 'dart:math' as math;
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/packages/flutter/lib/src/services/binding.dart b/packages/flutter/lib/src/services/binding.dart
index 20865660e0..bb02fc9b10 100644
--- a/packages/flutter/lib/src/services/binding.dart
+++ b/packages/flutter/lib/src/services/binding.dart
@@ -5,7 +5,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';
diff --git a/packages/flutter/lib/src/widgets/display_feature_sub_screen.dart b/packages/flutter/lib/src/widgets/display_feature_sub_screen.dart
index 563baeef50..3b6982a55e 100644
--- a/packages/flutter/lib/src/widgets/display_feature_sub_screen.dart
+++ b/packages/flutter/lib/src/widgets/display_feature_sub_screen.dart
@@ -4,9 +4,6 @@
 
 import 'dart:math' as math;
 import 'dart:ui' show DisplayFeature, DisplayFeatureState;
-import 'package:flutter/foundation.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/rendering.dart';
 
 import 'basic.dart';
 import 'debug.dart';
diff --git a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
index a92a00df32..30da364ffe 100644
--- a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
+++ b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
@@ -6,7 +6,6 @@ import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/physics.dart';
 
 import 'basic.dart';
 import 'binding.dart';
diff --git a/packages/flutter/lib/src/widgets/platform_menu_bar.dart b/packages/flutter/lib/src/widgets/platform_menu_bar.dart
index e67edbd89a..e357de38db 100644
--- a/packages/flutter/lib/src/widgets/platform_menu_bar.dart
+++ b/packages/flutter/lib/src/widgets/platform_menu_bar.dart
@@ -3,11 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 
 import 'binding.dart';
diff --git a/packages/flutter/lib/src/widgets/shared_app_data.dart b/packages/flutter/lib/src/widgets/shared_app_data.dart
index 154cff2678..ba006a76da 100644
--- a/packages/flutter/lib/src/widgets/shared_app_data.dart
+++ b/packages/flutter/lib/src/widgets/shared_app_data.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
 
 import 'framework.dart';
 import 'inherited_model.dart';
diff --git a/packages/flutter/test/gestures/gesture_config_regression_test.dart b/packages/flutter/test/gestures/gesture_config_regression_test.dart
index c0c04a2907..f5ab7b5398 100644
--- a/packages/flutter/test/gestures/gesture_config_regression_test.dart
+++ b/packages/flutter/test/gestures/gesture_config_regression_test.dart
@@ -5,7 +5,6 @@
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 class TestResult {
diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart
index 2c95313f78..397181f808 100644
--- a/packages/flutter/test/material/app_bar_test.dart
+++ b/packages/flutter/test/material/app_bar_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/flutter/test/material/bottom_navigation_bar_theme_test.dart b/packages/flutter/test/material/bottom_navigation_bar_theme_test.dart
index f9279b9d6f..a8fe971a9f 100644
--- a/packages/flutter/test/material/bottom_navigation_bar_theme_test.dart
+++ b/packages/flutter/test/material/bottom_navigation_bar_theme_test.dart
@@ -5,7 +5,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vector_math/vector_math_64.dart' show Vector3;
 
diff --git a/packages/flutter/test/material/range_slider_test.dart b/packages/flutter/test/material/range_slider_test.dart
index b92b4b4d1d..621c3da740 100644
--- a/packages/flutter/test/material/range_slider_test.dart
+++ b/packages/flutter/test/material/range_slider_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
diff --git a/packages/flutter/test/material/switch_list_tile_test.dart b/packages/flutter/test/material/switch_list_tile_test.dart
index 47ce364cf5..5e7b7245a0 100644
--- a/packages/flutter/test/material/switch_list_tile_test.dart
+++ b/packages/flutter/test/material/switch_list_tile_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
diff --git a/packages/flutter/test/material/tooltip_visibility_test.dart b/packages/flutter/test/material/tooltip_visibility_test.dart
index b994415959..fda54b90d2 100644
--- a/packages/flutter/test/material/tooltip_visibility_test.dart
+++ b/packages/flutter/test/material/tooltip_visibility_test.dart
@@ -6,7 +6,6 @@ import 'dart:ui';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 const String tooltipText = 'TIP';
diff --git a/packages/flutter/test/rendering/mock_canvas_test.dart b/packages/flutter/test/rendering/mock_canvas_test.dart
index 4c097ca84a..82cccc1bde 100644
--- a/packages/flutter/test/rendering/mock_canvas_test.dart
+++ b/packages/flutter/test/rendering/mock_canvas_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'mock_canvas.dart';
diff --git a/packages/flutter/test/rendering/relayout_boundary_test.dart b/packages/flutter/test/rendering/relayout_boundary_test.dart
index 1823f1ad69..b282e8bf88 100644
--- a/packages/flutter/test/rendering/relayout_boundary_test.dart
+++ b/packages/flutter/test/rendering/relayout_boundary_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/flutter/test/widgets/display_feature_sub_screen_test.dart b/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
index 2efa0089da..4e919a8be1 100644
--- a/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
+++ b/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
@@ -4,8 +4,6 @@
 
 import 'dart:ui';
 
-import 'package:flutter/foundation.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/flutter/test/widgets/editable_text_shortcuts_test.dart b/packages/flutter/test/widgets/editable_text_shortcuts_test.dart
index 47dc7d1f23..e0f23a78dc 100644
--- a/packages/flutter/test/widgets/editable_text_shortcuts_test.dart
+++ b/packages/flutter/test/widgets/editable_text_shortcuts_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/flutter/test/widgets/editable_text_utils.dart b/packages/flutter/test/widgets/editable_text_utils.dart
index 4d95a83a31..7a65bff2cc 100644
--- a/packages/flutter/test/widgets/editable_text_utils.dart
+++ b/packages/flutter/test/widgets/editable_text_utils.dart
@@ -4,7 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 // Returns the first RenderEditable.
diff --git a/packages/flutter/test/widgets/placeholder_test.dart b/packages/flutter/test/widgets/placeholder_test.dart
index f0376e2fb6..38c2342107 100644
--- a/packages/flutter/test/widgets/placeholder_test.dart
+++ b/packages/flutter/test/widgets/placeholder_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../rendering/mock_canvas.dart';
diff --git a/packages/flutter/test/widgets/platform_menu_bar_test.dart b/packages/flutter/test/widgets/platform_menu_bar_test.dart
index 87e0aab5ea..1034afdd27 100644
--- a/packages/flutter/test/widgets/platform_menu_bar_test.dart
+++ b/packages/flutter/test/widgets/platform_menu_bar_test.dart
@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/src/foundation/diagnostics.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/packages/flutter/test/widgets/ticker_mode_test.dart b/packages/flutter/test/widgets/ticker_mode_test.dart
index 8c1c089acd..f23250c434 100644
--- a/packages/flutter/test/widgets/ticker_mode_test.dart
+++ b/packages/flutter/test/widgets/ticker_mode_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/packages/flutter/test/widgets/transitions_test.dart b/packages/flutter/test/widgets/transitions_test.dart
index a419517728..172d581f6d 100644
--- a/packages/flutter/test/widgets/transitions_test.dart
+++ b/packages/flutter/test/widgets/transitions_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:math' as math;
-import 'dart:ui' show Rect;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
diff --git a/packages/flutter_localizations/test/material/tabs_test.dart b/packages/flutter_localizations/test/material/tabs_test.dart
index e4e16647f3..96f74da823 100644
--- a/packages/flutter_localizations/test/material/tabs_test.dart
+++ b/packages/flutter_localizations/test/material/tabs_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/flutter_test/lib/src/test_text_input.dart b/packages/flutter_test/lib/src/test_text_input.dart
index 1a4f5d9caf..c0fb114868 100644
--- a/packages/flutter_test/lib/src/test_text_input.dart
+++ b/packages/flutter_test/lib/src/test_text_input.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:typed_data';
 import 'dart:ui' show Rect, Offset;
 
 import 'package:flutter/foundation.dart';
diff --git a/packages/flutter_tools/lib/src/proxied_devices/file_transfer.dart b/packages/flutter_tools/lib/src/proxied_devices/file_transfer.dart
index d966f56b7b..d36b39394b 100644
--- a/packages/flutter_tools/lib/src/proxied_devices/file_transfer.dart
+++ b/packages/flutter_tools/lib/src/proxied_devices/file_transfer.dart
@@ -10,7 +10,6 @@ import 'package:crypto/crypto.dart';
 import 'package:meta/meta.dart';
 
 import '../base/file_system.dart';
-import '../base/io.dart';
 import '../build_system/hash.dart';
 import '../convert.dart';
 
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
index 303f97c5df..88a9aa33f3 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
@@ -18,7 +18,6 @@ import 'package:flutter_tools/src/dart/analysis.dart';
 
 import '../../src/common.dart';
 import '../../src/context.dart';
-import '../../src/fake_process_manager.dart';
 import '../../src/test_flutter_command_runner.dart';
 
 const String _kFlutterRoot = '/data/flutter';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart
index 494e6b57f1..4504abd8d1 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart
@@ -19,7 +19,6 @@ import 'package:test/fake.dart';
 
 import '../../src/common.dart';
 import '../../src/context.dart';
-import '../../src/fake_process_manager.dart';
 import '../../src/test_flutter_command_runner.dart';
 
 void main() {
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart
index d6dbc310c6..3e0ed7c22e 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart
@@ -7,7 +7,6 @@
 import 'dart:async';
 
 import 'package:file/memory.dart';
-import 'package:file/src/interface/file.dart';
 import 'package:flutter_tools/src/android/android_device.dart';
 import 'package:flutter_tools/src/application_package.dart';
 import 'package:flutter_tools/src/base/common.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/upgrade_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/upgrade_test.dart
index b758713ad9..7b2013076e 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/upgrade_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/upgrade_test.dart
@@ -14,7 +14,6 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/upgrade.dart';
 import 'package:flutter_tools/src/version.dart';
 
-import '../../src/common.dart';
 import '../../src/context.dart';
 import '../../src/fake_process_manager.dart';
 import '../../src/fakes.dart' show FakeFlutterVersion;
diff --git a/packages/flutter_tools/test/general.shard/integration_test_device_test.dart b/packages/flutter_tools/test/general.shard/integration_test_device_test.dart
index c76232366a..9fb63e625d 100644
--- a/packages/flutter_tools/test/general.shard/integration_test_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/integration_test_device_test.dart
@@ -17,7 +17,6 @@ import 'package:stream_channel/stream_channel.dart';
 import 'package:test/fake.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
-import '../src/common.dart';
 import '../src/context.dart';
 import '../src/fake_devices.dart';
 import '../src/fake_vm_services.dart';
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
index 563c564a34..dc87cc6459 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
@@ -6,9 +6,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:dds/dap.dart';
-import 'package:dds/src/dap/logging.dart';
 import 'package:file/file.dart';
-import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/convert.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;