From ccaf1e33c06ff1903c6a11f63196c5a8c09190e3 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Tue, 18 Feb 2025 00:39:53 +0100
Subject: [PATCH] build: Make this modules stuff actually mostly work on Clang

---
 CMakeLists.txt                                |  1 +
 cmake/build_helpers.cmake                     |  1 +
 lib/external/pattern_language                 |  2 +-
 lib/libimhex/include/hex.cppm                 | 21 ++++++++--
 .../include/hex/api/achievement_manager.hpp   |  2 +-
 .../include/hex/api/content_registry.hpp      | 38 ++++++++++---------
 .../include/hex/api/event_manager.hpp         |  2 +-
 lib/libimhex/include/hex/api/imhex_api.hpp    | 24 +++++++-----
 .../include/hex/api/layout_manager.hpp        |  6 ++-
 .../include/hex/api/plugin_manager.hpp        |  6 ++-
 .../include/hex/api/project_file_manager.hpp  |  2 +-
 .../include/hex/api/shortcut_manager.hpp      |  6 ++-
 lib/libimhex/include/hex/api/task_manager.hpp |  2 +-
 .../include/hex/api/theme_manager.hpp         |  2 +-
 .../include/hex/api/tutorial_manager.hpp      |  2 +-
 .../include/hex/api/workspace_manager.hpp     |  2 +-
 lib/libimhex/include/hex/helpers/logger.hpp   |  2 +-
 lib/libimhex/include/hex/helpers/utils.hpp    |  8 ++--
 .../include/hex/helpers/utils_macos.hpp       |  4 +-
 .../include/hex/providers/provider_data.hpp   |  8 ++--
 .../include/hex/providers/undo_redo/stack.hpp |  2 -
 lib/libimhex/source/api/imhex_api.cpp         |  1 +
 lib/libimhex/source/helpers/crypto.cpp        |  1 +
 lib/libimhex/source/providers/provider.cpp    |  1 +
 lib/libimhex/source/providers/undo/stack.cpp  |  3 ++
 main/gui/source/window/macos_window.cpp       |  1 +
 .../builtin/source/content/achievements.cpp   |  1 +
 .../content/data_information_sections.cpp     |  2 +
 .../data_processor_nodes/other_nodes.cpp      |  1 +
 plugins/builtin/source/content/events.cpp     |  1 +
 .../source/content/main_menu_items.cpp        |  1 +
 plugins/builtin/source/content/ui_items.cpp   |  3 +-
 .../content/views/view_achievements.cpp       |  1 +
 .../source/content/views/view_bookmarks.cpp   |  1 +
 .../content/views/view_command_palette.cpp    |  1 +
 .../content/views/view_data_inspector.cpp     |  1 +
 .../content/views/view_data_processor.cpp     |  1 +
 .../source/content/views/view_find.cpp        |  1 +
 .../content/views/view_highlight_rules.cpp    |  1 +
 .../source/content/views/view_patches.cpp     |  1 +
 .../content/views/view_pattern_data.cpp       |  1 +
 .../source/content/views/view_store.cpp       |  1 +
 .../content/views/view_theme_manager.cpp      |  1 +
 .../source/content/window_decoration.cpp      |  1 +
 .../source/content/views/view_hashes.cpp      |  1 +
 plugins/ui/include/ui/hex_editor.hpp          |  2 +
 .../content/data_information_sections.cpp     |  1 +
 47 files changed, 119 insertions(+), 56 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9530c838..37c250824 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ include("${IMHEX_BASE_FOLDER}/cmake/ide_helpers.cmake")
 
 # Basic compiler and cmake configurations
 set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index afa6c7bd0..e691e2dde 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -665,6 +665,7 @@ macro(setupCompilerFlags target)
         addCCXXFlag("-Wno-array-bounds" ${target})
         addCCXXFlag("-Wno-deprecated-declarations" ${target})
         addCCXXFlag("-Wno-unknown-pragmas" ${target})
+        addCXXFlag("-Wno-include-angled-in-module-purview" ${target})
 
         # Enable hardening flags
         addCommonFlag("-U_FORTIFY_SOURCE" ${target})
diff --git a/lib/external/pattern_language b/lib/external/pattern_language
index 72e9b93c8..831a49f6b 160000
--- a/lib/external/pattern_language
+++ b/lib/external/pattern_language
@@ -1 +1 @@
-Subproject commit 72e9b93c8ff81020b2f65e23cde04dadabfe4f5a
+Subproject commit 831a49f6b7ada8d729a1331dbf7071bb0d303188
diff --git a/lib/libimhex/include/hex.cppm b/lib/libimhex/include/hex.cppm
index 3958b5343..73baed9ca 100644
--- a/lib/libimhex/include/hex.cppm
+++ b/lib/libimhex/include/hex.cppm
@@ -17,22 +17,35 @@ module;
 #include <ranges>
 #include <fstream>
 #include <thread>
+#include <future>
 
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
+#include <wolv/io/file.hpp>
+
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <hex/ui/imgui_imhex_extensions.h>
+
+#include <hex/helpers/auto_reset.hpp>
+#include <hex/api/event_manager.hpp>
+#include <hex/providers/provider.hpp>
+#include <hex/providers/provider_data.hpp>
+#include <hex/data_processor/node.hpp>
+#include <hex/data_processor/link.hpp>
+#include <hex/data_processor/attribute.hpp>
+#include <pl/pattern_language.hpp>
 
 export module hex;
 
 #define HEX_MODULE_EXPORT
+#include <hex/api/task_manager.hpp>
 #include <hex/api/achievement_manager.hpp>
-#include <hex/api/content_registry.hpp>
-#include <hex/api/event_manager.hpp>
 #include <hex/api/imhex_api.hpp>
 #include <hex/api/layout_manager.hpp>
 #include <hex/api/localization_manager.hpp>
 #include <hex/api/plugin_manager.hpp>
 #include <hex/api/shortcut_manager.hpp>
-#include <hex/api/task_manager.hpp>
 #include <hex/api/theme_manager.hpp>
 #include <hex/api/tutorial_manager.hpp>
-#include <hex/api/workspace_manager.hpp>
\ No newline at end of file
+#include <hex/api/workspace_manager.hpp>
diff --git a/lib/libimhex/include/hex/api/achievement_manager.hpp b/lib/libimhex/include/hex/api/achievement_manager.hpp
index 2f4f17a09..d99779670 100644
--- a/lib/libimhex/include/hex/api/achievement_manager.hpp
+++ b/lib/libimhex/include/hex/api/achievement_manager.hpp
@@ -16,7 +16,7 @@
 #include <hex/api/localization_manager.hpp>
 #include <hex/helpers/auto_reset.hpp>
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class AchievementManager;
 
diff --git a/lib/libimhex/include/hex/api/content_registry.hpp b/lib/libimhex/include/hex/api/content_registry.hpp
index 747bd3977..023e638ed 100644
--- a/lib/libimhex/include/hex/api/content_registry.hpp
+++ b/lib/libimhex/include/hex/api/content_registry.hpp
@@ -16,27 +16,31 @@
 #include <nlohmann/json.hpp>
 #include <wolv/io/fs.hpp>
 
-using ImGuiDataType = int;
-using ImGuiInputTextFlags = int;
-struct ImColor;
-enum ImGuiCustomCol : int;
-typedef int ImGuiColorEditFlags;
+#if !defined(HEX_MODULE_EXPORT)
+    using ImGuiDataType = int;
+    using ImGuiInputTextFlags = int;
+    struct ImColor;
+    enum ImGuiCustomCol : int;
+    typedef int ImGuiColorEditFlags;
+#endif
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
-    class View;
-    class Task;
+    #if !defined(HEX_MODULE_EXPORT)
+        class View;
+        class Task;
 
-    namespace dp {
-        class Node;
-    }
-    namespace prv {
-        class Provider;
-    }
+        namespace dp {
+            class Node;
+        }
+        namespace prv {
+            class Provider;
+        }
 
-    namespace LocalizationManager {
-        class LanguageDefinition;
-    }
+        namespace LocalizationManager {
+            class LanguageDefinition;
+        }
+    #endif
 
     /*
         The Content Registry is the heart of all features in ImHex that are in some way extendable by Plugins.
diff --git a/lib/libimhex/include/hex/api/event_manager.hpp b/lib/libimhex/include/hex/api/event_manager.hpp
index d750eb5c3..1bc1287c9 100644
--- a/lib/libimhex/include/hex/api/event_manager.hpp
+++ b/lib/libimhex/include/hex/api/event_manager.hpp
@@ -31,7 +31,7 @@
 #define EVENT_DEF_NO_LOG(event_name, ...)   EVENT_DEF_IMPL(event_name, #event_name, false, __VA_ARGS__)
 
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     namespace impl {
 
diff --git a/lib/libimhex/include/hex/api/imhex_api.hpp b/lib/libimhex/include/hex/api/imhex_api.hpp
index eb33be161..7db671601 100644
--- a/lib/libimhex/include/hex/api/imhex_api.hpp
+++ b/lib/libimhex/include/hex/api/imhex_api.hpp
@@ -14,21 +14,25 @@
 #include <set>
 #include <memory>
 
-using ImGuiID = unsigned int;
-struct ImVec2;
-struct ImFontAtlas;
-struct ImFont;
+#if !defined(HEX_MODULE_EXPORT)
+    using ImGuiID = unsigned int;
+    struct ImVec2;
+    struct ImFontAtlas;
+    struct ImFont;
+#endif
 struct GLFWwindow;
 
 EXPORT_MODULE namespace hex {
 
-    namespace impl {
-        class AutoResetBase;
-    }
+    #if !defined(HEX_MODULE_EXPORT)
+        namespace impl {
+            class AutoResetBase;
+        }
 
-    namespace prv {
-        class Provider;
-    }
+        namespace prv {
+            class Provider;
+        }
+    #endif
 
     namespace ImHexApi {
 
diff --git a/lib/libimhex/include/hex/api/layout_manager.hpp b/lib/libimhex/include/hex/api/layout_manager.hpp
index d77f433a4..124807f95 100644
--- a/lib/libimhex/include/hex/api/layout_manager.hpp
+++ b/lib/libimhex/include/hex/api/layout_manager.hpp
@@ -4,9 +4,11 @@
 
 #include <string>
 
-struct ImGuiTextBuffer;
+#if !defined(HEX_MODULE_EXPORT)
+    struct ImGuiTextBuffer;
+#endif
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class LayoutManager {
     public:
diff --git a/lib/libimhex/include/hex/api/plugin_manager.hpp b/lib/libimhex/include/hex/api/plugin_manager.hpp
index 0471e7f43..8b3906df2 100644
--- a/lib/libimhex/include/hex/api/plugin_manager.hpp
+++ b/lib/libimhex/include/hex/api/plugin_manager.hpp
@@ -10,9 +10,11 @@
 #include <hex/helpers/logger.hpp>
 #include <hex/helpers/auto_reset.hpp>
 
-struct ImGuiContext;
+#if !defined(HEX_MODULE_EXPORT)
+    struct ImGuiContext;
+#endif
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     struct SubCommand {
         enum class Type : u8 {
diff --git a/lib/libimhex/include/hex/api/project_file_manager.hpp b/lib/libimhex/include/hex/api/project_file_manager.hpp
index 614a978f7..2e64492d0 100644
--- a/lib/libimhex/include/hex/api/project_file_manager.hpp
+++ b/lib/libimhex/include/hex/api/project_file_manager.hpp
@@ -9,7 +9,7 @@
  * that want to store any data to a Project File.
  *
  */
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     namespace prv {
         class Provider;
diff --git a/lib/libimhex/include/hex/api/shortcut_manager.hpp b/lib/libimhex/include/hex/api/shortcut_manager.hpp
index fdd952a11..de3660ce7 100644
--- a/lib/libimhex/include/hex/api/shortcut_manager.hpp
+++ b/lib/libimhex/include/hex/api/shortcut_manager.hpp
@@ -9,7 +9,9 @@
 #include <set>
 #include <string>
 
-struct ImGuiWindow;
+#if !defined(HEX_MODULE_EXPORT)
+    struct ImGuiWindow;
+#endif
 
 struct KeyEquivalent {
     bool valid;
@@ -17,7 +19,7 @@ struct KeyEquivalent {
     int key;
 };
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class View;
 
diff --git a/lib/libimhex/include/hex/api/task_manager.hpp b/lib/libimhex/include/hex/api/task_manager.hpp
index ed8ad2037..34663621b 100644
--- a/lib/libimhex/include/hex/api/task_manager.hpp
+++ b/lib/libimhex/include/hex/api/task_manager.hpp
@@ -11,7 +11,7 @@
 #include <condition_variable>
 #include <source_location>
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class TaskHolder;
     class TaskManager;
diff --git a/lib/libimhex/include/hex/api/theme_manager.hpp b/lib/libimhex/include/hex/api/theme_manager.hpp
index 84ea1bee4..d5aeb3542 100644
--- a/lib/libimhex/include/hex/api/theme_manager.hpp
+++ b/lib/libimhex/include/hex/api/theme_manager.hpp
@@ -9,7 +9,7 @@
 #include <nlohmann/json_fwd.hpp>
 #include <imgui.h>
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     /**
      * @brief The Theme Manager takes care of loading and applying themes
diff --git a/lib/libimhex/include/hex/api/tutorial_manager.hpp b/lib/libimhex/include/hex/api/tutorial_manager.hpp
index a4786dc6b..0c8beaf11 100644
--- a/lib/libimhex/include/hex/api/tutorial_manager.hpp
+++ b/lib/libimhex/include/hex/api/tutorial_manager.hpp
@@ -10,7 +10,7 @@
 
 #include <hex/ui/imgui_imhex_extensions.h>
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class TutorialManager {
     public:
diff --git a/lib/libimhex/include/hex/api/workspace_manager.hpp b/lib/libimhex/include/hex/api/workspace_manager.hpp
index c7900a985..6dfec3b04 100644
--- a/lib/libimhex/include/hex/api/workspace_manager.hpp
+++ b/lib/libimhex/include/hex/api/workspace_manager.hpp
@@ -6,7 +6,7 @@
 #include <map>
 #include <string>
 
-namespace hex {
+EXPORT_MODULE namespace hex {
 
     class WorkspaceManager {
     public:
diff --git a/lib/libimhex/include/hex/helpers/logger.hpp b/lib/libimhex/include/hex/helpers/logger.hpp
index e1fa78dd7..8f986a444 100644
--- a/lib/libimhex/include/hex/helpers/logger.hpp
+++ b/lib/libimhex/include/hex/helpers/logger.hpp
@@ -8,7 +8,7 @@
 #include <wolv/io/file.hpp>
 #include <wolv/utils/guards.hpp>
 
-namespace hex::log {
+EXPORT_MODULE namespace hex::log {
 
     namespace impl {
 
diff --git a/lib/libimhex/include/hex/helpers/utils.hpp b/lib/libimhex/include/hex/helpers/utils.hpp
index 76333ed63..dbd1d6773 100644
--- a/lib/libimhex/include/hex/helpers/utils.hpp
+++ b/lib/libimhex/include/hex/helpers/utils.hpp
@@ -30,9 +30,11 @@
 
 namespace hex {
 
-    namespace prv {
-        class Provider;
-    }
+    #if !defined(HEX_MODULE_EXPORT)
+        namespace prv {
+            class Provider;
+        }
+    #endif
 
     template<typename T>
     [[nodiscard]] std::vector<std::vector<T>> sampleChannels(const std::vector<T> &data, size_t count, size_t channels) {
diff --git a/lib/libimhex/include/hex/helpers/utils_macos.hpp b/lib/libimhex/include/hex/helpers/utils_macos.hpp
index 8fd672cec..2535758e4 100644
--- a/lib/libimhex/include/hex/helpers/utils_macos.hpp
+++ b/lib/libimhex/include/hex/helpers/utils_macos.hpp
@@ -4,7 +4,9 @@
 
 #if defined(OS_MACOS)
 
-    struct GLFWwindow;
+    #if !defined(HEX_MODULE_EXPORT)
+        struct GLFWwindow;
+    #endif
 
     extern "C" {
 
diff --git a/lib/libimhex/include/hex/providers/provider_data.hpp b/lib/libimhex/include/hex/providers/provider_data.hpp
index 821e51152..e2f9710f0 100644
--- a/lib/libimhex/include/hex/providers/provider_data.hpp
+++ b/lib/libimhex/include/hex/providers/provider_data.hpp
@@ -12,9 +12,11 @@
 
 namespace hex {
 
-    namespace prv {
-        class Provider;
-    }
+    #if !defined(HEX_MODULE_EXPORT)
+        namespace prv {
+            class Provider;
+        }
+    #endif
 
     template<typename T>
     class PerProvider {
diff --git a/lib/libimhex/include/hex/providers/undo_redo/stack.hpp b/lib/libimhex/include/hex/providers/undo_redo/stack.hpp
index 3ae51799a..8ac6c7d30 100644
--- a/lib/libimhex/include/hex/providers/undo_redo/stack.hpp
+++ b/lib/libimhex/include/hex/providers/undo_redo/stack.hpp
@@ -2,7 +2,6 @@
 
 #include <hex.hpp>
 #include <hex/api/localization_manager.hpp>
-#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/providers/undo_redo/operations/operation.hpp>
 
@@ -35,7 +34,6 @@ namespace hex::prv::undo {
         template<std::derived_from<Operation> T>
         bool add(auto && ... args) {
             auto result = this->add(std::make_unique<T>(std::forward<decltype(args)>(args)...));
-            EventDataChanged::post(m_provider);
 
             return result;
         }
diff --git a/lib/libimhex/source/api/imhex_api.cpp b/lib/libimhex/source/api/imhex_api.cpp
index ae389b0d8..4f443658b 100644
--- a/lib/libimhex/source/api/imhex_api.cpp
+++ b/lib/libimhex/source/api/imhex_api.cpp
@@ -7,6 +7,7 @@
 #include <hex/api/events/requests_lifecycle.hpp>
 #include <hex/api/events/requests_provider.hpp>
 #include <hex/api/events/requests_gui.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/api/task_manager.hpp>
 #include <hex/helpers/fmt.hpp>
diff --git a/lib/libimhex/source/helpers/crypto.cpp b/lib/libimhex/source/helpers/crypto.cpp
index d1bb714e2..3d56128d6 100644
--- a/lib/libimhex/source/helpers/crypto.cpp
+++ b/lib/libimhex/source/helpers/crypto.cpp
@@ -20,6 +20,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <bit>
+#include <span>
 
 #if MBEDTLS_VERSION_MAJOR <= 2
 
diff --git a/lib/libimhex/source/providers/provider.cpp b/lib/libimhex/source/providers/provider.cpp
index 80a009287..779c6437f 100644
--- a/lib/libimhex/source/providers/provider.cpp
+++ b/lib/libimhex/source/providers/provider.cpp
@@ -2,6 +2,7 @@
 
 #include <hex.hpp>
 #include <hex/api/events/events_provider.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <cmath>
 #include <cstring>
diff --git a/lib/libimhex/source/providers/undo/stack.cpp b/lib/libimhex/source/providers/undo/stack.cpp
index a7213068f..1f45c2386 100644
--- a/lib/libimhex/source/providers/undo/stack.cpp
+++ b/lib/libimhex/source/providers/undo/stack.cpp
@@ -1,5 +1,6 @@
 #include <hex/providers/undo_redo/stack.hpp>
 #include <hex/providers/undo_redo/operations/operation_group.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/providers/provider.hpp>
 
@@ -122,6 +123,8 @@ namespace hex::prv::undo {
         // Do the operation
         this->getLastOperation()->redo(m_provider);
 
+        EventDataChanged::post(m_provider);
+
         return true;
     }
 
diff --git a/main/gui/source/window/macos_window.cpp b/main/gui/source/window/macos_window.cpp
index a44dde4d5..1ffdb2198 100644
--- a/main/gui/source/window/macos_window.cpp
+++ b/main/gui/source/window/macos_window.cpp
@@ -6,6 +6,7 @@
     #include <hex/api/imhex_api.hpp>
     #include <hex/api/events/events_gui.hpp>
     #include <hex/api/events/requests_gui.hpp>
+    #include <hex/api/events/events_interaction.hpp>
     #include <hex/api/task_manager.hpp>
 
     #include <hex/helpers/utils_macos.hpp>
diff --git a/plugins/builtin/source/content/achievements.cpp b/plugins/builtin/source/content/achievements.cpp
index e36a57037..218586ec2 100644
--- a/plugins/builtin/source/content/achievements.cpp
+++ b/plugins/builtin/source/content/achievements.cpp
@@ -4,6 +4,7 @@
 
 #include <hex/api/events/events_provider.hpp>
 #include <hex/api/events/events_lifecycle.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/helpers/crypto.hpp>
 #include <hex/providers/provider.hpp>
diff --git a/plugins/builtin/source/content/data_information_sections.cpp b/plugins/builtin/source/content/data_information_sections.cpp
index 96835893a..4308c169f 100644
--- a/plugins/builtin/source/content/data_information_sections.cpp
+++ b/plugins/builtin/source/content/data_information_sections.cpp
@@ -7,6 +7,8 @@
 #include <fonts/vscode_icons.hpp>
 #include <hex/api/task_manager.hpp>
 #include <hex/ui/imgui_imhex_extensions.h>
+#include <hex/helpers/logger.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <wolv/literals.hpp>
 
diff --git a/plugins/builtin/source/content/data_processor_nodes/other_nodes.cpp b/plugins/builtin/source/content/data_processor_nodes/other_nodes.cpp
index e6726d31e..74d83e49d 100644
--- a/plugins/builtin/source/content/data_processor_nodes/other_nodes.cpp
+++ b/plugins/builtin/source/content/data_processor_nodes/other_nodes.cpp
@@ -1,6 +1,7 @@
 #include <hex/api/imhex_api.hpp>
 #include <hex/api/content_registry.hpp>
 #include <hex/api/achievement_manager.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/providers/provider.hpp>
 #include <hex/data_processor/node.hpp>
diff --git a/plugins/builtin/source/content/events.cpp b/plugins/builtin/source/content/events.cpp
index 5d3995fe1..add42472d 100644
--- a/plugins/builtin/source/content/events.cpp
+++ b/plugins/builtin/source/content/events.cpp
@@ -1,5 +1,6 @@
 #include <hex/api/events/events_provider.hpp>
 #include <hex/api/events/events_lifecycle.hpp>
+#include <hex/api/events/events_interaction.hpp>
 #include <hex/api/events/events_gui.hpp>
 #include <hex/api/events/requests_lifecycle.hpp>
 #include <hex/api/events/requests_interaction.hpp>
diff --git a/plugins/builtin/source/content/main_menu_items.cpp b/plugins/builtin/source/content/main_menu_items.cpp
index 1d2669adc..409d6b84b 100644
--- a/plugins/builtin/source/content/main_menu_items.cpp
+++ b/plugins/builtin/source/content/main_menu_items.cpp
@@ -19,6 +19,7 @@
 #include <toasts/toast_notification.hpp>
 #include <popups/popup_text_input.hpp>
 #include <hex/api/workspace_manager.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <wolv/io/file.hpp>
 #include <wolv/literals.hpp>
diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp
index 7900d3fb9..2a6a8761c 100644
--- a/plugins/builtin/source/content/ui_items.cpp
+++ b/plugins/builtin/source/content/ui_items.cpp
@@ -22,6 +22,7 @@
 #include <toasts/toast_notification.hpp>
 
 #include <csignal>
+#include <hex/api/events/events_interaction.hpp>
 
 namespace hex::plugin::builtin {
 
@@ -553,4 +554,4 @@ namespace hex::plugin::builtin {
         });
     }
 
-}
\ No newline at end of file
+}
diff --git a/plugins/builtin/source/content/views/view_achievements.cpp b/plugins/builtin/source/content/views/view_achievements.cpp
index 6bf8a56e4..95da203e8 100644
--- a/plugins/builtin/source/content/views/view_achievements.cpp
+++ b/plugins/builtin/source/content/views/view_achievements.cpp
@@ -3,6 +3,7 @@
 #include <hex/api/content_registry.hpp>
 #include <hex/api/task_manager.hpp>
 #include <hex/api/events/requests_gui.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <fonts/vscode_icons.hpp>
 
diff --git a/plugins/builtin/source/content/views/view_bookmarks.cpp b/plugins/builtin/source/content/views/view_bookmarks.cpp
index 7ed0776d2..ead13fdaa 100644
--- a/plugins/builtin/source/content/views/view_bookmarks.cpp
+++ b/plugins/builtin/source/content/views/view_bookmarks.cpp
@@ -5,6 +5,7 @@
 #include <hex/api/achievement_manager.hpp>
 #include <hex/api/task_manager.hpp>
 #include <hex/api/events/requests_interaction.hpp>
+#include <hex/api/events/events_interaction.hpp>
 #include <hex/helpers/fmt.hpp>
 #include <hex/helpers/utils.hpp>
 #include <hex/providers/provider.hpp>
diff --git a/plugins/builtin/source/content/views/view_command_palette.cpp b/plugins/builtin/source/content/views/view_command_palette.cpp
index 10a44a78b..84c87a2a2 100644
--- a/plugins/builtin/source/content/views/view_command_palette.cpp
+++ b/plugins/builtin/source/content/views/view_command_palette.cpp
@@ -3,6 +3,7 @@
 #include <hex/api/content_registry.hpp>
 #include <wolv/utils/guards.hpp>
 #include <hex/api/events/requests_gui.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include "imstb_textedit.h"
 
diff --git a/plugins/builtin/source/content/views/view_data_inspector.cpp b/plugins/builtin/source/content/views/view_data_inspector.cpp
index 56dc204ab..e5f9746c6 100644
--- a/plugins/builtin/source/content/views/view_data_inspector.cpp
+++ b/plugins/builtin/source/content/views/view_data_inspector.cpp
@@ -4,6 +4,7 @@
 #include <hex/providers/provider.hpp>
 #include <hex/helpers/logger.hpp>
 #include <hex/helpers/default_paths.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <fonts/vscode_icons.hpp>
 #include <hex/ui/imgui_imhex_extensions.h>
diff --git a/plugins/builtin/source/content/views/view_data_processor.cpp b/plugins/builtin/source/content/views/view_data_processor.cpp
index daba17cb9..b1721c598 100644
--- a/plugins/builtin/source/content/views/view_data_processor.cpp
+++ b/plugins/builtin/source/content/views/view_data_processor.cpp
@@ -7,6 +7,7 @@
 
 #include <hex/api/events/events_provider.hpp>
 #include <hex/api/events/requests_gui.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/providers/provider.hpp>
 #include <hex/helpers/logger.hpp>
diff --git a/plugins/builtin/source/content/views/view_find.cpp b/plugins/builtin/source/content/views/view_find.cpp
index 6daea6bc8..324ff8735 100644
--- a/plugins/builtin/source/content/views/view_find.cpp
+++ b/plugins/builtin/source/content/views/view_find.cpp
@@ -2,6 +2,7 @@
 
 #include <hex/api/imhex_api.hpp>
 #include <hex/api/achievement_manager.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/providers/buffered_reader.hpp>
 
diff --git a/plugins/builtin/source/content/views/view_highlight_rules.cpp b/plugins/builtin/source/content/views/view_highlight_rules.cpp
index c63307e35..2b61a9b58 100644
--- a/plugins/builtin/source/content/views/view_highlight_rules.cpp
+++ b/plugins/builtin/source/content/views/view_highlight_rules.cpp
@@ -3,6 +3,7 @@
 #include <hex/api/content_registry.hpp>
 #include <hex/api/project_file_manager.hpp>
 #include <hex/api/events/events_provider.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <wolv/utils/guards.hpp>
 
diff --git a/plugins/builtin/source/content/views/view_patches.cpp b/plugins/builtin/source/content/views/view_patches.cpp
index 0a4c91d51..d1bbcbe54 100644
--- a/plugins/builtin/source/content/views/view_patches.cpp
+++ b/plugins/builtin/source/content/views/view_patches.cpp
@@ -3,6 +3,7 @@
 #include <hex/providers/provider.hpp>
 
 #include <hex/api/project_file_manager.hpp>
+#include <hex/api/events/events_interaction.hpp>
 #include <nlohmann/json.hpp>
 
 #include <content/providers/undo_operations/operation_write.hpp>
diff --git a/plugins/builtin/source/content/views/view_pattern_data.cpp b/plugins/builtin/source/content/views/view_pattern_data.cpp
index 6ad266145..2f4035c1a 100644
--- a/plugins/builtin/source/content/views/view_pattern_data.cpp
+++ b/plugins/builtin/source/content/views/view_pattern_data.cpp
@@ -3,6 +3,7 @@
 #include <hex/api/content_registry.hpp>
 #include <hex/providers/memory_provider.hpp>
 #include <hex/api/events/requests_interaction.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <fonts/vscode_icons.hpp>
 
diff --git a/plugins/builtin/source/content/views/view_store.cpp b/plugins/builtin/source/content/views/view_store.cpp
index c21841036..6eb663be3 100644
--- a/plugins/builtin/source/content/views/view_store.cpp
+++ b/plugins/builtin/source/content/views/view_store.cpp
@@ -4,6 +4,7 @@
 #include <hex/api_urls.hpp>
 
 #include <hex/api/content_registry.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <popups/popup_notification.hpp>
 #include <toasts/toast_notification.hpp>
diff --git a/plugins/builtin/source/content/views/view_theme_manager.cpp b/plugins/builtin/source/content/views/view_theme_manager.cpp
index f65251302..2826ad900 100644
--- a/plugins/builtin/source/content/views/view_theme_manager.cpp
+++ b/plugins/builtin/source/content/views/view_theme_manager.cpp
@@ -2,6 +2,7 @@
 
 #include <hex/api/content_registry.hpp>
 #include <hex/api/theme_manager.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <wolv/io/file.hpp>
 #include <fonts/vscode_icons.hpp>
diff --git a/plugins/builtin/source/content/window_decoration.cpp b/plugins/builtin/source/content/window_decoration.cpp
index 9cb611060..9675b7fa0 100644
--- a/plugins/builtin/source/content/window_decoration.cpp
+++ b/plugins/builtin/source/content/window_decoration.cpp
@@ -4,6 +4,7 @@
 #include <hex/api/project_file_manager.hpp>
 #include <hex/api/events/events_gui.hpp>
 #include <hex/api/events/requests_gui.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/ui/view.hpp>
 #include <hex/helpers/utils.hpp>
diff --git a/plugins/hashes/source/content/views/view_hashes.cpp b/plugins/hashes/source/content/views/view_hashes.cpp
index 5a8163749..0c825848e 100644
--- a/plugins/hashes/source/content/views/view_hashes.cpp
+++ b/plugins/hashes/source/content/views/view_hashes.cpp
@@ -3,6 +3,7 @@
 #include <hex/api/project_file_manager.hpp>
 #include <hex/api/achievement_manager.hpp>
 #include <hex/providers/memory_provider.hpp>
+#include <hex/api/events/events_interaction.hpp>
 
 #include <hex/helpers/crypto.hpp>
 
diff --git a/plugins/ui/include/ui/hex_editor.hpp b/plugins/ui/include/ui/hex_editor.hpp
index f7641ba51..0976abeed 100644
--- a/plugins/ui/include/ui/hex_editor.hpp
+++ b/plugins/ui/include/ui/hex_editor.hpp
@@ -6,6 +6,8 @@
 #include <hex/providers/provider.hpp>
 #include <hex/helpers/encoding_file.hpp>
 
+#include <hex/api/events/events_interaction.hpp>
+
 #include <imgui.h>
 #include <hex/ui/view.hpp>
 
diff --git a/plugins/yara_rules/source/content/data_information_sections.cpp b/plugins/yara_rules/source/content/data_information_sections.cpp
index a7d58ceed..b83c7b50e 100644
--- a/plugins/yara_rules/source/content/data_information_sections.cpp
+++ b/plugins/yara_rules/source/content/data_information_sections.cpp
@@ -7,6 +7,7 @@
 
 #include <content/yara_rule.hpp>
 #include <romfs/romfs.hpp>
+#include <wolv/io/file.hpp>
 
 namespace hex::plugin::yara {