diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h
index 954e9a027..62a4407d8 100644
--- a/src/Platform/AbstractXApplication.h
+++ b/src/Platform/AbstractXApplication.h
@@ -35,9 +35,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status
 
 #include "Math/Vector2.h"
 
diff --git a/src/Platform/Implementation/GlxContextHandler.h b/src/Platform/Implementation/GlxContextHandler.h
index e8eb487bd..a1e99f90e 100644
--- a/src/Platform/Implementation/GlxContextHandler.h
+++ b/src/Platform/Implementation/GlxContextHandler.h
@@ -25,11 +25,13 @@
 */
 
 #include "OpenGL.h"
+#define Status int
 #include <GL/glx.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status
 
 #include "Platform/AbstractXApplication.h"
 #include "Platform/Implementation/AbstractContextHandler.h"
diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Platform/WindowlessGlxApplication.h
index dd5ec4193..8088b06d9 100644
--- a/src/Platform/WindowlessGlxApplication.h
+++ b/src/Platform/WindowlessGlxApplication.h
@@ -34,9 +34,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status
 
 #include "Magnum.h"