diff --git a/core/block_svg.js b/core/block_svg.js
index b391fb7a2..6ae84884d 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -35,6 +35,7 @@ goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.userAgent');
 
+goog.requireType('Blockly.blockRendering.Debug');
 goog.requireType('Blockly.Comment');
 goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.Field');
@@ -42,7 +43,9 @@ goog.requireType('Blockly.IASTNodeLocationSvg');
 goog.requireType('Blockly.IBoundedElement');
 goog.requireType('Blockly.ICopyable');
 goog.requireType('Blockly.Input');
+goog.requireType('Blockly.Mutator');
 goog.requireType('Blockly.ShortcutRegistry');
+goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Warning');
 goog.requireType('Blockly.WorkspaceSvg');
 
diff --git a/core/bubble.js b/core/bubble.js
index 5ec9eca47..e597214c3 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -26,6 +26,7 @@ goog.require('Blockly.Workspace');
 goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.IBubble');
+goog.requireType('Blockly.MetricsManager');
 goog.requireType('Blockly.utils.Metrics');
 goog.requireType('Blockly.WorkspaceSvg');
 
diff --git a/core/marker_manager.js b/core/marker_manager.js
index d1d233359..05988a757 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -15,6 +15,8 @@ goog.provide('Blockly.MarkerManager');
 goog.require('Blockly.Cursor');
 goog.require('Blockly.Marker');
 
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Class to manage the multiple markers and the cursor on a workspace.
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index d9669b68e..763e99524 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -19,6 +19,8 @@ goog.require('Blockly.Msg');
 goog.require('Blockly.utils.xml');
 goog.require('Blockly.VariableModel');
 
+goog.requireType('Blockly.Workspace');
+
 
 Blockly.VariablesDynamic.onCreateVariableButtonClick_String = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
diff --git a/core/warning.js b/core/warning.js
index 07b3738fc..ca5385bea 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -20,6 +20,10 @@ goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.utils.Coordinate');
+
 
 /**
  * Class for a warning.
diff --git a/core/workspace.js b/core/workspace.js
index 08e5940e2..ec89c0078 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -19,8 +19,13 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.math');
 goog.require('Blockly.VariableMap');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.ConnectionDB');
+goog.requireType('Blockly.Events.Abstract');
 goog.requireType('Blockly.IASTNodeLocation');
 goog.requireType('Blockly.IConnectionChecker');
+goog.requireType('Blockly.utils.toolbox');
+goog.requireType('Blockly.VariableModel');
 
 
 /**
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index c8188dabf..39cb4c325 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -18,6 +18,8 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.userAgent');
 
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Class for loading, storing, and playing audio for a workspace.
diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index 57e989be9..0b5032ebd 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -20,6 +20,8 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.utils.Coordinate');
+
 
 /**
  * Blocks are moved into this SVG during a drag, improving performance.
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index b2b483cbb..fda7eeba7 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -47,6 +47,7 @@ goog.require('Blockly.Xml');
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.blockRendering.Renderer');
+goog.requireType('Blockly.Cursor');
 goog.requireType('Blockly.FlyoutButton');
 goog.requireType('Blockly.IASTNodeLocationSvg');
 goog.requireType('Blockly.IBoundedElement');
@@ -54,6 +55,7 @@ goog.requireType('Blockly.IFlyout');
 goog.requireType('Blockly.IMetricsManager');
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.Marker');
+goog.requireType('Blockly.ScrollbarPair');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Trashcan');
 goog.requireType('Blockly.utils.Size');