diff --git a/core/blockly.js b/core/blockly.js
index 8c3cf6b8c..e6a569336 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,9 +17,8 @@
 goog.provide('Blockly');
 
 goog.require('Blockly.browserEvents');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.connectionTypes');
+goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
diff --git a/core/events/block_events.js b/core/events/block_events.js
index df7e077f6..c69e03086 100644
--- a/core/events/block_events.js
+++ b/core/events/block_events.js
@@ -20,9 +20,9 @@ goog.provide('Blockly.Events.Create');  // Deprecated.
 goog.provide('Blockly.Events.Delete');  // Deprecated.
 goog.provide('Blockly.Events.Move');  // Deprecated.
 
+goog.require('Blockly.connectionTypes');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.connectionTypes');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.object');
diff --git a/core/mutator.js b/core/mutator.js
index 2a10991cd..b3aedec22 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -20,6 +20,7 @@ goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
 goog.require('Blockly.Icon');
+goog.require('Blockly.Options');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.object');
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 919814b46..598509adc 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -14,10 +14,12 @@ goog.provide('Blockly.blockRendering.RenderInfo');
 
 goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.blockRendering.ExternalValueInput');
+goog.require('Blockly.blockRendering.Field');
 goog.require('Blockly.blockRendering.Hat');
 goog.require('Blockly.blockRendering.InlineInput');
 goog.require('Blockly.blockRendering.InputRow');
 goog.require('Blockly.blockRendering.InRowSpacer');
+goog.require('Blockly.blockRendering.JaggedEdge');
 goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.NextConnection');
 goog.require('Blockly.blockRendering.OutputConnection');
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index fce49de23..8ed72afdf 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -20,6 +20,7 @@ goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ToolboxItemSelect');
+goog.require('Blockly.Options');
 goog.require('Blockly.registry');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
diff --git a/core/trashcan.js b/core/trashcan.js
index 5eba6453f..6c00dca52 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -19,6 +19,7 @@ goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.TrashcanOpen');
 goog.require('Blockly.IPositionable');
+goog.require('Blockly.Options');
 goog.require('Blockly.registry');
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.utils.dom');
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index f089c9e6d..b262724ab 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -19,13 +19,13 @@ goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
+goog.require('Blockly.IPositionable');
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.IPositionable');
 
 goog.requireType('Blockly.WorkspaceSvg');