diff --git a/client.cpp b/client.cpp
index ed86444820..4c62b6feb0 100644
--- a/client.cpp
+++ b/client.cpp
@@ -47,10 +47,10 @@ public:
       m_client = c;
     }
 
-    virtual void changeDesktop(CARD32 desktop) {
+    virtual void changeDesktop(Q_UINT32 desktop) {
       m_client->setDesktop( desktop );
     }
-    virtual void changeState(CARD32 state, CARD32 /* mask */) {
+    virtual void changeState(Q_UINT32 state, Q_UINT32 /* mask */) {
       // What's the mask ?
       // Warning: this code was written by David who has no clue about window managers :/
 
diff --git a/workspace.cpp b/workspace.cpp
index 7f79d413cb..880bbf1c24 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -56,8 +56,8 @@ public:
     }
     ~RootInfo() {}
 
-    void changeNumberOfDesktops(CARD32 n) { workspace->setNumberOfDesktops( n ); }
-    void changeCurrentDesktop(CARD32 d) { workspace->setCurrentDesktop( d ); }
+    void changeNumberOfDesktops(Q_UINT32 n) { workspace->setNumberOfDesktops( n ); }
+    void changeCurrentDesktop(Q_UINT32 d) { workspace->setCurrentDesktop( d ); }
     void changeActiveWindow(Window w) { 
 	::Client* c = workspace->findClient( (WId) w );
 	if ( c )