diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index c71854f0..ac1c73f5 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -15,70 +15,7 @@ add_subdirectory(kdnssd)
 add_subdirectory(karchive)
 add_subdirectory(kemail)
 add_subdirectory(knetworkmanager)
-
-######## kidletime ####################
-
-set(kidletime_LIB_SRCS
-    kidletime/kidletime.cpp
-    kidletime/abstractsystempoller.cpp
-    kidletime/widgetbasedpoller.cpp
-)
-
-if (HAVE_XSCREENSAVER)
-    set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS}
-        kidletime/xscreensaverbasedpoller.cpp
-    )
-endif()
-
-if(HAVE_XSYNC)
-    set(kidletime_LIB_SRCS
-        ${kidletime_LIB_SRCS}
-        kidletime/xsyncbasedpoller.cpp
-    )
-endif()
-
-set_source_files_properties(
-    ${CMAKE_SOURCE_DIR}/kutils/kidletime/xscreensaverbasedpoller.cpp
-    ${CMAKE_SOURCE_DIR}/kutils/kidletime/xsyncbasedpoller.cpp
-    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
-)
-
-add_library(kidletime SHARED ${kidletime_LIB_SRCS})
-
-target_link_libraries(kidletime PUBLIC
-    ${QT_QTGUI_LIBRARY}
-    kdecore
-    kdeui
-)
-
-if(HAVE_XSCREENSAVER)
-    target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
-endif()
-
-if(HAVE_XSYNC)
-    target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
-endif()
-target_link_libraries(kidletime PRIVATE ${X11_X11_LIB})
-
-set_target_properties(kidletime PROPERTIES
-    VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION}
-)
-
-generate_export_header(kidletime)
-
-install(
-    FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
-    kidletime/kidletime.h
-    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
-)
-
-install(
-    TARGETS kidletime
-    EXPORT kdelibsTargets
-    DESTINATION ${KDE4_LIB_INSTALL_DIR}
-)
+add_subdirectory(kidletime)
 
 ########### kcmutils ###############
 
diff --git a/kutils/kidletime/CMakeLists.txt b/kutils/kidletime/CMakeLists.txt
new file mode 100644
index 00000000..b50b0826
--- /dev/null
+++ b/kutils/kidletime/CMakeLists.txt
@@ -0,0 +1,68 @@
+project(kidletime)
+
+######## kidletime ####################
+
+set(kidletime_LIB_SRCS
+    kidletime.cpp
+    abstractsystempoller.cpp
+    widgetbasedpoller.cpp
+)
+
+if (HAVE_XSCREENSAVER)
+    set(kidletime_LIB_SRCS
+        ${kidletime_LIB_SRCS}
+        xscreensaverbasedpoller.cpp
+    )
+endif()
+
+if(HAVE_XSYNC)
+    set(kidletime_LIB_SRCS
+        ${kidletime_LIB_SRCS}
+        xsyncbasedpoller.cpp
+    )
+endif()
+
+set_source_files_properties(
+    ${CMAKE_SOURCE_DIR}/kutils/kidletime/xscreensaverbasedpoller.cpp
+    ${CMAKE_SOURCE_DIR}/kutils/kidletime/xsyncbasedpoller.cpp
+    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+)
+
+add_library(kidletime SHARED ${kidletime_LIB_SRCS})
+
+target_link_libraries(kidletime PUBLIC
+    ${QT_QTGUI_LIBRARY}
+    kdecore
+    kdeui
+)
+target_link_libraries(kidletime PRIVATE
+    ${X11_X11_LIB}
+)
+
+if(HAVE_XSCREENSAVER)
+    target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
+endif()
+
+if(HAVE_XSYNC)
+    target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
+endif()
+
+set_target_properties(kidletime PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+generate_export_header(kidletime)
+
+install(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
+    kidletime.h
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
+)
+
+install(
+    TARGETS kidletime
+    EXPORT kdelibsTargets
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
diff --git a/kutils/kidletime/kidletime.h b/kutils/kidletime/kidletime.h
index 6754c8e0..59b72d3b 100644
--- a/kutils/kidletime/kidletime.h
+++ b/kutils/kidletime/kidletime.h
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QHash>
 #include <kidletime_export.h>
+
 class KIdleTimePrivate;
 
 /**
diff --git a/kutils/kidletime/xsyncbasedpoller.cpp b/kutils/kidletime/xsyncbasedpoller.cpp
index 818e0c30..cfd0a092 100644
--- a/kutils/kidletime/xsyncbasedpoller.cpp
+++ b/kutils/kidletime/xsyncbasedpoller.cpp
@@ -47,11 +47,11 @@ XSyncBasedPoller *XSyncBasedPoller::instance()
 }
 
 XSyncBasedPoller::XSyncBasedPoller(QWidget *parent)
-        : AbstractSystemPoller(parent)
-        , m_display(QX11Info::display())
-        , m_idleCounter(X::None)
-        , m_resetAlarm(X::None)
-        , m_available(true)
+    : AbstractSystemPoller(parent)
+    , m_display(QX11Info::display())
+    , m_idleCounter(X::None)
+    , m_resetAlarm(X::None)
+    , m_available(true)
 {
     Q_ASSERT(!s_globalXSyncBasedPoller->q);
     s_globalXSyncBasedPoller->q = this;