diff --git a/Cargo.toml b/Cargo.toml
index 07af0d5..de60dfc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ repository    = "https://github.com/thijsc/mongo-rust-driver"
 keywords      = ["mongodb", "database"]
 categories    = ["database", "api-bindings"]
 license       = "MIT/Apache-2.0"
+edition       = "2018"
 
 [badges]
 travis-ci = { repository = "thijsc/mongo-rust-driver" }
diff --git a/src/bsonc.rs b/src/bsonc.rs
index 8820663..7fdf221 100644
--- a/src/bsonc.rs
+++ b/src/bsonc.rs
@@ -4,7 +4,7 @@ use std::fmt;
 use std::slice;
 use libc::c_void;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 use bson;
 
 use super::Result;
diff --git a/src/client.rs b/src/client.rs
index bfbe158..9412cf4 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -11,7 +11,7 @@ use std::ptr;
 use std::io;
 use std::fs::File;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 use bson::Document;
 
diff --git a/src/collection.rs b/src/collection.rs
index 2ce86f2..9c4ad9c 100644
--- a/src/collection.rs
+++ b/src/collection.rs
@@ -7,8 +7,8 @@ use std::ffi::CStr;
 use std::borrow::Cow;
 use std::time::Duration;
 
-use mongoc::bindings;
-use bsonc;
+use crate::mongoc::bindings;
+use crate::bsonc;
 
 use bson::Document;
 
diff --git a/src/cursor.rs b/src/cursor.rs
index 2212052..0238f9f 100644
--- a/src/cursor.rs
+++ b/src/cursor.rs
@@ -6,7 +6,7 @@ use std::thread;
 use std::time::Duration;
 use std::collections::VecDeque;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 use bson::{self,Bson,Document,oid};
 
 use super::BsoncError;
diff --git a/src/database.rs b/src/database.rs
index a777899..c4334f9 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -4,7 +4,7 @@ use std::ffi::{CString,CStr};
 use std::borrow::Cow;
 use std::ptr;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 use bson::Document;
 
 use super::Result;
@@ -18,7 +18,7 @@ use super::cursor;
 use super::cursor::Cursor;
 use super::cursor::BatchCursor;
 use super::read_prefs::ReadPrefs;
-use flags::FlagsValue;
+use crate::flags::FlagsValue;
 
 #[doc(hidden)]
 pub enum CreatedBy<'a> {
diff --git a/src/error.rs b/src/error.rs
index b3bae36..60a8019 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -6,7 +6,7 @@ use std::ffi::CStr;
 use bson::{DecoderError,EncoderError,ValueAccessError,Document};
 use std::ffi::NulError;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 /// Wrapper for all errors that can occur in the driver.
 pub enum MongoError {
diff --git a/src/flags.rs b/src/flags.rs
index e3acc89..a866eff 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -1,6 +1,6 @@
 //! Flags to configure various MongoDB operations.
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 use std::collections::BTreeSet;
 
diff --git a/src/lib.rs b/src/lib.rs
index 7f54a51..deb41c3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,7 +40,7 @@ use std::ptr;
 use std::result;
 use std::sync::Once;
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 pub mod client;
 pub mod collection;
@@ -53,7 +53,7 @@ pub mod write_concern;
 mod bsonc;
 mod error;
 
-pub use error::{MongoError,BsoncError,MongoErrorDomain,MongoErrorCode,InvalidParamsError,BulkOperationError};
+pub use crate::error::{MongoError,BsoncError,MongoErrorDomain,MongoErrorCode,InvalidParamsError,BulkOperationError};
 
 /// Result that's used in all functions that perform operations on the database.
 pub type Result<T> = result::Result<T, MongoError>;
diff --git a/src/read_prefs.rs b/src/read_prefs.rs
index 5cc9888..64ce537 100644
--- a/src/read_prefs.rs
+++ b/src/read_prefs.rs
@@ -1,6 +1,6 @@
 //! Abstraction on top of the MongoDB connection read prefences.
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 /// Describes how reads should be dispatched.
 pub enum ReadMode {
diff --git a/src/write_concern.rs b/src/write_concern.rs
index 9e1f3cd..14e9b9b 100644
--- a/src/write_concern.rs
+++ b/src/write_concern.rs
@@ -1,6 +1,6 @@
 //! Abstraction on top of the MongoDB connection write concern.
 
-use mongoc::bindings;
+use crate::mongoc::bindings;
 
 /// Possible write concern levels, only default is supported at the moment.
 pub enum WriteConcernLevel {