3460522 code cleanup required for building on freebsd
2 files changed