diff --git a/_HasDropDown.js b/_HasDropDown.js
index 2d4e9c90e..3291ece4f 100644
--- a/_HasDropDown.js
+++ b/_HasDropDown.js
@@ -1,6 +1,6 @@
 define([
 	"dojo/_base/declare", // declare
-	"dojo/_base/Deferred",
+	"dojo/Deferred",
 	"dojo/dom", // dom.isDescendant
 	"dojo/dom-attr", // domAttr.set
 	"dojo/dom-class", // domClass.add domClass.contains domClass.remove
diff --git a/_editor/RichText.js b/_editor/RichText.js
index 1ae8a48a3..ca8065db5 100644
--- a/_editor/RichText.js
+++ b/_editor/RichText.js
@@ -2,7 +2,7 @@ define([
 	"dojo/_base/array", // array.forEach array.indexOf array.some
 	"dojo/_base/config", // config
 	"dojo/_base/declare", // declare
-	"dojo/_base/Deferred", // Deferred
+	"dojo/Deferred", // Deferred
 	"dojo/dom", // dom.byId
 	"dojo/dom-attr", // domAttr.set or get
 	"dojo/dom-class", // domClass.add domClass.remove
diff --git a/form/_FormSelectWidget.js b/form/_FormSelectWidget.js
index cd2cbf205..f81484937 100644
--- a/form/_FormSelectWidget.js
+++ b/form/_FormSelectWidget.js
@@ -1,8 +1,7 @@
 define([
 	"dojo/_base/array", // array.filter array.forEach array.map array.some
 	"dojo/aspect",
-	"dojo/_base/Deferred",
-	"dojo/aspect", // aspect.after
+	"dojo/Deferred",
 	"dojo/data/util/sorter", // util.sorter.createSortFunction
 	"dojo/_base/declare", // declare
 	"dojo/dom", // dom.setSelectable
@@ -13,7 +12,7 @@ define([
 	"dojo/when",
 	"dojo/store/util/QueryResults",
 	"./_FormValueWidget"
-], function(array, aspect, Deferred, aspect, sorter, declare, dom, domClass, kernel, lang, query, when,
+], function(array, aspect, Deferred, sorter, declare, dom, domClass, kernel, lang, query, when,
 			QueryResults, _FormValueWidget){
 
 // module:
diff --git a/layout/ContentPane.js b/layout/ContentPane.js
index 477547b21..05b6d2243 100644
--- a/layout/ContentPane.js
+++ b/layout/ContentPane.js
@@ -9,7 +9,7 @@ define([
 	"dojo/i18n!../nls/loading",
 	"dojo/_base/array", // array.forEach
 	"dojo/_base/declare", // declare
-	"dojo/_base/Deferred", // Deferred
+	"dojo/Deferred", // Deferred
 	"dojo/dom", // dom.byId
 	"dojo/dom-attr", // domAttr.attr
 	"dojo/dom-construct", // empty()