diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index 90ea4d191..79ccaaed0 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -9,9 +9,7 @@
 #include "core/memory.h"
 
 namespace Kernel {
-class ServerSession;
 
-// TODO(Subv): Move these declarations out of here
 static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header
 
 /**
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 167cb09a8..4f973c634 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -94,8 +94,8 @@ ResultCode SessionRequestHandler::TranslateRequest(Kernel::SharedPtr<Kernel::Ser
     return RESULT_SUCCESS;
 }
 
+Interface::Interface(u32 max_sessions) : max_sessions(max_sessions) {}
 Interface::~Interface() = default;
-Interface::Interface(u32 max_sessions) : max_sessions(max_sessions) { }
 
 void Interface::HandleSyncRequestImpl(Kernel::SharedPtr<Kernel::ServerSession> server_session) {
     // TODO(Subv): Make use of the server_session in the HLE service handlers to distinguish which session triggered each command.