#184 Review PR

This PR is created for initial reviewing of the changes of #184 because #184 includes many external changes and hard to review.
I agree with the removal of BORLAND and WATCOM. This was not consistent with the description of the macro.