Fix several out-of-build tree issues with CVS HEAD found while building on-site with Cisco.

Some issues were related to changes I made, and some were related to Masatake's
getuid changes as well.

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
8 files changed