diff --git a/kcontrol/dateandtime/helper.cpp b/kcontrol/dateandtime/helper.cpp
index 8eb224ab..f7c11fdc 100644
--- a/kcontrol/dateandtime/helper.cpp
+++ b/kcontrol/dateandtime/helper.cpp
@@ -39,6 +39,7 @@
 #include <kconfiggroup.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
+#include <kauthhelpersupport.h>
 #include <QFile>
 #include <QDir>
 
diff --git a/kcontrol/dateandtime/helper.h b/kcontrol/dateandtime/helper.h
index fea71bae..5a56da95 100644
--- a/kcontrol/dateandtime/helper.h
+++ b/kcontrol/dateandtime/helper.h
@@ -21,7 +21,7 @@
 #ifndef CLOCK_HELPER_H
 #define CLOCK_HELPER_H
 
-#include <kauth.h>
+#include <kauthactionreply.h>
 
 using namespace KAuth;
 
diff --git a/kdm/kcm/helper.cpp b/kdm/kcm/helper.cpp
index 69a95442..a52ded57 100644
--- a/kdm/kcm/helper.cpp
+++ b/kdm/kcm/helper.cpp
@@ -34,6 +34,7 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KStandardDirs>
+#include <kauthhelpersupport.h>
 
 bool secureCopy(const QString &from, const QString &to)
 {
diff --git a/kdm/kcm/helper.h b/kdm/kcm/helper.h
index 806bfee0..3bc27d16 100644
--- a/kdm/kcm/helper.h
+++ b/kdm/kcm/helper.h
@@ -21,7 +21,7 @@
 #ifndef KDM_HELPER_H
 #define KDM_HELPER_H
 
-#include <kauth.h>
+#include <kauthactionreply.h>
 
 using namespace KAuth;
 
diff --git a/kdm/kcm/kdm-theme.cpp b/kdm/kcm/kdm-theme.cpp
index f7cea0d6..5a5f4ebd 100644
--- a/kdm/kcm/kdm-theme.cpp
+++ b/kdm/kcm/kdm-theme.cpp
@@ -37,6 +37,7 @@
 #include <KIO/Job>
 #include <KIO/DeleteJob>
 #include <KIO/NetAccess>
+#include <KAuth/Action>
 
 #include <QDir>
 #include <QGridLayout>
diff --git a/kdm/kcm/kdm-users.cpp b/kdm/kcm/kdm-users.cpp
index 2b169be6..ff24aaf0 100644
--- a/kdm/kcm/kdm-users.cpp
+++ b/kdm/kcm/kdm-users.cpp
@@ -33,6 +33,7 @@
 #include <KStandardDirs>
 #include <KStandardGuiItem>
 #include <KIO/NetAccess>
+#include <KAuth/Action>
 
 #include <QButtonGroup>
 #include <QCheckBox>
diff --git a/kdm/kcm/main.cpp b/kdm/kcm/main.cpp
index 5c533615..18e134a3 100644
--- a/kdm/kcm/main.cpp
+++ b/kdm/kcm/main.cpp
@@ -42,6 +42,7 @@
 #include <kconfig.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
+#include <kauthaction.h>
 
 #include <QEvent>
 #include <QFile>
diff --git a/knotify/notifybysound.cpp b/knotify/notifybysound.cpp
index cb93fbbd..349412b3 100644
--- a/knotify/notifybysound.cpp
+++ b/knotify/notifybysound.cpp
@@ -27,7 +27,6 @@
 #include "notifybysound.h"
 
 // QT headers
-#include <QHash>
 #include <QtCore/QTimer>
 #include <QtCore/QQueue>
 #include <QtCore/qcoreevent.h>
@@ -47,43 +46,38 @@
 
 class NotifyBySound::Private
 {
-	public:
-		enum { NoSound, UseMediaPlayer } playerMode;
-
-		QHash<int, KAudioPlayer*> playerObjects;
-		QSignalMapper *signalmapper;
-		KAudioPlayer *currentPlayer;
-		QQueue<int> closeQueue;
+public:
+    bool noSound;
+    QMap<int, KAudioPlayer*> playerObjects;
+    QSignalMapper *signalmapper;
+    KAudioPlayer *currentPlayer;
+    QQueue<int> closeQueue;
 };
 
 NotifyBySound::NotifyBySound(QObject *parent) : KNotifyPlugin(parent),d(new Private)
 {
-	d->signalmapper = new QSignalMapper(this);
-	connect(d->signalmapper, SIGNAL(mapped(int)), this, SLOT(slotSoundFinished(int)));
+    d->signalmapper = new QSignalMapper(this);
+    connect(d->signalmapper, SIGNAL(mapped(int)), this, SLOT(slotSoundFinished(int)));
 
-	d->currentPlayer = new KAudioPlayer(this);
-	startTimer(1000);
-	loadConfig();
+    d->currentPlayer = new KAudioPlayer(this);
+    startTimer(1000);
+    loadConfig();
 }
 
 
 NotifyBySound::~NotifyBySound()
 {
-	delete d;
+    delete d;
 }
 
 
 void NotifyBySound::loadConfig()
 {
-        // load player settings
-	KSharedConfig::Ptr kc = KGlobal::config();
-	KConfigGroup cg(kc, "Sounds");
+    // load player settings
+    KSharedConfig::Ptr kc = KGlobal::config();
+    KConfigGroup cg(kc, "Sounds");
 
-	d->playerMode = Private::UseMediaPlayer;
-	if(cg.readEntry( "No sound" , false ))
-	{
-		d->playerMode = Private::NoSound;
-	}
+    d->noSound = cg.readEntry( "No sound" , false );
 }
 
 
@@ -91,103 +85,95 @@ void NotifyBySound::loadConfig()
 
 void NotifyBySound::notify( int eventId, KNotifyConfig * config )
 {
-	if(d->playerMode == Private::NoSound)
-	{
-		finish( eventId );
-		return;
-	}
+    if (d->noSound) {
+        finish( eventId );
+        return;
+    }
 
-	if(d->playerObjects.contains(eventId))
-	{
-		//a sound is already playing for this notification,  we don't support playing two sounds.
-		finish( eventId );
-		return;
-	}
+    if (d->playerObjects.contains(eventId)) {
+        //a sound is already playing for this notification,  we don't support playing two sounds.
+        finish( eventId );
+        return;
+    }
 
-	KUrl soundFileURL = config->readEntry( "Sound" , true );
-	QString soundFile = soundFileURL.toLocalFile();
+    KUrl soundFileURL = config->readEntry( "Sound" , true );
+    QString soundFile = soundFileURL.toLocalFile();
 
-	if (soundFile.isEmpty())
-	{
-		finish( eventId );
-		return;
-	}
+    if (soundFile.isEmpty()) {
+        finish( eventId );
+        return;
+    }
 
     // get file name
-	if ( KUrl::isRelativeUrl(soundFile) )
-	{
-		QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
-		search = KGlobal::mainComponent().dirs()->findResource("data", search);
-		if ( search.isEmpty() )
-			soundFile = KStandardDirs::locate( "sound", soundFile );
-		else
-			soundFile = search;
-	}
-	if ( soundFile.isEmpty() )
-	{
-		finish( eventId );
-		return;
-	}
+    if (KUrl::isRelativeUrl(soundFile)) {
+        QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+        search = KGlobal::mainComponent().dirs()->findResource("data", search);
+        if ( search.isEmpty() ) {
+            soundFile = KStandardDirs::locate( "sound", soundFile );
+        } else {
+            soundFile = search;
+        }
+    }
+    if ( soundFile.isEmpty() ) {
+        finish( eventId );
+        return;
+    }
 
-	kDebug() << " going to play " << soundFile;
-
-	if(d->playerMode == Private::UseMediaPlayer)
-	{
-                KAudioPlayer *player = d->currentPlayer;
-                if (d->currentPlayer && d->currentPlayer->isPlaying()) {
-                    kDebug() << "creating new player";
-                    player = new KAudioPlayer(this);
-                }
-		connect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
-		d->signalmapper->setMapping(player, eventId);
-		player->load(soundFile);
-		d->playerObjects.insert(eventId, player);
-	}
+    kDebug() << " going to play " << soundFile;
+    if (!d->noSound) {
+        KAudioPlayer *player = d->currentPlayer;
+        if (d->currentPlayer && d->currentPlayer->isPlaying()) {
+            kDebug() << "creating new player";
+            player = new KAudioPlayer(this);
+        }
+        connect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
+        d->signalmapper->setMapping(player, eventId);
+        player->load(soundFile);
+        d->playerObjects.insert(eventId, player);
+    }
 }
 
 
 void NotifyBySound::timerEvent(QTimerEvent *e)
 {
-        QMutableHashIterator<int,KAudioPlayer*> iter(d->playerObjects);
-        while(iter.hasNext()) {
-            iter.next();
-            KAudioPlayer *player = iter.value();
-            if (player != d->currentPlayer && !player->isPlaying()) {
-                kDebug() << "destroying idle player";
-                d->playerObjects.remove(iter.key());
-                delete player;
-            }
+    QMutableMapIterator<int,KAudioPlayer*> iter(d->playerObjects);
+    while (iter.hasNext()) {
+        iter.next();
+        KAudioPlayer *player = iter.value();
+        if (player != d->currentPlayer && !player->isPlaying()) {
+            kDebug() << "destroying idle player";
+            d->playerObjects.remove(d->playerObjects.key(player));
+            player->deleteLater();
         }
-        KNotifyPlugin::timerEvent(e);
+    }
+    KNotifyPlugin::timerEvent(e);
 }
 
 void NotifyBySound::slotSoundFinished(int id)
 {
-	kDebug() << id;
-	if(d->playerObjects.contains(id))
-	{
-		KAudioPlayer *player=d->playerObjects.value(id);
-		disconnect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
-	}
-	finish(id);
+    kDebug() << id;
+    if (d->playerObjects.contains(id)) {
+        KAudioPlayer *player=d->playerObjects.value(id);
+        disconnect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
+    }
+    finish(id);
 }
 
 void NotifyBySound::close(int id)
 {
-	// close in 1 min - ugly workaround for sounds getting cut off because the close call in kdelibs
-	// is hardcoded to 6 seconds
-	d->closeQueue.enqueue(id);
-	QTimer::singleShot(60000, this, SLOT(closeNow()));
+    // close in 1 min - ugly workaround for sounds getting cut off because the close call in kdelibs
+    // is hardcoded to 6 seconds
+    d->closeQueue.enqueue(id);
+    QTimer::singleShot(60000, this, SLOT(closeNow()));
 }
 
 void NotifyBySound::closeNow()
 {
-	const int id = d->closeQueue.dequeue();
-	if(d->playerObjects.contains(id))
-	{
-		KAudioPlayer *player = d->playerObjects.value(id);
-		player->stop();
-	}
+    const int id = d->closeQueue.dequeue();
+    if (d->playerObjects.contains(id)) {
+        KAudioPlayer *player = d->playerObjects.value(id);
+        player->stop();
+    }
 }
 
 #include "moc_notifybysound.cpp"
diff --git a/kwalletmanager/src/konfigurator/savehelper.cpp b/kwalletmanager/src/konfigurator/savehelper.cpp
index c62e08b0..ba15f700 100644
--- a/kwalletmanager/src/konfigurator/savehelper.cpp
+++ b/kwalletmanager/src/konfigurator/savehelper.cpp
@@ -20,6 +20,7 @@
 #include "savehelper.h"
 
 #include <kdebug.h>
+#include <kauthhelpersupport.h>
 #include <unistd.h>
 
 ActionReply SaveHelper::save(QVariantMap args)
diff --git a/kwalletmanager/src/konfigurator/savehelper.h b/kwalletmanager/src/konfigurator/savehelper.h
index e54c9497..d6f66627 100644
--- a/kwalletmanager/src/konfigurator/savehelper.h
+++ b/kwalletmanager/src/konfigurator/savehelper.h
@@ -20,7 +20,7 @@
 #ifndef _SAVEHELPER_H_
 #define _SAVEHELPER_H_
 
-#include <kauth.h>
+#include <kauthactionreply.h>
 
 using namespace KAuth;
 
diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp
index 26910f5c..d3838d38 100644
--- a/kwin/killer/killer.cpp
+++ b/kwin/killer/killer.cpp
@@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kmessagebox.h>
 #include <KIcon>
 #include <KLocalizedString>
-#include <kauth.h>
+#include <kauthaction.h>
 #include <kdebug.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
diff --git a/libs/ksysguard/processcore/helper.cpp b/libs/ksysguard/processcore/helper.cpp
index c6026add..e0be56c8 100644
--- a/libs/ksysguard/processcore/helper.cpp
+++ b/libs/ksysguard/processcore/helper.cpp
@@ -23,6 +23,8 @@
 #include "helper.h"
 #include "processes_local_p.h"
 
+#include <kauthhelpersupport.h>
+
 KSysGuardProcessListHelper::KSysGuardProcessListHelper()
 {
     qRegisterMetaType<QList<long long> >();
diff --git a/libs/ksysguard/processcore/helper.h b/libs/ksysguard/processcore/helper.h
index 965d1d57..9dfde1b4 100644
--- a/libs/ksysguard/processcore/helper.h
+++ b/libs/ksysguard/processcore/helper.h
@@ -20,7 +20,7 @@
 
 */
 
-#include <kauth.h>
+#include <kauthactionreply.h>
 #include <QObject>
 
 using namespace KAuth;
diff --git a/libs/ksysguard/processui/ksysguardprocesslist.cpp b/libs/ksysguard/processui/ksysguardprocesslist.cpp
index a93f76c6..6853977d 100644
--- a/libs/ksysguard/processui/ksysguardprocesslist.cpp
+++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp
@@ -47,7 +47,9 @@
 
 #include <signal.h> //For SIGTERM
 
-#include <kauth.h>
+#include <kauthaction.h>
+#include <kauthactionreply.h>
+#include <kauthhelpersupport.h>
 #include <kaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/powerdevil/daemon/backends/upower/backlighthelper.cpp b/powerdevil/daemon/backends/upower/backlighthelper.cpp
index a94217ae..d15fdf8d 100644
--- a/powerdevil/daemon/backends/upower/backlighthelper.cpp
+++ b/powerdevil/daemon/backends/upower/backlighthelper.cpp
@@ -19,6 +19,8 @@
 
 #include "backlighthelper.h"
 
+#include <kauthhelpersupport.h>
+
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
diff --git a/powerdevil/daemon/backends/upower/backlighthelper.h b/powerdevil/daemon/backends/upower/backlighthelper.h
index 5ab9298d..946ee414 100644
--- a/powerdevil/daemon/backends/upower/backlighthelper.h
+++ b/powerdevil/daemon/backends/upower/backlighthelper.h
@@ -21,7 +21,7 @@
 #define BACKLIGHTHELPER_H
 
 #include <QObject>
-#include <kauth.h>
+#include <kauthactionreply.h>
 
 using namespace KAuth;