diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b83106441d..57c876c33c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -112,7 +112,6 @@ set(client_SRCS
     creds/httpcredentialsgui.cpp
     creds/oauth.cpp
     creds/flow2auth.cpp
-    creds/keychainchunk.cpp
     creds/webflowcredentials.cpp
     creds/webflowcredentialsdialog.cpp
     wizard/postfixlineedit.cpp
diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp
index ff5c2eb2ab..e6c1f141a3 100644
--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@@ -1,13 +1,13 @@
 #include "webflowcredentials.h"
 
 #include "creds/httpcredentials.h"
+#include "creds/keychainchunk.h"
 
 #include <QAuthenticator>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPointer>
 #include <QTimer>
-#include <keychain.h>
 #include <QDialog>
 #include <QVBoxLayout>
 #include <QLabel>
@@ -18,7 +18,6 @@
 #include "theme.h"
 #include "wizard/webview.h"
 #include "webflowcredentialsdialog.h"
-#include "keychainchunk.h"
 
 using namespace QKeychain;
 
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 146e0910ab..aef76d246b 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -59,6 +59,7 @@ set(libsync_SRCS
     creds/dummycredentials.cpp
     creds/abstractcredentials.cpp
     creds/credentialscommon.cpp
+    creds/keychainchunk.cpp
 )
 
 if(TOKEN_AUTH_ONLY)
diff --git a/src/gui/creds/keychainchunk.cpp b/src/libsync/creds/keychainchunk.cpp
similarity index 100%
rename from src/gui/creds/keychainchunk.cpp
rename to src/libsync/creds/keychainchunk.cpp
diff --git a/src/gui/creds/keychainchunk.h b/src/libsync/creds/keychainchunk.h
similarity index 95%
rename from src/gui/creds/keychainchunk.h
rename to src/libsync/creds/keychainchunk.h
index d1ae1e9dda..d1d207b557 100644
--- a/src/gui/creds/keychainchunk.h
+++ b/src/libsync/creds/keychainchunk.h
@@ -39,7 +39,8 @@ static constexpr int MaxChunks = 10;
 /*
  * @brief: Abstract base class for KeychainChunk jobs.
  */
-class Job : public QObject {
+class Job : public QObject
+{
     Q_OBJECT
 public:
     Job(QObject *parent = nullptr);
@@ -84,7 +85,8 @@ protected:
 /*
 * @brief: Simple wrapper class for QKeychain::WritePasswordJob, splits too large keychain entry's data into chunks on Windows
 */
-class WriteJob : public KeychainChunk::Job {
+class OWNCLOUDSYNC_EXPORT WriteJob : public KeychainChunk::Job
+{
     Q_OBJECT
 public:
     WriteJob(Account *account, const QString &key, const QByteArray &data, QObject *parent = nullptr);
@@ -100,7 +102,8 @@ private slots:
 /*
 * @brief: Simple wrapper class for QKeychain::ReadPasswordJob, splits too large keychain entry's data into chunks on Windows
 */
-class ReadJob : public KeychainChunk::Job {
+class OWNCLOUDSYNC_EXPORT ReadJob : public KeychainChunk::Job
+{
     Q_OBJECT
 public:
     ReadJob(Account *account, const QString &key, const bool &keychainMigration, QObject *parent = nullptr);