3 files changed, 2 insertions, 10 deletions
diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/headless_backend_osmesa.cpp
index 8ec6079bd0..5042f5ed10 100644
--- a/platform/default/headless_backend_osmesa.cpp
+++ b/platform/default/headless_backend_osmesa.cpp
@@ -25,7 +25,7 @@ struct OSMesaImpl : public HeadlessBackend::Impl {
     GLubyte fakeBuffer = 0;
 };
 
-gl::glProc HeadlessBackend::initializeExtension(const char* name) {
+gl::ProcAddress HeadlessBackend::initializeExtension(const char* name) {
     return OSMesaGetProcAddress(name);
 }
 
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp
index 6ae19356fb..798c8fe680 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/mbgl/gl/headless_backend.cpp
@@ -33,11 +33,6 @@ void HeadlessBackend::activate() {
 
     assert(hasContext());
     impl->activateContext();
-
-    if (!extensionsLoaded) {
-        gl::InitializeExtensions(initializeExtension);
-        extensionsLoaded = true;
-    }
 }
 
 void HeadlessBackend::deactivate() {
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp
index 63e3cec9ee..7e1749a253 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/mbgl/gl/headless_backend.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <mbgl/gl/extension.hpp>
-
 #include <mbgl/map/backend.hpp>
 
 #include <memory>
@@ -27,7 +25,7 @@ public:
 
 private:
     // Implementation specific functions
-    static gl::glProc initializeExtension(const char*);
+    gl::ProcAddress initializeExtension(const char*) override;
 
     void activate() override;
     void deactivate() override;
@@ -40,7 +38,6 @@ private:
     std::unique_ptr<Impl> impl;
     std::shared_ptr<HeadlessDisplay> display;
 
-    bool extensionsLoaded = false;
     bool active = false;
 };