Optimize includes across code base

src/autotype/AutoType.cpp

@@ -19,18 +19,15 @@
 #include "AutoType.h"
 
 #include <QApplication>
+#include <QDebug>
 #include <QPluginLoader>
-#include <QWindow>
+#include <QUrl>
 
 #include "config-keepassx.h"
 
 #include "autotype/AutoTypePlatformPlugin.h"
 #include "autotype/AutoTypeSelectDialog.h"
 #include "autotype/PickcharsDialog.h"
-#include "core/Config.h"
-#include "core/Database.h"
-#include "core/Entry.h"
-#include "core/Group.h"
 #include "core/Resources.h"
 #include "core/Tools.h"
 #include "gui/MainWindow.h"

src/autotype/AutoType.h

@@ -21,11 +21,8 @@
 
 #include <QMutex>
 #include <QObject>
-#include <QStringList>
 #include <QWidget>
 
-#include "autotype/AutoTypeMatch.h"
-
 class AutoTypeAction;
 class AutoTypeExecutor;
 class AutoTypePlatformInterface;

src/autotype/AutoTypeAction.h

@@ -19,8 +19,6 @@
 #ifndef KEEPASSX_AUTOTYPEACTION_H
 #define KEEPASSX_AUTOTYPEACTION_H
 
-#include <QChar>
-
 #include "core/Global.h"
 
 class AutoTypeExecutor;

src/autotype/AutoTypeMatch.h

@@ -20,7 +20,6 @@
 
 #include <QPair>
 #include <QPointer>
-#include <QString>
 
 class Entry;
 typedef QPair<QPointer<Entry>, QString> AutoTypeMatch;

src/autotype/AutoTypeMatchModel.cpp

@@ -20,9 +20,6 @@
 
 #include <QFont>
 
-#include "core/DatabaseIcons.h"
-#include "core/Entry.h"
-#include "core/Global.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 

src/autotype/AutoTypeMatchView.cpp

@@ -17,12 +17,8 @@
  */
 
 #include "AutoTypeMatchView.h"
+#include "AutoTypeMatchModel.h"
 
-#include "core/Entry.h"
-#include "gui/Clipboard.h"
-#include "gui/Icons.h"
-
-#include <QAction>
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QSortFilterProxyModel>

src/autotype/AutoTypeMatchView.h

@@ -22,7 +22,8 @@
 #include <QTableView>
 
 #include "autotype/AutoTypeMatch.h"
-#include "autotype/AutoTypeMatchModel.h"
+
+class AutoTypeMatchModel;
 
 class QSortFilterProxyModel;
 

src/autotype/PickcharsDialog.cpp

@@ -18,7 +18,6 @@
 #include "PickcharsDialog.h"
 #include "ui_PickcharsDialog.h"
 
-#include "core/Entry.h"
 #include "gui/Icons.h"
 
 #include <QPushButton>

src/autotype/PickcharsDialog.h

@@ -19,8 +19,6 @@
 #define KEEPASSXC_PICKCHARSDIALOG_H
 
 #include <QDialog>
-#include <QPointer>
-#include <QString>
 
 namespace Ui
 {

src/autotype/test/AutoTypeTest.h

@@ -20,7 +20,6 @@
 
 #include <QtPlugin>
 
-#include "autotype/AutoTypeAction.h"
 #include "autotype/AutoTypePlatformPlugin.h"
 #include "autotype/test/AutoTypeTestInterface.h"
 

src/autotype/xcb/AutoTypeXCB.cpp

@@ -18,6 +18,13 @@
  */
 
 #include "AutoTypeXCB.h"
+#include "core/Tools.h"
+#include "gui/osutils/nixutils/X11Funcs.h"
+
+#include <QX11Info>
+#include <X11/XKBlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XTest.h>
 
 AutoTypePlatformX11::AutoTypePlatformX11()
 {

src/autotype/xcb/AutoTypeXCB.h

@@ -23,19 +23,11 @@
 #include <QApplication>
 #include <QSet>
 #include <QWidget>
-#include <QX11Info>
 #include <QtPlugin>
 
-#include "autotype/AutoTypeAction.h"
 #include "autotype/AutoTypePlatformPlugin.h"
-#include "core/Tools.h"
-#include "gui/osutils/OSUtils.h"
-#include "gui/osutils/nixutils/X11Funcs.h"
 
 #include <X11/XKBlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/XTest.h>
-#include <xcb/xcb.h>
 
 #define N_MOD_INDICES (Mod5MapIndex + 1)
 

src/browser/BrowserAccessControlDialog.cpp

@@ -18,6 +18,7 @@
 
 #include "BrowserAccessControlDialog.h"
 #include "ui_BrowserAccessControlDialog.h"
+#include <QUrl>
 
 #include "core/Entry.h"
 

src/browser/BrowserAccessControlDialog.h

@@ -20,8 +20,7 @@
 #define BROWSERACCESSCONTROLDIALOG_H
 
 #include <QDialog>
-#include <QScopedPointer>
+#include <QTableWidget>
-#include <QTableWidgetItem>
 
 class Entry;
 

src/browser/BrowserAction.cpp

@@ -16,14 +16,17 @@
  */
 
 #include "BrowserAction.h"
+
 #include "BrowserService.h"
 #include "BrowserSettings.h"
 #include "BrowserShared.h"
 #include "config-keepassx.h"
 #include "core/Global.h"
 
+#include <QJsonArray>
 #include <QJsonDocument>
-#include <QJsonParseError>
+#include <QJsonObject>
+
 #include <botan/sodium.h>
 
 using namespace Botan::Sodium;

src/browser/BrowserAction.h

@@ -18,9 +18,10 @@
 #ifndef BROWSERACTION_H
 #define BROWSERACTION_H
 
-#include <QJsonObject>
 #include <QString>
 
+class QJsonObject;
+
 class BrowserAction
 {
 public:

src/browser/BrowserEntryConfig.cpp

@@ -17,9 +17,13 @@
  */
 
 #include "BrowserEntryConfig.h"
+
+#include "browser/Variant.h"
 #include "core/Entry.h"
-#include "core/EntryAttributes.h"
+
-#include <QtCore>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QVariant>
 
 static const char KEEPASSXCBROWSER_NAME[] = "KeePassXC-Browser Settings";
 

src/browser/BrowserEntryConfig.h

@@ -19,11 +19,9 @@
 #ifndef BROWSERENTRYCONFIG_H
 #define BROWSERENTRYCONFIG_H
 
-#include "Variant.h"
+#include <QObject>
-#include <QtCore/QObject>
+#include <QSet>
-#include <QtCore/QSet>
+#include <QString>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
 
 class Entry;
 

src/browser/BrowserEntrySaveDialog.cpp

@@ -19,7 +19,6 @@
 #include "BrowserEntrySaveDialog.h"
 #include "ui_BrowserEntrySaveDialog.h"
 
-#include "core/Database.h"
 #include "gui/DatabaseWidget.h"
 
 BrowserEntrySaveDialog::BrowserEntrySaveDialog(QWidget* parent)

src/browser/BrowserEntrySaveDialog.h

@@ -21,9 +21,7 @@
 
 #include "gui/DatabaseTabWidget.h"
 
-#include <QDialog>
+class QListWidgetItem;
-#include <QListWidgetItem>
-#include <QScopedPointer>
 
 class Entry;
 

src/browser/BrowserHost.cpp

@@ -16,16 +16,11 @@
  */
 
 #include "BrowserHost.h"
-#include "BrowserSettings.h"
 #include "BrowserShared.h"
 
 #include <QJsonDocument>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QMutexLocker>
-#include <QtNetwork>
-
-#include <iostream>
 
 #ifdef Q_OS_WIN
 #include <fcntl.h>
@@ -34,7 +29,6 @@
 #include <windows.h>
 #else
 #include <sys/socket.h>
-#include <sys/types.h>
 #endif
 
 BrowserHost::BrowserHost(QObject* parent)

src/browser/BrowserService.cpp

@@ -17,26 +17,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QCheckBox>
+#include "BrowserService.h"
-#include <QHostAddress>
-#include <QInputDialog>
-#include <QJsonArray>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QUuid>
 
 #include "BrowserAccessControlDialog.h"
 #include "BrowserAction.h"
 #include "BrowserEntryConfig.h"
 #include "BrowserEntrySaveDialog.h"
 #include "BrowserHost.h"
-#include "BrowserService.h"
 #include "BrowserSettings.h"
-#include "core/Database.h"
-#include "core/EntrySearcher.h"
-#include "core/Group.h"
-#include "core/Metadata.h"
-#include "core/PasswordGenerator.h"
 #include "core/Tools.h"
 #include "gui/MainWindow.h"
 #include "gui/MessageBox.h"
@@ -44,6 +32,16 @@
 #include "gui/osutils/macutils/MacUtils.h"
 #endif
 
+#include <QCheckBox>
+#include <QCryptographicHash>
+#include <QHostAddress>
+#include <QInputDialog>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QListWidget>
+#include <QProgressDialog>
+#include <QUrl>
+
 const QString BrowserService::KEEPASSXCBROWSER_NAME = QStringLiteral("KeePassXC-Browser Settings");
 const QString BrowserService::KEEPASSXCBROWSER_OLD_NAME = QStringLiteral("keepassxc-browser Settings");
 static const QString KEEPASSXCBROWSER_GROUP_NAME = QStringLiteral("KeePassXC-Browser Passwords");

src/browser/BrowserService.h

@@ -21,10 +21,6 @@
 #define BROWSERSERVICE_H
 
 #include "core/Entry.h"
-#include <QObject>
-#include <QPointer>
-#include <QSharedPointer>
-#include <QtCore>
 
 typedef QPair<QString, QString> StringPair;
 typedef QList<StringPair> StringPairList;

src/browser/BrowserSettings.cpp

@@ -21,6 +21,8 @@
 #include "core/Config.h"
 #include "core/PasswordHealth.h"
 
+#include <QJsonObject>
+
 BrowserSettings* BrowserSettings::m_instance(nullptr);
 
 BrowserSettings* BrowserSettings::instance()

src/browser/BrowserSettings.h

@@ -20,7 +20,6 @@
 #ifndef BROWSERSETTINGS_H
 #define BROWSERSETTINGS_H
 
-#include "BrowserShared.h"
 #include "NativeMessageInstaller.h"
 #include "core/PassphraseGenerator.h"
 #include "core/PasswordGenerator.h"

src/browser/BrowserSettingsWidget.cpp

@@ -20,7 +20,6 @@
 
 #include "BrowserSettings.h"
 #include "config-keepassx.h"
-#include "core/Resources.h"
 
 #include <QFileDialog>
 

src/browser/BrowserSettingsWidget.h

@@ -19,7 +19,6 @@
 #define BROWSERSETTINGSWIDGET_H
 
 #include <QPointer>
-#include <QScopedPointer>
 #include <QWidget>
 
 namespace Ui

src/browser/BrowserShared.cpp

@@ -16,12 +16,10 @@
  */
 
 #include "BrowserShared.h"
+
 #include "config-keepassx.h"
 
-#include <QCoreApplication>
-#include <QProcessEnvironment>
 #include <QStandardPaths>
-#include <QVariant>
 
 namespace BrowserShared
 {

src/browser/NativeMessageInstaller.cpp

@@ -23,9 +23,9 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
-#include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QMessageBox>
 #include <QProcessEnvironment>
 #include <QSettings>

src/browser/NativeMessageInstaller.h

@@ -20,7 +20,9 @@
 #define NATIVEMESSAGEINSTALLER_H
 
 #include "BrowserShared.h"
-#include <QJsonObject>
+#include <QtGlobal>
+
+class QJsonObject;
 
 class NativeMessageInstaller
 {

src/browser/Variant.cpp

@@ -15,7 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Variant.h"
+#include <QJsonObject>
+#include <QMetaProperty>
 
 QVariantMap qo2qv(const QObject* object, const QStringList& ignoredProperties)
 {

src/browser/Variant.h

@@ -18,7 +18,7 @@
 #ifndef VARIANT_H
 #define VARIANT_H
 
-#include <QtCore>
+#include <QVariantMap>
 
 QVariantMap qo2qv(const QObject* object,
                   const QStringList& ignoredProperties = QStringList(QString(QLatin1String("objectName"))));

src/cli/Add.cpp

@@ -19,8 +19,10 @@
 
 #include "Generate.h"
 #include "Utils.h"
-#include "core/Entry.h"
 #include "core/Group.h"
+#include "core/PasswordGenerator.h"
+
+#include <QCommandLineParser>
 
 const QCommandLineOption Add::UsernameOption = QCommandLineOption(QStringList() << "u"
                                                                                 << "username",

src/cli/AddGroup.cpp

@@ -18,9 +18,10 @@
 #include "AddGroup.h"
 
 #include "Utils.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 
+#include <QCommandLineParser>
+
 AddGroup::AddGroup()
 {
     name = QString("mkdir");

src/cli/Analyze.cpp

@@ -20,7 +20,6 @@
 #include "Utils.h"
 #include "core/Group.h"
 #include "core/HibpOffline.h"
-#include "core/Tools.h"
 
 #include <QCommandLineParser>
 #include <QFile>

src/cli/Clip.cpp

@@ -18,10 +18,11 @@
 #include "Clip.h"
 
 #include "Utils.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Tools.h"
 
+#include <QCommandLineParser>
+
 #define CLI_DEFAULT_CLIP_TIMEOUT 10
 
 const QCommandLineOption Clip::AttributeOption = QCommandLineOption(

src/cli/Close.h

@@ -18,8 +18,6 @@
 #ifndef KEEPASSXC_CLOSE_H
 #define KEEPASSXC_CLOSE_H
 
-#include <QStringList>
-
 #include "Command.h"
 
 class Close : public Command

src/cli/Command.cpp

@@ -15,8 +15,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Command.h"
-
 #include "Add.h"
 #include "AddGroup.h"
 #include "Analyze.h"
@@ -42,6 +40,7 @@
 #include "Show.h"
 #include "Utils.h"
 
+#include <QCommandLineParser>
 #include <QFileInfo>
 #include <QRegularExpression>
 

src/cli/Command.h

@@ -19,13 +19,11 @@
 #define KEEPASSXC_COMMAND_H
 
 #include <QCommandLineOption>
-#include <QCommandLineParser>
-#include <QList>
-#include <QString>
-#include <QStringList>
 
 #include "core/Database.h"
 
+class QCommandLineParser;
+
 // At the moment, there's no QT class for the positional arguments
 // like there is for the options (QCommandLineOption).
 struct CommandLineArgument

src/cli/Create.cpp

@@ -20,6 +20,7 @@
 #include "Utils.h"
 #include "keys/FileKey.h"
 
+#include <QCommandLineParser>
 #include <QFileInfo>
 
 const QCommandLineOption Create::DecryptionTimeOption =

src/cli/DatabaseCommand.cpp

@@ -16,7 +16,11 @@
  */
 
 #include "DatabaseCommand.h"
+
 #include "Utils.h"
+#include "config-keepassx.h"
+
+#include <QCommandLineParser>
 
 DatabaseCommand::DatabaseCommand()
 {

src/cli/Diceware.cpp

@@ -20,6 +20,8 @@
 #include "Utils.h"
 #include "core/PassphraseGenerator.h"
 
+#include <QCommandLineParser>
+
 const QCommandLineOption Diceware::WordCountOption =
     QCommandLineOption(QStringList() << "W"
                                      << "words",

src/cli/Edit.cpp

@@ -20,8 +20,10 @@
 #include "Add.h"
 #include "Generate.h"
 #include "Utils.h"
-#include "core/Entry.h"
 #include "core/Group.h"
+#include "core/PasswordGenerator.h"
+
+#include <QCommandLineParser>
 
 const QCommandLineOption Edit::TitleOption = QCommandLineOption(QStringList() << "t"
                                                                               << "title",

src/cli/Estimate.cpp

@@ -20,6 +20,7 @@
 #include "Utils.h"
 #include "core/PasswordHealth.h"
 
+#include <QCommandLineParser>
 #include <zxcvbn.h>
 
 const QCommandLineOption Estimate::AdvancedOption =

src/cli/Exit.h

@@ -18,9 +18,6 @@
 #ifndef KEEPASSXC_EXIT_H
 #define KEEPASSXC_EXIT_H
 
-#include <QString>
-#include <QStringList>
-
 #include "Command.h"
 
 class Exit : public Command

src/cli/Export.cpp

@@ -21,6 +21,8 @@
 #include "Utils.h"
 #include "format/CsvExporter.h"
 
+#include <QCommandLineParser>
+
 const QCommandLineOption Export::FormatOption = QCommandLineOption(
     QStringList() << "f"
                   << "format",

src/cli/Generate.cpp

@@ -17,8 +17,10 @@
 
 #include "Generate.h"
 
-#include "TextStream.h"
 #include "Utils.h"
+#include "core/PasswordGenerator.h"
+
+#include <QCommandLineParser>
 
 const QCommandLineOption Generate::PasswordLengthOption =
     QCommandLineOption(QStringList() << "L"

src/cli/Generate.h

@@ -20,7 +20,7 @@
 
 #include "Command.h"
 
-#include "core/PasswordGenerator.h"
+class PasswordGenerator;
 
 class Generate : public Command
 {

src/cli/Import.cpp

@@ -20,6 +20,7 @@
 #include "Create.h"
 #include "Utils.h"
 
+#include <QCommandLineParser>
 #include <QFileInfo>
 
 /**

src/cli/Info.cpp

@@ -21,6 +21,8 @@
 #include "core/Global.h"
 #include "core/Metadata.h"
 
+#include <QCommandLineParser>
+
 Info::Info()
 {
     name = QString("db-info");

src/cli/List.cpp

@@ -20,6 +20,8 @@
 #include "Utils.h"
 #include "core/Group.h"
 
+#include <QCommandLineParser>
+
 const QCommandLineOption List::RecursiveOption =
     QCommandLineOption(QStringList() << "R"
                                      << "recursive",

src/cli/Locate.cpp

@@ -17,9 +17,8 @@
 
 #include "Locate.h"
 
-#include <QStringList>
+#include <QCommandLineParser>
 
-#include "TextStream.h"
 #include "Utils.h"
 #include "core/Group.h"
 

src/cli/Merge.cpp

@@ -17,10 +17,11 @@
 
 #include "Merge.h"
 
-#include "TextStream.h"
 #include "Utils.h"
 #include "core/Merger.h"
 
+#include <QCommandLineParser>
+
 const QCommandLineOption Merge::SameCredentialsOption =
     QCommandLineOption(QStringList() << "s"
                                      << "same-credentials",

src/cli/Move.cpp

@@ -17,11 +17,11 @@
 
 #include "Move.h"
 
-#include "TextStream.h"
 #include "Utils.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 
+#include <QCommandLineParser>
+
 Move::Move()
 {
     name = QString("mv");

src/cli/Open.cpp

@@ -17,6 +17,8 @@
 
 #include "Open.h"
 
+#include <QCommandLineParser>
+
 Open::Open()
 {
     name = QString("open");

src/cli/Remove.cpp

@@ -17,11 +17,12 @@
 
 #include "Remove.h"
 
-#include "TextStream.h"
 #include "Utils.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 
+#include <QCommandLineParser>
+
 Remove::Remove()
 {
     name = QString("rm");

src/cli/RemoveGroup.cpp

@@ -17,11 +17,12 @@
 
 #include "RemoveGroup.h"
 
-#include "TextStream.h"
 #include "Utils.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 
+#include <QCommandLineParser>
+
 RemoveGroup::RemoveGroup()
 {
     name = QString("rmdir");

src/cli/Show.cpp

@@ -20,6 +20,8 @@
 #include "Utils.h"
 #include "core/Group.h"
 
+#include <QCommandLineParser>
+
 const QCommandLineOption Show::TotpOption = QCommandLineOption(QStringList() << "t"
                                                                              << "totp",
                                                                QObject::tr("Show the entry's current TOTP."));

src/cli/Utils.cpp

@@ -19,9 +19,7 @@
 
 #include "core/Database.h"
 #include "core/EntryAttributes.h"
-#include "keys/CompositeKey.h"
 #include "keys/FileKey.h"
-#include "keys/PasswordKey.h"
 #ifdef WITH_XC_YUBIKEY
 #include "keys/ChallengeResponseKey.h"
 #endif
@@ -35,7 +33,6 @@
 
 #include <QFileInfo>
 #include <QProcess>
-#include <QTextStream>
 
 namespace Utils
 {

src/cli/keepassxc-cli.cpp

@@ -17,10 +17,8 @@
 
 #include <QCommandLineParser>
 #include <QFileInfo>
-#include <QStringList>
 
 #include "Command.h"
-#include "DatabaseCommand.h"
 #include "Open.h"
 #include "TextStream.h"
 #include "Utils.h"

src/core/Alloc.cpp

@@ -15,10 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtGlobal>
 #include <botan/mem_ops.h>
-#include <cstdint>
-#include <cstdlib>
 #if defined(Q_OS_MACOS)
 #include <malloc/malloc.h>
 #elif defined(Q_OS_FREEBSD)

src/core/AsyncTask.h

@@ -18,7 +18,6 @@
 #ifndef KEEPASSXC_ASYNCTASK_HPP
 #define KEEPASSXC_ASYNCTASK_HPP
 
-#include <QFuture>
 #include <QFutureWatcher>
 #include <QtConcurrent>
 

src/core/Base32.cpp

@@ -23,6 +23,9 @@
 
 #include "Base32.h"
 
+#include <QHash>
+#include <QVariant>
+
 constexpr quint64 MASK_40BIT = quint64(0xF8) << 32;
 constexpr quint64 MASK_35BIT = quint64(0x7C0000000);
 constexpr quint64 MASK_25BIT = quint64(0x1F00000);

src/core/Base32.h

@@ -26,7 +26,6 @@
 
 #include <QByteArray>
 #include <QVariant>
-#include <QtCore/qglobal.h>
 
 class Base32
 {

src/core/Bootstrap.cpp

@@ -17,7 +17,6 @@
 
 #include "Bootstrap.h"
 #include "config-keepassx.h"
-#include "core/Config.h"
 #include "core/Translator.h"
 
 #ifdef Q_OS_WIN

src/core/Compare.cpp

@@ -14,4 +14,3 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "Compare.h"

src/core/Compare.h

@@ -18,8 +18,6 @@
 #ifndef KEEPASSXC_COMPARE_H
 #define KEEPASSXC_COMPARE_H
 
-#include <QDateTime>
-
 #include "core/Clock.h"
 
 enum CompareItemOption

src/core/Config.h

@@ -20,7 +20,6 @@
 #define KEEPASSX_CONFIG_H
 
 #include <QPointer>
-#include <QScopedPointer>
 #include <QVariant>
 
 class QSettings;

src/core/CsvParser.cpp

@@ -18,7 +18,7 @@
 
 #include "CsvParser.h"
 
-#include <QObject>
+#include <QFile>
 #include <QTextCodec>
 
 #include "core/Tools.h"

src/core/CsvParser.h

@@ -20,10 +20,10 @@
 #define KEEPASSX_CSVPARSER_H
 
 #include <QBuffer>
-#include <QFile>
-#include <QQueue>
 #include <QTextStream>
 
+class QFile;
+
 typedef QStringList CsvRow;
 typedef QList<CsvRow> CsvTable;
 

src/core/CustomData.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "CustomData.h"
-#include "Clock.h"
 
+#include "core/Clock.h"
 #include "core/Global.h"
 
 const QString CustomData::LastModified = QStringLiteral("_LAST_MODIFIED");

src/core/CustomData.h

@@ -20,8 +20,6 @@
 
 #include <QHash>
 #include <QObject>
-#include <QSet>
-#include <QStringList>
 
 #include "core/ModifiableObject.h"
 

src/core/Database.cpp

@@ -19,23 +19,18 @@
 #include "Database.h"
 
 #include "core/AsyncTask.h"
-#include "core/Clock.h"
 #include "core/FileWatcher.h"
 #include "core/Group.h"
-#include "core/Merger.h"
-#include "core/Metadata.h"
 #include "format/KdbxXmlReader.h"
 #include "format/KeePass2Reader.h"
 #include "format/KeePass2Writer.h"
-#include "keys/FileKey.h"
-#include "keys/PasswordKey.h"
 
-#include <QFile>
 #include <QFileInfo>
+#include <QJsonObject>
+#include <QRegularExpression>
 #include <QSaveFile>
 #include <QTemporaryFile>
 #include <QTimer>
-#include <QXmlStreamReader>
 
 QHash<QUuid, QPointer<Database>> Database::s_uuidMap;
 

src/core/Database.h

@@ -23,13 +23,11 @@
 #include <QHash>
 #include <QMutex>
 #include <QPointer>
-#include <QScopedPointer>
 #include <QTimer>
 
 #include "config-keepassx.h"
 #include "core/ModifiableObject.h"
 #include "crypto/kdf/AesKdf.h"
-#include "crypto/kdf/Kdf.h"
 #include "format/KeePass2.h"
 #include "keys/CompositeKey.h"
 #include "keys/PasswordKey.h"

src/core/DatabaseIcons.cpp

@@ -19,8 +19,6 @@
 
 #include "core/Config.h"
 #include "core/Global.h"
-#include "core/Resources.h"
-#include "gui/MainWindow.h"
 
 #include <QDir>
 #include <QImageReader>

src/core/Endian.h

@@ -19,9 +19,7 @@
 #ifndef KEEPASSX_ENDIAN_H
 #define KEEPASSX_ENDIAN_H
 
-#include <QByteArray>
 #include <QIODevice>
-#include <QSysInfo>
 #include <QtEndian>
 
 namespace Endian

src/core/Entry.cpp

@@ -15,10 +15,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "Entry.h"
 
 #include "core/Config.h"
-#include "core/Database.h"
 #include "core/DatabaseIcons.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
@@ -28,7 +28,7 @@
 
 #include <QDir>
 #include <QRegularExpression>
-#include <utility>
+#include <QUrl>
 
 const int Entry::DefaultIconNumber = 0;
 const int Entry::ResolveMaximumDepth = 10;

src/core/Entry.h

@@ -20,11 +20,7 @@
 #define KEEPASSX_ENTRY_H
 
 #include <QImage>
-#include <QMap>
-#include <QPixmap>
 #include <QPointer>
-#include <QSet>
-#include <QUrl>
 #include <QUuid>
 
 #include "core/AutoTypeAssociations.h"
@@ -32,7 +28,6 @@
 #include "core/EntryAttachments.h"
 #include "core/EntryAttributes.h"
 #include "core/Global.h"
-#include "core/ModifiableObject.h"
 #include "core/TimeInfo.h"
 
 class Database;

src/core/EntryAttachments.cpp

@@ -20,7 +20,6 @@
 #include "core/Global.h"
 
 #include <QSet>
-#include <QStringList>
 
 EntryAttachments::EntryAttachments(QObject* parent)
     : ModifiableObject(parent)

src/core/EntryAttributes.cpp

@@ -20,6 +20,9 @@
 
 #include "core/Global.h"
 
+#include <QRegularExpression>
+#include <QUuid>
+
 const QString EntryAttributes::TitleKey = "Title";
 const QString EntryAttributes::UserNameKey = "UserName";
 const QString EntryAttributes::PasswordKey = "Password";

src/core/EntryAttributes.h

@@ -21,10 +21,7 @@
 
 #include <QMap>
 #include <QObject>
-#include <QRegularExpression>
 #include <QSet>
-#include <QStringList>
-#include <QUuid>
 
 #include "core/ModifiableObject.h"
 

src/core/EntrySearcher.h

@@ -20,7 +20,6 @@
 #define KEEPASSX_ENTRYSEARCHER_H
 
 #include <QRegularExpression>
-#include <QString>
 
 class Group;
 class Entry;

src/core/FileWatcher.cpp

@@ -19,10 +19,8 @@
 
 #include "core/AsyncTask.h"
 
-#include <QCryptographicHash>
-
 #ifdef Q_OS_LINUX
-#include <sys/vfs.h>
+#include <sys/statfs.h>
 #endif
 
 FileWatcher::FileWatcher(QObject* parent)

src/core/Global.h

@@ -21,7 +21,6 @@
 #define KEEPASSX_GLOBAL_H
 
 #include <QString>
-#include <QtGlobal>
 
 #if defined(Q_OS_WIN)
 #if defined(KEEPASSX_BUILDING_CORE)

src/core/Group.cpp

@@ -19,10 +19,8 @@
 #include "Group.h"
 #include "config-keepassx.h"
 
-#include "core/Clock.h"
 #include "core/Config.h"
 #include "core/DatabaseIcons.h"
-#include "core/Global.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
 
@@ -30,7 +28,7 @@
 #include "keeshare/KeeShare.h"
 #endif
 
-#include <QtConcurrent>
+#include <QtConcurrentFilter>
 
 const int Group::DefaultIconNumber = 48;
 const int Group::RecycleBinIconNumber = 43;

src/core/Group.h

@@ -20,15 +20,10 @@
 #define KEEPASSX_GROUP_H
 
 #include <QImage>
-#include <QPixmap>
-#include <QPointer>
 
 #include "core/CustomData.h"
 #include "core/Database.h"
 #include "core/Entry.h"
-#include "core/Global.h"
-#include "core/ModifiableObject.h"
-#include "core/TimeInfo.h"
 
 class Group : public ModifiableObject
 {

src/core/HibpDownloader.cpp

@@ -16,13 +16,10 @@
  */
 
 #include "HibpDownloader.h"
-#include "core/Config.h"
-#include "core/Global.h"
 #include "core/NetworkManager.h"
 
 #include <QCryptographicHash>
-#include <QUrl>
+#include <QNetworkReply>
-#include <QtNetwork>
 
 namespace
 {

src/core/HibpDownloader.h

@@ -21,7 +21,6 @@
 #include "config-keepassx.h"
 #include <QHash>
 #include <QObject>
-#include <QTimer>
 
 #ifndef WITH_XC_NETWORKING
 #error This file requires KeePassXC to be built with network support.

src/core/HibpOffline.cpp

@@ -17,13 +17,11 @@
 
 #include "HibpOffline.h"
 
-#include <QCryptographicHash>
-#include <QMultiHash>
-#include <QProcess>
-
-#include "core/Database.h"
 #include "core/Group.h"
 
+#include <QCryptographicHash>
+#include <QProcess>
+
 namespace HibpOffline
 {
     const std::size_t SHA1_BYTES = 20;

src/core/HibpOffline.h

@@ -18,9 +18,9 @@
 #ifndef KEEPASSXC_HIBPOFFLINE_H
 #define KEEPASSXC_HIBPOFFLINE_H
 
-#include <QIODevice>
+#include <QSharedPointer>
-#include <QList>
+
-#include <QPair>
+class QIODevice;
 
 class Database;
 class Entry;

src/core/Merger.cpp

@@ -17,9 +17,6 @@
 
 #include "Merger.h"
 
-#include "core/Clock.h"
-#include "core/Database.h"
-#include "core/Entry.h"
 #include "core/Metadata.h"
 
 Merger::Merger(const Database* sourceDb, Database* targetDb)

src/core/Merger.h

@@ -19,8 +19,6 @@
 #define KEEPASSXC_MERGER_H
 
 #include "core/Group.h"
-#include <QObject>
-#include <QPointer>
 
 class Database;
 class Entry;

src/core/Metadata.cpp

@@ -16,14 +16,12 @@
  */
 
 #include "Metadata.h"
-#include <QApplication>
-#include <QtCore/QCryptographicHash>
 
-#include "core/Clock.h"
 #include "core/DatabaseIcons.h"
-#include "core/Entry.h"
 #include "core/Group.h"
-#include "core/Tools.h"
+
+#include <QApplication>
+#include <QCryptographicHash>
 
 const int Metadata::DefaultHistoryMaxItems = 10;
 const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024;

src/core/Metadata.h

@@ -19,18 +19,12 @@
 #define KEEPASSX_METADATA_H
 
 #include <QDateTime>
-#include <QHash>
 #include <QIcon>
-#include <QImage>
-#include <QPixmap>
-#include <QPixmapCache>
 #include <QPointer>
-#include <QSize>
 #include <QUuid>
 
 #include "core/CustomData.h"
 #include "core/Global.h"
-#include "core/ModifiableObject.h"
 
 class Database;
 class Group;

src/core/NetworkManager.cpp

@@ -18,9 +18,11 @@
 #include "config-keepassx.h"
 
 #ifdef WITH_XC_NETWORKING
+
 #include "NetworkManager.h"
 
 #include <QCoreApplication>
+#include <QNetworkAccessManager>
 
 QNetworkAccessManager* g_netMgr = nullptr;
 QNetworkAccessManager* getNetMgr()

src/core/NetworkManager.h

@@ -19,12 +19,10 @@
 #define KEEPASSXC_NETWORKMANAGER_H
 
 #include "config-keepassx.h"
-#include <QtGlobal>
 
 #ifdef WITH_XC_NETWORKING
-#include <QNetworkAccessManager>
+
-#include <QNetworkReply>
+class QNetworkAccessManager;
-#include <QNetworkRequest>
 
 QNetworkAccessManager* getNetMgr();
 #else

src/core/PassphraseGenerator.h

@@ -18,8 +18,6 @@
 #ifndef KEEPASSX_PASSPHRASEGENERATOR_H
 #define KEEPASSX_PASSPHRASEGENERATOR_H
 
-#include <QFlags>
-#include <QString>
 #include <QVector>
 
 class PassphraseGenerator

src/core/PasswordGenerator.h

@@ -19,8 +19,6 @@
 #ifndef KEEPASSX_PASSWORDGENERATOR_H
 #define KEEPASSX_PASSWORDGENERATOR_H
 
-#include <QFlags>
-#include <QString>
 #include <QVector>
 
 typedef QVector<QChar> PasswordGroup;

src/core/PasswordHealth.cpp

@@ -15,11 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QApplication>
 #include <QString>
 
-#include "Database.h"
-#include "Entry.h"
 #include "Group.h"
 #include "PasswordHealth.h"
 #include "zxcvbn.h"

src/core/PasswordHealth.h

@@ -20,7 +20,6 @@
 
 #include <QHash>
 #include <QSharedPointer>
-#include <QStringList>
 
 class Database;
 class Entry;