diff --git a/tokio-async-await/src/async_await/compat/backward.rs b/tokio-async-await/src/async_await/compat/backward.rs
index 642a2d190..f7625845f 100644
--- a/tokio-async-await/src/async_await/compat/backward.rs
+++ b/tokio-async-await/src/async_await/compat/backward.rs
@@ -4,7 +4,7 @@ use futures::{
 };
 use futures_core::{Future as Future03};
 
-use std::boxed::PinBox;
+use std::pin::PinBox;
 use std::future::FutureObj;
 use std::ptr::NonNull;
 use std::task::{
diff --git a/tokio-async-await/src/async_await/compat/forward.rs b/tokio-async-await/src/async_await/compat/forward.rs
index 2c0968288..fb712b50c 100644
--- a/tokio-async-await/src/async_await/compat/forward.rs
+++ b/tokio-async-await/src/async_await/compat/forward.rs
@@ -4,7 +4,7 @@ use futures_core::future::Future as Future03;
 use futures_core::task::Poll as Poll03;
 
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 use std::task::Context;
 
 /// Converts an 0.1 `Future` into an 0.3 `Future`.
diff --git a/tokio-async-await/src/async_await/io/flush.rs b/tokio-async-await/src/async_await/io/flush.rs
index d2279eed0..49813c041 100644
--- a/tokio-async-await/src/async_await/io/flush.rs
+++ b/tokio-async-await/src/async_await/io/flush.rs
@@ -5,7 +5,7 @@ use futures_core::task::{self, Poll};
 
 use std::io;
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 
 /// A future used to fully flush an I/O object.
 #[derive(Debug)]
diff --git a/tokio-async-await/src/async_await/io/read.rs b/tokio-async-await/src/async_await/io/read.rs
index 6780ca244..006f87f39 100644
--- a/tokio-async-await/src/async_await/io/read.rs
+++ b/tokio-async-await/src/async_await/io/read.rs
@@ -5,7 +5,7 @@ use futures_core::task::{self, Poll};
 
 use std::io;
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 
 /// A future which can be used to read bytes.
 #[derive(Debug)]
diff --git a/tokio-async-await/src/async_await/io/read_exact.rs b/tokio-async-await/src/async_await/io/read_exact.rs
index df319c89a..9bba54f51 100644
--- a/tokio-async-await/src/async_await/io/read_exact.rs
+++ b/tokio-async-await/src/async_await/io/read_exact.rs
@@ -6,7 +6,9 @@ use futures_util::try_ready;
 
 use std::io;
 use std::marker::Unpin;
-use std::mem::{self, PinMut};
+use std::mem;
+
+use core::pin::PinMut;
 
 /// A future which can be used to read exactly enough bytes to fill a buffer.
 #[derive(Debug)]
diff --git a/tokio-async-await/src/async_await/io/write.rs b/tokio-async-await/src/async_await/io/write.rs
index bf54e5c7d..6a933fbb4 100644
--- a/tokio-async-await/src/async_await/io/write.rs
+++ b/tokio-async-await/src/async_await/io/write.rs
@@ -5,7 +5,7 @@ use futures_core::task::{self, Poll};
 
 use std::io;
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 
 /// A future used to write data.
 #[derive(Debug)]
diff --git a/tokio-async-await/src/async_await/io/write_all.rs b/tokio-async-await/src/async_await/io/write_all.rs
index 757017253..ffede24e8 100644
--- a/tokio-async-await/src/async_await/io/write_all.rs
+++ b/tokio-async-await/src/async_await/io/write_all.rs
@@ -6,7 +6,9 @@ use futures_util::try_ready;
 
 use std::io;
 use std::marker::Unpin;
-use std::mem::{self, PinMut};
+use std::mem;
+
+use core::pin::PinMut;
 
 /// A future used to write the entire contents of a buffer.
 #[derive(Debug)]
diff --git a/tokio-async-await/src/async_await/sink/send.rs b/tokio-async-await/src/async_await/sink/send.rs
index 3c17a7f4e..f283d5d81 100644
--- a/tokio-async-await/src/async_await/sink/send.rs
+++ b/tokio-async-await/src/async_await/sink/send.rs
@@ -4,7 +4,7 @@ use futures_core::future::Future;
 use futures_core::task::{self, Poll};
 
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 
 /// Future for the `SinkExt::send_async` combinator, which sends a value to a
 /// sink and then waits until the sink has fully flushed.
diff --git a/tokio-async-await/src/async_await/stream/next.rs b/tokio-async-await/src/async_await/stream/next.rs
index 3d2f6bd76..8fdf86e6a 100644
--- a/tokio-async-await/src/async_await/stream/next.rs
+++ b/tokio-async-await/src/async_await/stream/next.rs
@@ -3,7 +3,7 @@ use futures_core::future::Future;
 use futures_core::task::{self, Poll};
 
 use std::marker::Unpin;
-use std::mem::PinMut;
+use std::pin::PinMut;
 
 /// A future of the next element of a stream.
 #[derive(Debug)]