diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp
index b2679b9c..bed93337 100644
--- a/kcontrol/keyboard/kcm_keyboard_widget.cpp
+++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp
@@ -24,6 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
+#include <kicon.h>
 
 #include <QtGui/QMessageBox>
 #include <QtGui/QWidget>
diff --git a/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp b/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
index 20a7a2a5..46fd13ec 100644
--- a/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
+++ b/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
@@ -25,6 +25,7 @@
 #include "UnicodeBlocks.h"
 #include "UnicodeScripts.h"
 #include <KLocale>
+#include <KIcon>
 
 namespace KFI
 {
diff --git a/krunner/krunnerdialog.cpp b/krunner/krunnerdialog.cpp
index b13836bc..656711e3 100644
--- a/krunner/krunnerdialog.cpp
+++ b/krunner/krunnerdialog.cpp
@@ -335,7 +335,7 @@ void KRunnerDialog::paintEvent(QPaintEvent *e)
 void KRunnerDialog::showEvent(QShowEvent *)
 {
     m_shadows->addWindow(this);
-    unsigned long state = NET::SkipTaskbar | NET::KeepAbove | NET::StaysOnTop;
+    unsigned long state = NET::SkipTaskbar | NET::KeepAbove;
     if (m_floating) {
         KWindowSystem::clearState(winId(), state);
     } else {
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 2c42da4c..288a2648 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -72,7 +72,7 @@ bool KSysTrayCmd::start()
       if ( win ) {
         // Window always on top
         if (onTop) {
-          KWindowSystem::setState(win, NET::StaysOnTop);
+          KWindowSystem::setState(win, NET::KeepAbove);
         }
         return true;
       }
@@ -108,7 +108,7 @@ void KSysTrayCmd::showWindow()
   // Window always on top
   if (onTop)
   {
-    KWindowSystem::setState(win, NET::StaysOnTop);
+    KWindowSystem::setState(win, NET::KeepAbove);
   }
 
   KWindowSystem::activateWindow( win );
@@ -144,7 +144,7 @@ void KSysTrayCmd::setTargetWindow( WId w )
   // Always on top ?
   if (onTop)
   {
-    KWindowSystem::setState(win, NET::StaysOnTop);
+    KWindowSystem::setState(win, NET::KeepAbove);
   }
 }
 
diff --git a/kwalletmanager/src/manager/kwmapeditor.cpp b/kwalletmanager/src/manager/kwmapeditor.cpp
index 30e52738..3d11c720 100644
--- a/kwalletmanager/src/manager/kwmapeditor.cpp
+++ b/kwalletmanager/src/manager/kwmapeditor.cpp
@@ -25,12 +25,12 @@
 #include <kmenu.h>
 #include <kstandardaction.h>
 #include <kwindowsystem.h>
+#include <kicon.h>
+#include <ktextedit.h>
 #include <QPointer>
 #include <QApplication>
 #include <QClipboard>
 #include <QToolButton>
-#include <ktextedit.h>
-#include <QtGui/qevent.h>
 #include <QtGui/qevent.h>
 #include <QItemDelegate>
 
diff --git a/kwin/effects/zoom/zoom_config.cpp b/kwin/effects/zoom/zoom_config.cpp
index a3c90374..599c10b3 100644
--- a/kwin/effects/zoom/zoom_config.cpp
+++ b/kwin/effects/zoom/zoom_config.cpp
@@ -28,8 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
-#include <kaction.h>
+#include <KAction>
 #include <KShortcutsEditor>
+#include <KIcon>
 
 #include <QVBoxLayout>
 
diff --git a/libs/taskmanager/task.cpp b/libs/taskmanager/task.cpp
index 3c36fedc..1cfaf76b 100644
--- a/libs/taskmanager/task.cpp
+++ b/libs/taskmanager/task.cpp
@@ -196,7 +196,7 @@ bool Task::isIconified() const
 
 bool Task::isAlwaysOnTop() const
 {
-    return d->info.valid(true) && (d->info.state() & NET::StaysOnTop);
+    return d->info.valid(true) && (d->info.state() & NET::KeepAbove);
 }
 
 bool Task::isKeptBelowOthers() const
diff --git a/libs/taskmanager/task_x11.cpp b/libs/taskmanager/task_x11.cpp
index fbe361d1..e68f5026 100644
--- a/libs/taskmanager/task_x11.cpp
+++ b/libs/taskmanager/task_x11.cpp
@@ -204,9 +204,9 @@ void Task::setAlwaysOnTop(bool stay)
 {
     NETWinInfo ni(QX11Info::display(), d->win, QX11Info::appRootWindow(), NET::WMState);
     if (stay)
-        ni.setState(NET::StaysOnTop, NET::StaysOnTop);
+        ni.setState(NET::KeepAbove, NET::KeepAbove);
     else
-        ni.setState(0, NET::StaysOnTop);
+        ni.setState(0, NET::KeepAbove);
 }
 
 void Task::setKeptBelowOthers(bool below)
diff --git a/plasma/applets/folderview/popupview.cpp b/plasma/applets/folderview/popupview.cpp
index 326f94e8..c1cd7185 100644
--- a/plasma/applets/folderview/popupview.cpp
+++ b/plasma/applets/folderview/popupview.cpp
@@ -40,6 +40,7 @@
 #include <knewfilemenu.h>
 #include <KWindowSystem>
 #include <KMenu>
+#include <KIcon>
 
 #include <kio/fileundomanager.h>
 #include <kio/paste.h>
diff --git a/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp b/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp
index 804f34e9..0420bd2a 100644
--- a/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp
+++ b/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp
@@ -57,7 +57,7 @@ public:
 
         setWindowFlags(Qt::FramelessWindowHint | Qt::CustomizeWindowHint);
         KWindowSystem::setOnAllDesktops(winId(), true);
-        unsigned long state = NET::Sticky | NET::StaysOnTop | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager | NET::MaxVert | NET::MaxHoriz;
+        unsigned long state = NET::Sticky | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager | NET::MaxVert | NET::MaxHoriz;
         KWindowSystem::setState(effectiveWinId(), state);
     }
 
@@ -107,7 +107,7 @@ FullScreenWindow::FullScreenWindow(QDeclarativeItem *parent)
     m_view->setWindowFlags(Qt::FramelessWindowHint | Qt::CustomizeWindowHint);
     m_view->setFrameShape(QFrame::NoFrame);
     KWindowSystem::setOnAllDesktops(m_view->winId(), true);
-    unsigned long state = NET::Sticky | NET::StaysOnTop | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager;
+    unsigned long state = NET::Sticky | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager;
     KWindowSystem::setState(m_view->effectiveWinId(), state);
 
     m_background = new Background(this);
@@ -283,7 +283,7 @@ void FullScreenWindow::setVisible(const bool visible)
         m_background->setVisible(visible);
         Plasma::WindowEffects::slideWindow(m_view->winId(), Plasma::BottomEdge, 0);
         m_view->setVisible(visible);
-        unsigned long state = NET::Sticky | NET::StaysOnTop | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager;
+        unsigned long state = NET::Sticky | NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager;
         KWindowSystem::setState(m_view->effectiveWinId(), state);
         KWindowSystem::setState(m_background->effectiveWinId(), state);
         if (visible) {