diff --git a/Cargo.toml b/Cargo.toml
index 87013eb7..f408fe5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "apitest"
 version = "0.1.0"
 authors = ["Dietmar Maurer <dietmar@proxmox.com>"]
-
+edition = "2018"
 
 [lib]
 name = "apitest"
diff --git a/src/api_info.rs b/src/api_info.rs
index 1a4ee4b4..a0049f84 100644
--- a/src/api_info.rs
+++ b/src/api_info.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use json_schema::*;
+use crate::json_schema::*;
 use serde_json::{Value};
 
 pub struct ApiMethod<'a> {
diff --git a/src/json_schema.rs b/src/json_schema.rs
index 51dbe303..a051440f 100644
--- a/src/json_schema.rs
+++ b/src/json_schema.rs
@@ -1,4 +1,4 @@
-use static_map::StaticMap;
+use crate::static_map::StaticMap;
 
 pub type PropertyMap<'a> = StaticMap<'a, &'a str, Jss<'a>>; 
 
diff --git a/src/lib.rs b/src/lib.rs
index 835e6958..f82a7a17 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,3 @@
-extern crate failure;
-
-extern crate serde_json;
-
-
 pub mod static_map;
 pub mod json_schema;
 pub mod api_info;
diff --git a/src/main.rs b/src/main.rs
index 22b8de34..4b462b43 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,29 +1,19 @@
-extern crate failure;
-use failure::*;
+#[macro_use]
+extern crate apitest;
 
-use apitest::static_map::StaticMap;
+use failure::*;
 
 use std::collections::HashMap;
 
-#[macro_use]
-extern crate apitest;
 
 use apitest::json_schema::*;
 use apitest::api_info::*;
 
-
-extern crate serde_json;
-#[macro_use]
-extern crate serde_derive;
-
+use serde_derive::{Serialize, Deserialize};
 use serde_json::{json, Value};
 
-extern crate url;
-
 use url::form_urlencoded;
 
-extern crate hyper;
-
 use hyper::{Method, Body, Request, Response, Server, StatusCode};
 use hyper::rt::Future;
 use hyper::service::service_fn_ok;