@llyyr Thanks, the latest version seems good to me in terms of the changes. However, I noticed that something has gone wrong with the commit split. In particular some changes from the second commit have leaked into the first one. In particular the introduction of the `wayland_surface_set_title()` function and the associated `#include <assert.h>` in wayland_surface.c should be part of the second commit, not the first one (see https://gitlab.winehq.org/wine/wine/-/merge_requests/5178/diffs?commit_id=af...)