Merge "Sync with some upstream OpenBSD #include cleanup."