Moved defines for VC++ not to throw a hissy fit