diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c009b910..10d1076e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,10 @@ if(WITH_CXX11ABI)
 endif()
 
 if(WITH_OSMESA)
-    add_compile_options(-D__OSMESA__)
+    # Default mesa mason binary is OSMesa.
+    set(MASON_MESA_SUFFIX "")
 else()
-    set(MASON_MESA_SUFFIX -glx)
+    set(MASON_MESA_SUFFIX "-glx")
 endif()
 
 if(IS_CI_BUILD)
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index a89c0d7f4..cd28c1de0 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -54,7 +54,6 @@ set(MBGL_CORE_FILES
 
     # gl
     include/mbgl/gl/gl.hpp
-    include/mbgl/gl/implementation.hpp
     src/mbgl/gl/attribute.hpp
     src/mbgl/gl/color_mode.cpp
     src/mbgl/gl/color_mode.hpp
diff --git a/include/mbgl/gl/implementation.hpp b/include/mbgl/gl/implementation.hpp
deleted file mode 100644
index a0101085f..000000000
--- a/include/mbgl/gl/implementation.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#if defined(__QT__)
-    #define MBGL_USE_QT 1
-#elif defined(__APPLE__)
-    #include <TargetConditionals.h>
-    #if TARGET_OS_IOS
-        #define MBGL_USE_EAGL 1
-    #else
-        #define MBGL_USE_CGL 1
-    #endif
-#elif defined(__OSMESA__)
-    #define MBGL_USE_OSMESA 1
-#else
-    #define MBGL_USE_GLX 1
-#endif
diff --git a/include/mbgl/platform/default/headless_backend.hpp b/include/mbgl/platform/default/headless_backend.hpp
index 2fef321d8..da8c55e04 100644
--- a/include/mbgl/platform/default/headless_backend.hpp
+++ b/include/mbgl/platform/default/headless_backend.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <mbgl/gl/implementation.hpp>
 #include <mbgl/gl/extension.hpp>
 
 #include <mbgl/map/backend.hpp>
diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp
index 433df952f..a5c95085b 100644
--- a/include/mbgl/platform/default/headless_display.hpp
+++ b/include/mbgl/platform/default/headless_display.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <mbgl/gl/implementation.hpp>
-
 #include <memory>
 
 namespace mbgl {