diff --git a/composite.cpp b/composite.cpp
index 26738b0598..e2f2f982aa 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -371,7 +371,7 @@ void Compositor::deleteUnusedSupportProperties()
     }
     foreach (const xcb_atom_t &atom, m_unusedSupportProperties) {
         // remove property from root window
-        XDeleteProperty(QX11Info::display(), rootWindow(), atom);
+        xcb_delete_property(connection(), rootWindow(), atom);
     }
 }
 
diff --git a/effects.cpp b/effects.cpp
index a15abf2c24..886a31bf1d 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -201,7 +201,7 @@ static QByteArray readWindowProperty(Window win, long atom, long type, int forma
 
 static void deleteWindowProperty(Window win, long int atom)
 {
-    XDeleteProperty(QX11Info::display(), win, atom);
+    xcb_delete_property(connection(), win, atom);
 }
 
 //---------------------
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 9167222d09..5c090ff17a 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // own
 #include "tabboxhandler.h"
+#include <kwinglobals.h>
 // tabbox
 #include "clientmodel.h"
 #include "declarative.h"
@@ -178,9 +179,8 @@ void TabBoxHandlerPrivate::endHighlightWindows(bool abort)
     lastRaisedClient = 0;
     lastRaisedClientSucc = 0;
     // highlight windows
-    Display *dpy = QX11Info::display();
-    Atom atom = XInternAtom(dpy, "_KDE_WINDOW_HIGHLIGHT", False);
-    XDeleteProperty(dpy, config.isShowTabBox() && m_declarativeView ? m_declarativeView->winId() : QX11Info::appRootWindow(), atom);
+    Atom atom = XInternAtom(display(), "_KDE_WINDOW_HIGHLIGHT", False);
+    xcb_delete_property(connection(), config.isShowTabBox() && m_declarativeView ? m_declarativeView->winId() : rootWindow(), atom);
 }
 
 /***********************************************
diff --git a/workspace.cpp b/workspace.cpp
index c41c1b0533..600033796a 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -459,7 +459,7 @@ Workspace::~Workspace()
     }
     for (UnmanagedList::iterator it = unmanaged.begin(), end = unmanaged.end(); it != end; ++it)
         (*it)->release(true);
-    XDeleteProperty(display(), rootWindow(), atoms->kwin_running);
+    xcb_delete_property(connection(), rootWindow(), atoms->kwin_running);
 
     delete RuleBook::self();
     KSharedConfig::openConfig()->sync();