diff --git a/libraries/persistent_store/src/format.rs b/libraries/persistent_store/src/format.rs
index 712d8cd..5935fd6 100644
--- a/libraries/persistent_store/src/format.rs
+++ b/libraries/persistent_store/src/format.rs
@@ -15,7 +15,9 @@
 #[macro_use]
 mod bitfield;
 
-use self::bitfield::*;
+#[cfg(test)]
+use self::bitfield::Length;
+use self::bitfield::{count_zeros, num_bits, Bit, Checksum, ConstField, Field};
 use crate::{usize_to_nat, Nat, Storage, StorageIndex, StoreError, StoreResult};
 use alloc::vec::Vec;
 use core::cmp::min;
diff --git a/libraries/persistent_store/src/store.rs b/libraries/persistent_store/src/store.rs
index ce34892..b0d132c 100644
--- a/libraries/persistent_store/src/store.rs
+++ b/libraries/persistent_store/src/store.rs
@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::format::*;
+use crate::format::{
+    is_erased, CompactInfo, Format, Header, InitInfo, InternalEntry, Padding, ParsedWord, Position,
+    Word, WordState,
+};
 #[cfg(feature = "std")]
 pub use crate::model::{StoreModel, StoreOperation};
 #[cfg(feature = "std")]