diff --git a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
index 87fd651e5..de2629265 100644
--- a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
+++ b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
@@ -27,7 +27,6 @@
 
 #include <ksharedconfig.h>
 #include <QDebug>
-#include <kglobal.h>
 
 #include <kdeclarative/kdeclarative.h>
 
@@ -44,7 +43,7 @@ class BKSingleton
 public:
    EngineBookKeeping self;
 };
-K_GLOBAL_STATIC(BKSingleton, privateBKSelf)
+Q_GLOBAL_STATIC(BKSingleton, privateBKSelf)
 
 EngineBookKeeping::EngineBookKeeping()
 {
diff --git a/src/plasma/abstractrunner.cpp b/src/plasma/abstractrunner.cpp
index 3fe228ec3..c01ac18e4 100644
--- a/src/plasma/abstractrunner.cpp
+++ b/src/plasma/abstractrunner.cpp
@@ -30,10 +30,8 @@
 #include <QDebug>
 #include <kplugininfo.h>
 #include <kservicetypetrader.h>
-#include <kstandarddirs.h>
 #include <klocalizedstring.h>
 #include <kiconloader.h>
-#include <kglobal.h>
 #include <qstandardpaths.h>
 
 #include "package.h"
diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp
index 0974c021e..a56448229 100644
--- a/src/plasma/dataengine.cpp
+++ b/src/plasma/dataengine.cpp
@@ -29,10 +29,8 @@
 
 #include <QDebug>
 #include <kplugininfo.h>
-#include <kglobal.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
-#include <kstandarddirs.h>
 #include <klocalizedstring.h>
 
 #include "datacontainer.h"
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 532382669..864aa5866 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -28,7 +28,6 @@
 #include <QDebug>
 #include <kdesktopfile.h>
 #include <kservicetypetrader.h>
-#include <kstandarddirs.h>
 #include <ktar.h>
 #include <kzip.h>
 
diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp
index 49914923e..4d8633c8c 100644
--- a/src/plasma/pluginloader.cpp
+++ b/src/plasma/pluginloader.cpp
@@ -24,8 +24,6 @@
 #include <QDebug>
 #include <kservice.h>
 #include <kservicetypetrader.h>
-#include <kglobal.h>
-#include <kplugininfo.h>
 #include <kplugintrader.h>
 
 #include "config-plasma.h"
diff --git a/src/plasma/private/applet_p.cpp b/src/plasma/private/applet_p.cpp
index 8c448727f..b9e68bab9 100644
--- a/src/plasma/private/applet_p.cpp
+++ b/src/plasma/private/applet_p.cpp
@@ -33,8 +33,6 @@
 #include <klocale.h>
 #include <klocalizedstring.h>
 #include <kkeysequencewidget.h>
-#include <kstandarddirs.h>
-#include <kglobal.h>
 #include <kglobalaccel.h>
 
 #include "containment.h"
diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp
index 990f6b16a..daf0abf15 100644
--- a/src/plasma/theme.cpp
+++ b/src/plasma/theme.cpp
@@ -32,11 +32,9 @@
 #include "config-plasma.h"
 
 #include <kcolorscheme.h>
-#include <kcomponentdata.h>
 #include <kconfiggroup.h>
 #include <QDebug>
 #include <kdirwatch.h>
-#include <kglobal.h>
 #include <kmanagerselection.h>
 #include <kimagecache.h>
 #include <ksharedconfig.h>
diff --git a/src/plasmapkg/plasmapkg.cpp b/src/plasmapkg/plasmapkg.cpp
index 41a3bb657..a5a616097 100644
--- a/src/plasmapkg/plasmapkg.cpp
+++ b/src/plasmapkg/plasmapkg.cpp
@@ -30,8 +30,6 @@
 #include <plasma/packagestructure.h>
 #include <plasma/package.h>
 #include <plasma/pluginloader.h>
-#include <kglobal.h>
-#include <klocale.h>
 #include <kjob.h>
 
 #include <qcommandlineparser.h>
diff --git a/src/plasmaquick/configmodel.cpp b/src/plasmaquick/configmodel.cpp
index 3e41a64e2..f495556fd 100644
--- a/src/plasmaquick/configmodel.cpp
+++ b/src/plasmaquick/configmodel.cpp
@@ -32,7 +32,6 @@
 #include <QQmlContext>
 #include <QQuickItem>
 
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kdeclarative/kdeclarative.h>
 
diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp
index 02c73a276..e0888d27d 100644
--- a/src/plasmaquick/configview.cpp
+++ b/src/plasmaquick/configview.cpp
@@ -32,7 +32,6 @@
 #include <QQmlContext>
 #include <QQuickItem>
 
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kdeclarative/kdeclarative.h>
 
diff --git a/src/plasmaquick/private/configcategory_p.cpp b/src/plasmaquick/private/configcategory_p.cpp
index 9a0e61f58..5183d3793 100644
--- a/src/plasmaquick/private/configcategory_p.cpp
+++ b/src/plasmaquick/private/configcategory_p.cpp
@@ -32,7 +32,6 @@
 #include <QQmlContext>
 #include <QQuickItem>
 
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kdeclarative/kdeclarative.h>
 
diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
index f715f7ddf..4af21a98d 100644
--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
@@ -34,7 +34,6 @@
 #include <klocalizedstring.h>
 #include <kurlmimedata.h>
 #include <QMimeDatabase>
-#include <ktemporaryfile.h>
 
 #ifndef PLASMA_NO_KIO
 #include "kio/jobclasses.h" // for KIO::JobFlags
diff --git a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
index 648f59ea5..b8d0c7fdc 100644
--- a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
+++ b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
@@ -30,8 +30,6 @@
 
 #include <kconfiggroup.h>
 #include <QDebug>
-#include <kglobal.h>
-#include <klocale.h>
 #include <klocalizedstring.h>
 
 #include <Plasma/Applet>
diff --git a/src/shell/activity.cpp b/src/shell/activity.cpp
index 4e722e6cc..3454c2367 100644
--- a/src/shell/activity.cpp
+++ b/src/shell/activity.cpp
@@ -29,7 +29,6 @@
 
 #include <kactioncollection.h>
 #include <kconfig.h>
-#include <kstandarddirs.h>
 #include <kwindowsystem.h>
 
 #include <Plasma/Containment>
diff --git a/src/shell/panelconfigview.cpp b/src/shell/panelconfigview.cpp
index fbd877cf1..beebffa6e 100644
--- a/src/shell/panelconfigview.cpp
+++ b/src/shell/panelconfigview.cpp
@@ -27,7 +27,6 @@
 #include <QQmlContext>
 #include <QScreen>
 
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kwindoweffects.h>
 
diff --git a/src/shell/panelshadows.cpp b/src/shell/panelshadows.cpp
index c07061a81..d2fa85bb8 100644
--- a/src/shell/panelshadows.cpp
+++ b/src/shell/panelshadows.cpp
@@ -30,7 +30,6 @@
 #endif
 
 #include <qdebug.h>
-#include <kglobal.h>
 
 class PanelShadows::Private
 {
@@ -94,7 +93,7 @@ public:
    PanelShadows self;
 };
 
-K_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
+Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
 
 PanelShadows::PanelShadows(QObject *parent, const QString &prefix)
     : Plasma::Svg(parent),
diff --git a/src/shell/scripting/appinterface.cpp b/src/shell/scripting/appinterface.cpp
index 79e36d531..a9d4b5791 100644
--- a/src/shell/scripting/appinterface.cpp
+++ b/src/shell/scripting/appinterface.cpp
@@ -22,9 +22,6 @@
 #include <QEventLoop>
 #include <QTimer>
 
-#include <kcomponentdata.h>
-#include <k4aboutdata.h>
-
 #include <solid/device.h>
 
 #include <Plasma/Containment>
diff --git a/src/shell/scripting/scriptengine.cpp b/src/shell/scripting/scriptengine.cpp
index 76c992f9a..eb0fa3fc5 100644
--- a/src/shell/scripting/scriptengine.cpp
+++ b/src/shell/scripting/scriptengine.cpp
@@ -29,12 +29,10 @@
 #include <QStandardPaths>
 
 #include <QDebug>
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kmimetypetrader.h>
 #include <kservicetypetrader.h>
 #include <kshell.h>
-#include <kcomponentdata.h>
 
 // KIO
 //#include <kemailsettings.h> // no camelcase include
diff --git a/src/shell/shellcorona.cpp b/src/shell/shellcorona.cpp
index 37d851802..6d95434b5 100644
--- a/src/shell/shellcorona.cpp
+++ b/src/shell/shellcorona.cpp
@@ -35,7 +35,6 @@
 #include <kactivities/controller.h>
 #include <kactivities/consumer.h>
 #include <ksycoca.h>
-#include <kcomponentdata.h>
 #include <kservicetypetrader.h>