diff --git a/src/commands/keytocardcommand.h b/src/commands/keytocardcommand.h
index 101c003fa..b04a3500a 100644
--- a/src/commands/keytocardcommand.h
+++ b/src/commands/keytocardcommand.h
@@ -1,58 +1,60 @@
 /*  commands/keytocardcommand.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <commands/cardcommand.h>
 
 #include <gpgme++/key.h>
 
+#include <memory>
+
 namespace Kleo
 {
 namespace SmartCard
 {
 class Card;
 }
 }
 
 namespace Kleo
 {
 namespace Commands
 {
 
 class KeyToCardCommand : public CardCommand
 {
     Q_OBJECT
 public:
     KeyToCardCommand(const GpgME::Subkey &subkey);
     KeyToCardCommand(const std::string &cardSlot, const std::string &serialNumber, const std::string &appName);
     ~KeyToCardCommand() override;
 
     static std::vector<std::shared_ptr<Kleo::SmartCard::Card> > getSuitableCards(const GpgME::Subkey &subkey);
 
 public Q_SLOTS:
     void keyToOpenPGPCardDone(const GpgME::Error &err);
     void keyToPIVCardDone(const GpgME::Error &err);
     void deleteDone(const GpgME::Error &err);
 
 private:
     void doStart() override;
     void doCancel() override;
 
 private:
     class Private;
     inline Private *d_func();
     inline const Private *d_func() const;
 };
 
 }
 }
 
diff --git a/src/conf/groupsconfigdialog.h b/src/conf/groupsconfigdialog.h
index df9b47a2a..b2811e587 100644
--- a/src/conf/groupsconfigdialog.h
+++ b/src/conf/groupsconfigdialog.h
@@ -1,35 +1,37 @@
 /*
     conf/groupsconfigdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <KConfigDialog>
 
+#include <memory>
+
 class GroupsConfigDialog : public KConfigDialog
 {
     Q_OBJECT
 public:
     explicit GroupsConfigDialog(QWidget *parent = nullptr);
     ~GroupsConfigDialog() override;
 
     static QString dialogName();
 
 private Q_SLOTS:
     void updateSettings() override;
     void updateWidgets() override;
 
 private:
     bool hasChanged() override;
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
diff --git a/src/conf/groupsconfigpage.h b/src/conf/groupsconfigpage.h
index a71d2e91c..26bd29e0c 100644
--- a/src/conf/groupsconfigpage.h
+++ b/src/conf/groupsconfigpage.h
@@ -1,33 +1,35 @@
 /*
     conf/groupsconfigpage.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QWidget>
 
+#include <memory>
+
 class GroupsConfigPage : public QWidget
 {
     Q_OBJECT
 public:
     explicit GroupsConfigPage(QWidget *parent = nullptr);
     ~GroupsConfigPage() override;
 
 public Q_SLOTS:
     void load();
     void save();
 
 Q_SIGNALS:
     void changed(bool state);
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
diff --git a/src/conf/groupsconfigwidget.h b/src/conf/groupsconfigwidget.h
index 83485e4fa..5ccfc3fea 100644
--- a/src/conf/groupsconfigwidget.h
+++ b/src/conf/groupsconfigwidget.h
@@ -1,40 +1,41 @@
 /*
     conf/groupsconfigwidget.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QWidget>
 
+#include <memory>
 #include <vector>
 
 namespace Kleo
 {
 class KeyGroup;
 
 class GroupsConfigWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit GroupsConfigWidget(QWidget *parent = nullptr);
     ~GroupsConfigWidget() override;
 
     void setGroups(const std::vector<KeyGroup> &groups);
     std::vector<KeyGroup> groups() const;
 
 Q_SIGNALS:
     void changed();
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 }
 
diff --git a/src/crypto/encryptemailtask.h b/src/crypto/encryptemailtask.h
index b5c49c338..532abea50 100644
--- a/src/crypto/encryptemailtask.h
+++ b/src/crypto/encryptemailtask.h
@@ -1,65 +1,66 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     crypto/encryptemailtask.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <crypto/task.h>
 
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
 
+#include <memory>
 #include <vector>
 
 namespace GpgME
 {
 class Key;
 }
 
 namespace Kleo
 {
 class Input;
 class Output;
 }
 
 namespace Kleo
 {
 namespace Crypto
 {
 
 class EncryptEMailTask : public Task
 {
     Q_OBJECT
 public:
     explicit EncryptEMailTask(QObject *parent = nullptr);
     ~EncryptEMailTask() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setOutput(const std::shared_ptr<Output> &output);
     void setRecipients(const std::vector<GpgME::Key> &recipients);
 
     GpgME::Protocol protocol() const override;
 
     void cancel() override;
     QString label() const override;
 
 private:
     void doStart() override;
     unsigned long long inputSize() const override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotResult(const GpgME::EncryptionResult &))
 };
 
 }
 }
 
 
diff --git a/src/crypto/gui/decryptverifyfilesdialog.h b/src/crypto/gui/decryptverifyfilesdialog.h
index 3a36f32a7..6c5040af1 100644
--- a/src/crypto/gui/decryptverifyfilesdialog.h
+++ b/src/crypto/gui/decryptverifyfilesdialog.h
@@ -1,74 +1,76 @@
 /* crypto/gui/decryptverifyfilesdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
     SPDX-FileCopyrightText: 2016 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
 
 #include <QDialog>
 #include <QString>
 #include <QDialogButtonBox>
 #include <QHash>
 #include "crypto/task.h"
 
+#include <memory>
+
 class QVBoxLayout;
 class QProgressBar;
 template <typename K, typename U> class QHash;
 class QLabel;
 
 namespace Kleo
 {
 class FileNameRequester;
 namespace Crypto
 {
 class TaskCollection;
 
 namespace Gui
 {
 class ResultListWidget;
 
 class DecryptVerifyFilesDialog : public QDialog
 {
     Q_OBJECT
 public:
     explicit DecryptVerifyFilesDialog(const std::shared_ptr<TaskCollection> &coll,
                                       QWidget *parent = nullptr);
     ~DecryptVerifyFilesDialog();
 
     void setOutputLocation(const QString &dir);
     QString outputLocation() const;
 
 protected Q_SLOTS:
     void progress(const QString &msg, int progress, int total);
     void started(const std::shared_ptr<Task> &result);
     void allDone();
     void btnClicked(QAbstractButton *btn);
     void checkAccept();
 
 protected:
     void readConfig();
     void writeConfig();
 
 protected:
     QLabel *labelForTag(const QString &tag);
 
 private:
     std::shared_ptr<TaskCollection> m_tasks;
     QProgressBar *m_progressBar;
     QHash<QString, QLabel *> m_progressLabelByTag;
     QVBoxLayout *m_progressLabelLayout;
     int m_lastErrorItemIndex;
     ResultListWidget *m_resultList;
     FileNameRequester *m_outputLocationFNR;
     QDialogButtonBox::StandardButton m_saveButton = QDialogButtonBox::NoButton;
     QDialogButtonBox *const m_buttonBox;
 };
 
 } // namespace Gui
 } //namespace Crypto;
 } // namespace Kleo
 
diff --git a/src/dialogs/certificatedetailsinputwidget.h b/src/dialogs/certificatedetailsinputwidget.h
index ecf1d936f..56c44f4e8 100644
--- a/src/dialogs/certificatedetailsinputwidget.h
+++ b/src/dialogs/certificatedetailsinputwidget.h
@@ -1,44 +1,46 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     dialogs/certificatedetailsinputwidget.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QWidget>
 
+#include <memory>
+
 namespace Kleo
 {
 namespace Dialogs
 {
 
 class CertificateDetailsInputWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit CertificateDetailsInputWidget(QWidget *parent = nullptr);
     ~CertificateDetailsInputWidget() override;
 
     void setName(const QString &name);
 
     void setEmail(const QString &email);
     QString email() const;
 
     QString dn() const;
 
 Q_SIGNALS:
     void validityChanged(bool valid);
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 }
 }
 
diff --git a/src/dialogs/createcsrforcardkeydialog.h b/src/dialogs/createcsrforcardkeydialog.h
index e39761e24..2e7e0cfeb 100644
--- a/src/dialogs/createcsrforcardkeydialog.h
+++ b/src/dialogs/createcsrforcardkeydialog.h
@@ -1,41 +1,43 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     dialogs/createcsrforcardkeydialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QDialog>
 
+#include <memory>
+
 namespace Kleo
 {
 namespace Dialogs
 {
 
 class CreateCSRForCardKeyDialog : public QDialog
 {
     Q_OBJECT
 public:
     explicit CreateCSRForCardKeyDialog(QWidget *parent = nullptr);
     ~CreateCSRForCardKeyDialog() override;
 
     void setName(const QString &name);
 
     void setEmail(const QString &email);
     QString email() const;
 
     QString dn() const;
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 }
 }
 
diff --git a/src/dialogs/editgroupdialog.h b/src/dialogs/editgroupdialog.h
index 6d61b943f..0d9722018 100644
--- a/src/dialogs/editgroupdialog.h
+++ b/src/dialogs/editgroupdialog.h
@@ -1,54 +1,55 @@
 /*
     dialogs/editgroupdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QDialog>
 
+#include <memory>
 #include <vector>
 
 namespace GpgME
 {
 class Key;
 }
 
 namespace Kleo
 {
 namespace Dialogs
 {
 
 class EditGroupDialog : public QDialog
 {
     Q_OBJECT
 public:
     enum FocusWidget {
         GroupName,
         KeysFilter
     };
 
     explicit EditGroupDialog(QWidget *parent = nullptr);
     ~EditGroupDialog() override;
 
     void setInitialFocus(FocusWidget widget);
 
     void setGroupName(const QString &name);
     QString groupName() const;
 
     void setGroupKeys(const std::vector<GpgME::Key> &keys);
     std::vector<GpgME::Key> groupKeys() const;
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 }
 }
 
diff --git a/src/dialogs/groupdetailsdialog.h b/src/dialogs/groupdetailsdialog.h
index 0bb5a2321..f833193e3 100644
--- a/src/dialogs/groupdetailsdialog.h
+++ b/src/dialogs/groupdetailsdialog.h
@@ -1,38 +1,40 @@
 /*
     dialogs/groupdetailsdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QDialog>
 
+#include <memory>
+
 namespace Kleo
 {
 class KeyGroup;
 
 namespace Dialogs
 {
 
 class GroupDetailsDialog : public QDialog
 {
     Q_OBJECT
 public:
     explicit GroupDetailsDialog(QWidget *parent = nullptr);
     ~GroupDetailsDialog() override;
 
     void setGroup(const Kleo::KeyGroup &group);
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 }
 }
 
diff --git a/src/dialogs/pivcardapplicationadministrationkeyinputdialog.h b/src/dialogs/pivcardapplicationadministrationkeyinputdialog.h
index 80270ed61..f2141822d 100644
--- a/src/dialogs/pivcardapplicationadministrationkeyinputdialog.h
+++ b/src/dialogs/pivcardapplicationadministrationkeyinputdialog.h
@@ -1,37 +1,39 @@
 /*  dialogs/pivcardapplicationadministrationkeyinputdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
 
 #include <QDialog>
 
+#include <memory>
+
 namespace Kleo
 {
 namespace Dialogs
 {
 class PIVCardApplicationAdministrationKeyInputDialog: public QDialog
 {
     Q_OBJECT
     Q_PROPERTY(QString labelText READ labelText WRITE setLabelText)
 
 public:
     explicit PIVCardApplicationAdministrationKeyInputDialog(QWidget *parent = nullptr);
 
     void setLabelText(const QString& text);
     QString labelText() const;
 
     QByteArray adminKey() const;
 
 private:
     class Private;
     std::shared_ptr<Private> d;
 };
 } // namespace Dialogs
 } // namespace Kleo
 
 
diff --git a/src/dialogs/revokecertificationdialog.h b/src/dialogs/revokecertificationdialog.h
index de4699526..ef3ce60c0 100644
--- a/src/dialogs/revokecertificationdialog.h
+++ b/src/dialogs/revokecertificationdialog.h
@@ -1,48 +1,50 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     dialogs/revokecertificationdialog.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QDialog>
 
+#include <memory>
+
 namespace GpgME
 {
 class Key;
 class UserID;
 }
 
 namespace Kleo
 {
 
 class RevokeCertificationDialog : public QDialog
 {
     Q_OBJECT
 public:
     explicit RevokeCertificationDialog(QWidget *parent = nullptr, Qt::WindowFlags f = {});
     ~RevokeCertificationDialog() override;
 
     void setCertificateToRevoke(const GpgME::Key &key);
 
     void setSelectedUserIDs(const std::vector<GpgME::UserID> &uids);
     std::vector<GpgME::UserID> selectedUserIDs() const;
 
     void setSelectedCertificationKey(const GpgME::Key &key);
     GpgME::Key selectedCertificationKey() const;
 
     bool sendToServer() const;
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 } // namespace Kleo
 
diff --git a/src/dialogs/revokecertificationwidget.h b/src/dialogs/revokecertificationwidget.h
index e4652a1ea..3cce84d92 100644
--- a/src/dialogs/revokecertificationwidget.h
+++ b/src/dialogs/revokecertificationwidget.h
@@ -1,62 +1,63 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     dialogs/revokecertificationwidget.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <QWidget>
 
+#include <memory>
 #include <vector>
 
 namespace GpgME
 {
 class Key;
 class UserID;
 }
 
 namespace Kleo
 {
 /** Widget for revoking OpenPGP certifications. */
 class RevokeCertificationWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit RevokeCertificationWidget(QWidget *parent = nullptr);
     ~RevokeCertificationWidget() override;
 
     /* Set the key to revoke certifications of */
     void setTarget(const GpgME::Key &key);
 
     /* Get the key to revoke certifications of */
     GpgME::Key target() const;
 
     /* Select specific user ids. Default: all */
     void setSelectUserIDs(const std::vector<GpgME::UserID> &uids);
 
     /* The user ids whose certifications shall be revoked */
     std::vector<GpgME::UserID> selectedUserIDs() const;
 
     /* Set the selected certification key. Default: last used key */
     void setCertificationKey(const GpgME::Key &key);
 
     /* The selected certification key */
     GpgME::Key certificationKey() const;
 
     /* Whether the revocations shall be published */
     bool publishSelected() const;
 
     void saveConfig() const;
 
 private:
     class Private;
     const std::unique_ptr<Private> d;
 };
 
 } // namespace Kleo
 
diff --git a/src/smartcard/deviceinfowatcher_p.h b/src/smartcard/deviceinfowatcher_p.h
index 22e044e3e..83f32274c 100644
--- a/src/smartcard/deviceinfowatcher_p.h
+++ b/src/smartcard/deviceinfowatcher_p.h
@@ -1,61 +1,63 @@
 /*  smartcard/deviceinfowatcher_p.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
 
 #include <gpgme++/interfaces/statusconsumer.h>
 
 #include <gpgme++/context.h>
 
 #include <gpgme.h>
 
 #include <QThread>
 
+#include <memory>
+
 namespace Kleo
 {
 
 class DeviceInfoWatcher::Worker : public QObject, public GpgME::StatusConsumer
 {
     Q_OBJECT
 
 public:
     ~Worker();
 
 public Q_SLOTS:
     void start();
 
 Q_SIGNALS:
     void statusChanged(const QByteArray &details);
 
 private:
     Q_INVOKABLE void poll();
 
     void status(const char *status, const char *details) override;
 
 private:
     int mRetryDelay = 100;
     std::unique_ptr<GpgME::Context> mContext;
 };
 
 class DeviceInfoWatcher::Private
 {
     friend class ::Kleo::DeviceInfoWatcher;
     DeviceInfoWatcher *const q;
 public:
     explicit Private(DeviceInfoWatcher *qq);
     ~Private();
 
 private:
     void start();
 
 private:
     QThread workerThread;
 };
 
 }