diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index a1855411a988..e82161a96a26 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -85,14 +85,6 @@ var gPluginHandler = {
     }
   },
 
-#ifdef MOZ_CRASHREPORTER
-  get CrashSubmit() {
-    delete this.CrashSubmit;
-    Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
-    return this.CrashSubmit;
-  },
-#endif
-
   // Callback for user clicking on a disabled plugin
   managePlugins: function () {
     BrowserOpenAddonsMgr("addons://list/plugin");
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index f5a15be14ac9..badd3d04dba3 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -230,10 +230,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "gWebRTCUI",
 
 XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler",
   "resource:///modules/ContentCrashHandlers.jsm");
-#ifdef MOZ_CRASHREPORTER
-XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter",
-  "resource:///modules/ContentCrashHandlers.jsm");
-#endif
+
+if (AppConstants.MOZ_CRASHREPORTER) {
+  XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter",
+    "resource:///modules/ContentCrashHandlers.jsm");
+}
 
 XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
   "resource:///modules/FormValidationHandler.jsm");
@@ -289,11 +290,11 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
   return null;
 });
 
-#ifdef MOZ_CRASHREPORTER
-XPCOMUtils.defineLazyServiceGetter(this, "gCrashReporter",
-                                   "@mozilla.org/xre/app-info;1",
-                                   "nsICrashReporter");
-#endif
+if (AppConstants.MOZ_CRASHREPORTER) {
+  XPCOMUtils.defineLazyServiceGetter(this, "gCrashReporter",
+                                     "@mozilla.org/xre/app-info;1",
+                                     "nsICrashReporter");
+}
 
 XPCOMUtils.defineLazyGetter(this, "PageMenuParent", function() {
   let tmp = {};
@@ -4460,8 +4461,7 @@ var XULBrowserWindow = {
     else
       this.asyncUpdateUI();
 
-#ifdef MOZ_CRASHREPORTER
-    if (aLocationURI) {
+    if (AppConstants.MOZ_CRASHREPORTER && aLocationURI) {
       let uri = aLocationURI.clone();
       try {
         // If the current URI contains a username/password, remove it.
@@ -4474,7 +4474,6 @@ var XULBrowserWindow = {
         // Don't make noise when the crash reporter is built but not enabled.
       }
     }
-#endif
   },
 
   asyncUpdateUI: function () {
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 7ba9cced4160..37911f796371 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -89,7 +89,7 @@ browser.jar:
         content/browser/browser-fxaccounts.js         (content/browser-fxaccounts.js)
 *       content/browser/browser-gestureSupport.js     (content/browser-gestureSupport.js)
 *       content/browser/browser-places.js             (content/browser-places.js)
-*       content/browser/browser-plugins.js            (content/browser-plugins.js)
+        content/browser/browser-plugins.js            (content/browser-plugins.js)
 #ifdef MOZ_SAFE_BROWSING
         content/browser/browser-safebrowsing.js       (content/browser-safebrowsing.js)
 #endif