diff --git a/src/mpd.c b/src/mpd.c
index ded4bbd8..152cc2a3 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -34,6 +34,15 @@
 #include <stdint.h>
 #include <inttypes.h>
 
+#ifdef HAVE_LIBEVENT2
+# include <event2/event.h>
+# include <event2/buffer.h>
+# include <event2/bufferevent.h>
+# include <event2/listener.h>
+#else
+# include <event.h>
+#endif
+
 #if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
 # define USE_EVENTFD
 # include <sys/eventfd.h>
@@ -48,7 +57,6 @@
 #include "conffile.h"
 #include "misc.h"
 #include "listener.h"
-#include "mpd.h"
 
 #include "player.h"
 #include "filescanner.h"
diff --git a/src/mpd.h b/src/mpd.h
index c5430a40..5df5917a 100644
--- a/src/mpd.h
+++ b/src/mpd.h
@@ -2,14 +2,6 @@
 #ifndef __MPD_H__
 #define __MPD_H__
 
-#ifdef HAVE_LIBEVENT2
-# include <event2/event.h>
-# include <event2/buffer.h>
-# include <event2/bufferevent.h>
-# include <event2/listener.h>
-#else
-# include <event.h>
-#endif
 
 int
 mpd_init(void);