MAINT: Remove newly defined non-prefixed macros from noprefix.h.

There was a chance that they could conflict with user defined macros.