SWORD25: Some more fixes for Amiga OS 4 compilation.