diff --git a/activation.cpp b/activation.cpp
index 9e6dddff7c..eb99915c3b 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kxerrorhandler.h>
 #include <kstartupinfo.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "notifications.h"
 #include "atoms.h"
diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index 73e4710533..97fd2d7901 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTextStream>
 #include <kicontheme.h>
 #include <kiconeffect.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <QBitmap>
 #include <QLabel>
diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp
index fc9c7b953f..7739223607 100644
--- a/clients/b2/config/config.cpp
+++ b/clients/b2/config/config.cpp
@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QGridLayout>
 #include <QSpacerItem>
 #include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kvbox.h>
 
 
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 57232969ad..958cd2ec8c 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QBitmap>
 #include <QPainter>
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 namespace Laptop {
 
diff --git a/clients/oxygen/config/oxygenanimationconfigwidget.cpp b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
index ec51886dcc..5139d91594 100644
--- a/clients/oxygen/config/oxygenanimationconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
@@ -32,7 +32,7 @@
 #include <QButtonGroup>
 #include <QtGui/QHoverEvent>
 #include <QTextStream>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp
index 4339d467c2..e36212d55e 100644
--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QGroupBox>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KTabWidget>
 
 namespace Oxygen
diff --git a/clients/oxygen/config/oxygendetectwidget.cpp b/clients/oxygen/config/oxygendetectwidget.cpp
index c0ca8eae49..69e5120b65 100644
--- a/clients/oxygen/config/oxygendetectwidget.cpp
+++ b/clients/oxygen/config/oxygendetectwidget.cpp
@@ -35,7 +35,6 @@
 #include <QLayout>
 #include <QGroupBox>
 #include <QtGui/QMouseEvent>
-#include <KLocale>
 
 #include <QtGui/QX11Info>
 #include <X11/Xlib.h>
diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
index dba3c896d8..3710ba2f97 100644
--- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp
+++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
@@ -28,7 +28,7 @@
 #include "oxygenexceptiondialog.h"
 
 #include <QPointer>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 
 //__________________________________________________________
diff --git a/clients/oxygen/config/oxygenexceptionmodel.cpp b/clients/oxygen/config/oxygenexceptionmodel.cpp
index 521552acda..574d160e5e 100644
--- a/clients/oxygen/config/oxygenexceptionmodel.cpp
+++ b/clients/oxygen/config/oxygenexceptionmodel.cpp
@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "oxygenexceptionmodel.h"
-#include <KLocale>
+#include <KLocalizedString>
 namespace Oxygen
 {
 
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index ea9cd9d7b9..9b9a710301 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -34,7 +34,7 @@
 #include <cassert>
 #include <cmath>
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KColorUtils>
 #include <KDebug>
 #include <KStyle>
diff --git a/composite.cpp b/composite.cpp
index fc894aa86e..b533918343 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDBusConnection>
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include <xcb/composite.h>
 #include <xcb/damage.h>
diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 10b65aeb57..2aeb417880 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kxerrorhandler.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdeversion.h>
 #include <ksharedconfig.h>
 #include <kstandarddirs.h>
diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp
index d1c1a927c6..321f316896 100644
--- a/effects/coverswitch/coverswitch.cpp
+++ b/effects/coverswitch/coverswitch.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFont>
 #include <QMatrix4x4>
 #include <QMouseEvent>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kapplication.h>
 #include <kcolorscheme.h>
 #include <kglobal.h>
diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp
index 61fdbc2d80..25117c3df9 100644
--- a/effects/cube/cube.cpp
+++ b/effects/cube/cube.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kwinconfig.h>
 #include <kdebug.h>
 
diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 941643636d..37ea252d8e 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <netwm_def.h>
 #include <QEvent>
 #include <QMouseEvent>
diff --git a/effects/diminactive/diminactive_config.cpp b/effects/diminactive/diminactive_config.cpp
index 3b97383ed3..152cb9e141 100644
--- a/effects/diminactive/diminactive_config.cpp
+++ b/effects/diminactive/diminactive_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <kaction.h>
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index e7e58241ab..7d725cb88f 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <KAction>
 #include <KActionCollection>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 
 #include <kwinglutils.h>
 
diff --git a/effects/invert/invert.cpp b/effects/invert/invert.cpp
index a2075b0702..e1d9738cd2 100644
--- a/effects/invert/invert.cpp
+++ b/effects/invert/invert.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglplatform.h>
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KStandardDirs>
 
diff --git a/effects/invert/invert_config.cpp b/effects/invert/invert_config.cpp
index 310d3eaacb..c67da28807 100644
--- a/effects/invert/invert_config.cpp
+++ b/effects/invert/invert_config.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/effects/lookingglass/lookingglass.cpp b/effects/lookingglass/lookingglass.cpp
index 167481838e..c5e77e6cfd 100644
--- a/effects/lookingglass/lookingglass.cpp
+++ b/effects/lookingglass/lookingglass.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KDE/KGlobal>
 #include <KDE/KStandardDirs>
diff --git a/effects/lookingglass/lookingglass_config.cpp b/effects/lookingglass/lookingglass_config.cpp
index cf91f457c2..80b9fdef26 100644
--- a/effects/lookingglass/lookingglass_config.cpp
+++ b/effects/lookingglass/lookingglass_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/effects/magnifier/magnifier_config.cpp b/effects/magnifier/magnifier_config.cpp
index fef5ab52db..e68300e70f 100644
--- a/effects/magnifier/magnifier_config.cpp
+++ b/effects/magnifier/magnifier_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/effects/mousemark/mousemark.cpp b/effects/mousemark/mousemark.cpp
index 53679ff865..78208e19a8 100644
--- a/effects/mousemark/mousemark.cpp
+++ b/effects/mousemark/mousemark.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include <math.h>
 
diff --git a/effects/mousemark/mousemark_config.cpp b/effects/mousemark/mousemark_config.cpp
index 03beaa4e1b..cc0a03082b 100644
--- a/effects/mousemark/mousemark_config.cpp
+++ b/effects/mousemark/mousemark_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index d4e5fcb4b4..edf2712e67 100755
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "presentwindowsconfig.h"
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
diff --git a/effects/showfps/showfps_config.cpp b/effects/showfps/showfps_config.cpp
index f5d5911239..8474b4f194 100644
--- a/effects/showfps/showfps_config.cpp
+++ b/effects/showfps/showfps_config.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 
 namespace KWin
diff --git a/effects/thumbnailaside/thumbnailaside.cpp b/effects/thumbnailaside/thumbnailaside.cpp
index 29687c0691..f34d38da66 100644
--- a/effects/thumbnailaside/thumbnailaside.cpp
+++ b/effects/thumbnailaside/thumbnailaside.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 namespace KWin
 {
diff --git a/effects/thumbnailaside/thumbnailaside_config.cpp b/effects/thumbnailaside/thumbnailaside_config.cpp
index 53eb647ba8..fc3ad3b9c3 100644
--- a/effects/thumbnailaside/thumbnailaside_config.cpp
+++ b/effects/thumbnailaside/thumbnailaside_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/effects/trackmouse/trackmouse.cpp b/effects/trackmouse/trackmouse.cpp
index 89f215db76..e0dc90bd12 100644
--- a/effects/trackmouse/trackmouse.cpp
+++ b/effects/trackmouse/trackmouse.cpp
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 
 #include <math.h>
 
diff --git a/effects/trackmouse/trackmouse_config.cpp b/effects/trackmouse/trackmouse_config.cpp
index 17140a0783..bd7df133c8 100644
--- a/effects/trackmouse/trackmouse_config.cpp
+++ b/effects/trackmouse/trackmouse_config.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <KActionCollection>
diff --git a/effects/translucency/translucency_config.cpp b/effects/translucency/translucency_config.cpp
index db9f17bf10..685be3dc88 100644
--- a/effects/translucency/translucency_config.cpp
+++ b/effects/translucency/translucency_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 
diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp
index 91c1baff53..de6c3a44e2 100644
--- a/effects/windowgeometry/windowgeometry.cpp
+++ b/effects/windowgeometry/windowgeometry.cpp
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KActionCollection>
 #include <kaction.h>
 #include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 
 using namespace KWin;
 
diff --git a/effects/windowgeometry/windowgeometry_config.cpp b/effects/windowgeometry/windowgeometry_config.cpp
index 1aeb91a79f..3b5345b786 100644
--- a/effects/windowgeometry/windowgeometry_config.cpp
+++ b/effects/windowgeometry/windowgeometry_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 #include <KActionCollection>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfiggroup.h>
 
 namespace KWin
diff --git a/effects/wobblywindows/wobblywindows_config.cpp b/effects/wobblywindows/wobblywindows_config.cpp
index 9a04dc6193..d9ae7255ff 100644
--- a/effects/wobblywindows/wobblywindows_config.cpp
+++ b/effects/wobblywindows/wobblywindows_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kconfiggroup.h>
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index 988b4016aa..83e7aacb26 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kactioncollection.h>
 #include <kstandardaction.h>
 #include <KDE/KConfigGroup>
-#include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 #include <KDE/KDebug>
 
 #include <kwinglutils.h>
diff --git a/effects/zoom/zoom_config.cpp b/effects/zoom/zoom_config.cpp
index 0b4308b92a..00f6c29902 100644
--- a/effects/zoom/zoom_config.cpp
+++ b/effects/zoom/zoom_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/kcmkwin/kwincompositing/ktimerdialog.cpp b/kcmkwin/kwincompositing/ktimerdialog.cpp
index dfb655669c..e652d3fac1 100644
--- a/kcmkwin/kwincompositing/ktimerdialog.cpp
+++ b/kcmkwin/kwincompositing/ktimerdialog.cpp
@@ -31,7 +31,7 @@
 #include <kwindowsystem.h>
 #include <kiconloader.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kvbox.h>
 
diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index a4ebf9e8c7..5e668445dc 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -40,7 +40,7 @@
 #include <QMimeData>
 #include <QScrollBar>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kglobalsettings.h>
 
 #ifdef KWIN_BUILD_KAPPMENU
diff --git a/kcmkwin/kwindecoration/buttonsconfigdialog.cpp b/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
index 6e46b38a29..6dc93057ee 100644
--- a/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
+++ b/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVBoxLayout>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <kdecoration.h>
 
 namespace KWin
diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp
index fef7e33452..6571ffb34c 100644
--- a/kcmkwin/kwindecoration/decorationmodel.cpp
+++ b/kcmkwin/kwindecoration/decorationmodel.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDesktopFile>
 #include <KGlobalSettings>
 #include <KIcon>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KStandardDirs>
 #include <KPluginInfo>
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 4bb274e466..7e77b108d6 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -47,7 +47,7 @@
 // KDE
 #include <KAboutData>
 #include <KDialog>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KMessageBox>
 #include <KNS3/DownloadDialog>
 #include <KDE/KStandardDirs>
diff --git a/kcmkwin/kwindecoration/preview.cpp b/kcmkwin/kwindecoration/preview.cpp
index 94aacbaf1a..3e25b2aed6 100644
--- a/kcmkwin/kwindecoration/preview.cpp
+++ b/kcmkwin/kwindecoration/preview.cpp
@@ -20,7 +20,7 @@
 #include "preview.h"
 
 #include <kapplication.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <QLabel>
diff --git a/kcmkwin/kwindesktop/desktopnameswidget.cpp b/kcmkwin/kwindesktop/desktopnameswidget.cpp
index 34e5e232a2..e33276696c 100644
--- a/kcmkwin/kwindesktop/desktopnameswidget.cpp
+++ b/kcmkwin/kwindesktop/desktopnameswidget.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLabel>
 #include <QGridLayout>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KLineEdit>
 
 namespace KWin
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index f319c44ff6..0a9b6ede6f 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -27,7 +27,7 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <kdialog.h>
diff --git a/kcmkwin/kwinoptions/mouse.h b/kcmkwin/kwinoptions/mouse.h
index c1f203383e..ec86289b95 100644
--- a/kcmkwin/kwinoptions/mouse.h
+++ b/kcmkwin/kwinoptions/mouse.h
@@ -26,7 +26,7 @@ class KConfig;
 
 #include <kcmodule.h>
 #include <KComboBox>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "ui_actions.h"
 #include "ui_mouse.h"
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 9fc481946c..3660e5ccb9 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -34,7 +34,7 @@
 #include <QtDBus/QtDBus>
 
 #include <KButtonGroup>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <knuminput.h>
 #include <kdialog.h>
 
diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index 5d469f6e5b..06be198197 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -20,7 +20,7 @@
 #include "detectwidget.h"
 
 #include <kapplication.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kwindowsystem.h>
 #include <QLabel>
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index d4ea0a1708..b67b8ac967 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -22,7 +22,7 @@
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <QtDBus/QtDBus>
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index b040172e7f..a2b3919988 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kconfig.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 #include <X11/Xlib.h>
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index 8ff3fcec0d..4a3159e210 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -25,7 +25,7 @@
 #include <kpushbutton.h>
 #include <QLabel>
 #include <kwindowsystem.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <QRegExp>
 #include <KActivities/Consumer>
 
diff --git a/kcmkwin/kwinrules/yesnobox.h b/kcmkwin/kwinrules/yesnobox.h
index d49538b1e5..b10e7c6224 100644
--- a/kcmkwin/kwinrules/yesnobox.h
+++ b/kcmkwin/kwinrules/yesnobox.h
@@ -23,7 +23,7 @@
 #include <QHBoxLayout>
 #include <QRadioButton>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 class YesNoBox : public QWidget {
     Q_OBJECT
diff --git a/killer/killer.cpp b/killer/killer.cpp
index c88a9244f3..210f8af8e6 100644
--- a/killer/killer.cpp
+++ b/killer/killer.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kauth.h>
 #include <kdebug.h>
 #include <unistd.h>
diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp
index f0a5a275e9..2f906f4d4c 100644
--- a/libkdecorations/kcommondecoration.cpp
+++ b/libkdecorations/kcommondecoration.cpp
@@ -37,7 +37,7 @@
 
 #include <kapplication.h>
 #include "kdecorationfactory.h"
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "kcommondecoration.moc"
 
diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp
index bcdc1d8ea9..2f4b522206 100644
--- a/libkdecorations/kdecoration_plugins_p.cpp
+++ b/libkdecorations/kdecoration_plugins_p.cpp
@@ -31,6 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <klibrary.h>
 #include <kconfiggroup.h>
+#include <KDE/KLocalizedString>
 #include <assert.h>
 
 #include <QDir>
diff --git a/plugins.cpp b/plugins.cpp
index ea5fe1c912..41506b54fb 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config-kwin.h"
 
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <stdlib.h>
 #include <QPixmap>
 
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 0821e51436..fee8db921d 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -62,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVector4D>
 #include <QMatrix4x4>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KProcess>
 
 namespace KWin
diff --git a/tabbox/clientmodel.cpp b/tabbox/clientmodel.cpp
index 2230942947..acba1c1724 100644
--- a/tabbox/clientmodel.cpp
+++ b/tabbox/clientmodel.cpp
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // TODO: remove with Qt 5, only for HTML escaping the caption
 #include <QTextDocument>
 #include <QTextStream>
-// KDE
-#include <KLocale>
 // other
 #include <math.h>
 
diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp
index 4fb3a44413..c2fbbaa0dd 100644
--- a/tabbox/tabbox.cpp
+++ b/tabbox/tabbox.cpp
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KDE/KAction>
 #include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kkeyserver.h>
 // X11
 #include <fixx11h.h>
diff --git a/useractions.cpp b/useractions.cpp
index 6ada8138c1..ae297e2bf2 100755
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kglobalaccel.h>
 #include <kapplication.h>
diff --git a/utils.cpp b/utils.cpp
index 8c657b002a..36626ba36f 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kxerrorhandler.h>
 #include <X11/Xatom.h>
+#include <KDE/KLocalizedString>
 
 #ifndef KCMRULES
 #include <QLabel>
@@ -36,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <assert.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
 #include <kshortcut.h>
 #include <kkeyserver.h>
 #include <KPushButton>
diff --git a/workspace.cpp b/workspace.cpp
index e2c96cd71a..6d4adc9417 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <fixx11h.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <klocale.h>
 #include <QDesktopWidget>
 #include <QRegExp>
 #include <QPainter>