--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/places-overlay.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/places-overlay.js
@@ -15,33 +15,32 @@
 // -----------------------------------------------------------------------------
 var path = require("path");
 var helpers = require("../helpers");
 var globals = require("../globals");
 var modules = helpers.modulesGlobalData;
 
 const placesOverlayFiles = [
   "toolkit/content/globalOverlay.js",
-  "browser/base/content/utilityOverlay.js",
-  "browser/components/places/content/controller.js",
-  "browser/components/places/content/treeView.js"
+  "browser/base/content/utilityOverlay.js"
 ];
 
 const extraPlacesDefinitions = [
-  // Straight definitions.
-  {name: "Cc", writable: false},
-  {name: "Ci", writable: false},
-  {name: "Cr", writable: false},
-  {name: "Cu", writable: false},
-  // Via Components.utils / XPCOMUtils.defineLazyModuleGetter (and map to
+  // Via Components.utils, defineModuleGetter, defineLazyModuleGetters or
+  // defineLazyScriptGetter (and map to
   // single) variable.
   {name: "XPCOMUtils", writable: false},
   {name: "Task", writable: false},
   {name: "PlacesUIUtils", writable: false},
-  {name: "PlacesTransactions", writable: false}
+  {name: "PlacesTransactions", writable: false},
+  {name: "ForgetAboutSite", writable: false},
+  {name: "PlacesTreeView", writable: false},
+  {name: "PlacesInsertionPoint", writable: false},
+  {name: "PlacesController", writable: false},
+  {name: "PlacesControllerDragHelper", writable: false}
 ];
 
 const placesOverlayModules = [
   "PlacesUtils.jsm"
 ];
 
 function getScriptGlobals() {
   let fileGlobals = [];