diff --git a/benches/mc.rs b/benches/mc.rs
index bfbd400d44..151a6b917f 100644
--- a/benches/mc.rs
+++ b/benches/mc.rs
@@ -7,6 +7,7 @@ use rav1e::bench::context::BlockContext;
 use rav1e::bench::context::CDFContext;
 use rav1e::bench::context::ContextWriter;
 use rav1e::bench::context::FrameBlocks;
+use rav1e::bench::context::{BlockOffset, TileBlockOffset};
 use rav1e::bench::cpu_features::*;
 use rav1e::bench::encoder::FrameState;
 use rav1e::bench::encoder::{motion_compensate, FrameInvariants};
@@ -14,7 +15,6 @@ use rav1e::bench::frame::{AsRegion, PlaneOffset, PlaneSlice};
 use rav1e::bench::mc::*;
 use rav1e::bench::partition::RefType;
 use rav1e::bench::util::Aligned;
-use rav1e::context::{BlockOffset, TileBlockOffset};
 use rav1e::prelude::*;
 use std::hint::black_box;
 use std::sync::Arc;
diff --git a/src/lib.rs b/src/lib.rs
index 670416e622..f00bc7a53d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -94,8 +94,7 @@ mod rdo_tables;
 #[macro_use]
 mod util;
 mod cdef;
-#[doc(hidden)]
-pub mod context;
+mod context;
 mod deblock;
 mod encoder;
 mod entropymode;
@@ -108,8 +107,7 @@ mod recon_intra;
 mod scan_order;
 mod segmentation;
 mod stats;
-#[doc(hidden)]
-pub mod tiling;
+mod tiling;
 mod token_cdfs;
 
 mod api;