diff --git a/src/ll/api/Logger.cpp b/src/ll/api/Logger.cpp
index 9041cc6ad2..4fdb7bd16f 100644
--- a/src/ll/api/Logger.cpp
+++ b/src/ll/api/Logger.cpp
@@ -1,14 +1,27 @@
+#include "ll/api/Logger.h"
+
+#include <array>
+#include <exception>
+#include <filesystem>
+#include <fstream>
+#include <ios>
+#include <mutex>
+#include <optional>
+#include <ostream>
+#include <string>
+#include <string_view>
+#include <system_error>
 #include <utility>
 
-#include "ll/api/Logger.h"
+#include "fmt/chrono.h" // IWYU pragma: keep
+#include "fmt/color.h"
+#include "fmt/core.h"
 
-#include "ll/api/io/FileUtils.h"
+#include "ll/api/base/ToString.h" // IWYU pragma: keep
 #include "ll/api/utils/ErrorUtils.h"
-#include "ll/api/utils/HashUtils.h"
 #include "ll/api/utils/StringUtils.h"
-#include "ll/core/Config.h"
-
 #include "ll/api/utils/WinUtils.h"
+#include "ll/core/Config.h"
 
 using namespace ll::string_utils;
 
diff --git a/src/ll/api/Logger.h b/src/ll/api/Logger.h
index 69effd4241..92ed788c99 100644
--- a/src/ll/api/Logger.h
+++ b/src/ll/api/Logger.h
@@ -14,25 +14,25 @@
  * @endcode
  */
 
-#include "ll/api/base/Concepts.h"
-#include "ll/api/i18n/I18nAPI.h"
-
+#include <array>
 #include <filesystem>
 #include <fstream>
-#include <iostream>
+#include <functional>
 #include <mutex>
-#include <source_location>
-#include <sstream>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <utility>
 
-#include "fmt/chrono.h"
+#include "fmt/chrono.h" // IWYU pragma: keep
 #include "fmt/color.h"
-#include "fmt/compile.h"
+#include "fmt/core.h"
 #include "fmt/format.h"
-#include "fmt/os.h"
-#include "fmt/ranges.h"
-#include "fmt/std.h"
+#include "fmt/os.h"     // IWYU pragma: keep
+#include "fmt/ranges.h" // IWYU pragma: keep
+#include "fmt/std.h"    // IWYU pragma: keep
+
+#include "ll/api/base/Macro.h"
 
 namespace ll {
 class Logger {
diff --git a/src/ll/api/base/SourceLocation.h b/src/ll/api/base/SourceLocation.h
index 035fcbda83..90d0f36da6 100644
--- a/src/ll/api/base/SourceLocation.h
+++ b/src/ll/api/base/SourceLocation.h
@@ -5,11 +5,6 @@
 
 namespace ll {
 class SourceLocation {
-    int         line_;
-    int         column_;
-    char const* file_;
-    char const* function_;
-
 public:
     static consteval SourceLocation current(
         int         line     = __builtin_LINE(),
@@ -21,18 +16,24 @@ class SourceLocation {
     }
 
     consteval SourceLocation(int line, int column, char const* file, char const* function) noexcept
-    : line_(line),
-      column_(column),
-      file_(file),
-      function_(function) {}
+    : mLine(line),
+      mColumn(column),
+      mFile(file),
+      mFunction(function) {}
 
-    [[nodiscard]] int         line() const noexcept { return line_; }
-    [[nodiscard]] int         column() const noexcept { return column_; }
-    [[nodiscard]] char const* file() const noexcept { return file_; }
-    [[nodiscard]] char const* function() const noexcept { return function_; }
+    [[nodiscard]] int         line() const noexcept { return mLine; }
+    [[nodiscard]] int         column() const noexcept { return mColumn; }
+    [[nodiscard]] char const* file() const noexcept { return mFile; }
+    [[nodiscard]] char const* function() const noexcept { return mFunction; }
 
     [[nodiscard]] std::string toString() const {
-        return std::format("{} at {}({}:{})", function_, file_, line_, column_);
+        return std::format("{} at {}({}:{})", mFunction, mFile, mLine, mColumn);
     }
+
+private:
+    int         mLine;
+    int         mColumn;
+    char const* mFile;
+    char const* mFunction;
 };
 } // namespace ll
diff --git a/src/ll/api/dimension/CustomDimensionManager.cpp b/src/ll/api/dimension/CustomDimensionManager.cpp
index b85e7a757d..fa40185964 100644
--- a/src/ll/api/dimension/CustomDimensionManager.cpp
+++ b/src/ll/api/dimension/CustomDimensionManager.cpp
@@ -5,6 +5,7 @@
 #include "ll/api/memory/Hook.h"
 #include "ll/api/service/Bedrock.h"
 #include "ll/api/utils/Base64Utils.h"
+#include "ll/api/utils/StringUtils.h"
 #include "ll/core/dimension/CustomDimensionConfig.h"
 #include "ll/core/dimension/FakeDimensionId.h"
 
diff --git a/src/ll/api/schedule/Task.cpp b/src/ll/api/schedule/Task.cpp
index 2747c31b4d..807f06f762 100644
--- a/src/ll/api/schedule/Task.cpp
+++ b/src/ll/api/schedule/Task.cpp
@@ -1,10 +1,13 @@
 #include "ll/api/schedule/Task.h"
 
 #include <spanstream>
+#include <thread>
 
 #include "ll/api/Logger.h"
 #include "ll/api/utils/ErrorUtils.h"
 
+#include "fmt/std.h" // IWYU pragma: keep
+
 namespace ll::schedule {
 inline namespace task {
 std::atomic_ullong taskId{0};
diff --git a/src/ll/core/Config.cpp b/src/ll/core/Config.cpp
index 84cae17d5a..d7ea0c950a 100644
--- a/src/ll/core/Config.cpp
+++ b/src/ll/core/Config.cpp
@@ -1,5 +1,7 @@
 #include "ll/core/Config.h"
+
 #include "ll/api/Config.h"
+#include "ll/api/i18n/I18nAPI.h"
 #include "ll/api/utils/ErrorUtils.h"
 #include "ll/core/LeviLamina.h"
 
diff --git a/src/ll/core/CrashLogger.cpp b/src/ll/core/CrashLogger.cpp
index f31a3a91c9..d55278bf59 100644
--- a/src/ll/core/CrashLogger.cpp
+++ b/src/ll/core/CrashLogger.cpp
@@ -4,6 +4,7 @@
 
 #include "ll/api/Logger.h"
 #include "ll/api/data/Version.h"
+#include "ll/api/i18n/I18nAPI.h"
 #include "ll/api/service/ServerInfo.h"
 #include "ll/api/utils/ErrorUtils.h"
 #include "ll/api/utils/StacktraceUtils.h"
@@ -11,7 +12,7 @@
 #include "ll/api/utils/WinUtils.h"
 #include "ll/core/Config.h"
 
-#include "windows.h"
+#include <windows.h>
 
 #if _HAS_CXX23
 #include "DbgHelp.h"
diff --git a/src/ll/core/LeviLamina.cpp b/src/ll/core/LeviLamina.cpp
index 6087ae1569..61e689dc93 100644
--- a/src/ll/core/LeviLamina.cpp
+++ b/src/ll/core/LeviLamina.cpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "ll/api/Logger.h"
+#include "ll/api/i18n/I18nAPI.h"
 #include "ll/api/memory/Hook.h"
 #include "ll/api/service/Bedrock.h"
 #include "ll/api/service/PlayerInfo.h"
diff --git a/src/ll/core/plugin/PluginRegistrar.cpp b/src/ll/core/plugin/PluginRegistrar.cpp
index da21a7eb21..8390f2709d 100644
--- a/src/ll/core/plugin/PluginRegistrar.cpp
+++ b/src/ll/core/plugin/PluginRegistrar.cpp
@@ -1,16 +1,36 @@
 #include "ll/core/plugin/PluginRegistrar.h"
 
+#include <cstddef>
 #include <expected>
+#include <filesystem>
+#include <memory>
+#include <mutex>
 #include <ranges>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
-#include "ll/api/event/Emitter.h"
+#include "nlohmann/json.hpp"
+#include "nlohmann/json_fwd.hpp"
+
+#include "ll/api/base/Concepts.h" // IWYU pragma: keep
+#include "ll/api/data/DependencyGraph.h"
+#include "ll/api/i18n/I18nAPI.h"
 #include "ll/api/io/FileUtils.h"
 #include "ll/api/memory/Hook.h"
+#include "ll/api/plugin/Manifest.h"
+#include "ll/api/plugin/Plugin.h"
+#include "ll/api/plugin/PluginManagerRegistry.h"
 #include "ll/api/reflection/Deserialization.h"
 #include "ll/api/utils/ErrorUtils.h"
+#include "ll/api/utils/StringUtils.h"
 #include "ll/core/LeviLamina.h"
 #include "ll/core/plugin/NativePluginManager.h"
 
+
 #include "mc/server/ServerInstance.h"
 #include "mc/world/events/ServerInstanceEventCoordinator.h"