--- a/gfx/angle/src/libANGLE/moz.build
+++ b/gfx/angle/src/libANGLE/moz.build
@@ -123,16 +123,17 @@ UNIFIED_SOURCES += [
     '../compiler/translator/ValidateLimitations.cpp',
     '../compiler/translator/ValidateMaxParameters.cpp',
     '../compiler/translator/ValidateSwitch.cpp',
     '../compiler/translator/ValidateVaryingLocations.cpp',
     '../compiler/translator/VectorizeVectorScalarArithmetic.cpp',
     '../compiler/translator/VersionGLSL.cpp',
     '../compiler/translator/WrapSwitchStatementsInBlocks.cpp',
     '../third_party/compiler/ArrayBoundsClamper.cpp',
+    '../third_party/systeminfo/SystemInfo.cpp',
     'angletypes.cpp',
     'AttributeMap.cpp',
     'Buffer.cpp',
     'Caps.cpp',
     'Compiler.cpp',
     'Config.cpp',
     'Context.cpp',
     'ContextState.cpp',
@@ -298,17 +299,16 @@ SOURCES += [
     '../compiler/translator/ValidateOutputs.cpp',
     '../compiler/translator/VariablePacker.cpp',
     '../gpu_info_util/SystemInfo.cpp',
     '../gpu_info_util/SystemInfo_win.cpp',
     '../image_util/copyimage.cpp',
     '../image_util/imageformats.cpp',
     '../image_util/loadimage.cpp',
     '../image_util/loadimage_etc.cpp',
-    '../third_party/systeminfo/SystemInfo.cpp',
     'Display.cpp',
     'renderer/d3d/DisplayD3D.cpp',
     'renderer/d3d/HLSLCompiler.cpp',
     'renderer/gl/FramebufferGL.cpp',
 ]
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     UNIFIED_SOURCES += [
         'renderer/d3d/d3d11/Blit11.cpp',

--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -3,17 +3,17 @@
 # WARNING WARNING WARNING
 #
 # This file is generated by generate_mozbuild.py (from
 # https://github.com/mozilla/angle). Do not modify it without also modifying
 # generate_mozbuild.py.
 #
 # WARNING WARNING WARNING
 #
-UNIFIED_SOURCES += [
+SOURCES += [
     'entry_points_egl.cpp',
     'entry_points_egl_ext.cpp',
     'entry_points_gles_2_0_autogen.cpp',
     'entry_points_gles_2_0_ext.cpp',
     'entry_points_gles_2_0_ext_autogen.cpp',
     'entry_points_gles_3_0_autogen.cpp',
     'entry_points_gles_3_1_autogen.cpp',
     'global_state.cpp',