Disambiguations needed for RAD Studio xe4.

These fixes are needed in order to succesfully compile oce under
bcc32 compiler version 6.6 which comes bundled with RAD studio
xe4.
Merge pull request #399 from tpaviot/review/xe4-port

Disambiguations needed for RAD Studio xe4.