diff --git a/src/rcore.rs b/src/rcore.rs
index 789c3d7..38b2e28 100644
--- a/src/rcore.rs
+++ b/src/rcore.rs
@@ -24,9 +24,7 @@ use crate::func::context::*;
 use crate::func::*;
 use crate::mode::*;
 
-use self::addresses::{Addresses, InliningAddresses};
 pub use self::context::Context;
-use self::dectx::{DeCtx, DeCtxT};
 pub use self::demoted::Demoted;
 pub use self::diagnostic::Diagnostic;
 pub use self::hashing::{Hash, HASH_SIZE, HASH_ZEROS};
diff --git a/src/rcore/addresses.rs b/src/rcore/addresses.rs
index da4cf56..0c02394 100644
--- a/src/rcore/addresses.rs
+++ b/src/rcore/addresses.rs
@@ -1,4 +1,7 @@
-use super::*;
+use super::{
+    dectx::{DeCtx, DeCtxT},
+    *,
+};
 
 /// Preferred way to parse [Point]s off of a [Serializer].
 pub(super) struct Addresses {
@@ -86,7 +89,7 @@ impl<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>> FactoryExt<'a, Ctx> for F {
 
 #[cfg(test)]
 mod tests {
-    use crate::rcore::*;
+    use super::*;
 
     #[test]
     fn can_read_one_address() {
diff --git a/src/rcore/dectx.rs b/src/rcore/dectx.rs
index 0145214..468f997 100644
--- a/src/rcore/dectx.rs
+++ b/src/rcore/dectx.rs
@@ -1,9 +1,9 @@
-use super::*;
+use super::{addresses::Addresses, *};
 
 pub(super) struct DeCtxT<'a: 'c, 'c, Ctx: Context<'a>> {
-    pub deserializer: &'c mut dyn Deserializer,
-    pub resolver: &'c Arc<dyn Resolver<'a, Ctx>>,
-    pub addresses: &'c mut Addresses,
+    pub(super) deserializer: &'c mut dyn Deserializer,
+    pub(super) resolver: &'c Arc<dyn Resolver<'a, Ctx>>,
+    pub(super) addresses: &'c mut Addresses,
 }
 
 pub(super) trait DeCtx<'a, Ctx: Context<'a>> {
diff --git a/src/rcore/demoted.rs b/src/rcore/demoted.rs
index 7b42eb8..1d5c69f 100644
--- a/src/rcore/demoted.rs
+++ b/src/rcore/demoted.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{dectx::DeCtx, *};
 
 /// Demoted [`InCtx`], returned by [`InCtx::demote`]. Use when a concrete type is required.
 pub struct Demoted<'a: 'c, 'c, Ctx: Context<'a>>(pub(super) &'c mut dyn DeCtx<'a, Ctx>);
diff --git a/src/rcore/inctx.rs b/src/rcore/inctx.rs
index 8d72c00..ddfa56c 100644
--- a/src/rcore/inctx.rs
+++ b/src/rcore/inctx.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{addresses::InliningAddresses, dectx::DeCtx, *};
 
 /// Inlining ([Stream]ed) context.
 pub trait InCtx<'a, Ctx: Context<'a>>: Stream {