Same comment as before, if you'd prefer a global defines (which I guess you do - defines.h :-) ) then I'll move them.