--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -40,9 +40,10 @@ if CONFIG['MOZ_XUL']:
         'inDOMView.cpp',
     ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../style',
     '/dom/base',
     '/dom/xbl',
+    '/modules/brotli/dec',
 ]

--- a/modules/brotli/moz.build
+++ b/modules/brotli/moz.build
@@ -2,25 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'General')
 
-EXPORTS += [
-    'dec/bit_reader.h',
-    'dec/decode.h',
-    'dec/huffman.h',
-    'dec/port.h',
-    'dec/state.h',
-    'dec/types.h',
-]
-
 UNIFIED_SOURCES += [
     'dec/bit_reader.c',
     'dec/decode.c',
     'dec/dictionary.c',
     'dec/huffman.c',
     'dec/state.c',
 ]
 

--- a/modules/woff2/moz.build
+++ b/modules/woff2/moz.build
@@ -10,12 +10,16 @@ with Files('**'):
 UNIFIED_SOURCES += [
     'src/table_tags.cc',
     'src/variable_length.cc',
     'src/woff2_common.cc',
     'src/woff2_dec.cc',
     'src/woff2_out.cc',
 ]
 
+LOCAL_INCLUDES += [
+    '/modules/brotli/dec',
+]
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
 Library('woff2')

--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -64,9 +64,10 @@ if CONFIG['NECKO_WIFI']:
 
 if CONFIG['MOZ_RTSP']:
     LOCAL_INCLUDES += [
         '/netwerk/protocol/rtsp',
     ]
 
 LOCAL_INCLUDES += [
     '!/netwerk/dns',
+    '/modules/brotli/dec',
 ]

--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -30,10 +30,11 @@ if 'ftp' in CONFIG['NECKO_PROTOCOLS']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     UNIFIED_SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '/modules/brotli/dec',
     '/netwerk/base',
 ]