r18203: rearranged the overrides in heimdal_build/*.h to avoid the use of