--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -109,24 +109,28 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
         'cairo-ft.h',
     ]
     SOURCES += [
         'cairo-ft-font.c',
         'cairo-type1-subset.c',
     ]
 
 SOURCES += [
+    'cairo-bentley-ottmann-rectangular.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann-rectilinear.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann.c', # redefinition of '_cairo_bo_trap'
+    'cairo-surface-wrapper.c', #  redefinition of '_copy_transformed_pattern'
+]
+
+UNIFIED_SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',
     'cairo-atomic.c',
     'cairo-base64-stream.c',
-    'cairo-bentley-ottmann-rectangular.c',
-    'cairo-bentley-ottmann-rectilinear.c',
-    'cairo-bentley-ottmann.c',
     'cairo-botor-scan-converter.c',
     'cairo-boxes.c',
     'cairo-cache.c',
     'cairo-clip.c',
     'cairo-color.c',
     'cairo-composite-rectangles.c',
     'cairo-debug.c',
     'cairo-device.c',
@@ -168,17 +172,16 @@ SOURCES += [
     'cairo-spans.c',
     'cairo-spline.c',
     'cairo-stroke-style.c',
     'cairo-surface-clipper.c',
     'cairo-surface-fallback.c',
     'cairo-surface-offset.c',
     'cairo-surface-snapshot.c',
     'cairo-surface-subsurface.c',
-    'cairo-surface-wrapper.c',
     'cairo-surface.c',
     'cairo-tee-surface.c',
     'cairo-tor-scan-converter.c',
     'cairo-toy-font-face.c',
     'cairo-traps.c',
     'cairo-unicode.c',
     'cairo-user-font.c',
     'cairo-version.c',