diff --git a/filterlogdlg.cpp b/filterlogdlg.cpp
index a10a056ec..0c82b67f2 100644
--- a/filterlogdlg.cpp
+++ b/filterlogdlg.cpp
@@ -48,6 +48,7 @@
 #include <errno.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <QX11Info>
 
 using namespace KMail;
 
@@ -159,7 +160,7 @@ FilterLogDialog::FilterLogDialog( QWidget * parent )
   // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably
   // wrong (#76026), and should be done only for modals. CVS HEAD should get
   // proper fix in KWin (see also searchwindow.cpp)
-  XDeleteProperty( qt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
+  XDeleteProperty( QX11Info::display(), winId(), XA_WM_TRANSIENT_FOR );
 #endif
 }
 
diff --git a/searchwindow.cpp b/searchwindow.cpp
index 4d0cea107..dc78e6663 100644
--- a/searchwindow.cpp
+++ b/searchwindow.cpp
@@ -55,6 +55,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <QX11Info>
 
 namespace KMail {
 
@@ -80,7 +81,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably
   // wrong (#76026), and should be done only for modals. CVS HEAD should get
   // proper fix in KWin (l.lunak@kde.org)
-  XDeleteProperty( qt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
+  XDeleteProperty( QX11Info::display(), winId(), XA_WM_TRANSIENT_FOR );
 #endif
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());