SWORD25: And even more fixes for Amiga OS 4 compilation.