diff --git a/src/Contexts/EglContext.h b/src/Contexts/EglContext.h
index a063a591a..fe2e48cb2 100644
--- a/src/Contexts/EglContext.h
+++ b/src/Contexts/EglContext.h
@@ -22,6 +22,9 @@
 #include "Magnum.h"
 
 #include <X11/Xlib.h>
+#ifdef None // undef Xlib nonsense to avoid conflicts
+#undef None
+#endif
 
 #ifndef SUPPORT_X11
 #define SUPPORT_X11 // OpenGL ES on BeagleBoard needs this (?)