diff --git a/lib/libimhex/source/api/content_registry.cpp b/lib/libimhex/source/api/content_registry.cpp
index 08828c503..134da5737 100644
--- a/lib/libimhex/source/api/content_registry.cpp
+++ b/lib/libimhex/source/api/content_registry.cpp
@@ -12,6 +12,7 @@
 #include <nlohmann/json.hpp>
 
 #include <wolv/io/file.hpp>
+#include <wolv/utils/string.hpp>
 
 namespace hex {
 
diff --git a/lib/libimhex/source/helpers/fs.cpp b/lib/libimhex/source/helpers/fs.cpp
index 2cb38754d..6d0ae8609 100644
--- a/lib/libimhex/source/helpers/fs.cpp
+++ b/lib/libimhex/source/helpers/fs.cpp
@@ -18,9 +18,11 @@
 
 #include <algorithm>
 #include <filesystem>
+#include <utility>
 
 #include <wolv/io/file.hpp>
 #include <wolv/io/fs.hpp>
+#include <wolv/utils/string.hpp>
 
 namespace hex::fs {
 
diff --git a/main/source/window/win_window.cpp b/main/source/window/win_window.cpp
index db75b7971..a4430219d 100644
--- a/main/source/window/win_window.cpp
+++ b/main/source/window/win_window.cpp
@@ -7,6 +7,8 @@
     #include <hex/helpers/utils.hpp>
     #include <hex/helpers/logger.hpp>
 
+    #include <wolv/utils/string.hpp>
+
     #include <imgui.h>
     #include <imgui_internal.h>
     #include <fonts/codicons_font.h>
diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp
index 2a4e39576..6e62b77cd 100644
--- a/main/source/window/window.cpp
+++ b/main/source/window/window.cpp
@@ -33,6 +33,8 @@
 #include <imnodes.h>
 #include <imnodes_internal.h>
 
+#include <wolv/utils/string.hpp>
+
 #include <fonts/codicons_font.h>
 
 #include <hex/api/project_file_manager.hpp>
diff --git a/plugins/builtin/include/content/popups/popup_file_chooser.hpp b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
index e52c040c2..67b2121f5 100644
--- a/plugins/builtin/include/content/popups/popup_file_chooser.hpp
+++ b/plugins/builtin/include/content/popups/popup_file_chooser.hpp
@@ -2,6 +2,8 @@
 
 #include <hex/api/localization.hpp>
 
+#include <wolv/utils/string.hpp>
+
 #include <functional>
 #include <string>
 
diff --git a/plugins/builtin/source/content/command_palette_commands.cpp b/plugins/builtin/source/content/command_palette_commands.cpp
index 4ad1b08a5..30845dc59 100644
--- a/plugins/builtin/source/content/command_palette_commands.cpp
+++ b/plugins/builtin/source/content/command_palette_commands.cpp
@@ -7,6 +7,8 @@
 
 #include <content/helpers/math_evaluator.hpp>
 
+#include <wolv/utils/string.hpp>
+
 namespace hex::plugin::builtin {
 
     void registerCommandPaletteCommands() {
diff --git a/plugins/builtin/source/content/data_processor_nodes.cpp b/plugins/builtin/source/content/data_processor_nodes.cpp
index 7779a8db5..bca5c65b7 100644
--- a/plugins/builtin/source/content/data_processor_nodes.cpp
+++ b/plugins/builtin/source/content/data_processor_nodes.cpp
@@ -20,6 +20,7 @@
 
 #include <wolv/utils/core.hpp>
 #include <wolv/utils/lock.hpp>
+#include <wolv/utils/string.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/data_visualizers.cpp b/plugins/builtin/source/content/data_visualizers.cpp
index a93faa144..a55cd7ff7 100644
--- a/plugins/builtin/source/content/data_visualizers.cpp
+++ b/plugins/builtin/source/content/data_visualizers.cpp
@@ -2,9 +2,13 @@
 
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
+
 #include <hex/helpers/logger.hpp>
 #include <hex/helpers/utils.hpp>
 
+#include <wolv/utils/string.hpp>
+
+
 namespace hex::plugin::builtin {
 
     template<typename T>
diff --git a/plugins/builtin/source/content/recent.cpp b/plugins/builtin/source/content/recent.cpp
index 265c3d000..96647f51f 100644
--- a/plugins/builtin/source/content/recent.cpp
+++ b/plugins/builtin/source/content/recent.cpp
@@ -10,6 +10,7 @@
 #include <hex/providers/provider.hpp>
 
 #include <wolv/utils/guards.hpp>
+#include <wolv/utils/string.hpp>
 
 #include <content/recent.hpp>
 #include <content/popups/popup_notification.hpp>
diff --git a/plugins/builtin/source/content/views/view_data_inspector.cpp b/plugins/builtin/source/content/views/view_data_inspector.cpp
index 4384771c7..4e173ea59 100644
--- a/plugins/builtin/source/content/views/view_data_inspector.cpp
+++ b/plugins/builtin/source/content/views/view_data_inspector.cpp
@@ -13,6 +13,7 @@
 #include <pl/patterns/pattern.hpp>
 
 #include <wolv/io/file.hpp>
+#include <wolv/utils/string.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/views/view_data_processor.cpp b/plugins/builtin/source/content/views/view_data_processor.cpp
index ec6672adb..1859a48e4 100644
--- a/plugins/builtin/source/content/views/view_data_processor.cpp
+++ b/plugins/builtin/source/content/views/view_data_processor.cpp
@@ -13,6 +13,7 @@
 
 #include <wolv/io/file.hpp>
 #include <wolv/utils/guards.hpp>
+#include <wolv/utils/core.hpp>
 
 namespace hex::plugin::builtin {