diff --git a/client.cpp b/client.cpp
index 3c22bc0806..20a0e873c5 100644
--- a/client.cpp
+++ b/client.cpp
@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <unistd.h>
 #include <kstandarddirs.h>
 #include <QWhatsThis>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <kiconloader.h>
 #include <stdlib.h>
 
@@ -1225,7 +1225,7 @@ QString Client::readName() const
     if ( info->name() && info->name()[ 0 ] != '\0' ) 
         return QString::fromUtf8( info->name() );
     else 
-        return KWM::readNameProperty( window(), XA_WM_NAME );
+        return KWindowSystem::readNameProperty( window(), XA_WM_NAME );
     }
     
 KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, Client, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption());
@@ -1284,7 +1284,7 @@ void Client::fetchIconicName()
     if ( info->iconName() && info->iconName()[ 0 ] != '\0' ) 
         s = QString::fromUtf8( info->iconName() );
     else 
-        s = KWM::readNameProperty( window(), XA_WM_ICON_NAME );
+        s = KWindowSystem::readNameProperty( window(), XA_WM_ICON_NAME );
     if ( s != cap_iconic ) 
         {
 	bool was_set = !cap_iconic.isEmpty();
@@ -1349,10 +1349,10 @@ void Client::readIcons( Window win, QPixmap* icon, QPixmap* miniicon )
     {    
     // get the icons, allow scaling
     if( icon != NULL )
-        *icon = KWM::icon( win, 32, 32, true, KWM::NETWM | KWM::WMHints );
+        *icon = KWindowSystem::icon( win, 32, 32, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
     if( miniicon != NULL )
         if( icon == NULL || !icon->isNull())
-            *miniicon = KWM::icon( win, 16, 16, true, KWM::NETWM | KWM::WMHints );
+            *miniicon = KWindowSystem::icon( win, 16, 16, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
         else
             *miniicon = QPixmap();
     }
@@ -1379,8 +1379,8 @@ void Client::getIcons()
         }
     if( icon_pix.isNull())
         { // and if nothing else, load icon from classhint or xapp icon
-        icon_pix = KWM::icon( window(), 32, 32, true, KWM::ClassHint | KWM::XApp );
-        miniicon_pix = KWM::icon( window(), 16, 16, true, KWM::ClassHint | KWM::XApp );
+        icon_pix = KWindowSystem::icon( window(), 32, 32, true, KWindowSystem::ClassHint | KWindowSystem::XApp );
+        miniicon_pix = KWindowSystem::icon( window(), 16, 16, true, KWindowSystem::ClassHint | KWindowSystem::XApp );
         }
     if( isManaged() && decoration != NULL )
         decoration->iconChange();
diff --git a/geometry.cpp b/geometry.cpp
index 4121c37f50..f2bf8fefc8 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <QPainter>
-#include <kwm.h>
+#include <kwindowsystem.h>
 
 #include "placement.h"
 #include "notifications.h"
@@ -658,7 +658,7 @@ void Workspace::updateTopMenuGeometry( Client* c )
         ev.xclient.data.l[3] = 0;
         ev.xclient.data.l[4] = 0;
         XSendEvent( display(), c->window(), False, NoEventMask, &ev );
-        KWM::setStrut( c->window(), 0, 0, topmenu_height, 0 ); // so that kicker etc. know
+        KWindowSystem::setStrut( c->window(), 0, 0, topmenu_height, 0 ); // so that kicker etc. know
         c->checkWorkspacePosition();
         return;
         }
diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index bd3f371dbf..a6368cc0ba 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -22,7 +22,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <QLabel>
 #include <QRadioButton>
 #include <QCheckBox>
@@ -72,7 +72,7 @@ void DetectDialog::readWindow( WId w )
         emit detectionDone( false );
         return;
         }
-    info = KWM::windowInfo( w, -1U, -1U ); // read everything
+    info = KWindowSystem::windowInfo( w, -1U, -1U ); // read everything
     if( !info.valid())
         {
         emit detectionDone( false );
diff --git a/kcmkwin/kwinrules/detectwidget.h b/kcmkwin/kwinrules/detectwidget.h
index f844288656..047eb11c8e 100644
--- a/kcmkwin/kwinrules/detectwidget.h
+++ b/kcmkwin/kwinrules/detectwidget.h
@@ -23,7 +23,7 @@
 #include "ui_detectwidgetbase.h"
 
 #include <kdialog.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 
 #include "../../rules.h"
 //Added by qt3to4:
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 3cc98a478b..f6aeb03ce8 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -20,7 +20,7 @@
 #include <kapplication.h>
 #include <kconfig.h>
 #include <klocale.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 #include <X11/Xlib.h>
 #include <fixx11h.h>
@@ -69,7 +69,7 @@ static void saveRules( const QList< Rules* >& rules )
 
 static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app )
     {
-    KWindowInfo info = KWM::windowInfo( wid,
+    KWindowInfo info = KWindowSystem::windowInfo( wid,
         NET::WMName | NET::WMWindowType,
         NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine );
     if( !info.valid()) // shouldn't really happen
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index f6d2a47129..ead0021da0 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -24,7 +24,7 @@
 #include <QCheckBox>
 #include <kpushbutton.h>
 #include <QLabel>
-#include <kwm.h>
+#include <kwindowsystem.h>
 #include <klocale.h>
 #include <QRegExp>
 
@@ -110,9 +110,9 @@ RulesWidget::RulesWidget( QWidget* parent )
     SETUP( disableglobalshortcuts, force );
     int i;
     for( i = 1;
-         i <= KWM::numberOfDesktops();
+         i <= KWindowSystem::numberOfDesktops();
          ++i )
-        desktop->addItem( QString::number( i ).rightJustified( 2 ) + ':' + KWM::desktopName( i ));
+        desktop->addItem( QString::number( i ).rightJustified( 2 ) + ':' + KWindowSystem::desktopName( i ));
     desktop->addItem( i18n( "All Desktops" ));
     }
 
diff --git a/kcmkwin/kwinrules/ruleswidget.h b/kcmkwin/kwinrules/ruleswidget.h
index 56b1eae048..a1f4943486 100644
--- a/kcmkwin/kwinrules/ruleswidget.h
+++ b/kcmkwin/kwinrules/ruleswidget.h
@@ -21,7 +21,7 @@
 #define __RULESWIDGET_H__
 
 #include <kdialog.h>
-#include <kwm.h>
+#include <kwindowsystem.h>
 //#include <kshortcutdialog.h>
 
 #include "ruleswidgetbase.h"