Merge pull request #9884 from liamwhite/service-cleanup

service: miscellaneous cleanups

1 files changed, 7 insertions, 5 deletions

diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h
index 6e189af8b..33f380352 100644
--- a/src/core/hle/kernel/k_server_session.h
+++ b/src/core/hle/kernel/k_server_session.h
@@ -10,18 +10,20 @@
 
 #include <boost/intrusive/list.hpp>
 
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_light_lock.h"
 #include "core/hle/kernel/k_session_request.h"
 #include "core/hle/kernel/k_synchronization_object.h"
 #include "core/hle/result.h"
 
+namespace Service {
+class HLERequestContext;
+class SessionRequestManager;
+} // namespace Service
+
 namespace Kernel {
 
-class HLERequestContext;
 class KernelCore;
 class KSession;
-class SessionRequestManager;
 class KThread;
 
 class KServerSession final : public KSynchronizationObject,
@@ -52,8 +54,8 @@ public:
     /// TODO: flesh these out to match the real kernel
     Result OnRequest(KSessionRequest* request);
     Result SendReply(bool is_hle = false);
-    Result ReceiveRequest(std::shared_ptr<HLERequestContext>* out_context = nullptr,
-                          std::weak_ptr<SessionRequestManager> manager = {});
+    Result ReceiveRequest(std::shared_ptr<Service::HLERequestContext>* out_context = nullptr,
+                          std::weak_ptr<Service::SessionRequestManager> manager = {});
 
     Result SendReplyHLE() {
         return SendReply(true);