diff --git a/include/platform/Platform.h b/include/platform/Platform.h
index 434a589fd..37a94b2e1 100644
--- a/include/platform/Platform.h
+++ b/include/platform/Platform.h
@@ -12,6 +12,8 @@
 #include <stdint.h>
 #include <array>
 
+#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482
+
 #if defined(_WIN32)
 #   if !defined(LIBANGLE_IMPLEMENTATION)
 #       define ANGLE_PLATFORM_EXPORT __declspec(dllimport)
diff --git a/src/common/angleutils.h b/src/common/angleutils.h
index 1c601c12d..5920965fb 100644
--- a/src/common/angleutils.h
+++ b/src/common/angleutils.h
@@ -250,9 +250,6 @@ std::string ToString(const T &value)
 #define GL_RGB10_A2_SSCALED_ANGLEX 0x6AEC
 #define GL_RGB10_A2_USCALED_ANGLEX 0x6AED
 
-// TODO(jmadill): Clean this up at some point.
-#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
-
 // This internal enum is used to filter internal errors that are already handled.
 // TODO(jmadill): Remove this when refactor is done. http://anglebug.com/2491
 #define GL_INTERNAL_ERROR_ANGLEX 0x6AEE
diff --git a/src/tests/deqp_support/tcuANGLEPlatform.cpp b/src/tests/deqp_support/tcuANGLEPlatform.cpp
index 746936d6d..cb622f95b 100644
--- a/src/tests/deqp_support/tcuANGLEPlatform.cpp
+++ b/src/tests/deqp_support/tcuANGLEPlatform.cpp
@@ -30,9 +30,6 @@
 
 static_assert(EGL_DONT_CARE == -1, "Unexpected value for EGL_DONT_CARE");
 
-// We should clean this up at some point by making it a properly exposed enum.
-#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
-
 namespace tcu
 {
 ANGLEPlatform::ANGLEPlatform(angle::LogErrorFunc logErrorFunc)
diff --git a/util/EGLWindow.cpp b/util/EGLWindow.cpp
index e67dddca1..a3dc25c9b 100644
--- a/util/EGLWindow.cpp
+++ b/util/EGLWindow.cpp
@@ -12,9 +12,7 @@
 #include "EGLWindow.h"
 #include "OSWindow.h"
 #include "common/debug.h"
-
-// TODO(jmadill): Clean this up at some point.
-#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
+#include "platform/Platform.h"
 
 EGLPlatformParameters::EGLPlatformParameters()
     : renderer(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE),