diff --git a/lib/libimhex/source/ui/view.cpp b/lib/libimhex/source/ui/view.cpp
index bae4acfe3..a87e43126 100644
--- a/lib/libimhex/source/ui/view.cpp
+++ b/lib/libimhex/source/ui/view.cpp
@@ -1,4 +1,5 @@
 #include <hex/ui/view.hpp>
+#include <hex/api/task_manager.hpp>
 
 #include <imgui.h>
 
diff --git a/plugins/builtin/source/content/init_tasks.cpp b/plugins/builtin/source/content/init_tasks.cpp
index 93f641ef8..09ef49785 100644
--- a/plugins/builtin/source/content/init_tasks.cpp
+++ b/plugins/builtin/source/content/init_tasks.cpp
@@ -8,6 +8,8 @@
 #include <hex/helpers/logger.hpp>
 
 #include <wolv/hash/uuid.hpp>
+#include <hex/ui/imgui_imhex_extensions.h>
+#include <toasts/toast_notification.hpp>
 
 #include <fonts/vscode_icons.hpp>
 #include <nlohmann/json.hpp>
diff --git a/plugins/builtin/source/content/window_decoration.cpp b/plugins/builtin/source/content/window_decoration.cpp
index e804abb16..aa5443a8d 100644
--- a/plugins/builtin/source/content/window_decoration.cpp
+++ b/plugins/builtin/source/content/window_decoration.cpp
@@ -8,21 +8,23 @@
 
 #include <hex/ui/view.hpp>
 #include <hex/helpers/utils.hpp>
+#include <hex/helpers/menu_items.hpp>
+#include <hex/helpers/auto_reset.hpp>
 
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <random>
 #include <hex/ui/imgui_imhex_extensions.h>
-#include <hex/helpers/menu_items.hpp>
 
+#include <fonts/fonts.hpp>
 #include <fonts/vscode_icons.hpp>
-#include <hex/api/tutorial_manager.hpp>
-#include <hex/helpers/auto_reset.hpp>
+
 #include <romfs/romfs.hpp>
 #include <wolv/utils/guards.hpp>
 
 #include <GLFW/glfw3.h>
 
+#include <random>
+
 namespace hex::plugin::builtin {
 
     // Function that draws the provider popup, defined in the ui_items.cpp file