diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index 1d7d988d7a..c21b28830b 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -284,7 +284,7 @@ void WaylandXRenderBackend::present(int mask, const QRegion &damage)
 
     Wayland::WaylandBackend *wl = Wayland::WaylandBackend::self();
     const QSize &size = wl->shellSurfaceSize();
-    wl_buffer *buffer = wl->shmPool()->createBuffer(size, size.width() * 4, m_shm->buffer());
+    auto buffer = wl->shmPool()->createBuffer(size, size.width() * 4, m_shm->buffer());
     if (!buffer) {
         qDebug() << "Did not get a buffer";
         return;
diff --git a/wayland_backend.cpp b/wayland_backend.cpp
index 9d55191204..4b0a615752 100644
--- a/wayland_backend.cpp
+++ b/wayland_backend.cpp
@@ -130,11 +130,11 @@ void X11CursorTracker::cursorChanged(uint32_t serial)
 void X11CursorTracker::installCursor(const CursorData& cursor)
 {
     const QImage &cursorImage = cursor.cursor();
-    wl_buffer *buffer = m_backend->shmPool()->createBuffer(cursorImage);
+    auto buffer = m_backend->shmPool()->createBuffer(cursorImage);
     if (!buffer) {
         return;
     }
-    m_seat->installCursorImage(buffer, cursorImage.size(), cursor.hotSpot());
+    m_seat->installCursorImage(buffer->buffer(), cursorImage.size(), cursor.hotSpot());
 }
 
 void X11CursorTracker::resetCursor()