Optimize includes across code base

47 files changed, 31 insertions, 117 deletions

diff --git a/src/core/Alloc.cpp b/src/core/Alloc.cpp
index 525a7e5c6..266f2a386 100644
--- a/src/core/Alloc.cpp
+++ b/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)
diff --git a/src/core/AsyncTask.h b/src/core/AsyncTask.h
index b113134d9..581865419 100644
--- a/src/core/AsyncTask.h
+++ b/src/core/AsyncTask.h
@@ -18,7 +18,6 @@
 #ifndef KEEPASSXC_ASYNCTASK_HPP
 #define KEEPASSXC_ASYNCTASK_HPP
 
-#include <QFuture>
 #include <QFutureWatcher>
 #include <QtConcurrent>
 
diff --git a/src/core/Base32.cpp b/src/core/Base32.cpp
index 78448ffb5..05841121a 100644
--- a/src/core/Base32.cpp
+++ b/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);
diff --git a/src/core/Base32.h b/src/core/Base32.h
index 204368c52..07b16a0cc 100644
--- a/src/core/Base32.h
+++ b/src/core/Base32.h
@@ -26,7 +26,6 @@
 
 #include <QByteArray>
 #include <QVariant>
-#include <QtCore/qglobal.h>
 
 class Base32
 {
diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp
index 4845ef0b1..e01bf7337 100644
--- a/src/core/Bootstrap.cpp
+++ b/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
diff --git a/src/core/Compare.cpp b/src/core/Compare.cpp
index 5dccdd781..414f97e0a 100644
--- a/src/core/Compare.cpp
+++ b/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"
diff --git a/src/core/Compare.h b/src/core/Compare.h
index 921893859..15d1d144f 100644
--- a/src/core/Compare.h
+++ b/src/core/Compare.h
@@ -18,8 +18,6 @@
 #ifndef KEEPASSXC_COMPARE_H
 #define KEEPASSXC_COMPARE_H
 
-#include <QDateTime>
-
 #include "core/Clock.h"
 
 enum CompareItemOption
diff --git a/src/core/Config.h b/src/core/Config.h
index 5b480f084..34ec01e06 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -20,7 +20,6 @@
 #define KEEPASSX_CONFIG_H
 
 #include <QPointer>
-#include <QScopedPointer>
 #include <QVariant>
 
 class QSettings;
diff --git a/src/core/CsvParser.cpp b/src/core/CsvParser.cpp
index 3370379ca..a376e3662 100644
--- a/src/core/CsvParser.cpp
+++ b/src/core/CsvParser.cpp
@@ -18,7 +18,7 @@
 
 #include "CsvParser.h"
 
-#include <QObject>
+#include <QFile>
 #include <QTextCodec>
 
 #include "core/Tools.h"
diff --git a/src/core/CsvParser.h b/src/core/CsvParser.h
index d90e8300a..73fb13d24 100644
--- a/src/core/CsvParser.h
+++ b/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;
 
diff --git a/src/core/CustomData.cpp b/src/core/CustomData.cpp
index 6e1dbcb70..fc4401ef0 100644
--- a/src/core/CustomData.cpp
+++ b/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");
diff --git a/src/core/CustomData.h b/src/core/CustomData.h
index 3879daffc..356d2c69f 100644
--- a/src/core/CustomData.h
+++ b/src/core/CustomData.h
@@ -20,8 +20,6 @@
 
 #include <QHash>
 #include <QObject>
-#include <QSet>
-#include <QStringList>
 
 #include "core/ModifiableObject.h"
 
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 77398c608..d9ace8c2e 100644
--- a/src/core/Database.cpp
+++ b/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;
 
diff --git a/src/core/Database.h b/src/core/Database.h
index d51b4f230..d5e5b312e 100644
--- a/src/core/Database.h
+++ b/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"
diff --git a/src/core/DatabaseIcons.cpp b/src/core/DatabaseIcons.cpp
index b8d5fd382..a284d3842 100644
--- a/src/core/DatabaseIcons.cpp
+++ b/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>
diff --git a/src/core/Endian.h b/src/core/Endian.h
index c2d87ee3f..ed5f41945 100644
--- a/src/core/Endian.h
+++ b/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
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index c56c5f74e..e386a349d 100644
--- a/src/core/Entry.cpp
+++ b/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;
diff --git a/src/core/Entry.h b/src/core/Entry.h
index 9dd58e5a7..99c0e6024 100644
--- a/src/core/Entry.h
+++ b/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;
diff --git a/src/core/EntryAttachments.cpp b/src/core/EntryAttachments.cpp
index fea7a1bd4..be8135f5f 100644
--- a/src/core/EntryAttachments.cpp
+++ b/src/core/EntryAttachments.cpp
@@ -20,7 +20,6 @@
 #include "core/Global.h"
 
 #include <QSet>
-#include <QStringList>
 
 EntryAttachments::EntryAttachments(QObject* parent)
     : ModifiableObject(parent)
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
index aaa89d7d2..d6ca12102 100644
--- a/src/core/EntryAttributes.cpp
+++ b/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";
diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h
index ee73f89b3..a9fcf7f60 100644
--- a/src/core/EntryAttributes.h
+++ b/src/core/EntryAttributes.h
@@ -21,10 +21,7 @@
 
 #include <QMap>
 #include <QObject>
-#include <QRegularExpression>
 #include <QSet>
-#include <QStringList>
-#include <QUuid>
 
 #include "core/ModifiableObject.h"
 
diff --git a/src/core/EntrySearcher.h b/src/core/EntrySearcher.h
index d1b17557b..c99639af1 100644
--- a/src/core/EntrySearcher.h
+++ b/src/core/EntrySearcher.h
@@ -20,7 +20,6 @@
 #define KEEPASSX_ENTRYSEARCHER_H
 
 #include <QRegularExpression>
-#include <QString>
 
 class Group;
 class Entry;
diff --git a/src/core/FileWatcher.cpp b/src/core/FileWatcher.cpp
index 430e60274..c919a64ef 100644
--- a/src/core/FileWatcher.cpp
+++ b/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)
diff --git a/src/core/Global.h b/src/core/Global.h
index 6f48977b6..fe51b9b5d 100644
--- a/src/core/Global.h
+++ b/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)
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index 0564df82c..5e77d4951 100644
--- a/src/core/Group.cpp
+++ b/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;
diff --git a/src/core/Group.h b/src/core/Group.h
index ce32cdc16..021126b3e 100644
--- a/src/core/Group.h
+++ b/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
 {
diff --git a/src/core/HibpDownloader.cpp b/src/core/HibpDownloader.cpp
index 53189af91..9ff181093 100644
--- a/src/core/HibpDownloader.cpp
+++ b/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 <QtNetwork>
+#include <QNetworkReply>
 
 namespace
 {
diff --git a/src/core/HibpDownloader.h b/src/core/HibpDownloader.h
index 04c109bae..f8e66baf3 100644
--- a/src/core/HibpDownloader.h
+++ b/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.
diff --git a/src/core/HibpOffline.cpp b/src/core/HibpOffline.cpp
index 65ea63b4a..7a5d4d24c 100644
--- a/src/core/HibpOffline.cpp
+++ b/src/core/HibpOffline.cpp
@@ -17,13 +17,11 @@
 
 #include "HibpOffline.h"
 
+#include "core/Group.h"
+
 #include <QCryptographicHash>
-#include <QMultiHash>
 #include <QProcess>
 
-#include "core/Database.h"
-#include "core/Group.h"
-
 namespace HibpOffline
 {
     const std::size_t SHA1_BYTES = 20;
diff --git a/src/core/HibpOffline.h b/src/core/HibpOffline.h
index 4548f58e1..da0363de9 100644
--- a/src/core/HibpOffline.h
+++ b/src/core/HibpOffline.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSXC_HIBPOFFLINE_H
 #define KEEPASSXC_HIBPOFFLINE_H
 
-#include <QIODevice>
-#include <QList>
-#include <QPair>
+#include <QSharedPointer>
+
+class QIODevice;
 
 class Database;
 class Entry;
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index 83b1e5a44..a5f532af2 100644
--- a/src/core/Merger.cpp
+++ b/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)
diff --git a/src/core/Merger.h b/src/core/Merger.h
index 712f4fde3..4b277f956 100644
--- a/src/core/Merger.h
+++ b/src/core/Merger.h
@@ -19,8 +19,6 @@
 #define KEEPASSXC_MERGER_H
 
 #include "core/Group.h"
-#include <QObject>
-#include <QPointer>
 
 class Database;
 class Entry;
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index 65adba49a..f99f42499 100644
--- a/src/core/Metadata.cpp
+++ b/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;
diff --git a/src/core/Metadata.h b/src/core/Metadata.h
index d833a0ae8..51276ec61 100644
--- a/src/core/Metadata.h
+++ b/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;
diff --git a/src/core/NetworkManager.cpp b/src/core/NetworkManager.cpp
index 52b54609f..8fc4c9e06 100644
--- a/src/core/NetworkManager.cpp
+++ b/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()
diff --git a/src/core/NetworkManager.h b/src/core/NetworkManager.h
index 561621874..1e571d95c 100644
--- a/src/core/NetworkManager.h
+++ b/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>
-#include <QNetworkRequest>
+
+class QNetworkAccessManager;
 
 QNetworkAccessManager* getNetMgr();
 #else
diff --git a/src/core/PassphraseGenerator.h b/src/core/PassphraseGenerator.h
index 5868faab4..bb282f59b 100644
--- a/src/core/PassphraseGenerator.h
+++ b/src/core/PassphraseGenerator.h
@@ -18,8 +18,6 @@
 #ifndef KEEPASSX_PASSPHRASEGENERATOR_H
 #define KEEPASSX_PASSPHRASEGENERATOR_H
 
-#include <QFlags>
-#include <QString>
 #include <QVector>
 
 class PassphraseGenerator
diff --git a/src/core/PasswordGenerator.h b/src/core/PasswordGenerator.h
index 308142563..7ea7eb155 100644
--- a/src/core/PasswordGenerator.h
+++ b/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;
diff --git a/src/core/PasswordHealth.cpp b/src/core/PasswordHealth.cpp
index 583509eb0..7b52fa4ba 100644
--- a/src/core/PasswordHealth.cpp
+++ b/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"
diff --git a/src/core/PasswordHealth.h b/src/core/PasswordHealth.h
index 6f1139997..6e3179253 100644
--- a/src/core/PasswordHealth.h
+++ b/src/core/PasswordHealth.h
@@ -20,7 +20,6 @@
 
 #include <QHash>
 #include <QSharedPointer>
-#include <QStringList>
 
 class Database;
 class Entry;
diff --git a/src/core/Resources.cpp b/src/core/Resources.cpp
index 463abe530..c9eb4cb6c 100644
--- a/src/core/Resources.cpp
+++ b/src/core/Resources.cpp
@@ -23,7 +23,6 @@
 #include <QLibrary>
 
 #include "config-keepassx.h"
-#include "core/Config.h"
 #include "core/Global.h"
 
 Resources* Resources::m_instance(nullptr);
diff --git a/src/core/SignalMultiplexer.h b/src/core/SignalMultiplexer.h
index b27e1f3a6..727c4a3a3 100644
--- a/src/core/SignalMultiplexer.h
+++ b/src/core/SignalMultiplexer.h
@@ -18,7 +18,6 @@
 #ifndef KEEPASSX_SIGNALMULTIPLEXER_H
 #define KEEPASSX_SIGNALMULTIPLEXER_H
 
-#include <QObject>
 #include <QPointer>
 
 class SignalMultiplexer
diff --git a/src/core/TimeInfo.cpp b/src/core/TimeInfo.cpp
index 9f4faf3a4..5687fe00c 100644
--- a/src/core/TimeInfo.cpp
+++ b/src/core/TimeInfo.cpp
@@ -17,8 +17,6 @@
 
 #include "TimeInfo.h"
 
-#include "core/Clock.h"
-
 TimeInfo::TimeInfo()
     : m_expires(false)
     , m_usageCount(0)
diff --git a/src/core/TimeInfo.h b/src/core/TimeInfo.h
index de8a37593..077c0a9f3 100644
--- a/src/core/TimeInfo.h
+++ b/src/core/TimeInfo.h
@@ -19,7 +19,6 @@
 #define KEEPASSX_TIMEINFO_H
 
 #include <QDateTime>
-#include <QFlag>
 
 #include "core/Compare.h"
 
diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index d92d1b4a8..2011a2d44 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -20,30 +20,20 @@
 #include "Tools.h"
 
 #include "config-keepassx.h"
-#include "core/Config.h"
-#include "core/Translator.h"
-
 #include "git-info.h"
-#include <QCoreApplication>
+
 #include <QElapsedTimer>
-#include <QIODevice>
 #include <QImageReader>
 #include <QLocale>
 #include <QRegularExpression>
 #include <QStringList>
-#include <QSysInfo>
 #include <QUrl>
 #include <QUuid>
-#include <cctype>
 
 #ifdef Q_OS_WIN
 #include <windows.h> // for Sleep()
 #endif
 
-#ifdef Q_OS_UNIX
-#include <time.h> // for nanosleep()
-#endif
-
 namespace Tools
 {
     QString debugInfo()
diff --git a/src/core/Tools.h b/src/core/Tools.h
index c7bf5093f..e60d46633 100644
--- a/src/core/Tools.h
+++ b/src/core/Tools.h
@@ -21,12 +21,7 @@
 
 #include "core/Global.h"
 
-#include <QObject>
 #include <QProcessEnvironment>
-#include <QString>
-#include <QUuid>
-
-#include <algorithm>
 
 class QIODevice;
 class QRegularExpression;
diff --git a/src/core/Translator.h b/src/core/Translator.h
index 8236ade43..af699ac90 100644
--- a/src/core/Translator.h
+++ b/src/core/Translator.h
@@ -18,9 +18,7 @@
 #ifndef KEEPASSX_TRANSLATOR_H
 #define KEEPASSX_TRANSLATOR_H
 
-#include <QLocale>
-#include <QPair>
-#include <QString>
+#include <QMetaType>
 
 class Translator
 {