Revert move to check
Include <math.h> for M_PI.

We also need to define _USE_MATH_DEFINES on MSVC for the constants
to be visible.
Include <math.h> for M_PI.

We also need to define _USE_MATH_DEFINES on MSVC for the constants
to be visible.
Merge remote-tracking branch 'upstream/master'