diff --git a/docs/SubsystemHLE.md b/docs/SubsystemHLE.md
index 4ebe333c53..485ee4708b 100644
--- a/docs/SubsystemHLE.md
+++ b/docs/SubsystemHLE.md
@@ -49,25 +49,34 @@ public:
         : ServiceFramework{system_, "IFloatingRegistrationRequest"}
     {}
 
+    // Must be placed after all methods are defined (or declared).
     // Define here your functions and methods, please order them.
     // Use FindRequestTipc for TIPC handlers.
     static constexpr auto functions = CreateStaticMap(
-            FunctionInfo{0, nullptr, "GetSessionId"},
-            FunctionInfo{12, nullptr, "GetAccountId"},
-            FunctionInfo{13, nullptr, "GetLinkedNintendoAccountId"},
-            FunctionInfo{14, nullptr, "GetNickname"},
-            FunctionInfo{15, nullptr, "GetProfileImage"},
-            FunctionInfo{16, nullptr, "GetProfileLargeImage", MakeVersionGate({18,0,0})},
-            FunctionInfo{21, nullptr, "LoadIdTokenCache"},
-            FunctionInfo{100, nullptr, "RegisterUser"},
-            FunctionInfo{101, nullptr, "RegisterUserWithUid"},
-            FunctionInfo{102, nullptr, "RegisterNetworkServiceAccountAsync", MakeVersionGate({4,0,0})},
-            FunctionInfo{103, nullptr, "RegisterNetworkServiceAccountWithUidAsync", MakeVersionGate({4,0,0})},
-            FunctionInfo{110, nullptr, "SetSystemProgramIdentification"},
-            FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"}
-        );
+        FunctionInfo{0, nullptr, "GetSessionId"},
+        FunctionInfo{12, nullptr, "GetAccountId"},
+        FunctionInfo{13, nullptr, "GetLinkedNintendoAccountId"},
+        FunctionInfo{14, nullptr, "GetNickname"},
+        FunctionInfo{15, nullptr, "GetProfileImage"},
+        FunctionInfo{16, nullptr, "GetProfileLargeImage", MakeVersionGate({18,0,0})},
+        FunctionInfo{21, nullptr, "LoadIdTokenCache"},
+        FunctionInfo{100, nullptr, "RegisterUser"},
+        FunctionInfo{101, nullptr, "RegisterUserWithUid"},
+        FunctionInfo{102, nullptr, "RegisterNetworkServiceAccountAsync", MakeVersionGate({4,0,0})},
+        FunctionInfo{103, nullptr, "RegisterNetworkServiceAccountWithUidAsync", MakeVersionGate({4,0,0})},
+        FunctionInfo{110, nullptr, "SetSystemProgramIdentification"},
+        FunctionInfo{111, nullptr, "EnsureIdTokenCacheAsync"}
+    );
     FunctionInfoBase const* FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 };
 ```
+
+Try to keep service structures local, that is, don't place them on header files if they're only going to be used by a specific service.
+
+In each `.cpp` file that uses `D<...>/C<...>` CMIF wrapper helpers, remember to include the corresponding instancer, so you don't face linker errors:
+```c++
+#include "core/hle/service/cmif_serialization.h"
+```
+This will properly instatiate the corresponding wrappers and decompose the provided arguments in the wiring order.
diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp
index 45e18202b6..ae1ff1f963 100644
--- a/src/core/hle/service/psc/psc.cpp
+++ b/src/core/hle/service/psc/psc.cpp
@@ -14,6 +14,7 @@
 #include "core/hle/service/psc/time/service_manager.h"
 #include "core/hle/service/psc/time/static.h"
 #include "core/hle/service/service.h"
+#include "core/hle/service/cmif_serialization.h"
 
 namespace Service::PSC {
 
@@ -109,6 +110,7 @@ public:
     explicit IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} {}
     ~IPmService() override = default;
 
+private:
     Result GetPmModule(Out<SharedPointer<IPmModule>> out_module) {
         LOG_DEBUG(Service_PSC, "called");
         *out_module = std::make_shared<IPmModule>(system);