Fixes for gcc15 build

Note that I do not really understand how previous builds are working. Most probably we were not compiling this code so far. Now why do we compile it now I do not know

@gcorti you probably want to have a look