diff --git a/Makefile.am b/Makefile.am
index 97b8f7efd..5c599f4a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,7 +201,6 @@ src_mpd_SOURCES = \
 	src/ClientMessage.cxx src/ClientMessage.hxx \
 	src/ClientSubscribe.cxx src/ClientSubscribe.hxx \
 	src/ClientFile.cxx src/ClientFile.hxx \
-	src/ServerSocket.cxx src/ServerSocket.hxx \
 	src/Listen.cxx src/Listen.hxx \
 	src/Log.cxx src/Log.hxx \
 	src/ls.cxx \
@@ -328,6 +327,7 @@ libevent_a_SOURCES = \
 	src/event/BufferedSocket.cxx src/event/BufferedSocket.hxx \
 	src/event/FullyBufferedSocket.cxx src/event/FullyBufferedSocket.hxx \
 	src/event/MultiSocketMonitor.cxx src/event/MultiSocketMonitor.hxx \
+	src/event/ServerSocket.cxx src/event/ServerSocket.hxx \
 	src/event/Loop.hxx
 
 # PCM library
@@ -1337,8 +1337,7 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/filter_config.c \
 	src/AudioCompress/compress.c \
 	src/ReplayGainInfo.cxx \
-	src/fd_util.c \
-	src/ServerSocket.cxx
+	src/fd_util.c
 
 test_read_mixer_LDADD = \
 	libpcm.a \
diff --git a/src/Listen.cxx b/src/Listen.cxx
index 7bc10dc18..f1d6e4fec 100644
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@@ -22,7 +22,7 @@
 #include "Main.hxx"
 #include "Client.hxx"
 #include "conf.h"
-#include "ServerSocket.hxx"
+#include "event/ServerSocket.hxx"
 
 #include <string.h>
 #include <assert.h>
diff --git a/src/ServerSocket.cxx b/src/event/ServerSocket.cxx
similarity index 100%
rename from src/ServerSocket.cxx
rename to src/event/ServerSocket.cxx
diff --git a/src/ServerSocket.hxx b/src/event/ServerSocket.hxx
similarity index 100%
rename from src/ServerSocket.hxx
rename to src/event/ServerSocket.hxx
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx
index a9b27c483..871047a5f 100644
--- a/src/output/HttpdOutputPlugin.cxx
+++ b/src/output/HttpdOutputPlugin.cxx
@@ -28,7 +28,7 @@
 #include "Page.hxx"
 #include "IcyMetaDataServer.hxx"
 #include "fd_util.h"
-#include "ServerSocket.hxx"
+#include "event/ServerSocket.hxx"
 #include "Main.hxx"
 
 #include <assert.h>