2 files changed, 10 insertions, 12 deletions

diff --git a/src/core/hle/service/set/settings.cpp b/src/core/hle/service/set/settings.cpp
index 4ebc2a0ec..c48844f77 100644
--- a/src/core/hle/service/set/settings.cpp
+++ b/src/core/hle/service/set/settings.cpp
@@ -1,20 +1,23 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "core/hle/service/server_manager.h"
 #include "core/hle/service/set/set.h"
 #include "core/hle/service/set/set_cal.h"
 #include "core/hle/service/set/set_fd.h"
 #include "core/hle/service/set/set_sys.h"
 #include "core/hle/service/set/settings.h"
-#include "core/hle/service/sm/sm.h"
 
 namespace Service::Set {
 
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
-    std::make_shared<SET>(system)->InstallAsService(service_manager);
-    std::make_shared<SET_CAL>(system)->InstallAsService(service_manager);
-    std::make_shared<SET_FD>(system)->InstallAsService(service_manager);
-    std::make_shared<SET_SYS>(system)->InstallAsService(service_manager);
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("set", std::make_shared<SET>(system));
+    server_manager->RegisterNamedService("set:cal", std::make_shared<SET_CAL>(system));
+    server_manager->RegisterNamedService("set:fd", std::make_shared<SET_FD>(system));
+    server_manager->RegisterNamedService("set:sys", std::make_shared<SET_SYS>(system));
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::Set
diff --git a/src/core/hle/service/set/settings.h b/src/core/hle/service/set/settings.h
index 6cd7d634c..03cd4bb66 100644
--- a/src/core/hle/service/set/settings.h
+++ b/src/core/hle/service/set/settings.h
@@ -7,13 +7,8 @@ namespace Core {
 class System;
 }
 
-namespace Service::SM {
-class ServiceManager;
-}
-
 namespace Service::Set {
 
-/// Registers all Settings services with the specified service manager.
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::Set