diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 25643e42945..4ee11aba031 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -110,7 +110,7 @@ browser.jar:
         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
         content/browser/newtab/newTab.inadjacent.json         (content/newtab/newTab.inadjacent.json)
         content/browser/remote-newtab/newTab.xhtml    (content/remote-newtab/newTab.xhtml)
-*       content/browser/remote-newtab/newTab.js       (content/remote-newtab/newTab.js)
+        content/browser/remote-newtab/newTab.js       (content/remote-newtab/newTab.js)
         content/browser/remote-newtab/newTab.css      (content/remote-newtab/newTab.css)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
diff --git a/browser/components/preferences/applicationManager.js b/browser/components/preferences/applicationManager.js
index 5e7c110a8d3..adbcc397749 100644
--- a/browser/components/preferences/applicationManager.js
+++ b/browser/components/preferences/applicationManager.js
@@ -1,6 +1,6 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
index 28fac1e50f1..b7c15b78b66 100644
--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -8,7 +8,7 @@ browser.jar:
     content/browser/preferences/aboutPermissions.css
     content/browser/preferences/aboutPermissions.xml
     content/browser/preferences/applicationManager.xul
-*   content/browser/preferences/applicationManager.js
+    content/browser/preferences/applicationManager.js
     content/browser/preferences/blocklists.xul
     content/browser/preferences/blocklists.js
 *   content/browser/preferences/colors.xul
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index 899dd83c929..f400e3144b2 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -31,6 +31,8 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'TelemetryArchive.jsm',
+    'TelemetryController.jsm',
+    'TelemetryEnvironment.jsm',
     'TelemetryLog.jsm',
     'TelemetryReportingPolicy.jsm',
     'TelemetrySend.jsm',
@@ -42,8 +44,6 @@ EXTRA_JS_MODULES += [
 ]
 
 EXTRA_PP_JS_MODULES += [
-    'TelemetryController.jsm',
-    'TelemetryEnvironment.jsm',
     'TelemetrySession.jsm',
 ]
 
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index 97184f31865..11015b17a72 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -21,12 +21,12 @@ EXTRA_COMPONENTS += [
     'amContentHandler.js',
     'amInstallTrigger.js',
     'amWebInstallListener.js',
+    'nsBlocklistServiceContent.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'extensions.manifest',
     'nsBlocklistService.js',
-    'nsBlocklistServiceContent.js',
 ]
 
 EXTRA_JS_MODULES += [