diff --git a/stl/inc/cvt/8859_1 b/stl/inc/cvt/8859_1
index b3611970e32..591da9db589 100644
--- a/stl/inc/cvt/8859_1
+++ b/stl/inc/cvt/8859_1
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_1 {
             enum { _Nlow = 0x100, _Nbytes = 1 };
@@ -86,7 +86,7 @@ namespace stdext {
         const unsigned char _tab_8859_1<_Dummy>::_Wtb[1] = {0};
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_1 : public _Cvt_one_byte<_Elem, _tab_8859_1<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_10 b/stl/inc/cvt/8859_10
index cdec0235311..5309cfcf879 100644
--- a/stl/inc/cvt/8859_10
+++ b/stl/inc/cvt/8859_10
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_10 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -105,7 +105,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_10 : public _Cvt_one_byte<_Elem, _tab_8859_10<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_13 b/stl/inc/cvt/8859_13
index 5bba2abccc9..7569faeb0d4 100644
--- a/stl/inc/cvt/8859_13
+++ b/stl/inc/cvt/8859_13
@@ -59,7 +59,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_13 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -103,7 +103,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_13 : public _Cvt_one_byte<_Elem, _tab_8859_13<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_14 b/stl/inc/cvt/8859_14
index abf8b6dcad9..f1bec695747 100644
--- a/stl/inc/cvt/8859_14
+++ b/stl/inc/cvt/8859_14
@@ -60,7 +60,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_14 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -100,7 +100,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_14 : public _Cvt_one_byte<_Elem, _tab_8859_14<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_15 b/stl/inc/cvt/8859_15
index 101a5917617..5ca529a98ea 100644
--- a/stl/inc/cvt/8859_15
+++ b/stl/inc/cvt/8859_15
@@ -62,7 +62,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_15 {
             enum { _Nlow = 0xa4, _Nbytes = 1 };
@@ -98,7 +98,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_15 : public _Cvt_one_byte<_Elem, _tab_8859_15<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_16 b/stl/inc/cvt/8859_16
index 86b43970d23..d0bf158cb11 100644
--- a/stl/inc/cvt/8859_16
+++ b/stl/inc/cvt/8859_16
@@ -59,7 +59,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_16 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -101,7 +101,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_16 : public _Cvt_one_byte<_Elem, _tab_8859_16<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_2 b/stl/inc/cvt/8859_2
index a77ded35224..3a7b84cfcd1 100644
--- a/stl/inc/cvt/8859_2
+++ b/stl/inc/cvt/8859_2
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_2 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -107,7 +107,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_2 : public _Cvt_one_byte<_Elem, _tab_8859_2<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_3 b/stl/inc/cvt/8859_3
index 8693ce8e00f..20c10f2504f 100644
--- a/stl/inc/cvt/8859_3
+++ b/stl/inc/cvt/8859_3
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_3 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -103,7 +103,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_3 : public _Cvt_one_byte<_Elem, _tab_8859_3<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_4 b/stl/inc/cvt/8859_4
index b166034b88b..097700c210e 100644
--- a/stl/inc/cvt/8859_4
+++ b/stl/inc/cvt/8859_4
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_4 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -105,7 +105,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_4 : public _Cvt_one_byte<_Elem, _tab_8859_4<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_5 b/stl/inc/cvt/8859_5
index d08555b0ebe..2f5964c5d6b 100644
--- a/stl/inc/cvt/8859_5
+++ b/stl/inc/cvt/8859_5
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_5 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -113,7 +113,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_5 : public _Cvt_one_byte<_Elem, _tab_8859_5<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_6 b/stl/inc/cvt/8859_6
index 3adbcac6c28..68966a25f4d 100644
--- a/stl/inc/cvt/8859_6
+++ b/stl/inc/cvt/8859_6
@@ -65,7 +65,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_6 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -107,7 +107,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_6 : public _Cvt_one_byte<_Elem, _tab_8859_6<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_7 b/stl/inc/cvt/8859_7
index b78a2cafb19..ec0b800893a 100644
--- a/stl/inc/cvt/8859_7
+++ b/stl/inc/cvt/8859_7
@@ -68,7 +68,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_7 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -114,7 +114,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_7 : public _Cvt_one_byte<_Elem, _tab_8859_7<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_8 b/stl/inc/cvt/8859_8
index 94176207bfe..538b9b4cc70 100644
--- a/stl/inc/cvt/8859_8
+++ b/stl/inc/cvt/8859_8
@@ -65,7 +65,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_8 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -105,7 +105,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_8 : public _Cvt_one_byte<_Elem, _tab_8859_8<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/8859_9 b/stl/inc/cvt/8859_9
index ebbc556009f..5af1f93317f 100644
--- a/stl/inc/cvt/8859_9
+++ b/stl/inc/cvt/8859_9
@@ -65,7 +65,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_8859_9 {
             enum { _Nlow = 0xd0, _Nbytes = 1 };
@@ -97,7 +97,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_8859_9 : public _Cvt_one_byte<_Elem, _tab_8859_9<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/baltic b/stl/inc/cvt/baltic
index 1540d64b152..62f0140c841 100644
--- a/stl/inc/cvt/baltic
+++ b/stl/inc/cvt/baltic
@@ -31,7 +31,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_baltic {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -75,7 +75,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_baltic : public _Cvt_one_byte<_Elem, _tab_baltic<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/big5 b/stl/inc/cvt/big5
index 271c88dd068..c065eab60b8 100644
--- a/stl/inc/cvt/big5
+++ b/stl/inc/cvt/big5
@@ -121,7 +121,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_big5 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -4379,7 +4379,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_big5 : public _Cvt_two_byte<_Elem, _tab_big5<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp037 b/stl/inc/cvt/cp037
index 13942239097..4470f1a5079 100644
--- a/stl/inc/cvt/cp037
+++ b/stl/inc/cvt/cp037
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp037 {
             enum { _Nlow = 0x04, _Nbytes = 1 };
@@ -118,7 +118,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp037 : public _Cvt_one_byte<_Elem, _tab_cp037<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1006 b/stl/inc/cvt/cp1006
index e4679b57e28..dacee4667ea 100644
--- a/stl/inc/cvt/cp1006
+++ b/stl/inc/cvt/cp1006
@@ -62,7 +62,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1006 {
             enum { _Nlow = 0xa1, _Nbytes = 1 };
@@ -112,7 +112,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1006 : public _Cvt_one_byte<_Elem, _tab_cp1006<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1026 b/stl/inc/cvt/cp1026
index a2649e0e501..26f2be4900d 100644
--- a/stl/inc/cvt/cp1026
+++ b/stl/inc/cvt/cp1026
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1026 {
             enum { _Nlow = 0x04, _Nbytes = 1 };
@@ -118,7 +118,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1026 : public _Cvt_one_byte<_Elem, _tab_cp1026<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1250 b/stl/inc/cvt/cp1250
index e16fa7e8a30..757d7214005 100644
--- a/stl/inc/cvt/cp1250
+++ b/stl/inc/cvt/cp1250
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1250 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -81,7 +81,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1250 : public _Cvt_one_byte<_Elem, _tab_cp1250<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1251 b/stl/inc/cvt/cp1251
index 2912810a5b3..b54ec99add3 100644
--- a/stl/inc/cvt/cp1251
+++ b/stl/inc/cvt/cp1251
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1251 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -87,7 +87,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1251 : public _Cvt_one_byte<_Elem, _tab_cp1251<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1252 b/stl/inc/cvt/cp1252
index 85c4f863038..fa00c9a2dad 100644
--- a/stl/inc/cvt/cp1252
+++ b/stl/inc/cvt/cp1252
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1252 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -75,7 +75,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1252 : public _Cvt_one_byte<_Elem, _tab_cp1252<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1253 b/stl/inc/cvt/cp1253
index 30038a6f584..083e18b7446 100644
--- a/stl/inc/cvt/cp1253
+++ b/stl/inc/cvt/cp1253
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1253 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -83,7 +83,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1253 : public _Cvt_one_byte<_Elem, _tab_cp1253<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1254 b/stl/inc/cvt/cp1254
index 7cf1ac99fe8..0c508442719 100644
--- a/stl/inc/cvt/cp1254
+++ b/stl/inc/cvt/cp1254
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1254 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -75,7 +75,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1254 : public _Cvt_one_byte<_Elem, _tab_cp1254<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1255 b/stl/inc/cvt/cp1255
index f4d7991c47c..133483f374c 100644
--- a/stl/inc/cvt/cp1255
+++ b/stl/inc/cvt/cp1255
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1255 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -81,7 +81,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1255 : public _Cvt_one_byte<_Elem, _tab_cp1255<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1256 b/stl/inc/cvt/cp1256
index 52c61e945d5..055a545979d 100644
--- a/stl/inc/cvt/cp1256
+++ b/stl/inc/cvt/cp1256
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1256 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -83,7 +83,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1256 : public _Cvt_one_byte<_Elem, _tab_cp1256<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1257 b/stl/inc/cvt/cp1257
index 47206b18738..198e5ce4086 100644
--- a/stl/inc/cvt/cp1257
+++ b/stl/inc/cvt/cp1257
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1257 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -81,7 +81,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1257 : public _Cvt_one_byte<_Elem, _tab_cp1257<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp1258 b/stl/inc/cvt/cp1258
index 4d1051e2118..73efaa4a77b 100644
--- a/stl/inc/cvt/cp1258
+++ b/stl/inc/cvt/cp1258
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp1258 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -75,7 +75,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp1258 : public _Cvt_one_byte<_Elem, _tab_cp1258<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp424 b/stl/inc/cvt/cp424
index 62727cb9d24..7c8d9c921ae 100644
--- a/stl/inc/cvt/cp424
+++ b/stl/inc/cvt/cp424
@@ -63,7 +63,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp424 {
             enum { _Nlow = 0x04, _Nbytes = 1 };
@@ -141,7 +141,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp424 : public _Cvt_one_byte<_Elem, _tab_cp424<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp437 b/stl/inc/cvt/cp437
index d7225d842cb..4766e184d1a 100644
--- a/stl/inc/cvt/cp437
+++ b/stl/inc/cvt/cp437
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp437 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp437 : public _Cvt_one_byte<_Elem, _tab_cp437<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp500 b/stl/inc/cvt/cp500
index ba67523a438..fb383b42539 100644
--- a/stl/inc/cvt/cp500
+++ b/stl/inc/cvt/cp500
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp500 {
             enum { _Nlow = 0x04, _Nbytes = 1 };
@@ -118,7 +118,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp500 : public _Cvt_one_byte<_Elem, _tab_cp500<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp737 b/stl/inc/cvt/cp737
index 352ba15dcd4..989ef9b7b57 100644
--- a/stl/inc/cvt/cp737
+++ b/stl/inc/cvt/cp737
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp737 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp737 : public _Cvt_one_byte<_Elem, _tab_cp737<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp775 b/stl/inc/cvt/cp775
index d842408dd84..bd5c2478ec7 100644
--- a/stl/inc/cvt/cp775
+++ b/stl/inc/cvt/cp775
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp775 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp775 : public _Cvt_one_byte<_Elem, _tab_cp775<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp850 b/stl/inc/cvt/cp850
index c3a6f979279..52892dbfee3 100644
--- a/stl/inc/cvt/cp850
+++ b/stl/inc/cvt/cp850
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp850 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp850 : public _Cvt_one_byte<_Elem, _tab_cp850<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp852 b/stl/inc/cvt/cp852
index 0334e981df9..039433e7a1e 100644
--- a/stl/inc/cvt/cp852
+++ b/stl/inc/cvt/cp852
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp852 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp852 : public _Cvt_one_byte<_Elem, _tab_cp852<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp855 b/stl/inc/cvt/cp855
index 5ac282afb22..f45c7622ef9 100644
--- a/stl/inc/cvt/cp855
+++ b/stl/inc/cvt/cp855
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp855 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp855 : public _Cvt_one_byte<_Elem, _tab_cp855<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp856 b/stl/inc/cvt/cp856
index af600e895de..1466bf72f61 100644
--- a/stl/inc/cvt/cp856
+++ b/stl/inc/cvt/cp856
@@ -62,7 +62,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp856 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -112,7 +112,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp856 : public _Cvt_one_byte<_Elem, _tab_cp856<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp857 b/stl/inc/cvt/cp857
index 938e09d63f6..5043c0276ed 100644
--- a/stl/inc/cvt/cp857
+++ b/stl/inc/cvt/cp857
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp857 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp857 : public _Cvt_one_byte<_Elem, _tab_cp857<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp860 b/stl/inc/cvt/cp860
index b86395dc957..c07177beb19 100644
--- a/stl/inc/cvt/cp860
+++ b/stl/inc/cvt/cp860
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp860 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp860 : public _Cvt_one_byte<_Elem, _tab_cp860<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp861 b/stl/inc/cvt/cp861
index 5b202388819..a3f12fcd756 100644
--- a/stl/inc/cvt/cp861
+++ b/stl/inc/cvt/cp861
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp861 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp861 : public _Cvt_one_byte<_Elem, _tab_cp861<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp862 b/stl/inc/cvt/cp862
index 23c3418fb90..7e1e3347b96 100644
--- a/stl/inc/cvt/cp862
+++ b/stl/inc/cvt/cp862
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp862 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp862 : public _Cvt_one_byte<_Elem, _tab_cp862<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp863 b/stl/inc/cvt/cp863
index 69732d7dba3..3fdb5700a8b 100644
--- a/stl/inc/cvt/cp863
+++ b/stl/inc/cvt/cp863
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp863 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp863 : public _Cvt_one_byte<_Elem, _tab_cp863<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp864 b/stl/inc/cvt/cp864
index 69eac98e266..4490a6c9f09 100644
--- a/stl/inc/cvt/cp864
+++ b/stl/inc/cvt/cp864
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp864 {
             enum { _Nlow = 0x25, _Nbytes = 1 };
@@ -97,7 +97,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp864 : public _Cvt_one_byte<_Elem, _tab_cp864<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp865 b/stl/inc/cvt/cp865
index 992f5d6f2ce..e45f8364c76 100644
--- a/stl/inc/cvt/cp865
+++ b/stl/inc/cvt/cp865
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp865 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp865 : public _Cvt_one_byte<_Elem, _tab_cp865<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp866 b/stl/inc/cvt/cp866
index 4822af4b76c..c1467b480a3 100644
--- a/stl/inc/cvt/cp866
+++ b/stl/inc/cvt/cp866
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp866 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp866 : public _Cvt_one_byte<_Elem, _tab_cp866<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp869 b/stl/inc/cvt/cp869
index a87fc460b5b..233b4f3918f 100644
--- a/stl/inc/cvt/cp869
+++ b/stl/inc/cvt/cp869
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp869 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp869 : public _Cvt_one_byte<_Elem, _tab_cp869<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp874 b/stl/inc/cvt/cp874
index 362d432aa5b..9ba7f508f65 100644
--- a/stl/inc/cvt/cp874
+++ b/stl/inc/cvt/cp874
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp874 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -85,7 +85,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp874 : public _Cvt_one_byte<_Elem, _tab_cp874<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp875 b/stl/inc/cvt/cp875
index fba746d3447..8a6bdb246b1 100644
--- a/stl/inc/cvt/cp875
+++ b/stl/inc/cvt/cp875
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp875 {
             enum { _Nlow = 0x04, _Nbytes = 1 };
@@ -118,7 +118,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp875 : public _Cvt_one_byte<_Elem, _tab_cp875<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp932 b/stl/inc/cvt/cp932
index 61cf2fc0e9a..c9c6f8c1817 100644
--- a/stl/inc/cvt/cp932
+++ b/stl/inc/cvt/cp932
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp932 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -2459,7 +2459,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp932 : public _Cvt_two_byte<_Elem, _tab_cp932<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp936 b/stl/inc/cvt/cp936
index 21a7189490f..177e4e29bf1 100644
--- a/stl/inc/cvt/cp936
+++ b/stl/inc/cvt/cp936
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp936 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -6779,7 +6779,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp936 : public _Cvt_two_byte<_Elem, _tab_cp936<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp949 b/stl/inc/cvt/cp949
index 73751dd3e7f..28686066832 100644
--- a/stl/inc/cvt/cp949
+++ b/stl/inc/cvt/cp949
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp949 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -5319,7 +5319,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp949 : public _Cvt_two_byte<_Elem, _tab_cp949<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cp950 b/stl/inc/cvt/cp950
index 481b8f6fcf0..af258aa4c6d 100644
--- a/stl/inc/cvt/cp950
+++ b/stl/inc/cvt/cp950
@@ -33,7 +33,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cp950 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -4227,7 +4227,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cp950 : public _Cvt_two_byte<_Elem, _tab_cp950<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/cyrillic b/stl/inc/cvt/cyrillic
index f0a726e46a6..5c26b27bbdd 100644
--- a/stl/inc/cvt/cyrillic
+++ b/stl/inc/cvt/cyrillic
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_cyrillic {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_cyrillic : public _Cvt_one_byte<_Elem, _tab_cyrillic<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/ebcdic b/stl/inc/cvt/ebcdic
index 98108eb69d4..e29b0f3a973 100644
--- a/stl/inc/cvt/ebcdic
+++ b/stl/inc/cvt/ebcdic
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         using _Statype = _CSTD mbstate_t;
 
         template <class _Elem, unsigned char _Maxcode = 0xff>
@@ -175,7 +175,7 @@ namespace stdext {
             0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, //
             0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, //
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/euc b/stl/inc/cvt/euc
index 6857562d866..adb9dd60204 100644
--- a/stl/inc/cvt/euc
+++ b/stl/inc/cvt/euc
@@ -77,7 +77,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_euc {
             enum { _Nlow = 0x5c, _Nbytes = 2 };
@@ -2256,7 +2256,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_euc : public _Cvt_two_byte<_Elem, _tab_euc<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/euc_0208 b/stl/inc/cvt/euc_0208
index 9ecbe2d6521..8ef4d12722e 100644
--- a/stl/inc/cvt/euc_0208
+++ b/stl/inc/cvt/euc_0208
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         using _Statype = _CSTD mbstate_t;
 
         template <class _Elem, unsigned long _Maxcode = 0x7e7e>
@@ -186,7 +186,7 @@ namespace stdext {
                 return 0; // 0 => varying length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/gb12345 b/stl/inc/cvt/gb12345
index a3d8ef88e27..a19c58910f2 100644
--- a/stl/inc/cvt/gb12345
+++ b/stl/inc/cvt/gb12345
@@ -44,7 +44,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_gb12345 {
             enum { _Nlow = 0x5c, _Nbytes = 2 };
@@ -2409,7 +2409,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_gb12345 : public _Cvt_two_byte<_Elem, _tab_gb12345<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/gb2312 b/stl/inc/cvt/gb2312
index 0487a86312a..fa797bf6284 100644
--- a/stl/inc/cvt/gb2312
+++ b/stl/inc/cvt/gb2312
@@ -87,7 +87,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_gb2312 {
             enum { _Nlow = 0x5c, _Nbytes = 2 };
@@ -2420,7 +2420,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_gb2312 : public _Cvt_two_byte<_Elem, _tab_gb2312<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/greek b/stl/inc/cvt/greek
index d698b013304..34dae7b05a4 100644
--- a/stl/inc/cvt/greek
+++ b/stl/inc/cvt/greek
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_greek {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_greek : public _Cvt_one_byte<_Elem, _tab_greek<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/iceland b/stl/inc/cvt/iceland
index 93a4400da79..955ffa8c808 100644
--- a/stl/inc/cvt/iceland
+++ b/stl/inc/cvt/iceland
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_iceland {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_iceland : public _Cvt_one_byte<_Elem, _tab_iceland<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/jis b/stl/inc/cvt/jis
index d946dcff072..6ef1230d727 100644
--- a/stl/inc/cvt/jis
+++ b/stl/inc/cvt/jis
@@ -77,7 +77,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_jis {
             enum { _Nlow = 0x5c, _Nbytes = 2 };
@@ -2246,7 +2246,7 @@ namespace stdext {
             0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
             0x2131, 0x216f};
 
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #include <cvt/xjis>
diff --git a/stl/inc/cvt/jis0201 b/stl/inc/cvt/jis0201
index d13cf1eefb7..b8e3bdbfbeb 100644
--- a/stl/inc/cvt/jis0201
+++ b/stl/inc/cvt/jis0201
@@ -77,7 +77,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_jis0201 {
             enum { _Nlow = 0x5c, _Nbytes = 1 };
@@ -126,7 +126,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_jis0201 : public _Cvt_one_byte<_Elem, _tab_jis0201<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/jis_0208 b/stl/inc/cvt/jis_0208
index 28b338536da..40a8e14cb5b 100644
--- a/stl/inc/cvt/jis_0208
+++ b/stl/inc/cvt/jis_0208
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         using _Statype = _CSTD mbstate_t;
 
 #define _ESC_CODE 0x1b
@@ -243,7 +243,7 @@ namespace stdext {
                 return 0; // 0 => varying length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/ksc5601 b/stl/inc/cvt/ksc5601
index c8d9e560a62..241ba63e3f9 100644
--- a/stl/inc/cvt/ksc5601
+++ b/stl/inc/cvt/ksc5601
@@ -47,7 +47,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_ksc5601 {
             enum { _Nlow = 0x80, _Nbytes = 2 };
@@ -5333,7 +5333,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_ksc5601 : public _Cvt_two_byte<_Elem, _tab_ksc5601<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/latin2 b/stl/inc/cvt/latin2
index fe0f99f1cd5..8f7e91a8f53 100644
--- a/stl/inc/cvt/latin2
+++ b/stl/inc/cvt/latin2
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_latin2 {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_latin2 : public _Cvt_one_byte<_Elem, _tab_latin2<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/one_one b/stl/inc/cvt/one_one
index 3869df909e0..287b65e3ab3 100644
--- a/stl/inc/cvt/one_one
+++ b/stl/inc/cvt/one_one
@@ -19,7 +19,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -225,7 +225,7 @@ namespace stdext {
             }
         };
         _STL_RESTORE_DEPRECATED_WARNING
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/roman b/stl/inc/cvt/roman
index b2e0efe29dd..27004cf35a5 100644
--- a/stl/inc/cvt/roman
+++ b/stl/inc/cvt/roman
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_roman {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_roman : public _Cvt_one_byte<_Elem, _tab_roman<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/sjis b/stl/inc/cvt/sjis
index 2d94acf997f..19e125ff2dd 100644
--- a/stl/inc/cvt/sjis
+++ b/stl/inc/cvt/sjis
@@ -77,7 +77,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_sjis {
             enum { _Nlow = 0x5c, _Nbytes = 2 };
@@ -2248,7 +2248,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_sjis : public _Cvt_two_byte<_Elem, _tab_sjis<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/sjis_0208 b/stl/inc/cvt/sjis_0208
index 64115176e7d..521f44aa0d3 100644
--- a/stl/inc/cvt/sjis_0208
+++ b/stl/inc/cvt/sjis_0208
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -174,7 +174,7 @@ namespace stdext {
                 return 0; // 0 => varying length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/turkish b/stl/inc/cvt/turkish
index e59857b6810..bbf61316f8c 100644
--- a/stl/inc/cvt/turkish
+++ b/stl/inc/cvt/turkish
@@ -34,7 +34,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         template <class _Dummy>
         struct _tab_turkish {
             enum { _Nlow = 0x80, _Nbytes = 1 };
@@ -90,7 +90,7 @@ namespace stdext {
 
         template <class _Elem, unsigned long _Maxcode = 0xffff>
         class codecvt_turkish : public _Cvt_one_byte<_Elem, _tab_turkish<int>, _Maxcode> {};
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/utf16 b/stl/inc/cvt/utf16
index 64d65307c72..c97f6ce47df 100644
--- a/stl/inc/cvt/utf16
+++ b/stl/inc/cvt/utf16
@@ -19,7 +19,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
         using _Statype = _CSTD mbstate_t;
 
         _STL_DISABLE_DEPRECATED_WARNING
@@ -254,7 +254,7 @@ namespace stdext {
             }
         };
         _STL_RESTORE_DEPRECATED_WARNING
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/utf8 b/stl/inc/cvt/utf8
index 4e8e0befd62..81a4c3393e7 100644
--- a/stl/inc/cvt/utf8
+++ b/stl/inc/cvt/utf8
@@ -19,7 +19,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -233,7 +233,7 @@ namespace stdext {
             }
         };
         _STL_RESTORE_DEPRECATED_WARNING
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/utf8_utf16 b/stl/inc/cvt/utf8_utf16
index 2c5593f988d..745eee4204f 100644
--- a/stl/inc/cvt/utf8_utf16
+++ b/stl/inc/cvt/utf8_utf16
@@ -19,7 +19,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Mbstatype = _CSTD mbstate_t;
 
@@ -289,7 +289,7 @@ namespace stdext {
             }
         };
         _STL_RESTORE_DEPRECATED_WARNING
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/wbuffer b/stl/inc/cvt/wbuffer
index 90b3302b087..a3d8f1c9a7a 100644
--- a/stl/inc/cvt/wbuffer
+++ b/stl/inc/cvt/wbuffer
@@ -23,7 +23,7 @@ _STL_DISABLE_CLANG_WARNINGS
 // mywcout << static_cast<wchar_t>(0x80); // writes 0xc2 0x80
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         template <class _Codecvt, class _Elem = wchar_t, class _Traits = _STD char_traits<_Elem>>
         class wbuffer_convert
@@ -314,7 +314,7 @@ namespace stdext {
             _STD string _Str; // unconsumed input bytes
             _STD locale _Loc; // manages reference to codecvt facet
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 #pragma pop_macro("new")
 _STL_RESTORE_CLANG_WARNINGS
diff --git a/stl/inc/cvt/wstring b/stl/inc/cvt/wstring
index 80a3078dba0..a481a8adb61 100644
--- a/stl/inc/cvt/wstring
+++ b/stl/inc/cvt/wstring
@@ -20,7 +20,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         template <class _Codecvt, class _Elem = wchar_t>
         class wstring_convert { // converts between _Elem (wide) and char (byte) strings
@@ -217,7 +217,7 @@ namespace stdext {
             bool _Has_werr;
             size_t _Nconv;
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 #pragma pop_macro("new")
 _STL_RESTORE_CLANG_WARNINGS
diff --git a/stl/inc/cvt/xjis b/stl/inc/cvt/xjis
index 047e724d89d..5d246dfd6da 100644
--- a/stl/inc/cvt/xjis
+++ b/stl/inc/cvt/xjis
@@ -22,7 +22,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #endif // _CVT_JIS_
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -306,7 +306,7 @@ namespace stdext {
                 return 0; // 0 => varying length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/xone_byte b/stl/inc/cvt/xone_byte
index 7bc94360117..dae7499ed1e 100644
--- a/stl/inc/cvt/xone_byte
+++ b/stl/inc/cvt/xone_byte
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -125,7 +125,7 @@ namespace stdext {
                 return 1; // >0 => fixed sequence length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/cvt/xtwo_byte b/stl/inc/cvt/xtwo_byte
index 46cc686728d..897aadf516d 100644
--- a/stl/inc/cvt/xtwo_byte
+++ b/stl/inc/cvt/xtwo_byte
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef new
 
 namespace stdext {
-    namespace cvt {
+    namespace _DEPRECATE_STDEXT_CVT cvt {
 
         using _Statype = _CSTD mbstate_t;
 
@@ -192,7 +192,7 @@ namespace stdext {
                 return 0; // 0 => varying length
             }
         };
-    } // namespace cvt
+    } // namespace _DEPRECATE_STDEXT_CVT cvt
 } // namespace stdext
 
 #pragma pop_macro("new")
diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
index e4ec9109126..abe49868cd3 100644
--- a/stl/inc/yvals_core.h
+++ b/stl/inc/yvals_core.h
@@ -1485,18 +1485,29 @@ _EMIT_STL_ERROR(STL1004, "C++98 unexpected() is incompatible with C++23 unexpect
 #endif // ^^^ warning disabled ^^^
 
 #if _HAS_CXX17 && !defined(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) \
-    && !defined(_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS)
+    && !defined(_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS)
 #define _DEPRECATE_STDEXT_ARR_ITERS                                                                               \
     [[deprecated(                                                                                                 \
         "warning STL4043: stdext::checked_array_iterator, stdext::unchecked_array_iterator, and related factory " \
-        "functions are non-Standard extensions and will be removed in the future. std::span (since C++20) "       \
-        "and gsl::span can be used instead. You can define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING or "     \
-        "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to suppress this warning.")]]
+        "functions are non-Standard extensions and will be removed in the future. std::span (since C++20) and "   \
+        "gsl::span can be used instead. You can define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING or "         \
+        "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS to suppress this warning.")]]
 #else // ^^^ warning enabled / warning disabled vvv
 #define _DEPRECATE_STDEXT_ARR_ITERS
 #endif // ^^^ warning disabled ^^^
 
-// next warning number: STL4044
+#if _HAS_CXX17 && !defined(_SILENCE_STDEXT_CVT_DEPRECATION_WARNING) \
+    && !defined(_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS)
+#define _DEPRECATE_STDEXT_CVT                                                                                          \
+    [[deprecated("warning STL4044: The contents of the stdext::cvt namespace are non-Standard extensions and will be " \
+                 "removed in the future. The MultiByteToWideChar() and WideCharToMultiByte() functions can be used "   \
+                 "instead. You can define _SILENCE_STDEXT_CVT_DEPRECATION_WARNING or "                                 \
+                 "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS to suppress this warning.")]]
+#else // ^^^ warning enabled / warning disabled vvv
+#define _DEPRECATE_STDEXT_CVT
+#endif // ^^^ warning disabled ^^^
+
+// next warning number: STL4045
 
 // next error number: STL1006
 
diff --git a/tests/std/tests/Dev11_0453373_codecvt_compiles/test.compile.pass.cpp b/tests/std/tests/Dev11_0453373_codecvt_compiles/test.compile.pass.cpp
index a619377cf5b..4b17ef8544b 100644
--- a/tests/std/tests/Dev11_0453373_codecvt_compiles/test.compile.pass.cpp
+++ b/tests/std/tests/Dev11_0453373_codecvt_compiles/test.compile.pass.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+#define _SILENCE_STDEXT_CVT_DEPRECATION_WARNING
 
 #include <codecvt>
 #include <cvt/one_one>
diff --git a/tests/std/tests/P0218R1_filesystem/test.cpp b/tests/std/tests/P0218R1_filesystem/test.cpp
index 9dccd939413..0c9da8b2b45 100644
--- a/tests/std/tests/P0218R1_filesystem/test.cpp
+++ b/tests/std/tests/P0218R1_filesystem/test.cpp
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #define _SILENCE_CXX20_U8PATH_DEPRECATION_WARNING
+#define _SILENCE_STDEXT_CVT_DEPRECATION_WARNING
+
 #include <algorithm>
 #include <array>
 #include <cassert>
diff --git a/tests/std/tests/VSO_0000000_instantiate_cvt/test.compile.pass.cpp b/tests/std/tests/VSO_0000000_instantiate_cvt/test.compile.pass.cpp
index e2502be67e3..e5e9231c37f 100644
--- a/tests/std/tests/VSO_0000000_instantiate_cvt/test.compile.pass.cpp
+++ b/tests/std/tests/VSO_0000000_instantiate_cvt/test.compile.pass.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#define _SILENCE_STDEXT_CVT_DEPRECATION_WARNING
 #define _USE_NAMED_IDL_NAMESPACE 1
 
 #ifndef _M_CEE_PURE // chk builds of /clr:pure compile this test extremely slowly.
diff --git a/tests/tr1/tests/cvt/env.lst b/tests/tr1/tests/cvt/env.lst
index 05d39111052..815c53e70ba 100644
--- a/tests/tr1/tests/cvt/env.lst
+++ b/tests/tr1/tests/cvt/env.lst
@@ -2,3 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 RUNALL_INCLUDE ..\..\env_single.lst
+RUNALL_CROSSLIST
+PM_CL="/D_SILENCE_STDEXT_CVT_DEPRECATION_WARNING"