diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp
index fe6830513bb7..7a60caab578d 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -35,6 +35,7 @@
 #include "nsContentUtils.h"
 #include "nsDisplayList.h"
 #include "TexUnpackBlob.h"
+#include "WebGLFormats.h"
 #include "WebGLMethodDispatcher.h"
 #include "WebGLChild.h"
 #include "WebGLTextureUpload.h"
diff --git a/dom/canvas/ClientWebGLContext.h b/dom/canvas/ClientWebGLContext.h
index 62957ee445e2..caebcd3af35a 100644
--- a/dom/canvas/ClientWebGLContext.h
+++ b/dom/canvas/ClientWebGLContext.h
@@ -18,7 +18,6 @@
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
 #include "mozilla/layers/LayersSurfaces.h"
 #include "mozilla/StaticPrefs_webgl.h"
-#include "WebGLFormats.h"
 #include "WebGLStrongTypes.h"
 #include "WebGLTypes.h"
 
diff --git a/dom/canvas/WebGLContextDraw.cpp b/dom/canvas/WebGLContextDraw.cpp
index d23afbebbe02..98744fcf9dda 100644
--- a/dom/canvas/WebGLContextDraw.cpp
+++ b/dom/canvas/WebGLContextDraw.cpp
@@ -15,6 +15,7 @@
 #include "nsPrintfCString.h"
 #include "WebGLBuffer.h"
 #include "WebGLContextUtils.h"
+#include "WebGLFormats.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLProgram.h"
 #include "WebGLRenderbuffer.h"
diff --git a/dom/canvas/WebGLContextState.cpp b/dom/canvas/WebGLContextState.cpp
index 8a7a5b4b4b7c..01abb7583485 100644
--- a/dom/canvas/WebGLContextState.cpp
+++ b/dom/canvas/WebGLContextState.cpp
@@ -13,6 +13,7 @@
 #include "nsString.h"
 #include "WebGLBuffer.h"
 #include "WebGLContextUtils.h"
+#include "WebGLFormats.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLProgram.h"
 #include "WebGLRenderbuffer.h"
diff --git a/dom/canvas/WebGLContextValidate.cpp b/dom/canvas/WebGLContextValidate.cpp
index e5197db8079a..697f168c205a 100644
--- a/dom/canvas/WebGLContextValidate.cpp
+++ b/dom/canvas/WebGLContextValidate.cpp
@@ -17,6 +17,7 @@
 #include "nsPrintfCString.h"
 #include "WebGLBuffer.h"
 #include "WebGLContextUtils.h"
+#include "WebGLFormats.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLProgram.h"
 #include "WebGLRenderbuffer.h"
diff --git a/dom/canvas/WebGLExtensions.cpp b/dom/canvas/WebGLExtensions.cpp
index 1eaaea7dfd90..be9323ca716c 100644
--- a/dom/canvas/WebGLExtensions.cpp
+++ b/dom/canvas/WebGLExtensions.cpp
@@ -11,6 +11,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_webgl.h"
 #include "WebGLContext.h"
+#include "WebGLFormats.h"
 
 namespace mozilla {
 
@@ -65,7 +66,7 @@ WebGLExtensionColorBufferFloat::WebGLExtensionColorBufferFloat(
 }
 
 void WebGLExtensionColorBufferFloat::SetRenderable(
-    const webgl::FormatRenderableState state) {
+    const webgl::FormatRenderableState& state) {
   auto& fua = mContext->mFormatUsage;
 
   auto fnUpdateUsage = [&](GLenum sizedFormat,
@@ -106,7 +107,7 @@ WebGLExtensionColorBufferHalfFloat::WebGLExtensionColorBufferHalfFloat(
 }
 
 void WebGLExtensionColorBufferHalfFloat::SetRenderable(
-    const webgl::FormatRenderableState state) {
+    const webgl::FormatRenderableState& state) {
   auto& fua = mContext->mFormatUsage;
 
   auto fnUpdateUsage = [&](GLenum sizedFormat, webgl::EffectiveFormat effFormat,
diff --git a/dom/canvas/WebGLExtensions.h b/dom/canvas/WebGLExtensions.h
index 449bb335b6bf..e80681525434 100644
--- a/dom/canvas/WebGLExtensions.h
+++ b/dom/canvas/WebGLExtensions.h
@@ -12,7 +12,6 @@
 #include "nsWrapperCache.h"
 #include "WebGLObjectModel.h"
 #include "WebGLTypes.h"
-#include "WebGLFormats.h"
 
 namespace mozilla {
 class ErrorResult;
@@ -25,6 +24,7 @@ class Sequence;
 }  // namespace dom
 
 namespace webgl {
+struct FormatRenderableState;
 class FormatUsageAuthority;
 }  // namespace webgl
 
@@ -250,7 +250,7 @@ class WebGLExtensionColorBufferFloat : public WebGLExtensionBase {
   explicit WebGLExtensionColorBufferFloat(WebGLContext*);
   static bool IsSupported(const WebGLContext*);
 
-  void SetRenderable(const webgl::FormatRenderableState);
+  void SetRenderable(const webgl::FormatRenderableState&);
   void OnSetExplicit() override;
 };
 
@@ -259,7 +259,7 @@ class WebGLExtensionColorBufferHalfFloat : public WebGLExtensionBase {
   explicit WebGLExtensionColorBufferHalfFloat(WebGLContext*);
   static bool IsSupported(const WebGLContext*);
 
-  void SetRenderable(const webgl::FormatRenderableState);
+  void SetRenderable(const webgl::FormatRenderableState&);
   void OnSetExplicit() override;
 };
 
diff --git a/dom/canvas/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp
index f29d3d1c1490..6188344f3b73 100644
--- a/dom/canvas/WebGLProgram.cpp
+++ b/dom/canvas/WebGLProgram.cpp
@@ -14,6 +14,7 @@
 #include "nsPrintfCString.h"
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
+#include "WebGLFormats.h"
 #include "WebGLShader.h"
 #include "WebGLShaderValidator.h"
 #include "WebGLTransformFeedback.h"
diff --git a/dom/canvas/WebGLTextureUpload.cpp b/dom/canvas/WebGLTextureUpload.cpp
index 30d8fad8fa3b..a4c2a679bf01 100644
--- a/dom/canvas/WebGLTextureUpload.cpp
+++ b/dom/canvas/WebGLTextureUpload.cpp
@@ -31,6 +31,7 @@
 #include "TexUnpackBlob.h"
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
+#include "WebGLFormats.h"
 #include "WebGLContextUtils.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLTexelConversions.h"