diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index 865aa8cbc..93080afbe 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -20,15 +20,14 @@
 #ifndef MPD_EVENT_LOOP_HXX
 #define MPD_EVENT_LOOP_HXX
 
-#include "thread/Id.hxx"
-#include "util/Compiler.h"
-
 #include "PollGroup.hxx"
-#include "thread/Mutex.hxx"
 #include "WakeFD.hxx"
 #include "SocketMonitor.hxx"
 #include "IdleMonitor.hxx"
 #include "DeferEvent.hxx"
+#include "thread/Id.hxx"
+#include "thread/Mutex.hxx"
+#include "util/Compiler.h"
 
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>
diff --git a/src/event/PollResultGeneric.hxx b/src/event/PollResultGeneric.hxx
index 6ba466512..1c4b9d7dd 100644
--- a/src/event/PollResultGeneric.hxx
+++ b/src/event/PollResultGeneric.hxx
@@ -23,6 +23,14 @@
 #include <cstddef>
 #include <vector>
 
+#ifdef _WIN32
+#include <windows.h>
+/* damn you, windows.h! */
+#ifdef GetObject
+#undef GetObject
+#endif
+#endif
+
 class PollResultGeneric
 {
 	struct Item