diff --git a/futures-executor/src/local_pool.rs b/futures-executor/src/local_pool.rs
index e6df64de11..04a92fbc48 100644
--- a/futures-executor/src/local_pool.rs
+++ b/futures-executor/src/local_pool.rs
@@ -20,10 +20,10 @@ use std::thread::{self, Thread};
 /// little work in between I/O actions.
 ///
 /// To get a handle to the pool that implements
-/// [`Spawn`](futures_core::task::Spawn), use the
+/// [`Spawn`](futures_task::Spawn), use the
 /// [`spawner()`](LocalPool::spawner) method. Because the executor is
 /// single-threaded, it supports a special form of task spawning for non-`Send`
-/// futures, via [`spawn_local_obj`](futures_core::task::LocalSpawn::spawn_local_obj).
+/// futures, via [`spawn_local_obj`](futures_task::LocalSpawn::spawn_local_obj).
 #[derive(Debug)]
 pub struct LocalPool {
     pool: FuturesUnordered<LocalFutureObj<'static, ()>>,
@@ -31,7 +31,7 @@ pub struct LocalPool {
 }
 
 /// A handle to a [`LocalPool`](LocalPool) that implements
-/// [`Spawn`](futures_core::task::Spawn).
+/// [`Spawn`](futures_task::Spawn).
 #[derive(Clone, Debug)]
 pub struct LocalSpawner {
     incoming: Weak<Incoming>,
diff --git a/futures-task/src/arc_wake.rs b/futures-task/src/arc_wake.rs
index 6307afc84f..aa6de0fc43 100644
--- a/futures-task/src/arc_wake.rs
+++ b/futures-task/src/arc_wake.rs
@@ -9,12 +9,12 @@ use alloc::sync::Arc;
 ///
 /// Currently, there are two ways to convert `ArcWake` into [`Waker`]:
 ///
-/// * [`waker`](crate::task::waker()) converts `Arc<impl ArcWake>` into [`Waker`].
-/// * [`waker_ref`](crate::task::waker_ref()) converts `&Arc<impl ArcWake>` into [`WakerRef`] that
+/// * [`waker`](super::waker()) converts `Arc<impl ArcWake>` into [`Waker`].
+/// * [`waker_ref`](super::waker_ref()) converts `&Arc<impl ArcWake>` into [`WakerRef`] that
 ///   provides access to a [`&Waker`][`Waker`].
 ///
 /// [`Waker`]: std::task::Waker
-/// [`WakerRef`]: crate::task::WakerRef
+/// [`WakerRef`]: super::WakerRef
 // Note: Send + Sync required because `Arc<T>` doesn't automatically imply
 // those bounds, but `Waker` implements them.
 pub trait ArcWake: Send + Sync {
diff --git a/futures-task/src/future_obj.rs b/futures-task/src/future_obj.rs
index fe4dcf6cfc..6acdf7c37f 100644
--- a/futures-task/src/future_obj.rs
+++ b/futures-task/src/future_obj.rs
@@ -104,8 +104,7 @@ impl<T> Drop for LocalFutureObj<'_, T> {
 /// contexts.
 ///
 /// You should generally not need to use this type outside of `no_std` or when
-/// implementing `Spawn`, consider using [`BoxFuture`](crate::future::BoxFuture)
-/// instead.
+/// implementing `Spawn`, consider using `BoxFuture` instead.
 pub struct FutureObj<'a, T>(LocalFutureObj<'a, T>);
 
 impl<T> Unpin for FutureObj<'_, T> {}
diff --git a/futures-test/src/task/mod.rs b/futures-test/src/task/mod.rs
index f2a834e041..3ed8d3c27b 100644
--- a/futures-test/src/task/mod.rs
+++ b/futures-test/src/task/mod.rs
@@ -12,7 +12,7 @@
 //! This module provides utilities for creating test
 //! [`Context`](futures_core::task::Context)s,
 //! [`Waker`](futures_core::task::Waker)s and
-//! [`Spawn`](futures_core::task::Spawn) implementations.
+//! [`Spawn`](futures_task::Spawn) implementations.
 //!
 //! Test contexts:
 //! - [`noop_context`](crate::task::noop_context) creates a context that ignores calls to
diff --git a/futures-test/src/task/noop_spawner.rs b/futures-test/src/task/noop_spawner.rs
index 9225e87d0e..517a15b17d 100644
--- a/futures-test/src/task/noop_spawner.rs
+++ b/futures-test/src/task/noop_spawner.rs
@@ -1,6 +1,6 @@
 use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that
+/// An implementation of [`Spawn`](futures_task::Spawn) that
 /// discards spawned futures when used.
 ///
 /// # Examples
diff --git a/futures-test/src/task/panic_spawner.rs b/futures-test/src/task/panic_spawner.rs
index 8d3e978c89..4766ee7171 100644
--- a/futures-test/src/task/panic_spawner.rs
+++ b/futures-test/src/task/panic_spawner.rs
@@ -1,6 +1,6 @@
 use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that panics
+/// An implementation of [`Spawn`](futures_task::Spawn) that panics
 /// when used.
 ///
 /// # Examples
diff --git a/futures-test/src/task/record_spawner.rs b/futures-test/src/task/record_spawner.rs
index 960c39f9a8..3db983d5b8 100644
--- a/futures-test/src/task/record_spawner.rs
+++ b/futures-test/src/task/record_spawner.rs
@@ -1,6 +1,6 @@
 use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that records
+/// An implementation of [`Spawn`](futures_task::Spawn) that records
 /// any [`Future`](futures_core::future::Future)s spawned on it.
 ///
 /// # Examples
diff --git a/futures-util/src/compat/executor.rs b/futures-util/src/compat/executor.rs
index 311729bc0c..2df900c45f 100644
--- a/futures-util/src/compat/executor.rs
+++ b/futures-util/src/compat/executor.rs
@@ -17,7 +17,7 @@ pub trait Executor01CompatExt: Executor01<Executor01Future> +
                                Clone + Send + 'static
 {
     /// Converts a futures 0.1 [`Executor`](futures_01::future::Executor) into a
-    /// futures 0.3 [`Spawn`](futures_core::task::Spawn).
+    /// futures 0.3 [`Spawn`](futures_task::Spawn).
     ///
     /// ```
     /// use futures::task::SpawnExt;
@@ -56,7 +56,7 @@ where Ex: Executor01<Executor01Future> + Clone + Send + 'static
 }
 
 /// Converts a futures 0.1 [`Executor`](futures_01::future::Executor) into a
-/// futures 0.3 [`Spawn`](futures_core::task::Spawn).
+/// futures 0.3 [`Spawn`](futures_task::Spawn).
 #[derive(Debug, Clone)]
 pub struct Executor01As03<Ex> {
     executor01: Ex