3460522 code cleanup required for building on freebsd
13 files changed