diff --git a/devtools/client/shared/doorhanger.js b/devtools/client/shared/doorhanger.js
index 5eebb4d3009e..577ec10c81d2 100644
--- a/devtools/client/shared/doorhanger.js
+++ b/devtools/client/shared/doorhanger.js
@@ -8,7 +8,6 @@ const Services = require("Services");
 const { DOMHelpers } = require("resource://devtools/client/shared/DOMHelpers.jsm");
 const { Task } = require("devtools/shared/task");
 const defer = require("devtools/shared/defer");
-const { getMostRecentBrowserWindow } = require("sdk/window/utils");
 
 const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const DEV_EDITION_PROMO_URL = "chrome://devtools/content/framework/dev-edition-promo/dev-edition-promo.xul";
@@ -150,7 +149,7 @@ function onFrameLoad(frame) {
 }
 
 function getGBrowser() {
-  return getMostRecentBrowserWindow().gBrowser;
+  return Services.wm.getMostRecentWindow("navigator:browser").gBrowser;
 }
 
 function wait(n) {
diff --git a/devtools/shared/gcli/commands/rulers.js b/devtools/shared/gcli/commands/rulers.js
index 7cc2feb0df7a..b24d23422ade 100644
--- a/devtools/shared/gcli/commands/rulers.js
+++ b/devtools/shared/gcli/commands/rulers.js
@@ -6,7 +6,6 @@
 
 const events = require("sdk/event/core");
 
-loader.lazyRequireGetter(this, "getOuterId", "sdk/window/utils", true);
 loader.lazyRequireGetter(this, "CommandState",
   "devtools/shared/gcli/command-state", true);
 
diff --git a/devtools/shared/worker/worker.js b/devtools/shared/worker/worker.js
index 7e6d2c437da2..d54ba82c1221 100644
--- a/devtools/shared/worker/worker.js
+++ b/devtools/shared/worker/worker.js
@@ -139,10 +139,9 @@
     console.warn("`workerify` should only be used in tests or measuring performance. " +
                  "This creates an object URL on the browser window, and should not be " +
                  "used in production.");
-    // Fetch via window/utils here as we don't want to include
-    // this module normally.
-    let { getMostRecentBrowserWindow } = require("sdk/window/utils");
-    let { URL, Blob } = getMostRecentBrowserWindow();
+    // Fetch modules here as we don't want to include it normally.
+    const Services = require("Services");
+    let { URL, Blob } = Services.wm.getMostRecentWindow("navigator:browser");
     let stringifiedFn = createWorkerString(fn);
     let blob = new Blob([stringifiedFn]);
     let url = URL.createObjectURL(blob);