diff --git a/simgear/misc/strutils.cxx b/simgear/misc/strutils.cxx
index f45e0ac8..aee6a49c 100644
--- a/simgear/misc/strutils.cxx
+++ b/simgear/misc/strutils.cxx
@@ -29,11 +29,8 @@
 #include <cstring>              // strerror_r() and strerror_s()
 #include <cctype>
 #include <cerrno>
-
-#if defined(HAVE_CPP11_CODECVT)
-    #include <codecvt> // new in C++11
-#endif
-
+#include <codecvt>
+ 
 #include "strutils.hxx"
 
 #include <simgear/debug/logstream.hxx>
@@ -656,26 +653,14 @@ static std::string convertWStringToMultiByte(DWORD encoding, const std::wstring&
 
 std::wstring convertUtf8ToWString(const std::string& a)
 {
-#ifdef SG_WINDOWS
-    return convertMultiByteToWString(CP_UTF8, a);
-#elif defined(HAVE_CPP11_CODECVT)
     std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> ucs2conv;
     return ucs2conv.from_bytes(a);
-#else
-    return std::wstring();
-#endif
 }
 
 std::string convertWStringToUtf8(const std::wstring& w)
 {
-#ifdef SG_WINDOWS
-	return convertWStringToMultiByte(CP_UTF8, w);
-#elif defined(HAVE_CPP11_CODECVT)
     std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> ucs2conv;
     return ucs2conv.to_bytes(w);
-#else
-    return std::string();
-#endif
 }
 
 std::string convertWindowsLocal8BitToUtf8(const std::string& a)