From 9f528922a7f7d26c5170bb57a625e594c67891a1 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 24 May 2019 14:33:18 -0700
Subject: [PATCH] Fix some dependencies

---
 core/block.js                    | 1 +
 core/block_dragger.js            | 1 +
 core/block_svg.js                | 2 ++
 core/blockly.js                  | 3 ++-
 core/bubble_dragger.js           | 1 +
 core/comment.js                  | 1 +
 core/connection.js               | 1 +
 core/contextmenu.js              | 2 ++
 core/events_abstract.js          | 1 +
 core/extensions.js               | 1 +
 core/field.js                    | 1 +
 core/field_checkbox.js           | 2 ++
 core/field_colour.js             | 2 ++
 core/field_date.js               | 1 +
 core/field_dropdown.js           | 2 ++
 core/field_image.js              | 1 +
 core/field_textinput.js          | 2 ++
 core/field_variable.js           | 3 +++
 core/flyout_base.js              | 1 +
 core/flyout_horizontal.js        | 4 +---
 core/flyout_vertical.js          | 2 --
 core/gesture.js                  | 1 +
 core/inject.js                   | 2 ++
 core/insertion_marker_manager.js | 2 +-
 core/mutator.js                  | 1 +
 core/procedures.js               | 2 ++
 core/rendered_connection.js      | 1 +
 core/theme.js                    | 2 ++
 core/theme/classic.js            | 1 +
 core/theme/highcontrast.js       | 1 +
 core/theme/modern.js             | 1 +
 core/toolbox.js                  | 1 +
 core/trashcan.js                 | 1 +
 core/utils.js                    | 2 +-
 core/variable_map.js             | 2 ++
 core/variable_model.js           | 1 +
 core/variables.js                | 3 +--
 core/variables_dynamic.js        | 4 +---
 core/warning.js                  | 1 +
 core/widgetdiv.js                | 1 +
 core/workspace.js                | 1 +
 core/workspace_comment.js        | 1 +
 core/workspace_comment_svg.js    | 2 ++
 core/workspace_events.js         | 1 +
 core/workspace_svg.js            | 2 ++
 core/xml.js                      | 1 +
 46 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/core/block.js b/core/block.js
index 3df892d47..3fd1a43bc 100644
--- a/core/block.js
+++ b/core/block.js
@@ -29,6 +29,7 @@ goog.provide('Blockly.Block');
 goog.require('Blockly.Blocks');
 goog.require('Blockly.Comment');
 goog.require('Blockly.Connection');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.BlockDelete');
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 9ba2e63eb..ce07de741 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -28,6 +28,7 @@ goog.provide('Blockly.BlockDragger');
 
 goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.InsertionMarkerManager');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockMove');
 
 goog.require('goog.math.Coordinate');
diff --git a/core/block_svg.js b/core/block_svg.js
index 47cee2673..8b69d751e 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -29,9 +29,11 @@ goog.provide('Blockly.BlockSvg');
 goog.require('Blockly.Block');
 goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.ContextMenu');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Grid');
+goog.require('Blockly.Msg');
 goog.require('Blockly.RenderedConnection');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
diff --git a/core/blockly.js b/core/blockly.js
index d9c6764d9..a5a133d3c 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -32,6 +32,7 @@ goog.provide('Blockly');
 
 goog.require('Blockly.BlockSvg.render');
 goog.require('Blockly.Events');
+goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FieldAngle');
 goog.require('Blockly.FieldCheckbox');
 goog.require('Blockly.FieldColour');
@@ -45,9 +46,9 @@ goog.require('Blockly.FieldTextInput');
 goog.require('Blockly.FieldNumber');
 goog.require('Blockly.FieldVariable');
 goog.require('Blockly.Generator');
-goog.require('Blockly.Msg');
 goog.require('Blockly.Procedures');
 goog.require('Blockly.Toolbox');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.WidgetDiv');
 goog.require('Blockly.WorkspaceSvg');
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index 3665d9fd1..701f48f20 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.BubbleDragger');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentMove');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceCommentSvg');
diff --git a/core/comment.js b/core/comment.js
index 73a9c6695..3176b573c 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.Comment');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
diff --git a/core/connection.js b/core/connection.js
index 739ad1314..53f0bb2db 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Connection');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Xml');
 
diff --git a/core/contextmenu.js b/core/contextmenu.js
index f9e7a39bd..6971c3f49 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -30,7 +30,9 @@
  */
 goog.provide('Blockly.ContextMenu');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
+goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.uiMenu');
diff --git a/core/events_abstract.js b/core/events_abstract.js
index 4fa10c82c..387276cf8 100644
--- a/core/events_abstract.js
+++ b/core/events_abstract.js
@@ -29,6 +29,7 @@ goog.provide('Blockly.Events.Abstract');
 
 goog.require('Blockly.Events');
 
+
 /**
  * Abstract class for an event.
  * @constructor
diff --git a/core/extensions.js b/core/extensions.js
index 583cdc910..c15329559 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -36,6 +36,7 @@ goog.provide('Blockly.Extensions');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.utils');
 
+
 /**
  * The set of all registered extensions, keyed by extension name/id.
  * @private
diff --git a/core/field.js b/core/field.js
index f103813fe..0e7929178 100644
--- a/core/field.js
+++ b/core/field.js
@@ -28,6 +28,7 @@
 
 goog.provide('Blockly.Field');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.userAgent');
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 67d08237e..74d6c115a 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -26,6 +26,8 @@
 
 goog.provide('Blockly.FieldCheckbox');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.utils');
 
diff --git a/core/field_colour.js b/core/field_colour.js
index 0e0c830df..f9be4933b 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -27,6 +27,8 @@
 goog.provide('Blockly.FieldColour');
 
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 
 goog.require('goog.math.Size');
diff --git a/core/field_date.js b/core/field_date.js
index c71d0d743..6b7a2dd31 100644
--- a/core/field_date.js
+++ b/core/field_date.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.FieldDate');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Field');
 goog.require('Blockly.utils');
 
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 821ad3b68..4083e231c 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -28,6 +28,8 @@
 
 goog.provide('Blockly.FieldDropdown');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
diff --git a/core/field_image.js b/core/field_image.js
index 532543c65..0d39a9fce 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.FieldImage');
 
 goog.require('Blockly.Field');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.utils');
 
 goog.require('goog.math.Size');
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 717f9113e..068a5ecc4 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -27,6 +27,8 @@
 goog.provide('Blockly.FieldTextInput');
 
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');
diff --git a/core/field_variable.js b/core/field_variable.js
index 5b2fc7d2b..a2cd7a6bb 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -26,11 +26,14 @@
 
 goog.provide('Blockly.FieldVariable');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 goog.require('Blockly.VariableModel');
 goog.require('Blockly.Variables');
+goog.require('Blockly.Xml');
 
 goog.require('goog.math.Size');
 
diff --git a/core/flyout_base.js b/core/flyout_base.js
index c8fcc79d2..0e20bd0d6 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -32,6 +32,7 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.Gesture');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceSvg');
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index be8426bb1..da62a8ffe 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -27,11 +27,9 @@
 goog.provide('Blockly.HorizontalFlyout');
 
 goog.require('Blockly.Block');
-goog.require('Blockly.Events');
-goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.Flyout');
+goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.utils');
-goog.require('Blockly.WorkspaceSvg');
 
 goog.require('goog.math.Rect');
 
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index a2fe351a4..96438050a 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -27,12 +27,10 @@
 goog.provide('Blockly.VerticalFlyout');
 
 goog.require('Blockly.Block');
-goog.require('Blockly.Events');
 goog.require('Blockly.Flyout');
 goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
-goog.require('Blockly.WorkspaceSvg');
 
 goog.require('goog.math.Rect');
 
diff --git a/core/gesture.js b/core/gesture.js
index 4e18a1204..990667e22 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -31,6 +31,7 @@ goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.BlockDragger');
 goog.require('Blockly.BubbleDragger');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FlyoutDragger');
 goog.require('Blockly.Tooltip');
diff --git a/core/inject.js b/core/inject.js
index 4492bae58..11c390351 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -29,8 +29,10 @@ goog.provide('Blockly.inject');
 goog.require('Blockly.BlockDragSurfaceSvg');
 goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
 goog.require('Blockly.Grid');
 goog.require('Blockly.Options');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceSvg');
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 8b3bd3079..de4de3892 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -27,7 +27,7 @@
 goog.provide('Blockly.InsertionMarkerManager');
 
 goog.require('Blockly.BlockAnimations');
-goog.require('Blockly.Events.BlockMove');
+goog.require('Blockly.Events');
 goog.require('Blockly.RenderedConnection');
 
 
diff --git a/core/mutator.js b/core/mutator.js
index fe499e996..2e57df43d 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -28,6 +28,7 @@
 goog.provide('Blockly.Mutator');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
diff --git a/core/procedures.js b/core/procedures.js
index cc84a4902..a226bc971 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -32,8 +32,10 @@ goog.provide('Blockly.Procedures');
 
 goog.require('Blockly.Blocks');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
+goog.require('Blockly.Msg');
 goog.require('Blockly.Names');
 goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 730053088..4c8b3d0d8 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.RenderedConnection');
 
 goog.require('Blockly.Connection');
+goog.require('Blockly.Events');
 goog.require('Blockly.utils');
 
 goog.require('goog.math.Coordinate');
diff --git a/core/theme.js b/core/theme.js
index 1149ebd19..0105c96f6 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -24,6 +24,8 @@
 'use strict';
 
 goog.provide('Blockly.Theme');
+
+
 /**
  * Class for a theme.
  * @param {Object.<string, Blockly.BlockStyle>} blockStyles A map from style
diff --git a/core/theme/classic.js b/core/theme/classic.js
index 522e44440..5de42fefe 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -29,6 +29,7 @@ goog.provide('Blockly.Themes.Classic');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks":{
     "colourPrimary": "20"
diff --git a/core/theme/highcontrast.js b/core/theme/highcontrast.js
index 93c88ecf9..56174e215 100644
--- a/core/theme/highcontrast.js
+++ b/core/theme/highcontrast.js
@@ -28,6 +28,7 @@ goog.provide('Blockly.Themes.HighContrast');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks":{
     "colourPrimary": "#a52714",
diff --git a/core/theme/modern.js b/core/theme/modern.js
index d7e06cf1a..c218225bc 100644
--- a/core/theme/modern.js
+++ b/core/theme/modern.js
@@ -28,6 +28,7 @@ goog.provide('Blockly.Themes.Modern');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks": {
     "colourPrimary": "#a5745b",
diff --git a/core/toolbox.js b/core/toolbox.js
index 3804cbc37..ef3bd6557 100644
--- a/core/toolbox.js
+++ b/core/toolbox.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Toolbox');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Flyout');
 goog.require('Blockly.HorizontalFlyout');
diff --git a/core/trashcan.js b/core/trashcan.js
index 975f1beca..ccee525bc 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.Trashcan');
 
 goog.require('Blockly.utils');
+goog.require('Blockly.Xml');
 
 goog.require('goog.math.Rect');
 
diff --git a/core/utils.js b/core/utils.js
index 2aaf9b1c0..18ee689dd 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -32,6 +32,7 @@
  */
 goog.provide('Blockly.utils');
 
+goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');
 
 goog.require('goog.math.Coordinate');
@@ -1021,4 +1022,3 @@ Blockly.utils.clampNumber = function(lowerBound, number, upperBound) {
  * Reference to the global object.
  */
 Blockly.utils.global = this || self;
-
diff --git a/core/variable_map.js b/core/variable_map.js
index 642cf6a95..a444835ca 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -26,8 +26,10 @@
 
 goog.provide('Blockly.VariableMap');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarDelete');
 goog.require('Blockly.Events.VarRename');
+goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 
 
diff --git a/core/variable_model.js b/core/variable_model.js
index e41dd2091..af1230ed7 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.VariableModel');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.utils');
 
diff --git a/core/variables.js b/core/variables.js
index 9255cd432..a37271702 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -31,9 +31,8 @@
 goog.provide('Blockly.Variables');
 
 goog.require('Blockly.Blocks');
-goog.require('Blockly.constants');
+goog.require('Blockly.Msg');
 goog.require('Blockly.VariableModel');
-goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');
 
 goog.require('goog.string');
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index d09c2aa0c..cc95e2b3e 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -29,10 +29,8 @@ goog.provide('Blockly.VariablesDynamic');
 
 goog.require('Blockly.Variables');
 goog.require('Blockly.Blocks');
-goog.require('Blockly.constants');
+goog.require('Blockly.Msg');
 goog.require('Blockly.VariableModel');
-// TODO Fix circular dependencies
-// goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');
 
 
diff --git a/core/warning.js b/core/warning.js
index 9ae3c7ea0..f1633c06e 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -27,6 +27,7 @@
 goog.provide('Blockly.Warning');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
 goog.require('Blockly.utils');
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 9fc80d82f..4690b66ad 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -33,6 +33,7 @@
 goog.provide('Blockly.WidgetDiv');
 
 goog.require('Blockly.Css');
+
 goog.require('goog.style');
 
 
diff --git a/core/workspace.js b/core/workspace.js
index 4dd5d2a51..6cf93946f 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Workspace');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.utils');
 goog.require('Blockly.VariableMap');
 goog.require('Blockly.WorkspaceComment');
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index fa1b73130..fc7508443 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.WorkspaceComment');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentChange');
 goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index b76614f1a..287135cb5 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -26,9 +26,11 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
+goog.require('Blockly.Events.Ui');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceComment');
 
diff --git a/core/workspace_events.js b/core/workspace_events.js
index b4c78e2de..02b4a9cd6 100644
--- a/core/workspace_events.js
+++ b/core/workspace_events.js
@@ -29,6 +29,7 @@ goog.provide('Blockly.Events.FinishedLoading');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 
+
 /**
  * Class for a finished loading event.
  * Used to notify the developer when the workspace has finished loading (i.e
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index f07cdc5f2..37625df1a 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -30,9 +30,11 @@ goog.provide('Blockly.WorkspaceSvg');
 //goog.require('Blockly.BlockSvg');
 goog.require('Blockly.ConnectionDB');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.Grid');
+goog.require('Blockly.Msg');
 goog.require('Blockly.Options');
 goog.require('Blockly.ScrollbarPair');
 goog.require('Blockly.Touch');
diff --git a/core/xml.js b/core/xml.js
index eb736afaf..c542a0e4c 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -30,6 +30,7 @@
  */
 goog.provide('Blockly.Xml');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.FinishedLoading');
 goog.require('Blockly.Events.VarCreate');