diff --git a/libcxx/include/charconv b/libcxx/include/charconv
index c0cb9c52aa9d..064f2e11c3f3 100644
--- a/libcxx/include/charconv
+++ b/libcxx/include/charconv
@@ -87,6 +87,9 @@ namespace std {
 #pragma GCC system_header
 #endif
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace __itoa {
@@ -609,4 +612,6 @@ from_chars(const char* __first, const char* __last, _Tp& __value, int __base)
 
 _LIBCPP_END_NAMESPACE_STD
 
+_LIBCPP_POP_MACROS
+
 #endif  // _LIBCPP_CHARCONV
diff --git a/libcxx/test/libcxx/min_max_macros.sh.cpp b/libcxx/test/libcxx/min_max_macros.sh.cpp
index 087aa3645a50..45b7bb1f6a8d 100644
--- a/libcxx/test/libcxx/min_max_macros.sh.cpp
+++ b/libcxx/test/libcxx/min_max_macros.sh.cpp
@@ -46,6 +46,8 @@ TEST_MACROS();
 TEST_MACROS();
 #include <cfloat>
 TEST_MACROS();
+#include <charconv>
+TEST_MACROS();
 #include <chrono>
 TEST_MACROS();
 #include <cinttypes>