[PATCH] Drop buildid macros