diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h
index 2c08247c0..b2a7df849 100644
--- a/src/Magnum/Platform/AbstractXApplication.h
+++ b/src/Magnum/Platform/AbstractXApplication.h
@@ -41,6 +41,7 @@
 /* undef Xlib nonsense to avoid conflicts */
 #undef Always
 #undef Complex
+#undef Convex
 #undef None
 #undef Status
 
diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h
index ba1b1a3b3..e56f3c757 100644
--- a/src/Magnum/Platform/WindowlessGlxApplication.h
+++ b/src/Magnum/Platform/WindowlessGlxApplication.h
@@ -47,10 +47,10 @@
 /* undef Xlib nonsense to avoid conflicts */
 #undef Always
 #undef Complex
+#undef Convex
 #undef None
 #undef Status
 
-
 namespace Magnum { namespace Platform {
 
 /**