diff --git a/src/backup/chunk_stream.rs b/pbs-client/src/chunk_stream.rs
similarity index 99%
rename from src/backup/chunk_stream.rs
rename to pbs-client/src/chunk_stream.rs
index dd37832b..4e86336f 100644
--- a/src/backup/chunk_stream.rs
+++ b/pbs-client/src/chunk_stream.rs
@@ -6,7 +6,7 @@ use anyhow::{Error};
 use futures::ready;
 use futures::stream::{Stream, TryStream};
 
-use super::Chunker;
+use pbs_datastore::Chunker;
 
 /// Split input stream into dynamic sized chunks
 pub struct ChunkStream<S: Unpin> {
diff --git a/pbs-client/src/lib.rs b/pbs-client/src/lib.rs
index 78e9dad2..87a911c2 100644
--- a/pbs-client/src/lib.rs
+++ b/pbs-client/src/lib.rs
@@ -44,6 +44,9 @@ pub use backup_repo::*;
 mod backup_specification;
 pub use backup_specification::*;
 
+mod chunk_stream;
+pub use chunk_stream::{ChunkStream, FixedChunkStream};
+
 pub const PROXMOX_BACKUP_TCP_KEEPALIVE_TIME: u32 = 120;
 
 /// Connect to localhost:8007 as root@pam
diff --git a/src/backup/mod.rs b/src/backup/mod.rs
index 2f2c8426..a81f7825 100644
--- a/src/backup/mod.rs
+++ b/src/backup/mod.rs
@@ -71,9 +71,6 @@ pub use pbs_datastore::fixed_index::*;
 
 pub use pbs_datastore::read_chunk::*;
 
-mod chunk_stream;
-pub use chunk_stream::*;
-
 // Split
 mod read_chunk;
 pub use read_chunk::*;
diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index d4fa9448..034d3262 100644
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -38,6 +38,8 @@ use pbs_client::{
     BackupSpecificationType,
     BackupStats,
     BackupWriter,
+    ChunkStream,
+    FixedChunkStream,
     HttpClient,
     PxarBackupStream,
     RemoteChunkReader,
@@ -75,8 +77,6 @@ use pbs_tools::tokio::TokioWriterAdapter;
 
 use proxmox_backup::backup::{
     BufferedDynamicReader,
-    ChunkStream,
-    FixedChunkStream,
 };
 use proxmox_backup::tools;