diff --git a/core/block_svg.js b/core/block_svg.js
index b176bc0a4..64f40c93a 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -33,7 +33,6 @@ goog.require('Blockly.ContextMenu');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Events.BlockMove');
-goog.require('Blockly.Grid');
 goog.require('Blockly.Msg');
 goog.require('Blockly.RenderedConnection');
 goog.require('Blockly.Tooltip');
diff --git a/core/requires.js b/core/requires.js
index 2d25644ea..ed8849df5 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -29,6 +29,8 @@ goog.provide('Blockly.requires');
 
 // Blockly Core.
 goog.require('Blockly');
+goog.require('Blockly.Trashcan');
+goog.require('Blockly.ZoomControls');
 // Blockly Fields.
 goog.require('Blockly.FieldAngle');
 goog.require('Blockly.FieldCheckbox');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 0eff6fbf5..9a8a5b944 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -41,7 +41,6 @@ goog.require('Blockly.Options');
 goog.require('Blockly.ScrollbarPair');
 goog.require('Blockly.Touch');
 goog.require('Blockly.TouchGesture');
-goog.require('Blockly.Trashcan');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
@@ -55,7 +54,6 @@ goog.require('Blockly.WorkspaceCommentSvg');
 goog.require('Blockly.WorkspaceCommentSvg.render');
 goog.require('Blockly.WorkspaceDragSurfaceSvg');
 goog.require('Blockly.Xml');
-goog.require('Blockly.ZoomControls');
 
 
 /**
@@ -766,6 +764,9 @@ Blockly.WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) {
  * @package
  */
 Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
+  if (!Blockly.Trashcan) {
+    throw Error('Missing require for Blockly.Trashcan');
+  }
   /** @type {Blockly.Trashcan} */
   this.trashcan = new Blockly.Trashcan(this);
   var svgTrashcan = this.trashcan.createDom();
@@ -777,6 +778,9 @@ Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
  * @package
  */
 Blockly.WorkspaceSvg.prototype.addZoomControls = function() {
+  if (!Blockly.ZoomControls) {
+    throw Error('Missing require for Blockly.ZoomControls');
+  }
   /** @type {Blockly.ZoomControls} */
   this.zoomControls_ = new Blockly.ZoomControls(this);
   var svgZoomControls = this.zoomControls_.createDom();