b186571cf6
changes are for completeness, I don't think they work. There are changes to deal with the new include files. Obtained from: NetBSD (mostly)