SWORD25: Even more fixes for Amiga OS 4 compilation.