From 8da7a86b961dd3e6a8c49c0c379eaa5d9c0b6e51 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sat, 2 Nov 2024 16:22:54 -0500
Subject: [PATCH 1/2] Config/IsSettingSaveable: Use class template argument
 deduction.

---
 Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
index fd47ede19e..9652dd281a 100644
--- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
+++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
@@ -17,8 +17,8 @@ namespace ConfigLoaders
 {
 bool IsSettingSaveable(const Config::Location& config_location)
 {
-  static constexpr std::array<Config::System, 3> systems_not_saveable = {
-      Config::System::GCPad, Config::System::WiiPad, Config::System::GCKeyboard};
+  static constexpr std::array systems_not_saveable = {Config::System::GCPad, Config::System::WiiPad,
+                                                      Config::System::GCKeyboard};
 
   if (std::find(begin(systems_not_saveable), end(systems_not_saveable), config_location.system) ==
       end(systems_not_saveable))

From 0fd5e86677bf735f86a4dda4a3d89b72dd681255 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sat, 2 Nov 2024 16:23:49 -0500
Subject: [PATCH 2/2] Config/IsSettingSaveable: Remove unused includes.

---
 Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
index 9652dd281a..4e4b698851 100644
--- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
+++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
@@ -6,11 +6,6 @@
 #include <algorithm>
 #include <array>
 
-#include "Common/Config/Config.h"
-#include "Core/Config/AchievementSettings.h"
-#include "Core/Config/GraphicsSettings.h"
-#include "Core/Config/MainSettings.h"
-#include "Core/Config/UISettings.h"
 #include "Core/Config/WiimoteSettings.h"
 
 namespace ConfigLoaders