diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-sanitiser.h
index c514a0279c18..ecb9c63a5be3 100644
--- a/gfx/ots/include/opentype-sanitiser.h
+++ b/gfx/ots/include/opentype-sanitiser.h
@@ -241,7 +241,7 @@ class OTS_API OTSContext {
 void DisableDebugOutput();
 
 // Enable WOFF2 support(experimental).
-void EnableWOFF2();
+void OTS_API EnableWOFF2();
 
 }  // namespace ots
 
diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
index 0fd0cb975f8a..3b627d2c0aba 100644
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -44,6 +44,7 @@ UNIFIED_SOURCES += [
     'prep.cc',
     'vhea.cc',
     'vmtx.cc',
+    'woff2.cc',
 ]
 
 MSVC_ENABLE_PGO = True
@@ -61,5 +62,6 @@ if CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['OTS_DLL'] = True
     DEFINES['OTS_DLL_EXPORTS'] = True
 
-# Disable WOFF2 support.
-DEFINES['OTS_DISABLE_WOFF2'] = True;
+USE_LIBS += [
+    'brotli',
+]
diff --git a/gfx/ots/src/woff2.cc b/gfx/ots/src/woff2.cc
index caa77019188f..104f7833d124 100644
--- a/gfx/ots/src/woff2.cc
+++ b/gfx/ots/src/woff2.cc
@@ -11,7 +11,7 @@
 
 #include <zlib.h>
 
-#include "third_party/brotli/src/brotli/dec/decode.h"
+#include "decode.h"
 
 #include "opentype-sanitiser.h"
 #include "ots-memory-stream.h"