Looks like some #define constants are either aliases or duplicates of existing enums in C lib. Removing dups.