fix various header namespace issues under feature-test-macro control

reported and changes suggested by Daniel Sabogal.
6 files changed