diff --git a/Cargo.toml b/Cargo.toml
index 516fc51f..6352be3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,6 +87,9 @@ xdg = "2.2"
 nom = "5.1"
 crossbeam-channel = "0.5"
 
+# Used only by examples currently:
+zstd = { version = "0.6", features = [ "bindgen" ] }
+
 pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
diff --git a/examples/test_chunk_size.rs b/examples/test_chunk_size.rs
index 4062d235..5a3a5398 100644
--- a/examples/test_chunk_size.rs
+++ b/examples/test_chunk_size.rs
@@ -5,7 +5,7 @@ extern crate proxmox_backup;
 use anyhow::{Error};
 use std::io::{Read, Write};
 
-use proxmox_backup::backup::*;
+use pbs_datastore::Chunker;
 
 struct ChunkWriter {
     chunker: Chunker,
diff --git a/examples/test_chunk_speed.rs b/examples/test_chunk_speed.rs
index 1b787469..f9fb0b0d 100644
--- a/examples/test_chunk_speed.rs
+++ b/examples/test_chunk_speed.rs
@@ -1,7 +1,6 @@
 extern crate proxmox_backup;
 
-//use proxmox_backup::backup::chunker::*;
-use proxmox_backup::backup::*;
+use pbs_datastore::Chunker;
 
 fn main() {
 
diff --git a/pbs-datastore/src/lib.rs b/pbs-datastore/src/lib.rs
index b113d0a6..4380adb3 100644
--- a/pbs-datastore/src/lib.rs
+++ b/pbs-datastore/src/lib.rs
@@ -214,6 +214,8 @@ pub use crypt_config::{CryptConfig, CryptMode, Fingerprint};
 pub use crypt_reader::CryptReader;
 pub use crypt_writer::CryptWriter;
 pub use data_blob::DataBlob;
+pub use data_blob_reader::DataBlobReader;
+pub use data_blob_writer::DataBlobWriter;
 pub use key_derivation::{
     decrypt_key, load_and_decrypt_key, rsa_decrypt_key_config, rsa_encrypt_key_config,
 };
diff --git a/src/tape/test/alloc_writable_media.rs b/src/tape/test/alloc_writable_media.rs
index 8190f250..7df6c99f 100644
--- a/src/tape/test/alloc_writable_media.rs
+++ b/src/tape/test/alloc_writable_media.rs
@@ -5,8 +5,9 @@
 use std::path::PathBuf;
 use anyhow::Error;
 
+use pbs_systemd::time::parse_time_span;
+
 use crate::{
-    tools::systemd::time::parse_time_span,
     api2::types::{
         MediaSetPolicy,
         RetentionPolicy,
diff --git a/src/tape/test/compute_media_state.rs b/src/tape/test/compute_media_state.rs
index 70f03251..459359ea 100644
--- a/src/tape/test/compute_media_state.rs
+++ b/src/tape/test/compute_media_state.rs
@@ -107,8 +107,8 @@ fn test_media_expire_time() -> Result<(), Error> {
     let sl2= MediaSetLabel::with_data("p1", Uuid::generate(), 0, ctime + 120, None);
     let tape2_uuid = inventory.generate_used_tape("tape2", sl2, 0);
 
-    let event = crate::tools::systemd::time::parse_calendar_event("*:0/2")?;
-    let span = crate::tools::systemd::time::parse_time_span("120 seconds")?;
+    let event = pbs_systemd::time::parse_calendar_event("*:0/2")?;
+    let span = pbs_systemd::time::parse_time_span("120 seconds")?;
 
     let pool = MediaPool::new(
         "p1",
diff --git a/tests/blob_writer.rs b/tests/blob_writer.rs
index 7ea25bb8..9f50ba01 100644
--- a/tests/blob_writer.rs
+++ b/tests/blob_writer.rs
@@ -4,7 +4,7 @@ use std::io::Cursor;
 use std::io::{Read, Write, Seek, SeekFrom };
 use lazy_static::lazy_static;
 
-use proxmox_backup::backup::*;
+use pbs_datastore::{CryptConfig, DataBlob, DataBlobReader, DataBlobWriter};
 
 lazy_static! {
     static ref TEST_DATA: Vec<u8> = {
diff --git a/tests/prune.rs b/tests/prune.rs
index da516a0e..3297b031 100644
--- a/tests/prune.rs
+++ b/tests/prune.rs
@@ -1,7 +1,9 @@
 use anyhow::{Error};
 use std::path::PathBuf;
 
-use proxmox_backup::backup::*;
+use pbs_datastore::manifest::MANIFEST_BLOB_NAME;
+use pbs_datastore::prune::{compute_prune_info, PruneOptions};
+use pbs_datastore::{BackupDir, BackupInfo};
 
 fn get_prune_list(
     list: Vec<BackupInfo>,