diff --git a/core/block.js b/core/block.js
index 08a509203..015b2ade6 100644
--- a/core/block.js
+++ b/core/block.js
@@ -31,11 +31,12 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.BlockDelete');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Extensions');
+goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.Input');
+goog.require('Blockly.navigation');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.object');
-goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils.string');
 goog.require('Blockly.Workspace');
 
diff --git a/core/block_svg.js b/core/block_svg.js
index cfcb3d6e6..d36187234 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -23,6 +23,7 @@
 
 goog.provide('Blockly.BlockSvg');
 
+goog.require('Blockly.ASTNode');
 goog.require('Blockly.Block');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.blockRendering.IPathObject');
@@ -31,6 +32,7 @@ goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Msg');
+goog.require('Blockly.navigation');
 goog.require('Blockly.RenderedConnection');
 goog.require('Blockly.TabNavigateCursor');
 goog.require('Blockly.Tooltip');
diff --git a/core/comment.js b/core/comment.js
index 8fe065aeb..b2ef69bf7 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -24,6 +24,7 @@
 goog.provide('Blockly.Comment');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
diff --git a/core/gesture.js b/core/gesture.js
index 6e25b9051..0547fe712 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -24,6 +24,7 @@
 
 goog.provide('Blockly.Gesture');
 
+goog.require('Blockly.ASTNode');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.BlockDragger');
 goog.require('Blockly.BubbleDragger');
@@ -31,6 +32,7 @@ goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FlyoutDragger');
+goog.require('Blockly.navigation');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
diff --git a/core/inject.js b/core/inject.js
index 3bec1b7f5..b7c8d3518 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -29,9 +29,11 @@ goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
 goog.require('Blockly.Grid');
+goog.require('Blockly.Msg');
 goog.require('Blockly.Options');
 goog.require('Blockly.ScrollbarPair');
 goog.require('Blockly.Tooltip');
+goog.require('Blockly.user.keyMap');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.userAgent');
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index 8847df3fa..861fe04b5 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -24,6 +24,7 @@
 
 goog.provide('Blockly.Cursor');
 
+goog.require('Blockly.ASTNode');
 goog.require('Blockly.navigation');
 
 /**
diff --git a/core/keyboard_nav/cursor_svg.js b/core/keyboard_nav/cursor_svg.js
index 329059ba7..68c10e6c8 100644
--- a/core/keyboard_nav/cursor_svg.js
+++ b/core/keyboard_nav/cursor_svg.js
@@ -23,6 +23,7 @@
 
 goog.provide('Blockly.CursorSvg');
 
+goog.require('Blockly.ASTNode');
 goog.require('Blockly.Cursor');
 goog.require('Blockly.utils.object');
 
diff --git a/core/keyboard_nav/flyout_cursor.js b/core/keyboard_nav/flyout_cursor.js
index 4fa6c4299..9208a24fe 100644
--- a/core/keyboard_nav/flyout_cursor.js
+++ b/core/keyboard_nav/flyout_cursor.js
@@ -25,6 +25,7 @@
 goog.provide('Blockly.FlyoutCursor');
 
 goog.require('Blockly.Cursor');
+goog.require('Blockly.navigation');
 goog.require('Blockly.utils.object');
 
 
diff --git a/core/keyboard_nav/key_map.js b/core/keyboard_nav/key_map.js
index 81f92eb59..8f3ecbef5 100644
--- a/core/keyboard_nav/key_map.js
+++ b/core/keyboard_nav/key_map.js
@@ -24,6 +24,8 @@
 
 goog.provide('Blockly.user.keyMap');
 
+// TODO: Fix circular dependency.
+// goog.require('Blockly.navigation');
 goog.require('Blockly.utils.KeyCodes');
 goog.require('Blockly.utils.object');
 
diff --git a/core/mutator.js b/core/mutator.js
index 006aea0b8..decb81f3a 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -29,6 +29,7 @@ goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
+goog.require('Blockly.navigation');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.global');
diff --git a/core/options.js b/core/options.js
index d2596c392..856bd4ce4 100644
--- a/core/options.js
+++ b/core/options.js
@@ -25,6 +25,7 @@ goog.provide('Blockly.Options');
 
 goog.require('Blockly.Theme');
 goog.require('Blockly.Themes.Classic');
+goog.require('Blockly.user.keyMap');
 goog.require('Blockly.utils.userAgent');
 goog.require('Blockly.Xml');
 
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 39d7566b2..80916a837 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -23,6 +23,7 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
+goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index da6eacaf4..d1b3aa772 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -32,6 +32,7 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.Grid');
 goog.require('Blockly.Msg');
+goog.require('Blockly.navigation');
 goog.require('Blockly.Options');
 goog.require('Blockly.ThemeManager');
 goog.require('Blockly.Themes.Classic');
@@ -2643,4 +2644,3 @@ Blockly.WorkspaceSvg.prototype.getAudioManager = function() {
 Blockly.WorkspaceSvg.prototype.getGrid = function() {
   return this.grid_;
 };
-