Woops remove non-conditional headers.
Fix typos
FreeBSD patches
Don't hardcode -ldl
Misc typos