Make a couple more files compile under NetBSD.  Not actually tested
yet.  :)