diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/src/nsContainerEnumerator.cpp
index 7822118d4024..f8e8d5d2e1dc 100644
--- a/rdf/base/src/nsContainerEnumerator.cpp
+++ b/rdf/base/src/nsContainerEnumerator.cpp
@@ -79,7 +79,9 @@ ContainerEnumeratorImpl::Init()
 {
     if (gRefCnt++ == 0) {
         nsresult rv;
-        nsCOMPtr<nsIRDFService> rdf = do_GetService(NS_RDFSERVICE_CID);
+
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        nsCOMPtr<nsIRDFService> rdf = do_GetService(kRDFServiceCID);
         NS_ASSERTION(rdf != nullptr, "unable to acquire resource manager");
         if (! rdf)
             return NS_ERROR_FAILURE;
@@ -88,7 +90,8 @@ ContainerEnumeratorImpl::Init()
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
         if (NS_FAILED(rv)) return rv;
 
-        rv = CallGetService(NS_RDFCONTAINERUTILS_CID, &gRDFC);
+        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
+        rv = CallGetService(kRDFContainerUtilsCID, &gRDFC);
         if (NS_FAILED(rv)) return rv;
     }
 
diff --git a/rdf/base/src/nsRDFContainer.cpp b/rdf/base/src/nsRDFContainer.cpp
index ce492b28b65c..f3c32c79cfb6 100644
--- a/rdf/base/src/nsRDFContainer.cpp
+++ b/rdf/base/src/nsRDFContainer.cpp
@@ -686,9 +686,10 @@ RDFContainerImpl::GetNextValue(nsIRDFResource** aResult)
         }
     }
 
-    char buf[sizeof(RDF_NAMESPACE_URI) + 16];
+    static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
+    char buf[sizeof(kRDFNameSpaceURI) + 16];
     nsFixedCString nextValStr(buf, sizeof(buf), 0);
-    nextValStr = RDF_NAMESPACE_URI;
+    nextValStr = kRDFNameSpaceURI;
     nextValStr.Append("_");
     nextValStr.AppendInt(nextVal, 10);
 
diff --git a/rdf/base/src/nsRDFContainerUtils.cpp b/rdf/base/src/nsRDFContainerUtils.cpp
index 4abe86634b8c..146f390d470a 100644
--- a/rdf/base/src/nsRDFContainerUtils.cpp
+++ b/rdf/base/src/nsRDFContainerUtils.cpp
@@ -323,7 +323,8 @@ RDFContainerUtilsImpl::RDFContainerUtilsImpl()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
-        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_SUCCEEDED(rv)) {
diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp
index d240f2764bbf..dcd8623eac23 100644
--- a/rdf/base/src/nsRDFContentSink.cpp
+++ b/rdf/base/src/nsRDFContentSink.cpp
@@ -270,7 +270,8 @@ RDFContentSinkImpl::RDFContentSinkImpl()
       mDocumentURL(nullptr)
 {
     if (gRefCnt++ == 0) {
-        nsresult rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        nsresult rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_SUCCEEDED(rv)) {
@@ -288,8 +289,8 @@ RDFContentSinkImpl::RDFContentSinkImpl()
                                           &kRDF_nextVal);
         }
 
-
-        rv = CallGetService(NS_RDFCONTAINERUTILS_CID, &gRDFContainerUtils);
+        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
+        rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
 
         NS_RegisterStaticAtoms(rdf_atoms);
     }
@@ -379,7 +380,7 @@ RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(kIRDFContentSinkIID) ||
         iid.Equals(kIXMLContentSinkIID) ||
         iid.Equals(kIContentSinkIID) ||
-        iid.Equals(NS_GET_IID(nsISupports))) {
+        iid.Equals(kISupportsIID)) {
         *result = static_cast<nsIXMLContentSink*>(this);
         AddRef();
         return NS_OK;
diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/src/nsRDFXMLDataSource.cpp
index 4308f2f3e4b8..e59a24a3d106 100644
--- a/rdf/base/src/nsRDFXMLDataSource.cpp
+++ b/rdf/base/src/nsRDFXMLDataSource.cpp
@@ -414,7 +414,8 @@ RDFXMLDataSourceImpl::Init()
     if (NS_FAILED(rv)) return rv;
 
     if (gRefCnt++ == 0) {
-        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_FAILED(rv)) return rv;
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
index d728ecda24c0..cc8fd93105f4 100644
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -17,28 +17,20 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'url-classifier'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
+    'HashStore.cpp',
     'LookupCache.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
+    'nsUrlClassifierPrefixSet.cpp',
     'nsUrlClassifierProxies.cpp',
+    'nsUrlClassifierStreamUpdater.cpp',
     'nsUrlClassifierUtils.cpp',
     'ProtocolParser.cpp',
 ]
 
-# define conflicting LOG() macros
-SOURCES += [
-    'nsUrlClassifierPrefixSet.cpp',
-    'nsUrlClassifierStreamUpdater.cpp',
-]
-
-# contains variables that conflict with LookupCache.cpp
-SOURCES += [
-    'HashStore.cpp',
-]
-
 EXTRA_COMPONENTS += [
     'nsURLClassifier.manifest',
     'nsUrlClassifierHashCompleter.js',