diff --git a/src/Platform/AbstractXApplication.cpp b/src/Platform/AbstractXApplication.cpp
index 3fb287433..38d5606f9 100644
--- a/src/Platform/AbstractXApplication.cpp
+++ b/src/Platform/AbstractXApplication.cpp
@@ -27,10 +27,9 @@
 #include <Utility/utilities.h>
 
 #include "Context.h"
+#include "Version.h"
 #include "Platform/Implementation/AbstractContextHandler.h"
 
-#define None 0L // redef Xlib nonsense
-
 /* Mask for X events */
 #define INPUT_MASK KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask
 
@@ -80,7 +79,7 @@ bool AbstractXApplication::tryCreateContext(const Configuration& configuration)
     attr.event_mask = 0;
     unsigned long mask = CWBackPixel|CWBorderPixel|CWColormap|CWEventMask;
     window = XCreateWindow(display, root, 20, 20, configuration.size().x(), configuration.size().y(), 0, visInfo->depth, InputOutput, visInfo->visual, mask, &attr);
-    XSetStandardProperties(display, window, configuration.title().data(), nullptr, None, nullptr, 0, nullptr);
+    XSetStandardProperties(display, window, configuration.title().data(), nullptr, 0, nullptr, 0, nullptr);
     XFree(visInfo);
 
     /* Be notified about closing the window */
@@ -176,7 +175,7 @@ void AbstractXApplication::mousePressEvent(MouseEvent&) {}
 void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {}
 void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {}
 
-AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600) {}
+AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600), _version(Version::None) {}
 AbstractXApplication::Configuration::~Configuration() = default;
 
 }}
diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp
index c425035a0..e02f8873f 100644
--- a/src/Platform/GlutApplication.cpp
+++ b/src/Platform/GlutApplication.cpp
@@ -133,7 +133,7 @@ void GlutApplication::mousePressEvent(MouseEvent&) {}
 void GlutApplication::mouseReleaseEvent(MouseEvent&) {}
 void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {}
 
-GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0) {}
+GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0), _version(Version::None) {}
 GlutApplication::Configuration::~Configuration() = default;
 
 template class BasicScreen<GlutApplication>;