diff --git a/Cargo.toml b/Cargo.toml
index a380e4c6..7d51e130 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ name = "ruma-api"
 readme = "README.md"
 repository = "https://github.com/ruma/ruma-api"
 version = "0.6.0"
+edition = "2018"
 
 [dependencies]
 futures = "0.1.25"
diff --git a/src/lib.rs b/src/lib.rs
index f629be43..621b42ab 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,25 +12,14 @@
 #![deny(missing_docs)]
 #![feature(try_from)]
 
-extern crate futures;
-extern crate http;
-extern crate hyper;
-extern crate ruma_identifiers;
-#[cfg(test)]
-extern crate serde;
-#[cfg(test)]
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate serde_urlencoded;
-#[cfg(test)]
-extern crate url;
-
 use std::{convert::TryInto, io};
 
 use futures::future::FutureFrom;
-use http::{Method, Request, Response, StatusCode};
-use hyper::Body;
+use http::{self, Method, Request, Response, StatusCode};
+use hyper::{self, Body};
+use ruma_identifiers;
+use serde_json;
+use serde_urlencoded;
 
 /// A Matrix API endpoint.
 pub trait Endpoint<T = Body, U = Body> {
@@ -141,6 +130,7 @@ mod tests {
         };
         use ruma_identifiers::{RoomAliasId, RoomId};
         use serde::de::{Deserialize, IntoDeserializer};
+        use serde_derive::{Deserialize, Serialize};
         use serde_json;
         use url::percent_encoding;