diff --git a/main.cpp b/main.cpp
index db58ac71f5..e5fc0c2297 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,6 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KLocalizedString>
 #include <KPluginMetaData>
 #include <KSharedConfig>
+#include <KWayland/Server/surface_interface.h>
 // Qt
 #include <qplatformdefs.h>
 #include <qcommandlineparser.h>
@@ -105,6 +106,7 @@ Application::Application(Application::OperationMode mode, int &argc, char **argv
 {
     qRegisterMetaType<Options::WindowOperation>("Options::WindowOperation");
     qRegisterMetaType<KWin::EffectWindow*>();
+    qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *");
 }
 
 void Application::setConfigLock(bool lock)
diff --git a/wayland_server.cpp b/wayland_server.cpp
index 099adcd269..bd40ddbe19 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -73,7 +73,6 @@ KWIN_SINGLETON_FACTORY(WaylandServer)
 WaylandServer::WaylandServer(QObject *parent)
     : QObject(parent)
 {
-    qRegisterMetaType<KWayland::Server::SurfaceInterface *>("KWayland::Server::SurfaceInterface *");
     qRegisterMetaType<KWayland::Server::OutputInterface::DpmsMode>();
 
     connect(kwinApp(), &Application::screensCreated, this, &WaylandServer::initOutputs);