diff --git a/gfx/src/gfxTelemetry.cpp b/gfx/src/gfxTelemetry.cpp
index 4726e35244..386bcae823 100644
--- a/gfx/src/gfxTelemetry.cpp
+++ b/gfx/src/gfxTelemetry.cpp
@@ -4,6 +4,7 @@
  * 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/. */
 #include "gfxTelemetry.h"
+#include "mozilla/Assertions.h"
 
 namespace mozilla {
 namespace gfx {
diff --git a/gfx/src/moz.build b/gfx/src/moz.build
index ea707a340a..b11fada66d 100644
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -56,11 +56,12 @@ if CONFIG['MOZ_X11']:
         'X11Util.cpp',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DriverCrashGuard.cpp',
     'FilterSupport.cpp',
     'gfxTelemetry.cpp',
     'nsColor.cpp',
+    'nsDeviceContext.cpp',
     'nsFont.cpp',
     'nsFontMetrics.cpp',
     'nsRect.cpp',
@@ -72,11 +73,6 @@ UNIFIED_SOURCES += [
     'TiledRegion.cpp',
 ]
 
-# nsDeviceContext.cpp cannot be built in unified mode because it pulls in OS X system headers.
-SOURCES += [
-    'nsDeviceContext.cpp',
-]
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index 3b0bec1e31..ed86704e89 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -5,6 +5,7 @@
 
 #include "nsRegion.h"
 #include "nsTArray.h"
+#include "gfx2DGlue.h"
 #include "gfxUtils.h"
 #include "mozilla/ToString.h"