diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
index e77a1a29657..d0ebbfbc9d6 100644
--- a/core/src/lib/CMakeLists.txt
+++ b/core/src/lib/CMakeLists.txt
@@ -25,7 +25,7 @@ set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h
    bsock_tcp.h btime.h btimers.h cbuf.h
    crypto.h crypto_cache.h devlock.h dlist.h fnmatch.h
    guid_to_name.h htable.h ini.h lex.h lib.h lockmgr.h
-   md5.h mem_pool.h message.h mntent_cache.h ordered_cbuf.h parse_conf.h
+   md5.h mem_pool.h message.h mntent_cache.h parse_conf.h
    plugins.h qualified_resource_name_type_converter.h queue.h rblist.h
    runscript.h rwlock.h scsi_crypto.h scsi_lli.h scsi_tapealert.h sellist.h
    serial.h sha1.h smartall.h status.h tls.h tls_conf.h tree.h var.h
@@ -51,7 +51,7 @@ set (BAREOS_SRCS  address_conf.cc alist.cc attr.cc attribs.cc base64.cc
    crypto_none.cc crypto_nss.cc  crypto_openssl.cc crypto_wrap.cc daemon.cc
    devlock.cc dlist.cc  edit.cc fnmatch.cc guid_to_name.cc hmac.cc htable.cc
    jcr.cc json.cc  lockmgr.cc md5.cc mem_pool.cc message.cc mntent_cache.cc
-   output_formatter.cc ordered_cbuf.cc passphrase.cc path_list.cc plugins.cc
+   output_formatter.cc passphrase.cc path_list.cc plugins.cc
    bpoll.cc  priv.cc
    queue.cc rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc  scsi_lli.cc
    sellist.cc serial.cc sha1.cc signal.cc  smartall.cc tls.cc
diff --git a/core/src/stored/backends/CMakeLists.txt b/core/src/stored/backends/CMakeLists.txt
index 13bf8bb0c9c..3b0ddf57662 100644
--- a/core/src/stored/backends/CMakeLists.txt
+++ b/core/src/stored/backends/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(bareossd-gfapi ${GFAPI_LIBRARIES})
 endif()
 
 if(${HAVE_DROPLET})
-add_library(bareossd-chunked SHARED chunked_device.cc)
+add_library(bareossd-chunked SHARED ordered_cbuf.cc chunked_device.cc)
 target_link_libraries(bareossd-chunked ${DROPLET_LIBRARIES})
 INSTALL(TARGETS bareossd-chunked DESTINATION ${backenddir})
 
diff --git a/core/src/stored/backends/chunked_device.h b/core/src/stored/backends/chunked_device.h
index 4382134694e..606db697b60 100644
--- a/core/src/stored/backends/chunked_device.h
+++ b/core/src/stored/backends/chunked_device.h
@@ -87,7 +87,7 @@ struct chunk_descriptor {
    bool opened;            /* An open call was done */
 };
 
-#include "lib/ordered_cbuf.h"
+#include "ordered_cbuf.h"
 
 class chunked_device: public Device {
 private:
diff --git a/core/src/lib/ordered_cbuf.cc b/core/src/stored/backends/ordered_cbuf.cc
similarity index 99%
rename from core/src/lib/ordered_cbuf.cc
rename to core/src/stored/backends/ordered_cbuf.cc
index ae977091957..b0bb8bb356e 100644
--- a/core/src/lib/ordered_cbuf.cc
+++ b/core/src/stored/backends/ordered_cbuf.cc
@@ -26,6 +26,7 @@
  * Ordered Circular buffer used for producer/consumer problem with pthreads.
  */
 #include "include/bareos.h"
+namespace storagedaemon {
 #include "ordered_cbuf.h"
 
 /*
@@ -417,3 +418,4 @@ int ordered_circbuf::flush()
 
    return 0;
 }
+} /* namespace storagedaemon */
diff --git a/core/src/lib/ordered_cbuf.h b/core/src/stored/backends/ordered_cbuf.h
similarity index 100%
rename from core/src/lib/ordered_cbuf.h
rename to core/src/stored/backends/ordered_cbuf.h