diff --git a/extern/curve_fit_nd/intern/curve_fit_cubic.c b/extern/curve_fit_nd/intern/curve_fit_cubic.c
index 8261950e0bd..b97763460a3 100644
--- a/extern/curve_fit_nd/intern/curve_fit_cubic.c
+++ b/extern/curve_fit_nd/intern/curve_fit_cubic.c
@@ -29,6 +29,10 @@
  *  \ingroup curve_fit
  */
 
+#ifdef _MSC_VER
+#  define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 #include <float.h>
 #include <stdbool.h>
@@ -39,12 +43,6 @@
 
 #include "../curve_fit_nd.h"
 
-/* Fix for compiling on MSVC */
-#ifndef M_PI
-#define M_PI        3.14159265358979323846  /* pi */
-#endif
-
-
 /* Take curvature into account when calculating the least square solution isn't usable. */
 #define USE_CIRCULAR_FALLBACK