diff --git a/Source/Core/Core/IOS/Network/KD/Mail/MailCommon.h b/Source/Core/Core/IOS/Network/KD/Mail/MailCommon.h
index 6919c9cfec..b92e1394f0 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/MailCommon.h
+++ b/Source/Core/Core/IOS/Network/KD/Mail/MailCommon.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
+#include "Common/Swap.h"
 
 #include <array>
 
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.cpp b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.cpp
index 17b08bf64a..6c6b7852f8 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.cpp
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.cpp
@@ -2,6 +2,16 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Core/IOS/Network/KD/Mail/WC24FriendList.h"
+
+#include <algorithm>
+#include <memory>
+#include <string_view>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+#include "Common/Swap.h"
+
 #include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/Uids.h"
 
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
index 5c8ec241cf..ee3fe047fc 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
@@ -5,7 +5,7 @@
 
 #include <array>
 #include <memory>
-#include <string>
+#include <string_view>
 #include <vector>
 
 #include "Common/CommonPaths.h"
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.cpp b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.cpp
index 76b3fa639d..687036e164 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.cpp
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.cpp
@@ -2,13 +2,26 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Core/IOS/Network/KD/Mail/WC24Send.h"
+
+#include <algorithm>
+#include <cstring>
+#include <ctime>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <fmt/chrono.h>
+
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+#include "Common/Swap.h"
+
 #include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/Network/KD/VFF/VFFUtil.h"
 #include "Core/IOS/Uids.h"
 
-#include <fmt/chrono.h>
-#include "Common/Assert.h"
-
 namespace IOS::HLE::NWC24::Mail
 {
 constexpr const char SEND_LIST_PATH[] = "/" WII_WC24CONF_DIR "/mbox"
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
index 056372d147..d839b2b102 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
@@ -3,7 +3,10 @@
 
 #pragma once
 
+#include <array>
+#include <memory>
 #include <optional>
+#include <string>
 #include <string_view>
 #include <vector>