Merge "Revert "Grab macros from libbase instead of duplicating""