avoid compound statements in __builtin_expect()

(compatibility with older gcc?)
remove libbsock.so extraneous dependency on -ldl
minor: header include paths

modify header include paths for ease of use with install-headers target