diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21d84b31c..b2a8517b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/kdeui/windowmanagement
                     ${CMAKE_SOURCE_DIR}/kio
                     ${CMAKE_SOURCE_DIR}/kio/kio
+                    ${CMAKE_SOURCE_DIR}/knewstuff/
                     ${CMAKE_BINARY_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/solid/
-                    ${CMAKE_SOURCE_DIR}/knewstuff/
+                    ${CMAKE_SOURCE_DIR}/threadweaver/
                     ${KDE4_INCLUDES})
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
     include_directories(${OPENGL_INCLUDE_DIR})
diff --git a/runnermanager.cpp b/runnermanager.cpp
index e995809d2..e01e9d5e8 100644
--- a/runnermanager.cpp
+++ b/runnermanager.cpp
@@ -33,11 +33,11 @@
 #include <solid/device.h>
 #include <solid/deviceinterface.h>
 
-#include <threadweaver/debuggingaids.h.h>
-#include <threadweaver/thread.h>
-#include <threadweaver/job.h>
-#include <threadweaver/queuepolicy.h>
-#include <threadweaver/weaver.h>
+#include <Weaver/DebuggingAids.h>
+#include <Weaver/Thread.h>
+#include <Weaver/Job.h>
+#include <Weaver/QueuePolicy.h>
+#include <Weaver/ThreadWeaver.h>
 
 #include "querymatch.h"
 
diff --git a/service.cpp b/service.cpp
index 0f6d569a1..dbaed192f 100644
--- a/service.cpp
+++ b/service.cpp
@@ -23,7 +23,7 @@
 #include <QFile>
 #include <QTimer>
 
-#include <kdebug.h.h>
+#include <kdebug.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <ksharedconfig.h>
diff --git a/theme.cpp b/theme.cpp
index 8d68f7a5f..cd9876c5a 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -31,8 +31,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
+#include <kmanagerselection.h>
 #include <kpixmapcache.h>
-#include <kselectionwatcher.h>
 #include <ksharedconfig.h>
 #include <kstandarddirs.h>
 #include <kwindowsystem.h>
diff --git a/tooltipcontent.cpp b/tooltipcontent.cpp
index 4987faacb..5fefba7e6 100644
--- a/tooltipcontent.cpp
+++ b/tooltipcontent.cpp
@@ -19,7 +19,7 @@
 
 #include "tooltipcontent.h"
 
-#include <kiconloader>
+#include <kiconloader.h>
 
 namespace Plasma
 {
diff --git a/view.cpp b/view.cpp
index 5fc821ebd..fe3d7e406 100644
--- a/view.cpp
+++ b/view.cpp
@@ -19,7 +19,7 @@
 
 #include "view.h"
 
-#include <kglobal>
+#include <kglobal.h>
 #include <kwindowsystem.h>
 #include <kactioncollection.h>
 
diff --git a/widgets/checkbox.cpp b/widgets/checkbox.cpp
index a162dbc9f..279941b2c 100644
--- a/widgets/checkbox.cpp
+++ b/widgets/checkbox.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/combobox.cpp b/widgets/combobox.cpp
index 631e55aa0..8c7820382 100644
--- a/widgets/combobox.cpp
+++ b/widgets/combobox.cpp
@@ -19,13 +19,13 @@
 
 #include "combobox.h"
 
-#include <KComboBox>
 #include <QPainter>
 #include <QApplication>
 
-#include <KMimeType>
-#include <KIconEffect>
-#include <KIconLoader>
+#include <kcombobox.h>
+#include <kmimetype.h>
+#include <kiconeffect.h>
+#include <kiconloader.h>
 
 #include "theme.h"
 #include "framesvg.h"
diff --git a/widgets/flashinglabel.cpp b/widgets/flashinglabel.cpp
index b6cf79af1..a57fe3187 100644
--- a/widgets/flashinglabel.cpp
+++ b/widgets/flashinglabel.cpp
@@ -28,7 +28,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QColor>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include <plasma/animator.h>
 
diff --git a/widgets/frame.cpp b/widgets/frame.cpp
index a5a6000fd..a587d50e4 100644
--- a/widgets/frame.cpp
+++ b/widgets/frame.cpp
@@ -27,7 +27,7 @@
 #include <QApplication>
 
 //KDE
-#include <KMimeType>
+#include <kmimetype.h>
 
 //Plasma
 #include "plasma/theme.h"
diff --git a/widgets/groupbox.cpp b/widgets/groupbox.cpp
index 6a2c9180c..3ef182845 100644
--- a/widgets/groupbox.cpp
+++ b/widgets/groupbox.cpp
@@ -22,7 +22,7 @@
 #include <QGroupBox>
 #include <QPainter>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp
index 0b5cf0405..c24994756 100644
--- a/widgets/iconwidget.cpp
+++ b/widgets/iconwidget.cpp
@@ -40,15 +40,15 @@
 #include "effects/blur.cpp"
 #endif
 
-#include <KGlobalSettings>
-#include <KIconEffect>
-#include <KIconLoader>
-#include <KIcon>
-#include <KUrl>
-#include <KRun>
-#include <KMimeType>
-#include <KDebug>
-#include <KColorScheme>
+#include <kglobalsettings.h>
+#include <kiconeffect.h>
+#include <kiconloader.h>
+#include <kicon.h>
+#include <kurl.h>
+#include <krun.h>
+#include <kmimetype.h>
+#include <kdebug.h>
+#include <kcolorscheme.h>
 
 #include <plasma/paintutils.h>
 #include <plasma/theme.h>
diff --git a/widgets/label.cpp b/widgets/label.cpp
index b9dc205cc..9b5fb07dc 100644
--- a/widgets/label.cpp
+++ b/widgets/label.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp
index 824825719..448540762 100644
--- a/widgets/lineedit.cpp
+++ b/widgets/lineedit.cpp
@@ -19,10 +19,10 @@
 
 #include "lineedit.h"
 
-#include <KLineEdit>
 #include <QPainter>
 
-#include <KMimeType>
+#include <klineedit.h>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/pushbutton.cpp b/widgets/pushbutton.cpp
index de9f41320..479f04ab3 100644
--- a/widgets/pushbutton.cpp
+++ b/widgets/pushbutton.cpp
@@ -25,10 +25,10 @@
 #include <QDir>
 #include <QApplication>
 
-#include <KIcon>
-#include <KIconEffect>
-#include <KMimeType>
-#include <KPushButton>
+#include <kicon.h>
+#include <kiconeffect.h>
+#include <kmimetype.h>
+#include <kpushbutton.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/radiobutton.cpp b/widgets/radiobutton.cpp
index 50abf7acd..9c50c8e6f 100644
--- a/widgets/radiobutton.cpp
+++ b/widgets/radiobutton.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/signalplotter.cpp b/widgets/signalplotter.cpp
index 330be3647..5b62ea9e3 100644
--- a/widgets/signalplotter.cpp
+++ b/widgets/signalplotter.cpp
@@ -32,11 +32,11 @@
 #include <QtGui/QPainterPath>
 #include <QtGui/QPolygon>
 
-#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
-#include <KApplication>
-#include <KStandardDirs>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kapplication.h>
+#include <kstandarddirs.h>
 
 #include <plasma/svg.h>
 
diff --git a/widgets/slider.cpp b/widgets/slider.cpp
index 761879258..4a2addb66 100644
--- a/widgets/slider.cpp
+++ b/widgets/slider.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QStyleOptionSlider>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "framesvg.h"
diff --git a/widgets/tabbar.cpp b/widgets/tabbar.cpp
index d199c1040..9d8a77150 100644
--- a/widgets/tabbar.cpp
+++ b/widgets/tabbar.cpp
@@ -28,7 +28,8 @@
 #include <QIcon>
 #include <QStyleOption>
 #include <QPainter>
-#include <KDebug>
+
+#include <kdebug.h>
 
 #include <plasma/animator.h>
 
diff --git a/widgets/template.cpp b/widgets/template.cpp
index d8494e1c9..60dfd82c8 100644
--- a/widgets/template.cpp
+++ b/widgets/template.cpp
@@ -22,7 +22,7 @@
 #include <<Native>>
 #include <QPainter>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/textedit.cpp b/widgets/textedit.cpp
index 1068fdc6d..9145db538 100644
--- a/widgets/textedit.cpp
+++ b/widgets/textedit.cpp
@@ -19,11 +19,11 @@
 
 #include "textedit.h"
 
-#include <KTextEdit>
 #include <QPainter>
 #include <QScrollBar>
 
-#include <KMimeType>
+#include <kmimetype.h>
+#include <ktextedit.h>
 
 #include "theme.h"
 #include "svg.h"
diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp
index 69e4cc880..2c470e04f 100644
--- a/widgets/treeview.cpp
+++ b/widgets/treeview.cpp
@@ -23,7 +23,7 @@
 #include <QHeaderView>
 #include <QScrollBar>
 
-#include <KIconLoader>
+#include <kiconloader.h>
 
 #include "private/style.h"
 
diff --git a/widgets/webview.cpp b/widgets/webview.cpp
index 64eb1cf4a..dc7c9591c 100644
--- a/widgets/webview.cpp
+++ b/widgets/webview.cpp
@@ -27,7 +27,7 @@
 #include <QtWebKit/QWebFrame>
 #include <QtWebKit/QWebPage>
 
-#include <KDE/KDebug>
+#include <kdebug.h>
 
 #include "plasma/widgets/webview.h"