Clean up includes

source/NotificationsUtils.cpp

@@ -1,9 +1,12 @@
 #include "NotificationsUtils.h"
+
 #include "globals.h"
 #include "utils/logger.h"
-#include <cstring>
+
 #include <notifications/notifications.h>
 
+#include <cstring>
+
 bool DisplayNotificationMessage(std::string_view text, NotificationModuleNotificationType type, float duration) {
     if (!gNotificationModuleLoaded) {
         return false;

source/NotificationsUtils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include <string_view>
 
 bool DisplayInfoNotificationMessage(std::string_view text, float duration);
 

source/PluginManagement.cpp

@@ -1,17 +1,28 @@
 #include "PluginManagement.h"
+
 #include "NotificationsUtils.h"
 #include "hooks.h"
+#include "plugin/FunctionData.h"
+#include "plugin/HookData.h"
+#include "plugin/PluginConfigData.h"
 #include "plugin/PluginContainer.h"
+#include "plugin/PluginData.h"
 #include "plugin/PluginLinkInformationFactory.h"
 #include "plugin/PluginLoadWrapper.h"
 #include "plugin/PluginMetaInformationFactory.h"
+#include "plugin/RelocationData.h"
+#include "plugin/SectionInfo.h"
 #include "utils/ElfUtils.h"
 #include "utils/StringTools.h"
-#include "utils/utils.h"
+#include "utils/logger.h"
+
+#include <wums/defines/relocation_defines.h>
+
 #include <coreinit/cache.h>
-#include <coreinit/dynload.h>
-#include <memory.h>
-#include <ranges>
+
+#include <vector>
+
+#include <cstdint>
 
 static uint32_t sTrampolineID = 0;
 

source/PluginManagement.h

@@ -1,12 +1,16 @@
 #pragma once
 
-#include "plugin/PluginContainer.h"
-#include "plugin/PluginLoadWrapper.h"
+#include <wums/defines/relocation_defines.h>
+
 #include <coreinit/dynload.h>
+
 #include <functional>
 #include <map>
-#include <set>
-#include <wums/defines/relocation_defines.h>
+#include <string>
+
+class RelocationData;
+class PluginLoadWrapper;
+class PluginContainer;
 
 class PluginManagement {
 public:

source/config/WUPSConfig.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "WUPSConfigCategory.h"
+
 #include <string_view>
 
 namespace WUPSConfigAPIBackend {

source/config/WUPSConfigAPI.cpp

@@ -1,4 +1,5 @@
 #include "WUPSConfigAPI.h"
+
 #include "WUPSConfig.h"
 #include "WUPSConfigCategory.h"
 #include "WUPSConfigItem.h"
@@ -10,13 +11,14 @@
 #include "utils/logger.h"
 #include "utils/utils.h"
 
-#include <memory>
-#include <ranges>
-#include <vector>
 #include <wums/exports.h>
-#include <wups/config.h>
 #include <wups/config_api.h>
 
+#include <bits/ranges_algo.h>
+#include <memory>
+#include <mutex>
+#include <vector>
+
 namespace WUPSConfigAPIBackend {
 
     std::vector<std::unique_ptr<WUPSConfig>> sConfigs;

source/config/WUPSConfigAPI.h

@@ -1,11 +1,13 @@
 #pragma once
 
-#include "WUPSConfig.h"
-#include "WUPSConfigCategory.h"
-#include "WUPSConfigItem.h"
 #include <wups/config.h>
 
+#include <memory>
+
 namespace WUPSConfigAPIBackend {
+    class WUPSConfigItem;
+    class WUPSConfig;
+    class WUPSConfigCategory;
     namespace Intern {
         /**
          * @brief Retrieves a WUPSConfig pointer based on a given handle.

source/config/WUPSConfigAPIDeprecated.cpp

@@ -1,7 +1,9 @@
 #include "WUPSConfig.h"
 #include "WUPSConfigAPI.h"
+#include "WUPSConfigItem.h"
 #include "utils/logger.h"
-#include <wums.h>
+
+#include <wums/exports.h>
 #include <wups/config.h>
 
 int32_t WUPSConfig_Create(void **out, const char *name) {

source/config/WUPSConfigCategory.cpp

@@ -1,5 +1,9 @@
 #include "WUPSConfigCategory.h"
+#include "WUPSConfigItem.h"
 
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace WUPSConfigAPIBackend {
 

source/config/WUPSConfigCategory.h

@@ -16,13 +16,13 @@
 ****************************************************************************/
 
 #pragma once
-#include "WUPSConfigItem.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 namespace WUPSConfigAPIBackend {
+    class WUPSConfigItem;
     class WUPSConfigCategory {
     public:
         explicit WUPSConfigCategory(std::string_view name);

source/config/WUPSConfigItem.cpp

@@ -1,5 +1,7 @@
 #include "WUPSConfigItem.h"
 
+#include <string>
+
 namespace WUPSConfigAPIBackend {
     WUPSConfigItem::WUPSConfigItem(std::string displayName) : mDisplayName(std::move(displayName)) {
     }

source/config/WUPSConfigItem.h

@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <string>
 #include <wups/config.h>
 
+#include <string>
+
 namespace WUPSConfigAPIBackend {
     class WUPSConfigItem {
     public:

source/config/WUPSConfigItemV1.cpp

@@ -1,7 +1,12 @@
 #include "WUPSConfigItemV1.h"
+
 #include "utils/StringTools.h"
 #include "utils/logger.h"
 
+#include <wups/config.h>
+
+#include <string>
+
 namespace WUPSConfigAPIBackend {
     WUPSConfigItemV1::WUPSConfigItemV1(const std::string_view configId,
                                        const std::string_view displayName,

source/config/WUPSConfigItemV1.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #include "WUPSConfigItem.h"
-#include <string>
+
 #include <wups/config.h>
 
+#include <string>
 namespace WUPSConfigAPIBackend {
     class WUPSConfigItemV1 final : public WUPSConfigItem {
     public:

source/config/WUPSConfigItemV2.cpp

@@ -1,9 +1,10 @@
 #include "WUPSConfigItemV2.h"
+
+#include <wups/config.h>
+
 #include "utils/StringTools.h"
 #include "utils/logger.h"
-
 #include <string>
-#include <wups/config.h>
 
 namespace WUPSConfigAPIBackend {
     WUPSConfigItemV2::WUPSConfigItemV2(const std::string_view displayName,

source/config/WUPSConfigItemV2.h

@@ -1,9 +1,11 @@
 #pragma once
 
 #include "WUPSConfigItem.h"
-#include <string>
+
 #include <wups/config.h>
 
+#include <string>
+
 namespace WUPSConfigAPIBackend {
     class WUPSConfigItemV2 final : public WUPSConfigItem {
     public:

source/fs/CFile.cpp

@@ -1,9 +1,11 @@
 
+#include "fs/CFile.hpp"
 #include "utils/utils.h"
+
 #include <cstdarg>
 #include <cstdio>
-#include <fs/CFile.hpp>
-#include <strings.h>
+#include <sys/_default_fcntl.h>
+
 
 CFile::CFile() {
     iFd      = -1;

source/fs/CFile.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <cstdio>
-#include <cstring>
-#include <fcntl.h>
-#include <string>
-#include <unistd.h>
 #include <wut_types.h>
 
+#include <string>
+
+#include <cstdio>
+#include <unistd.h>
+
 class CFile {
 public:
     enum eOpenTypes {

source/fs/DirList.cpp

@@ -24,18 +24,18 @@
  * DirList Class
  * for WiiXplorer 2010
  ***************************************************************************/
+#include "fs/DirList.h"
+#include "utils/StringTools.h"
+
 #include <algorithm>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <string>
+
+#include <cstring>
+#include <stdio.h>
 #include <strings.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
 
-#include <fs/DirList.h>
-#include <utils/StringTools.h>
-
 DirList::DirList() {
     Flags  = 0;
     Filter = 0;

source/fs/DirList.h

@@ -27,9 +27,10 @@
 #ifndef ___DIRLIST_H_
 #define ___DIRLIST_H_
 
+#include <wut_types.h>
+
 #include <string>
 #include <vector>
-#include <wut_types.h>
 
 typedef struct {
     char *FilePath;

source/fs/FSUtils.cpp

@@ -1,12 +1,14 @@
 #include "fs/FSUtils.h"
 #include "utils/logger.h"
+
 #include "utils/utils.h"
+#include <filesystem>
+#include <vector>
+
 #include <cstdio>
 #include <cstring>
 #include <fcntl.h>
-#include <filesystem>
 #include <unistd.h>
-#include <vector>
 
 int32_t FSUtils::LoadFileToMem(std::string_view filepath, std::vector<uint8_t> &buffer) {
     //! always initialize input

source/fs/FSUtils.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <wut_types.h>
+
 #include <string>
 #include <vector>
-#include <wut_types.h>
 
 class FSUtils {
 public:

source/globals.cpp

@@ -1,7 +1,15 @@
 #include "globals.h"
+
+#include "plugin/FunctionData.h"
+#include "plugin/HookData.h"
+#include "plugin/PluginConfigData.h"
 #include "plugin/PluginContainer.h"
 #include "plugin/PluginData.h"
+#include "plugin/PluginLinkInformation.h"
 #include "plugin/PluginLoadWrapper.h"
+#include "plugin/RelocationData.h"
+#include "plugin/SectionInfo.h"
+
 
 StoredBuffer gStoredTVBuffer  = {};
 StoredBuffer gStoredDRCBuffer = {};

source/globals.h

@@ -2,13 +2,16 @@
 
 #include "utils/config/ConfigDefines.h"
 #include "version.h"
+
+#include <wums/defines/relocation_defines.h>
+
 #include <coreinit/dynload.h>
 #include <coreinit/thread.h>
+
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
-#include <wums/defines/relocation_defines.h>
 
 #define MODULE_VERSION      "v0.3.5"
 #define MODULE_VERSION_FULL MODULE_VERSION MODULE_VERSION_EXTRA

source/hooks.cpp

@@ -1,15 +1,20 @@
 #include "hooks.h"
+
+#include "plugin/HookData.h"
+#include "plugin/PluginConfigData.h"
 #include "plugin/PluginContainer.h"
+#include "plugin/PluginData.h"
 #include "utils/StorageUtilsDeprecated.h"
 #include "utils/buttoncombo/ButtonComboUtils.h"
 #include "utils/logger.h"
 #include "utils/storage/StorageUtils.h"
 
-#include <functional>
 #include <wups/button_combo.h>
 #include <wups/button_combo_internal.h>
 #include <wups/storage.h>
 
+#include <functional>
+
 static const char **hook_names = (const char *[]){
         "WUPS_LOADER_HOOK_INIT_WUT_MALLOC",
         "WUPS_LOADER_HOOK_FINI_WUT_MALLOC",

source/hooks.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "plugin/PluginContainer.h"
+#include <wups/hooks.h>
 
 #include <functional>
 #include <vector>
-#include <wups/hooks.h>
+
+class PluginContainer;
 
 void CallHook(const std::vector<PluginContainer> &plugins, wups_loader_hook_type_t hook_type, const std::function<bool(const PluginContainer &)> &pred);
 

source/main.cpp

@@ -1,22 +1,34 @@
 #include "PluginManagement.h"
-#include "coreinit/interrupts.h"
-#include "coreinit/scheduler.h"
 #include "globals.h"
 #include "hooks.h"
 #include "patcher/hooks_patcher_static.h"
+#include "plugin/FunctionData.h"
+#include "plugin/HookData.h"
+#include "plugin/PluginConfigData.h"
+#include "plugin/PluginContainer.h"
+#include "plugin/PluginData.h"
 #include "plugin/PluginDataFactory.h"
+#include "plugin/PluginLoadWrapper.h"
+#include "plugin/RelocationData.h"
+#include "plugin/SectionInfo.h"
 #include "utils/DrawUtils.h"
 #include "utils/WUPSBackendSettings.h"
 #include "utils/input/VPADInput.h"
 #include "utils/logger.h"
 #include "utils/utils.h"
-#include "version.h"
 
 #include <buttoncombo/manager.h>
-#include <coreinit/debug.h>
+#include <function_patcher/function_patching.h>
+#include <notifications/notification_defines.h>
 #include <notifications/notifications.h>
-#include <ranges>
-#include <wums.h>
+
+#include <wums/meta.h>
+#include <wups/hooks.h>
+
+#include <coreinit/interrupts.h>
+#include <coreinit/scheduler.h>
+
+#include <thread>
 
 WUMS_MODULE_EXPORT_NAME("homebrew_wupsbackend");
 WUMS_USE_WUT_DEVOPTAB();

source/patcher/hooks_patcher_static.cpp

@@ -1,11 +1,15 @@
 #include "hooks_patcher_static.h"
 
 #include "globals.h"
+#include "hooks.h"
+#include "plugin/PluginConfigData.h"
+#include "plugin/PluginContainer.h"
+#include "plugin/PluginData.h"
+#include "plugin/SectionInfo.h"
 #include "utils/config/ConfigUtils.h"
 
 #include <coreinit/core.h>
 #include <coreinit/messagequeue.h>
-#include <hooks.h>
 #include <padscore/wpad.h>
 #include <vpad/input.h>
 

source/patcher/hooks_patcher_static.h

@@ -2,6 +2,8 @@
 
 #include <function_patcher/function_patching.h>
 
+#include <cstdint>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

source/plugin/ButtonComboManager.cpp

@@ -1,7 +1,9 @@
 #include "ButtonComboManager.h"
+#include "utils/logger.h"
+#include "utils/utils.h"
+
 #include <buttoncombo/manager.h>
-#include <utils/logger.h>
-#include <utils/utils.h>
+
 #include <wups/button_combo_internal.h>
 
 namespace {

source/plugin/ButtonComboManager.h

@@ -1,11 +1,14 @@
 #pragma once
 
 #include <buttoncombo/defines.h>
-#include <cstdint>
+
+#include <wups/button_combo.h>
+
 #include <functional>
 #include <memory>
 #include <vector>
-#include <wups/button_combo.h>
+
+#include <cstdint>
 
 
 class ButtonComboWrapper;

source/plugin/FunctionData.cpp

@@ -2,6 +2,7 @@
 #include "utils/logger.h"
 
 #include <function_patcher/function_patching.h>
+
 #include <string>
 
 FunctionData::FunctionData(void *paddress, void *vaddress,

source/plugin/FunctionData.h

@@ -17,6 +17,7 @@
 #pragma once
 
 #include <function_patcher/fpatching_defines.h>
+
 #include <string>
 
 class FunctionData {

source/plugin/FunctionSymbolData.h

@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <cstdint>
 #include <string>
 
+#include <cstdint>
+
 class FunctionSymbolData {
 
 public:

source/plugin/PluginConfigData.cpp

@@ -1,6 +1,6 @@
 #include "PluginConfigData.h"
-
-#include <config/WUPSConfigAPI.h>
+#include "config/WUPSConfigAPI.h"
+#include "plugin/PluginData.h"
 
 PluginConfigData::PluginConfigData(const std::string_view name,
                                    const WUPSConfigAPI_MenuOpenedCallback openedCallback,

source/plugin/PluginConfigData.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <wups/config.h>
+#include <wups/config_api.h>
+
 #include <optional>
 #include <string>
-#include <wups/config.h>
-#include <wups/config_api.h>
 
 class PluginConfigData {
 public:

source/plugin/PluginContainer.cpp

@@ -1,7 +1,15 @@
 #include "PluginContainer.h"
+#include "plugin/FunctionData.h"
+#include "plugin/HookData.h"
+#include "plugin/PluginConfigData.h"
+#include "plugin/PluginData.h"
+#include "plugin/PluginLinkInformation.h"
+#include "plugin/RelocationData.h"
+#include "plugin/SectionInfo.h"
+#include "utils/buttoncombo/ButtonComboUtils.h"
 #include "utils/storage/StorageUtils.h"
 
-#include <utils/buttoncombo/ButtonComboUtils.h>
+#include <optional>
 
 PluginContainer::PluginContainer(PluginMetaInformation metaInformation, PluginLinkInformation pluginLinkInformation, std::shared_ptr<PluginData> pluginData)
     : mMetaInformation(std::move(metaInformation)),

source/plugin/PluginContainer.h

@@ -18,13 +18,15 @@
 #pragma once
 
 #include "PluginConfigData.h"
-#include "PluginData.h"
 #include "PluginLinkInformation.h"
 #include "PluginMetaInformation.h"
 
+#include <wups/storage.h>
+
 #include <memory>
 #include <optional>
-#include <wups/storage.h>
+
+class PluginData;
 
 class PluginContainer {
 public:

source/plugin/PluginData.h

@@ -17,12 +17,13 @@
 
 #pragma once
 
-#include <cstdint>
 #include <memory>
 #include <span>
 #include <string>
 #include <vector>
 
+#include <cstdint>
+
 class PluginData {
 public:
     explicit PluginData(std::vector<uint8_t> &&buffer, std::string_view source);

source/plugin/PluginDataFactory.cpp

@@ -17,6 +17,7 @@
 
 #include "PluginDataFactory.h"
 #include "NotificationsUtils.h"
+#include "PluginData.h"
 #include "PluginLoadWrapper.h"
 #include "fs/FSUtils.h"
 #include "utils/StringTools.h"
@@ -24,6 +25,7 @@
 
 #include <memory>
 #include <set>
+
 #include <sys/dirent.h>
 
 std::vector<PluginLoadWrapper> PluginDataFactory::loadDir(const std::string_view path, const std::set<std::string> &inactivePluginsFilenames) {

source/plugin/PluginDataFactory.h

@@ -16,13 +16,14 @@
  ****************************************************************************/
 
 #pragma once
-#include "PluginData.h"
-#include "PluginLoadWrapper.h"
 
 #include <memory>
 #include <set>
 #include <vector>
 
+class PluginData;
+class PluginLoadWrapper;
+
 class PluginDataFactory {
 public:
     static std::vector<PluginLoadWrapper> loadDir(std::string_view path, const std::set<std::string> &inactivePluginsFilenames);

source/plugin/PluginLinkInformation.cpp

@@ -1,5 +1,10 @@
 #include "PluginLinkInformation.h"
 
+#include "FunctionData.h"
+#include "HookData.h"
+#include "RelocationData.h"
+#include "SectionInfo.h"
+
 PluginLinkInformation::PluginLinkInformation(PluginLinkInformation &&src) : mHookDataList(std::move(src.mHookDataList)),
                                                                             mFunctionDataList(std::move(src.mFunctionDataList)),
                                                                             mRelocationDataList(std::move(src.mRelocationDataList)),
@@ -13,7 +18,7 @@ PluginLinkInformation::PluginLinkInformation(PluginLinkInformation &&src) : mHoo
     src.mTrampolineId = {};
 }
 
-PluginLinkInformation &PluginLinkInformation::operator=(PluginLinkInformation &&src) {
+PluginLinkInformation &PluginLinkInformation::operator=(PluginLinkInformation &&src) noexcept {
     if (this != &src) {
         this->mHookDataList               = std::move(src.mHookDataList);
         this->mFunctionDataList           = std::move(src.mFunctionDataList);

source/plugin/PluginLinkInformation.h

@@ -17,19 +17,20 @@
 
 #pragma once
 
-#include "FunctionData.h"
 #include "FunctionSymbolData.h"
-#include "HookData.h"
-#include "RelocationData.h"
-#include "SectionInfo.h"
 #include "utils/HeapMemoryFixedSize.h"
-#include <cstdint>
+
 #include <map>
 #include <optional>
 #include <set>
-#include <string>
 #include <vector>
 
+class HeapMemoryFixedSize;
+class SectionInfo;
+class RelocationData;
+class FunctionData;
+class HookData;
+
 struct FunctionSymbolDataComparator {
     bool operator()(const FunctionSymbolData &lhs,
                     const FunctionSymbolData &rhs) const {
@@ -45,7 +46,7 @@ public:
 
     PluginLinkInformation(PluginLinkInformation &&src) noexcept;
 
-    PluginLinkInformation &operator=(PluginLinkInformation &&src);
+    PluginLinkInformation &operator=(PluginLinkInformation &&src) noexcept;
 
     [[nodiscard]] const std::vector<HookData> &getHookDataList() const;
 

source/plugin/PluginLinkInformationFactory.cpp

@@ -16,14 +16,23 @@
  ****************************************************************************/
 
 #include "PluginLinkInformationFactory.h"
+
+#include "FunctionData.h"
+#include "HookData.h"
+#include "PluginData.h"
+#include "PluginLinkInformation.h"
+#include "RelocationData.h"
+#include "SectionInfo.h"
 #include "utils/ElfUtils.h"
+#include "utils/HeapMemoryFixedSize.h"
 #include "utils/logger.h"
 #include "utils/utils.h"
 #include "utils/wiiu_zlib.hpp"
 
-#include <coreinit/cache.h>
 #include <wups/function_patching.h>
 
+#include <coreinit/cache.h>
+
 using namespace ELFIO;
 
 std::optional<PluginLinkInformation>

source/plugin/PluginLinkInformationFactory.h

@@ -16,12 +16,16 @@
  ****************************************************************************/
 
 #pragma once
-#include "PluginData.h"
-#include "PluginLinkInformation.h"
+
+#include <wums/defines/relocation_defines.h>
 
 #include <elfio/elfio.hpp>
+
 #include <optional>
-#include <wums/defines/relocation_defines.h>
+#include <span>
+
+class PluginData;
+class PluginLinkInformation;
 
 class PluginLinkInformationFactory {
 public:

source/plugin/PluginLoadWrapper.h

@@ -1,7 +1,9 @@
 #pragma once
-#include "PluginData.h"
+
 #include <memory>
 
+class PluginData;
+
 class PluginLoadWrapper {
 public:
     PluginLoadWrapper(std::shared_ptr<PluginData> pluginData, const bool linkAndLoad) : mPluginData(std::move(pluginData)), mIsLoadAndLink(linkAndLoad) {

source/plugin/PluginMetaInformation.cpp

@@ -1,5 +1,7 @@
 #include "PluginMetaInformation.h"
 
+#include <cstdint>
+
 [[nodiscard]] const std::string &PluginMetaInformation::getName() const {
     return mName;
 }

source/plugin/PluginMetaInformation.h

@@ -18,8 +18,13 @@
 #pragma once
 
 #include "WUPSVersion.h"
+
 #include <string>
 
+#include <cstdint>
+
+class WUPSVersion;
+
 class PluginMetaInformation {
 public:
     [[nodiscard]] const std::string &getName() const;

source/plugin/PluginMetaInformationFactory.cpp

@@ -19,11 +19,11 @@
 
 #include "PluginData.h"
 #include "PluginMetaInformation.h"
+#include "elfio/elfio.hpp"
 #include "fs/FSUtils.h"
 #include "utils/logger.h"
 #include "utils/wiiu_zlib.hpp"
 
-#include <elfio/elfio.hpp>
 #include <optional>
 
 std::optional<PluginMetaInformation> PluginMetaInformationFactory::loadPlugin(const PluginData &pluginData, PluginParseErrors &error) {

source/plugin/PluginMetaInformationFactory.h

@@ -17,13 +17,15 @@
 
 #pragma once
 
-#include "PluginData.h"
-#include "PluginMetaInformation.h"
-
 #include <optional>
 #include <span>
 #include <string_view>
 
+#include <cstdint>
+
+class PluginData;
+class PluginMetaInformation;
+
 enum PluginParseErrors {
     PLUGIN_PARSE_ERROR_NONE,
     PLUGIN_PARSE_ERROR_UNKNOWN,

source/plugin/RelocationData.h

@@ -18,10 +18,12 @@
 #pragma once
 
 #include "ImportRPLInformation.h"
-#include <cstdint>
+
 #include <memory>
 #include <string>
 
+#include <cstdint>
+
 class RelocationData {
 
 public:

source/plugin/SectionInfo.h

@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <cstdint>
 #include <string>
 
+#include <cstdint>
+
 class SectionInfo {
 
 public:

source/plugin/WUPSVersion.h

@@ -1,7 +1,10 @@
-#include <cstdint>
+#pragma once
+
 #include <optional>
 #include <string>
 
+#include <cstdint>
+
 class WUPSVersion {
 public:
     WUPSVersion(int major, int minor, int revision);

source/utils/DrawUtils.cpp

@@ -4,14 +4,18 @@
 #include "globals.h"
 #include "logger.h"
 #include "utils.h"
+
+#include <png.h>
+
+#include <memory/mappedmemory.h>
+
 #include <avm/tv.h>
 #include <coreinit/cache.h>
 #include <coreinit/memory.h>
 #include <coreinit/screen.h>
-#include <cstdlib>
-#include <memory/mappedmemory.h>
 #include <padscore/kpad.h>
-#include <png.h>
+
+#include <cstdlib>
 
 // buffer width
 #define DRC_WIDTH 0x380

source/utils/DrawUtils.h

@@ -1,9 +1,11 @@
 #pragma once
 
 #include "schrift.h"
-#include <cstdint>
+
 #include <functional>
 
+#include <cstdint>
+
 // visible screen sizes
 #define SCREEN_WIDTH             854
 #define SCREEN_HEIGHT            480

source/utils/ElfUtils.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <cstdint>
 #include <wums/defines/relocation_defines.h>
 
+#include <cstdint>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

source/utils/HeapMemoryFixedSize.cpp

@@ -1,4 +1,5 @@
 #include "HeapMemoryFixedSize.h"
+
 #include "utils.h"
 
 HeapMemoryFixedSize::HeapMemoryFixedSize() = default;

source/utils/HeapMemoryFixedSize.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <cstdint>
 #include <memory>
 
+#include <cstdint>
+
 class HeapMemoryFixedSize {
 public:
     HeapMemoryFixedSize();

source/utils/StorageUtilsDeprecated.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <cstdint>
 
 namespace WUPSStorageDeprecated {

source/utils/StringTools.cpp

@@ -25,9 +25,10 @@
 ***************************************************************************/
 
 #include "StringTools.h"
-#include <cstring>
+
 #include <string>
-#include <strings.h>
+
+#include <cstring>
 
 std::string StringTools::truncate(const std::string &str, const size_t width, const bool show_ellipsis) {
     if (str.length() > width - 3) {

source/utils/StringTools.h

@@ -27,7 +27,9 @@
 
 #include "logger.h"
 #include "utils.h"
+
 #include <coreinit/debug.h>
+
 #include <memory>
 #include <string>
 

source/utils/WUPSBackendSettings.cpp

@@ -1,9 +1,10 @@
 #include "WUPSBackendSettings.h"
+
 #include "fs/CFile.hpp"
 #include "fs/FSUtils.h"
 #include "utils/logger.h"
 #include "utils/utils.h"
-#include <span>
+
 #include <string>
 #include <vector>
 

source/utils/WUPSBackendSettings.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <set>
-#include <span>
 #include <string>
 
 namespace WUPSBackendSettings {

source/utils/buttoncombo/ButtonComboUtils.cpp

@@ -1,11 +1,12 @@
 #include "ButtonComboUtils.h"
 
+#include "plugin/ButtonComboManager.h"
+#include "plugin/PluginContainer.h"
+#include "utils/logger.h"
+#include "utils/utils.h"
+
 #include <forward_list>
 #include <mutex>
-#include <plugin/ButtonComboManager.h>
-#include <plugin/PluginContainer.h>
-#include <utils/logger.h>
-#include <utils/utils.h>
 
 namespace ButtonComboUtils::API {
     static std::forward_list<ButtonComboManager> sButtonComboManager;
@@ -118,7 +119,7 @@ namespace ButtonComboUtils::API {
 
     WUPSButtonCombo_Error UpdateButtonCombo(void *identifier,
                                             const WUPSButtonCombo_ComboHandle handle,
-                                            WUPSButtonCombo_Buttons combo,
+                                            const WUPSButtonCombo_Buttons combo,
                                             WUPSButtonCombo_ComboStatus *outStatus) {
         WUPSButtonCombo_ComboStatus tmpStatus;
         const auto res = ExecuteForIdentifierLocked(identifier,

source/utils/buttoncombo/ButtonComboUtils.h

@@ -2,6 +2,8 @@
 
 #include <wups/button_combo.h>
 
+#include <cstdint>
+
 namespace ButtonComboUtils::API {
     namespace Internal {
         uint32_t CreateButtonComboData();

source/utils/config/CategoryRenderer.cpp

@@ -1,11 +1,21 @@
 #include "CategoryRenderer.h"
+
+#include "ConfigDefines.h"
 #include "ConfigRendererItem.h"
 #include "ConfigRendererItemCategory.h"
+#include "ConfigRendererItemGeneric.h"
 #include "ConfigUtils.h"
 #include "utils/DrawUtils.h"
 #include "utils/StringTools.h"
+#include "utils/input/Input.h"
 #include "utils/logger.h"
-#include "utils/utils.h"
+
+#include <wups/config.h>
+
+#include <algorithm>
+
+#include <cassert>
+#include <cstdint>
 
 CategoryRenderer::CategoryRenderer(const GeneralConfigInformation *info, const WUPSConfigAPIBackend::WUPSConfigCategory *cat, const bool isRoot)
     : mInfo(info), mCat(cat), mIsRoot(isRoot) {

source/utils/config/CategoryRenderer.h

@@ -2,14 +2,21 @@
 
 #include "ConfigDefines.h"
 #include "ConfigDisplayItem.h"
-#include "ConfigRendererItemGeneric.h"
-#include "config/WUPSConfigCategory.h"
-#include "utils/input/Input.h"
 
-#include <cstdint>
+#include <wups/config.h>
+
 #include <memory>
 #include <vector>
 
+#include <cstdint>
+
+namespace WUPSConfigAPIBackend {
+    class WUPSConfigCategory;
+}
+
+class Input;
+class ConfigRendererItemGeneric;
+
 class CategoryRenderer {
 
 public:
@@ -45,9 +52,9 @@ private:
     const GeneralConfigInformation *mInfo                  = {};
     const WUPSConfigAPIBackend::WUPSConfigCategory *mCat   = {};
 
-    std::vector<std::unique_ptr<ConfigRendererItemGeneric>> mItemRenderer = {};
-    bool mIsItemMovementAllowed                                           = true;
-    bool mFirstFrame                                                      = true;
-    bool mIsRoot                                                          = false;
-    bool mNeedsRedraw                                                     = true;
+    std::vector<std::unique_ptr<ConfigRendererItemGeneric>> mItemRenderer;
+    bool mIsItemMovementAllowed = true;
+    bool mFirstFrame            = true;
+    bool mIsRoot                = false;
+    bool mNeedsRedraw           = true;
 };

source/utils/config/ConfigDefines.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <cstdint>
 #include <gx2/surface.h>
 
+#include <cstdint>
+
 #define MAX_BUTTONS_ON_SCREEN 8
 
 struct StoredBuffer {

source/utils/config/ConfigDisplayItem.cpp

@@ -1,6 +1,11 @@
 #include "ConfigDisplayItem.h"
+
 #include "config/WUPSConfig.h"
 
+#include <memory>
+
+#include <cassert>
+
 ConfigDisplayItem::ConfigDisplayItem(GeneralConfigInformation &info,
                                      std::unique_ptr<WUPSConfigAPIBackend::WUPSConfig> config,
                                      const bool isActive) : mConfig(std::move(config)),

source/utils/config/ConfigDisplayItem.h

@@ -2,6 +2,7 @@
 
 #include "config/WUPSConfig.h"
 #include "plugin/PluginData.h"
+
 #include <memory>
 #include <string>
 

source/utils/config/ConfigRenderer.cpp

@@ -1,19 +1,25 @@
 #include "ConfigRenderer.h"
+
+#include "CategoryRenderer.h"
+#include "ConfigDisplayItem.h"
+#include "config/WUPSConfigItem.h"
 #include "globals.h"
 #include "plugin/PluginLoadWrapper.h"
 #include "utils/DrawUtils.h"
 #include "utils/StringTools.h"
+#include "utils/input/Input.h"
 #include "utils/logger.h"
-#include "utils/utils.h"
+
+#include <algorithm>
 
 ConfigRenderer::ConfigRenderer(std::vector<ConfigDisplayItem> &&vec) : mConfigs(std::move(vec)) {
-    std::copy(mConfigs.begin(), mConfigs.end(),
-              std::back_inserter(mAllConfigs));
-    std::copy_if(mConfigs.begin(), mConfigs.end(),
-                 std::back_inserter(mActiveConfigs),
-                 [&](const auto &value) {
-                     return value.isActivePlugin();
-                 });
+    std::ranges::copy(mConfigs,
+                      std::back_inserter(mAllConfigs));
+    std::ranges::copy_if(mConfigs,
+                         std::back_inserter(mActiveConfigs),
+                         [&](const auto &value) {
+                             return value.isActivePlugin();
+                         });
 }
 
 ConfigRenderer::~ConfigRenderer() = default;
@@ -205,7 +211,7 @@ void ConfigRenderer::RenderStateMain() const {
         auto countInactivePlugins = mAllConfigs.size() - mActiveConfigs.size();
         if (countInactivePlugins > 0) {
             DrawUtils::setFontSize(14);
-            std::string plugin_unloaded = string_format("Found %d inactive plugins", countInactivePlugins);
+            const std::string plugin_unloaded = string_format("Found %d inactive plugins", countInactivePlugins);
             DrawUtils::print(SCREEN_WIDTH - 16 - DrawUtils::getTextWidth(MODULE_VERSION_FULL) - 32, 8 + 24, plugin_unloaded.c_str(), true);
         }
     }

source/utils/config/ConfigRenderer.h

@@ -1,17 +1,23 @@
 #pragma once
 
-#include "CategoryRenderer.h"
 #include "ConfigDefines.h"
 #include "ConfigDisplayItem.h"
-#include "plugin/PluginLoadWrapper.h"
-#include "utils/input/Input.h"
 
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <vector>
 #include <wups/config.h>
 
+#include <memory>
+#include <vector>
+
+#include <cstdint>
+
+namespace WUPSConfigAPIBackend {
+    class WUPSConfig;
+    class WUPSConfigCategory;
+} // namespace WUPSConfigAPIBackend
+class PluginLoadWrapper;
+class Input;
+class CategoryRenderer;
+class ConfigDisplayItem;
 class ConfigRenderer {
 
 public:
@@ -39,7 +45,7 @@ private:
     void CallOnCloseCallback(const GeneralConfigInformation &info, const std::vector<std::unique_ptr<WUPSConfigAPIBackend::WUPSConfigCategory>> &categories);
     void CallOnCloseCallback(const GeneralConfigInformation &info, const WUPSConfigAPIBackend::WUPSConfig &config);
 
-    const std::vector<std::reference_wrapper<ConfigDisplayItem>> &GetConfigList() const;
+    [[nodiscard]] const std::vector<std::reference_wrapper<ConfigDisplayItem>> &GetConfigList() const;
 
     enum State {
         STATE_MAIN = 0,
@@ -49,7 +55,7 @@ private:
     std::vector<ConfigDisplayItem> mConfigs;
     std::vector<std::reference_wrapper<ConfigDisplayItem>> mAllConfigs;
     std::vector<std::reference_wrapper<ConfigDisplayItem>> mActiveConfigs;
-    std::unique_ptr<CategoryRenderer> mCategoryRenderer = {};
+    std::unique_ptr<CategoryRenderer> mCategoryRenderer;
 
     State mState = STATE_MAIN;
 

source/utils/config/ConfigRendererItem.cpp

@@ -1,5 +1,8 @@
 #include "ConfigRendererItem.h"
+
 #include "utils/DrawUtils.h"
+#include <config/WUPSConfigItem.h>
+
 #include <cassert>
 
 ConfigRendererItem::ConfigRendererItem(const WUPSConfigAPIBackend::WUPSConfigItem *item) : mItem(item) {

source/utils/config/ConfigRendererItem.h

@@ -1,11 +1,14 @@
 #pragma once
 
 #include "ConfigRendererItemGeneric.h"
-#include "config/WUPSConfigItem.h"
+
+#include <string>
 
 #include <cstdint>
-#include <string>
-#include <wups/config.h>
+
+namespace WUPSConfigAPIBackend {
+    class WUPSConfigItem;
+}
 
 class ConfigRendererItem final : public ConfigRendererItemGeneric {
 public:

source/utils/config/ConfigRendererItemCategory.h

@@ -1,6 +1,8 @@
 #pragma once
-#include "ConfigRendererItemGeneric.h"
-#include "config/WUPSConfigCategory.h"
+
+//#include "ConfigRendererItemGeneric.h"
+//#include "config/WUPSConfigCategory.h"
+
 #include <cassert>
 
 class ConfigRendererItemCategory final : public ConfigRendererItemGeneric {

source/utils/config/ConfigRendererItemGeneric.cpp

@@ -1,8 +1,10 @@
 #include "ConfigRendererItemGeneric.h"
 
-#include "ConfigDefines.h"
 #include "utils/DrawUtils.h"
 
+#include <string>
+#include <wups/config.h>
+
 ConfigRendererItemGeneric::~ConfigRendererItemGeneric() = default;
 
 void ConfigRendererItemGeneric::drawGenericBoxAndText(const uint32_t yOffset, const std::string &displayName, const bool isHighlighted) const {

source/utils/config/ConfigRendererItemGeneric.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <cstdint>
-#include <string>
 #include <wups/config.h>
 
+#include <string>
+
+#include <cstdint>
+
 class ConfigRendererItemGeneric {
 public:
     virtual ~ConfigRendererItemGeneric();

source/utils/config/ConfigUtils.cpp

@@ -1,26 +1,31 @@
 #include "ConfigUtils.h"
+
+#include "ConfigDisplayItem.h"
 #include "ConfigRenderer.h"
 #include "config/WUPSConfigAPI.h"
+#include "globals.h"
 #include "hooks.h"
+#include "plugin/HookData.h"
+#include "plugin/PluginContainer.h"
 #include "plugin/PluginLoadWrapper.h"
 #include "utils/DrawUtils.h"
 #include "utils/WUPSBackendSettings.h"
-#include "utils/dc.h"
 #include "utils/input/CombinedInput.h"
 #include "utils/input/Input.h"
 #include "utils/input/VPADInput.h"
 #include "utils/input/WPADInput.h"
 #include "utils/logger.h"
 #include "utils/utils.h"
-#include "version.h"
 
-#include <algorithm>
-#include <coreinit/title.h>
-#include <globals.h>
-#include <memory>
-#include <sysapp/launch.h>
-#include <vector>
 #include <wups/config.h>
+#include <wups/hooks.h>
+
+#include <coreinit/title.h>
+#include <sysapp/launch.h>
+
+#include <bits/ranges_algo.h>
+#include <memory>
+#include <vector>
 
 WUPS_CONFIG_SIMPLE_INPUT ConfigUtils::convertInputs(const uint32_t buttons) {
     WUPSConfigButtons pressedButtons = WUPS_CONFIG_BUTTON_NONE;

source/utils/config/ConfigUtils.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <cstdint>
-#include <string_view>
 #include <wups/config.h>
 
+#include <string_view>
+
+#include <cstdint>
+
 #define MOVE_ITEM_INPUT_MASK (WUPS_CONFIG_BUTTON_B | WUPS_CONFIG_BUTTON_DOWN | WUPS_CONFIG_BUTTON_UP)
 
 class ConfigUtils {

source/utils/exports.cpp

@@ -3,14 +3,17 @@
 #include "plugin/PluginContainer.h"
 #include "plugin/PluginData.h"
 #include "plugin/PluginDataFactory.h"
+#include "plugin/PluginLoadWrapper.h"
 #include "plugin/PluginMetaInformation.h"
 #include "plugin/PluginMetaInformationFactory.h"
+#include "plugin/SectionInfo.h"
 #include "utils.h"
 
-#include <ranges>
 #include <wums.h>
 #include <wups_backend/import_defines.h>
 
+#include <ranges>
+
 static void fillPluginInformation(wups_backend_plugin_information *out, const PluginMetaInformation &metaInformation) {
     out->plugin_information_version = WUPS_BACKEND_PLUGIN_INFORMATION_VERSION;
     strncpy(out->author, metaInformation.getAuthor().c_str(), sizeof(out->author) - 1);

source/utils/input/CombinedInput.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "Input.h"
+
 class CombinedInput final : public Input {
 public:
     void combine(const Input &b) {

source/utils/input/WPADInput.h

@@ -17,6 +17,7 @@
  ****************************************************************************/
 
 #include "Input.h"
+
 #include <padscore/kpad.h>
 #include <padscore/wpad.h>
 

source/utils/storage/StorageItem.h

@@ -1,10 +1,11 @@
 #pragma once
-#include <cstdint>
+
 #include <memory>
 #include <string>
 #include <variant>
 #include <vector>
 
+#include <cstdint>
 
 enum class StorageItemType { None,
                              Boolean,

source/utils/storage/StorageItemRoot.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "StorageSubItem.h"
+
 #include <string>
 
 class StorageItemRoot : public StorageSubItem {

source/utils/storage/StorageSubItem.cpp

@@ -1,6 +1,6 @@
 #include "StorageSubItem.h"
 
-#include <utils/utils.h>
+#include "utils/utils.h"
 
 StorageSubItem::StorageSubItem(const std::string_view key) : StorageItem(key) {
 }

source/utils/storage/StorageSubItem.h

@@ -2,10 +2,11 @@
 
 #include "StorageItem.h"
 
+#include <wups/storage.h>
+
 #include <forward_list>
 #include <map>
 #include <string>
-#include <wups/storage.h>
 
 class StorageSubItem : public StorageItem {
 public:

source/utils/storage/StorageUtils.cpp

@@ -1,6 +1,6 @@
-#include "StorageItem.h"
+#include "StorageUtils.h"
+
 #include "StorageItemRoot.h"
-#include "StorageSubItem.h"
 #include "fs/CFile.hpp"
 #include "fs/FSUtils.h"
 #include "utils/base64.h"
@@ -9,9 +9,9 @@
 #include "utils/utils.h"
 
 #include <forward_list>
-#include <malloc.h>
 #include <mutex>
-#include <wups/storage.h>
+
+#include <cstring>
 
 namespace StorageUtils {
     std::forward_list<StorageItemRoot> gStorage;

source/utils/storage/StorageUtils.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <cstdint>
-#include <string_view>
 #include <wups/storage.h>
 
+#include <string_view>
+
+#include <cstdint>
+
 namespace StorageUtils::API {
     namespace Internal {
         WUPSStorageError OpenStorage(std::string_view plugin_id, wups_storage_root_item &outItem);

source/utils/utils.cpp

@@ -6,13 +6,16 @@
 #include "json.hpp"
 #include "logger.h"
 
-#include <algorithm>
 #include <coreinit/ios.h>
-#include <malloc.h>
-#include <string>
-#include <sys/dirent.h>
+
 #include <wups/storage.h>
 
+#include <algorithm>
+#include <string>
+
+#include <malloc.h>
+#include <sys/dirent.h>
+
 static std::string sPluginPath;
 static std::string sModulePath;
 static std::string sEnvironmentPath;

source/utils/utils.h

@@ -1,15 +1,18 @@
 #pragma once
 
 #include "json.hpp"
-#include <algorithm>
+
 #include <coreinit/dynload.h>
-#include <cstdint>
+
+#include <algorithm>
 #include <forward_list>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <vector>
 
+#include <cstdint>
+
 #ifdef __cplusplus
 extern "C" {
 #endif