From a05ac621bf2cf7098ef6a549ae84abe76adce0ce Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 10 Apr 2024 15:58:46 +0200
Subject: [PATCH] do some header includes clean-up as recommended by compiler

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---
 src/gui/accountstate.cpp                     |  2 ++
 src/gui/creds/webflowcredentials.cpp         | 18 +++++++++---------
 src/gui/editlocallymanager.cpp               |  1 +
 src/gui/tray/talkreply.cpp                   |  2 ++
 src/libsync/abstractnetworkjob.h             |  6 ++++--
 src/libsync/account.h                        | 14 ++++++++------
 src/libsync/clientsideencryption.h           |  7 ++++---
 src/libsync/encryptedfoldermetadatahandler.h |  5 +++++
 8 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index c76754bf3b..0be637f6d8 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -13,6 +13,7 @@
  */
 
 #include "accountstate.h"
+
 #include "accountmanager.h"
 #include "remotewipe.h"
 #include "account.h"
@@ -23,6 +24,7 @@
 #include "ocsnavigationappsjob.h"
 #include "ocsuserstatusconnector.h"
 #include "pushnotifications.h"
+#include "networkjobs.h"
 
 #include <QSettings>
 #include <QTimer>
diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp
index 82fb78bd7c..830070754f 100644
--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@@ -2,6 +2,15 @@
 
 #include "creds/httpcredentials.h"
 #include "creds/keychainchunk.h"
+#include "accessmanager.h"
+#include "account.h"
+#include "configfile.h"
+#include "theme.h"
+#ifdef WITH_WEBENGINE
+#include "wizard/webview.h"
+#endif // WITH_WEBENGINE
+#include "webflowcredentialsdialog.h"
+#include "networkjobs.h"
 
 #include <QAuthenticator>
 #include <QNetworkAccessManager>
@@ -12,15 +21,6 @@
 #include <QVBoxLayout>
 #include <QLabel>
 
-#include "accessmanager.h"
-#include "account.h"
-#include "configfile.h"
-#include "theme.h"
-#ifdef WITH_WEBENGINE
-#include "wizard/webview.h"
-#endif // WITH_WEBENGINE
-#include "webflowcredentialsdialog.h"
-
 using namespace QKeychain;
 
 namespace OCC {
diff --git a/src/gui/editlocallymanager.cpp b/src/gui/editlocallymanager.cpp
index cd6ade7d31..8784c159b9 100644
--- a/src/gui/editlocallymanager.cpp
+++ b/src/gui/editlocallymanager.cpp
@@ -15,6 +15,7 @@
 #include "editlocallymanager.h"
 
 #include <QUrl>
+#include <QUrlQuery>
 #include <QLoggingCategory>
 
 namespace OCC {
diff --git a/src/gui/tray/talkreply.cpp b/src/gui/tray/talkreply.cpp
index 4819801cf8..732730f172 100644
--- a/src/gui/tray/talkreply.cpp
+++ b/src/gui/tray/talkreply.cpp
@@ -1,5 +1,7 @@
 #include "talkreply.h"
+
 #include "accountstate.h"
+#include "networkjobs.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/src/libsync/abstractnetworkjob.h b/src/libsync/abstractnetworkjob.h
index d7af11c2f7..814f0e8460 100644
--- a/src/libsync/abstractnetworkjob.h
+++ b/src/libsync/abstractnetworkjob.h
@@ -16,6 +16,10 @@
 #pragma once
 
 #include "owncloudlib.h"
+
+#include "accountfwd.h"
+#include "common/asserts.h"
+
 #include <QObject>
 #include <QNetworkRequest>
 #include <QNetworkReply>
@@ -23,8 +27,6 @@
 #include <QElapsedTimer>
 #include <QDateTime>
 #include <QTimer>
-#include "accountfwd.h"
-#include "common/asserts.h"
 
 class QUrl;
 
diff --git a/src/libsync/account.h b/src/libsync/account.h
index b7702e525f..ebc53dbda3 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -16,6 +16,12 @@
 #ifndef SERVERCONNECTION_H
 #define SERVERCONNECTION_H
 
+#include "capabilities.h"
+#include "clientsideencryption.h"
+#include "clientstatusreporting.h"
+#include "common/utility.h"
+#include "syncfileitem.h"
+
 #include <QByteArray>
 #include <QUrl>
 #include <QNetworkCookie>
@@ -26,17 +32,13 @@
 #include <QSslCipher>
 #include <QSslError>
 #include <QSharedPointer>
+#include <QHttpMultiPart>
+#include <QTimer>
 
 #ifndef TOKEN_AUTH_ONLY
 #include <QPixmap>
 #endif
 
-#include "capabilities.h"
-#include "clientsideencryption.h"
-#include "clientstatusreporting.h"
-#include "common/utility.h"
-#include "syncfileitem.h"
-
 #include <memory>
 
 class QSettings;
diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h
index 7c56edb7b1..f6acaa19c2 100644
--- a/src/libsync/clientsideencryption.h
+++ b/src/libsync/clientsideencryption.h
@@ -1,7 +1,10 @@
 #ifndef CLIENTSIDEENCRYPTION_H
 #define CLIENTSIDEENCRYPTION_H
 
+#include "owncloudlib.h"
+
 #include "clientsideencryptionprimitives.h"
+#include "accountfwd.h"
 
 #include <QString>
 #include <QObject>
@@ -12,12 +15,10 @@
 #include <QFile>
 #include <QVector>
 #include <QMap>
+#include <QHash>
 
 #include <openssl/evp.h>
 
-#include "accountfwd.h"
-#include "networkjobs.h"
-
 namespace QKeychain {
 class Job;
 class WritePasswordJob;
diff --git a/src/libsync/encryptedfoldermetadatahandler.h b/src/libsync/encryptedfoldermetadatahandler.h
index cb5bb1f08d..5e736d1b1f 100644
--- a/src/libsync/encryptedfoldermetadatahandler.h
+++ b/src/libsync/encryptedfoldermetadatahandler.h
@@ -14,13 +14,18 @@
 
 #pragma once
 
+#include "owncloudlib.h"
+
 #include "account.h"
 #include "rootencryptedfolderinfo.h"
+#include "common/syncjournaldb.h"
+
 #include <QHash>
 #include <QMutex>
 #include <QObject>
 #include <QSslCertificate>
 #include <QString>
+#include <QPointer>
 
 namespace OCC {
 class FolderMetadata;