no macro renames in compat.h anymore