diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
index bfaed8cf88f5..27601deb96d0 100644
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -20,7 +20,7 @@ EXPORTS.angle += [
 
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/compiler/preprocessor/' + src for src in [
     'DiagnosticsBase.cpp',
     'DirectiveHandlerBase.cpp',
     'DirectiveParser.cpp',
@@ -32,13 +32,13 @@ CPP_SOURCES += [
     'Preprocessor.cpp',
     'Token.cpp',
     'Tokenizer.cpp',
-]
+]]
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
@@ -67,46 +67,46 @@ CPP_SOURCES += [
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
-]
+]]
 
 # src/compiler/depgraph:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
-]
+]]
 
 # src/compiler/timing:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/compiler/timing/' + src for src in [
     'RestrictFragmentShaderTiming.cpp',
     'RestrictVertexShaderTiming.cpp',
-]
+]]
 
 # src/third_party/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/third_party/compiler/' + src for src in [
     'ArrayBoundsClamper.cpp',
-]
+]]
 
 # src/third_party/murmurhash:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/third_party/murmurhash/' + src for src in [
     'MurmurHash3.cpp',
-]
+]]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
-        'ossource_win.cpp',
+        'src/compiler/ossource_win.cpp',
     ]
 else:
     CPP_SOURCES += [
-        'ossource_posix.cpp',
+        'src/compiler/ossource_posix.cpp',
     ]
 
 
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
 # src/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['src/compiler/' + src for src in [
     'CodeGenGLSL.cpp',
     'OutputESSL.cpp',
     'OutputGLSLBase.cpp',
@@ -115,7 +115,7 @@ CPP_SOURCES += [
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
-]
+]]
 
 LIBRARY_NAME = 'angle'
 LIBXUL_LIBRARY = True
diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
index 81eff9d4371a..0c5745e12dd5 100644
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -9,10 +9,10 @@ MODULE = 'libegl'
 # Target: 'libEGL'
 #   Requires: 'libGLESv2'
 # src/common:
-CPP_SOURCES += [
+CPP_SOURCES += ['../common/' + src for src in [
     'debug.cpp',
     'RefCountObject.cpp',
-]
+]]
 
 # src/libEGL
 CPP_SOURCES += [
diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
index c26405eebc80..38ead5f0d85b 100644
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -8,7 +8,7 @@ MODULE = 'libglesv2'
 
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
-CPP_SOURCES += [
+CPP_SOURCES += ['../compiler/preprocessor/' + src for src in [
     'DiagnosticsBase.cpp',
     'DirectiveHandlerBase.cpp',
     'DirectiveParser.cpp',
@@ -20,13 +20,13 @@ CPP_SOURCES += [
     'Preprocessor.cpp',
     'Token.cpp',
     'Tokenizer.cpp',
-]
+]]
 
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['../compiler/' + src for src in [
     'BuiltInFunctionEmulator.cpp',
     'Compiler.cpp',
     'compiler_debug.cpp',
@@ -55,46 +55,46 @@ CPP_SOURCES += [
     'ValidateLimitations.cpp',
     'VariableInfo.cpp',
     'VariablePacker.cpp',
-]
+]]
 
 # src/compiler/depgraph:
-CPP_SOURCES += [
+CPP_SOURCES += ['../compiler/depgraph/' + src for src in [
     'DependencyGraph.cpp',
     'DependencyGraphBuilder.cpp',
     'DependencyGraphOutput.cpp',
     'DependencyGraphTraverse.cpp',
-]
+]]
 
 # src/compiler/timing:
-CPP_SOURCES += [
+CPP_SOURCES += ['../compiler/timing/' + src for src in [
     'RestrictFragmentShaderTiming.cpp',
     'RestrictVertexShaderTiming.cpp',
-]
+]]
 
 # src/third_party/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['../third_party/compiler/' + src for src in [
     'ArrayBoundsClamper.cpp',
-]
+]]
 
 # src/third_party/murmurhash:
-CPP_SOURCES += [
+CPP_SOURCES += ['../third_party/murmurhash/' + src for src in [
     'MurmurHash3.cpp',
-]
+]]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
-        'ossource_win.cpp',
+        '../compiler/ossource_win.cpp',
     ]
 else:
     CPP_SOURCES += [
-        'ossource_posix.cpp',
+        '../compiler/ossource_posix.cpp',
     ]
 
 
 # Target: 'translator_hlsl'
 #   Requires: 'translator_common'
 # src/compiler:
-CPP_SOURCES += [
+CPP_SOURCES += ['../compiler/' + src for src in [
     'ShaderLang.cpp',
     'DetectDiscontinuity.cpp',
     'CodeGenHLSL.cpp',
@@ -102,16 +102,16 @@ CPP_SOURCES += [
     'TranslatorHLSL.cpp',
     'UnfoldShortCircuit.cpp',
     'SearchSymbol.cpp',
-]
+]]
 
 
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
-CPP_SOURCES += [
+CPP_SOURCES += ['../common/' + src for src in [
     'debug.cpp',
     'RefCountObject.cpp',
-]
+]]
 
 # src/libGLESv2:
 CPP_SOURCES += [
@@ -136,7 +136,7 @@ CPP_SOURCES += [
 ]
 
 # src/libGLESv2/renderer:
-CPP_SOURCES += [
+CPP_SOURCES += ['renderer/' + src for src in [
     'Blit.cpp',
     'BufferStorage.cpp',
     'BufferStorage9.cpp',
@@ -175,6 +175,6 @@ CPP_SOURCES += [
     'VertexBuffer11.cpp',
     'VertexDataManager.cpp',
     'VertexDeclarationCache.cpp',
-]
+]]
 
 LIBRARY_NAME = 'libGLESv2'
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 58e4edcec6c0..62fba06858c7 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -126,7 +126,7 @@ class TreeMetadataEmitter(LoggingMixin):
             yield XPIDLFile(sandbox, mozpath.join(sandbox['SRCDIR'], idl),
                 xpidl_module)
 
-        exclusions = ('gfx', 'toolkit/crashreporter')
+        exclusions = ('gfx/layers', 'gfx/skia', 'toolkit/crashreporter')
 
         if sandbox['CPP_SOURCES'] and not sandbox['RELATIVEDIR'].startswith(exclusions) and os.path.join('js', 'src') not in sandbox.main_path:
             for src in sandbox['CPP_SOURCES']: