From ed8e2d143a0fbc81df79cfb6062ac25a7f8e7bbe Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Wed, 1 Jan 2025 16:05:37 +0100
Subject: [PATCH] Clean up header

---
 src/Hints.cpp               | 14 +++++++++++---
 src/UpdaterCheck.cpp        | 25 +++++++++++++++----------
 src/main.cpp                | 12 ++++++++----
 src/utils/DownloadUtils.cpp |  4 +++-
 src/utils/DownloadUtils.h   |  3 +++
 src/utils/config.cpp        |  6 ++++++
 src/utils/config.h          |  6 +++---
 src/utils/input.cpp         |  3 +++
 src/utils/input.h           |  2 --
 src/utils/utils.cpp         |  6 +++++-
 src/utils/utils.h           |  3 ++-
 11 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/Hints.cpp b/src/Hints.cpp
index 4641d9c..85e333f 100644
--- a/src/Hints.cpp
+++ b/src/Hints.cpp
@@ -1,13 +1,21 @@
 #include "Hints.h"
+
 #include "utils/config.h"
-#include <coreinit/cache.h>
-#include <coreinit/thread.h>
+#include "utils/logger.h"
+
 #include <notifications/notification_defines.h>
 #include <notifications/notifications.h>
 #include <sdutils/sdutils.h>
+
+#include <wups/storage.h>
+
+#include <coreinit/cache.h>
+#include <coreinit/thread.h>
+
+#include <thread>
+
 #include <sys/fcntl.h>
 #include <sys/unistd.h>
-#include <thread>
 
 std::unique_ptr<std::thread> sShowHintThread;
 static bool sShutdownHintThread = false;
diff --git a/src/UpdaterCheck.cpp b/src/UpdaterCheck.cpp
index 1ae3dda..1bbf871 100644
--- a/src/UpdaterCheck.cpp
+++ b/src/UpdaterCheck.cpp
@@ -3,20 +3,25 @@
 #include "utils/LatestVersion.h"
 #include "utils/config.h"
 #include "utils/input.h"
+#include "utils/logger.h"
+
+#include <notifications/notifications.h>
+#include <rpxloader/rpxloader.h>
+
+#include <wups/function_patching.h>
+#include <wups/storage.h>
+
 #include <coreinit/cache.h>
 #include <coreinit/thread.h>
 #include <coreinit/time.h>
-#include <memory>
-#include <notifications/notifications.h>
 #include <padscore/wpad.h>
-#include <rpxloader/rpxloader.h>
-#include <string>
-#include <sys/stat.h>
-#include <thread>
-#include <utils/logger.h>
 #include <vpad/input.h>
-#include <wups/function_patching.h>
-#include <wups/storage.h>
+
+#include <memory>
+#include <string>
+#include <thread>
+
+#include <sys/stat.h>
 
 static std::string sAromaUpdaterPath               = AROMA_UPDATER_NEW_PATH_FULL;
 static NotificationModuleHandle sAromaUpdateHandle = 0;
@@ -110,7 +115,7 @@ void UpdateCheckThreadEntry() {
 }
 
 void ShowUpdateNotification() {
-    struct stat st{};
+    struct stat st {};
     // Check if the Aroma Updater is on the sd card
     if (stat(AROMA_UPDATER_OLD_PATH_FULL, &st) >= 0 && S_ISREG(st.st_mode)) {
         sAromaUpdaterPath = AROMA_UPDATER_OLD_PATH;
diff --git a/src/main.cpp b/src/main.cpp
index 622087a..9cad40d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,16 +5,20 @@
 #include "utils/LatestVersion.h"
 #include "utils/config.h"
 #include "utils/utils.h"
-#include <coreinit/title.h>
-#include <malloc.h>
+#include <utils/logger.h>
+
 #include <mocha/mocha.h>
-#include <nn/spm.h>
 #include <notifications/notifications.h>
 #include <rpxloader/rpxloader.h>
 #include <sdutils/sdutils.h>
-#include <utils/logger.h>
+
 #include <wups.h>
 
+#include <coreinit/title.h>
+#include <nn/spm.h>
+
+#include <malloc.h>
+
 WUPS_PLUGIN_NAME("Aroma Base Plugin");
 WUPS_PLUGIN_DESCRIPTION("Implements small patches and checks for Aroma updates.");
 WUPS_PLUGIN_VERSION(PLUGIN_VERSION_FULL);
diff --git a/src/utils/DownloadUtils.cpp b/src/utils/DownloadUtils.cpp
index 20fa930..990b1fd 100644
--- a/src/utils/DownloadUtils.cpp
+++ b/src/utils/DownloadUtils.cpp
@@ -1,8 +1,10 @@
 #include "DownloadUtils.h"
 #include "logger.h"
-#include <coreinit/cache.h>
+
 #include <curl/curl.h>
 
+#include <coreinit/cache.h>
+
 #define IO_BUFSIZE (128 * 1024) // 128 KB
 
 bool DownloadUtils::libInitDone = false;
diff --git a/src/utils/DownloadUtils.h b/src/utils/DownloadUtils.h
index d143344..9de0095 100644
--- a/src/utils/DownloadUtils.h
+++ b/src/utils/DownloadUtils.h
@@ -1,6 +1,9 @@
 #pragma once
+
 #include <string>
 
+#include <cstdint>
+
 class DownloadUtils {
 public:
     static bool Init();
diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index 9b1befc..82d30fc 100644
--- a/src/utils/config.cpp
+++ b/src/utils/config.cpp
@@ -1,5 +1,11 @@
 #include "config.h"
 
+#include "logger.h"
+
+#include <wups/config/WUPSConfigCategory.h>
+#include <wups/config/WUPSConfigItemBoolean.h>
+#include <wups/storage.h>
+
 bool gActivateUStealth          = ACTIVATE_USTEALTH_DEFAULT;
 bool gSkip4SecondOffStatusCheck = SKIP_4_SECOND_OFF_STATUS_CHECK_DEFAULT;
 bool gConfigMenuHintShown       = CONFIG_MENU_HINT_SHOWN_DEFAULT;
diff --git a/src/utils/config.h b/src/utils/config.h
index 42b58b1..4f0b440 100644
--- a/src/utils/config.h
+++ b/src/utils/config.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "logger.h"
+
 #include <string>
-#include <wups/config/WUPSConfigItemBoolean.h>
-#include <wups/storage.h>
+
+#include <cstdint>
 
 #define CAT_CONFIG                             "config"
 #define CAT_OTHER                              "other"
diff --git a/src/utils/input.cpp b/src/utils/input.cpp
index 48dd607..2eb4a56 100644
--- a/src/utils/input.cpp
+++ b/src/utils/input.cpp
@@ -1,5 +1,8 @@
 #include "input.h"
 
+#include <padscore/wpad.h>
+#include <vpad/input.h>
+
 uint32_t remapWiiMoteButtons(uint32_t buttons) {
     uint32_t conv_buttons = 0;
 
diff --git a/src/utils/input.h b/src/utils/input.h
index 59413b4..d20d8b9 100644
--- a/src/utils/input.h
+++ b/src/utils/input.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <padscore/kpad.h>
-#include <vpad/input.h>
 
 uint32_t remapWiiMoteButtons(uint32_t buttons);
 uint32_t remapClassicButtons(uint32_t buttons);
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 199692c..935ef32 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -2,9 +2,13 @@
 #include "FSUtils.h"
 #include "common.h"
 #include "logger.h"
-#include <coreinit/mcp.h>
+
 #include <mocha/mocha.h>
+
+#include <coreinit/mcp.h>
+
 #include <string>
+
 #include <sys/stat.h>
 
 bool Utils::GetSerialId(std::string &serialID) {
diff --git a/src/utils/utils.h b/src/utils/utils.h
index 1095a29..2e3892c 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <cstdint>
 #include <memory>
 #include <string>
 
+#include <cstdio>
+
 namespace Utils {
     bool GetSerialId(std::string &serialID);