diff --git a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp b/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp
index 0c768d330..eb5d51590 100644
--- a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp
+++ b/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp
@@ -20,6 +20,12 @@
 
 #include <QDateTime>
 
+#if QT_VERSION >= 0x050000
+#include <KF5/KWallet/KWallet>
+#else
+#include <KDE/KWallet/Wallet>
+#endif
+
 static PasswordEntry decodeEntry(const QByteArray &data)
 {
     QDataStream stream(data);
diff --git a/src/plugins/KWalletPasswords/kwalletpasswordbackend.h b/src/plugins/KWalletPasswords/kwalletpasswordbackend.h
index 23623f5bf..749642bbb 100644
--- a/src/plugins/KWalletPasswords/kwalletpasswordbackend.h
+++ b/src/plugins/KWalletPasswords/kwalletpasswordbackend.h
@@ -20,15 +20,13 @@
 
 #include <QVector>
 
-#if QT_VERSION >= 0x050000
-#include <KF5/KWallet/KWallet>
-#else
-#include <KDE/KWallet/Wallet>
-#endif
-
 #include "passwordbackends/passwordbackend.h"
 #include "passwordmanager.h"
 
+namespace KWallet {
+class Wallet;
+}
+
 class KWalletPasswordBackend : public PasswordBackend
 {
 public:
diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro
index 46995d89f..530b984ba 100644
--- a/tests/autotests/autotests.pro
+++ b/tests/autotests/autotests.pro
@@ -11,10 +11,8 @@ QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin
 
 # KWallet plugin
 exists($$PWD/../../bin/plugins/libKWalletPasswords.so) {
-    isEqual(QT_MAJOR_VERSION, 4) | qtHaveModule(KWallet) {
-        LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so
-        DEFINES += HAVE_KDE_PASSWORDS_PLUGIN
-    }
+    LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so
+    DEFINES += HAVE_KDE_PASSWORDS_PLUGIN
 }
 
 # GnomeKeyring plugin