diff --git a/ksmserver/config-ksmserver.h.cmake b/ksmserver/config-ksmserver.h.cmake
index f24e62d7c..0b58e7b6c 100644
--- a/ksmserver/config-ksmserver.h.cmake
+++ b/ksmserver/config-ksmserver.h.cmake
@@ -1,12 +1,4 @@
 /* Define to 1 if you have the `_IceTransNoListen' function. */
 #cmakedefine HAVE__ICETRANSNOLISTEN 1
 
-#ifndef KSMSERVER_UNIT_TEST
-#define KCHECKPASS_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kcheckpass"
-#else
-#define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/screenlocker/greeter/autotests/fakekcheckpass"
-#endif
-
-#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kscreenlocker_greet"
-
 #define KWIN_BIN "${KWIN_BIN}"
diff --git a/ksmserver/screenlocker/CMakeLists.txt b/ksmserver/screenlocker/CMakeLists.txt
index 97da3931a..a5f819bf8 100644
--- a/ksmserver/screenlocker/CMakeLists.txt
+++ b/ksmserver/screenlocker/CMakeLists.txt
@@ -4,10 +4,12 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kscreenlocker\")
 # adjusting CMAKE_C_FLAGS to get wayland protocols to compile
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
 
+configure_file(config-kscreenlocker.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kscreenlocker.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 add_subdirectory(kcheckpass)
 add_subdirectory(greeter)
 add_subdirectory(kcm)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
 
 set(screensaver_dbusXML dbus/org.freedesktop.ScreenSaver.xml)
 set(kscreensaver_dbusXML dbus/org.kde.screensaver.xml)
diff --git a/ksmserver/screenlocker/autotests/CMakeLists.txt b/ksmserver/screenlocker/autotests/CMakeLists.txt
index 51eb0feaf..73a340de2 100644
--- a/ksmserver/screenlocker/autotests/CMakeLists.txt
+++ b/ksmserver/screenlocker/autotests/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DKSMSERVER_UNIT_TEST)
+add_definitions(-DKSCREENLOCKER_UNIT_TEST)
 include(ECMMarkAsTest)
 
 #######################################
diff --git a/ksmserver/screenlocker/config-kscreenlocker.h.cmake b/ksmserver/screenlocker/config-kscreenlocker.h.cmake
new file mode 100644
index 000000000..2a034dee8
--- /dev/null
+++ b/ksmserver/screenlocker/config-kscreenlocker.h.cmake
@@ -0,0 +1,7 @@
+#ifndef KSCREENLOCKER_UNIT_TEST
+#define KCHECKPASS_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kcheckpass"
+#else
+#define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/greeter/autotests/fakekcheckpass"
+#endif
+
+#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kscreenlocker_greet"
diff --git a/ksmserver/screenlocker/greeter/CMakeLists.txt b/ksmserver/screenlocker/greeter/CMakeLists.txt
index 942d88cd7..2c15430e4 100644
--- a/ksmserver/screenlocker/greeter/CMakeLists.txt
+++ b/ksmserver/screenlocker/greeter/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kscreenlocker_greet\")
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ../kcheckpass
-    ${CMAKE_CURRENT_BINARY_DIR}/../../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
 set(kscreenlocker_greet_SRCS
diff --git a/ksmserver/screenlocker/greeter/authenticator.cpp b/ksmserver/screenlocker/greeter/authenticator.cpp
index 4d916a1ba..1389c6dc6 100644
--- a/ksmserver/screenlocker/greeter/authenticator.cpp
+++ b/ksmserver/screenlocker/greeter/authenticator.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "authenticator.h"
 #include <kcheckpass-enums.h>
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 
 // Qt
 #include <QFile>
diff --git a/ksmserver/screenlocker/greeter/autotests/CMakeLists.txt b/ksmserver/screenlocker/greeter/autotests/CMakeLists.txt
index 4244a2aec..73b32d09d 100644
--- a/ksmserver/screenlocker/greeter/autotests/CMakeLists.txt
+++ b/ksmserver/screenlocker/greeter/autotests/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DKSMSERVER_UNIT_TEST)
+add_definitions(-DKSCREENLOCKER_UNIT_TEST)
 include(ECMMarkAsTest)
 
 #####################################
diff --git a/ksmserver/screenlocker/greeter/autotests/killtest.cpp b/ksmserver/screenlocker/greeter/autotests/killtest.cpp
index 363c9f03e..b0483fa74 100644
--- a/ksmserver/screenlocker/greeter/autotests/killtest.cpp
+++ b/ksmserver/screenlocker/greeter/autotests/killtest.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 // own
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 // Qt
 #include <QDebug>
 #include <QtTest/QtTest>
diff --git a/ksmserver/screenlocker/kcm/CMakeLists.txt b/ksmserver/screenlocker/kcm/CMakeLists.txt
index c5c62be4a..1abfda239 100644
--- a/ksmserver/screenlocker/kcm/CMakeLists.txt
+++ b/ksmserver/screenlocker/kcm/CMakeLists.txt
@@ -5,7 +5,7 @@ set(screenlocker_kcm_SRCS
     kcm.cpp
     selectimagebutton.cpp
 )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
 
 ki18n_wrap_ui(screenlocker_kcm_SRCS kcm.ui)
 kconfig_add_kcfg_files(screenlocker_kcm_SRCS ../kcfg/kscreensaversettings.kcfgc)
diff --git a/ksmserver/screenlocker/kcm/kcm.cpp b/ksmserver/screenlocker/kcm/kcm.cpp
index 053344933..bf1da583b 100644
--- a/ksmserver/screenlocker/kcm/kcm.cpp
+++ b/ksmserver/screenlocker/kcm/kcm.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kscreensaversettings.h"
 #include "ui_kcm.h"
 #include "screenlocker_interface.h"
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 #include <KActionCollection>
 #include <KGlobalAccel>
 #include <KCModule>
diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
index d4c4c83de..59334c468 100644
--- a/ksmserver/screenlocker/ksldapp.cpp
+++ b/ksmserver/screenlocker/ksldapp.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "waylandlocker.h"
 #include "logind.h"
 #include "kscreensaversettings.h"
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 #include <config-X11.h>
 #include "waylandserver.h"
 // KDE
diff --git a/ksmserver/screenlocker/waylandserver.cpp b/ksmserver/screenlocker/waylandserver.cpp
index f8ef66533..f57a5f4a4 100644
--- a/ksmserver/screenlocker/waylandserver.cpp
+++ b/ksmserver/screenlocker/waylandserver.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "waylandserver.h"
 // ksld
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 // Wayland
 #include <wayland-server.h>
 #include <wayland-ksld-server-protocol.h>