diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fc9ffe0f..f4298ccff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,11 +301,9 @@ configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h
 configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
 
 # Needed for the calls to kconfig_add_kcfg_files in some modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tier2/kconfig/cmake")
 set(KCONFIG_KCFGC_EXECUTABLE kconfig_compiler)
 include(KConfigMacros)
 
-set(kde4support_LIBRARY kde4support)
 
 ################# list the subdirectories #################
 
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index f503cba4e..c083329c8 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -24,31 +24,34 @@ endif(NOT X11_FOUND)
 #find_package(Gpgme)
 #macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
 
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
-                    ${KDE4_KDECORE_INCLUDES}
-                    ${KDE4_KDEUI_INCLUDES}
-                    ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
-                    ${CMAKE_BINARY_DIR}/experimental/libkdeclarative
-                    ${karchive_SOURCE_DIR}/src
-                    ${karchive_BINARY_DIR}/src
-                    ${CMAKE_SOURCE_DIR}/tier2/kauth/src/
-                    ${CMAKE_BINARY_DIR}/tier2/kauth/src/
-                    ${CMAKE_SOURCE_DIR}/tier1/threadweaver/src
-                    ${CMAKE_BINARY_DIR}/tier1/threadweaver/src
-                    ${CMAKE_BINARY_DIR}/tier1/threadweaver/src/Weaver
-                    ${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/
-                    ${CMAKE_BINARY_DIR}/tier1/kwindowsystem/
-                    ${CMAKE_SOURCE_DIR}/tier1/solid/src
-                    ${CMAKE_BINARY_DIR}/tier1/solid/src
+                    ${KDE4_INCLUDE_DIR}
+                    ${KDE4_INCLUDE_DIR}/KDE
+#                    ${KDE4_KDEUI_INCLUDES}
+#                     ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
+#                     ${CMAKE_BINARY_DIR}/experimental/libkdeclarative
+#                     ${karchive_SOURCE_DIR}/src
+#                     ${karchive_BINARY_DIR}/src
+#                     ${CMAKE_SOURCE_DIR}/tier2/kauth/src/
+#                     ${CMAKE_BINARY_DIR}/tier2/kauth/src/
+#                     ${CMAKE_SOURCE_DIR}/tier1/threadweaver/src
+#                     ${CMAKE_BINARY_DIR}/tier1/threadweaver/src
+#                     ${CMAKE_BINARY_DIR}/tier1/threadweaver/src/Weaver
+#                     ${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/
+#                     ${CMAKE_BINARY_DIR}/tier1/kwindowsystem/
+#                     ${CMAKE_SOURCE_DIR}/tier1/solid/src
+#                     ${CMAKE_BINARY_DIR}/tier1/solid/src
+#                     ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/caching
                     ${CMAKE_SOURCE_DIR}/plasma/remote
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/includes
-                    ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/caching
                     ${ki18n_SOURCE_DIR}/src
                     ${ki18n_BINARY_DIR}/src
+                    ${KDE4_INCLUDE_DIR}/threadweaver
+                    #FIXME: this will go into Qt upstream
+                    ${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
                     )
 
 if(NOT PLASMA_NO_KIO)
diff --git a/plasma/applet.cpp b/plasma/applet.cpp
index 54b186642..d828a8d13 100644
--- a/plasma/applet.cpp
+++ b/plasma/applet.cpp
@@ -73,7 +73,6 @@
 #include "configloader.h"
 #include "containment.h"
 #include "corona.h"
-#include "dialog.h"
 #include "package.h"
 #include "plasma.h"
 #include "scripting/appletscript.h"
diff --git a/plasma/private/runnerjobs.cpp b/plasma/private/runnerjobs.cpp
index 74912a384..a012a6cbb 100644
--- a/plasma/private/runnerjobs.cpp
+++ b/plasma/private/runnerjobs.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 
 //#include <Weaver/DebuggingAids.h>
-#include <Weaver/ThreadWeaver.h>
+#include <threadweaver/ThreadWeaver.h>
 
 #include "runnermanager.h"
 #include "plasma/querymatch.h"
diff --git a/plasma/private/runnerjobs_p.h b/plasma/private/runnerjobs_p.h
index 0f400983e..496fbccc0 100644
--- a/plasma/private/runnerjobs_p.h
+++ b/plasma/private/runnerjobs_p.h
@@ -24,8 +24,8 @@
 #include <QMutex>
 #include <QSet>
 
-#include <Weaver/Job.h>
-#include <Weaver/QueuePolicy.h>
+#include <threadweaver/Job.h>
+#include <threadweaver/QueuePolicy.h>
 
 #include "abstractrunner.h"
 
diff --git a/plasma/runnermanager.cpp b/plasma/runnermanager.cpp
index b016ebab3..ad8478b85 100644
--- a/plasma/runnermanager.cpp
+++ b/plasma/runnermanager.cpp
@@ -37,10 +37,10 @@
 #include <solid/deviceinterface.h>
 #endif
 
-#include <Weaver/DebuggingAids.h>
-#include <Weaver/State.h>
-#include <Weaver/Thread.h>
-#include <Weaver/ThreadWeaver.h>
+#include <threadweaver/DebuggingAids.h>
+#include <threadweaver/State.h>
+#include <threadweaver/Thread.h>
+#include <threadweaver/ThreadWeaver.h>
 
 #include "private/runnerjobs_p.h"
 #include "pluginloader.h"