Optimize includes across code base

src/keys/ChallengeResponseKey.h

@@ -22,11 +22,6 @@
 #include "Key.h"
 #include "drivers/YubiKey.h"
 
-#include <QByteArray>
-#include <QUuid>
-
-#include <botan/secmem.h>
-
 class ChallengeResponseKey : public Key
 {
 public:

src/keys/CompositeKey.cpp

@@ -17,13 +17,11 @@
  */
 
 #include "CompositeKey.h"
-#include <QFile>
-#include <QtConcurrent>
+#include <QDebug>
 #include <format/KeePass2.h>
 
-#include "core/Global.h"
 #include "crypto/CryptoHash.h"
-#include "crypto/kdf/AesKdf.h"
+#include "crypto/kdf/Kdf.h"
 #include "keys/ChallengeResponseKey.h"
 
 QUuid CompositeKey::UUID("76a7ae25-a542-4add-9849-7c06be945b94");

src/keys/CompositeKey.h

@@ -19,9 +19,7 @@
 #ifndef KEEPASSX_COMPOSITEKEY_H
 #define KEEPASSX_COMPOSITEKEY_H
 
-#include <QList>
 #include <QSharedPointer>
-#include <QString>
 
 #include "keys/Key.h"
 

src/keys/FileKey.cpp

@@ -23,6 +23,7 @@
 #include "crypto/Random.h"
 
 #include <QFile>
+#include <QXmlStreamReader>
 
 QUuid FileKey::UUID("a584cbc4-c9b4-437e-81bb-362ca9709273");
 

src/keys/FileKey.h

@@ -19,7 +19,6 @@
 #ifndef KEEPASSX_FILEKEY_H
 #define KEEPASSX_FILEKEY_H
 
-#include <QXmlStreamReader>
 #include <botan/secmem.h>
 
 #include "keys/Key.h"

src/keys/Key.h

@@ -19,7 +19,6 @@
 #ifndef KEEPASSX_KEY_H
 #define KEEPASSX_KEY_H
 
-#include <QByteArray>
 #include <QUuid>
 
 class Key

src/keys/PasswordKey.cpp

@@ -16,12 +16,10 @@
  */
 
 #include "PasswordKey.h"
-#include "core/Tools.h"
 
 #include "crypto/CryptoHash.h"
 
-#include <algorithm>
-#include <cstring>
+#include <QSharedPointer>
 
 QUuid PasswordKey::UUID("77e90411-303a-43f2-b773-853b05635ead");
 

src/keys/PasswordKey.h

@@ -20,8 +20,7 @@
 
 #include <botan/secmem.h>
 
-#include <QSharedPointer>
-#include <QString>
+#include <QMetaType>
 
 #include "keys/Key.h"
 

src/keys/drivers/YubiKey.cpp

@@ -16,15 +16,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-
 #include <ykcore.h>
 #include <ykdef.h>
 #include <ykpers-version.h>
 #include <ykstatus.h>
-#include <yubikey.h>
 
-#include "core/Global.h"
 #include "core/Tools.h"
 #include "crypto/Random.h"