1 files changed, 12 insertions, 9 deletions
diff --git a/win/rfb_win32/SocketManager.cxx b/win/rfb_win32/SocketManager.cxx
index 7f6d1773..9a22ee14 100644
--- a/win/rfb_win32/SocketManager.cxx
+++ b/win/rfb_win32/SocketManager.cxx
@@ -25,16 +25,19 @@
 #include <winsock2.h>
 #include <list>
 
-#include <rdr/Exception.h>
+#include <core/Exception.h>
+#include <core/LogWriter.h>
+#include <core/Timer.h>
+#include <core/time.h>
+
+#include <rdr/FdOutStream.h>
 
 #include <network/Socket.h>
 
-#include <rfb/LogWriter.h>
-#include <rfb/Timer.h>
 #include <rfb/VNCServer.h>
-#include <rfb/util.h>
 #include <rfb_win32/SocketManager.h>
 
+using namespace core;
 using namespace rfb;
 using namespace rfb::win32;
 
@@ -69,7 +72,7 @@ void SocketManager::addListener(network::SocketListener* sock_,
     flags |= FD_ADDRESS_LIST_CHANGE;
   try {
     if (event && (WSAEventSelect(sock_->getFd(), event, flags) == SOCKET_ERROR))
-      throw rdr::socket_error("Unable to select on listener", WSAGetLastError());
+      throw core::socket_error("Unable to select on listener", WSAGetLastError());
 
     // requestAddressChangeEvents MUST happen after WSAEventSelect, so that the socket is non-blocking
     if (acn)
@@ -186,7 +189,7 @@ int SocketManager::checkTimeouts() {
       if (j->second.sock->outStream().hasBufferedData())
         eventMask |= FD_WRITE;
       if (WSAEventSelect(j->second.sock->getFd(), j->first, eventMask) == SOCKET_ERROR)
-        throw rdr::socket_error("unable to adjust WSAEventSelect:%u", WSAGetLastError());
+        throw core::socket_error("unable to adjust WSAEventSelect:%u", WSAGetLastError());
     }
   }
 
@@ -236,11 +239,11 @@ void SocketManager::processEvent(HANDLE event) {
 
       // Fetch why this event notification triggered
       if (WSAEnumNetworkEvents(ci.sock->getFd(), event, &network_events) == SOCKET_ERROR)
-        throw rdr::socket_error("Unable to get WSAEnumNetworkEvents:%u", WSAGetLastError());
+        throw core::socket_error("Unable to get WSAEnumNetworkEvents:%u", WSAGetLastError());
 
       // Cancel event notification for this socket
       if (WSAEventSelect(ci.sock->getFd(), event, 0) == SOCKET_ERROR)
-        throw rdr::socket_error("unable to disable WSAEventSelect:%u", WSAGetLastError());
+        throw core::socket_error("unable to disable WSAEventSelect:%u", WSAGetLastError());
 
       // Reset the event object
       WSAResetEvent(event);
@@ -268,7 +271,7 @@ void SocketManager::processEvent(HANDLE event) {
       if (ci.sock->outStream().hasBufferedData())
         eventMask |= FD_WRITE;
       if (WSAEventSelect(ci.sock->getFd(), event, eventMask) == SOCKET_ERROR)
-        throw rdr::socket_error("unable to re-enable WSAEventSelect:%u", WSAGetLastError());
+        throw core::socket_error("unable to re-enable WSAEventSelect:%u", WSAGetLastError());
     } catch (std::exception& e) {
       vlog.error("%s", e.what());
       remSocket(ci.sock);