rest of changes to be buildable by Open Watcom