hi!

Please review: https://code.illumos.org/c/illumos-gate/+/3368

A bit of cleanup, and pull in updated headers to ease up future updates.

thanks,
toomas