diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h
index 3afdd40c2..4913d03bb 100644
--- a/src/Platform/AbstractXApplication.h
+++ b/src/Platform/AbstractXApplication.h
@@ -56,7 +56,10 @@ Supports keyboard and mouse handling. See @ref platform for brief introduction.
 class AbstractXApplication {
     public:
         /** @brief Application arguments */
-        typedef std::pair<int&, char**> Arguments;
+        struct Arguments {
+            int& argc;      /**< @brief Argument count */
+            char** argv;    /**< @brief Argument values */
+        };
 
         class Configuration;
         class InputEvent;
diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp
index 705264312..65ea0566c 100644
--- a/src/Platform/GlutApplication.cpp
+++ b/src/Platform/GlutApplication.cpp
@@ -32,12 +32,12 @@ namespace Magnum { namespace Platform {
 GlutApplication* GlutApplication::instance = nullptr;
 
 GlutApplication::GlutApplication(const Arguments& arguments): c(nullptr) {
-    initialize(arguments.first, arguments.second);
+    initialize(arguments.argc, arguments.argv);
     createContext(new Configuration);
 }
 
 GlutApplication::GlutApplication(const Arguments& arguments, Configuration* configuration): c(nullptr) {
-    initialize(arguments.first, arguments.second);
+    initialize(arguments.argc, arguments.argv);
     if(configuration) createContext(configuration);
 }
 
diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h
index 4987ccf60..0f0ab185a 100644
--- a/src/Platform/GlutApplication.h
+++ b/src/Platform/GlutApplication.h
@@ -68,7 +68,10 @@ to simplify porting.
 class GlutApplication {
     public:
         /** @brief Application arguments */
-        typedef std::pair<int&, char**> Arguments;
+        struct Arguments {
+            int& argc;      /**< @brief Argument count */
+            char** argv;    /**< @brief Argument values */
+        };
 
         class Configuration;
         class InputEvent;
diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h
index 5ed06ed7a..10733d3cb 100644
--- a/src/Platform/Sdl2Application.h
+++ b/src/Platform/Sdl2Application.h
@@ -69,7 +69,10 @@ to simplify porting.
 class Sdl2Application {
     public:
         /** @brief Application arguments */
-        typedef std::pair<int&, char**> Arguments;
+        struct Arguments {
+            int& argc;      /**< @brief Argument count */
+            char** argv;    /**< @brief Argument values */
+        };
 
         class Configuration;
         class InputEvent;
diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Platform/WindowlessGlxApplication.h
index b7c8d940a..c38cfb5a6 100644
--- a/src/Platform/WindowlessGlxApplication.h
+++ b/src/Platform/WindowlessGlxApplication.h
@@ -66,7 +66,10 @@ If no other application header is included this class is also aliased to
 class WindowlessGlxApplication {
     public:
         /** @brief Application arguments */
-        typedef std::pair<int&, char**> Arguments;
+        struct Arguments {
+            int& argc;      /**< @brief Argument count */
+            char** argv;    /**< @brief Argument values */
+        };
 
         class Configuration;