diff --git a/activation.cpp b/activation.cpp
index de27953d47..57a09c5890 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -383,7 +383,7 @@ void Workspace::takeActivity(Client* c, int flags, bool handled)
         screens()->setCurrent(c->screen());
 }
 
-void Workspace::handleTakeActivity(Client* c, Time /*timestamp*/, int flags)
+void Workspace::handleTakeActivity(KWin::Client *c, xcb_timestamp_t /*timestamp*/, int flags)
 {
     if (pending_take_activity != c)   // pending_take_activity is reset when doing restack or activation
         return;
@@ -533,7 +533,7 @@ void Workspace::setShouldGetFocus(Client* c)
 // focus_in -> the window got FocusIn event
 // ignore_desktop - call comes from _NET_ACTIVE_WINDOW message, don't refuse just because of window
 //     is on a different desktop
-bool Workspace::allowClientActivation(const Client* c, Time time, bool focus_in, bool ignore_desktop)
+bool Workspace::allowClientActivation(const KWin::Client *c, xcb_timestamp_t time, bool focus_in, bool ignore_desktop)
 {
     // options->focusStealingPreventionLevel :
     // 0 - none    - old KWin behaviour, new windows always get focus
@@ -596,7 +596,7 @@ bool Workspace::allowClientActivation(const Client* c, Time time, bool focus_in,
 // a window to be fully raised upon its own request (XRaiseWindow),
 // if refused, it will be raised only on top of windows belonging
 // to the same application
-bool Workspace::allowFullClientRaising(const Client* c, Time time)
+bool Workspace::allowFullClientRaising(const KWin::Client *c, xcb_timestamp_t time)
 {
     int level = c->rules()->checkFSP(options->focusStealingPreventionLevel());
     if (session_saving && level <= 2) { // <= normal
@@ -618,7 +618,7 @@ bool Workspace::allowFullClientRaising(const Client* c, Time time)
     }
     if (level == 3)   // high
         return false;
-    Time user_time = ac->userTime();
+    xcb_timestamp_t user_time = ac->userTime();
     kDebug(1212) << "Raising, compared:" << time << ":" << user_time
                  << ":" << (timestampCompare(time, user_time) >= 0) << endl;
     return timestampCompare(time, user_time) >= 0;   // time >= user_time
diff --git a/layers.cpp b/layers.cpp
index cc7ac2c699..c1c4782b07 100644
--- a/layers.cpp
+++ b/layers.cpp
@@ -420,7 +420,7 @@ void Workspace::raiseClientWithinApplication(Client* c)
     }
 }
 
-void Workspace::raiseClientRequest(Client* c, NET::RequestSource src, Time timestamp)
+void Workspace::raiseClientRequest(KWin::Client *c, NET::RequestSource src, xcb_timestamp_t timestamp)
 {
     if (src == NET::FromTool || allowFullClientRaising(c, timestamp))
         raiseClient(c);
@@ -430,7 +430,7 @@ void Workspace::raiseClientRequest(Client* c, NET::RequestSource src, Time times
     }
 }
 
-void Workspace::lowerClientRequest(Client* c, NET::RequestSource src, Time /*timestamp*/)
+void Workspace::lowerClientRequest(KWin::Client *c, NET::RequestSource src, xcb_timestamp_t /*timestamp*/)
 {
     // If the client has support for all this focus stealing prevention stuff,
     // do only lowering within the application, as that's the more logical
diff --git a/workspace.cpp b/workspace.cpp
index e652c68eff..a9513d6a9c 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1336,7 +1336,7 @@ void Workspace::sendPingToWindow(xcb_window_t window, xcb_timestamp_t timestamp)
     rootInfo->sendPing(window, timestamp);
 }
 
-void Workspace::sendTakeActivity(Client* c, Time timestamp, long flags)
+void Workspace::sendTakeActivity(KWin::Client *c, xcb_timestamp_t timestamp, long int flags)
 {
     rootInfo->takeActivity(c->window(), timestamp, flags);
     pending_take_activity = c;
diff --git a/workspace.h b/workspace.h
index 08e87b529c..39af1ddc6e 100644
--- a/workspace.h
+++ b/workspace.h
@@ -101,8 +101,8 @@ public:
     void activateClient(Client*, bool force = false);
     void requestFocus(Client* c, bool force = false);
     void takeActivity(Client* c, int flags, bool handled);   // Flags are ActivityFlags
-    void handleTakeActivity(Client* c, Time timestamp, int flags);   // Flags are ActivityFlags
-    bool allowClientActivation(const Client* c, Time time = -1U, bool focus_in = false,
+    void handleTakeActivity(Client* c, xcb_timestamp_t timestamp, int flags);   // Flags are ActivityFlags
+    bool allowClientActivation(const Client* c, xcb_timestamp_t time = -1U, bool focus_in = false,
                                bool ignore_desktop = false);
     void restoreFocus();
     void gotFocusIn(const Client*);
@@ -123,8 +123,8 @@ public:
     QRect adjustClientSize(Client* c, QRect moveResizeGeom, int mode);
     void raiseClient(Client* c, bool nogroup = false);
     void lowerClient(Client* c, bool nogroup = false);
-    void raiseClientRequest(Client* c, NET::RequestSource src, Time timestamp);
-    void lowerClientRequest(Client* c, NET::RequestSource src, Time timestamp);
+    void raiseClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp);
+    void lowerClientRequest(Client* c, NET::RequestSource src, xcb_timestamp_t timestamp);
     void restackClientUnderActive(Client*);
     void restack(Client *c, Client *under);
     void updateClientLayer(Client* c);
@@ -253,7 +253,7 @@ public:
     bool showingDesktop() const;
 
     void sendPingToWindow(xcb_window_t w, xcb_timestamp_t timestamp);   // Called from Client::pingWindow()
-    void sendTakeActivity(Client* c, Time timestamp, long flags);   // Called from Client::takeActivity()
+    void sendTakeActivity(Client* c, xcb_timestamp_t timestamp, long flags);   // Called from Client::takeActivity()
 
     void removeClient(Client*);   // Only called from Client::destroyClient() or Client::releaseWindow()
     void setActiveClient(Client*);
@@ -438,7 +438,7 @@ private:
     ToplevelList constrainedStackingOrder();
     void raiseClientWithinApplication(Client* c);
     void lowerClientWithinApplication(Client* c);
-    bool allowFullClientRaising(const Client* c, Time timestamp);
+    bool allowFullClientRaising(const Client* c, xcb_timestamp_t timestamp);
     bool keepTransientAbove(const Client* mainwindow, const Client* transient);
     void blockStackingUpdates(bool block);
     void updateToolWindows(bool also_hide);