update private multi-line macros to match style in public header