Remove BSD defines.
Remove UIDSCORE and NONAP defines.