preprocessor: namespace fixes to remove clang warnings

(cherry picked from commit 3745409f197900750d548e45f754d14618569819)