diff --git a/lib/external/libwolv b/lib/external/libwolv
index 759035de2..2d2329aa1 160000
--- a/lib/external/libwolv
+++ b/lib/external/libwolv
@@ -1 +1 @@
-Subproject commit 759035de2d966c07f81638e2a1f80539a0f0daec
+Subproject commit 2d2329aa12c34795850775c60d6d6c30f18842b1
diff --git a/lib/external/pattern_language b/lib/external/pattern_language
index c7cd05397..7a0e7800e 160000
--- a/lib/external/pattern_language
+++ b/lib/external/pattern_language
@@ -1 +1 @@
-Subproject commit c7cd053979fec6fffe4d924593e97efa65a8a4d5
+Subproject commit 7a0e7800efa376559c71f65c95f9e2c778008033
diff --git a/main/gui/source/init/run/cli.cpp b/main/gui/source/init/run/cli.cpp
index 5a1250604..fefb473b0 100644
--- a/main/gui/source/init/run/cli.cpp
+++ b/main/gui/source/init/run/cli.cpp
@@ -14,7 +14,6 @@
 #if defined(OS_WINDOWS)
     #include <windows.h>
     #include <shellapi.h>
-    #include <codecvt>
 #endif
 
 namespace hex::init {
diff --git a/plugins/builtin/source/content/data_inspector.cpp b/plugins/builtin/source/content/data_inspector.cpp
index 8bb8d88b1..568b1f780 100644
--- a/plugins/builtin/source/content/data_inspector.cpp
+++ b/plugins/builtin/source/content/data_inspector.cpp
@@ -10,7 +10,6 @@
 #include <hex/providers/provider.hpp>
 
 #include <cstring>
-#include <codecvt>
 #include <string>
 
 #include <imgui_internal.h>
diff --git a/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp b/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp
index 5ff4bca57..428853ea0 100644
--- a/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp
+++ b/plugins/builtin/source/content/popups/hex_editor/popup_hex_editor_find.cpp
@@ -9,7 +9,6 @@
 #include <fonts/vscode_icons.hpp>
 
 #include <bit>
-#include <codecvt>
 
 namespace hex::plugin::builtin {
 
@@ -286,8 +285,7 @@ namespace hex::plugin::builtin {
                         break;
                     }
                     case Encoding::UTF16: {
-                        std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> convert16;
-                        auto utf16 = convert16.from_bytes(s_inputString);
+                        auto utf16 = wolv::util::utf8ToUtf16(s_inputString);
 
                         for (auto &c: utf16) {
                             swapEndianness(c, Encoding::UTF16, m_stringEndianness);
@@ -299,8 +297,7 @@ namespace hex::plugin::builtin {
                         break;
                     }
                     case Encoding::UTF32: {
-                        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> convert32;
-                        auto utf32 = convert32.from_bytes(s_inputString);
+                        auto utf32 = wolv::util::utf8ToUtf32(s_inputString);
 
                         for (auto &c: utf32) {
                             swapEndianness(c, Encoding::UTF32, m_stringEndianness);