move macros with too many deps out of basics