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