diff --git a/src/core/analog_joystick.cpp b/src/core/analog_joystick.cpp
index a4ea53dce..204af5af7 100644
--- a/src/core/analog_joystick.cpp
+++ b/src/core/analog_joystick.cpp
@@ -10,6 +10,7 @@
 
 #include "common/bitutils.h"
 #include "common/log.h"
+#include "common/settings_interface.h"
 #include "common/string_util.h"
 
 #include "IconsFontAwesome5.h"
@@ -340,14 +341,14 @@ std::unique_ptr<AnalogJoystick> AnalogJoystick::Create(u32 index)
 
 static const Controller::ControllerBindingInfo s_binding_info[] = {
 #define BUTTON(name, display_name, icon_name, button, genb)                                                            \
-  {                                                                                                                    \
-    name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb                      \
-  }
+  {name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb}
 #define AXIS(name, display_name, icon_name, halfaxis, genb)                                                            \
-  {                                                                                                                    \
-    name, display_name, icon_name, static_cast<u32>(AnalogJoystick::Button::Count) + static_cast<u32>(halfaxis),       \
-      InputBindingInfo::Type::HalfAxis, genb                                                                           \
-  }
+  {name,                                                                                                               \
+   display_name,                                                                                                       \
+   icon_name,                                                                                                          \
+   static_cast<u32>(AnalogJoystick::Button::Count) + static_cast<u32>(halfaxis),                                       \
+   InputBindingInfo::Type::HalfAxis,                                                                                   \
+   genb}
 
   // clang-format off
   BUTTON("Up", TRANSLATE_NOOP("AnalogJoystick", "D-Pad Up"), ICON_PF_DPAD_UP, AnalogJoystick::Button::Up, GenericInputBinding::DPadUp),
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index 1471a6fe3..5375e7408 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -17,6 +17,7 @@
 #include "common/file_system.h"
 #include "common/log.h"
 #include "common/path.h"
+#include "common/settings_interface.h"
 #include "common/small_string.h"
 #include "common/string_util.h"
 #include "common/zip_helpers.h"
diff --git a/src/core/cpu_recompiler_x64.cpp b/src/core/cpu_recompiler_x64.cpp
index 696a214aa..1d3495640 100644
--- a/src/core/cpu_recompiler_x64.cpp
+++ b/src/core/cpu_recompiler_x64.cpp
@@ -12,6 +12,7 @@
 #include "common/align.h"
 #include "common/assert.h"
 #include "common/log.h"
+#include "common/small_string.h"
 #include "common/string_util.h"
 
 #include <limits>
diff --git a/src/core/negcon.cpp b/src/core/negcon.cpp
index f4f89dcee..544c8d923 100644
--- a/src/core/negcon.cpp
+++ b/src/core/negcon.cpp
@@ -10,6 +10,7 @@
 #include "common/assert.h"
 #include "common/bitutils.h"
 #include "common/log.h"
+#include "common/settings_interface.h"
 
 #include "IconsPromptFont.h"
 
@@ -261,14 +262,14 @@ std::unique_ptr<NeGcon> NeGcon::Create(u32 index)
 
 static const Controller::ControllerBindingInfo s_binding_info[] = {
 #define BUTTON(name, display_name, icon_name, button, genb)                                                            \
-  {                                                                                                                    \
-    name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb                      \
-  }
+  {name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb}
 #define AXIS(name, display_name, icon_name, halfaxis, genb)                                                            \
-  {                                                                                                                    \
-    name, display_name, icon_name, static_cast<u32>(NeGcon::Button::Count) + static_cast<u32>(halfaxis),               \
-      InputBindingInfo::Type::HalfAxis, genb                                                                           \
-  }
+  {name,                                                                                                               \
+   display_name,                                                                                                       \
+   icon_name,                                                                                                          \
+   static_cast<u32>(NeGcon::Button::Count) + static_cast<u32>(halfaxis),                                               \
+   InputBindingInfo::Type::HalfAxis,                                                                                   \
+   genb}
 
   // clang-format off
   BUTTON("Up", TRANSLATE_NOOP("NeGcon", "D-Pad Up"), ICON_PF_DPAD_UP, NeGcon::Button::Up, GenericInputBinding::DPadUp),
diff --git a/src/core/playstation_mouse.cpp b/src/core/playstation_mouse.cpp
index d81a4d8cc..5bc385f60 100644
--- a/src/core/playstation_mouse.cpp
+++ b/src/core/playstation_mouse.cpp
@@ -10,6 +10,7 @@
 
 #include "common/assert.h"
 #include "common/log.h"
+#include "common/settings_interface.h"
 
 #include "IconsPromptFont.h"
 
diff --git a/src/core/settings.h b/src/core/settings.h
index 96ff89715..273909a3d 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -8,8 +8,6 @@
 #include "util/audio_stream.h"
 
 #include "common/log.h"
-#include "common/settings_interface.h"
-#include "common/small_string.h"
 
 #include <array>
 #include <optional>
@@ -18,6 +16,8 @@
 #include <string_view>
 #include <vector>
 
+class SettingsInterface;
+
 enum class RenderAPI : u8;
 enum class MediaCaptureBackend : u8;
 
diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp
index 94aad8581..3d871a650 100644
--- a/src/core/timing_event.cpp
+++ b/src/core/timing_event.cpp
@@ -10,6 +10,7 @@
 
 #include "common/assert.h"
 #include "common/log.h"
+#include "common/small_string.h"
 #include "common/thirdparty/SmallVector.h"
 
 LOG_CHANNEL(TimingEvents);