diff --git a/core/generator.js b/core/generator.js
index b9b488d5c..241574f88 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -16,6 +16,9 @@ goog.provide('Blockly.Generator');
 goog.require('Blockly.constants');
 goog.require('Blockly.Block');
 
+goog.requireType('Blockly.Names');
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Class for a code generator that translates the blocks into a language.
diff --git a/core/gesture.js b/core/gesture.js
index cf7229118..2819ce5c9 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -26,8 +26,11 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.WorkspaceDragger');
 
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Field');
 goog.requireType('Blockly.IBubble');
 goog.requireType('Blockly.IFlyout');
+goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
diff --git a/core/icon.js b/core/icon.js
index 506915fcd..79357c3c9 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -18,6 +18,9 @@ goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Bubble');
+
 
 /**
  * Class for an icon.
diff --git a/core/inject.js b/core/inject.js
index 3e97ec5e3..85b7f6405 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -29,6 +29,7 @@ goog.require('Blockly.WorkspaceDragSurfaceSvg');
 goog.require('Blockly.WorkspaceSvg');
 
 goog.requireType('Blockly.utils.Metrics');
+goog.requireType('Blockly.Workspace');
 
 
 /**
diff --git a/core/interfaces/i_accessibility.js b/core/interfaces/i_accessibility.js
index ab05e16d4..5fb3304bd 100644
--- a/core/interfaces/i_accessibility.js
+++ b/core/interfaces/i_accessibility.js
@@ -15,8 +15,11 @@ goog.provide('Blockly.IASTNodeLocation');
 goog.provide('Blockly.IASTNodeLocationSvg');
 goog.provide('Blockly.IASTNodeLocationWithBlock');
 goog.provide('Blockly.IKeyboardAccessible');
+
+goog.requireType('Blockly.Block');
 goog.requireType('Blockly.ShortcutRegistry');
 
+
 /**
  * An AST node location interface.
  * @interface
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index bbf9fdae3..aad591aee 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -13,8 +13,10 @@
 
 goog.provide('Blockly.IBubble');
 
+goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.IContextMenu');
 goog.requireType('Blockly.IDeletable');
+goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js
index 505401666..4b6120da1 100644
--- a/core/interfaces/i_connection_checker.js
+++ b/core/interfaces/i_connection_checker.js
@@ -14,6 +14,7 @@
 goog.provide('Blockly.IConnectionChecker');
 
 goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.RenderedConnection');
 
 
 /**
diff --git a/core/interfaces/i_deletearea.js b/core/interfaces/i_deletearea.js
index 3ca0f083d..f406a0152 100644
--- a/core/interfaces/i_deletearea.js
+++ b/core/interfaces/i_deletearea.js
@@ -14,6 +14,8 @@
 
 goog.provide('Blockly.IDeleteArea');
 
+goog.requireType('Blockly.utils.Rect');
+
 
 /**
  * Interface for a component that can delete a block that is dropped on top of it.
diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index 5cda4bca7..ceaaf243b 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -19,6 +19,7 @@ goog.requireType('Blockly.MetricsManager');
 goog.requireType('Blockly.utils.Metrics');
 goog.requireType('Blockly.utils.toolbox');
 
+goog.requireType('Blockly.utils.Size');
 
 /**
  * Interface for a metrics manager.