wayland-surface: Fix a build coming from a bad rebase