diff --git a/Makefile.am b/Makefile.am
index d5ec4e4958..7217a68b63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = kwin
 lib_LTLIBRARIES = kwin.la
 
 # workspace.cpp has to be first in order not to break --enable-final
-kwin_la_SOURCES = client.cpp workspace.cpp placement.cpp atoms.cpp  main.cpp \
+kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp  main.cpp \
 	popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
 	killwindow.cpp kwinbutton.cpp geometrytip.cpp
 kwin_la_LIBADD = $(LIB_KDEUI)
diff --git a/workspace.cpp b/workspace.cpp
index 828966f334..c158d96002 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -53,8 +53,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 
 const int XIconicState = IconicState;
 #undef IconicState
-const int XAbove = Above;
-#undef Above
 
 #include <kwin.h>
 #include <kdebug.h>
@@ -457,12 +455,12 @@ void Workspace::init()
         NET::MaxHoriz |
         NET::Shaded |
         NET::SkipTaskbar |
-        NET::Above |
-//        NET::StaysOnTop |  the same like Above
+        NET::KeepAbove |
+//        NET::StaysOnTop |  the same like KeepAbove
         NET::SkipPager |
 //        NET::Hidden |  TODO
 //        NET::FullScreen | TODO
-//        NET::Below | TODO
+//        NET::KeepBelow | TODO
         0
         };
         
@@ -728,7 +726,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             wc.width = e->xconfigurerequest.width;
             wc.height = e->xconfigurerequest.height;
             wc.sibling = None;
-            wc.stack_mode = XAbove;
+            wc.stack_mode = Above;
             value_mask = e->xconfigurerequest.value_mask | CWBorderWidth;
             XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, & wc );
 
@@ -877,6 +875,7 @@ bool Workspace::destroyClient( Client* c)
 
 #include <stdarg.h>
 
+static
 bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
 {
         va_list args;
@@ -917,6 +916,7 @@ bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
         return bAll;
 }
 
+static
 bool areModKeysDepressed( const KShortcut& cut )
 {