diff --git a/include/wx/docview.h b/include/wx/docview.h
index c64a0309df..5c1e21efc9 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -99,8 +99,8 @@ public:
     virtual bool Revert();
 
 #if wxUSE_STD_IOSTREAM
-    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
-    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
+    virtual std::ostream& SaveObject(std::ostream& stream);
+    virtual std::istream& LoadObject(std::istream& stream);
 #else
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);
@@ -972,9 +972,9 @@ private:
 // converts from/to a stream to/from a temporary file.
 #if wxUSE_STD_IOSTREAM
 bool WXDLLIMPEXP_CORE
-wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream);
+wxTransferFileToStream(const wxString& filename, std::ostream& stream);
 bool WXDLLIMPEXP_CORE
-wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename);
+wxTransferStreamToFile(std::istream& stream, const wxString& filename);
 #else
 bool WXDLLIMPEXP_CORE
 wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
diff --git a/include/wx/log.h b/include/wx/log.h
index e89a3a7aee..842acedd66 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -704,7 +704,7 @@ class WXDLLIMPEXP_BASE wxLogStream : public wxLog,
 {
 public:
     // redirect log output to an ostream
-    wxLogStream(wxSTD ostream *ostr = (wxSTD ostream *) nullptr,
+    wxLogStream(std::ostream *ostr = (std::ostream *) nullptr,
                 const wxMBConv& conv = wxConvWhateverWorks);
 
 protected:
@@ -712,7 +712,7 @@ protected:
     virtual void DoLogText(const wxString& msg) override;
 
     // using ptr here to avoid including <iostream.h> from this file
-    wxSTD ostream *m_ostr;
+    std::ostream *m_ostr;
 
     wxDECLARE_NO_COPY_CLASS(wxLogStream);
 };
diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index dff7186710..4e663f25cc 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -326,7 +326,7 @@ public:
 #if wxUSE_STD_IOSTREAM
         // input/output
     friend WXDLLIMPEXP_BASE
-    wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
+    std::ostream& operator<<(std::ostream&, const wxLongLongNative&);
 #endif
 
     friend WXDLLIMPEXP_BASE
@@ -545,7 +545,7 @@ public:
 #if wxUSE_STD_IOSTREAM
         // input/output
     friend WXDLLIMPEXP_BASE
-    wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);
+    std::ostream& operator<<(std::ostream&, const wxULongLongNative&);
 #endif
 
     friend WXDLLIMPEXP_BASE
@@ -785,7 +785,7 @@ public:
 
 #if wxUSE_STD_IOSTREAM
     friend WXDLLIMPEXP_BASE
-    wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
+    std::ostream& operator<<(std::ostream&, const wxLongLongWx&);
 #endif // wxUSE_STD_IOSTREAM
 
     friend WXDLLIMPEXP_BASE
@@ -1001,7 +1001,7 @@ public:
 
 #if wxUSE_STD_IOSTREAM
     friend WXDLLIMPEXP_BASE
-    wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);
+    std::ostream& operator<<(std::ostream&, const wxULongLongWx&);
 #endif // wxUSE_STD_IOSTREAM
 
     friend WXDLLIMPEXP_BASE
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 5431acb5ad..c67440ffd9 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -125,7 +125,7 @@ public:
     virtual bool Eq(wxVariantData& data) const override;
 
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 
@@ -151,7 +151,7 @@ public:
     virtual bool Eq(wxVariantData& data) const override;
 
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 
@@ -179,7 +179,7 @@ public:
     virtual bool Eq(wxVariantData& data) const override;
 
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 
diff --git a/include/wx/string.h b/include/wx/string.h
index 5e6c6287c1..0b854a3b91 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -4113,18 +4113,18 @@ namespace std
 
 #include "wx/iosfwrap.h"
 
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCStrData&);
+WXDLLIMPEXP_BASE std::ostream& operator<<(std::ostream&, const wxString&);
+WXDLLIMPEXP_BASE std::ostream& operator<<(std::ostream&, const wxCStrData&);
 #ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedCharBuffer&);
+WXDLLIMPEXP_BASE std::ostream& operator<<(std::ostream&, const wxScopedCharBuffer&);
 #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedWCharBuffer&);
+WXDLLIMPEXP_BASE std::ostream& operator<<(std::ostream&, const wxScopedWCharBuffer&);
 
 #if defined(HAVE_WOSTREAM)
 
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&);
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&);
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxScopedWCharBuffer&);
+WXDLLIMPEXP_BASE std::wostream& operator<<(std::wostream&, const wxString&);
+WXDLLIMPEXP_BASE std::wostream& operator<<(std::wostream&, const wxCStrData&);
+WXDLLIMPEXP_BASE std::wostream& operator<<(std::wostream&, const wxScopedWCharBuffer&);
 
 #endif  // defined(HAVE_WOSTREAM)
 
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 49011b7f39..34083d18a5 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -742,7 +742,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl,
 #if wxHAS_TEXT_WINDOW_STREAM
-                                   public wxSTD streambuf,
+                                   public std::streambuf,
 #endif
                                    public wxTextAreaBase,
                                    public wxTextEntry
@@ -965,12 +965,12 @@ private:
 
 public:
     wxStreamToTextRedirector(wxTextCtrl *text)
-        : m_ostr(wxSTD cout)
+        : m_ostr(std::cout)
     {
         Init(text);
     }
 
-    wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr)
+    wxStreamToTextRedirector(wxTextCtrl *text, std::ostream *ostr)
         : m_ostr(*ostr)
     {
         Init(text);
@@ -983,10 +983,10 @@ public:
 
 private:
     // the stream we're redirecting
-    wxSTD ostream&   m_ostr;
+    std::ostream&   m_ostr;
 
     // the old streambuf (before we changed it)
-    wxSTD streambuf *m_sbufOld;
+    std::streambuf *m_sbufOld;
 };
 
 #endif // wxHAS_TEXT_WINDOW_STREAM
diff --git a/include/wx/variant.h b/include/wx/variant.h
index a5c92a9dec..e0129db451 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -63,11 +63,11 @@ public:
     virtual bool Eq(wxVariantData& data) const = 0;
 
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; }
+    virtual bool Write(std::ostream& WXUNUSED(str)) const { return false; }
 #endif
     virtual bool Write(wxString& WXUNUSED(str)) const { return false; }
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
+    virtual bool Read(std::istream& WXUNUSED(str)) { return false; }
 #endif
     virtual bool Read(wxString& WXUNUSED(str)) { return false; }
     // What type is it? Return a string name.
diff --git a/include/wx/variantbase.h b/include/wx/variantbase.h
index f07cb4a916..9f9710745e 100644
--- a/include/wx/variantbase.h
+++ b/include/wx/variantbase.h
@@ -67,8 +67,8 @@ public:
     { }
 
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; }
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
+    virtual bool Write(std::ostream& WXUNUSED(str)) const { return false; }
+    virtual bool Read(std::istream& WXUNUSED(str)) { return false; }
 #endif
     virtual bool Write(wxString& WXUNUSED(str)) const { return false; }
     virtual bool Read(wxString& WXUNUSED(str)) { return false; }
diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index d94f2d667f..f5fc6938ad 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -21,11 +21,11 @@
 // somewhat complicates its code but is necessary in order to support building
 // it under all platforms and in all build configurations
 //
-// In your own code you would normally use std::stream classes only and so
-// wouldn't need these typedefs
+// In your own code you would normally use one set of the stream classes only
+// and so wouldn't need these typedefs and preprocessor conditions.
 #if wxUSE_STD_IOSTREAM
-    typedef wxSTD istream DocumentIstream;
-    typedef wxSTD ostream DocumentOstream;
+    typedef std::istream DocumentIstream;
+    typedef std::ostream DocumentOstream;
 #else // !wxUSE_STD_IOSTREAM
     typedef wxInputStream DocumentIstream;
     typedef wxOutputStream DocumentOstream;
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index f21f285831..5a09958427 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -115,7 +115,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
 
-    wxSTD ofstream std_file_output( "test_std.dat" );
+    std::ofstream std_file_output( "test_std.dat" );
     wxFileOutputStream file_output( file_name );
     wxBufferedOutputStream buf_output( file_output );
     wxTextOutputStream text_output( buf_output );
@@ -155,7 +155,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     textCtrl.WriteText( "\nReading from ifstream:\n" );
 
-    wxSTD ifstream std_file_input( "test_std.dat" );
+    std::ifstream std_file_input( "test_std.dat" );
 
     std_file_input >> si;
     tmp.Printf( "Signed int: %d\n", si );
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 179a7e0003..cd3a131cfa 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -1060,7 +1060,7 @@ void TextWidgetsPage::OnStreamRedirector(wxCommandEvent& WXUNUSED(event))
 #if wxHAS_TEXT_WINDOW_STREAM
     wxStreamToTextRedirector redirect(m_text);
     wxString str( "Outputed to cout, appears in wxTextCtrl!" );
-    wxSTD cout << str << wxSTD endl;
+    std::cout << str << std::endl;
 #else
     wxMessageBox("This wxWidgets build does not support wxStreamToTextRedirector");
 #endif
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ee35150b77..dd859006e4 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -434,7 +434,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
 }
 
 #if wxUSE_STD_IOSTREAM
-wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
+std::istream& wxDocument::LoadObject(std::istream& stream)
 #else
 wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 #endif
@@ -443,7 +443,7 @@ wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 }
 
 #if wxUSE_STD_IOSTREAM
-wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
+std::ostream& wxDocument::SaveObject(std::ostream& stream)
 #else
 wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif
@@ -670,7 +670,7 @@ void wxDocument::OnChangeFilename(bool notifyViews)
 bool wxDocument::DoSaveDocument(const wxString& file)
 {
 #if wxUSE_STD_IOSTREAM
-    wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
+    std::ofstream store(file.mb_str(), std::ios::binary);
     if ( !store )
 #else
     wxFileOutputStream store(file);
@@ -693,7 +693,7 @@ bool wxDocument::DoSaveDocument(const wxString& file)
 bool wxDocument::DoOpenDocument(const wxString& file)
 {
 #if wxUSE_STD_IOSTREAM
-    wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+    std::ifstream store(file.mb_str(), std::ios::binary);
     if ( !store )
 #else
     wxFileInputStream store(file);
@@ -2247,7 +2247,7 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage,
 
 #if wxUSE_STD_IOSTREAM
 
-bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
+bool wxTransferFileToStream(const wxString& filename, std::ostream& stream)
 {
 #if wxUSE_FFILE
     wxFFile file(filename, wxT("rb"));
@@ -2274,7 +2274,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
     return true;
 }
 
-bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
+bool wxTransferStreamToFile(std::istream& stream, const wxString& filename)
 {
 #if wxUSE_FFILE
     wxFFile file(filename, wxT("wb"));
diff --git a/src/common/log.cpp b/src/common/log.cpp
index 778d466e46..67077c3025 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -891,11 +891,11 @@ void wxLogStderr::DoLogText(const wxString& msg)
 
 #if wxUSE_STD_IOSTREAM
 #include "wx/ioswrap.h"
-wxLogStream::wxLogStream(wxSTD ostream *ostr, const wxMBConv& conv)
+wxLogStream::wxLogStream(std::ostream *ostr, const wxMBConv& conv)
     : wxMessageOutputWithConv(conv)
 {
     if ( ostr == nullptr )
-        m_ostr = &wxSTD cerr;
+        m_ostr = &std::cerr;
     else
         m_ostr = ostr;
 }
diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 40026ab75c..294e824177 100644
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -1224,13 +1224,13 @@ void *wxULongLongWx::asArray() const
 
 // input/output
 WXDLLIMPEXP_BASE
-wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
+std::ostream& operator<< (std::ostream& o, const wxLongLong& ll)
 {
     return o << ll.ToString();
 }
 
 WXDLLIMPEXP_BASE
-wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
+std::ostream& operator<< (std::ostream& o, const wxULongLong& ll)
 {
     return o << ll.ToString();
 }
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 8971265588..6e9f1533a1 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -156,7 +156,7 @@ static wxStrCacheStatsDumper s_showCacheStats;
 
 #include <iostream>
 
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxCStrData& str)
+std::ostream& operator<<(std::ostream& os, const wxCStrData& str)
 {
 #if !wxUSE_UNICODE_UTF8
     return os << wxConvWhateverWorks.cWX2MB(str);
@@ -165,17 +165,17 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxCStrData& str)
 #endif
 }
 
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
+std::ostream& operator<<(std::ostream& os, const wxString& str)
 {
     return os << str.c_str();
 }
 
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedCharBuffer& str)
+std::ostream& operator<<(std::ostream& os, const wxScopedCharBuffer& str)
 {
     return os << str.data();
 }
 
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedWCharBuffer& str)
+std::ostream& operator<<(std::ostream& os, const wxScopedWCharBuffer& str)
 {
     // There is no way to write wide character data to std::ostream directly,
     // but we need to define this operator for compatibility, as we provided it
@@ -186,17 +186,17 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedWCharBuffer& str)
 
 #if defined(HAVE_WOSTREAM)
 
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str)
+std::wostream& operator<<(std::wostream& wos, const wxString& str)
 {
     return wos << str.wc_str();
 }
 
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxCStrData& str)
+std::wostream& operator<<(std::wostream& wos, const wxCStrData& str)
 {
     return wos << str.AsWChar();
 }
 
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxScopedWCharBuffer& str)
+std::wostream& operator<<(std::wostream& wos, const wxScopedWCharBuffer& str)
 {
     return wos << str.data();
 }
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index a9dd75e372..b34e987a6d 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -241,8 +241,8 @@ public:
     virtual bool Read(wxString& str) override;
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Read(std::istream& str) override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -286,7 +286,7 @@ bool wxVariantDataLong::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Write(wxSTD ostream& str) const
+bool wxVariantDataLong::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -302,7 +302,7 @@ bool wxVariantDataLong::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Read(wxSTD istream& str)
+bool wxVariantDataLong::Read(std::istream& str)
 {
     str >> m_value;
     return true;
@@ -408,11 +408,11 @@ public:
     virtual bool Eq(wxVariantData& data) const override;
     virtual bool Read(wxString& str) override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -439,7 +439,7 @@ bool wxVariantDoubleData::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDoubleData::Write(wxSTD ostream& str) const
+bool wxVariantDoubleData::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -455,7 +455,7 @@ bool wxVariantDoubleData::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDoubleData::Read(wxSTD istream& str)
+bool wxVariantDoubleData::Read(std::istream& str)
 {
     str >> m_value;
     return true;
@@ -547,12 +547,12 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
     virtual bool Read(wxString& str) override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -579,7 +579,7 @@ bool wxVariantDataBool::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Write(wxSTD ostream& str) const
+bool wxVariantDataBool::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -595,7 +595,7 @@ bool wxVariantDataBool::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataBool::Read(std::istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
@@ -690,8 +690,8 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Read(std::istream& str) override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual bool Write(wxString& str) const override;
@@ -719,7 +719,7 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Write(wxSTD ostream& str) const
+bool wxVariantDataChar::Write(std::ostream& str) const
 {
     str << wxString(m_value);
     return true;
@@ -733,7 +733,7 @@ bool wxVariantDataChar::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataChar::Read(std::istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 
@@ -843,12 +843,12 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) override { return false; }
+    virtual bool Read(std::istream& WXUNUSED(str)) override { return false; }
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -894,7 +894,7 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataString::Write(wxSTD ostream& str) const
+bool wxVariantDataString::Write(std::ostream& str) const
 {
     str << (const char*) m_value.mb_str();
     return true;
@@ -1036,11 +1036,11 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual wxString GetType() const override ;
@@ -1087,7 +1087,7 @@ wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
+bool wxVariantDataWxObjectPtr::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -1103,7 +1103,7 @@ bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(std::istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
@@ -1160,11 +1160,11 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual wxString GetType() const override { return wxT("void*"); }
@@ -1187,7 +1187,7 @@ bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+bool wxVariantDataVoidPtr::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -1203,7 +1203,7 @@ bool wxVariantDataVoidPtr::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(std::istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
@@ -1275,11 +1275,11 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual wxString GetType() const override { return wxT("datetime"); }
@@ -1303,7 +1303,7 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+bool wxVariantDataDateTime::Write(std::ostream& str) const
 {
     wxString value;
     Write( value );
@@ -1324,7 +1324,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const
 
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataDateTime::Read(std::istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
@@ -1408,11 +1408,11 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual wxString GetType() const override { return wxT("arrstring"); }
@@ -1435,7 +1435,7 @@ bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const
+bool wxVariantDataArrayString::Write(std::ostream& WXUNUSED(str)) const
 {
     // Not implemented
     return false;
@@ -1458,7 +1458,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
 
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataArrayString::Read(std::istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
@@ -1539,8 +1539,8 @@ public:
     virtual bool Read(wxString& str) override;
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Read(std::istream& str) override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -1607,7 +1607,7 @@ bool wxVariantDataLongLong::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataLongLong::Write(wxSTD ostream& str) const
+bool wxVariantDataLongLong::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -1627,7 +1627,7 @@ bool wxVariantDataLongLong::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataLongLong::Read(std::istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxS("Unimplemented"));
     return false;
@@ -1738,8 +1738,8 @@ public:
     virtual bool Read(wxString& str) override;
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Read(std::istream& str) override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -1807,7 +1807,7 @@ bool wxVariantDataULongLong::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataULongLong::Write(wxSTD ostream& str) const
+bool wxVariantDataULongLong::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -1827,7 +1827,7 @@ bool wxVariantDataULongLong::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataULongLong::Read(std::istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxS("Unimplemented"));
     return false;
@@ -1934,11 +1934,11 @@ public:
 
     virtual bool Eq(wxVariantData& data) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const override;
+    virtual bool Write(std::ostream& str) const override;
 #endif
     virtual bool Write(wxString& str) const override;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str) override;
+    virtual bool Read(std::istream& str) override;
 #endif
     virtual bool Read(wxString& str) override;
     virtual wxString GetType() const override { return wxT("list"); }
@@ -2048,7 +2048,7 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Write(wxSTD ostream& str) const
+bool wxVariantDataList::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -2075,7 +2075,7 @@ bool wxVariantDataList::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataList::Read(std::istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 70cef54b73..8f41ec77c2 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -127,7 +127,7 @@ bool wxVariantDataCurrency::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataCurrency::Write(wxSTD ostream& str) const
+bool wxVariantDataCurrency::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -180,7 +180,7 @@ bool wxVariantDataErrorCode::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataErrorCode::Write(wxSTD ostream& str) const
+bool wxVariantDataErrorCode::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);
@@ -228,7 +228,7 @@ bool wxVariantDataSafeArray::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataSafeArray::Write(wxSTD ostream& str) const
+bool wxVariantDataSafeArray::Write(std::ostream& str) const
 {
     wxString s;
     Write(s);