diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9db344f4..21d84b31c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,14 +14,24 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/kdecore/sycoca
                     ${CMAKE_SOURCE_DIR}/kdecore/util
                     ${CMAKE_BINARY_DIR}/kdeui/
+                    ${CMAKE_SOURCE_DIR}/kdeui/
+                    ${CMAKE_SOURCE_DIR}/kdeui/actions
                     ${CMAKE_SOURCE_DIR}/kdeui/about
                     ${CMAKE_SOURCE_DIR}/kdeui/config
+                    ${CMAKE_SOURCE_DIR}/kdeui/colors
+                    ${CMAKE_SOURCE_DIR}/kdeui/dialogs
+                    ${CMAKE_SOURCE_DIR}/kdeui/kernel
                     ${CMAKE_SOURCE_DIR}/kdeui/icons
+                    ${CMAKE_SOURCE_DIR}/kdeui/paged
                     ${CMAKE_SOURCE_DIR}/kdeui/shortcuts
-                    ${CMAKE_SOURCE_DIR}/kio/kio
+                    ${CMAKE_SOURCE_DIR}/kdeui/util
+                    ${CMAKE_SOURCE_DIR}/kdeui/widgets
+                    ${CMAKE_SOURCE_DIR}/kdeui/windowmanagement
                     ${CMAKE_SOURCE_DIR}/kio
-                    ${CMAKE_SOURCE_DIR}/kdeui/
-                    ${CMAKE_SOURCE_DIR}/kdeui/
+                    ${CMAKE_SOURCE_DIR}/kio/kio
+                    ${CMAKE_BINARY_DIR}/solid/
+                    ${CMAKE_SOURCE_DIR}/solid/
+                    ${CMAKE_SOURCE_DIR}/knewstuff/
                     ${KDE4_INCLUDES})
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
     include_directories(${OPENGL_INCLUDE_DIR})
diff --git a/dialog.cpp b/dialog.cpp
index 5542b5675..15248fcf0 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -36,7 +36,7 @@
 #include <QtGui/QGraphicsWidget>
 
 #include <kdebug.h>
-#include <netrootinfo.h>
+#include <netwm.h>
 
 #include "plasma/applet.h"
 #include "plasma/extender.h"
diff --git a/private/applet_p.h b/private/applet_p.h
index 39adc2434..d66817238 100644
--- a/private/applet_p.h
+++ b/private/applet_p.h
@@ -22,7 +22,7 @@
 #ifndef PLASMA_APPLET_P_H
 #define PLASMA_APPLET_P_H
 
-#include <KActionCollection>
+#include <kactioncollection.h>
 
 namespace Plasma
 {
diff --git a/private/applethandle.cpp b/private/applethandle.cpp
index 0b4d9e0de..d5483485a 100644
--- a/private/applethandle.cpp
+++ b/private/applethandle.cpp
@@ -26,11 +26,11 @@
 #include <QtGui/QPainter>
 #include <QtGui/QApplication>
 
-#include <KColorScheme>
-#include <KGlobalSettings>
-#include <KIcon>
-#include <KIconLoader>
-#include <KWindowSystem>
+#include <kcolorscheme.h>
+#include <kglobalsettings.h>
+#include <kicon.h>
+#include <kiconloader.h>
+#include <kwindowsystem.h>
 
 #include <cmath>
 #include <math.h>
diff --git a/private/dataengine_p.h b/private/dataengine_p.h
index a12621652..a6a2e34aa 100644
--- a/private/dataengine_p.h
+++ b/private/dataengine_p.h
@@ -22,7 +22,8 @@
 
 #include <QQueue>
 #include <QTime>
-#include <KPluginInfo>
+
+#include <kplugininfo.h>
 
 class QTime;
 
diff --git a/private/desktoptoolbox.cpp b/private/desktoptoolbox.cpp
index f8d419b82..3e9867694 100644
--- a/private/desktoptoolbox.cpp
+++ b/private/desktoptoolbox.cpp
@@ -25,11 +25,12 @@
 #include <QRadialGradient>
 #include <QGraphicsView>
 
+#include <kcolorscheme.h>
+#include <kdebug.h>
+
 #include <plasma/theme.h>
 #include <plasma/paintutils.h>
-#include <KColorScheme>
 
-#include <KDebug>
 
 #include <plasma/applet.h>
 
diff --git a/private/desktoptoolbox_p.h b/private/desktoptoolbox_p.h
index 533ed8126..a2ee97c8e 100644
--- a/private/desktoptoolbox_p.h
+++ b/private/desktoptoolbox_p.h
@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QTime>
 
-#include <KIcon>
+#include <kicon.h>
 
 #include <private/toolbox_p.h>
 
diff --git a/private/nativetabbar.cpp b/private/nativetabbar.cpp
index 9edfff3f9..0f0503f5a 100644
--- a/private/nativetabbar.cpp
+++ b/private/nativetabbar.cpp
@@ -21,10 +21,6 @@
 // Own
 #include "nativetabbar_p.h"
 
-// KDE
-#include <KDebug>
-#include <KColorUtils>
-
 // Qt
 #include <QIcon>
 #include <QMouseEvent>
@@ -36,6 +32,10 @@
 #include <QGradient>
 #include <QLinearGradient>
 
+// KDE
+#include <kdebug.h>
+#include <kcolorutils.h>
+
 #include "plasma/plasma.h"
 #include "plasma/theme.h"
 #include "plasma/animator.h"
diff --git a/private/packages.cpp b/private/packages.cpp
index ee2bd9339..06c550f8f 100644
--- a/private/packages.cpp
+++ b/private/packages.cpp
@@ -19,10 +19,10 @@
 
 #include "private/packages_p.h"
 
-#include <KConfigGroup>
-#include <KDesktopFile>
-#include <KLocale>
-#include <KMessageBox>
+#include <kconfiggroup.h>
+#include <kdesktopfile.h>
+#include <klocale.h>
+#include <kmessagebox.h>
 
 #include <knewstuff2/engine.h>
 
diff --git a/private/paneltoolbox.cpp b/private/paneltoolbox.cpp
index f6eb54940..2f932fa4e 100644
--- a/private/paneltoolbox.cpp
+++ b/private/paneltoolbox.cpp
@@ -25,13 +25,12 @@
 #include <QRadialGradient>
 #include <QApplication>
 
-#include <plasma/theme.h>
-#include <plasma/paintutils.h>
-#include <KColorScheme>
-
-#include <KDebug>
+#include <kcolorscheme.h>
+#include <kdebug.h>
 
 #include <plasma/applet.h>
+#include <plasma/paintutils.h>
+#include <plasma/theme.h>
 
 namespace Plasma
 {
diff --git a/private/paneltoolbox_p.h b/private/paneltoolbox_p.h
index 003d6389b..2e96413b9 100644
--- a/private/paneltoolbox_p.h
+++ b/private/paneltoolbox_p.h
@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QTime>
 
-#include <KIcon>
+#include <kicon.h>
 
 #include <private/toolbox_p.h>
 
diff --git a/private/service_p.h b/private/service_p.h
index d7208020d..f82f4eb16 100644
--- a/private/service_p.h
+++ b/private/service_p.h
@@ -27,7 +27,7 @@
 #include <QWidget>
 #include <QSet>
 
-#include <KTemporaryFile>
+#include <ktemporaryfile.h>
 
 namespace Plasma
 {
diff --git a/private/style.cpp b/private/style.cpp
index 0f5d79aa7..ab03e3e11 100644
--- a/private/style.cpp
+++ b/private/style.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QStyleOptionComplex>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include <plasma/framesvg.h>
 
diff --git a/private/toolbox.cpp b/private/toolbox.cpp
index 0c81dea60..46e4c46da 100644
--- a/private/toolbox.cpp
+++ b/private/toolbox.cpp
@@ -25,8 +25,8 @@
 #include <QPainter>
 #include <QRadialGradient>
 
-#include <KColorScheme>
-#include <KDebug>
+#include <kcolorscheme.h>
+#include <kdebug.h>
 
 #include <plasma/theme.h>
 #include "widgets/iconwidget.h"
diff --git a/private/tooltip.cpp b/private/tooltip.cpp
index b1ff5a890..439d7cdb0 100644
--- a/private/tooltip.cpp
+++ b/private/tooltip.cpp
@@ -30,12 +30,12 @@
 #include <QTimeLine>
 #ifdef Q_WS_X11
 #include <QX11Info>
-#include <NETRootInfo>
+#include <netwm.h>
 #endif
 
-#include <KDebug>
-#include <KGlobal>
-#include <KGlobalSettings>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
 
 #include <plasma/plasma.h>
 #include <plasma/theme.h>
diff --git a/private/windowpreview.cpp b/private/windowpreview.cpp
index 5d10d8a3b..6e5dca675 100644
--- a/private/windowpreview.cpp
+++ b/private/windowpreview.cpp
@@ -20,7 +20,7 @@
 
 #include "windowpreview_p.h"
 
-#include <KWindowSystem>
+#include <kwindowsystem.h>
 
 #ifdef Q_WS_X11
 #include <QX11Info>
diff --git a/scripting/appletscript.h b/scripting/appletscript.h
index 7487f0a93..5b33f1c1b 100644
--- a/scripting/appletscript.h
+++ b/scripting/appletscript.h
@@ -24,7 +24,7 @@
 #include <QtCore/QRect>
 #include <QtCore/QSizeF>
 
-#include <KDE/KGenericFactory>
+#include <kgenericfactory.h>
 
 #include <plasma/plasma_export.h>
 #include <plasma/scripting/scriptengine.h>
diff --git a/scripting/dataenginescript.h b/scripting/dataenginescript.h
index f159d5f74..f09094c22 100644
--- a/scripting/dataenginescript.h
+++ b/scripting/dataenginescript.h
@@ -20,7 +20,7 @@
 #ifndef PLASMA_DATAENGINESCRIPT_H
 #define PLASMA_DATAENGINESCRIPT_H
 
-#include <KDE/KGenericFactory>
+#include <kgenericfactory.h>
 
 #include <plasma/plasma_export.h>
 #include <plasma/scripting/scriptengine.h>
diff --git a/scripting/runnerscript.h b/scripting/runnerscript.h
index a4fa0d435..6cb8e87c3 100644
--- a/scripting/runnerscript.h
+++ b/scripting/runnerscript.h
@@ -20,7 +20,7 @@
 #ifndef PLASMA_RUNNERSCRIPT_H
 #define PLASMA_RUNNERSCRIPT_H
 
-#include <KDE/KGenericFactory>
+#include <kgenericfactory.h>
 
 #include <plasma/plasma_export.h>
 #include <plasma/scripting/scriptengine.h>
diff --git a/scripting/scriptengine.cpp b/scripting/scriptengine.cpp
index d23490b1a..a5d265b33 100644
--- a/scripting/scriptengine.cpp
+++ b/scripting/scriptengine.cpp
@@ -19,9 +19,9 @@
 
 #include "scripting/scriptengine.h"
 
-#include <KDebug>
-#include <KService>
-#include <KServiceTypeTrader>
+#include <kdebug.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
 
 #include "abstractrunner.h"
 #include "applet.h"