2 files changed, 6 insertions, 10 deletions
diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index 09075a1f282..ff2d23a815a 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -28,8 +28,6 @@
 #include <memory>
 #include <thread>
 
-using boost::asio::ip::tcp;
-
 void RASession::Start()
 {
     // wait 1 second for active connections to send negotiation request
diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h
index 65ef6b414be..cfb3177e4b5 100644
--- a/src/server/worldserver/RemoteAccess/RASession.h
+++ b/src/server/worldserver/RemoteAccess/RASession.h
@@ -18,27 +18,25 @@
 #ifndef __RASESSION_H__
 #define __RASESSION_H__
 
-#include <memory>
+#include "Define.h"
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/streambuf.hpp>
-
 #include <future>
-
-using boost::asio::ip::tcp;
+#include <memory>
 
 const size_t bufferSize = 4096;
 
 class RASession : public std::enable_shared_from_this <RASession>
 {
 public:
-    RASession(tcp::socket&& socket) : _socket(std::move(socket)), _commandExecuting(nullptr)
+    RASession(boost::asio::ip::tcp::socket&& socket) : _socket(std::move(socket)), _commandExecuting(nullptr)
     {
     }
 
     void Start();
 
-    const std::string GetRemoteIpAddress() const { return _socket.remote_endpoint().address().to_string(); }
-    unsigned short GetRemotePort() const { return _socket.remote_endpoint().port(); }
+    std::string GetRemoteIpAddress() const { return _socket.remote_endpoint().address().to_string(); }
+    uint16 GetRemotePort() const { return _socket.remote_endpoint().port(); }
 
 private:
     int Send(std::string_view data);
@@ -50,7 +48,7 @@ private:
     static void CommandPrint(void* callbackArg, std::string_view text);
     static void CommandFinished(void* callbackArg, bool);
 
-    tcp::socket _socket;
+    boost::asio::ip::tcp::socket _socket;
     boost::asio::streambuf _readBuffer;
     boost::asio::streambuf _writeBuffer;
     std::promise<void>* _commandExecuting;