Compiler error using AdvWebBrowser

I am using c++builder tokyo (10.2) and the classic compiler.
I am using the AdvWebBrowser control, and therefore I include AdvWebBrowser.hpp.

I get the following compiler error in that hpp file:
AdvWebBrowser.hpp(1260,2): C++ error E2370. ("Simple type name expected")

I can manually replace the following typedef statement in that hpp, to make it less complex for the compiler.

OLD:

typedef void __fastcall (__closure *TAdvWebBrowserOnGetContextMenu)(System::TObject* Sender, const TAdvWebBrowserTargetItem &ATarget, System::Generics::Collections::TObjectList__1<TAdvWebBrowserContextMenuItem*>* AContextMenu);

NEW:

typedef System::Generics::Collections::TObjectList__1<TAdvWebBrowserContextMenuItem*>* TAdvWebBrowserContextMenuList;

typedef void __fastcall (__closure *TAdvWebBrowserOnGetContextMenu)(System::TObject* Sender, const TAdvWebBrowserTargetItem &ATarget, TAdvWebBrowserContextMenuList AContextMenu);

I experienced this in a previous standalone installer version (13.5.13.0) and in the current version via Smart Setup.

Is there a better way than manually editing that file?
Is there something TMS can do to make that hpp classic compiler compatible?

Thanks
Björn

We have applied a fix for this in the source code, next version of TMS VCL UI Pack will have the fix included. Thanks for the feedback!