Don't forget to distribute this new "macro.h", too