>
> I think we should close it.
>

But I can't build Emacs 24 with the first Make run (only by manually
deleting the header and rerunning Make) as I do with Emacs 25 from trunk.
Is it fine by you?