3853 __cplusplus change and headers incompatipility with clang