diff --git a/include/wx/defs.h b/include/wx/defs.h
index 01e30314cb..ed4ab0770e 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -205,6 +205,15 @@
     #define wxCHECK_CXX_STD(ver) 0
 #endif
 
+/**
+ * C++ header checks
+ */
+#if defined(__has_include)
+    #define wxHAS_CXX17_INCLUDE(header) (wxCHECK_CXX_STD(201703L) && __has_include(header))
+#else
+    #define wxHAS_CXX17_INCLUDE(header) 0
+#endif
+
 /*  ---------------------------------------------------------------------------- */
 /*  check for native bool type and TRUE/FALSE constants */
 /*  ---------------------------------------------------------------------------- */
diff --git a/include/wx/string.h b/include/wx/string.h
index 6b950af8d1..be59395409 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -46,12 +46,10 @@
 #include <utility>
 
 // Check if C++17 <string_view> is available
-#ifdef __has_include
-    #if __has_include(<string_view>)
-        #include <string_view>
-        #ifdef __cpp_lib_string_view
-            #define wxHAS_STD_STRING_VIEW
-        #endif
+#if wxHAS_CXX17_INCLUDE(<string_view>)
+    #include <string_view>
+    #ifdef __cpp_lib_string_view
+        #define wxHAS_STD_STRING_VIEW
     #endif
 #endif
 
diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 2e16245f3e..3cde43201a 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -1545,6 +1545,17 @@ typedef double wxDouble;
 */
 #define wxCHECK_CXX_STD(stdver)
 
+/**
+    Returns @true if the compiler is using the C++17 standard and the header @a header exists.
+    This is designed to guard inclusion of C++17 standard library headers, since MSVC will warn
+    if a header for a newer C++ standard is included when compiling for an older standard.
+
+    @since 3.3.0
+
+    @header{wx/defs.h}
+*/
+#define wxHAS_CXX17_INCLUDE(header)
+
 /**
     This macro can be used in a class declaration to disable the generation of
     default assignment operator.
diff --git a/src/common/string.cpp b/src/common/string.cpp
index c2ab467f87..9f166a874d 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1569,11 +1569,9 @@ bool wxString::ToDouble(double *pVal) const
 // Check if C++17 <charconv> is available: even though normally it should be
 // available in any compiler claiming C++17 support, there are actually some
 // compilers (e.g. gcc 7) that don't have it, so do it in this way instead:
-#ifdef __has_include
-    #if __has_include(<charconv>)
-        // This should define __cpp_lib_to_chars checked below.
-        #include <charconv>
-    #endif
+#if wxHAS_CXX17_INCLUDE(<charconv>)
+    // This should define __cpp_lib_to_chars checked below.
+    #include <charconv>
 #endif
 
 // Now check if the functions we need are present in it (normally they ought
diff --git a/tests/benchmarks/strings.cpp b/tests/benchmarks/strings.cpp
index 7c03ff7688..a3c48113bc 100644
--- a/tests/benchmarks/strings.cpp
+++ b/tests/benchmarks/strings.cpp
@@ -663,7 +663,7 @@ BENCHMARK_FUNC(PrintfDouble)
     return true;
 }
 
-#if wxCHECK_CXX_STD(201703L)
+#if wxHAS_CXX17_INCLUDE(<charconv>)
 
 #include <charconv>
 
@@ -715,4 +715,4 @@ BENCHMARK_FUNC(StdToChars)
 }
 #endif // __cpp_lib_to_chars
 
-#endif // C++17
+#endif // wxHAS_CXX17_INCLUDE(<charconv>)
diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index a87f6962ef..f3ff37f2ee 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -691,4 +691,4 @@ TEST_CASE("StdString::View", "[stdstring]")
 
     CHECK( "" == wxString::FromUTF8(strViewInvalidUTF) );
 }
-#endif
+#endif // wxHAS_STD_STRING_VIEW