wayland: Drop "_interface" from filenames

The cpp files in the wayland directory are named after protocol names.
"_interface" does not contribute anything new.

autotests/integration/globalshortcuts_test.cpp

@@ -13,8 +13,8 @@
 #include "keyboard_input.h"
 #include "pointer_input.h"
 #include "useractions.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/keyboard.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/input_stacking_order.cpp

@@ -11,7 +11,7 @@
 #include "core/output.h"
 #include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/inputmethod_test.cpp

@@ -18,8 +18,8 @@
 #include "virtualkeyboard_dbus.h"
 #include "wayland/clientconnection.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/internal_window.cpp

@@ -12,7 +12,7 @@
 #include "effects.h"
 #include "internalwindow.h"
 #include "pointer_input.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

autotests/integration/lockscreen.cpp

@@ -14,8 +14,8 @@
 #include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/keyboard.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/plasmawindow_test.cpp

@@ -11,7 +11,7 @@
 #include "core/output.h"
 #include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/pointer_constraints_test.cpp

@@ -12,8 +12,8 @@
 #include "cursor.h"
 #include "keyboard_input.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/pointer_input.cpp

@@ -16,7 +16,7 @@
 #include "pointer_input.h"
 #include "utils/xcursortheme.h"
 #include "virtualdesktops.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/transient_placement.cpp

@@ -11,8 +11,8 @@
 #include "core/output.h"
 #include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/xwayland_input_test.cpp

@@ -10,7 +10,7 @@
 
 #include "core/output.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/xwayland_selections_test.cpp

@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/backends/drm/drm_dmabuf_feedback.cpp

@@ -10,7 +10,7 @@
 
 #include "drm_egl_backend.h"
 #include "drm_gpu.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 namespace KWin
 {

src/backends/drm/drm_egl_layer.cpp

@@ -14,7 +14,7 @@
 #include "drm_output.h"
 #include "drm_pipeline.h"
 #include "scene/surfaceitem_wayland.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 #include <QRegion>
 #include <drm_fourcc.h>

src/backends/drm/drm_virtual_egl_layer.cpp

@@ -14,7 +14,7 @@
 #include "platformsupport/scenes/opengl/eglswapchain.h"
 #include "platformsupport/scenes/opengl/glrendertimequery.h"
 #include "scene/surfaceitem_wayland.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 #include <QRegion>
 #include <drm_fourcc.h>

src/backends/fakeinput/fakeinputbackend.cpp

@@ -6,7 +6,7 @@
 
 #include "fakeinputbackend.h"
 #include "fakeinputdevice.h"
-#include "wayland/fakeinput_interface.h"
+#include "wayland/fakeinput.h"
 #include "wayland_server.h"
 
 namespace KWin

src/backends/fakeinput/fakeinputdevice.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "fakeinputdevice.h"
-#include "wayland/fakeinput_interface.h"
+#include "wayland/fakeinput.h"
 
 namespace KWin
 {

src/core/renderloop.cpp

@@ -10,7 +10,7 @@
 #include "scene/surfaceitem.h"
 #include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 namespace KWin
 {

src/cursorsource.cpp

@@ -6,7 +6,7 @@
 
 #include "cursorsource.h"
 #include "cursor.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 namespace KWin
 {

src/debug_console.cpp

@@ -21,13 +21,13 @@
 #include "utils/subsurfacemonitor.h"
 #include "wayland/abstract_data_source.h"
 #include "wayland/clientconnection.h"
-#include "wayland/datacontrolsource_v1_interface.h"
-#include "wayland/datasource_interface.h"
+#include "wayland/datacontrolsource_v1.h"
+#include "wayland/datasource.h"
 #include "wayland/display.h"
-#include "wayland/primaryselectionsource_v1_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/subcompositor_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/primaryselectionsource_v1.h"
+#include "wayland/seat.h"
+#include "wayland/subcompositor.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
 #include "workspace.h"

src/decorations/decorationbridge.cpp

@@ -14,7 +14,7 @@
 #include "decorations_logging.h"
 #include "settings.h"
 // KWin core
-#include "wayland/server_decoration_interface.h"
+#include "wayland/server_decoration.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/dpmsinputeventfilter.cpp

@@ -10,7 +10,7 @@
 #include "core/output.h"
 #include "input_event.h"
 #include "main.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

src/events.cpp

@@ -29,8 +29,8 @@
 #include "screenedge.h"
 #include "useractions.h"
 #include "utils/xcbutils.h"
-#include "wayland/surface_interface.h"
-#include "wayland/xwaylandshell_v1_interface.h"
+#include "wayland/surface.h"
+#include "wayland/xwaylandshell_v1.h"
 #include "wayland_server.h"
 
 #include <KDecoration2/Decoration>

src/idle_inhibition.cpp

@@ -10,7 +10,7 @@
 #include "idle_inhibition.h"
 #include "input.h"
 #include "virtualdesktops.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 #include "window.h"
 #include "workspace.h"
 

src/input.cpp

@@ -29,7 +29,7 @@
 #include "pointer_input.h"
 #include "tablet_input.h"
 #include "touch_input.h"
-#include "wayland/xdgtopleveldrag_v1_interface.h"
+#include "wayland/xdgtopleveldrag_v1.h"
 #include "x11window.h"
 #if KWIN_BUILD_TABBOX
 #include "tabbox/tabbox.h"
@@ -43,10 +43,10 @@
 #include "screenedge.h"
 #include "virtualdesktops.h"
 #include "wayland/display.h"
-#include "wayland/inputmethod_v1_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/tablet_v2_interface.h"
+#include "wayland/inputmethod_v1.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/tablet_v2.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "xkb.h"
@@ -73,7 +73,7 @@
 #include <xkbcommon/xkbcommon.h>
 
 #include "osd.h"
-#include "wayland/xdgshell_interface.h"
+#include "wayland/xdgshell.h"
 #include <cmath>
 
 using namespace std::literals;

src/inputmethod.cpp

@@ -24,12 +24,12 @@
 #include "tablet_input.h"
 #include "touch_input.h"
 #include "wayland/display.h"
-#include "wayland/inputmethod_v1_interface.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/textinput_v1_interface.h"
-#include "wayland/textinput_v3_interface.h"
+#include "wayland/inputmethod_v1.h"
+#include "wayland/keyboard.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/textinput_v1.h"
+#include "wayland/textinput_v3.h"
 #include "xkb.h"
 
 #include <KLocalizedString>

src/inputmethod.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "wayland/textinput_v2_interface.h"
+#include "wayland/textinput_v2.h"
 
 #include <utility>
 #include <vector>

src/inputpanelv1integration.cpp

@@ -7,7 +7,7 @@
 #include "inputpanelv1integration.h"
 #include "inputpanelv1window.h"
 #include "wayland/display.h"
-#include "wayland/inputmethod_v1_interface.h"
+#include "wayland/inputmethod_v1.h"
 #include "wayland_server.h"
 
 using namespace KWaylandServer;

src/inputpanelv1window.cpp

@@ -10,12 +10,12 @@
 #include "inputpanelv1window.h"
 #include "core/output.h"
 #include "inputmethod.h"
-#include "wayland/output_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/textinput_v1_interface.h"
-#include "wayland/textinput_v2_interface.h"
-#include "wayland/textinput_v3_interface.h"
+#include "wayland/output.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/textinput_v1.h"
+#include "wayland/textinput_v2.h"
+#include "wayland/textinput_v3.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

src/inputpanelv1window.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "wayland/inputmethod_v1_interface.h"
+#include "wayland/inputmethod_v1.h"
 #include "waylandwindow.h"
 #include <QPointer>
 

src/keyboard_input.cpp

@@ -16,9 +16,9 @@
 #include "keyboard_layout.h"
 #include "keyboard_repeat.h"
 #include "modifier_only_shortcuts.h"
-#include "wayland/datadevice_interface.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/datadevice.h"
+#include "wayland/keyboard.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/keyboard_repeat.cpp

@@ -9,8 +9,8 @@
 #include "keyboard_repeat.h"
 #include "input_event.h"
 #include "keyboard_input.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/keyboard.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "xkb.h"
 

src/layershellv1integration.cpp

@@ -8,8 +8,8 @@
 #include "core/output.h"
 #include "layershellv1window.h"
 #include "wayland/display.h"
-#include "wayland/layershell_v1_interface.h"
-#include "wayland/output_interface.h"
+#include "wayland/layershell_v1.h"
+#include "wayland/output.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

src/layershellv1window.cpp

@@ -8,10 +8,10 @@
 #include "core/output.h"
 #include "layershellv1integration.h"
 #include "screenedge.h"
-#include "wayland/layershell_v1_interface.h"
-#include "wayland/output_interface.h"
-#include "wayland/screenedge_v1_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/layershell_v1.h"
+#include "wayland/output.h"
+#include "wayland/screenedge_v1.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

src/main.cpp

@@ -33,7 +33,7 @@
 #include "sm.h"
 #include "tabletmodemanager.h"
 #include "utils/xcbutils.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 #include "workspace.h"
 #include "x11eventfilter.h"
 

src/main_wayland.cpp

@@ -22,7 +22,7 @@
 #include "tabletmodemanager.h"
 #include "utils/realtime.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "xwayland/xwayland.h"

src/plugins/backgroundcontrast/contrast.cpp

@@ -13,9 +13,9 @@
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "utils/xcbutils.h"
-#include "wayland/contrast_interface.h"
+#include "wayland/contrast.h"
 #include "wayland/display.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 #include <QCoreApplication>
 #include <QMatrix4x4>

src/plugins/blur/blur.cpp

@@ -14,9 +14,9 @@
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include "utils/xcbutils.h"
-#include "wayland/blur_interface.h"
+#include "wayland/blur.h"
 #include "wayland/display.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 #include <QGuiApplication>
 #include <QMatrix4x4>

src/plugins/screencast/screencastmanager.cpp

@@ -17,7 +17,7 @@
 #include "scene/workspacescene.h"
 #include "screencaststream.h"
 #include "wayland/display.h"
-#include "wayland/output_interface.h"
+#include "wayland/output.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "windowscreencastsource.h"

src/plugins/screencast/screencastmanager.h

@@ -10,7 +10,7 @@
 
 #include "plugin.h"
 
-#include "wayland/screencast_v1_interface.h"
+#include "wayland/screencast_v1.h"
 
 namespace KWin
 {

src/plugins/screencast/screencaststream.h

@@ -10,7 +10,7 @@
 
 #include "config-kwin.h"
 
-#include "wayland/screencast_v1_interface.h"
+#include "wayland/screencast_v1.h"
 
 #include <QDateTime>
 #include <QHash>

src/plugins/slidingpopups/slidingpopups.cpp

@@ -12,8 +12,8 @@
 #include "slidingpopupsconfig.h"
 
 #include "wayland/display.h"
-#include "wayland/slide_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/slide.h"
+#include "wayland/surface.h"
 
 #include <QFontMetrics>
 #include <QGuiApplication>

src/plugins/windowsystem/windowsystem.cpp

@@ -10,7 +10,7 @@
 #include <QGuiApplication>
 #include <QWindow>
 #include <wayland/display.h>
-#include <wayland/seat_interface.h>
+#include <wayland/seat.h>
 #include <wayland_server.h>
 #include <window.h>
 #include <workspace.h>

src/pointer_input.cpp

@@ -21,10 +21,10 @@
 #include "mousebuttons.h"
 #include "osd.h"
 #include "wayland/display.h"
-#include "wayland/pointer_interface.h"
-#include "wayland/pointerconstraints_v1_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/pointer.h"
+#include "wayland/pointerconstraints_v1.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

src/popup_input_filter.cpp

@@ -8,7 +8,7 @@
 #include "input_event.h"
 #include "internalwindow.h"
 #include "keyboard_input.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/scene/dndiconitem.cpp

@@ -6,8 +6,8 @@
 
 #include "scene/dndiconitem.h"
 #include "scene/surfaceitem_wayland.h"
-#include "wayland/datadevice_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/datadevice.h"
+#include "wayland/surface.h"
 
 namespace KWin
 {

src/scene/surfaceitem_wayland.cpp

@@ -8,8 +8,8 @@
 #include "compositor.h"
 #include "core/graphicsbuffer.h"
 #include "core/renderbackend.h"
-#include "wayland/subcompositor_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/subcompositor.h"
+#include "wayland/surface.h"
 #include "window.h"
 #include "x11window.h"
 

src/scene/workspacescene.cpp

@@ -66,8 +66,8 @@
 #include "scene/surfaceitem.h"
 #include "scene/windowitem.h"
 #include "shadow.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
 #include "workspace.h"

src/shadow.cpp

@@ -12,8 +12,8 @@
 #include "atoms.h"
 #include "core/graphicsbufferview.h"
 #include "internalwindow.h"
-#include "wayland/shadow_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/shadow.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "x11window.h"
 

src/tablet_input.cpp

@@ -11,8 +11,8 @@
 #include "input_event.h"
 #include "input_event_spy.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/touch_input.cpp

@@ -14,7 +14,7 @@
 #include "decorations/decoratedclient.h"
 #include "input_event_spy.h"
 #include "pointer_input.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/utils/subsurfacemonitor.cpp

@@ -9,8 +9,8 @@
 
 #include "subsurfacemonitor.h"
 
-#include "wayland/subcompositor_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/subcompositor.h"
+#include "wayland/surface.h"
 
 using namespace KWaylandServer;
 

src/virtualdesktops.cpp

@@ -9,7 +9,7 @@
 */
 #include "virtualdesktops.h"
 #include "input.h"
-#include "wayland/plasmavirtualdesktop_interface.h"
+#include "wayland/plasmavirtualdesktop.h"
 // KDE
 #include <KConfigGroup>
 #include <KGlobalAccel>

src/wayland/CMakeLists.txt

@@ -225,81 +225,81 @@ ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml
 target_sources(kwin PRIVATE
     abstract_data_source.cpp
     abstract_drop_handler.cpp
-    appmenu_interface.cpp
-    blur_interface.cpp
+    appmenu.cpp
+    blur.cpp
     clientconnection.cpp
-    compositor_interface.cpp
-    contenttype_v1_interface.cpp
-    contrast_interface.cpp
-    cursorshape_v1_interface.cpp
-    datacontroldevice_v1_interface.cpp
-    datacontroldevicemanager_v1_interface.cpp
-    datacontroloffer_v1_interface.cpp
-    datacontrolsource_v1_interface.cpp
-    datadevice_interface.cpp
-    datadevicemanager_interface.cpp
-    dataoffer_interface.cpp
-    datasource_interface.cpp
+    compositor.cpp
+    contenttype_v1.cpp
+    contrast.cpp
+    cursorshape_v1.cpp
+    datacontroldevice_v1.cpp
+    datacontroldevicemanager_v1.cpp
+    datacontroloffer_v1.cpp
+    datacontrolsource_v1.cpp
+    datadevice.cpp
+    datadevicemanager.cpp
+    dataoffer.cpp
+    datasource.cpp
     display.cpp
-    dpms_interface.cpp
+    dpms.cpp
     drmclientbuffer.cpp
-    drmlease_v1_interface.cpp
-    fakeinput_interface.cpp
-    fractionalscale_v1_interface.cpp
+    drmlease_v1.cpp
+    fakeinput.cpp
+    fractionalscale_v1.cpp
     filtered_display.cpp
-    idle_interface.cpp
-    idleinhibit_v1_interface.cpp
-    idlenotify_v1_interface.cpp
-    inputmethod_v1_interface.cpp
-    keyboard_interface.cpp
-    keyboard_shortcuts_inhibit_v1_interface.cpp
-    keystate_interface.cpp
-    layershell_v1_interface.cpp
+    idle.cpp
+    idleinhibit_v1.cpp
+    idlenotify_v1.cpp
+    inputmethod_v1.cpp
+    keyboard.cpp
+    keyboard_shortcuts_inhibit_v1.cpp
+    keystate.cpp
+    layershell_v1.cpp
     linuxdmabufv1clientbuffer.cpp
-    lockscreen_overlay_v1_interface.cpp
-    output_interface.cpp
-    output_order_v1_interface.cpp
-    outputdevice_v2_interface.cpp
-    outputmanagement_v2_interface.cpp
-    plasmashell_interface.cpp
-    plasmavirtualdesktop_interface.cpp
-    plasmawindowmanagement_interface.cpp
-    pointer_interface.cpp
-    pointerconstraints_v1_interface.cpp
-    pointergestures_v1_interface.cpp
-    primaryselectiondevice_v1_interface.cpp
-    primaryselectiondevicemanager_v1_interface.cpp
-    primaryselectionoffer_v1_interface.cpp
-    primaryselectionsource_v1_interface.cpp
-    region_interface.cpp
-    relativepointer_v1_interface.cpp
-    screencast_v1_interface.cpp
-    screenedge_v1_interface.cpp
-    seat_interface.cpp
-    server_decoration_interface.cpp
-    server_decoration_palette_interface.cpp
-    shadow_interface.cpp
+    lockscreen_overlay_v1.cpp
+    output.cpp
+    output_order_v1.cpp
+    outputdevice_v2.cpp
+    outputmanagement_v2.cpp
+    plasmashell.cpp
+    plasmavirtualdesktop.cpp
+    plasmawindowmanagement.cpp
+    pointer.cpp
+    pointerconstraints_v1.cpp
+    pointergestures_v1.cpp
+    primaryselectiondevice_v1.cpp
+    primaryselectiondevicemanager_v1.cpp
+    primaryselectionoffer_v1.cpp
+    primaryselectionsource_v1.cpp
+    region.cpp
+    relativepointer_v1.cpp
+    screencast_v1.cpp
+    screenedge_v1.cpp
+    seat.cpp
+    server_decoration.cpp
+    server_decoration_palette.cpp
+    shadow.cpp
     shmclientbuffer.cpp
-    slide_interface.cpp
-    subcompositor_interface.cpp
-    surface_interface.cpp
-    tablet_v2_interface.cpp
-    tearingcontrol_v1_interface.cpp
+    slide.cpp
+    subcompositor.cpp
+    surface.cpp
+    tablet_v2.cpp
+    tearingcontrol_v1.cpp
     textinput.cpp
-    textinput_v1_interface.cpp
-    textinput_v2_interface.cpp
-    textinput_v3_interface.cpp
-    touch_interface.cpp
+    textinput_v1.cpp
+    textinput_v2.cpp
+    textinput_v3.cpp
+    touch.cpp
     transaction.cpp
-    viewporter_interface.cpp
-    xdgactivation_v1_interface.cpp
-    xdgdecoration_v1_interface.cpp
-    xdgforeign_v2_interface.cpp
-    xdgoutput_v1_interface.cpp
-    xdgshell_interface.cpp
-    xdgtopleveldrag_v1_interface.cpp
-    xwaylandkeyboardgrab_v1_interface.cpp
-    xwaylandshell_v1_interface.cpp
+    viewporter.cpp
+    xdgactivation_v1.cpp
+    xdgdecoration_v1.cpp
+    xdgforeign_v2.cpp
+    xdgoutput_v1.cpp
+    xdgshell.cpp
+    xdgtopleveldrag_v1.cpp
+    xwaylandkeyboardgrab_v1.cpp
+    xwaylandshell_v1.cpp
 )
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -311,70 +311,70 @@ else()
 endif()
 
 install(FILES
-    appmenu_interface.h
-    blur_interface.h
-    compositor_interface.h
-    contenttype_v1_interface.h
-    contrast_interface.h
-    cursorshape_v1_interface.h
-    datacontroldevice_v1_interface.h
-    datacontroldevicemanager_v1_interface.h
-    datacontroloffer_v1_interface.h
-    datacontrolsource_v1_interface.h
-    datadevice_interface.h
-    datadevicemanager_interface.h
-    dataoffer_interface.h
-    datasource_interface.h
-    dpms_interface.h
-    drmlease_v1_interface.h
-    fakeinput_interface.h
-    fractionalscale_v1_interface.h
-    idle_interface.h
-    idleinhibit_v1_interface.h
-    idlenotify_v1_interface.h
-    inputmethod_v1_interface.h
-    keyboard_interface.h
-    keyboard_shortcuts_inhibit_v1_interface.h
-    keystate_interface.h
-    layershell_v1_interface.h
-    lockscreen_overlay_v1_interface.h
-    output_interface.h
-    output_order_v1_interface.h
-    outputdevice_v2_interface.h
-    outputmanagement_v2_interface.h
-    plasmashell_interface.h
-    plasmavirtualdesktop_interface.h
-    plasmawindowmanagement_interface.h
-    pointer_interface.h
-    pointerconstraints_v1_interface.h
-    pointergestures_v1_interface.h
-    primaryselectiondevice_v1_interface.h
-    primaryselectiondevicemanager_v1_interface.h
-    primaryselectionoffer_v1_interface.h
-    primaryselectionsource_v1_interface.h
-    relativepointer_v1_interface.h
-    screencast_v1_interface.h
-    screenedge_v1_interface.h
-    seat_interface.h
-    server_decoration_interface.h
-    server_decoration_palette_interface.h
-    shadow_interface.h
-    slide_interface.h
-    subcompositor_interface.h
-    surface_interface.h
-    tablet_v2_interface.h
-    tearingcontrol_v1_interface.h
-    textinput_v1_interface.h
-    textinput_v2_interface.h
-    textinput_v3_interface.h
-    touch_interface.h
-    viewporter_interface.h
-    xdgactivation_v1_interface.h
-    xdgdecoration_v1_interface.h
-    xdgforeign_v2_interface.h
-    xdgoutput_v1_interface.h
-    xdgshell_interface.h
-    xwaylandkeyboardgrab_v1_interface.h
-    xwaylandshell_v1_interface.h
+    appmenu.h
+    blur.h
+    compositor.h
+    contenttype_v1.h
+    contrast.h
+    cursorshape_v1.h
+    datacontroldevice_v1.h
+    datacontroldevicemanager_v1.h
+    datacontroloffer_v1.h
+    datacontrolsource_v1.h
+    datadevice.h
+    datadevicemanager.h
+    dataoffer.h
+    datasource.h
+    dpms.h
+    drmlease_v1.h
+    fakeinput.h
+    fractionalscale_v1.h
+    idle.h
+    idleinhibit_v1.h
+    idlenotify_v1.h
+    inputmethod_v1.h
+    keyboard.h
+    keyboard_shortcuts_inhibit_v1.h
+    keystate.h
+    layershell_v1.h
+    lockscreen_overlay_v1.h
+    output.h
+    output_order_v1.h
+    outputdevice_v2.h
+    outputmanagement_v2.h
+    plasmashell.h
+    plasmavirtualdesktop.h
+    plasmawindowmanagement.h
+    pointer.h
+    pointerconstraints_v1.h
+    pointergestures_v1.h
+    primaryselectiondevice_v1.h
+    primaryselectiondevicemanager_v1.h
+    primaryselectionoffer_v1.h
+    primaryselectionsource_v1.h
+    relativepointer_v1.h
+    screencast_v1.h
+    screenedge_v1.h
+    seat.h
+    server_decoration.h
+    server_decoration_palette.h
+    shadow.h
+    slide.h
+    subcompositor.h
+    surface.h
+    tablet_v2.h
+    tearingcontrol_v1.h
+    textinput_v1.h
+    textinput_v2.h
+    textinput_v3.h
+    touch.h
+    viewporter.h
+    xdgactivation_v1.h
+    xdgdecoration_v1.h
+    xdgforeign_v2.h
+    xdgoutput_v1.h
+    xdgshell.h
+    xwaylandkeyboardgrab_v1.h
+    xwaylandshell_v1.h
 
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/wayland COMPONENT Devel)

src/wayland/abstract_data_source.h

@@ -9,7 +9,7 @@
 #include "kwin_export.h"
 
 #include "clientconnection.h"
-#include "datadevicemanager_interface.h"
+#include "datadevicemanager.h"
 
 struct wl_client;
 

src/wayland/appmenu.cpp

@@ -3,9 +3,9 @@
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
-#include "appmenu_interface.h"
+#include "appmenu.h"
 #include "display.h"
-#include "surface_interface.h"
+#include "surface.h"
 
 #include <QPointer>
 #include <QtGlobal>

src/wayland/autotests/client/test_datadevice.cpp

@@ -8,13 +8,13 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include "wayland/compositor_interface.h"
-#include "wayland/datadevicemanager_interface.h"
-#include "wayland/datasource_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/datadevicemanager.h"
+#include "wayland/datasource.h"
 #include "wayland/display.h"
-#include "wayland/pointer_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/pointer.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 
 // KWayland
 #include "KWayland/Client/compositor.h"

src/wayland/autotests/client/test_datasource.cpp

@@ -9,8 +9,8 @@
 #include <QTemporaryFile>
 #include <QTest>
 
-#include "wayland/datadevicemanager_interface.h"
-#include "wayland/datasource_interface.h"
+#include "wayland/datadevicemanager.h"
+#include "wayland/datasource.h"
 #include "wayland/display.h"
 
 // KWayland

src/wayland/autotests/client/test_drag_drop.cpp

@@ -8,12 +8,12 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
-#include "wayland/datadevicemanager_interface.h"
-#include "wayland/datasource_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/datadevicemanager.h"
+#include "wayland/datasource.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
-#include "wayland/seat_interface_p.h"
+#include "wayland/seat.h"
+#include "wayland/seat_p.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_error.cpp

@@ -8,9 +8,9 @@
 #include <QTest>
 
 // server
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/plasmashell_interface.h"
+#include "wayland/plasmashell.h"
 
 // client
 #include "KWayland/Client/compositor.h"

src/wayland/autotests/client/test_fake_input.cpp

@@ -13,7 +13,7 @@
 #include "KWayland/Client/registry.h"
 // server
 #include "wayland/display.h"
-#include "wayland/fakeinput_interface.h"
+#include "wayland/fakeinput.h"
 
 #include <linux/input.h>
 

src/wayland/autotests/client/test_plasma_activities.cpp

@@ -7,9 +7,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/plasmawindowmanagement_interface.h"
+#include "wayland/plasmawindowmanagement.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_plasma_virtual_desktop.cpp

@@ -7,10 +7,10 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/plasmavirtualdesktop_interface.h"
-#include "wayland/plasmawindowmanagement_interface.h"
+#include "wayland/plasmavirtualdesktop.h"
+#include "wayland/plasmawindowmanagement.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_plasmashell.cpp

@@ -7,9 +7,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWayland
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/plasmashell_interface.h"
+#include "wayland/plasmashell.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_pointer_constraints.cpp

@@ -17,11 +17,11 @@
 #include "KWayland/Client/shm_pool.h"
 #include "KWayland/Client/surface.h"
 // server
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/pointerconstraints_v1_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/pointerconstraints_v1.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
 
 using namespace KWaylandServer;
 

src/wayland/autotests/client/test_selection.cpp

@@ -18,10 +18,10 @@
 #include "KWayland/Client/seat.h"
 #include "KWayland/Client/surface.h"
 // server
-#include "wayland/compositor_interface.h"
-#include "wayland/datadevicemanager_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/datadevicemanager.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 
 using namespace KWaylandServer;
 

src/wayland/autotests/client/test_server_side_decoration.cpp

@@ -7,9 +7,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/server_decoration_interface.h"
+#include "wayland/server_decoration.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_server_side_decoration_palette.cpp

@@ -8,9 +8,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/server_decoration_palette_interface.h"
+#include "wayland/server_decoration_palette.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_shadow.cpp

@@ -16,9 +16,9 @@
 #include "KWayland/Client/surface.h"
 // server
 #include "core/graphicsbufferview.h"
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/shadow_interface.h"
+#include "wayland/shadow.h"
 
 using namespace KWaylandServer;
 

src/wayland/autotests/client/test_shm_pool.cpp

@@ -8,9 +8,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/surface_interface.h"
+#include "wayland/surface.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_text_input_v2.cpp

@@ -16,11 +16,11 @@
 #include "KWayland/Client/surface.h"
 #include "KWayland/Client/textinput.h"
 // server
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 #include "wayland/textinput.h"
-#include "wayland/textinput_v2_interface.h"
+#include "wayland/textinput_v2.h"
 
 using namespace KWaylandServer;
 using namespace std::literals;

src/wayland/autotests/client/test_wayland_appmenu.cpp

@@ -8,8 +8,8 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/appmenu_interface.h"
-#include "wayland/compositor_interface.h"
+#include "wayland/appmenu.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
 
 #include "KWayland/Client/appmenu.h"

src/wayland/autotests/client/test_wayland_blur.cpp

@@ -7,8 +7,8 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/blur_interface.h"
-#include "wayland/compositor_interface.h"
+#include "wayland/blur.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
 
 #include "KWayland/Client/blur.h"

src/wayland/autotests/client/test_wayland_contrast.cpp

@@ -8,8 +8,8 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
-#include "wayland/contrast_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/contrast.h"
 #include "wayland/display.h"
 
 #include "KWayland/Client/compositor.h"

src/wayland/autotests/client/test_wayland_filter.cpp

@@ -7,8 +7,8 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/blur_interface.h"
-#include "wayland/compositor_interface.h"
+#include "wayland/blur.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
 #include "wayland/filtered_display.h"
 

src/wayland/autotests/client/test_wayland_output.cpp

@@ -8,7 +8,7 @@
 #include <QTest>
 // KWin
 #include "wayland/display.h"
-#include "wayland/output_interface.h"
+#include "wayland/output.h"
 
 #include "KWayland/Client/connection_thread.h"
 #include "KWayland/Client/event_queue.h"

src/wayland/autotests/client/test_wayland_seat.cpp

@@ -8,17 +8,17 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
-#include "wayland/datadevicemanager_interface.h"
-#include "wayland/datasource_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/datadevicemanager.h"
+#include "wayland/datasource.h"
 #include "wayland/display.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/pointer_interface.h"
-#include "wayland/pointergestures_v1_interface.h"
-#include "wayland/relativepointer_v1_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/subcompositor_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/keyboard.h"
+#include "wayland/pointer.h"
+#include "wayland/pointergestures_v1.h"
+#include "wayland/relativepointer_v1.h"
+#include "wayland/seat.h"
+#include "wayland/subcompositor.h"
+#include "wayland/surface.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_wayland_slide.cpp

@@ -7,9 +7,9 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/slide_interface.h"
+#include "wayland/slide.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_wayland_subsurface.cpp

@@ -7,10 +7,10 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/subcompositor_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/subcompositor.h"
+#include "wayland/surface.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_wayland_surface.cpp

@@ -11,11 +11,11 @@
 // KWin
 #include "core/graphicsbuffer.h"
 #include "core/graphicsbufferview.h"
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/idleinhibit_v1_interface.h"
-#include "wayland/output_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/idleinhibit_v1.h"
+#include "wayland/output.h"
+#include "wayland/surface.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_wayland_windowmanagement.cpp

@@ -7,10 +7,10 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/plasmawindowmanagement_interface.h"
-#include "wayland/surface_interface.h"
+#include "wayland/plasmawindowmanagement.h"
+#include "wayland/surface.h"
 #include <wayland-plasma-window-management-client-protocol.h>
 
 #include "KWayland/Client/compositor.h"

src/wayland/autotests/client/test_xdg_decoration.cpp

@@ -7,10 +7,10 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/xdgdecoration_v1_interface.h"
-#include "wayland/xdgshell_interface.h"
+#include "wayland/xdgdecoration_v1.h"
+#include "wayland/xdgshell.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_xdg_foreign.cpp

@@ -8,10 +8,10 @@
 #include <QSignalSpy>
 #include <QTest>
 // KWin
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/surface_interface.h"
-#include "wayland/xdgforeign_v2_interface.h"
+#include "wayland/surface.h"
+#include "wayland/xdgforeign_v2.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/client/test_xdg_output.cpp

@@ -8,8 +8,8 @@
 #include <QTest>
 // KWin
 #include "wayland/display.h"
-#include "wayland/output_interface.h"
-#include "wayland/xdgoutput_v1_interface.h"
+#include "wayland/output.h"
+#include "wayland/xdgoutput_v1.h"
 
 #include "KWayland/Client/connection_thread.h"
 #include "KWayland/Client/event_queue.h"

src/wayland/autotests/client/test_xdg_shell.cpp

@@ -19,12 +19,12 @@
 #include "KWayland/Client/surface.h"
 #include "KWayland/Client/xdgshell.h"
 // server
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/output_interface.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/xdgshell_interface.h"
+#include "wayland/output.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/xdgshell.h"
 
 #include "../../tests/fakeoutput.h"
 

src/wayland/autotests/server/test_datacontrol_interface.cpp

@@ -12,12 +12,12 @@
 #include <QThread>
 
 // WaylandServer
-#include "wayland/compositor_interface.h"
-#include "wayland/datacontroldevice_v1_interface.h"
-#include "wayland/datacontroldevicemanager_v1_interface.h"
-#include "wayland/datacontrolsource_v1_interface.h"
+#include "wayland/compositor.h"
+#include "wayland/datacontroldevice_v1.h"
+#include "wayland/datacontroldevicemanager_v1.h"
+#include "wayland/datacontrolsource_v1.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
+#include "wayland/seat.h"
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>

src/wayland/autotests/server/test_inputmethod_interface.cpp

@@ -13,11 +13,11 @@
 #include "../../tests/fakeoutput.h"
 
 // WaylandServer
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/inputmethod_v1_interface.h"
-#include "wayland/output_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/inputmethod_v1.h"
+#include "wayland/output.h"
+#include "wayland/seat.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp

@@ -10,10 +10,10 @@
 #include <QTest>
 #include <QThread>
 // WaylandServer
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/keyboard_shortcuts_inhibit_v1_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/keyboard_shortcuts_inhibit_v1.h"
+#include "wayland/seat.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_layershellv1_interface.cpp

@@ -8,11 +8,11 @@
 #include <QTest>
 #include <QThread>
 
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/layershell_v1_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/xdgshell_interface.h"
+#include "wayland/layershell_v1.h"
+#include "wayland/surface.h"
+#include "wayland/xdgshell.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_screencast.cpp

@@ -13,10 +13,10 @@
 #include <wayland-client.h>
 
 // WaylandServer
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/screencast_v1_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/screencast_v1.h"
+#include "wayland/seat.h"
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>

src/wayland/autotests/server/test_seat.cpp

@@ -8,9 +8,9 @@
 #include <QTest>
 // WaylandServer
 #include "wayland/display.h"
-#include "wayland/keyboard_interface.h"
-#include "wayland/pointer_interface.h"
-#include "wayland/seat_interface.h"
+#include "wayland/keyboard.h"
+#include "wayland/pointer.h"
+#include "wayland/seat.h"
 
 using namespace KWaylandServer;
 

src/wayland/autotests/server/test_tablet_interface.cpp

@@ -9,10 +9,10 @@
 #include <QTest>
 #include <QThread>
 // WaylandServer
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
-#include "wayland/tablet_v2_interface.h"
+#include "wayland/seat.h"
+#include "wayland/tablet_v2.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_textinputv1_interface.cpp

@@ -8,11 +8,11 @@
 #include <QTest>
 #include <QThread>
 
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/textinput_v1_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/textinput_v1.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_textinputv3_interface.cpp

@@ -8,11 +8,11 @@
 #include <QTest>
 #include <QThread>
 
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
-#include "wayland/textinput_v3_interface.h"
+#include "wayland/seat.h"
+#include "wayland/surface.h"
+#include "wayland/textinput_v3.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/autotests/server/test_viewporter_interface.cpp

@@ -8,10 +8,10 @@
 #include <QTest>
 #include <QThread>
 
-#include "wayland/compositor_interface.h"
+#include "wayland/compositor.h"
 #include "wayland/display.h"
-#include "wayland/surface_interface.h"
-#include "wayland/viewporter_interface.h"
+#include "wayland/surface.h"
+#include "wayland/viewporter.h"
 
 #include "KWayland/Client/compositor.h"
 #include "KWayland/Client/connection_thread.h"

src/wayland/blur.cpp

@@ -5,10 +5,10 @@
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
-#include "blur_interface.h"
+#include "blur.h"
 #include "display.h"
-#include "region_interface_p.h"
-#include "surface_interface_p.h"
+#include "region_p.h"
+#include "surface_p.h"
 
 #include "qwayland-server-blur.h"
 
@@ -144,4 +144,4 @@ QRegion BlurInterface::region()
 
 }
 
-#include "moc_blur_interface.cpp"
+#include "moc_blur.cpp"

src/wayland/compositor.cpp

@@ -4,10 +4,10 @@
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
-#include "compositor_interface.h"
+#include "compositor.h"
 #include "display.h"
-#include "region_interface_p.h"
-#include "surface_interface.h"
+#include "region_p.h"
+#include "surface.h"
 
 #include "qwayland-server-wayland.h"
 
@@ -72,4 +72,4 @@ Display *CompositorInterface::display() const
 
 } // namespace KWaylandServer
 
-#include "moc_compositor_interface.cpp"
+#include "wayland/moc_compositor.cpp"

src/wayland/compositor.h

@@ -8,7 +8,7 @@
 
 #include "kwin_export.h"
 
-#include "surface_interface.h"
+#include "surface.h"
 
 #include <QObject>
 

src/wayland/contenttype_v1.cpp

@@ -3,10 +3,10 @@
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
-#include "contenttype_v1_interface.h"
+#include "contenttype_v1.h"
 
 #include "display.h"
-#include "surface_interface_p.h"
+#include "surface_p.h"
 
 namespace KWaylandServer
 {
@@ -83,4 +83,4 @@ void ContentTypeV1Interface::wp_content_type_v1_destroy_resource(Resource *)
 
 }
 
-#include "moc_contenttype_v1_interface.cpp"
+#include "moc_contenttype_v1.cpp"