diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,67 +1,67 @@
 set(SERVER_LIB_SRCS
+    ../compat/wayland-xdg-shell-v5-protocol.c
     appmenu_interface.cpp
+    blur_interface.cpp
     buffer_interface.cpp
     clientconnection.cpp
     compositor_interface.cpp
+    contrast_interface.cpp
     datadevice_interface.cpp
     datadevicemanager_interface.cpp
     dataoffer_interface.cpp
     datasource_interface.cpp
     display.cpp
     dpms_interface.cpp
+    eglstream_controller_interface.cpp
+    fakeinput_interface.cpp
     filtered_display.cpp
     global.cpp
     idle_interface.cpp
     idleinhibit_interface.cpp
     idleinhibit_interface_v1.cpp
-    fakeinput_interface.cpp
     keyboard_interface.cpp
     keystate_interface.cpp
     linuxdmabuf_v1_interface.cpp
-    remote_access_interface.cpp
-    outputconfiguration_interface.cpp
+    output_interface.cpp
     outputchangeset.cpp
-    outputmanagement_interface.cpp
+    outputconfiguration_interface.cpp
     outputdevice_interface.cpp
-    output_interface.cpp
-    pointer_interface.cpp
+    outputmanagement_interface.cpp
     plasmashell_interface.cpp
     plasmavirtualdesktop_interface.cpp
     plasmawindowmanagement_interface.cpp
+    pointer_interface.cpp
     pointerconstraints_interface.cpp
     pointerconstraints_interface_v1.cpp
     pointergestures_interface.cpp
     pointergestures_interface_v1.cpp
     qtsurfaceextension_interface.cpp
     region_interface.cpp
     relativepointer_interface.cpp
     relativepointer_interface_v1.cpp
+    remote_access_interface.cpp
     resource.cpp
     seat_interface.cpp
-    slide_interface.cpp
-    shadow_interface.cpp
-    blur_interface.cpp
-    contrast_interface.cpp
     server_decoration_interface.cpp
     server_decoration_palette_interface.cpp
+    shadow_interface.cpp
     shell_interface.cpp
-    surface_interface.cpp
+    slide_interface.cpp
     subcompositor_interface.cpp
-    touch_interface.cpp
+    surface_interface.cpp
     textinput_interface.cpp
     textinput_interface_v0.cpp
     textinput_interface_v2.cpp
+    touch_interface.cpp
     xdgdecoration_interface.cpp
+    xdgforeign_interface.cpp
+    xdgforeign_v2_interface.cpp
+    xdgoutput_interface.cpp
     xdgshell_interface.cpp
+    xdgshell_stable_interface.cpp
     xdgshell_v5_interface.cpp
-    xdgforeign_v2_interface.cpp
-    xdgforeign_interface.cpp
     xdgshell_v5_interface.cpp
     xdgshell_v6_interface.cpp
-    xdgshell_stable_interface.cpp
-    xdgoutput_interface.cpp
-    eglstream_controller_interface.cpp
-    ../compat/wayland-xdg-shell-v5-protocol.c
 )
 
 ecm_qt_declare_logging_category(SERVER_LIB_SRCS HEADER logging.h IDENTIFIER KWAYLAND_SERVER CATEGORY_NAME kwayland-server DEFAULT_SEVERITY Critical)
@@ -221,62 +221,62 @@
 )
 
 set(SERVER_GENERATED_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-eglstream-controller-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-linux-dmabuf-unstable-v1-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-org_kde_kwin_outputdevice-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-org_kde_kwin_outputdevice-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-window-management-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-window-management-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-qt-surface-extension-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-qt-surface-extension-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-relativepointer-unstable-v1-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-relativepointer-unstable-v1-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration_palette-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration_palette-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-server-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-foreign-unstable-v2-client-protocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-foreign-unstable-v2-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-client-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-eglstream-controller-server-protocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/wayland-linux-dmabuf-unstable-v1-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-server-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-server-protocol.h
 )
 
 set_source_files_properties(${SERVER_GENERATED_SRCS} PROPERTIES SKIP_AUTOMOC ON)
@@ -313,39 +313,40 @@
   ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Server/kwaylandserver_export.h
   appmenu_interface.h
   blur_interface.h
-  contrast_interface.h
   buffer_interface.h
   clientconnection.h
   compositor_interface.h
+  contrast_interface.h
   datadevice_interface.h
   datadevicemanager_interface.h
   dataoffer_interface.h
   datasource_interface.h
   display.h
   dpms_interface.h
   eglstream_controller_interface.h
-  filtered_display.h
   fakeinput_interface.h
+  filtered_display.h
   global.h
   idle_interface.h
   idleinhibit_interface.h
   keyboard_interface.h
   keystate_interface.h
-  remote_access_interface.h
-  outputdevice_interface.h
+  linuxdmabuf_v1_interface.h
+  output_interface.h
   outputchangeset.h
   outputconfiguration_interface.h
+  outputdevice_interface.h
   outputmanagement_interface.h
-  output_interface.h
-  pointer_interface.h
-  pointerconstraints_interface.h
-  pointergestures_interface.h
   plasmashell_interface.h
   plasmavirtualdesktop_interface.h
   plasmawindowmanagement_interface.h
+  pointer_interface.h
+  pointerconstraints_interface.h
+  pointergestures_interface.h
   qtsurfaceextension_interface.h
   region_interface.h
   relativepointer_interface.h
+  remote_access_interface.h
   resource.h
   seat_interface.h
   server_decoration_interface.h
@@ -358,10 +359,9 @@
   textinput_interface.h
   touch_interface.h
   xdgdecoration_interface.h
-  xdgshell_interface.h
   xdgforeign_interface.h
   xdgoutput_interface.h
-  linuxdmabuf_v1_interface.h
+  xdgshell_interface.h
 )
 
 install(FILES