1 files changed, 10 insertions, 21 deletions
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index e253d7891..b2396bceb 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -148,11 +148,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'PrintTargetWindows.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
-        UNIFIED_SOURCES += [
-            'gfxDWriteFontList.cpp',
-        ]
         SOURCES += [
             'gfxDWriteCommon.cpp',
+            'gfxDWriteFontList.cpp',
             'gfxDWriteFonts.cpp',
         ]
 
@@ -164,27 +162,14 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 
 SOURCES += [
-    'ContextStateTracker.cpp',
-    # Includes mac system header conflicting with point/size,
-    # and includes glxXlibSurface.h which drags in Xrender.h
-    'gfxASurface.cpp',
-    # on X11, gfxDrawable.cpp includes X headers for an old workaround which
-    # we could consider removing soon (affects Ubuntus older than 10.04 LTS)
-    # which currently prevent it from joining UNIFIED_SOURCES.
-    'gfxDrawable.cpp',
-    # gfxPlatform.cpp includes mac system header conflicting with point/size
-    'gfxPlatform.cpp',
-    'gfxPrefs.cpp',
-    'PrintTarget.cpp',
-    'PrintTargetThebes.cpp',
-]
-
-UNIFIED_SOURCES += [
     'CJKCompatSVS.cpp',
+    'ContextStateTracker.cpp',
     'gfxAlphaRecovery.cpp',
+    'gfxASurface.cpp',
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxContext.cpp',
+    'gfxDrawable.cpp',
     'gfxFont.cpp',
     'gfxFontEntry.cpp',
     'gfxFontFeatures.cpp',
@@ -200,7 +185,9 @@ UNIFIED_SOURCES += [
     'gfxMathTable.cpp',
     'gfxMatrix.cpp',
     'gfxPattern.cpp',
+    'gfxPlatform.cpp',
     'gfxPlatformFontList.cpp',
+    'gfxPrefs.cpp',
     'gfxRect.cpp',
     'gfxScriptItemizer.cpp',
     'gfxSkipChars.cpp',
@@ -209,16 +196,18 @@ UNIFIED_SOURCES += [
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsUnicodeRange.cpp',
+    'PrintTarget.cpp',
+    'PrintTargetThebes.cpp',
     'SoftwareVsyncSource.cpp',
     'VsyncSource.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'D3D11Checks.cpp',
         'DeviceManagerDx.cpp',
     ]