Remove BORLANDC/WATCOMC ifdefs