diff --git a/root-io/src/core/file.rs b/root-io/src/core/file.rs
index acacbbe..4942b50 100644
--- a/root-io/src/core/file.rs
+++ b/root-io/src/core/file.rs
@@ -6,10 +6,9 @@ use std::io::{BufReader, Seek, SeekFrom, Read};
 
 use failure::Error;
 use nom::{IResult, *};
-use crate::core::types::Context;
 
 use MAP_OFFSET;
-use ::core::*;
+use ::core::{*, Context};
 use ::code_gen::rust::{ToNamedRustParser, ToRustStruct};
 
 /// `RootFile` wraps the most basic information of a ROOT file.
diff --git a/root-io/src/core/tstreamerinfo.rs b/root-io/src/core/tstreamerinfo.rs
index 63f029d..dde3a78 100644
--- a/root-io/src/core/tstreamerinfo.rs
+++ b/root-io/src/core/tstreamerinfo.rs
@@ -1,10 +1,9 @@
 use quote::*;
-// use nom::*;
 use nom::HexDisplay;
 use nom::{IResult, be_u16, be_u32};
 
-
-use crate::core::{*, Context};
+use ::core::{TStreamer, tstreamer, TNamed, Context};
+use ::core::parsers::*;
 use ::code_gen::rust::{ToRustType, ToRustParser, ToNamedRustParser, ToRustStruct};
 use ::code_gen::utils::{type_is_core};
 
diff --git a/root-io/src/tree_reader/branch.rs b/root-io/src/tree_reader/branch.rs
index 7692c02..5aa6198 100644
--- a/root-io/src/tree_reader/branch.rs
+++ b/root-io/src/tree_reader/branch.rs
@@ -2,9 +2,8 @@ use std::io::SeekFrom;
 use std::path::PathBuf;
 use nom::*;
 
-use core::parsers::*;
-// use crate::core::types::*;
-use crate::core::types::{Raw, Context};
+use ::core::parsers::*;
+use ::core::types::{Raw, Context};
 
 use code_gen::rust::ToRustType;
 
diff --git a/root-io/src/tree_reader/leafs.rs b/root-io/src/tree_reader/leafs.rs
index 9d64a85..1c3a5b9 100644
--- a/root-io/src/tree_reader/leafs.rs
+++ b/root-io/src/tree_reader/leafs.rs
@@ -2,7 +2,7 @@ use std::fmt;
 use nom::*;
 use quote::{Ident, Tokens};
 
-use crate::core::{*, Context};
+use ::core::{*, Context};
 use code_gen::rust::ToRustType;
 
 #[derive(Debug, Clone)]
diff --git a/root-io/src/tree_reader/tree.rs b/root-io/src/tree_reader/tree.rs
index f481188..3ce48e4 100644
--- a/root-io/src/tree_reader/tree.rs
+++ b/root-io/src/tree_reader/tree.rs
@@ -2,9 +2,8 @@ use std::fmt;
 use std::ops::Deref;
 use nom::*;
 
-use core::parsers::*;
-use core::types::*;
-use crate::core::types::Context;
+use ::core::parsers::*;
+use ::core::types::{TNamed, Context};
 
 use tree_reader::branch::TBranch;
 use tree_reader::branch::tbranch_hdr;