shouldn't we put the defines in defines.h?