Sync with some upstream OpenBSD #include cleanup.

Change-Id: Ibcd7adb19e9a6b9ad8c24d77e23935f19f56a144
5 files changed