diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 8e4f2dbaca9f3..2ef13f7f5b21d 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -708,8 +708,7 @@ void OwncloudPropagator::startFilePropagation(const SyncFileItemPtr &item,
     }
 }
 
-void OwncloudPropagator::processE2eeMetadataMigration(const SyncFileItemPtr &item,
-                                                              QStack<QPair<QString, PropagateDirectory *>> &directories)
+void OwncloudPropagator::processE2eeMetadataMigration(const SyncFileItemPtr &item, QStack<QPair<QString, PropagateDirectory *>> &directories)
 {
     if (item->_e2eEncryptionMaximumAvailableStatus >= EncryptionStatusEnums::ItemEncryptionStatus::EncryptedMigratedV2_0) {
         // migrating to v2.0+
diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index a8ae0ef3d379e..9f5c8d0581825 100644
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -450,8 +450,7 @@ class OWNCLOUDSYNC_EXPORT OwncloudPropagator : public QObject
                               QString &removedDirectory,
                               QString &maybeConflictDirectory);
 
-    void processE2eeMetadataMigration(const SyncFileItemPtr &item,
-                                              QStack<QPair<QString, PropagateDirectory *>> &directories);
+    void processE2eeMetadataMigration(const SyncFileItemPtr &item, QStack<QPair<QString, PropagateDirectory *>> &directories);
 
     [[nodiscard]] const SyncOptions &syncOptions() const;
     void setSyncOptions(const SyncOptions &syncOptions);
diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h
index 7a55f0512e79c..a56cdd4a1b0d4 100644
--- a/src/libsync/propagatedownload.h
+++ b/src/libsync/propagatedownload.h
@@ -137,10 +137,10 @@ class OWNCLOUDSYNC_EXPORT GETEncryptedFileJob : public GETFileJob
     // DOES NOT take ownership of the device.
     explicit GETEncryptedFileJob(AccountPtr account, const QString &path, QIODevice *device,
         const QMap<QByteArray, QByteArray> &headers, const QByteArray &expectedEtagForResume,
-        qint64 resumeStart, FolderMetadata::FolderMetadata::EncryptedFile encryptedInfo, QObject *parent = nullptr);
+        qint64 resumeStart, FolderMetadata::EncryptedFile encryptedInfo, QObject *parent = nullptr);
     explicit GETEncryptedFileJob(AccountPtr account, const QUrl &url, QIODevice *device,
         const QMap<QByteArray, QByteArray> &headers, const QByteArray &expectedEtagForResume,
-        qint64 resumeStart, FolderMetadata::FolderMetadata::EncryptedFile encryptedInfo, QObject *parent = nullptr);
+        qint64 resumeStart, FolderMetadata::EncryptedFile encryptedInfo, QObject *parent = nullptr);
     ~GETEncryptedFileJob() override = default;
 
 protected:
diff --git a/src/libsync/propagatedownloadencrypted.h b/src/libsync/propagatedownloadencrypted.h
index 6c8243454bad0..bc5c4a83ca6c4 100644
--- a/src/libsync/propagatedownloadencrypted.h
+++ b/src/libsync/propagatedownloadencrypted.h
@@ -39,7 +39,7 @@ private slots:
   QString _errorString;
   QString _remoteParentPath;
   QString _parentPathInDb;
-  // TODO: Create a base class with this member in 'protected' and virtual slots for fetch/upload, then refactor this and other similar classes to inherit the base class
+
   QScopedPointer<EncryptedFolderMetadataHandler> _encryptedFolderMetadataHandler;
 };
 
diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
index ef04c203d1e68..4a280d3aab0e8 100644
--- a/src/libsync/propagateremotemkdir.cpp
+++ b/src/libsync/propagateremotemkdir.cpp
@@ -21,7 +21,7 @@
 #include "common/asserts.h"
 #include "encryptfolderjob.h"
 #include "filesystem.h"
-#include <csync/csync.h>
+#include "csync/csync.h"
 
 #include <QFile>
 #include <QLoggingCategory>
diff --git a/src/libsync/propagateuploadencrypted.h b/src/libsync/propagateuploadencrypted.h
index 09c5d1189f0e7..effb8f6455667 100644
--- a/src/libsync/propagateuploadencrypted.h
+++ b/src/libsync/propagateuploadencrypted.h
@@ -70,8 +70,7 @@ private slots:
   QByteArray _generatedIv;
   QString _completeFileName;
   QString _remoteParentAbsolutePath;
-  // TODO: Create a base class with this member in 'protected' and virtual slots for fetch/upload, then refactor this and other similar classes to inherit the
-  // base class
+
   QScopedPointer<EncryptedFolderMetadataHandler> _encryptedFolderMetadataHandler;
 };
 
diff --git a/src/libsync/vfs/cfapi/hydrationjob.h b/src/libsync/vfs/cfapi/hydrationjob.h
index d5dac06329c13..27990c11a2ac5 100644
--- a/src/libsync/vfs/cfapi/hydrationjob.h
+++ b/src/libsync/vfs/cfapi/hydrationjob.h
@@ -121,8 +121,6 @@ private slots:
     QString _errorString;
     QString _remoteParentPath;
 
-    // TODO: Create a base class with this member in 'protected' and virtual slots for fetch/upload, then refactor this and other similar classes to inherit the
-    // base class
     QScopedPointer<EncryptedFolderMetadataHandler> _encryptedFolderMetadataHandler;
 };