include fixes for *BSD
22 files changed