diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
index 5ef2caf8a31..33de055f4df 100644
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -30,6 +30,7 @@ UNIFIED_SOURCES += [
     'nsCertVerificationThread.cpp',
     'nsClientAuthRemember.cpp',
     'nsCrypto.cpp',
+    'nsCryptoHash.cpp',
     'nsDataSignatureVerifier.cpp',
     'nsKeygenHandler.cpp',
     'nsKeygenHandlerContent.cpp',
@@ -43,10 +44,12 @@ UNIFIED_SOURCES += [
     'nsNSSCertificateFakeTransport.cpp',
     'nsNSSCertTrust.cpp',
     'nsNSSCertValidity.cpp',
+    'nsNSSComponent.cpp',
     'nsNSSErrors.cpp',
     'nsNSSIOLayer.cpp',
     'nsNSSModule.cpp',
     'nsNSSShutDown.cpp',
+    'nsNSSVersion.cpp',
     'nsNTLMAuthModule.cpp',
     'nsPK11TokenDB.cpp',
     'nsPKCS11Slot.cpp',
@@ -60,6 +63,7 @@ UNIFIED_SOURCES += [
     'nsSSLStatus.cpp',
     'nsTLSSocketProvider.cpp',
     'nsUsageArrayHelper.cpp',
+    'PSMContentListener.cpp',
     'PSMRunnable.cpp',
     'SharedSSLState.cpp',
     'SSLServerCertVerification.cpp',
@@ -67,14 +71,8 @@ UNIFIED_SOURCES += [
 ]
 
 # nsNSSCertificateDB.cpp needs to include nscert.h before everything else.
-# The rest cannot be built in unified mode because they want to force NSPR
-# logging.
 SOURCES += [
-    'nsCryptoHash.cpp',
     'nsNSSCertificateDB.cpp',
-    'nsNSSComponent.cpp',
-    'nsNSSVersion.cpp',
-    'PSMContentListener.cpp',
 ]
 
 LOCAL_INCLUDES += [