diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 8d73fa15cc..b3080d6edd 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -335,7 +335,7 @@ GlobalObject*
 GlobalObject::createInternal(JSContext* cx, const Class* clasp)
 {
     MOZ_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
-    MOZ_ASSERT(clasp->isTrace(JS_GlobalObjectTraceHook));
+    MOZ_ASSERT(clasp->hasTrace());
 
     JSObject* obj = NewObjectWithGivenProto(cx, clasp, nullptr, SingletonObject);
     if (!obj)
diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
index 78482d87fa..db24734a90 100644
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -242,7 +242,6 @@ UNIFIED_SOURCES += [
     'nsURLParsers.cpp',
     'PollableEvent.cpp',
     'Predictor.cpp',
-    'ProxyAutoConfig.cpp',
     'RedirectChannelRegistrar.cpp',
     'RequestContextService.cpp',
     'SimpleBuffer.cpp',
@@ -255,15 +254,18 @@ UNIFIED_SOURCES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'nsURLHelperWin.cpp',
+        'ProxyAutoConfig.cpp',
         'ShutdownLayer.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'nsURLHelperOSX.cpp',
+        'ProxyAutoConfig.cpp',
     ]
 else:
     SOURCES += [
         'nsURLHelperUnix.cpp',
+        'ProxyAutoConfig.cpp',
     ]
 
 # nsINetworkInfoService support.