diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index f2f2b6015..b62108c40 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -21,8 +21,7 @@
 
 using namespace QXmpp::Private;
 
-struct field_type
-{
+struct field_type {
     QXmppDataForm::Field::Type type;
     const char *str;
 };
diff --git a/src/base/QXmppError.h b/src/base/QXmppError.h
index 1433bb8f1..03cc678a1 100644
--- a/src/base/QXmppError.h
+++ b/src/base/QXmppError.h
@@ -14,8 +14,7 @@ class QFileDevice;
 class QIODevice;
 class QNetworkReply;
 
-struct QXMPP_EXPORT QXmppError
-{
+struct QXMPP_EXPORT QXmppError {
     QString description;
     std::any error;
 
diff --git a/src/base/QXmppFutureUtils_p.h b/src/base/QXmppFutureUtils_p.h
index 818b04372..8925a6c06 100644
--- a/src/base/QXmppFutureUtils_p.h
+++ b/src/base/QXmppFutureUtils_p.h
@@ -29,8 +29,7 @@ namespace QXmpp::Private {
 
 // helper for std::visit
 template<class... Ts>
-struct overloaded : Ts...
-{
+struct overloaded : Ts... {
     using Ts::operator()...;
 };
 // explicit deduction guide (not needed as of C++20)
@@ -59,8 +58,7 @@ template<typename F, typename Ret, typename A, typename... Rest>
 A lambda_helper(Ret (F::*)(A, Rest...) const);
 
 template<typename F>
-struct first_argument
-{
+struct first_argument {
     using type = decltype(lambda_helper(&F::operator()));
 };
 
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index 74f2b5991..e7d4da4b0 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -168,18 +168,14 @@ enum Cipher {
 ///
 /// \since QXmpp 1.5
 ///
-struct Success
-{
-};
+struct Success { };
 
 ///
 /// Unit struct used to indicate that a process has been cancelled.
 ///
 /// \since QXmpp 1.5
 ///
-struct Cancelled
-{
-};
+struct Cancelled { };
 
 }  // namespace QXmpp
 
diff --git a/src/base/QXmppHashing.cpp b/src/base/QXmppHashing.cpp
index d28ab7251..ece922a28 100644
--- a/src/base/QXmppHashing.cpp
+++ b/src/base/QXmppHashing.cpp
@@ -216,8 +216,7 @@ HashingResult calculateHashesSync(std::unique_ptr<QIODevice> data, std::vector<Q
     return { std::move(results), std::move(data) };
 }
 
-struct BufferReader : public QRunnable
-{
+struct BufferReader : public QRunnable {
     BufferReader(HashGenerator &creator)
         : generator(creator)
     {
@@ -230,8 +229,7 @@ struct BufferReader : public QRunnable
     HashGenerator &generator;
 };
 
-struct HashProcessor : public QRunnable
-{
+struct HashProcessor : public QRunnable {
     HashProcessor(HashGenerator *generator, QCryptographicHash::Algorithm algorithm)
         : generator(generator),
           hash(std::make_unique<QCryptographicHash>(algorithm)),
diff --git a/src/base/QXmppHashing_p.h b/src/base/QXmppHashing_p.h
index aa8566b2a..cc1e4fbcc 100644
--- a/src/base/QXmppHashing_p.h
+++ b/src/base/QXmppHashing_p.h
@@ -21,8 +21,7 @@ class QXmppHash;
 
 namespace QXmpp::Private {
 
-struct HashingResult
-{
+struct HashingResult {
     using Result = std::variant<std::vector<QXmppHash>, Cancelled, QXmppError>;
 
     HashingResult(Result result, std::unique_ptr<QIODevice> data)
@@ -34,17 +33,10 @@ struct HashingResult
     std::unique_ptr<QIODevice> data;
 };
 
-struct HashVerificationResult
-{
-    struct NoStrongHashes
-    {
-    };
-    struct NotMatching
-    {
-    };
-    struct Verified
-    {
-    };
+struct HashVerificationResult {
+    struct NoStrongHashes { };
+    struct NotMatching { };
+    struct Verified { };
     using Result = std::variant<NoStrongHashes, NotMatching, Verified, Cancelled, QXmppError>;
 
     HashVerificationResult(Result result, std::unique_ptr<QIODevice> data)
diff --git a/src/base/QXmppJingleData.h b/src/base/QXmppJingleData.h
index 8fb41f66d..1a473f936 100644
--- a/src/base/QXmppJingleData.h
+++ b/src/base/QXmppJingleData.h
@@ -434,20 +434,10 @@ class QXMPP_EXPORT QXmppJingleIq : public QXmppIq
         Responder
     };
 
-    struct RtpSessionStateActive
-    {
-    };
-
-    struct RtpSessionStateHold
-    {
-    };
-
-    struct RtpSessionStateUnhold
-    {
-    };
-
-    struct RtpSessionStateMuting
-    {
+    struct RtpSessionStateActive { };
+    struct RtpSessionStateHold { };
+    struct RtpSessionStateUnhold { };
+    struct RtpSessionStateMuting {
         /// True when temporarily not sending media to the other party but continuing to accept
         /// media from it, false for ending mute state
         bool isMute = true;
@@ -456,10 +446,7 @@ class QXMPP_EXPORT QXmppJingleIq : public QXmppIq
         /// Session to be muted (e.g., only audio or video)
         QString name;
     };
-
-    struct RtpSessionStateRinging
-    {
-    };
+    struct RtpSessionStateRinging { };
 
     using RtpSessionState = std::variant<RtpSessionStateActive, RtpSessionStateHold, RtpSessionStateUnhold, RtpSessionStateMuting, RtpSessionStateRinging>;
 
@@ -670,8 +657,7 @@ class QXMPP_EXPORT QXmppCallInviteElement
         Left
     };
 
-    struct Jingle
-    {
+    struct Jingle {
         QString sid;
         std::optional<QString> jid;
 
@@ -681,8 +667,7 @@ class QXMPP_EXPORT QXmppCallInviteElement
         void toXml(QXmlStreamWriter *writer) const;
     };
 
-    struct External
-    {
+    struct External {
         QString uri;
 
         bool operator==(const External &other) const { return other.uri == uri; }
diff --git a/src/base/QXmppPubSubIq_p.h b/src/base/QXmppPubSubIq_p.h
index d4e6100fc..e94ebeb09 100644
--- a/src/base/QXmppPubSubIq_p.h
+++ b/src/base/QXmppPubSubIq_p.h
@@ -7,14 +7,13 @@
 #define QXMPPPUBSUBIQ_H
 
 #include "QXmppIq.h"
+#include "QXmppPubSubBaseItem.h"
 
 #include <optional>
 
 #include <QDomElement>
 #include <QSharedDataPointer>
 
-#include "QXmppPubSubBaseItem.h"
-
 class QXmppDataForm;
 class QXmppPubSubSubscription;
 class QXmppPubSubAffiliation;
diff --git a/src/base/QXmppPubSubMetadata.cpp b/src/base/QXmppPubSubMetadata.cpp
index f30a35ee3..83dffa441 100644
--- a/src/base/QXmppPubSubMetadata.cpp
+++ b/src/base/QXmppPubSubMetadata.cpp
@@ -8,8 +8,7 @@
 
 // helper for std::visit
 template<class... Ts>
-struct overloaded : Ts...
-{
+struct overloaded : Ts... {
     using Ts::operator()...;
 };
 // explicit deduction guide (not needed as of C++20)
diff --git a/src/base/QXmppPubSubMetadata.h b/src/base/QXmppPubSubMetadata.h
index fd9b8321d..625b29d40 100644
--- a/src/base/QXmppPubSubMetadata.h
+++ b/src/base/QXmppPubSubMetadata.h
@@ -15,12 +15,8 @@ class QXmppPubSubMetadataPrivate;
 class QXMPP_EXPORT QXmppPubSubMetadata : public QXmppExtensibleDataFormBase
 {
 public:
-    struct Unset
-    {
-    };
-    struct Max
-    {
-    };
+    struct Unset { };
+    struct Max { };
     using ItemLimit = std::variant<Unset, quint64, Max>;
 
     QXmppPubSubMetadata();
diff --git a/src/base/QXmppPubSubNodeConfig.cpp b/src/base/QXmppPubSubNodeConfig.cpp
index 2703b3984..bae1c8cb7 100644
--- a/src/base/QXmppPubSubNodeConfig.cpp
+++ b/src/base/QXmppPubSubNodeConfig.cpp
@@ -43,8 +43,7 @@ static const auto PAYLOAD_TYPE = QStringLiteral("pubsub#type");
 
 // helper for std::visit
 template<class... Ts>
-struct overloaded : Ts...
-{
+struct overloaded : Ts... {
     using Ts::operator()...;
 };
 // explicit deduction guide (not needed as of C++20)
diff --git a/src/base/QXmppPubSubNodeConfig.h b/src/base/QXmppPubSubNodeConfig.h
index 383b59eeb..52cfd2f6b 100644
--- a/src/base/QXmppPubSubNodeConfig.h
+++ b/src/base/QXmppPubSubNodeConfig.h
@@ -15,12 +15,8 @@ class QXmppPubSubNodeConfigPrivate;
 class QXMPP_EXPORT QXmppPubSubNodeConfig : public QXmppExtensibleDataFormBase
 {
 public:
-    struct Unset
-    {
-    };
-    struct Max
-    {
-    };
+    struct Unset { };
+    struct Max { };
     using ItemLimit = std::variant<Unset, uint64_t, Max>;
 
     enum AccessModel : uint8_t {
diff --git a/src/base/QXmppSendResult.h b/src/base/QXmppSendResult.h
index 451387ac2..fbc597fcb 100644
--- a/src/base/QXmppSendResult.h
+++ b/src/base/QXmppSendResult.h
@@ -30,8 +30,7 @@ enum class SendError : uint8_t {
 ///
 /// \since QXmpp 1.5
 ///
-struct SendSuccess
-{
+struct SendSuccess {
     /// Indicates whether the packet has been acknowledged by the other peer.
     bool acknowledged = false;
 };
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index 03bb60c4a..10f7376b3 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -29,8 +29,7 @@
 
 using namespace QXmpp::Private;
 
-struct IqState
-{
+struct IqState {
     QXmppPromise<QXmppStream::IqResult> interface;
     QString jid;
 };
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 4ce3299f3..49545c8e5 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -1800,8 +1800,7 @@ QXmppIcePrivate::QXmppIcePrivate()
     tieBreaker = QXmppUtils::generateRandomBytes(8);
 }
 
-struct QXmppIceTransportDetails
-{
+struct QXmppIceTransportDetails {
     QXmppIceTransport *transport;
     QHostAddress stunHost;
     quint16 stunPort;
diff --git a/src/base/QXmppTask.cpp b/src/base/QXmppTask.cpp
index c17a6e4f5..7f851d4f6 100644
--- a/src/base/QXmppTask.cpp
+++ b/src/base/QXmppTask.cpp
@@ -8,8 +8,7 @@
 
 namespace QXmpp::Private {
 
-struct TaskData
-{
+struct TaskData {
     QPointer<QObject> context;
     std::function<void(TaskPrivate &, void *)> continuation;
     void *result = nullptr;
diff --git a/src/base/QXmppUtils_p.h b/src/base/QXmppUtils_p.h
index d817a9cee..cd38bd2e4 100644
--- a/src/base/QXmppUtils_p.h
+++ b/src/base/QXmppUtils_p.h
@@ -72,17 +72,13 @@ bool isIqType(const QDomElement &, QStringView tagName, QStringView xmlns);
 QDomElement firstChildElement(const QDomElement &, QStringView tagName = {}, QStringView xmlNs = {});
 QDomElement nextSiblingElement(const QDomElement &, QStringView tagName = {}, QStringView xmlNs = {});
 
-struct DomChildElements
-{
+struct DomChildElements {
     QDomElement parent;
     QStringView tagName;
     QStringView namespaceUri;
 
-    struct EndIterator
-    {
-    };
-    struct Iterator
-    {
+    struct EndIterator { };
+    struct Iterator {
         Iterator operator++()
         {
             el = nextSiblingElement(el, tagName, namespaceUri);
diff --git a/src/client/QXmppAtmTrustMemoryStorage.cpp b/src/client/QXmppAtmTrustMemoryStorage.cpp
index 04c8c7475..214d96509 100644
--- a/src/client/QXmppAtmTrustMemoryStorage.cpp
+++ b/src/client/QXmppAtmTrustMemoryStorage.cpp
@@ -22,8 +22,7 @@ using namespace QXmpp::Private;
 /// \since QXmpp 1.5
 ///
 
-struct UnprocessedKey
-{
+struct UnprocessedKey {
     QByteArray id;
     QString ownerJid;
     QByteArray senderKeyId;
diff --git a/src/client/QXmppAttentionManager.cpp b/src/client/QXmppAttentionManager.cpp
index 83d3df075..483d27ea0 100644
--- a/src/client/QXmppAttentionManager.cpp
+++ b/src/client/QXmppAttentionManager.cpp
@@ -57,8 +57,7 @@
 /// rate limiter.
 ///
 
-struct PastRequest
-{
+struct PastRequest {
     QString bareJid;
     QDateTime timestamp;
 };
diff --git a/src/client/QXmppBlockingManager.cpp b/src/client/QXmppBlockingManager.cpp
index 83548d147..d5cf2c62e 100644
--- a/src/client/QXmppBlockingManager.cpp
+++ b/src/client/QXmppBlockingManager.cpp
@@ -124,8 +124,7 @@ class UnblockIq : public QXmppIq
 };
 
 // Manager data
-struct QXmppBlockingManagerPrivate
-{
+struct QXmppBlockingManagerPrivate {
     std::optional<QVector<QString>> blocklist;
     std::vector<QXmppPromise<QXmppBlockingManager::BlocklistResult>> openFetchBlocklistPromises;
 };
diff --git a/src/client/QXmppBlockingManager.h b/src/client/QXmppBlockingManager.h
index 85c112c3a..dc0da81ce 100644
--- a/src/client/QXmppBlockingManager.h
+++ b/src/client/QXmppBlockingManager.h
@@ -9,25 +9,21 @@
 #include "QXmppError.h"
 #include "QXmppTask.h"
 
-#include <QVector>
-
 #include <variant>
 
+#include <QVector>
+
 struct QXmppBlockingManagerPrivate;
 
 class QXMPP_EXPORT QXmppBlocklist
 {
 public:
-    struct NotBlocked
-    {
-    };
-    struct Blocked
-    {
+    struct NotBlocked { };
+    struct Blocked {
         QVector<QString> blockingEntries;
         QVector<QString> partiallyBlockingEntries;
     };
-    struct PartiallyBlocked
-    {
+    struct PartiallyBlocked {
         QVector<QString> partiallyBlockingEntries;
     };
 
diff --git a/src/client/QXmppCallInviteManager.h b/src/client/QXmppCallInviteManager.h
index 60c84ee18..9f5569814 100644
--- a/src/client/QXmppCallInviteManager.h
+++ b/src/client/QXmppCallInviteManager.h
@@ -20,15 +20,9 @@ class QXMPP_EXPORT QXmppCallInvite : public QObject
 {
     Q_OBJECT
 public:
-    struct Rejected
-    {
-    };
-    struct Retracted
-    {
-    };
-    struct Left
-    {
-    };
+    struct Rejected { };
+    struct Retracted { };
+    struct Left { };
 
     using Result = std::variant<Rejected, Retracted, Left, QXmppError>;
 
diff --git a/src/client/QXmppCall_p.h b/src/client/QXmppCall_p.h
index 83cd2635a..8b2f3e5c0 100644
--- a/src/client/QXmppCall_p.h
+++ b/src/client/QXmppCall_p.h
@@ -29,8 +29,7 @@ class QXmppCallPrivate : public QObject
 {
     Q_OBJECT
 public:
-    struct GstCodec
-    {
+    struct GstCodec {
         int pt;
         QString name;
         int channels;
@@ -39,8 +38,7 @@ class QXmppCallPrivate : public QObject
         QString gstDepay;
         QString gstEnc;
         QString gstDec;
-        struct Property
-        {
+        struct Property {
             QString name;
             int value;
         };
diff --git a/src/client/QXmppE2eeExtension.h b/src/client/QXmppE2eeExtension.h
index 70038f054..b0defd8b8 100644
--- a/src/client/QXmppE2eeExtension.h
+++ b/src/client/QXmppE2eeExtension.h
@@ -22,9 +22,7 @@ class QXmppTask;
 class QXmppE2eeExtension : public QXmppExtension
 {
 public:
-    struct NotEncrypted
-    {
-    };
+    struct NotEncrypted { };
 
     using MessageEncryptResult = std::variant<std::unique_ptr<QXmppMessage>, QXmppError>;
     using MessageDecryptResult = std::variant<QXmppMessage, NotEncrypted, QXmppError>;
diff --git a/src/client/QXmppFileSharingManager.h b/src/client/QXmppFileSharingManager.h
index fdcf6f54b..ae040193f 100644
--- a/src/client/QXmppFileSharingManager.h
+++ b/src/client/QXmppFileSharingManager.h
@@ -34,8 +34,7 @@ class QXMPP_EXPORT QXmppFileUpload : public QObject
     /// Progress of the file upload between 0.0 and 1.0.
     Q_PROPERTY(float progress READ progress NOTIFY progressChanged)
 public:
-    struct FileResult
-    {
+    struct FileResult {
         QXmppFileShare fileShare;
         QXmppBitsOfBinaryDataList dataBlobs;
     };
@@ -85,8 +84,7 @@ class QXMPP_EXPORT QXmppFileDownload : public QObject
         HashVerified,
     };
 
-    struct Downloaded
-    {
+    struct Downloaded {
         HashVerificationResult hashVerificationResult;
     };
 
@@ -120,16 +118,14 @@ Q_DECLARE_METATYPE(QXmppFileDownload::Result);
 class QXMPP_EXPORT QXmppFileSharingManager : public QXmppClientExtension
 {
 public:
-    struct MetadataThumbnail
-    {
+    struct MetadataThumbnail {
         uint32_t width;
         uint32_t height;
         QByteArray data;
         QMimeType mimeType;
     };
 
-    struct MetadataGeneratorResult
-    {
+    struct MetadataGeneratorResult {
         std::optional<QSize> dimensions;
         std::optional<uint32_t> length;
         QVector<MetadataThumbnail> thumbnails;
diff --git a/src/client/QXmppHttpFileSharingProvider.cpp b/src/client/QXmppHttpFileSharingProvider.cpp
index 8fc9ec517..e7b2cdc52 100644
--- a/src/client/QXmppHttpFileSharingProvider.cpp
+++ b/src/client/QXmppHttpFileSharingProvider.cpp
@@ -51,8 +51,7 @@ auto QXmppHttpFileSharingProvider::downloadFile(const std::any &source,
                                                 std::function<void(DownloadResult)> reportFinished)
     -> std::shared_ptr<Download>
 {
-    struct State : Download
-    {
+    struct State : Download {
         ~State() override = default;
 
         std::unique_ptr<QIODevice> output;
@@ -135,8 +134,7 @@ auto QXmppHttpFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
                                               std::function<void(UploadResult)> reportFinished)
     -> std::shared_ptr<Upload>
 {
-    struct State : Upload
-    {
+    struct State : Upload {
         ~State() override = default;
 
         std::shared_ptr<QXmppHttpUpload> upload;
diff --git a/src/client/QXmppHttpUploadManager.cpp b/src/client/QXmppHttpUploadManager.cpp
index cdcf3544e..cf52d03ce 100644
--- a/src/client/QXmppHttpUploadManager.cpp
+++ b/src/client/QXmppHttpUploadManager.cpp
@@ -20,8 +20,7 @@
 using namespace QXmpp;
 using namespace QXmpp::Private;
 
-struct QXmppHttpUploadPrivate
-{
+struct QXmppHttpUploadPrivate {
     explicit QXmppHttpUploadPrivate(QXmppHttpUpload *q) : q(q) { }
 
     QUrl getUrl;
@@ -205,8 +204,7 @@ QXmppHttpUpload::QXmppHttpUpload()
 {
 }
 
-struct QXmppHttpUploadManagerPrivate
-{
+struct QXmppHttpUploadManagerPrivate {
     explicit QXmppHttpUploadManagerPrivate(QNetworkAccessManager *netManager)
         : netManager(netManager)
     {
diff --git a/src/client/QXmppJingleMessageInitiationManager.h b/src/client/QXmppJingleMessageInitiationManager.h
index 25ccd7640..770acb405 100644
--- a/src/client/QXmppJingleMessageInitiationManager.h
+++ b/src/client/QXmppJingleMessageInitiationManager.h
@@ -21,20 +21,17 @@ class QXMPP_EXPORT QXmppJingleMessageInitiation : public QObject
 {
     Q_OBJECT
 public:
-    struct Rejected
-    {
+    struct Rejected {
         std::optional<QXmppJingleReason> reason;
         bool containsTieBreak;
     };
 
-    struct Retracted
-    {
+    struct Retracted {
         std::optional<QXmppJingleReason> reason;
         bool containsTieBreak;
     };
 
-    struct Finished
-    {
+    struct Finished {
         std::optional<QXmppJingleReason> reason;
         QString migratedTo;
     };
diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp
index f45cce36a..ca3b307b6 100644
--- a/src/client/QXmppMamManager.cpp
+++ b/src/client/QXmppMamManager.cpp
@@ -38,8 +38,7 @@ auto sum(const T &c)
     return std::accumulate(c.begin(), c.end(), 0);
 }
 
-struct MamMessage
-{
+struct MamMessage {
     QDomElement element;
     std::optional<QDateTime> delay;
 };
@@ -87,8 +86,7 @@ std::optional<std::tuple<MamMessage, QString>> parseMamMessageResult(const QDomE
     return { { MamMessage { messageElement, parseDelay(forwardedElement) }, queryId } };
 }
 
-struct RetrieveRequestState
-{
+struct RetrieveRequestState {
     QXmppPromise<QXmppMamManager::RetrieveResult> promise;
     QXmppMamResultIq iq;
     QVector<MamMessage> messages;
diff --git a/src/client/QXmppMamManager.h b/src/client/QXmppMamManager.h
index 548d56d62..ac7d10b99 100644
--- a/src/client/QXmppMamManager.h
+++ b/src/client/QXmppMamManager.h
@@ -40,8 +40,7 @@ class QXMPP_EXPORT QXmppMamManager : public QXmppClientExtension
     Q_OBJECT
 
 public:
-    struct QXMPP_EXPORT RetrievedMessages
-    {
+    struct QXMPP_EXPORT RetrievedMessages {
         QXmppMamResultIq result;
         QVector<QXmppMessage> messages;
     };
diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h
index 154f585d4..1a446ec77 100644
--- a/src/client/QXmppPubSubManager.h
+++ b/src/client/QXmppPubSubManager.h
@@ -41,13 +41,10 @@ class QXMPP_EXPORT QXmppPubSubManager : public QXmppClientExtension
     ///
     /// Used to indicate a service type mismatch.
     ///
-    struct InvalidServiceType
-    {
-    };
+    struct InvalidServiceType { };
 
     template<typename T>
-    struct Items
-    {
+    struct Items {
         QVector<T> items;
         std::optional<QXmppResultSetReply> continuation;
     };
diff --git a/src/client/QXmppRemoteMethod.h b/src/client/QXmppRemoteMethod.h
index aad4f90a7..b555f540c 100644
--- a/src/client/QXmppRemoteMethod.h
+++ b/src/client/QXmppRemoteMethod.h
@@ -12,8 +12,7 @@
 
 class QXmppClient;
 
-struct QXmppRemoteMethodResult
-{
+struct QXmppRemoteMethodResult {
     QXmppRemoteMethodResult() : hasError(false), code(0) { }
     bool hasError;
     int code;
diff --git a/src/client/QXmppTrustMemoryStorage.cpp b/src/client/QXmppTrustMemoryStorage.cpp
index 29762bb0c..50aac23f3 100644
--- a/src/client/QXmppTrustMemoryStorage.cpp
+++ b/src/client/QXmppTrustMemoryStorage.cpp
@@ -22,8 +22,7 @@ using namespace QXmpp::Private;
 /// \since QXmpp 1.5
 ///
 
-struct Key
-{
+struct Key {
     QByteArray id;
     QString ownerJid;
     TrustLevel trustLevel;
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 924104b79..c23a8199d 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -570,8 +570,7 @@ void Manager::setMaximumDevicesPerStanza(int maximum)
 QXmppTask<QVector<Manager::DevicesResult>> Manager::requestDeviceLists(const QList<QString> &jids)
 {
     if (const auto jidsCount = jids.size()) {
-        struct State
-        {
+        struct State {
             int processed = 0;
             int jidsCount = 0;
             QXmppPromise<QVector<Manager::DevicesResult>> interface;
@@ -618,8 +617,7 @@ QXmppTask<QVector<Manager::DevicesResult>> Manager::requestDeviceLists(const QLi
 QXmppTask<QVector<Manager::DevicesResult>> Manager::subscribeToDeviceLists(const QList<QString> &jids)
 {
     if (const auto jidsCount = jids.size()) {
-        struct State
-        {
+        struct State {
             int processed = 0;
             int jidsCount = 0;
             QXmppPromise<QVector<Manager::DevicesResult>> interface;
diff --git a/src/omemo/QXmppOmemoManager.h b/src/omemo/QXmppOmemoManager.h
index 34cbc9273..c0330de32 100644
--- a/src/omemo/QXmppOmemoManager.h
+++ b/src/omemo/QXmppOmemoManager.h
@@ -72,8 +72,7 @@ class QXMPPOMEMO_EXPORT QXmppOmemoManager : public QXmppClientExtension, public
 public:
     using Result = std::variant<QXmpp::Success, QXmppError>;
 
-    struct DevicesResult
-    {
+    struct DevicesResult {
         QString jid;
         Result result;
     };
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index b8ee578ea..d55933ddc 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -3104,8 +3104,7 @@ QXmppTask<QVector<Manager::DevicesResult>> ManagerPrivate::unsubscribeFromDevice
         return makeReadyTask(QVector<Manager::DevicesResult>());
     }
 
-    struct State
-    {
+    struct State {
         int processed = 0;
         int jidsCount = 0;
         QXmppPromise<QVector<Manager::DevicesResult>> interface;
diff --git a/src/omemo/QXmppOmemoManager_p.h b/src/omemo/QXmppOmemoManager_p.h
index e2a610998..9249430ac 100644
--- a/src/omemo/QXmppOmemoManager_p.h
+++ b/src/omemo/QXmppOmemoManager_p.h
@@ -100,20 +100,17 @@ constexpr uint32_t PAYLOAD_AUTHENTICATION_KEY_SIZE = 32;
 constexpr uint32_t SCE_RPAD_SIZE_MIN = 0;
 constexpr uint32_t SCE_RPAD_SIZE_MAX = 200;
 
-struct PayloadEncryptionResult
-{
+struct PayloadEncryptionResult {
     QCA::SecureArray decryptionData;
     QByteArray encryptedPayload;
 };
 
-struct DecryptionResult
-{
+struct DecryptionResult {
     QDomElement sceContent;
     QXmppE2eeMetadata e2eeMetadata;
 };
 
-struct IqDecryptionResult
-{
+struct IqDecryptionResult {
     QDomElement iq;
     QXmppE2eeMetadata e2eeMetadata;
 };
diff --git a/src/omemo/QXmppOmemoStorage.h b/src/omemo/QXmppOmemoStorage.h
index 3049c0df8..2d0479e1d 100644
--- a/src/omemo/QXmppOmemoStorage.h
+++ b/src/omemo/QXmppOmemoStorage.h
@@ -19,8 +19,7 @@ class QXMPPOMEMO_EXPORT QXmppOmemoStorage
     ///
     /// Contains the data of this client instance's OMEMO device.
     ///
-    struct OwnDevice
-    {
+    struct OwnDevice {
         ///
         /// ID used to identify a device and fetch its bundle
         ///
@@ -68,8 +67,7 @@ class QXMPPOMEMO_EXPORT QXmppOmemoStorage
     /// That includes another own device (i.e., not this client instance's one)
     /// or a contact's device.
     ///
-    struct Device
-    {
+    struct Device {
         ///
         /// Human-readable string used to identify the device by users
         ///
@@ -113,8 +111,7 @@ class QXMPPOMEMO_EXPORT QXmppOmemoStorage
     ///
     /// Contains the data needed to manage an OMEMO signed pre key pair.
     ///
-    struct SignedPreKeyPair
-    {
+    struct SignedPreKeyPair {
         ///
         /// Date when the signed pre key pair was created
         ///
@@ -129,8 +126,7 @@ class QXMPPOMEMO_EXPORT QXmppOmemoStorage
     ///
     /// Contains all OMEMO data.
     ///
-    struct OmemoData
-    {
+    struct OmemoData {
         ///
         /// Device of this client instance
         ///
diff --git a/tests/qxmppentitytimemanager/tst_qxmppentitytimemanager.cpp b/tests/qxmppentitytimemanager/tst_qxmppentitytimemanager.cpp
index a76a628d3..6cdabb6c5 100644
--- a/tests/qxmppentitytimemanager/tst_qxmppentitytimemanager.cpp
+++ b/tests/qxmppentitytimemanager/tst_qxmppentitytimemanager.cpp
@@ -40,7 +40,7 @@ void tst_QXmppEntityTimeManager::testSendRequest()
 
     QCOMPARE(spy.size(), 1);
     auto time = spy.at(0).at(0).value<QXmppEntityTimeIq>();
-    QCOMPARE(time.utc(), QDateTime({2006, 12, 19}, {17, 58, 35}, Qt::UTC));
+    QCOMPARE(time.utc(), QDateTime({ 2006, 12, 19 }, { 17, 58, 35 }, Qt::UTC));
     QCOMPARE(time.tzo(), -6 * 60 * 60);
 }
 
@@ -59,7 +59,7 @@ void tst_QXmppEntityTimeManager::testHandleRequest()
     QVERIFY(QXmppEntityTimeIq::isEntityTimeIq(packet));
     QXmppEntityTimeIq resp;
     resp.parse(packet);
-    
+
     QCOMPARE(resp.id(), QStringLiteral("time_1"));
     QCOMPARE(resp.type(), QXmppIq::Result);
 }
diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
index 731476082..467fbb017 100644
--- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
+++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
@@ -24,8 +24,7 @@
 using namespace QXmpp;
 using namespace QXmpp::Private;
 
-struct OmemoUser
-{
+struct OmemoUser {
     QXmppClient client;
     QXmppLogger logger;
     QXmppOmemoManager *manager;
diff --git a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
index 2fef85cbe..a536001c0 100644
--- a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
+++ b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
@@ -51,8 +51,7 @@ class TestEventManager : public QXmppClientExtension, public QXmppPubSubEventHan
     uint m_events = 0;
 };
 
-struct Client
-{
+struct Client {
     Client() { }
     Client(const QString &jid)
     {
diff --git a/tests/qxmppversionmanager/tst_qxmppversionmanager.cpp b/tests/qxmppversionmanager/tst_qxmppversionmanager.cpp
index b28d0de25..e16fd29e1 100644
--- a/tests/qxmppversionmanager/tst_qxmppversionmanager.cpp
+++ b/tests/qxmppversionmanager/tst_qxmppversionmanager.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppVersionManager.h"
 #include "QXmppVersionIq.h"
+#include "QXmppVersionManager.h"
 
 #include "TestClient.h"