Fix Windows 2010/2012 builds

Both Visual Studios are complaining about these being redefined, and they're already in math_util.h, which is included, so why the redundancy?