Merge "Grab macros from libbase instead of duplicating"