diff --git a/packages/flutter/lib/src/cupertino/constants.dart b/packages/flutter/lib/src/cupertino/constants.dart
index a6ef62c2ce..f209681408 100644
--- a/packages/flutter/lib/src/cupertino/constants.dart
+++ b/packages/flutter/lib/src/cupertino/constants.dart
@@ -3,6 +3,11 @@
 // found in the LICENSE file.
 
 /// @docImport 'package:flutter/material.dart';
+///
+/// @docImport 'checkbox.dart';
+/// @docImport 'radio.dart';
+/// @docImport 'switch.dart';
+/// @docImport 'text_theme.dart';
 library;
 
 import 'package:flutter/widgets.dart';
diff --git a/packages/flutter/lib/src/cupertino/segmented_control.dart b/packages/flutter/lib/src/cupertino/segmented_control.dart
index 7fd4ca52fc..5912c406f8 100644
--- a/packages/flutter/lib/src/cupertino/segmented_control.dart
+++ b/packages/flutter/lib/src/cupertino/segmented_control.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'switch.dart';
+library;
+
 import 'dart:collection';
 import 'dart:math' as math;
 
@@ -75,7 +78,7 @@ const Duration _kFadeDuration = Duration(milliseconds: 165);
 /// the parent gets rebuilt.
 ///
 /// This example also demonstrates how to use the [disabledChildren] property by
-/// toggling each [Switch] to enable or disable the segments.
+/// toggling each [CupertinoSwitch] to enable or disable the segments.
 ///
 /// ** See code in examples/api/lib/cupertino/segmented_control/cupertino_segmented_control.0.dart **
 /// {@end-tool}
diff --git a/packages/flutter/lib/src/cupertino/switch.dart b/packages/flutter/lib/src/cupertino/switch.dart
index efd45f0348..a9bc166e32 100644
--- a/packages/flutter/lib/src/cupertino/switch.dart
+++ b/packages/flutter/lib/src/cupertino/switch.dart
@@ -8,6 +8,8 @@
 // void setState(VoidCallback fn) { }
 
 /// @docImport 'package:flutter/material.dart';
+///
+/// @docImport 'list_tile.dart';
 library;
 
 import 'dart:ui';
diff --git a/packages/flutter/lib/src/foundation/diagnostics.dart b/packages/flutter/lib/src/foundation/diagnostics.dart
index 1ec36bfa15..af0b5b0ea6 100644
--- a/packages/flutter/lib/src/foundation/diagnostics.dart
+++ b/packages/flutter/lib/src/foundation/diagnostics.dart
@@ -1445,7 +1445,7 @@ class TextTreeRenderer {
 /// The JSON representation of a [DiagnosticsNode].
 typedef _JsonDiagnosticsNode = Map<String, Object?>;
 
-/// Stack containing [DiagnosticNode]s to convert to JSON and the callback to
+/// Stack containing [DiagnosticsNode]s to convert to JSON and the callback to
 /// call with the JSON.
 ///
 /// Using a stack is required to process the widget tree iteratively instead of
diff --git a/packages/flutter/lib/src/material/about.dart b/packages/flutter/lib/src/material/about.dart
index 83d32ac843..ea2855d027 100644
--- a/packages/flutter/lib/src/material/about.dart
+++ b/packages/flutter/lib/src/material/about.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/cupertino.dart';
+///
 /// @docImport 'drawer.dart';
 /// @docImport 'list_tile_theme.dart';
 library;
diff --git a/packages/flutter/lib/src/material/navigation_bar.dart b/packages/flutter/lib/src/material/navigation_bar.dart
index 17890aa4dc..7121a08cbf 100644
--- a/packages/flutter/lib/src/material/navigation_bar.dart
+++ b/packages/flutter/lib/src/material/navigation_bar.dart
@@ -705,7 +705,7 @@ class _NavigationDestinationInfo extends InheritedWidget {
   /// The text style of the label.
   final MaterialStateProperty<TextStyle?>? labelTextStyle;
 
-  /// The padding around the [label] widget.
+  /// The padding around the label.
   ///
   /// Defaults to a padding of 4 pixels on the top.
   final EdgeInsetsGeometry? labelPadding;
diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart
index b0afd35688..d8d4fc9570 100644
--- a/packages/flutter/lib/src/material/page_transitions_theme.dart
+++ b/packages/flutter/lib/src/material/page_transitions_theme.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 /// @docImport 'app.dart';
+/// @docImport 'color_scheme.dart';
 /// @docImport 'page.dart';
 /// @docImport 'predictive_back_page_transitions_builder.dart';
 library;
diff --git a/packages/flutter/lib/src/material/search_anchor.dart b/packages/flutter/lib/src/material/search_anchor.dart
index 9a71657be4..6c9081ce25 100644
--- a/packages/flutter/lib/src/material/search_anchor.dart
+++ b/packages/flutter/lib/src/material/search_anchor.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/services.dart';
+library;
+
 import 'dart:async';
 import 'dart:math' as math;
 import 'dart:ui';
diff --git a/packages/flutter/lib/src/material/slider_theme.dart b/packages/flutter/lib/src/material/slider_theme.dart
index 350a6aa6ab..934ef26382 100644
--- a/packages/flutter/lib/src/material/slider_theme.dart
+++ b/packages/flutter/lib/src/material/slider_theme.dart
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'color_scheme.dart';
 /// @docImport 'range_slider.dart';
+/// @docImport 'text_theme.dart';
 library;
 
 import 'dart:math' as math;
diff --git a/packages/flutter/lib/src/painting/_web_image_info_web.dart b/packages/flutter/lib/src/painting/_web_image_info_web.dart
index f50b159484..f3240aa41a 100644
--- a/packages/flutter/lib/src/painting/_web_image_info_web.dart
+++ b/packages/flutter/lib/src/painting/_web_image_info_web.dart
@@ -12,7 +12,7 @@ import 'image_stream.dart';
 ///
 /// This occurs on the web when the image resource is from a different origin
 /// and is not configured for CORS. Since the image bytes cannot be directly
-/// fetched, [ui.Image]s cannot be created from it. However, the image can
+/// fetched, [Image]s cannot be created from it. However, the image can
 /// still be displayed if an <img> element is used.
 class WebImageInfo implements ImageInfo {
   /// Creates a new [WebImageInfo] from a given <img> element.
diff --git a/packages/flutter/lib/src/painting/image_provider.dart b/packages/flutter/lib/src/painting/image_provider.dart
index a28f83274e..a56a391a9b 100644
--- a/packages/flutter/lib/src/painting/image_provider.dart
+++ b/packages/flutter/lib/src/painting/image_provider.dart
@@ -12,6 +12,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math' as math;
 import 'dart:ui' as ui;
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
@@ -268,7 +269,7 @@ typedef ImageDecoderCallback =
 ///
 /// The following shows the code required to write a widget that fully conforms
 /// to the [ImageProvider] and [Widget] protocols. (It is essentially a
-/// bare-bones version of the [widgets.Image] widget.)
+/// bare-bones version of the [Image] widget.)
 ///
 /// ```dart
 /// class MyImage extends StatefulWidget {
diff --git a/packages/flutter/lib/src/painting/image_resolution.dart b/packages/flutter/lib/src/painting/image_resolution.dart
index ae479eac79..ced86a76da 100644
--- a/packages/flutter/lib/src/painting/image_resolution.dart
+++ b/packages/flutter/lib/src/painting/image_resolution.dart
@@ -115,7 +115,7 @@ const double _kLowDprLimit = 2.0;
 ///
 /// The following shows the code required to write a widget that fully conforms
 /// to the [AssetImage] and [Widget] protocols. (It is essentially a
-/// bare-bones version of the [widgets.Image] widget made to work specifically for
+/// bare-bones version of the [Image] widget made to work specifically for
 /// an [AssetImage].)
 ///
 /// ```dart
diff --git a/packages/flutter/lib/src/scheduler/ticker.dart b/packages/flutter/lib/src/scheduler/ticker.dart
index efc1682d4c..dfe8090ca1 100644
--- a/packages/flutter/lib/src/scheduler/ticker.dart
+++ b/packages/flutter/lib/src/scheduler/ticker.dart
@@ -163,7 +163,7 @@ class Ticker {
   bool get isActive => _future != null;
 
   /// The frame timestamp when the ticker was last started,
-  /// as reported by [SchedulerBinding.currentFrameTimestamp].
+  /// as reported by [SchedulerBinding.currentFrameTimeStamp].
   Duration? _startTime;
 
   /// Starts the clock for this [Ticker]. If the ticker is not [muted], then this
diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart
index 07d5e068be..31ad753b1c 100644
--- a/packages/flutter/lib/src/semantics/semantics.dart
+++ b/packages/flutter/lib/src/semantics/semantics.dart
@@ -6,6 +6,7 @@
 ///
 /// @docImport 'package:flutter/material.dart';
 /// @docImport 'package:flutter/rendering.dart';
+/// @docImport 'package:flutter_test/flutter_test.dart';
 library;
 
 import 'dart:math' as math;
diff --git a/packages/flutter/lib/src/services/scribe.dart b/packages/flutter/lib/src/services/scribe.dart
index 5f2877c124..2a8413db19 100644
--- a/packages/flutter/lib/src/services/scribe.dart
+++ b/packages/flutter/lib/src/services/scribe.dart
@@ -2,6 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'dart:ui';
+///
+/// @docImport 'package:flutter/widgets.dart';
+///
+/// @docImport 'text_input.dart';
+library;
+
 import 'package:flutter/foundation.dart';
 
 import 'message_codec.dart';
diff --git a/packages/flutter/lib/src/services/system_channels.dart b/packages/flutter/lib/src/services/system_channels.dart
index 8c4484d724..c2849db1cc 100644
--- a/packages/flutter/lib/src/services/system_channels.dart
+++ b/packages/flutter/lib/src/services/system_channels.dart
@@ -14,6 +14,7 @@
 /// @docImport 'raw_keyboard.dart';
 /// @docImport 'raw_keyboard_android.dart';
 /// @docImport 'raw_keyboard_fuchsia.dart';
+/// @docImport 'scribe.dart';
 /// @docImport 'system_chrome.dart';
 /// @docImport 'system_navigator.dart';
 /// @docImport 'system_sound.dart';
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart
index c5b6293c46..cf0fd67e7e 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -7,6 +7,7 @@
 /// @docImport 'package:flutter/rendering.dart';
 ///
 /// @docImport 'live_text.dart';
+/// @docImport 'scribe.dart';
 /// @docImport 'text_formatter.dart';
 library;
 
diff --git a/packages/flutter/lib/src/widgets/_web_image_web.dart b/packages/flutter/lib/src/widgets/_web_image_web.dart
index e1ac012d8b..7139ad408a 100644
--- a/packages/flutter/lib/src/widgets/_web_image_web.dart
+++ b/packages/flutter/lib/src/widgets/_web_image_web.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/rendering.dart';
+library;
+
 import 'dart:ui_web' as ui_web;
 
 import 'package:flutter/foundation.dart';
diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart
index 67efe904d6..c118c5bb60 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -387,7 +387,7 @@ class Opacity extends SingleChildRenderObjectWidget {
 /// A widget that applies a mask generated by a [Shader] to its child.
 ///
 /// For example, [ShaderMask] can be used to gradually fade out the edge
-/// of a child by using a [ui.Gradient.linear] mask.
+/// of a child by using a [RadialGradient] mask.
 ///
 /// {@youtube 560 315 https://www.youtube.com/watch?v=7sUL66pTQ7Q}
 ///
diff --git a/packages/flutter/lib/src/widgets/decorated_sliver.dart b/packages/flutter/lib/src/widgets/decorated_sliver.dart
index 21dda0285d..6c739c09e2 100644
--- a/packages/flutter/lib/src/widgets/decorated_sliver.dart
+++ b/packages/flutter/lib/src/widgets/decorated_sliver.dart
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/material.dart';
+///
 /// @docImport 'container.dart';
+/// @docImport 'scroll_view.dart';
 library;
 
 import 'package:flutter/rendering.dart';
diff --git a/packages/flutter/lib/src/widgets/flutter_logo.dart b/packages/flutter/lib/src/widgets/flutter_logo.dart
index a88f221a9e..0f23c84b43 100644
--- a/packages/flutter/lib/src/widgets/flutter_logo.dart
+++ b/packages/flutter/lib/src/widgets/flutter_logo.dart
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'icon.dart';
+/// @docImport 'image_icon.dart';
+library;
+
 import 'basic.dart';
 import 'framework.dart';
 import 'icon_theme.dart';
diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart
index 009669bb98..85cd4dfc4a 100644
--- a/packages/flutter/lib/src/widgets/scrollable.dart
+++ b/packages/flutter/lib/src/widgets/scrollable.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/material.dart';
+///
 /// @docImport 'page_storage.dart';
 /// @docImport 'page_view.dart';
 /// @docImport 'scroll_metrics.dart';
diff --git a/packages/flutter/lib/src/widgets/text_editing_intents.dart b/packages/flutter/lib/src/widgets/text_editing_intents.dart
index 5a54a74f13..36586a56d0 100644
--- a/packages/flutter/lib/src/widgets/text_editing_intents.dart
+++ b/packages/flutter/lib/src/widgets/text_editing_intents.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 /// @docImport 'default_text_editing_shortcuts.dart';
+/// @docImport 'editable_text.dart';
 library;
 
 import 'package:flutter/services.dart';
diff --git a/packages/flutter/test/widgets/multi_view_testing.dart b/packages/flutter/test/widgets/multi_view_testing.dart
index cf25a7bef2..2bb22d8a34 100644
--- a/packages/flutter/test/widgets/multi_view_testing.dart
+++ b/packages/flutter/test/widgets/multi_view_testing.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/widgets.dart';
+library;
+
 import 'dart:ui';
 
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/flutter/test_private/test/animated_icons_private_test.dart.tmpl b/packages/flutter/test_private/test/animated_icons_private_test.dart.tmpl
index 5e0205daaf..cb37bfb9e8 100644
--- a/packages/flutter/test_private/test/animated_icons_private_test.dart.tmpl
+++ b/packages/flutter/test_private/test/animated_icons_private_test.dart.tmpl
@@ -9,6 +9,8 @@
 // material material_animated_icons library, but instead, this test file is an
 // implementation of that library, using some of the parts of the real
 // material_animated_icons, this give the test access to the private APIs.
+/// @docImport 'package:flutter/material.dart';
+/// @docImport 'package:flutter/semantics.dart';
 library material_animated_icons;
 
 import 'dart:math' as math show pi;
diff --git a/packages/flutter_driver/lib/src/common/screenshot.dart b/packages/flutter_driver/lib/src/common/screenshot.dart
index 5ac78e7933..40c36d1217 100644
--- a/packages/flutter_driver/lib/src/common/screenshot.dart
+++ b/packages/flutter_driver/lib/src/common/screenshot.dart
@@ -34,7 +34,7 @@ enum ScreenshotFormat {
 
 /// A Flutter Driver command that takes a screenshot.
 class ScreenshotCommand extends Command {
-  /// Constructs this command given a [finder].
+  /// Constructs this command to take a screenshot.
   ScreenshotCommand({super.timeout, this.format = ScreenshotFormat.png});
 
   /// Deserializes this command from the value generated by [serialize].