Log Message:
catch up with bootstrap-pkgsrc changes.

Protect from multiple inclusion, in case system headers try to pull it in
(happens on Interix).