Fix Borland.
Merge topic 'GenerateExportHeader-tests' into next

694d36f Fix Borland.