diff --git a/stl/inc/fstream b/stl/inc/fstream
index 1fc1001e6d9..ecf2b7509b3 100644
--- a/stl/inc/fstream
+++ b/stl/inc/fstream
@@ -1361,6 +1361,8 @@ void swap(basic_fstream<_Elem, _Traits>& _Left, basic_fstream<_Elem, _Traits>& _
 }
 _STD_END
 
+#undef _FSTREAM_SUPPORTS_EXPERIMENTAL_FILESYSTEM
+
 #pragma pop_macro("new")
 _STL_RESTORE_CLANG_WARNINGS
 #pragma warning(pop)
diff --git a/stl/inc/vector b/stl/inc/vector
index 85a75e7327c..01574777fdb 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -3726,7 +3726,6 @@ _NODISCARD _CONSTEXPR20 _Iter_diff_t<_VbIt> _Count_vbool(_VbIt _First, const _Vb
 #undef _ASAN_VECTOR_CREATE_GUARD
 #undef _ASAN_VECTOR_EXTEND_GUARD
 #undef _ASAN_VECTOR_RELEASE_GUARD
-#undef _ACTIVATE_VECTOR_ANNOTATION
 #undef _INSERT_VECTOR_ANNOTATION
 _STD_END
 
diff --git a/stl/inc/xstring b/stl/inc/xstring
index cfc53742bc7..980c70e256f 100644
--- a/stl/inc/xstring
+++ b/stl/inc/xstring
@@ -5279,6 +5279,11 @@ namespace pmr {
 #endif // _HAS_CXX17
 _STD_END
 
+#undef _ASAN_STRING_REMOVE
+#undef _ASAN_STRING_CREATE
+#undef _ASAN_STRING_MODIFY
+#undef _INSERT_STRING_ANNOTATION
+
 #pragma pop_macro("new")
 _STL_RESTORE_CLANG_WARNINGS
 #pragma warning(pop)