diff --git a/Cargo.toml b/Cargo.toml
index ef748a71..68fe0f7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ include = [
     "src/**/*.rs",
     "Cargo.toml",
 ]
+edition = "2018"
 
 [lib]
 name = "sqlparser"
diff --git a/examples/cli.rs b/examples/cli.rs
index 545e8218..e8329914 100644
--- a/examples/cli.rs
+++ b/examples/cli.rs
@@ -1,5 +1,5 @@
-extern crate simple_logger;
-extern crate sqlparser;
+use simple_logger;
+
 ///! A small command-line app to run the parser.
 /// Run with `cargo run --example cli`
 use std::fs;
diff --git a/examples/parse_select.rs b/examples/parse_select.rs
index a87abb9b..99ae76d5 100644
--- a/examples/parse_select.rs
+++ b/examples/parse_select.rs
@@ -1,5 +1,3 @@
-extern crate sqlparser;
-
 use sqlparser::dialect::GenericSqlDialect;
 use sqlparser::sqlparser::*;
 
diff --git a/src/dialect/ansi_sql.rs b/src/dialect/ansi_sql.rs
index 4026cf61..522ed0ef 100644
--- a/src/dialect/ansi_sql.rs
+++ b/src/dialect/ansi_sql.rs
@@ -1,4 +1,4 @@
-use dialect::Dialect;
+use crate::dialect::Dialect;
 
 pub struct AnsiSqlDialect {}
 
diff --git a/src/dialect/generic_sql.rs b/src/dialect/generic_sql.rs
index 54275d69..fe48ab2d 100644
--- a/src/dialect/generic_sql.rs
+++ b/src/dialect/generic_sql.rs
@@ -1,4 +1,4 @@
-use dialect::Dialect;
+use crate::dialect::Dialect;
 pub struct GenericSqlDialect {}
 
 impl Dialect for GenericSqlDialect {
diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs
index 2b64c1f0..dac3740d 100644
--- a/src/dialect/postgresql.rs
+++ b/src/dialect/postgresql.rs
@@ -1,4 +1,4 @@
-use dialect::Dialect;
+use crate::dialect::Dialect;
 
 pub struct PostgreSqlDialect {}
 
diff --git a/src/lib.rs b/src/lib.rs
index 5ffc5a8e..2c9f9883 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,11 +35,6 @@
 //! println!("AST: {:?}", ast);
 //! ```
 
-#[macro_use]
-extern crate log;
-extern crate chrono;
-extern crate uuid;
-
 pub mod dialect;
 pub mod sqlast;
 pub mod sqlparser;
diff --git a/src/sqlast/mod.rs b/src/sqlast/mod.rs
index eef10fcd..9426eb04 100644
--- a/src/sqlast/mod.rs
+++ b/src/sqlast/mod.rs
@@ -483,7 +483,7 @@ impl ToString for FileFormat {
     }
 }
 
-use sqlparser::ParserError;
+use crate::sqlparser::ParserError;
 use std::str::FromStr;
 impl FromStr for FileFormat {
     type Err = ParserError;
diff --git a/src/sqlparser.rs b/src/sqlparser.rs
index d59048c8..27824110 100644
--- a/src/sqlparser.rs
+++ b/src/sqlparser.rs
@@ -14,6 +14,8 @@
 
 //! SQL Parser
 
+use log::debug;
+
 use super::dialect::keywords;
 use super::dialect::Dialect;
 use super::sqlast::*;
diff --git a/tests/sqlparser_ansi.rs b/tests/sqlparser_ansi.rs
index 73054fb7..82248729 100644
--- a/tests/sqlparser_ansi.rs
+++ b/tests/sqlparser_ansi.rs
@@ -1,6 +1,3 @@
-extern crate log;
-extern crate sqlparser;
-
 use sqlparser::dialect::AnsiSqlDialect;
 use sqlparser::sqlast::*;
 use sqlparser::sqlparser::*;
diff --git a/tests/sqlparser_generic.rs b/tests/sqlparser_generic.rs
index ea60e6d4..390d47c0 100644
--- a/tests/sqlparser_generic.rs
+++ b/tests/sqlparser_generic.rs
@@ -1,6 +1,3 @@
-extern crate log;
-extern crate sqlparser;
-
 use sqlparser::dialect::*;
 use sqlparser::sqlast::*;
 use sqlparser::sqlparser::*;
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
index 4c35a3cf..08071e82 100644
--- a/tests/sqlparser_postgres.rs
+++ b/tests/sqlparser_postgres.rs
@@ -1,13 +1,10 @@
-extern crate log;
-extern crate sqlparser;
+use log::debug;
 
 use sqlparser::dialect::PostgreSqlDialect;
 use sqlparser::sqlast::*;
 use sqlparser::sqlparser::*;
 use sqlparser::sqltokenizer::*;
 
-use log::*;
-
 #[test]
 fn test_prev_index() {
     let sql: &str = "SELECT version()";