#i125501# build fixes for enabling Category B also in OS/2 port.