diff --git a/src/dwarfs/util.cpp b/src/dwarfs/util.cpp
index 4a80e89d..c05e5a50 100644
--- a/src/dwarfs/util.cpp
+++ b/src/dwarfs/util.cpp
@@ -19,13 +19,9 @@
* along with dwarfs. If not, see .
*/
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
@@ -126,8 +122,10 @@ std::chrono::milliseconds parse_time_with_unit(std::string const& str) {
std::string sys_string_to_string(sys_string const& in) {
#ifdef _WIN32
- static std::wstring_convert, wchar_t> converter;
- return converter.to_bytes(in);
+ std::u16string tmp(in.size(), 0);
+ std::transform(in.begin(), in.end(), tmp.begin(),
+ [](sys_char c) { return static_cast(c); });
+ return utf8::utf16to8(tmp);
#else
return in;
#endif