8 files changed, 7 insertions, 12 deletions
diff --git a/src/init.cpp b/src/init.cpp
index a161f9c6f..5de013898 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 ServerConfig::Uplink *uplink_server;
 
diff --git a/src/logger.cpp b/src/logger.cpp
index 508fa7b0c..2df912e18 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -23,6 +23,7 @@
 #include "protocol.h"
 
 #include <sys/time.h>
+#include <unistd.h>
 
 static Anope::string GetTimeStamp()
 {
diff --git a/src/socketengines/pipeengine_eventfd.cpp b/src/socketengines/pipeengine_eventfd.cpp
index d1051cc28..19433d1c8 100644
--- a/src/socketengines/pipeengine_eventfd.cpp
+++ b/src/socketengines/pipeengine_eventfd.cpp
@@ -37,7 +37,3 @@ void Pipe::Notify()
 	eventfd_write(this->GetFD(), 1);
 }
 
-void Pipe::OnNotify()
-{
-}
-
diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp
index dc7d6918a..985c1cf95 100644
--- a/src/socketengines/pipeengine_pipe.cpp
+++ b/src/socketengines/pipeengine_pipe.cpp
@@ -54,6 +54,3 @@ void Pipe::Notify()
 	write(this->WritePipe, &dummy, 1);
 }
 
-void Pipe::OnNotify()
-{
-}
diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index b6dbdc23f..c2c7359d4 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -66,7 +66,7 @@ void SocketEngine::AddSocket(Socket *s)
 	if (epoll_ctl(EngineHandle, EPOLL_CTL_ADD, ev.data.fd, &ev) == -1)
 		throw SocketException("Unable to add fd " + stringify(ev.data.fd) + " to epoll: " + Anope::LastError());
 
-	Sockets.insert(std::make_pair(ev.data.fd, s));
+	Sockets[ev.data.fd] = s;
 }
 
 void SocketEngine::DelSocket(Socket *s)
diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index bac99a9b9..a2188214d 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -75,7 +75,7 @@ void SocketEngine::AddSocket(Socket *s)
 	struct kevent *event = GetChangeEvent();
 	EV_SET(event, s->GetFD(), EVFILT_READ, EV_ADD, 0, 0, NULL);
 
-	Sockets.insert(std::make_pair(s->GetFD(), s));
+	Sockets[s->GetFD()] = s;
 }
 
 void SocketEngine::DelSocket(Socket *s)
diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 8fa666cf3..48a996e31 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -75,8 +75,8 @@ void SocketEngine::AddSocket(Socket *s)
 	ev->events = POLLIN;
 	ev->revents = 0;
 
-	Sockets.insert(std::make_pair(ev->fd, s));
-	socket_positions.insert(std::make_pair(ev->fd, SocketCount));
+	Sockets[ev->fd] = s;
+	socket_positions[ev->fd] = SocketCount;
 
 	++SocketCount;
 }
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index e3393fdea..a10c3208c 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -52,7 +52,7 @@ void SocketEngine::AddSocket(Socket *s)
 	if (s->GetFD() > MaxFD)
 		MaxFD = s->GetFD();
 	FD_SET(s->GetFD(), &ReadFDs);
-	Sockets.insert(std::make_pair(s->GetFD(), s));
+	Sockets[s->GetFD()] = s;
 	++FDCount;
 }