diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index dba14eca..70b2081f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -22,8 +22,8 @@ if (NOT some_x_program)
     message("Warning: Could not determine X binary directory. Assuming ${CMAKE_INSTALL_PREFIX}/bin.")
 endif (NOT some_x_program)
 get_filename_component(proto_xbindir "${some_x_program}" PATH)
-get_filename_component(XBINDIR "${proto_xbindir}" ABSOLUTE)
-get_filename_component(xrootdir "${XBINDIR}" PATH)
+get_filename_component(xbindir "${proto_xbindir}" ABSOLUTE)
+get_filename_component(xrootdir "${xbindir}" PATH)
 set(XLIBDIR "${xrootdir}/lib/X11")
 set(XKBDIR "${xrootdir}/share/X11")
 
diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
index 68b7eb9c..30d02ecf 100644
--- a/config-workspace.h.cmake
+++ b/config-workspace.h.cmake
@@ -18,9 +18,6 @@
 /* KDE's default home directory */
 #cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}"
 
-/* KDE's binaries directory */
-#define KDE_BINDIR "${KDE4_BIN_INSTALL_DIR}"
-
 /* KDE's configuration directory */
 #define KDE_CONFDIR "${KDE4_CONFIG_INSTALL_DIR}"
 
@@ -33,9 +30,6 @@
 /* KDE's system configuration directory */
 #define KDE_SYSCONFDIR "${KDE4_SYSCONF_INSTALL_DIR}"
 
-/* X binaries directory */
-#cmakedefine XBINDIR "${XBINDIR}"
-
 /* X libraries directory */
 #cmakedefine XLIBDIR "${XLIBDIR}"
 
diff --git a/kgreeter/CMakeLists.txt b/kgreeter/CMakeLists.txt
index 6e0fdc27..34f5dcbe 100644
--- a/kgreeter/CMakeLists.txt
+++ b/kgreeter/CMakeLists.txt
@@ -8,7 +8,6 @@ set_package_properties(GLIB2 PROPERTIES
     PURPOSE "Needed for the LightDM greeter"
 )
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_subdirectory(kcm)
 
 include_directories(