diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 228fca5a00..b675872faf 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kconfiggroup.h>
 #include <KLocalizedString>
-#include <kdeversion.h>
 #include <ksharedconfig.h>
 
 #include <QDebug>
diff --git a/cursor.cpp b/cursor.cpp
index efe016c6db..4e3138b4bf 100644
--- a/cursor.cpp
+++ b/cursor.cpp
@@ -25,8 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "utils.h"
 // KDE
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KSharedConfig>
 // Qt
 #include <QTimer>
 // Xlib
diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp
index c196e3efd7..bb64b46a6b 100644
--- a/kcmkwin/kwindecoration/decorationmodel.cpp
+++ b/kcmkwin/kwindecoration/decorationmodel.cpp
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KDE
 #include <KConfigGroup>
 #include <KDesktopFile>
-#include <KIcon>
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KPluginInfo>
diff --git a/kcmkwin/kwinrules/ruleslist.cpp b/kcmkwin/kwinrules/ruleslist.cpp
index 0353c66da1..4c85f3d506 100644
--- a/kcmkwin/kwinrules/ruleslist.cpp
+++ b/kcmkwin/kwinrules/ruleslist.cpp
@@ -18,8 +18,6 @@
 
 #include "ruleslist.h"
 
-#include <klistwidget.h>
-#include <kpushbutton.h>
 #include <assert.h>
 #include <QDebug>
 #include <kconfig.h>
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index a1c5c49973..179a159c95 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -19,11 +19,9 @@
 #include "ruleswidget.h"
 
 #include <klineedit.h>
-#include <krestrictedline.h>
 #include <kcombobox.h>
 #include <kcolorschememanager.h>
 #include <QCheckBox>
-#include <kpushbutton.h>
 #include <QFileInfo>
 #include <QLabel>
 #include <kwindowsystem.h>
diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp
index 71343656c7..8e4d159f5f 100644
--- a/kcmkwin/kwintabbox/main.cpp
+++ b/kcmkwin/kwintabbox/main.cpp
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KPluginFactory>
 #include <KPluginInfo>
 #include <KPluginLoader>
-#include <KTabWidget>
 #include <KTitleWidget>
 #include <KServiceTypeTrader>
 #include <KShortcutsEditor>
diff --git a/killer/killer.cpp b/killer/killer.cpp
index 5f36cf87af..9165b387a4 100644
--- a/killer/killer.cpp
+++ b/killer/killer.cpp
@@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <KMessageBox>
 #include <KLocalizedString>
-#include <KAuth/Action>
+#include <KAuth/KAuthAction>
 #include <QApplication>
 #include <qcommandlineparser.h>
 #include <QDebug>
diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp
index e44e441e4c..d08aebcbb9 100644
--- a/libkdecorations/kdecoration_plugins_p.cpp
+++ b/libkdecorations/kdecoration_plugins_p.cpp
@@ -27,7 +27,6 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration_plugins_p.h"
 
 #include <kconfig.h>
-#include <klocale.h>
 #include <klibrary.h>
 #include <KPluginFactory>
 #include <KPluginLoader>
diff --git a/libkwineffects/kwinxrenderutils.h b/libkwineffects/kwinxrenderutils.h
index c57b6fc127..e1334de407 100644
--- a/libkwineffects/kwinxrenderutils.h
+++ b/libkwineffects/kwinxrenderutils.h
@@ -24,9 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KWin
 #include <kwinglobals.h>
 #include <kwineffects_export.h>
-// KDE
-#include <KSharedPtr>
 // Qt
+#include <QExplicitlySharedDataPointer>
 #include <QRegion>
 #include <QVector>
 // XCB
@@ -74,7 +73,7 @@ public:
     operator xcb_render_picture_t();
 private:
     void fromImage(const QImage &img);
-    KSharedPtr< XRenderPictureData > d;
+    QExplicitlySharedDataPointer< XRenderPictureData > d;
 };
 
 class KWINEFFECTS_EXPORT XFixesRegion