10.3 Project upgrade errors

I just upgraded my project to 10.3 and am using the latest version posted 12/6/2018.  When I recompile I am now getting 2 new compiler errors


[bcc32c Error] AdvStyleIF.hpp(203): functions that differ only in their return type cannot be overloaded
  winreg.h(659): previous declaration is here

[bcc32c Error] AdvGrid.hpp(5895): conflicting types for 'StrCmpLogicalW'
  shlwapi.h(309): previous declaration is here

Any insight on how to fix these would be appreciated.

This is because the CLang C++ compiler is selected and the HPP files generated by the Embarcadero Delphi do not seem to be fully CLang C++ 17 compliant. We're trying to find out with Embarcadero where the problem with the Delphi compiler is. 
Meanwhile, we'd suggest to use the classic compiler instead that works fine with the generated HPP files.

Any progress on this.  Using the clang compiler is a major reason to upgrade for us.