diff --git a/sdk/lib/crt/math/_hypotf.c b/sdk/lib/crt/math/_hypotf.c
index 34c0009cab9..bb63daef7c7 100644
--- a/sdk/lib/crt/math/_hypotf.c
+++ b/sdk/lib/crt/math/_hypotf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#if (_MSC_VER >= 1920)
+#pragma function(_hypotf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/acosf.c b/sdk/lib/crt/math/acosf.c
index 6df35b77f81..1d50952d7ba 100644
--- a/sdk/lib/crt/math/acosf.c
+++ b/sdk/lib/crt/math/acosf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(acosf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/asinf.c b/sdk/lib/crt/math/asinf.c
index 278ce4dcbd3..d2b8a90d1fb 100644
--- a/sdk/lib/crt/math/asinf.c
+++ b/sdk/lib/crt/math/asinf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(asinf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/atan2f.c b/sdk/lib/crt/math/atan2f.c
index c16a281679a..a63e44af539 100644
--- a/sdk/lib/crt/math/atan2f.c
+++ b/sdk/lib/crt/math/atan2f.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(atan2f)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/atanf.c b/sdk/lib/crt/math/atanf.c
index 16cd3a66e10..27851171c22 100644
--- a/sdk/lib/crt/math/atanf.c
+++ b/sdk/lib/crt/math/atanf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(atanf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/ceilf.c b/sdk/lib/crt/math/ceilf.c
index e27333a09ef..95621af24cf 100644
--- a/sdk/lib/crt/math/ceilf.c
+++ b/sdk/lib/crt/math/ceilf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(ceilf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/cosf.c b/sdk/lib/crt/math/cosf.c
index d00e6ef3aae..815b4780974 100644
--- a/sdk/lib/crt/math/cosf.c
+++ b/sdk/lib/crt/math/cosf.c
@@ -3,12 +3,10 @@
  * This file is part of the w64 mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define cosf _dummy_cosf
+
 #include <math.h>
-#undef cosf
 
 #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64))
-#pragma warning(suppress:4164) /* intrinsic not declared */
 #pragma function(cosf)
 #endif /* _MSC_VER */
 
diff --git a/sdk/lib/crt/math/coshf.c b/sdk/lib/crt/math/coshf.c
index f4c2e1f0299..381700e070d 100644
--- a/sdk/lib/crt/math/coshf.c
+++ b/sdk/lib/crt/math/coshf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(coshf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/div.c b/sdk/lib/crt/math/div.c
index 041a80e6dcc..7b9c73200f7 100644
--- a/sdk/lib/crt/math/div.c
+++ b/sdk/lib/crt/math/div.c
@@ -1,6 +1,10 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <precomp.h>
 
+#if (_MSC_VER >= 1920)
+#pragma function(div)
+#endif
+
 /*
  * @implemented
  */
diff --git a/sdk/lib/crt/math/expf.c b/sdk/lib/crt/math/expf.c
index 850bd7ad201..bfd021ec9f2 100644
--- a/sdk/lib/crt/math/expf.c
+++ b/sdk/lib/crt/math/expf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(expf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/floorf.c b/sdk/lib/crt/math/floorf.c
index 10ad8709b51..4c7b63cd4c4 100644
--- a/sdk/lib/crt/math/floorf.c
+++ b/sdk/lib/crt/math/floorf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(floorf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/fmodf.c b/sdk/lib/crt/math/fmodf.c
index 0050e02c54c..8a2d898832f 100644
--- a/sdk/lib/crt/math/fmodf.c
+++ b/sdk/lib/crt/math/fmodf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(fmodf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/hypot.c b/sdk/lib/crt/math/hypot.c
index 7004d8a5645..8f689c07bd6 100644
--- a/sdk/lib/crt/math/hypot.c
+++ b/sdk/lib/crt/math/hypot.c
@@ -17,6 +17,10 @@
  */
 #include <precomp.h>
 
+#if (_MSC_VER >= 1920)
+#pragma function(_hypot)
+#endif
+
 /* Approximate square roots of DBL_MAX and DBL_MIN.  Numbers
    between these two shouldn't neither overflow nor underflow
    when squared.  */
diff --git a/sdk/lib/crt/math/ldiv.c b/sdk/lib/crt/math/ldiv.c
index d6afed53be4..1186c253c68 100644
--- a/sdk/lib/crt/math/ldiv.c
+++ b/sdk/lib/crt/math/ldiv.c
@@ -1,6 +1,10 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <precomp.h>
 
+#if (_MSC_VER >= 1920)
+#pragma function(ldiv)
+#endif
+
 /*
  * @implemented
  */
diff --git a/sdk/lib/crt/math/log10f.c b/sdk/lib/crt/math/log10f.c
index 42a62764a24..b7fa2e5c0ff 100644
--- a/sdk/lib/crt/math/log10f.c
+++ b/sdk/lib/crt/math/log10f.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(log10f)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/logf.c b/sdk/lib/crt/math/logf.c
index c87e9c06bd0..73184b3dee6 100644
--- a/sdk/lib/crt/math/logf.c
+++ b/sdk/lib/crt/math/logf.c
@@ -3,12 +3,9 @@
  * This file is part of the w64 mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define logf _dummy_logf
 #include <math.h>
-#undef logf
 
 #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64))
-#pragma warning(suppress:4164) /* intrinsic not declared */
 #pragma function(logf)
 #endif /* _MSC_VER */
 
diff --git a/sdk/lib/crt/math/sinf.c b/sdk/lib/crt/math/sinf.c
index 2183fc7940e..3516e98f4af 100644
--- a/sdk/lib/crt/math/sinf.c
+++ b/sdk/lib/crt/math/sinf.c
@@ -3,12 +3,10 @@
  * This file is part of the w64 mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define sinf _dummy_sinf
+
 #include <math.h>
-#undef sinf
 
 #if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64))
-#pragma warning(suppress:4164) /* intrinsic not declared */
 #pragma function(sinf)
 #endif /* _MSC_VER */
 
diff --git a/sdk/lib/crt/math/sinhf.c b/sdk/lib/crt/math/sinhf.c
index f26fa6319e2..93743dc818d 100644
--- a/sdk/lib/crt/math/sinhf.c
+++ b/sdk/lib/crt/math/sinhf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(sinhf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/sqrtf.c b/sdk/lib/crt/math/sqrtf.c
index 922cbf2f744..9954cd60fe4 100644
--- a/sdk/lib/crt/math/sqrtf.c
+++ b/sdk/lib/crt/math/sqrtf.c
@@ -5,6 +5,10 @@
  */
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(sqrtf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/tanf.c b/sdk/lib/crt/math/tanf.c
index 200a17fcb2d..0dabf74671d 100644
--- a/sdk/lib/crt/math/tanf.c
+++ b/sdk/lib/crt/math/tanf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(tanf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/math/tanhf.c b/sdk/lib/crt/math/tanhf.c
index c48b195c9d9..d179d25c095 100644
--- a/sdk/lib/crt/math/tanhf.c
+++ b/sdk/lib/crt/math/tanhf.c
@@ -1,6 +1,10 @@
 
 #include <math.h>
 
+#ifdef _MSC_VER
+#pragma function(tanhf)
+#endif
+
 _Check_return_
 float
 __cdecl
diff --git a/sdk/lib/crt/mem/memchr.c b/sdk/lib/crt/mem/memchr.c
index 9d0a1386760..11682251567 100644
--- a/sdk/lib/crt/mem/memchr.c
+++ b/sdk/lib/crt/mem/memchr.c
@@ -1,7 +1,7 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER) && defined(_M_ARM)
+#if defined(_MSC_VER)
 #pragma function(memchr)
 #endif /* _MSC_VER */
 
diff --git a/sdk/lib/crt/mem/memmove.c b/sdk/lib/crt/mem/memmove.c
index d9536db9073..6d0dd8bf4d2 100644
--- a/sdk/lib/crt/mem/memmove.c
+++ b/sdk/lib/crt/mem/memmove.c
@@ -1,5 +1,9 @@
 #include <string.h>
 
+#if defined(_MSC_VER)
+#pragma function(memmove)
+#endif /* _MSC_VER */
+
 /* NOTE: This code is duplicated in memcpy function */
 void * __cdecl memmove(void *dest,const void *src,size_t count)
 {