These trivial differences are are only current differences from upstream OpenBSD. Change-Id: Iddbee2c803911915a25e1da8b246e8403fa72daf
Also undo some of the mess where we have OpenBSD <stdio.h> but a mix of different BSD's implementations. In this first pass, I've only moved easy OpenBSD stuff. Change-Id: Iae67b02cde6dba9d8d06fedeb53efbfdac0a8cf6