Moved the `#define`s back in `envremap.c` (as per rlk's request) and copied the one useful `#define` into `envtoirr.c`