2 files changed, 8 insertions, 10 deletions

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index e16e401f3..8527907c4 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -75,13 +75,12 @@ class ThreadSignalSocket : public EventHandler
 	ThreadSignalSocket(SocketThread* p, int newfd) : parent(p)
 	{
 		SetFd(newfd);
-		ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+		SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
 	}
 
 	~ThreadSignalSocket()
 	{
-		ServerInstance->SE->DelFd(this);
-		ServerInstance->SE->Close(GetFd());
+		SocketEngine::Close(this);
 	}
 
 	void Notify()
@@ -123,15 +122,14 @@ class ThreadSignalSocket : public EventHandler
 		parent(p), send_fd(sendfd)
 	{
 		SetFd(recvfd);
-		ServerInstance->SE->NonBlocking(fd);
-		ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+		SocketEngine::NonBlocking(fd);
+		SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
 	}
 
 	~ThreadSignalSocket()
 	{
 		close(send_fd);
-		ServerInstance->SE->DelFd(this);
-		ServerInstance->SE->Close(GetFd());
+		SocketEngine::Close(this);
 	}
 
 	void Notify()
diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index ea37892f8..c3a844a74 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -94,20 +94,20 @@ SocketThread::SocketThread()
 
 	if (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
 		throw CoreException("Could not create ITC pipe");
-	ServerInstance->SE->NonBlocking(connFD);
+	SocketEngine::NonBlocking(connFD);
 
 	struct sockaddr_in addr;
 	socklen_t sz = sizeof(addr);
 	getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
 	connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
-	ServerInstance->SE->Blocking(listenFD);
+	SocketEngine::Blocking(listenFD);
 	int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
 	if (nfd < 0)
 		throw CoreException("Could not create ITC pipe");
 	new ThreadSignalSocket(this, nfd);
 	closesocket(listenFD);
 
-	ServerInstance->SE->Blocking(connFD);
+	SocketEngine::Blocking(connFD);
 	this->signal.connFD = connFD;
 }