diff --git a/filament/include/filament/driver/ExternalContext.h b/filament/include/filament/driver/ExternalContext.h
index f0b844989e..f3d7edf4f4 100644
--- a/filament/include/filament/driver/ExternalContext.h
+++ b/filament/include/filament/driver/ExternalContext.h
@@ -45,7 +45,7 @@ public:
 
     // Creates and and initializes the low-level API (e.g. an OpenGL context or Vulkan instance),
     // then creates the concrete Driver. Returns null on failure.
-    virtual std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept = 0;
+    virtual std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept = 0;
 
     virtual ~ExternalContext() noexcept;
 
diff --git a/filament/src/driver/opengl/ContextManagerCocoa.h b/filament/src/driver/opengl/ContextManagerCocoa.h
index 3ad625ce75..a28bc17fc8 100644
--- a/filament/src/driver/opengl/ContextManagerCocoa.h
+++ b/filament/src/driver/opengl/ContextManagerCocoa.h
@@ -29,34 +29,34 @@ struct ContextManagerCocoaImpl;
 class ContextManagerCocoa final : public driver::ContextManagerGL {
 public:
     ContextManagerCocoa();
-    ~ContextManagerCocoa() noexcept final override;
+    ~ContextManagerCocoa() noexcept final;
 
-    std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept override;
-    void terminate() noexcept final override;
+    std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept override;
+    void terminate() noexcept final;
 
-    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final override;
-    void destroySwapChain(SwapChain* swapChain) noexcept final override;
-    void makeCurrent(SwapChain* swapChain) noexcept final override;
-    void commit(SwapChain* swapChain) noexcept final override;
+    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final;
+    void destroySwapChain(SwapChain* swapChain) noexcept final;
+    void makeCurrent(SwapChain* swapChain) noexcept final;
+    void commit(SwapChain* swapChain) noexcept final;
 
-    Fence* createFence() noexcept final override { return nullptr; }
-    void destroyFence(Fence* fence) noexcept final override {}
-    driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final override {
+    Fence* createFence() noexcept final { return nullptr; }
+    void destroyFence(Fence* fence) noexcept final {}
+    driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final {
         return driver::FenceStatus::ERROR;
     }
 
-    Stream* createStream(void* nativeStream) noexcept final override { return nullptr; }
-    void destroyStream(Stream* stream) noexcept final override {}
-    void attach(Stream* stream, intptr_t tname) noexcept final override {}
-    void detach(Stream* stream) noexcept final override {}
-    void updateTexImage(Stream* stream) noexcept final override {}
+    Stream* createStream(void* nativeStream) noexcept final { return nullptr; }
+    void destroyStream(Stream* stream) noexcept final {}
+    void attach(Stream* stream, intptr_t tname) noexcept final {}
+    void detach(Stream* stream) noexcept final {}
+    void updateTexImage(Stream* stream) noexcept final {}
 
-    ExternalTexture* createExternalTextureStorage() noexcept final override { return nullptr; }
+    ExternalTexture* createExternalTextureStorage() noexcept final { return nullptr; }
     void reallocateExternalStorage(ExternalTexture* ets,
-            uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final override { }
-    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override { }
+            uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final { }
+    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final { }
 
-    int getOSVersion() const noexcept final override { return 0; }
+    int getOSVersion() const noexcept final { return 0; }
 
 private:
     ContextManagerCocoaImpl* pImpl = nullptr;
diff --git a/filament/src/driver/opengl/ContextManagerEGL.h b/filament/src/driver/opengl/ContextManagerEGL.h
index 1b0186c844..3a887ca06b 100644
--- a/filament/src/driver/opengl/ContextManagerEGL.h
+++ b/filament/src/driver/opengl/ContextManagerEGL.h
@@ -38,31 +38,31 @@ public:
 
     ContextManagerEGL() noexcept;
 
-    std::unique_ptr<Driver> createDriver(void* const sharedGLContext) noexcept override;
+    std::unique_ptr<Driver> createDriver(void* sharedGLContext) noexcept override;
     void terminate() noexcept override;
 
-    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final override;
-    void destroySwapChain(SwapChain* swapChain) noexcept final override;
-    void makeCurrent(SwapChain* swapChain) noexcept final override;
-    void commit(SwapChain* swapChain) noexcept final override;
+    SwapChain* createSwapChain(void* nativewindow, uint64_t& flags) noexcept final;
+    void destroySwapChain(SwapChain* swapChain) noexcept final;
+    void makeCurrent(SwapChain* swapChain) noexcept final;
+    void commit(SwapChain* swapChain) noexcept final;
 
-    bool canCreateFence() noexcept final override { return true; }
-    Fence* createFence() noexcept final override;
-    void destroyFence(Fence* fence) noexcept final override;
-    driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final override;
+    bool canCreateFence() noexcept final { return true; }
+    Fence* createFence() noexcept final;
+    void destroyFence(Fence* fence) noexcept final;
+    driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final;
 
-    Stream* createStream(void* nativeStream) noexcept final override;
-    void destroyStream(Stream* stream) noexcept final override;
-    void attach(Stream* stream, intptr_t tname) noexcept final override;
-    void detach(Stream* stream) noexcept final override;
-    void updateTexImage(Stream* stream) noexcept final override;
+    Stream* createStream(void* nativeStream) noexcept final;
+    void destroyStream(Stream* stream) noexcept final;
+    void attach(Stream* stream, intptr_t tname) noexcept final;
+    void detach(Stream* stream) noexcept final;
+    void updateTexImage(Stream* stream) noexcept final;
 
-    ExternalTexture* createExternalTextureStorage() noexcept final override;
+    ExternalTexture* createExternalTextureStorage() noexcept final;
     void reallocateExternalStorage(ExternalTexture* ets,
-            uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final override;
-    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final override;
+            uint32_t w, uint32_t h, driver::TextureFormat format) noexcept final;
+    void destroyExternalTextureStorage(ExternalTexture* ets) noexcept final;
 
-    int getOSVersion() const noexcept final override;
+    int getOSVersion() const noexcept final;
 
 private:
     EGLBoolean makeCurrent(EGLSurface surface) noexcept;