Optimize includes across code base

src/sshagent/ASN1Key.cpp

@@ -18,6 +18,7 @@
 
 #include "ASN1Key.h"
 #include "BinaryStream.h"
+#include "OpenSSHKey.h"
 
 namespace
 {

src/sshagent/ASN1Key.h

@@ -19,8 +19,8 @@
 #ifndef KEEPASSXC_ASN1KEY_H
 #define KEEPASSXC_ASN1KEY_H
 
-#include "OpenSSHKey.h"
-#include <QtCore>
+class QByteArray;
+class OpenSSHKey;
 
 namespace ASN1Key
 {

src/sshagent/AgentSettingsPage.h

@@ -20,7 +20,6 @@
 #define AGENTSETTINGSPAGE_H
 
 #include "gui/ApplicationSettingsWidget.h"
-#include "gui/DatabaseTabWidget.h"
 
 class AgentSettingsPage : public ISettingsPage
 {

src/sshagent/AgentSettingsWidget.cpp

@@ -20,9 +20,6 @@
 #include "SSHAgent.h"
 #include "ui_AgentSettingsWidget.h"
 
-#include "core/Config.h"
-#include <QProcessEnvironment>
-
 AgentSettingsWidget::AgentSettingsWidget(QWidget* parent)
     : QWidget(parent)
     , m_ui(new Ui::AgentSettingsWidget())

src/sshagent/AgentSettingsWidget.h

@@ -20,6 +20,7 @@
 #define AGENTSETTINGSWIDGET_H
 
 #include <QScopedPointer>
+#include <QUuid>
 #include <QWidget>
 
 namespace Ui

src/sshagent/BinaryStream.h

@@ -20,8 +20,6 @@
 #define KEEPASSXC_BINARYSTREAM_H
 
 #include <QBuffer>
-#include <QIODevice>
-#include <QObject>
 
 class BinaryStream : QObject
 {

src/sshagent/KeeAgentSettings.cpp

@@ -17,9 +17,19 @@
  */
 
 #include "KeeAgentSettings.h"
+
+#include "OpenSSHKey.h"
 #include "core/Database.h"
+#include "core/Entry.h"
 #include "core/Tools.h"
 
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QProcessEnvironment>
+#include <QTextCodec>
+#include <QXmlStreamReader>
+
 KeeAgentSettings::KeeAgentSettings()
 {
     reset();

src/sshagent/KeeAgentSettings.h

@@ -19,11 +19,12 @@
 #ifndef KEEAGENTSETTINGS_H
 #define KEEAGENTSETTINGS_H
 
-#include "OpenSSHKey.h"
-#include "core/Entry.h"
-#include "core/EntryAttachments.h"
-#include <QXmlStreamReader>
-#include <QtCore>
+#include <QProcessEnvironment>
+
+class Entry;
+class EntryAttachments;
+class OpenSSHKey;
+class QXmlStreamReader;
 
 class KeeAgentSettings
 {

src/sshagent/OpenSSHKey.cpp

@@ -20,10 +20,8 @@
 
 #include "ASN1Key.h"
 #include "BinaryStream.h"
-#include "core/Tools.h"
 #include "crypto/SymmetricCipher.h"
 
-#include <QCryptographicHash>
 #include <QRegularExpression>
 #include <QStringList>
 

src/sshagent/SSHAgent.cpp

@@ -18,17 +18,18 @@
 
 #include "SSHAgent.h"
 
-#include "BinaryStream.h"
-#include "OpenSSHKey.h"
 #include "core/Config.h"
-#include "core/Database.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
+#include "sshagent/BinaryStream.h"
 #include "sshagent/KeeAgentSettings.h"
 
-#include <QtNetwork>
+#include <QFileInfo>
+#include <QLocalSocket>
+#include <QThread>
 
 #ifdef Q_OS_WIN
+#include <QtEndian>
 #include <windows.h>
 #endif
 

src/sshagent/SSHAgent.h

@@ -20,11 +20,11 @@
 #define KEEPASSXC_SSHAGENT_H
 
 #include <QHash>
-#include <QList>
-#include <QtCore>
 
 #include "OpenSSHKey.h"
-#include "sshagent/KeeAgentSettings.h"
+
+class KeeAgentSettings;
+class Database;
 
 class SSHAgent : public QObject
 {