From 8ee234e5a6da0c99ab8c065d6ad59b9975364a86 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Thu, 30 Nov 2023 11:23:12 +0100
Subject: [PATCH] impr: Optimize api includes

---
 .../include/hex/api/achievement_manager.hpp        |  9 ++++-----
 lib/libimhex/include/hex/ui/popup.hpp              |  1 -
 lib/libimhex/source/api/achievement_manager.cpp    |  1 +
 lib/libimhex/source/api/imhex_api.cpp              |  4 ----
 lib/libimhex/source/api/theme_manager.cpp          |  1 -
 lib/libimhex/source/helpers/utils.cpp              |  8 ++------
 main/gui/source/init/splash_window.cpp             |  7 +------
 main/gui/source/init/tasks.cpp                     | 11 +++--------
 main/gui/source/messaging/win.cpp                  |  1 -
 main/gui/source/window/win_window.cpp              |  4 ----
 .../content/providers/memory_file_provider.hpp     |  1 -
 plugins/builtin/include/content/tools_entries.hpp  |  4 +---
 .../include/content/views/view_hex_editor.hpp      |  3 ---
 plugins/builtin/include/ui/pattern_drawer.hpp      |  3 ---
 plugins/builtin/source/content/achievements.cpp    |  1 +
 plugins/builtin/source/content/data_inspector.cpp  |  3 +--
 plugins/builtin/source/content/dpn/logic_nodes.cpp |  1 -
 plugins/builtin/source/content/dpn/other_nodes.cpp |  4 +++-
 .../builtin/source/content/dpn/visual_nodes.cpp    |  1 -
 plugins/builtin/source/content/project.cpp         |  4 ++++
 .../source/content/providers/file_provider.cpp     |  2 +-
 .../content/providers/intel_hex_provider.cpp       |  1 -
 .../builtin/source/content/report_generators.cpp   |  1 -
 .../builtin/source/content/tools/color_picker.cpp  | 14 --------------
 .../builtin/source/content/tools/euclidean_alg.cpp | 10 ++--------
 .../source/content/tools/file_tool_splitter.cpp    | 10 ----------
 .../source/content/tools/wiki_explainer.cpp        |  2 ++
 .../source/content/views/view_data_inspector.cpp   |  2 --
 plugins/builtin/source/ui/pattern_drawer.cpp       |  3 +++
 29 files changed, 29 insertions(+), 88 deletions(-)

diff --git a/lib/libimhex/include/hex/api/achievement_manager.hpp b/lib/libimhex/include/hex/api/achievement_manager.hpp
index 5ea76ecee..fdff40980 100644
--- a/lib/libimhex/include/hex/api/achievement_manager.hpp
+++ b/lib/libimhex/include/hex/api/achievement_manager.hpp
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <string>
-#include <unordered_map>
-#include <utility>
+#include <list>
 #include <memory>
-#include <vector>
 #include <span>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include <hex/api/event_manager.hpp>
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 
diff --git a/lib/libimhex/include/hex/ui/popup.hpp b/lib/libimhex/include/hex/ui/popup.hpp
index df6c20b00..4a792a235 100644
--- a/lib/libimhex/include/hex/ui/popup.hpp
+++ b/lib/libimhex/include/hex/ui/popup.hpp
@@ -4,7 +4,6 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
diff --git a/lib/libimhex/source/api/achievement_manager.cpp b/lib/libimhex/source/api/achievement_manager.cpp
index 2dcbf70c2..3259de55f 100644
--- a/lib/libimhex/source/api/achievement_manager.cpp
+++ b/lib/libimhex/source/api/achievement_manager.cpp
@@ -1,4 +1,5 @@
 #include <hex/api/achievement_manager.hpp>
+#include <hex/api/event_manager.hpp>
 
 #include <nlohmann/json.hpp>
 
diff --git a/lib/libimhex/source/api/imhex_api.cpp b/lib/libimhex/source/api/imhex_api.cpp
index e9ae89364..9f7a87790 100644
--- a/lib/libimhex/source/api/imhex_api.cpp
+++ b/lib/libimhex/source/api/imhex_api.cpp
@@ -1,5 +1,4 @@
 #include <hex/api/imhex_api.hpp>
-#include <hex/api/content_registry.hpp>
 
 #include <hex/api/event_manager.hpp>
 #include <hex/api/task_manager.hpp>
@@ -15,12 +14,9 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 
-#include <nlohmann/json.hpp>
-
 #if defined(OS_WINDOWS)
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
-    #include <shellapi.h>
 #else
     #include <sys/utsname.h>
 #endif
diff --git a/lib/libimhex/source/api/theme_manager.cpp b/lib/libimhex/source/api/theme_manager.cpp
index 86c54f06d..29f3d7ea9 100644
--- a/lib/libimhex/source/api/theme_manager.cpp
+++ b/lib/libimhex/source/api/theme_manager.cpp
@@ -1,5 +1,4 @@
 #include <hex/api/theme_manager.hpp>
-#include <hex/api/imhex_api.hpp>
 #include <hex/api/event_manager.hpp>
 
 #include <hex/helpers/logger.hpp>
diff --git a/lib/libimhex/source/helpers/utils.cpp b/lib/libimhex/source/helpers/utils.cpp
index 73dffa8f9..3c6fe6213 100644
--- a/lib/libimhex/source/helpers/utils.cpp
+++ b/lib/libimhex/source/helpers/utils.cpp
@@ -1,26 +1,22 @@
 #include <hex/helpers/utils.hpp>
 
-#include <cstdio>
-
 #include <hex/api/imhex_api.hpp>
-#include <hex/api/event_manager.hpp>
 
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/crypto.hpp>
-#include <hex/helpers/utils_linux.hpp>
 
 #include <hex/providers/buffered_reader.hpp>
 
 #include <imgui.h>
-#include <imgui_internal.h>
 
 #if defined(OS_WINDOWS)
     #include <windows.h>
 #elif defined(OS_LINUX)
     #include <unistd.h>
+    #include <hex/helpers/utils_linux.hpp>
 #elif defined(OS_MACOS)
-    #include <hex/helpers/utils_macos.hpp>
     #include <unistd.h>
+    #include <hex/helpers/utils_macos.hpp>
 #elif defined(OS_WEB)
     #include "emscripten.h"
 #endif
diff --git a/main/gui/source/init/splash_window.cpp b/main/gui/source/init/splash_window.cpp
index fd785c86f..f317c9e3d 100644
--- a/main/gui/source/init/splash_window.cpp
+++ b/main/gui/source/init/splash_window.cpp
@@ -2,11 +2,9 @@
 #include "init/splash_window.hpp"
 
 #include <hex/api/imhex_api.hpp>
-#include <hex/api/task_manager.hpp>
 #include <hex/api/event_manager.hpp>
 
 #include <hex/helpers/utils.hpp>
-#include <hex/helpers/utils_macos.hpp>
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/logger.hpp>
 
@@ -23,9 +21,6 @@
 
 #include <wolv/utils/guards.hpp>
 
-#include <unistd.h>
-
-#include <chrono>
 #include <future>
 #include <numeric>
 #include <random>
@@ -97,7 +92,7 @@ namespace hex::init {
                 // When the task finished, increment the progress bar
                 ON_SCOPE_EXIT {
                     this->m_completedTaskCount += 1;
-                    this->m_progress = float(this->m_completedTaskCount) / this->m_totalTaskCount;
+                    this->m_progress = float(this->m_completedTaskCount) / float(this->m_totalTaskCount);
                 };
 
                 // Execute the actual task and track the amount of time it took to run
diff --git a/main/gui/source/init/tasks.cpp b/main/gui/source/init/tasks.cpp
index 9d502faca..a524686e7 100644
--- a/main/gui/source/init/tasks.cpp
+++ b/main/gui/source/init/tasks.cpp
@@ -1,7 +1,6 @@
 #include "init/tasks.hpp"
 
 #include <imgui.h>
-#include <imgui_freetype.h>
 
 #include <romfs/romfs.hpp>
 
@@ -9,7 +8,6 @@
 #include <hex/helpers/fs.hpp>
 #include <hex/helpers/logger.hpp>
 
-#include <hex/api_urls.hpp>
 #include <hex/api/content_registry.hpp>
 #include <hex/api/project_file_manager.hpp>
 #include <hex/api/theme_manager.hpp>
@@ -20,15 +18,10 @@
 #include <hex/ui/view.hpp>
 #include <hex/ui/popup.hpp>
 
-#include <fonts/fontawesome_font.h>
-#include <fonts/codicons_font.h>
-#include <fonts/unifont_font.h>
-
 #include <nlohmann/json.hpp>
 
 #include <wolv/io/fs.hpp>
 #include <wolv/io/file.hpp>
-#include <wolv/hash/uuid.hpp>
 
 namespace hex::init {
 
@@ -247,6 +240,7 @@ namespace hex::init {
     }
 
     bool clearOldLogs() {
+        bool result = true;
         for (const auto &path : fs::getDefaultPaths(fs::ImHexPath::Logs)) {
             try {
                 std::vector<std::filesystem::directory_entry> files;
@@ -265,10 +259,11 @@ namespace hex::init {
                     std::filesystem::remove(it->path());
             } catch (std::filesystem::filesystem_error &e) {
                 log::error("Failed to clear old log! {}", e.what());
+                result = false;
             }
         }
 
-        return true;
+        return result;
     }
 
     bool unloadPlugins() {
diff --git a/main/gui/source/messaging/win.cpp b/main/gui/source/messaging/win.cpp
index 6b69dd676..be08b03fc 100644
--- a/main/gui/source/messaging/win.cpp
+++ b/main/gui/source/messaging/win.cpp
@@ -2,7 +2,6 @@
 
 #include "messaging.hpp"
 
-#include <hex/api/imhex_api.hpp>
 #include <hex/helpers/logger.hpp>
 
 #include <windows.h>
diff --git a/main/gui/source/window/win_window.cpp b/main/gui/source/window/win_window.cpp
index 149ab70bf..a4c96d69f 100644
--- a/main/gui/source/window/win_window.cpp
+++ b/main/gui/source/window/win_window.cpp
@@ -2,8 +2,6 @@
 
 #include "messaging.hpp"
 
-#include <hex/api/content_registry.hpp>
-
 #if defined(OS_WINDOWS)
 
     #include <hex/helpers/utils.hpp>
@@ -12,7 +10,6 @@
     #include <imgui.h>
     #include <imgui_internal.h>
 
-    #include <GLFW/glfw3.h>
     #define GLFW_EXPOSE_NATIVE_WIN32
     #include <GLFW/glfw3native.h>
     #undef GLFW_EXPOSE_NATIVE_WIN32
@@ -25,7 +22,6 @@
     #include <wrl/client.h>
     #include <fcntl.h>
 
-    #include <csignal>
     #include <cstdio>
 
 namespace hex {
diff --git a/plugins/builtin/include/content/providers/memory_file_provider.hpp b/plugins/builtin/include/content/providers/memory_file_provider.hpp
index 7dd3020dd..de957ae0d 100644
--- a/plugins/builtin/include/content/providers/memory_file_provider.hpp
+++ b/plugins/builtin/include/content/providers/memory_file_provider.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <hex/providers/provider.hpp>
-#include <hex/api/localization_manager.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/include/content/tools_entries.hpp b/plugins/builtin/include/content/tools_entries.hpp
index 59c5c85ec..122bf57cd 100644
--- a/plugins/builtin/include/content/tools_entries.hpp
+++ b/plugins/builtin/include/content/tools_entries.hpp
@@ -2,9 +2,6 @@
 
 namespace hex::plugin::builtin {
     namespace impl {
-        using namespace std::literals::string_literals;
-        using namespace std::literals::chrono_literals;
-        using namespace hex::literals;
 
         void drawDemangler();
         void drawASCIITable();
@@ -26,5 +23,6 @@ namespace hex::plugin::builtin {
         void drawFileToolShredder();
         void drawFileToolSplitter();
         void drawFileToolCombiner();
+
     }
 }
diff --git a/plugins/builtin/include/content/views/view_hex_editor.hpp b/plugins/builtin/include/content/views/view_hex_editor.hpp
index 56460cd54..b9a617959 100644
--- a/plugins/builtin/include/content/views/view_hex_editor.hpp
+++ b/plugins/builtin/include/content/views/view_hex_editor.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <hex/api/content_registry.hpp>
-
 #include <hex/ui/view.hpp>
-#include <hex/helpers/concepts.hpp>
 
 #include <ui/hex_editor.hpp>
 
diff --git a/plugins/builtin/include/ui/pattern_drawer.hpp b/plugins/builtin/include/ui/pattern_drawer.hpp
index fbb30cd28..2fddcc516 100644
--- a/plugins/builtin/include/ui/pattern_drawer.hpp
+++ b/plugins/builtin/include/ui/pattern_drawer.hpp
@@ -3,14 +3,11 @@
 #include <hex/api/task_manager.hpp>
 #include <hex/api/content_registry.hpp>
 
-#include <pl/core/lexer.hpp>
 #include <pl/patterns/pattern.hpp>
 #include <pl/pattern_visitor.hpp>
 
 #include <pl/formatters.hpp>
 
-#include <hex/providers/provider.hpp>
-
 #include <set>
 
 struct ImGuiTableSortSpecs;
diff --git a/plugins/builtin/source/content/achievements.cpp b/plugins/builtin/source/content/achievements.cpp
index 1b2e3764f..73251472a 100644
--- a/plugins/builtin/source/content/achievements.cpp
+++ b/plugins/builtin/source/content/achievements.cpp
@@ -1,5 +1,6 @@
 #include <hex/api/achievement_manager.hpp>
 #include <hex/api/project_file_manager.hpp>
+#include <hex/api/event_manager.hpp>
 
 #include <hex/helpers/crypto.hpp>
 
diff --git a/plugins/builtin/source/content/data_inspector.cpp b/plugins/builtin/source/content/data_inspector.cpp
index 5fe861fb8..825ae657c 100644
--- a/plugins/builtin/source/content/data_inspector.cpp
+++ b/plugins/builtin/source/content/data_inspector.cpp
@@ -1,16 +1,15 @@
+#include <hex/api/imhex_api.hpp>
 #include <hex/api/content_registry.hpp>
 
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/crypto.hpp>
-#include <hex/api/event_manager.hpp>
 
 #include <hex/providers/provider.hpp>
 
 #include <cstring>
 #include <codecvt>
 #include <string>
-#include <vector>
 
 #include <imgui_internal.h>
 #include <hex/ui/imgui_imhex_extensions.h>
diff --git a/plugins/builtin/source/content/dpn/logic_nodes.cpp b/plugins/builtin/source/content/dpn/logic_nodes.cpp
index 0ad8d7dc4..e966cb7b9 100644
--- a/plugins/builtin/source/content/dpn/logic_nodes.cpp
+++ b/plugins/builtin/source/content/dpn/logic_nodes.cpp
@@ -1,5 +1,4 @@
 #include <hex/api/content_registry.hpp>
-#include <hex/api/localization_manager.hpp>
 #include <hex/data_processor/node.hpp>
 
 #include <ranges>
diff --git a/plugins/builtin/source/content/dpn/other_nodes.cpp b/plugins/builtin/source/content/dpn/other_nodes.cpp
index 7d030d489..aa503c602 100644
--- a/plugins/builtin/source/content/dpn/other_nodes.cpp
+++ b/plugins/builtin/source/content/dpn/other_nodes.cpp
@@ -1,6 +1,8 @@
-#include <hex/api/content_registry.hpp>
 #include <hex/api/imhex_api.hpp>
+#include <hex/api/content_registry.hpp>
 #include <hex/api/achievement_manager.hpp>
+#include <hex/api/event_manager.hpp>
+
 #include <hex/providers/provider.hpp>
 #include <hex/data_processor/node.hpp>
 #include <hex/helpers/utils.hpp>
diff --git a/plugins/builtin/source/content/dpn/visual_nodes.cpp b/plugins/builtin/source/content/dpn/visual_nodes.cpp
index 33455a08c..f3b6a7a99 100644
--- a/plugins/builtin/source/content/dpn/visual_nodes.cpp
+++ b/plugins/builtin/source/content/dpn/visual_nodes.cpp
@@ -1,5 +1,4 @@
 #include <hex/api/content_registry.hpp>
-#include <hex/api/localization_manager.hpp>
 #include <hex/helpers/utils.hpp>
 #include <hex/data_processor/node.hpp>
 #include <hex/ui/imgui_imhex_extensions.h>
diff --git a/plugins/builtin/source/content/project.cpp b/plugins/builtin/source/content/project.cpp
index 3d13e54a8..b3541587c 100644
--- a/plugins/builtin/source/content/project.cpp
+++ b/plugins/builtin/source/content/project.cpp
@@ -1,14 +1,18 @@
 #include <filesystem>
 
+
 #include <wolv/utils/guards.hpp>
 #include <wolv/utils/string.hpp>
 
+#include <hex/api/imhex_api.hpp>
 #include <hex/api/project_file_manager.hpp>
 #include <hex/api/localization_manager.hpp>
 #include <hex/api/achievement_manager.hpp>
+#include <hex/api/event_manager.hpp>
 
 #include <hex/providers/provider.hpp>
 #include <hex/helpers/fmt.hpp>
+#include <hex/helpers/logger.hpp>
 
 #include <content/helpers/notification.hpp>
 
diff --git a/plugins/builtin/source/content/providers/file_provider.cpp b/plugins/builtin/source/content/providers/file_provider.cpp
index 5d1d664ba..2005bd542 100644
--- a/plugins/builtin/source/content/providers/file_provider.cpp
+++ b/plugins/builtin/source/content/providers/file_provider.cpp
@@ -3,9 +3,9 @@
 
 #include <cstring>
 
+#include <hex/api/imhex_api.hpp>
 #include <hex/api/localization_manager.hpp>
 #include <hex/api/project_file_manager.hpp>
-#include <hex/api/achievement_manager.hpp>
 #include <hex/api/task_manager.hpp>
 
 
diff --git a/plugins/builtin/source/content/providers/intel_hex_provider.cpp b/plugins/builtin/source/content/providers/intel_hex_provider.cpp
index 01855e947..e33108f5c 100644
--- a/plugins/builtin/source/content/providers/intel_hex_provider.cpp
+++ b/plugins/builtin/source/content/providers/intel_hex_provider.cpp
@@ -2,7 +2,6 @@
 
 #include <cstring>
 
-#include <hex/api/imhex_api.hpp>
 #include <hex/api/localization_manager.hpp>
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/fmt.hpp>
diff --git a/plugins/builtin/source/content/report_generators.cpp b/plugins/builtin/source/content/report_generators.cpp
index 320b72bd5..69e627abf 100644
--- a/plugins/builtin/source/content/report_generators.cpp
+++ b/plugins/builtin/source/content/report_generators.cpp
@@ -1,5 +1,4 @@
 #include <hex/api/content_registry.hpp>
-#include <hex/api/imhex_api.hpp>
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/utils.hpp>
 
diff --git a/plugins/builtin/source/content/tools/color_picker.cpp b/plugins/builtin/source/content/tools/color_picker.cpp
index d87232d41..2623ab75a 100644
--- a/plugins/builtin/source/content/tools/color_picker.cpp
+++ b/plugins/builtin/source/content/tools/color_picker.cpp
@@ -1,18 +1,8 @@
-#include <hex/api/content_registry.hpp>
-
-#include <hex/helpers/http_requests.hpp>
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/fmt.hpp>
 
 #include <hex/api/localization_manager.hpp>
 
-
-#include <algorithm>
-#include <chrono>
-#include <random>
-#include <regex>
-
-#include <llvm/Demangle/Demangle.h>
 #include <content/helpers/math_evaluator.hpp>
 #include <content/tools_entries.hpp>
 
@@ -22,10 +12,6 @@
 #include <nlohmann/json.hpp>
 #include <romfs/romfs.hpp>
 
-#include <wolv/io/file.hpp>
-
-#include <wolv/net/socket_server.hpp>
-
 namespace hex::plugin::builtin {
     namespace impl {
         void drawColorPicker() {
diff --git a/plugins/builtin/source/content/tools/euclidean_alg.cpp b/plugins/builtin/source/content/tools/euclidean_alg.cpp
index 57f8ab3ef..f4f92f442 100644
--- a/plugins/builtin/source/content/tools/euclidean_alg.cpp
+++ b/plugins/builtin/source/content/tools/euclidean_alg.cpp
@@ -1,18 +1,12 @@
-#include <hex/api/content_registry.hpp>
 #include <hex/api/localization_manager.hpp>
 
-#include <hex/helpers/http_requests.hpp>
-#include <hex/ui/view.hpp>
-
 #include <content/tools_entries.hpp>
 
-#include <regex>
-
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
+#include <fonts/codicons_font.h>
 
-#include <nlohmann/json.hpp>
-
+#include <numeric>
 
 namespace hex::plugin::builtin {
     namespace impl {
diff --git a/plugins/builtin/source/content/tools/file_tool_splitter.cpp b/plugins/builtin/source/content/tools/file_tool_splitter.cpp
index c45c7bdc0..b960bce3a 100644
--- a/plugins/builtin/source/content/tools/file_tool_splitter.cpp
+++ b/plugins/builtin/source/content/tools/file_tool_splitter.cpp
@@ -1,28 +1,18 @@
-#include <hex/api/content_registry.hpp>
-#include <hex/api/imhex_api.hpp>
-
 #include <hex/helpers/http_requests.hpp>
-#include <hex/helpers/utils.hpp>
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/literals.hpp>
 #include <hex/helpers/fs.hpp>
 #include <hex/api/localization_manager.hpp>
 
 #include <algorithm>
-#include <random>
-#include <regex>
-
-#include <llvm/Demangle/Demangle.h>
 
 #include <imgui.h>
 
 #include <hex/ui/imgui_imhex_extensions.h>
 #include <content/popups/popup_notification.hpp>
-#include <nlohmann/json.hpp>
 
 #include <wolv/io/file.hpp>
 #include <wolv/utils/guards.hpp>
-#include <wolv/net/socket_server.hpp>
 
 namespace hex::plugin::builtin {
     namespace impl {
diff --git a/plugins/builtin/source/content/tools/wiki_explainer.cpp b/plugins/builtin/source/content/tools/wiki_explainer.cpp
index 39258d9eb..aa8bec648 100644
--- a/plugins/builtin/source/content/tools/wiki_explainer.cpp
+++ b/plugins/builtin/source/content/tools/wiki_explainer.cpp
@@ -14,6 +14,8 @@
 
 namespace hex::plugin::builtin {
     namespace impl {
+        using namespace std::literals::string_literals;
+        using namespace std::literals::chrono_literals;
 
         std::string getWikipediaApiUrl() {
             std::string setting = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.wiki_explain_language", "en").get<std::string>();
diff --git a/plugins/builtin/source/content/views/view_data_inspector.cpp b/plugins/builtin/source/content/views/view_data_inspector.cpp
index c9611431b..a3dc9466d 100644
--- a/plugins/builtin/source/content/views/view_data_inspector.cpp
+++ b/plugins/builtin/source/content/views/view_data_inspector.cpp
@@ -5,11 +5,9 @@
 #include <hex/providers/provider.hpp>
 
 #include <hex/api/achievement_manager.hpp>
-#include <hex/api/project_file_manager.hpp>
 #include <hex/helpers/logger.hpp>
 
 #include <pl/pattern_language.hpp>
-#include <pl/core/evaluator.hpp>
 #include <pl/patterns/pattern.hpp>
 
 #include <wolv/io/file.hpp>
diff --git a/plugins/builtin/source/ui/pattern_drawer.cpp b/plugins/builtin/source/ui/pattern_drawer.cpp
index e1ee6938a..124a2f698 100644
--- a/plugins/builtin/source/ui/pattern_drawer.cpp
+++ b/plugins/builtin/source/ui/pattern_drawer.cpp
@@ -1,5 +1,7 @@
 #include <ui/pattern_drawer.hpp>
 
+#include <pl/core/lexer.hpp>
+
 #include <pl/patterns/pattern_array_dynamic.hpp>
 #include <pl/patterns/pattern_array_static.hpp>
 #include <pl/patterns/pattern_bitfield.hpp>
@@ -30,6 +32,7 @@
 #include <hex/ui/imgui_imhex_extensions.h>
 #include <fonts/codicons_font.h>
 
+#include <wolv/io/file.hpp>
 
 namespace hex::plugin::builtin::ui {