diff --git a/geometry.cpp b/geometry.cpp
index ce0829fab6..5ff46b2772 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2510,7 +2510,7 @@ void Client::positionGeometryTip()
         return; // some effect paints this for us
     if (options->showGeometryTip()) {
         if (!geometryTip) {
-            geometryTip = new GeometryTip(&xSizeHint, false);
+            geometryTip = new GeometryTip(&xSizeHint);
         }
         QRect wgeom(moveResizeGeom);   // position of the frame, size of the window itself
         wgeom.setWidth(wgeom.width() - (width() - clientSize().width()));
diff --git a/geometrytip.cpp b/geometrytip.cpp
index 61c6cded38..f66306a07e 100644
--- a/geometrytip.cpp
+++ b/geometrytip.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 namespace KWin
 {
 
-GeometryTip::GeometryTip(const XSizeHints* xSizeHints, bool save_under):
+GeometryTip::GeometryTip(const XSizeHints* xSizeHints):
     QLabel(0)
 {
     setObjectName(QLatin1String("kwingeometry"));
@@ -35,11 +35,6 @@ GeometryTip::GeometryTip(const XSizeHints* xSizeHints, bool save_under):
     setAlignment(Qt::AlignCenter | Qt::AlignTop);
     setWindowFlags(Qt::X11BypassWindowManagerHint);
     sizeHints = xSizeHints;
-    if (save_under) {
-        XSetWindowAttributes attr;
-        attr.save_under = True; // use saveunder if possible to avoid weird effects in transparent mode
-        XChangeWindowAttributes(display(), winId(), CWSaveUnder, &attr);
-    }
 }
 
 GeometryTip::~GeometryTip()
diff --git a/geometrytip.h b/geometrytip.h
index 21959773d2..109a4c8058 100644
--- a/geometrytip.h
+++ b/geometrytip.h
@@ -22,7 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_GEOMETRY_TIP_H
 
 #include <QLabel>
-#include "client.h"
+#include <X11/Xutil.h>
+#include <fixx11h.h>
 
 namespace KWin
 {
@@ -31,7 +32,7 @@ class GeometryTip: public QLabel
 {
     Q_OBJECT
 public:
-    GeometryTip(const XSizeHints* xSizeHints, bool save_under);
+    GeometryTip(const XSizeHints* xSizeHints);
     ~GeometryTip();
     void setGeometry(const QRect& geom);