diff --git a/src/core/emulator_settings.h b/src/core/emulator_settings.h
index a2fb79202..00effa2bd 100644
--- a/src/core/emulator_settings.h
+++ b/src/core/emulator_settings.h
@@ -262,8 +262,7 @@ struct InputSettings {
                                          &InputSettings::motion_controls_enabled),
             make_override<InputSettings>("background_controller_input",
                                          &InputSettings::background_controller_input),
-            make_override<InputSettings>("camera_id",
-                                         &InputSettings::camera_id)};
+            make_override<InputSettings>("camera_id", &InputSettings::camera_id)};
     }
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(InputSettings, cursor_state, cursor_hide_timeout,
@@ -611,4 +610,4 @@ public:
 #undef SETTING_FORWARD
 #undef SETTING_FORWARD_BOOL
 #undef SETTING_FORWARD_BOOL_READONLY
-};
\ No newline at end of file
+};
diff --git a/src/core/libraries/np/np_manager.cpp b/src/core/libraries/np/np_manager.cpp
index 6d64ffc11..0ffbb682a 100644
--- a/src/core/libraries/np/np_manager.cpp
+++ b/src/core/libraries/np/np_manager.cpp
@@ -5,6 +5,7 @@
 #include <mutex>
 #include <variant>
 
+#include <core/user_settings.h>
 #include "common/logging/log.h"
 #include "core/emulator_settings.h"
 #include "core/libraries/error_codes.h"
@@ -12,7 +13,6 @@
 #include "core/libraries/np/np_error.h"
 #include "core/libraries/np/np_manager.h"
 #include "core/tls.h"
-#include <core/user_settings.h>
 
 namespace Libraries::Np::NpManager {
 
diff --git a/src/core/libraries/system/userservice.cpp b/src/core/libraries/system/userservice.cpp
index ad623222c..bb5bcd905 100644
--- a/src/core/libraries/system/userservice.cpp
+++ b/src/core/libraries/system/userservice.cpp
@@ -5,6 +5,7 @@
 
 #include "common/logging/log.h"
 
+#include <core/user_settings.h>
 #include "common/singleton.h"
 #include "core/emulator_settings.h"
 #include "core/libraries/libs.h"
@@ -12,7 +13,6 @@
 #include "core/libraries/system/userservice_error.h"
 #include "core/tls.h"
 #include "input/controller.h"
-#include <core/user_settings.h>
 
 namespace Libraries::UserService {
 
diff --git a/src/core/user_manager.h b/src/core/user_manager.h
index f5b39a166..572771c68 100644
--- a/src/core/user_manager.h
+++ b/src/core/user_manager.h
@@ -5,8 +5,8 @@
 #include <filesystem>
 #include <string>
 #include <vector>
-#include "common/types.h"
 #include <nlohmann/json.hpp>
+#include "common/types.h"
 
 struct User {
     s32 user_id;
@@ -48,4 +48,4 @@ public:
 
 private:
     Users m_users;
-};
\ No newline at end of file
+};