[tz] [PROPOSED 3/5] Remove macros duplicated from private.h