diff --git a/core/connection_checker.js b/core/connection_checker.js
index c90d1d76e..e59db419e 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -15,9 +15,9 @@ goog.provide('Blockly.ConnectionChecker');
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.constants');
+goog.require('Blockly.IConnectionChecker');
 goog.require('Blockly.registry');
 
-goog.requireType('Blockly.IConnectionChecker');
 goog.requireType('Blockly.RenderedConnection');
 
 
diff --git a/core/connection_db.js b/core/connection_db.js
index a5218d488..027c7fe34 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -18,6 +18,7 @@ goog.require('Blockly.constants');
 goog.require('Blockly.RenderedConnection');
 
 goog.requireType('Blockly.IConnectionChecker');
+goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 9d7b6e055..7f64acef2 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -23,12 +23,17 @@ goog.require('Blockly.Menu');
 goog.require('Blockly.MenuItem');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.aria');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.userAgent');
+goog.require('Blockly.WidgetDiv');
 goog.require('Blockly.Xml');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Which block is the context menu attached to?
diff --git a/core/events/block_events.js b/core/events/block_events.js
index 5f81cf26d..d6b9f80c5 100644
--- a/core/events/block_events.js
+++ b/core/events/block_events.js
@@ -29,6 +29,8 @@ goog.require('Blockly.utils.xml');
 // TODO: Fix recursive dependency.
 // goog.require('Blockly.Xml');
 
+goog.requireType('Blockly.Block');
+
 
 /**
  * Abstract class for a block event.
diff --git a/core/events/events.js b/core/events/events.js
index 6ce5db37c..c1991692c 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -19,6 +19,10 @@ goog.provide('Blockly.Events');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.Events.Abstract');
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Group ID for new events.  Grouped events are indivisible.
diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index f36fcc3e6..83e892086 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -15,6 +15,8 @@ goog.provide('Blockly.Events.Abstract');
 
 goog.require('Blockly.Events');
 
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Abstract class for an event.
diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index 2b36c308f..202a9240d 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -17,6 +17,9 @@ goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.Block');
+
+
 /**
  * Class for a block drag event.
  * @param {!Blockly.Block=} opt_block The top block in the stack that is being
diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index fa6b99e13..7d3fbff2d 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -17,6 +17,9 @@ goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.BlockSvg');
+
+
 /**
  * Class for a bubble open event.
  * @param {Blockly.BlockSvg} opt_block The associated block. Undefined for a
diff --git a/core/events/events_click.js b/core/events/events_click.js
index 3b4766bf2..ea46b0a76 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -17,6 +17,9 @@ goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.Block');
+
+
 /**
  * Class for a click event.
  * @param {?Blockly.Block=} opt_block The affected block. Null for click events
diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index d18872c39..ab839daff 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -17,6 +17,11 @@ goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.ASTNode');
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.Workspace');
+
+
 /**
  * Class for a marker move event.
  * @param {?Blockly.Block=} opt_block The affected block. Null if current node
diff --git a/core/events/ui_events.js b/core/events/ui_events.js
index f4267958f..5d649a22f 100644
--- a/core/events/ui_events.js
+++ b/core/events/ui_events.js
@@ -18,6 +18,9 @@ goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.Block');
+
+
 /**
  * Base class for a UI event.
  * UI events are events that don't need to be sent over the wire for multi-user
diff --git a/core/events/variable_events.js b/core/events/variable_events.js
index c908ff26a..4f7af9258 100644
--- a/core/events/variable_events.js
+++ b/core/events/variable_events.js
@@ -20,6 +20,8 @@ goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.VariableModel');
+
 
 /**
  * Abstract class for a variable event.
diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js
index 3bbb27d40..bb22097a0 100644
--- a/core/events/workspace_events.js
+++ b/core/events/workspace_events.js
@@ -17,6 +17,8 @@ goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Class for a finished loading event.
diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 0cf72b9c1..ea47b02bf 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -14,6 +14,8 @@ goog.provide('Blockly.WorkspaceDragger');
 
 goog.require('Blockly.utils.Coordinate');
 
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Class for a workspace dragger.  It moves the workspace around when it is