9 files changed, 11 insertions, 3 deletions
diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx
index 92e350e85..0f71bd941 100644
--- a/src/event/BufferedSocket.cxx
+++ b/src/event/BufferedSocket.cxx
@@ -22,6 +22,9 @@
 #include "system/SocketError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
+#include "Compiler.h"
+
+#include <algorithm>
 
 BufferedSocket::ssize_t
 BufferedSocket::DirectRead(void *data, size_t length)
diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx
index db920f981..9bd1b5b49 100644
--- a/src/event/BufferedSocket.hxx
+++ b/src/event/BufferedSocket.hxx
@@ -23,13 +23,13 @@
 #include "check.h"
 #include "SocketMonitor.hxx"
 #include "util/FifoBuffer.hxx"
-#include "Compiler.h"
 
 #include <assert.h>
 #include <stdint.h>
 
 struct fifo_buffer;
 class Error;
+class EventLoop;
 
 /**
  * A #SocketMonitor specialization that adds an input buffer.
diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx
index 8b57b1308..87d29296e 100644
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -23,6 +23,7 @@
 #include "util/fifo_buffer.h"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
+#include "Compiler.h"
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/src/event/FullyBufferedSocket.hxx b/src/event/FullyBufferedSocket.hxx
index c50bb5f61..083fab15e 100644
--- a/src/event/FullyBufferedSocket.hxx
+++ b/src/event/FullyBufferedSocket.hxx
@@ -24,7 +24,6 @@
 #include "BufferedSocket.hxx"
 #include "IdleMonitor.hxx"
 #include "util/PeakBuffer.hxx"
-#include "Compiler.h"
 
 /**
  * A #BufferedSocket specialization that adds an output buffer.
diff --git a/src/event/IdleMonitor.cxx b/src/event/IdleMonitor.cxx
index 8d25407b5..45f533e3f 100644
--- a/src/event/IdleMonitor.cxx
+++ b/src/event/IdleMonitor.cxx
@@ -21,6 +21,8 @@
 #include "IdleMonitor.hxx"
 #include "Loop.hxx"
 
+#include <assert.h>
+
 void
 IdleMonitor::Cancel()
 {
diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx
index fed6929c1..680930037 100644
--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -34,6 +34,7 @@
 #endif
 
 #include <forward_list>
+#include <iterator>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx
index 781d29181..72320b3eb 100644
--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -38,6 +38,7 @@
 #include <glib.h>
 
 #include <string>
+#include <algorithm>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/event/SignalMonitor.cxx b/src/event/SignalMonitor.cxx
index 8c8527a77..0d96fb138 100644
--- a/src/event/SignalMonitor.cxx
+++ b/src/event/SignalMonitor.cxx
@@ -39,6 +39,8 @@
 
 #include <algorithm>
 
+#include <assert.h>
+
 class SignalMonitor final : private SocketMonitor {
 #ifdef USE_SIGNALFD
 	SignalFD fd;
diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx
index fdef0acb6..e88427d53 100644
--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -28,7 +28,6 @@
 #ifdef WIN32
 #include <winsock2.h>
 #else
-#include <sys/types.h>
 #include <sys/socket.h>
 #endif