Optimize includes across code base

src/gui/AboutDialog.h

@@ -20,7 +20,6 @@
 #define KEEPASSX_ABOUTDIALOG_H
 
 #include <QDialog>
-#include <QScopedPointer>
 
 namespace Ui
 {

src/gui/Application.cpp

@@ -19,11 +19,7 @@
 
 #include "Application.h"
 
-#include "autotype/AutoType.h"
 #include "core/Bootstrap.h"
-#include "core/Config.h"
-#include "core/Global.h"
-#include "gui/Icons.h"
 #include "gui/MainWindow.h"
 #include "gui/MessageBox.h"
 #include "gui/osutils/OSUtils.h"
@@ -32,10 +28,11 @@
 
 #include <QFileInfo>
 #include <QFileOpenEvent>
+#include <QLocalSocket>
 #include <QLockFile>
+#include <QPixmapCache>
 #include <QSocketNotifier>
 #include <QStandardPaths>
-#include <QtNetwork/QLocalSocket>
 
 #if defined(Q_OS_UNIX)
 #include <signal.h>

src/gui/Application.h

@@ -21,10 +21,9 @@
 #define KEEPASSX_APPLICATION_H
 
 #include <QApplication>
-#include <QtNetwork/QLocalServer>
+#include <QtNetwork/qlocalserver.h>
 
 #if defined(Q_OS_WIN) || (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))
-#include <QScopedPointer>
 
 class OSEventFilter;
 #endif

src/gui/ApplicationSettingsWidget.cpp

@@ -23,15 +23,15 @@
 #include "config-keepassx.h"
 
 #include "autotype/AutoType.h"
-#include "core/Config.h"
-#include "core/Global.h"
 #include "core/Translator.h"
 #include "gui/Icons.h"
 #include "gui/MainWindow.h"
 #include "gui/osutils/OSUtils.h"
 
 #include "MessageBox.h"
+#ifdef Q_OS_MACOS
 #include "touchid/TouchID.h"
+#endif
 
 class ApplicationSettingsWidget::ExtraPage
 {

src/gui/CategoryListWidget.cpp

@@ -23,7 +23,6 @@
 #include <QProxyStyle>
 #include <QScrollBar>
 #include <QSize>
-#include <QStyledItemDelegate>
 
 CategoryListWidget::CategoryListWidget(QWidget* parent)
     : QWidget(parent)

src/gui/CategoryListWidget.h

@@ -20,7 +20,6 @@
 
 #include <QPointer>
 #include <QStyledItemDelegate>
-#include <QWidget>
 
 class CategoryListWidgetDelegate;
 class QListWidget;

src/gui/CloneDialog.cpp

@@ -19,11 +19,6 @@
 #include "ui_CloneDialog.h"
 
 #include "config-keepassx.h"
-#include "core/Database.h"
-#include "core/Entry.h"
-#include "core/Resources.h"
-#include "crypto/Crypto.h"
-#include "gui/DatabaseWidget.h"
 
 CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry)
     : QDialog(parent)

src/gui/CloneDialog.h

@@ -19,10 +19,7 @@
 #define KEEPASSX_CLONEDIALOG_H
 
 #include "core/Database.h"
-#include "core/Entry.h"
 #include "gui/DatabaseWidget.h"
-#include <QDialog>
-#include <QScopedPointer>
 
 namespace Ui
 {

src/gui/DatabaseOpenDialog.cpp

@@ -16,9 +16,11 @@
  */
 
 #include "DatabaseOpenDialog.h"
+
 #include "DatabaseOpenWidget.h"
 #include "DatabaseWidget.h"
-#include "core/Database.h"
+
+#include <QLayout>
 
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/QWindowsWindowFunctions>

src/gui/DatabaseOpenDialog.h

@@ -22,7 +22,6 @@
 
 #include <QDialog>
 #include <QPointer>
-#include <QSharedPointer>
 
 class Database;
 class DatabaseWidget;

src/gui/DatabaseOpenWidget.cpp

@@ -19,24 +19,20 @@
 #include "DatabaseOpenWidget.h"
 #include "ui_DatabaseOpenWidget.h"
 
-#include "core/Config.h"
-#include "core/Database.h"
-#include "crypto/Random.h"
-#include "format/KeePass2Reader.h"
+#include "config-keepassx.h"
 #include "gui/FileDialog.h"
 #include "gui/Icons.h"
 #include "gui/MainWindow.h"
 #include "gui/MessageBox.h"
 #include "keys/ChallengeResponseKey.h"
 #include "keys/FileKey.h"
-#include "keys/PasswordKey.h"
-#include "touchid/TouchID.h"
 
-#include "config-keepassx.h"
+#ifdef Q_OS_MACOS
+#include "touchid/TouchID.h"
+#endif
 
 #include <QDesktopServices>
 #include <QFont>
-#include <QSharedPointer>
 
 namespace
 {

src/gui/DatabaseOpenWidget.h

@@ -23,8 +23,8 @@
 #include <QTimer>
 
 #include "gui/DialogyWidget.h"
-#include "keys/CompositeKey.h"
 
+class CompositeKey;
 class Database;
 class QFile;
 

src/gui/DatabaseTabWidget.cpp

@@ -18,28 +18,15 @@
 #include "DatabaseTabWidget.h"
 
 #include <QFileInfo>
-#include <QPushButton>
-#include <QTabWidget>
 
 #include "autotype/AutoType.h"
-#include "core/AsyncTask.h"
-#include "core/Config.h"
-#include "core/Database.h"
-#include "core/Global.h"
-#include "core/Group.h"
-#include "core/Metadata.h"
 #include "core/Tools.h"
 #include "format/CsvExporter.h"
 #include "format/HtmlExporter.h"
-#include "gui/Clipboard.h"
-#include "gui/DatabaseOpenDialog.h"
-#include "gui/DatabaseWidget.h"
 #include "gui/DatabaseWidgetStateSync.h"
 #include "gui/DragTabBar.h"
 #include "gui/FileDialog.h"
 #include "gui/MessageBox.h"
-#include "gui/entry/EntryView.h"
-#include "gui/group/GroupView.h"
 #ifdef Q_OS_MACOS
 #include "gui/osutils/macutils/MacUtils.h"
 #endif

src/gui/DatabaseTabWidget.h

@@ -21,7 +21,6 @@
 #include "DatabaseOpenDialog.h"
 #include "gui/MessageWidget.h"
 
-#include <QPointer>
 #include <QTabWidget>
 
 class Database;

src/gui/DatabaseWidget.cpp

@@ -18,36 +18,21 @@
 
 #include "DatabaseWidget.h"
 
-#include <QAction>
 #include <QApplication>
+#include <QBoxLayout>
 #include <QCheckBox>
 #include <QDesktopServices>
-#include <QFile>
-#include <QHBoxLayout>
-#include <QHeaderView>
 #include <QHostInfo>
 #include <QKeyEvent>
-#include <QLabel>
-#include <QLineEdit>
 #include <QProcess>
 #include <QSplitter>
 #include <QTextEdit>
 
 #include "autotype/AutoType.h"
-#include "core/Config.h"
-#include "core/Database.h"
 #include "core/EntrySearcher.h"
-#include "core/FileWatcher.h"
-#include "core/Group.h"
 #include "core/Merger.h"
-#include "core/Metadata.h"
-#include "core/Resources.h"
-#include "core/Tools.h"
-#include "format/KeePass2Reader.h"
 #include "gui/Clipboard.h"
 #include "gui/CloneDialog.h"
-#include "gui/DatabaseOpenDialog.h"
-#include "gui/DatabaseOpenWidget.h"
 #include "gui/EntryPreviewWidget.h"
 #include "gui/FileDialog.h"
 #include "gui/GuiTools.h"
@@ -59,22 +44,16 @@
 #include "gui/TotpExportSettingsDialog.h"
 #include "gui/TotpSetupDialog.h"
 #include "gui/dbsettings/DatabaseSettingsDialog.h"
-#include "gui/entry/EditEntryWidget.h"
 #include "gui/entry/EntryView.h"
 #include "gui/group/EditGroupWidget.h"
 #include "gui/group/GroupView.h"
 #include "gui/reports/ReportsDialog.h"
 #include "keeshare/KeeShare.h"
-#include "touchid/TouchID.h"
 
 #ifdef WITH_XC_NETWORKING
 #include "gui/IconDownloaderDialog.h"
 #endif
 
-#ifdef Q_OS_LINUX
-#include <sys/vfs.h>
-#endif
-
 #ifdef WITH_XC_SSHAGENT
 #include "sshagent/SSHAgent.h"
 #endif

src/gui/DatabaseWidget.h

@@ -20,9 +20,7 @@
 #define KEEPASSX_DATABASEWIDGET_H
 
 #include <QFileSystemWatcher>
-#include <QScopedPointer>
 #include <QStackedWidget>
-#include <QTimer>
 
 #include "DatabaseOpenDialog.h"
 #include "config-keepassx.h"

src/gui/DatabaseWidgetStateSync.cpp

@@ -19,7 +19,6 @@
 
 #include "DatabaseWidgetStateSync.h"
 
-#include "core/Config.h"
 #include <QCoreApplication>
 
 DatabaseWidgetStateSync::DatabaseWidgetStateSync(QObject* parent)

src/gui/DialogyWidget.cpp

@@ -17,7 +17,6 @@
 
 #include "DialogyWidget.h"
 
-#include <QDialogButtonBox>
 #include <QKeyEvent>
 #include <QPushButton>
 

src/gui/DialogyWidget.h

@@ -19,7 +19,6 @@
 #define KEEPASSX_DIALOGYWIDGET_H
 
 #include <QDialogButtonBox>
-#include <QWidget>
 
 class DialogyWidget : public QWidget
 {

src/gui/EditWidget.cpp

@@ -22,8 +22,6 @@
 #include <QPushButton>
 #include <QScrollArea>
 
-#include "core/Resources.h"
-
 EditWidget::EditWidget(QWidget* parent)
     : DialogyWidget(parent)
     , m_ui(new Ui::EditWidget())

src/gui/EditWidgetIcons.cpp

@@ -20,14 +20,12 @@
 #include "ui_EditWidgetIcons.h"
 
 #include <QFileDialog>
-#include <QMessageBox>
 
 #include "core/Config.h"
-#include "core/Group.h"
+#include "core/Database.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
 #include "gui/IconModels.h"
-#include "gui/MessageBox.h"
 #ifdef WITH_XC_NETWORKING
 #include "gui/IconDownloader.h"
 #endif

src/gui/EditWidgetIcons.h

@@ -20,13 +20,9 @@
 #define KEEPASSX_EDITWIDGETICONS_H
 
 #include <QMenu>
-#include <QUrl>
 #include <QUuid>
-#include <QWidget>
 
 #include "config-keepassx.h"
-#include "core/Entry.h"
-#include "core/Global.h"
 #include "gui/MessageWidget.h"
 
 class Database;

src/gui/EntryPreviewWidget.cpp

@@ -21,10 +21,10 @@
 
 #include "Clipboard.h"
 #include "Font.h"
-#include "entry/EntryAttachmentsModel.h"
 #include "gui/Icons.h"
 #if defined(WITH_XC_KEESHARE)
 #include "keeshare/KeeShare.h"
+#include "keeshare/KeeShareSettings.h"
 #endif
 
 namespace

src/gui/EntryPreviewWidget.h

@@ -21,8 +21,6 @@
 #include "config-keepassx.h"
 #include "gui/DatabaseWidget.h"
 
-#include <QWidget>
-
 namespace Ui
 {
     class EntryPreviewWidget;

src/gui/FileDialog.cpp

@@ -19,8 +19,6 @@
 
 #include "core/Config.h"
 
-#include <QDir>
-
 FileDialog* FileDialog::m_instance(nullptr);
 
 QString FileDialog::getOpenFileName(QWidget* parent,

src/gui/Font.h

@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_FONT_H
 #define KEEPASSX_FONT_H
 
-#include <QFont>
+class QFont;
 
 class Font
 {

src/gui/GuiTools.cpp

@@ -18,8 +18,6 @@
 #include "GuiTools.h"
 
 #include "core/Config.h"
-#include "core/Database.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "gui/MessageBox.h"
 

src/gui/IconDownloader.cpp

@@ -19,9 +19,10 @@
 #include "core/Config.h"
 #include "core/NetworkManager.h"
 
+#include <QBuffer>
 #include <QHostInfo>
 #include <QImageReader>
-#include <QtNetwork>
+#include <QNetworkReply>
 
 #define MAX_REDIRECTS 5
 

src/gui/IconDownloader.h

@@ -19,12 +19,9 @@
 #define KEEPASSXC_ICONDOWNLOADER_H
 
 #include <QImage>
-#include <QObject>
 #include <QTimer>
 #include <QUrl>
 
-#include "core/Global.h"
-
 class QNetworkReply;
 
 class IconDownloader : public QObject

src/gui/IconDownloaderDialog.cpp

@@ -18,20 +18,15 @@
 #include "IconDownloaderDialog.h"
 #include "ui_IconDownloaderDialog.h"
 
-#include "core/AsyncTask.h"
 #include "core/Config.h"
+#include "core/Database.h"
 #include "core/Entry.h"
-#include "core/Global.h"
-#include "core/Group.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
 #include "gui/IconDownloader.h"
-#include "gui/IconModels.h"
-#ifdef Q_OS_MACOS
-#include "gui/osutils/macutils/MacUtils.h"
-#endif
+#include "osutils/OSUtils.h"
 
-#include <QMutexLocker>
+#include <QStandardItemModel>
 
 IconDownloaderDialog::IconDownloaderDialog(QWidget* parent)
     : QDialog(parent)

src/gui/IconDownloaderDialog.h

@@ -19,15 +19,14 @@
 #define KEEPASSX_ICONDOWNLOADERDIALOG_H
 
 #include <QDialog>
+#include <QMap>
 #include <QMutex>
-#include <QStandardItemModel>
-
-#include "gui/MessageWidget.h"
 
 class Database;
 class Entry;
 class CustomIconModel;
 class IconDownloader;
+class QStandardItemModel;
 
 namespace Ui
 {

src/gui/Icons.cpp

@@ -18,14 +18,9 @@
 
 #include "Icons.h"
 
-#include <QBitmap>
 #include <QIconEngine>
-#include <QPaintDevice>
 #include <QPainter>
-#include <QStyle>
 
-#include "config-keepassx.h"
-#include "core/Config.h"
 #include "gui/MainWindow.h"
 #include "gui/osutils/OSUtils.h"
 

src/gui/Icons.h

@@ -19,10 +19,7 @@
 #ifndef KEEPASSX_ICONS_H
 #define KEEPASSX_ICONS_H
 
-#include <QColor>
-#include <QHash>
 #include <QIcon>
-#include <QString>
 
 class Icons
 {

src/gui/KMessageWidget.cpp

@@ -24,16 +24,13 @@
 #include "gui/Icons.h"
 
 #include <QAction>
+#include <QBoxLayout>
 #include <QEvent>
-#include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QPainter>
-#include <QShowEvent>
+#include <QStyle>
 #include <QTimeLine>
 #include <QToolButton>
-#include <QStyle>
-#include <QtGui/QBitmap>
 
 //---------------------------------------------------------------------
 // KMessageWidgetPrivate

src/gui/KeePass1OpenWidget.cpp

@@ -18,13 +18,11 @@
 #include "KeePass1OpenWidget.h"
 #include "ui_DatabaseOpenWidget.h"
 
-#include <QFile>
 #include <QFileInfo>
 
 #include "core/Database.h"
 #include "core/Metadata.h"
 #include "format/KeePass1Reader.h"
-#include "gui/MessageBox.h"
 
 KeePass1OpenWidget::KeePass1OpenWidget(QWidget* parent)
     : DatabaseOpenWidget(parent)

src/gui/MainWindow.cpp

@@ -21,33 +21,29 @@
 
 #include <QCloseEvent>
 #include <QDesktopServices>
-#include <QFileInfo>
+#include <QList>
 #include <QMimeData>
 #include <QShortcut>
+#include <QStatusBar>
 #include <QTimer>
 #include <QToolButton>
 #include <QWindow>
 
 #include "config-keepassx.h"
 
+#include "Application.h"
+#include "Clipboard.h"
 #include "autotype/AutoType.h"
-#include "core/Config.h"
 #include "core/InactivityTimer.h"
-#include "core/Metadata.h"
 #include "core/Resources.h"
 #include "core/Tools.h"
 #include "gui/AboutDialog.h"
-#include "gui/DatabaseWidget.h"
 #include "gui/Icons.h"
 #include "gui/MessageBox.h"
 #include "gui/SearchWidget.h"
 #include "gui/osutils/OSUtils.h"
-#include "keys/CompositeKey.h"
-#include "keys/FileKey.h"
-#include "keys/PasswordKey.h"
 
 #ifdef Q_OS_MACOS
-#include "gui/osutils/macutils/MacUtils.h"
 #ifdef WITH_XC_TOUCHID
 #include "touchid/TouchID.h"
 #endif
@@ -82,8 +78,6 @@
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(QT_NO_DBUS)
 #include "gui/MainWindowAdaptor.h"
-#include <QList>
-#include <QtDBus/QtDBus>
 #endif
 
 const QString MainWindow::BaseWindowTitle = "KeePassXC";

src/gui/MainWindow.h

@@ -23,12 +23,9 @@
 #include <QLabel>
 #include <QMainWindow>
 #include <QProgressBar>
-#include <QStatusBar>
 #include <QSystemTrayIcon>
 
 #include "core/SignalMultiplexer.h"
-#include "gui/Application.h"
-#include "gui/Clipboard.h"
 #include "gui/DatabaseWidget.h"
 #include "gui/osutils/ScreenLockListener.h"
 

src/gui/MainWindowAdaptor.cpp

@@ -10,13 +10,6 @@
  */
 
 #include "MainWindowAdaptor.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QMetaObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
 
 /*
  * Implementation of adaptor class MainWindowAdaptor

src/gui/MessageBox.cpp

@@ -19,6 +19,8 @@
 #include "MessageBox.h"
 
 #include <QCheckBox>
+#include <QMap>
+#include <QPushButton>
 #include <QWindow>
 
 QWindow* MessageBox::m_overrideParent(nullptr);

src/gui/MessageBox.h

@@ -19,10 +19,8 @@
 #ifndef KEEPASSX_MESSAGEBOX_H
 #define KEEPASSX_MESSAGEBOX_H
 
-#include <QHash>
 #include <QMap>
 #include <QMessageBox>
-#include <QPushButton>
 
 class MessageBox
 {

src/gui/OpVaultOpenWidget.cpp

@@ -17,12 +17,8 @@
 
 #include "OpVaultOpenWidget.h"
 
-#include <QDir>
-
 #include "core/Database.h"
-#include "core/Metadata.h"
 #include "format/OpVaultReader.h"
-#include "gui/MessageBox.h"
 #include "ui_DatabaseOpenWidget.h"
 
 OpVaultOpenWidget::OpVaultOpenWidget(QWidget* parent)

src/gui/PasswordEdit.cpp

@@ -25,10 +25,9 @@
 #include "gui/osutils/OSUtils.h"
 #include "gui/styles/StateColorPalette.h"
 
-#include <QDialog>
+#include <QEvent>
 #include <QTimer>
 #include <QToolTip>
-#include <QVBoxLayout>
 
 PasswordEdit::PasswordEdit(QWidget* parent)
     : QLineEdit(parent)

src/gui/PasswordGeneratorWidget.cpp

@@ -20,13 +20,10 @@
 #include "ui_PasswordGeneratorWidget.h"
 
 #include <QDir>
-#include <QKeyEvent>
-#include <QLineEdit>
 #include <QShortcut>
 #include <QTimer>
 
 #include "core/Config.h"
-#include "core/PasswordGenerator.h"
 #include "core/PasswordHealth.h"
 #include "core/Resources.h"
 #include "gui/Clipboard.h"

src/gui/PasswordGeneratorWidget.h

@@ -20,8 +20,6 @@
 #define KEEPASSX_PASSWORDGENERATORWIDGET_H
 
 #include <QComboBox>
-#include <QLabel>
-#include <QWidget>
 
 #include "core/PassphraseGenerator.h"
 #include "core/PasswordGenerator.h"

src/gui/SearchWidget.cpp

@@ -21,10 +21,9 @@
 
 #include <QKeyEvent>
 #include <QMenu>
-#include <QShortcut>
 #include <QToolButton>
 
-#include "core/Config.h"
+#include "core/SignalMultiplexer.h"
 #include "gui/Icons.h"
 #include "gui/widgets/PopupHelpWidget.h"
 

src/gui/SearchWidget.h

@@ -22,9 +22,10 @@
 #include <QTimer>
 #include <QWidget>
 
-#include "core/SignalMultiplexer.h"
 #include "gui/DatabaseWidget.h"
 
+class SignalMultiplexer;
+
 namespace Ui
 {
     class SearchWidget;

src/gui/SquareSvgWidget.h

@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_SquareSvgWidget_H
 #define KEEPASSX_SquareSvgWidget_H
 
-#include <QtSvg/QSvgWidget>
+#include <QSvgWidget>
 
 class SquareSvgWidget : public QSvgWidget
 {

src/gui/TotpDialog.cpp

@@ -20,10 +20,11 @@
 #include "ui_TotpDialog.h"
 
 #include "core/Clock.h"
-#include "core/Config.h"
 #include "gui/Clipboard.h"
 #include "gui/MainWindow.h"
+#include "totp/totp.h"
 
+#include <QPushButton>
 #include <QShortcut>
 
 TotpDialog::TotpDialog(QWidget* parent, Entry* entry)

src/gui/TotpDialog.h

@@ -20,12 +20,7 @@
 #define KEEPASSX_TOTPDIALOG_H
 
 #include "core/Database.h"
-#include "core/Entry.h"
 #include "gui/DatabaseWidget.h"
-#include <QDialog>
-#include <QScopedPointer>
-#include <QTimer>
-#include <totp/totp.h>
 
 namespace Ui
 {

src/gui/TotpExportSettingsDialog.cpp

@@ -17,23 +17,18 @@
 
 #include "TotpExportSettingsDialog.h"
 
-#include "core/Config.h"
-#include "core/Entry.h"
 #include "gui/Clipboard.h"
-#include "gui/DatabaseWidget.h"
 #include "gui/MainWindow.h"
 #include "gui/SquareSvgWidget.h"
 #include "qrcode/QrCode.h"
 #include "totp/totp.h"
 
+#include <QBoxLayout>
 #include <QBuffer>
-#include <QDialogButtonBox>
 #include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QShortcut>
-#include <QSizePolicy>
-#include <QVBoxLayout>
 
 TotpExportSettingsDialog::TotpExportSettingsDialog(DatabaseWidget* parent, Entry* entry)
     : QDialog(parent)

src/gui/TotpExportSettingsDialog.h

@@ -19,11 +19,7 @@
 #define KEEPASSX_TotpExportSettingsDialog_H
 
 #include "core/Database.h"
-#include "core/Entry.h"
 #include "gui/DatabaseWidget.h"
-#include <QDialog>
-#include <QTimer>
-#include <QUrl>
 
 class QVBoxLayout;
 class SquareSvgWidget;

src/gui/TotpSetupDialog.h

@@ -20,10 +20,7 @@
 #define KEEPASSX_SETUPTOTPDIALOG_H
 
 #include "core/Database.h"
-#include "core/Entry.h"
 #include "gui/DatabaseWidget.h"
-#include <QDialog>
-#include <QScopedPointer>
 
 namespace Ui
 {

src/gui/URLEdit.cpp

@@ -18,11 +18,7 @@
 
 #include "URLEdit.h"
 
-#include <QRegularExpression>
-
-#include "core/Config.h"
 #include "core/Tools.h"
-#include "gui/Font.h"
 #include "gui/Icons.h"
 #include "gui/styles/StateColorPalette.h"
 

src/gui/UpdateCheckDialog.cpp

@@ -18,7 +18,11 @@
 #include "UpdateCheckDialog.h"
 #include "ui_UpdateCheckDialog.h"
 
+#include <QPushButton>
+
+#include "config-keepassx.h"
 #include "gui/Icons.h"
+#include "updatecheck/UpdateChecker.h"
 
 UpdateCheckDialog::UpdateCheckDialog(QWidget* parent)
     : QDialog(parent)

src/gui/UpdateCheckDialog.h

@@ -21,10 +21,6 @@
 #include "config-keepassx.h"
 #include "core/Global.h"
 #include "gui/MessageBox.h"
-#include "updatecheck/UpdateChecker.h"
-#include <QDialog>
-#include <QScopedPointer>
-#include <QUrl>
 
 namespace Ui
 {

src/gui/WelcomeWidget.h

@@ -20,7 +20,6 @@
 #define KEEPASSX_WELCOMEWIDGET_H
 
 #include <QListWidgetItem>
-#include <QWidget>
 
 namespace Ui
 {

src/gui/csvImport/CsvImportWidget.cpp

@@ -19,14 +19,11 @@
 #include "CsvImportWidget.h"
 #include "ui_CsvImportWidget.h"
 
-#include <QFile>
-#include <QFileInfo>
-#include <QSpacerItem>
+#include <QStringListModel>
 
 #include "core/Clock.h"
 #include "format/KeePass2Writer.h"
 #include "gui/MessageBox.h"
-#include "gui/MessageWidget.h"
 #include "totp/totp.h"
 
 // I wanted to make the CSV import GUI future-proof, so if one day you need a new field,

src/gui/csvImport/CsvImportWidget.h

@@ -20,15 +20,11 @@
 #define KEEPASSX_CSVIMPORTWIDGET_H
 
 #include <QComboBox>
-#include <QList>
-#include <QPushButton>
-#include <QScopedPointer>
-#include <QStackedWidget>
-#include <QStringListModel>
 
 #include "core/Metadata.h"
 #include "gui/csvImport/CsvParserModel.h"
-#include "keys/PasswordKey.h"
+
+class QStringListModel;
 
 namespace Ui
 {

src/gui/csvImport/CsvImportWizard.cpp

@@ -18,10 +18,7 @@
 
 #include "CsvImportWizard.h"
 
-#include <QApplication>
-#include <QLabel>
-
-#include "gui/MessageBox.h"
+#include <QGridLayout>
 
 CsvImportWizard::CsvImportWizard(QWidget* parent)
     : DialogyWidget(parent)

src/gui/csvImport/CsvImportWizard.h

@@ -21,12 +21,10 @@
 
 #include "CsvImportWidget.h"
 
-#include <QGridLayout>
-#include <QStackedWidget>
-
-#include "core/Database.h"
 #include "gui/DialogyWidget.h"
 
+class QGridLayout;
+
 class CsvImportWidget;
 
 class CsvImportWizard : public DialogyWidget

src/gui/csvImport/CsvParserModel.cpp

@@ -18,7 +18,7 @@
 
 #include "CsvParserModel.h"
 
-#include <utility>
+#include <QFile>
 
 CsvParserModel::CsvParserModel(QObject* parent)
     : QAbstractTableModel(parent)

src/gui/csvImport/CsvParserModel.h

@@ -20,7 +20,6 @@
 #define KEEPASSX_CSVPARSERMODEL_H
 
 #include <QAbstractTableModel>
-#include <QMap>
 
 #include "core/CsvParser.h"
 #include "core/Group.h"

src/gui/databasekey/KeyComponentWidget.cpp

@@ -18,7 +18,6 @@
 #include "KeyComponentWidget.h"
 #include "ui_KeyComponentWidget.h"
 
-#include <QStackedWidget>
 #include <QTimer>
 
 KeyComponentWidget::KeyComponentWidget(QWidget* parent)

src/gui/databasekey/KeyComponentWidget.h

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

src/gui/databasekey/KeyFileEditWidget.h

@@ -19,7 +19,6 @@
 #define KEEPASSXC_KEYFILEEDITWIDGET_H
 
 #include "KeyComponentWidget.h"
-#include <QPointer>
 
 namespace Ui
 {

src/gui/databasekey/PasswordEditWidget.cpp

@@ -19,7 +19,6 @@
 #include "ui_KeyComponentWidget.h"
 #include "ui_PasswordEditWidget.h"
 
-#include "gui/PasswordGeneratorWidget.h"
 #include "keys/CompositeKey.h"
 #include "keys/PasswordKey.h"
 

src/gui/databasekey/PasswordEditWidget.h

@@ -19,7 +19,6 @@
 #define KEEPASSXC_PASSWORDEDITWIDGET_H
 
 #include "KeyComponentWidget.h"
-#include <QPointer>
 
 namespace Ui
 {

src/gui/databasekey/YubiKeyEditWidget.h

@@ -19,7 +19,6 @@
 #define KEEPASSXC_YUBIKEYEDITWIDGET_H
 
 #include "KeyComponentWidget.h"
-#include <QPointer>
 
 namespace Ui
 {

src/gui/dbsettings/DatabaseSettingsDialog.cpp

@@ -26,18 +26,20 @@
 #include "DatabaseSettingsWidgetBrowser.h"
 #endif
 #include "DatabaseSettingsWidgetMaintenance.h"
-#if defined(WITH_XC_KEESHARE)
+#ifdef WITH_XC_KEESHARE
 #include "keeshare/DatabaseSettingsPageKeeShare.h"
 #endif
-#if defined(WITH_XC_FDOSECRETS)
+#ifdef WITH_XC_FDOSECRETS
 #include "fdosecrets/DatabaseSettingsPageFdoSecrets.h"
 #endif
+#ifdef Q_OS_MACOS
+#include "touchid/TouchID.h"
+#endif
 
 #include "core/Config.h"
 #include "core/Database.h"
 #include "core/Global.h"
 #include "gui/Icons.h"
-#include "touchid/TouchID.h"
 
 #include <QScrollArea>
 

src/gui/dbsettings/DatabaseSettingsDialog.h

@@ -22,8 +22,6 @@
 #include "gui/DialogyWidget.h"
 
 #include <QPointer>
-#include <QScopedPointer>
-#include <QSharedPointer>
 
 class Database;
 class DatabaseSettingsWidgetGeneral;

src/gui/dbsettings/DatabaseSettingsWidget.cpp

@@ -18,11 +18,6 @@
 #include "DatabaseSettingsWidget.h"
 #include "core/Database.h"
 
-#include <utility>
-
-#include <QTimer>
-#include <QWidget>
-
 DatabaseSettingsWidget::DatabaseSettingsWidget(QWidget* parent)
     : SettingsWidget(parent)
 {

src/gui/dbsettings/DatabaseSettingsWidget.h

@@ -20,8 +20,6 @@
 
 #include "gui/settings/SettingsWidget.h"
 
-#include <QSharedPointer>
-
 class Database;
 
 /**

src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp

@@ -21,10 +21,8 @@
 
 #include <QProgressDialog>
 
+#include "browser/BrowserService.h"
 #include "browser/BrowserSettings.h"
-#include "core/Clock.h"
-#include "core/Database.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "gui/MessageBox.h"

src/gui/dbsettings/DatabaseSettingsWidgetBrowser.h

@@ -21,16 +21,13 @@
 
 #include "DatabaseSettingsWidget.h"
 
-#include "browser/BrowserService.h"
-#include "core/CustomData.h"
-#include "gui/DatabaseTabWidget.h"
-
 #include <QItemSelection>
 #include <QPointer>
-#include <QScopedPointer>
 #include <QStandardItemModel>
 
+class CustomData;
 class Database;
+
 namespace Ui
 {
     class DatabaseSettingsWidgetBrowser;

src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp

@@ -26,9 +26,8 @@
 #include "keys/FileKey.h"
 #include "keys/PasswordKey.h"
 
+#include <QLayout>
 #include <QPushButton>
-#include <QSpacerItem>
-#include <QVBoxLayout>
 
 DatabaseSettingsWidgetDatabaseKey::DatabaseSettingsWidgetDatabaseKey(QWidget* parent)
     : DatabaseSettingsWidget(parent)

src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp

@@ -26,9 +26,6 @@
 #include "format/KeePass2.h"
 #include "gui/MessageBox.h"
 
-#include <QApplication>
-#include <QPushButton>
-
 const char* DatabaseSettingsWidgetEncryption::CD_DECRYPTION_TIME_PREFERENCE_KEY = "KPXC_DECRYPTION_TIME_PREFERENCE";
 
 DatabaseSettingsWidgetEncryption::DatabaseSettingsWidgetEncryption(QWidget* parent)

src/gui/dbsettings/DatabaseSettingsWidgetEncryption.h

@@ -22,9 +22,6 @@
 
 #include "crypto/kdf/Kdf.h"
 
-#include <QPointer>
-#include <QScopedPointer>
-
 class Database;
 namespace Ui
 {

src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp

@@ -19,8 +19,6 @@
 #include "ui_DatabaseSettingsWidgetGeneral.h"
 
 #include "core/Clock.h"
-#include "core/Database.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "gui/MessageBox.h"

src/gui/dbsettings/DatabaseSettingsWidgetGeneral.h

@@ -20,9 +20,6 @@
 
 #include "DatabaseSettingsWidget.h"
 
-#include <QPointer>
-#include <QScopedPointer>
-
 class Database;
 namespace Ui
 {

src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.cpp

@@ -18,10 +18,6 @@
 #include "DatabaseSettingsWidgetMaintenance.h"
 #include "ui_DatabaseSettingsWidgetMaintenance.h"
 
-#include <QProgressDialog>
-
-#include "core/Database.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "gui/IconModels.h"

src/gui/dbsettings/DatabaseSettingsWidgetMaintenance.h

@@ -20,8 +20,6 @@
 
 #include "DatabaseSettingsWidget.h"
 
-#include <QScopedPointer>
-
 class QItemSelection;
 class CustomIconModel;
 class Database;

src/gui/dbsettings/DatabaseSettingsWidgetMetaDataSimple.h

@@ -20,9 +20,6 @@
 
 #include "DatabaseSettingsWidget.h"
 
-#include <QPointer>
-#include <QScopedPointer>
-
 class Database;
 namespace Ui
 {

src/gui/entry/AutoTypeAssociationsModel.h

@@ -21,7 +21,7 @@
 #include <QAbstractListModel>
 #include <QPointer>
 
-#include "core/AutoTypeAssociations.h"
+class AutoTypeAssociations;
 
 class Entry;
 

src/gui/entry/EditEntryWidget.cpp

@@ -24,29 +24,22 @@
 #include "ui_EditEntryWidgetMain.h"
 #include "ui_EditEntryWidgetSSHAgent.h"
 
-#include <QButtonGroup>
 #include <QColorDialog>
 #include <QDesktopServices>
-#include <QEvent>
-#include <QMenu>
-#include <QMimeData>
+#include <QFileDialog>
 #include <QSortFilterProxyModel>
-#include <QStackedLayout>
-#include <QStandardPaths>
 #include <QStringListModel>
-#include <QTemporaryFile>
 
 #include "autotype/AutoType.h"
+#include "core/AutoTypeAssociations.h"
 #include "core/Clock.h"
 #include "core/Config.h"
 #include "core/Database.h"
 #include "core/Entry.h"
+#include "core/EntryAttributes.h"
 #include "core/Metadata.h"
-#include "core/PasswordHealth.h"
 #include "core/TimeDelta.h"
-#include "core/Tools.h"
 #ifdef WITH_XC_SSHAGENT
-#include "sshagent/KeeAgentSettings.h"
 #include "sshagent/OpenSSHKey.h"
 #include "sshagent/SSHAgent.h"
 #endif
@@ -57,12 +50,10 @@
 #include "gui/Clipboard.h"
 #include "gui/EditWidgetIcons.h"
 #include "gui/EditWidgetProperties.h"
-#include "gui/FileDialog.h"
 #include "gui/Font.h"
 #include "gui/Icons.h"
 #include "gui/MessageBox.h"
 #include "gui/entry/AutoTypeAssociationsModel.h"
-#include "gui/entry/EntryAttachmentsModel.h"
 #include "gui/entry/EntryAttributesModel.h"
 #include "gui/entry/EntryHistoryModel.h"
 

src/gui/entry/EditEntryWidget.h

@@ -21,10 +21,7 @@
 
 #include <QButtonGroup>
 #include <QCompleter>
-#include <QModelIndex>
 #include <QPointer>
-#include <QScopedPointer>
-#include <QScrollArea>
 #include <QTimer>
 
 #include "config-keepassx.h"
@@ -42,6 +39,7 @@ class EntryAttributesModel;
 class EntryHistoryModel;
 class QButtonGroup;
 class QMenu;
+class QScrollArea;
 class QSortFilterProxyModel;
 class QStringListModel;
 #ifdef WITH_XC_SSHAGENT

src/gui/entry/EntryAttachmentsModel.cpp

@@ -17,11 +17,9 @@
 
 #include "EntryAttachmentsModel.h"
 
-#include "core/Entry.h"
+#include "core/EntryAttachments.h"
 #include "core/Tools.h"
 
-#include <algorithm>
-
 EntryAttachmentsModel::EntryAttachmentsModel(QObject* parent)
     : QAbstractListModel(parent)
     , m_entryAttachments(nullptr)

src/gui/entry/EntryAttachmentsWidget.cpp

@@ -4,10 +4,7 @@
 #include <QDesktopServices>
 #include <QDir>
 #include <QDropEvent>
-#include <QFile>
-#include <QFileInfo>
 #include <QMimeData>
-#include <QProcessEnvironment>
 #include <QTemporaryFile>
 
 #include "EntryAttachmentsModel.h"

src/gui/entry/EntryAttributesModel.cpp

@@ -17,10 +17,7 @@
 
 #include "EntryAttributesModel.h"
 
-#include "core/Entry.h"
-#include "core/Tools.h"
-
-#include <algorithm>
+#include "core/EntryAttributes.h"
 
 EntryAttributesModel::EntryAttributesModel(QObject* parent)
     : QAbstractListModel(parent)

src/gui/entry/EntryModel.cpp

@@ -17,13 +17,10 @@
 
 #include "EntryModel.h"
 
-#include <QDateTime>
+#include <QFont>
 #include <QMimeData>
-#include <QPainter>
 #include <QPalette>
 
-#include "core/DatabaseIcons.h"
-#include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "core/PasswordHealth.h"

src/gui/entry/EntryURLModel.cpp

@@ -18,13 +18,11 @@
 
 #include "EntryURLModel.h"
 
-#include "core/Entry.h"
+#include "core/EntryAttributes.h"
 #include "core/Tools.h"
 #include "gui/Icons.h"
 #include "gui/styles/StateColorPalette.h"
 
-#include <algorithm>
-
 EntryURLModel::EntryURLModel(QObject* parent)
     : QStandardItemModel(parent)
     , m_entryAttributes(nullptr)

src/gui/group/EditGroupWidget.cpp

@@ -16,13 +16,13 @@
  */
 
 #include "EditGroupWidget.h"
-#include "gui/Font.h"
 #include "ui_EditGroupWidgetMain.h"
 
 #include "core/Config.h"
 #include "core/Metadata.h"
 #include "gui/EditWidgetIcons.h"
 #include "gui/EditWidgetProperties.h"
+#include "gui/Font.h"
 #include "gui/Icons.h"
 #include "gui/MessageBox.h"
 

src/gui/group/EditGroupWidget.h

@@ -19,7 +19,6 @@
 #define KEEPASSX_EDITGROUPWIDGET_H
 
 #include <QComboBox>
-#include <QScopedPointer>
 #include <QScrollArea>
 
 #include "core/Group.h"

src/gui/group/GroupModel.cpp

@@ -17,14 +17,10 @@
 
 #include "GroupModel.h"
 
-#include <QFont>
 #include <QMimeData>
 
-#include "core/Database.h"
-#include "core/DatabaseIcons.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
-#include "core/Tools.h"
 #include "keeshare/KeeShare.h"
 
 GroupModel::GroupModel(Database* db, QObject* parent)

src/gui/group/GroupView.cpp

@@ -18,12 +18,10 @@
 #include "GroupView.h"
 
 #include <QDragMoveEvent>
-#include <QMetaObject>
 #include <QMimeData>
 #include <QShortcut>
 
 #include "core/Config.h"
-#include "core/Database.h"
 #include "core/Group.h"
 #include "gui/group/GroupModel.h"
 

src/gui/osutils/OSUtils.h

@@ -18,9 +18,6 @@
 #ifndef KEEPASSXC_OSUTILS_H
 #define KEEPASSXC_OSUTILS_H
 
-#include "OSUtilsBase.h"
-#include <QtCore>
-
 #if defined(Q_OS_WIN)
 
 #include "winutils/WinUtils.h"

src/gui/osutils/OSUtilsBase.h

@@ -19,7 +19,6 @@
 #define KEEPASSXC_OSUTILSBASE_H
 
 #include <QObject>
-#include <QPointer>
 
 class QWindow;
 

src/gui/osutils/ScreenLockListenerPrivate.cpp

@@ -20,6 +20,8 @@
 #include "macutils/ScreenLockListenerMac.h"
 #elif defined(Q_OS_UNIX)
 #include "nixutils/ScreenLockListenerDBus.h"
+
+#include <QWidget>
 #elif defined(Q_OS_WIN)
 #include "winutils/ScreenLockListenerWin.h"
 #endif

src/gui/osutils/ScreenLockListenerPrivate.h

@@ -18,7 +18,6 @@
 #ifndef SCREENLOCKLISTENERPRIVATE_H
 #define SCREENLOCKLISTENERPRIVATE_H
 #include <QObject>
-#include <QWidget>
 
 class ScreenLockListenerPrivate : public QObject
 {

src/gui/osutils/nixutils/NixUtils.cpp

@@ -16,18 +16,14 @@
  */
 
 #include "NixUtils.h"
-#include "core/Tools.h"
 
 #include <QApplication>
-#include <QColor>
 #include <QDir>
-#include <QFile>
-#include <QGuiApplication>
-#include <QPalette>
+#include <QPointer>
 #include <QStandardPaths>
 #include <QStyle>
 #include <QTextStream>
-#include <QtX11Extras/QX11Info>
+#include <QX11Info>
 
 #include <qpa/qplatformnativeinterface.h>
 

src/gui/osutils/nixutils/NixUtils.h

@@ -20,7 +20,7 @@
 
 #include "gui/osutils/OSUtilsBase.h"
 #include <QAbstractNativeEventFilter>
-#include <QPointer>
+#include <QSharedPointer>
 
 class NixUtils : public OSUtilsBase, QAbstractNativeEventFilter
 {