* commit '02d750efde238837989a6968ea66ac5eb13c639e': Revert "Grab macros from libbase instead of duplicating"