diff --git a/autotests/server/test_display.cpp b/autotests/server/test_display.cpp
--- a/autotests/server/test_display.cpp
+++ b/autotests/server/test_display.cpp
@@ -207,10 +207,10 @@
 
 void TestWaylandServerDisplay::testOutputManagement()
 {
-    auto display = new KWayland::Server::Display(this);
-    display->setSocketName("kwayland-test-0");
-    display->start();
-    auto kwin = display->createOutputManagement(this);
+    Display display;
+    display.setSocketName("kwayland-test-0");
+    display.start();
+    auto kwin = display.createOutputManagement(this);
     kwin->create();
     QVERIFY(kwin->isValid());
 }
diff --git a/src/client/xdgoutput.cpp b/src/client/xdgoutput.cpp
--- a/src/client/xdgoutput.cpp
+++ b/src/client/xdgoutput.cpp
@@ -172,8 +172,8 @@
     }
 }
 
-XdgOutput::Private::Private(XdgOutput *q)
-    : q(q)
+XdgOutput::Private::Private(XdgOutput *qptr)
+    : q(qptr)
 {
 }
 
diff --git a/src/server/dpms_interface.cpp b/src/server/dpms_interface.cpp
--- a/src/server/dpms_interface.cpp
+++ b/src/server/dpms_interface.cpp
@@ -34,9 +34,9 @@
 };
 #endif
 
-DpmsManagerInterface::Private::Private(DpmsManagerInterface *q, Display *d)
+DpmsManagerInterface::Private::Private(DpmsManagerInterface *qptr, Display *d)
     : Global::Private(d, &org_kde_kwin_dpms_manager_interface, s_version)
-    , q(q)
+    , q(qptr)
 {
 }
 
@@ -82,9 +82,9 @@
 };
 #endif
 
-DpmsInterface::Private::Private(DpmsInterface *q, DpmsManagerInterface *g, wl_resource *parentResource, OutputInterface *output)
+DpmsInterface::Private::Private(DpmsInterface *q, DpmsManagerInterface *g, wl_resource *parentResource, OutputInterface *outputInterface)
     : Resource::Private(q, g, parentResource, &org_kde_kwin_dpms_interface, &s_interface)
-    , output(output)
+    , output(outputInterface)
 {
 }
 
diff --git a/src/server/xdgoutput_interface.cpp b/src/server/xdgoutput_interface.cpp
--- a/src/server/xdgoutput_interface.cpp
+++ b/src/server/xdgoutput_interface.cpp
@@ -150,9 +150,9 @@
     });
 }
 
-XdgOutputManagerInterface::Private::Private(XdgOutputManagerInterface *q, Display *d)
+XdgOutputManagerInterface::Private::Private(XdgOutputManagerInterface *qptr, Display *d)
     : Global::Private(d, &zxdg_output_manager_v1_interface, s_version)
-    , q(q)
+    , q(qptr)
 {
 }