diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81eee0fc7..d40fdbc13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 #find_package(QtJolie REQUIRED)
 find_package(QCA2 REQUIRED)
 #find_package(DNSSD REQUIRED)
-include_directories(${QCA2_INCLUDES})
+
+
+include_directories(${QCA2_INCLUDE_DIR})
 include_directories(${QTJOLIE_INCLUDE_DIRS})
 
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
diff --git a/authorizationmanager.cpp b/authorizationmanager.cpp
index 75b360f6f..1bf1bfa53 100644
--- a/authorizationmanager.cpp
+++ b/authorizationmanager.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QMetaType>
 
-#include <QtCrypto/QtCrypto>
+#include <QtCrypto>
 #include <QtJolie/Message>
 #include <QtJolie/Server>
 
diff --git a/authorizationrule.cpp b/authorizationrule.cpp
index 0ac0d7e72..6db17553d 100644
--- a/authorizationrule.cpp
+++ b/authorizationrule.cpp
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <klocalizedstring.h>
 
-#include <QtCrypto/QtCrypto>
+#include <QtCrypto>
 #include "credentials.h"
 
 namespace Plasma
diff --git a/credentials.cpp b/credentials.cpp
index 56380b187..fc167c40c 100644
--- a/credentials.cpp
+++ b/credentials.cpp
@@ -18,9 +18,9 @@
 #include "credentials.h"
 
 #include <QObject>
-#include <QtCrypto/QtCrypto>
+#include <QtCrypto>
 
-#include <KDebug>
+#include <kdebug.h>
 #include "authorizationmanager.h"
 #include <kstandarddirs.h>
 
diff --git a/credentials.h b/credentials.h
index 9589e30d9..f17f0e7c1 100644
--- a/credentials.h
+++ b/credentials.h
@@ -24,7 +24,7 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QMetaType>
 
-#include <QtCrypto/QtCrypto>
+#include <QtCrypto>
 
 namespace Plasma {
 
diff --git a/private/authorizationmanager_p.h b/private/authorizationmanager_p.h
index 02aaae41e..73eb52a79 100644
--- a/private/authorizationmanager_p.h
+++ b/private/authorizationmanager_p.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCrypto/QtCrypto>
+#include <QtCrypto>
 
 #include <plasma/authorizationmanager.h>
 #include <plasma/credentials.h>
diff --git a/private/joliemessagehelper_p.h b/private/joliemessagehelper_p.h
index 68ba2eabd..a2ed47ccf 100644
--- a/private/joliemessagehelper_p.h
+++ b/private/joliemessagehelper_p.h
@@ -23,8 +23,8 @@
 #include <QByteArray>
 #include <QtJolie/Message>
 #include <QtJolie/Value>
-#include <QtCrypto/QtCrypto>
-#include <KDebug>
+#include <QtCrypto>
+#include <kdebug.h>
 #include <klocalizedstring.h>
 
 namespace Message {