Switch to Profile88 and add more missing defines