diff --git a/src/crypto/decryptverifyemailcontroller.h b/src/crypto/decryptverifyemailcontroller.h
index ffd45b669..1aa286691 100644
--- a/src/crypto/decryptverifyemailcontroller.h
+++ b/src/crypto/decryptverifyemailcontroller.h
@@ -1,93 +1,91 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     decryptverifyemailcontroller.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include <crypto/controller.h>
 
 #include <utils/types.h>
 
 #include <gpgme++/global.h>
 
 #include <QMetaType>
 
 #include <memory>
 #include <vector>
 
+#include <gpgme++/verificationresult.h>
+
 namespace KMime
 {
 namespace Types
 {
 class Mailbox;
 }
 }
-namespace GpgME
-{
-class VerificationResult;
-}
 
 namespace Kleo
 {
 
 class Input;
 class Output;
 
 namespace Crypto
 {
 
 class DecryptVerifyEMailController : public Controller
 {
     Q_OBJECT
 public:
     explicit DecryptVerifyEMailController(QObject *parent = nullptr);
     explicit DecryptVerifyEMailController(const std::shared_ptr<const ExecutionContext> &cmd, QObject *parent = nullptr);
 
     ~DecryptVerifyEMailController() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setInputs(const std::vector<std::shared_ptr<Input> > &inputs);
 
     void setSignedData(const std::shared_ptr<Input> &data);
     void setSignedData(const std::vector<std::shared_ptr<Input> > &data);
 
     void setOutput(const std::shared_ptr<Output> &output);
     void setOutputs(const std::vector<std::shared_ptr<Output> > &outputs);
 
     void setInformativeSenders(const std::vector<KMime::Types::Mailbox> &senders);
 
     void setWizardShown(bool shown);
 
     void setOperation(DecryptVerifyOperation operation);
     void setVerificationMode(VerificationMode vm);
     void setProtocol(GpgME::Protocol protocol);
 
     void setSessionId(unsigned int id);
 
     void start();
 
 public Q_SLOTS:
     void cancel();
 
 Q_SIGNALS:
     void verificationResult(const GpgME::VerificationResult &);
 
 private:
     void doTaskDone(const Task *task, const std::shared_ptr<const Task::Result> &result) override;
 
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotWizardCanceled())
     Q_PRIVATE_SLOT(d, void schedule())
 };
 
 } //namespace Crypto
 } //namespace Kleo
 
 Q_DECLARE_METATYPE(GpgME::VerificationResult)
 
diff --git a/src/crypto/decryptverifyfilescontroller.h b/src/crypto/decryptverifyfilescontroller.h
index f2084155a..38f60cdf1 100644
--- a/src/crypto/decryptverifyfilescontroller.h
+++ b/src/crypto/decryptverifyfilescontroller.h
@@ -1,71 +1,68 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     decryptverifyfilescontroller.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include "crypto/controller.h"
 
 #include "utils/types.h"
 #include "utils/archivedefinition.h"
 
 #include <QMetaType>
 
 #include <memory>
 #include <vector>
 
-namespace GpgME
-{
-class VerificationResult;
-}
+#include <gpgme++/verificationresult.h>
 
 namespace Kleo
 {
 namespace Crypto
 {
 
 class DecryptVerifyFilesController : public Controller
 {
     Q_OBJECT
 public:
     explicit DecryptVerifyFilesController(QObject *parent = nullptr);
     explicit DecryptVerifyFilesController(const std::shared_ptr<const ExecutionContext> &ctx, QObject *parent = nullptr);
 
     ~DecryptVerifyFilesController() override;
 
     virtual void setFiles(const QStringList &files);
     virtual void setOperation(DecryptVerifyOperation op);
     virtual DecryptVerifyOperation operation() const;
     virtual void start();
 
 public Q_SLOTS:
     virtual void cancel();
 
 protected:
     std::shared_ptr<ArchiveDefinition> pick_archive_definition(GpgME::Protocol proto,
             const std::vector< std::shared_ptr<ArchiveDefinition> > &ads, const QString &filename);
 
 Q_SIGNALS:
     void verificationResult(const GpgME::VerificationResult &);
 
 private:
     void doTaskDone(const Task *task, const std::shared_ptr<const Task::Result> &) override;
 
 private:
     class Private;
     std::shared_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotWizardOperationPrepared())
     Q_PRIVATE_SLOT(d, void slotWizardCanceled())
     Q_PRIVATE_SLOT(d, void schedule())
 };
 
 }
 }
 
 Q_DECLARE_METATYPE(GpgME::VerificationResult)