diff --git a/src/gmt_common_math.h b/src/gmt_common_math.h
index 5722d7a4bf6..04be6786c03 100644
--- a/src/gmt_common_math.h
+++ b/src/gmt_common_math.h
@@ -65,17 +65,6 @@ extern "C" {
 #	define int64_abs(x) ((int64_t)(((x) >= 0) ? (x) : -(x)))
 #endif
 
-/* Apparently NAN may not be defined anymore in new Visual Studio headers.
-  See https://github.com/conda-forge/gmt-feedstock/pull/302#issuecomment-2487473474
-  I found it in, and recopying it here:
-  "C:\Program Files (x86)\Windows Kits\10\Include\10.0.22000.0\ucrt\corecrt_math.h"
-*/
-#ifdef _WIN32
-#	ifndef NAN
-#		define NAN  (-(float)(((float)(1e+300 * 1e+300)) * 0.0F))
-#	endif
-#endif
-
 #ifdef __CYGWIN__	/* See http://gmt.soest.hawaii.edu/boards/1/topics/5428 */
 #ifdef __x86_64
 #define lrint(x) ((long int)(int)lrint(x))
diff --git a/src/gmt_notposix.h b/src/gmt_notposix.h
index 586c88d1365..570bdb9f612 100644
--- a/src/gmt_notposix.h
+++ b/src/gmt_notposix.h
@@ -331,8 +331,8 @@
 
 #ifndef NAN
 #	ifdef _MSC_VER
-#		include <ymath.h>
-#		define NAN _Nan._Double
+		static const double _NAN = (-(float)(((float)(1e+300 * 1e+300)) * 0.0F));
+#		define NAN _NAN
 #	else /* _MSC_VER */
 		static const double _NAN = (HUGE_VAL-HUGE_VAL);
 #		define NAN _NAN