Remove borland workarounds.
Merge topic 'remove-borland-build' into next

40dc076b Remove borland workarounds.