1 files changed, 26 insertions, 32 deletions

diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index dc667500c..d681cc3dc 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -8,29 +8,15 @@
 #include "core/hle/service/service.h"
 #include "core/hle/service/ac_u.h"
 #include "core/hle/service/act_u.h"
-#include "core/hle/service/am_app.h"
-#include "core/hle/service/am_net.h"
-#include "core/hle/service/am_sys.h"
-#include "core/hle/service/boss_p.h"
-#include "core/hle/service/boss_u.h"
-#include "core/hle/service/cam_u.h"
-#include "core/hle/service/cecd_u.h"
-#include "core/hle/service/cecd_s.h"
 #include "core/hle/service/csnd_snd.h"
 #include "core/hle/service/dsp_dsp.h"
 #include "core/hle/service/err_f.h"
-#include "core/hle/service/frd_a.h"
-#include "core/hle/service/frd_u.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/gsp_lcd.h"
 #include "core/hle/service/http_c.h"
 #include "core/hle/service/ldr_ro.h"
 #include "core/hle/service/mic_u.h"
 #include "core/hle/service/ndm_u.h"
-#include "core/hle/service/news_s.h"
-#include "core/hle/service/news_u.h"
-#include "core/hle/service/nim_aoc.h"
-#include "core/hle/service/nim_u.h"
 #include "core/hle/service/ns_s.h"
 #include "core/hle/service/nwm_uds.h"
 #include "core/hle/service/pm_app.h"
@@ -39,11 +25,18 @@
 #include "core/hle/service/ssl_c.h"
 #include "core/hle/service/y2r_u.h"
 
+#include "core/hle/service/am/am.h"
 #include "core/hle/service/apt/apt.h"
+#include "core/hle/service/boss/boss.h"
+#include "core/hle/service/cam/cam.h"
+#include "core/hle/service/cecd/cecd.h"
+#include "core/hle/service/frd/frd.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/ir/ir.h"
+#include "core/hle/service/news/news.h"
+#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/ptm/ptm.h"
 
 namespace Service {
@@ -111,36 +104,29 @@ void Init() {
     AddNamedPort(new ERR_F::Interface);
 
     Service::FS::ArchiveInit();
-    Service::CFG::Init();
+    Service::AM::Init();
     Service::APT::Init();
-    Service::PTM::Init();
+    Service::BOSS::Init();
+    Service::CAM::Init();
+    Service::CECD::Init();
+    Service::CFG::Init();
+    Service::FRD::Init();
     Service::HID::Init();
     Service::IR::Init();
+    Service::NEWS::Init();
+    Service::NIM::Init();
+    Service::PTM::Init();
 
     AddService(new AC_U::Interface);
     AddService(new ACT_U::Interface);
-    AddService(new AM_APP::Interface);
-    AddService(new AM_NET::Interface);
-    AddService(new AM_SYS::Interface);
-    AddService(new BOSS_P::Interface);
-    AddService(new BOSS_U::Interface);
-    AddService(new CAM_U::Interface);
-    AddService(new CECD_S::Interface);
-    AddService(new CECD_U::Interface);
     AddService(new CSND_SND::Interface);
     AddService(new DSP_DSP::Interface);
-    AddService(new FRD_A::Interface);
-    AddService(new FRD_U::Interface);
     AddService(new GSP_GPU::Interface);
     AddService(new GSP_LCD::Interface);
     AddService(new HTTP_C::Interface);
     AddService(new LDR_RO::Interface);
     AddService(new MIC_U::Interface);
     AddService(new NDM_U::Interface);
-    AddService(new NEWS_S::Interface);
-    AddService(new NEWS_U::Interface);
-    AddService(new NIM_AOC::Interface);
-    AddService(new NIM_U::Interface);
     AddService(new NS_S::Interface);
     AddService(new NWM_UDS::Interface);
     AddService(new PM_APP::Interface);
@@ -153,11 +139,19 @@ void Init() {
 
 /// Shutdown ServiceManager
 void Shutdown() {
+
+    Service::PTM::Shutdown();
+    Service::NIM::Shutdown();
+    Service::NEWS::Shutdown();
     Service::IR::Shutdown();
     Service::HID::Shutdown();
-    Service::PTM::Shutdown();
-    Service::APT::Shutdown();
+    Service::FRD::Shutdown();
     Service::CFG::Shutdown();
+    Service::CECD::Shutdown();
+    Service::CAM::Shutdown();
+    Service::BOSS::Shutdown();
+    Service::APT::Shutdown();
+    Service::AM::Shutdown();
     Service::FS::ArchiveShutdown();
 
     g_srv_services.clear();