Improve defines.h