Another way of getting M_PI
These files moved, leading to package failure