diff --git a/Makefile.am b/Makefile.am
index 00353536e..7c28e0a27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -288,14 +288,14 @@ libsystem_a_SOURCES = \
 	src/system/SocketUtil.cxx src/system/SocketUtil.hxx \
 	src/system/SocketError.hxx \
 	src/system/resolver.c src/system/resolver.h \
+	src/system/EventPipe.cxx src/system/EventPipe.hxx \
+	src/system/EventFD.cxx src/system/EventFD.hxx \
 	src/system/SignalFD.cxx src/system/SignalFD.hxx \
 	src/system/clock.c src/system/clock.h
 
 # Event loop library
 
 libevent_a_SOURCES = \
-	src/event/EventPipe.cxx src/event/EventPipe.hxx \
-	src/event/EventFD.cxx src/event/EventFD.hxx \
 	src/event/WakeFD.hxx \
 	src/event/SignalMonitor.hxx src/event/SignalMonitor.cxx \
 	src/event/TimeoutMonitor.hxx src/event/TimeoutMonitor.cxx \
diff --git a/src/event/WakeFD.hxx b/src/event/WakeFD.hxx
index e4058287f..ed1baafd8 100644
--- a/src/event/WakeFD.hxx
+++ b/src/event/WakeFD.hxx
@@ -25,10 +25,10 @@
 #include <assert.h>
 
 #ifdef USE_EVENTFD
-#include "EventFD.hxx"
+#include "system/EventFD.hxx"
 #define WakeFD EventFD
 #else
-#include "EventPipe.hxx"
+#include "system/EventPipe.hxx"
 #define WakeFD EventPipe
 #endif
 
diff --git a/src/event/EventFD.cxx b/src/system/EventFD.cxx
similarity index 100%
rename from src/event/EventFD.cxx
rename to src/system/EventFD.cxx
diff --git a/src/event/EventFD.hxx b/src/system/EventFD.hxx
similarity index 100%
rename from src/event/EventFD.hxx
rename to src/system/EventFD.hxx
diff --git a/src/event/EventPipe.cxx b/src/system/EventPipe.cxx
similarity index 100%
rename from src/event/EventPipe.cxx
rename to src/system/EventPipe.cxx
diff --git a/src/event/EventPipe.hxx b/src/system/EventPipe.hxx
similarity index 100%
rename from src/event/EventPipe.hxx
rename to src/system/EventPipe.hxx