diff --git a/src/Contexts/EglContextHandler.cpp b/src/Contexts/EglContextHandler.cpp
index c21b1ecf7..fe89eb477 100644
--- a/src/Contexts/EglContextHandler.cpp
+++ b/src/Contexts/EglContextHandler.cpp
@@ -15,6 +15,8 @@
 
 #include "EglContextHandler.h"
 
+#include <Utility/Debug.h>
+
 #include "Context.h"
 
 namespace Magnum { namespace Contexts {
diff --git a/src/Contexts/EglContextHandler.h b/src/Contexts/EglContextHandler.h
index 7c9eab9c6..ae5f3daf0 100644
--- a/src/Contexts/EglContextHandler.h
+++ b/src/Contexts/EglContextHandler.h
@@ -26,6 +26,9 @@
 #endif
 #include <EGL/egl.h>
 
+/* undef Xlib nonsense to avoid conflicts */
+#undef None
+
 #include "AbstractContextHandler.h"
 
 #include "magnumCompatibility.h"