Merge "Fix for clang -fsyntax-only happens to see the same header as host gcc"