diff --git a/core/block.ts b/core/block.ts
index f648674d2..bd5507449 100644
--- a/core/block.ts
+++ b/core/block.ts
@@ -12,8 +12,7 @@
  * The class representing one block.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Block');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/block_animations.ts b/core/block_animations.ts
index 83beded81..a64990eaa 100644
--- a/core/block_animations.ts
+++ b/core/block_animations.ts
@@ -12,8 +12,7 @@
  * Methods animating a block on connection and disconnection.
  * @namespace Blockly.blockAnimations
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.blockAnimations');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/block_drag_surface.ts b/core/block_drag_surface.ts
index 2f8595bc2..cbbfa43f9 100644
--- a/core/block_drag_surface.ts
+++ b/core/block_drag_surface.ts
@@ -22,8 +22,7 @@
  * while dragging blocks.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.BlockDragSurfaceSvg');
+
 
 import {Coordinate} from './utils/coordinate';
 import * as dom from './utils/dom';
diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index b1fd69c70..2452f6686 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -12,8 +12,7 @@
  * Methods for dragging a block visually.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.BlockDragger');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_drag';
diff --git a/core/block_svg.ts b/core/block_svg.ts
index 63c31ae81..832f8ff82 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.BlockSvg');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/blockly.ts b/core/blockly.ts
index a117c01e5..759caa2c0 100644
--- a/core/blockly.ts
+++ b/core/blockly.ts
@@ -12,8 +12,7 @@
  * The top level namespace used to access the Blockly library.
  * @namespace Blockly
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_create';
diff --git a/core/blockly_options.ts b/core/blockly_options.ts
index 927a79ada..7ae2d35ad 100644
--- a/core/blockly_options.ts
+++ b/core/blockly_options.ts
@@ -12,8 +12,7 @@
  * Object that defines user-specified options for the workspace.
  * @namespace Blockly.BlocklyOptions
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.BlocklyOptions');
+
 
 
 /**
diff --git a/core/blocks.ts b/core/blocks.ts
index 07037bf3a..bb650f1d6 100644
--- a/core/blocks.ts
+++ b/core/blocks.ts
@@ -12,8 +12,7 @@
  * A mapping of block type names to block prototype objects.
  * @namespace Blockly.blocks
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.blocks');
+
 
 
 /**
diff --git a/core/browser_events.ts b/core/browser_events.ts
index 432eb0e1c..9eaa6a0c3 100644
--- a/core/browser_events.ts
+++ b/core/browser_events.ts
@@ -12,8 +12,7 @@
  * Browser event handling.
  * @namespace Blockly.browserEvents
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.browserEvents');
+
 
 import * as Touch from './touch';
 import * as userAgent from './utils/useragent';
diff --git a/core/bubble.ts b/core/bubble.ts
index abea01e70..048fe0956 100644
--- a/core/bubble.ts
+++ b/core/bubble.ts
@@ -12,8 +12,7 @@
  * Object representing a UI bubble.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Bubble');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts
index e91907515..d07d03517 100644
--- a/core/bubble_dragger.ts
+++ b/core/bubble_dragger.ts
@@ -12,8 +12,7 @@
  * Methods for dragging a bubble visually.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.BubbleDragger');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './bubble';
diff --git a/core/bump_objects.ts b/core/bump_objects.ts
index e83a18eb6..1416cc52a 100644
--- a/core/bump_objects.ts
+++ b/core/bump_objects.ts
@@ -12,8 +12,7 @@
  * Utilities for bumping objects back into worksapce bounds.
  * @namespace Blockly.bumpObjects
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.bumpObjects');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/clipboard.ts b/core/clipboard.ts
index 36203e777..8579bd47c 100644
--- a/core/clipboard.ts
+++ b/core/clipboard.ts
@@ -12,8 +12,7 @@
  * Blockly's internal clipboard for managing copy-paste.
  * @namespace Blockly.clipboard
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.clipboard');
+
 
 import {CopyData, ICopyable} from './interfaces/i_copyable';
 
diff --git a/core/comment.ts b/core/comment.ts
index 51b44f06c..ed3d14802 100644
--- a/core/comment.ts
+++ b/core/comment.ts
@@ -12,8 +12,7 @@
  * Object representing a code comment.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Comment');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/common.ts b/core/common.ts
index 008a7c218..4d834f6fa 100644
--- a/core/common.ts
+++ b/core/common.ts
@@ -14,8 +14,7 @@
  * must not be at the top level to avoid circular dependencies.
  * @namespace Blockly.common
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.common');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/component_manager.ts b/core/component_manager.ts
index 9dcf6e8aa..cef396fbe 100644
--- a/core/component_manager.ts
+++ b/core/component_manager.ts
@@ -12,8 +12,7 @@
  * Manager for all items registered with the workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ComponentManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IAutoHideable} from './interfaces/i_autohideable';
diff --git a/core/config.ts b/core/config.ts
index 9aec22ba0..ee17645ad 100644
--- a/core/config.ts
+++ b/core/config.ts
@@ -16,8 +16,7 @@
  * generally recommended.
  * @namespace Blockly.config
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.config');
+
 
 
 /**
diff --git a/core/connection.ts b/core/connection.ts
index 66d65b6f6..bc18d6daf 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -12,8 +12,7 @@
  * Components for creating connections between blocks.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Connection');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
diff --git a/core/connection_checker.ts b/core/connection_checker.ts
index e1f117794..a294d01a7 100644
--- a/core/connection_checker.ts
+++ b/core/connection_checker.ts
@@ -14,8 +14,7 @@
  * potential connection is safe and valid.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ConnectionChecker');
+
 
 import * as common from './common';
 import {Connection} from './connection';
diff --git a/core/connection_db.ts b/core/connection_db.ts
index d9f027320..8145a31c0 100644
--- a/core/connection_db.ts
+++ b/core/connection_db.ts
@@ -16,8 +16,7 @@
  *    Sorted by y coordinate.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ConnectionDB');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './constants';
diff --git a/core/connection_type.ts b/core/connection_type.ts
index aa7fe1879..4bb780383 100644
--- a/core/connection_type.ts
+++ b/core/connection_type.ts
@@ -12,8 +12,7 @@
  * An enum for the possible types of connections.
  * @namespace Blockly.ConnectionType
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ConnectionType');
+
 
 
 /**
diff --git a/core/constants.ts b/core/constants.ts
index 8ea419bda..ae5617892 100644
--- a/core/constants.ts
+++ b/core/constants.ts
@@ -12,8 +12,7 @@
  * Blockly constants.
  * @namespace Blockly.constants
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.constants');
+
 
 
 /**
diff --git a/core/contextmenu.ts b/core/contextmenu.ts
index c3592cfb1..6dad4c496 100644
--- a/core/contextmenu.ts
+++ b/core/contextmenu.ts
@@ -12,8 +12,7 @@
  * Functionality for the right-click context menus.
  * @namespace Blockly.ContextMenu
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ContextMenu');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block';
diff --git a/core/contextmenu_items.ts b/core/contextmenu_items.ts
index d84495064..b50f52a74 100644
--- a/core/contextmenu_items.ts
+++ b/core/contextmenu_items.ts
@@ -12,8 +12,7 @@
  * Registers default context menu items.
  * @namespace Blockly.ContextMenuItems
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ContextMenuItems');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/contextmenu_registry.ts b/core/contextmenu_registry.ts
index 6ea906243..698460ff1 100644
--- a/core/contextmenu_registry.ts
+++ b/core/contextmenu_registry.ts
@@ -12,8 +12,7 @@
  * Registry for context menu option items.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ContextMenuRegistry');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/css.ts b/core/css.ts
index ec83ef6bb..bd778186b 100644
--- a/core/css.ts
+++ b/core/css.ts
@@ -12,8 +12,7 @@
  * Inject Blockly's CSS synchronously.
  * @namespace Blockly.Css
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Css');
+
 
 import * as deprecation from './utils/deprecation';
 
diff --git a/core/delete_area.ts b/core/delete_area.ts
index c6f5449bd..541ad9f2c 100644
--- a/core/delete_area.ts
+++ b/core/delete_area.ts
@@ -14,8 +14,7 @@
  * bubble that is dropped on top of it.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.DeleteArea');
+
 
 import {BlockSvg} from './block_svg';
 import {DragTarget} from './drag_target';
diff --git a/core/dialog.ts b/core/dialog.ts
index 87dbe326d..5d00f612d 100644
--- a/core/dialog.ts
+++ b/core/dialog.ts
@@ -13,8 +13,7 @@
  * Wrapper functions around JS functions for showing alert/confirmation dialogs.
  * @namespace Blockly.dialog
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.dialog');
+
 
 
 let alertImplementation = function(
diff --git a/core/drag_target.ts b/core/drag_target.ts
index 71099e85c..ad127e427 100644
--- a/core/drag_target.ts
+++ b/core/drag_target.ts
@@ -14,8 +14,7 @@
  * block or bubble is dragged over or dropped on top of it.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.DragTarget');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IDragTarget} from './interfaces/i_drag_target';
diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts
index c5e0a75d9..3ce004a9d 100644
--- a/core/dropdowndiv.ts
+++ b/core/dropdowndiv.ts
@@ -14,8 +14,7 @@
  * A div that floats on top of the workspace, for drop-down menus.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.dropDownDiv');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/events/events.ts b/core/events/events.ts
index 4dbd090d4..66397ee58 100644
--- a/core/events/events.ts
+++ b/core/events/events.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of actions in Blockly's editor.
  * @namespace Blockly.Events
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events');
+
 
 import {Abstract as AbstractEvent} from './events_abstract';
 import {BlockBase} from './events_block_base';
diff --git a/core/events/events_abstract.ts b/core/events/events_abstract.ts
index 969325bb9..694930594 100644
--- a/core/events/events_abstract.ts
+++ b/core/events/events_abstract.ts
@@ -14,8 +14,7 @@
  * Blockly's editor.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.Abstract');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Workspace} from '../workspace';
diff --git a/core/events/events_block_base.ts b/core/events/events_block_base.ts
index ee0ff25bd..88f674cf4 100644
--- a/core/events/events_block_base.ts
+++ b/core/events/events_block_base.ts
@@ -12,8 +12,7 @@
  * Base class for all types of block events.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockBase');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_block_change.ts b/core/events/events_block_change.ts
index 8fa5a0fb8..2c0402e03 100644
--- a/core/events/events_block_change.ts
+++ b/core/events/events_block_change.ts
@@ -12,8 +12,7 @@
  * Class for a block change event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockChange');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_block_create.ts b/core/events/events_block_create.ts
index 018736d46..9a66c567f 100644
--- a/core/events/events_block_create.ts
+++ b/core/events/events_block_create.ts
@@ -12,8 +12,7 @@
  * Class for a block creation event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockCreate');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_block_delete.ts b/core/events/events_block_delete.ts
index 296a58b94..ce67b44af 100644
--- a/core/events/events_block_delete.ts
+++ b/core/events/events_block_delete.ts
@@ -12,8 +12,7 @@
  * Class for a block delete event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockDelete');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_block_drag.ts b/core/events/events_block_drag.ts
index c6ef42125..7ddb5a03c 100644
--- a/core/events/events_block_drag.ts
+++ b/core/events/events_block_drag.ts
@@ -12,8 +12,7 @@
  * Events fired as a block drag.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockDrag');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_block_move.ts b/core/events/events_block_move.ts
index 00eef2f4c..5a1a22318 100644
--- a/core/events/events_block_move.ts
+++ b/core/events/events_block_move.ts
@@ -12,8 +12,7 @@
  * Class for a block move event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BlockMove');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_bubble_open.ts b/core/events/events_bubble_open.ts
index 7171a2b73..adca6f8a7 100644
--- a/core/events/events_bubble_open.ts
+++ b/core/events/events_bubble_open.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of bubble open.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.BubbleOpen');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../block_svg';
diff --git a/core/events/events_click.ts b/core/events/events_click.ts
index 382ed1990..1d7e38a55 100644
--- a/core/events/events_click.ts
+++ b/core/events/events_click.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of UI click in Blockly's editor.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.Click');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_comment_base.ts b/core/events/events_comment_base.ts
index 706b788b7..26aaa8786 100644
--- a/core/events/events_comment_base.ts
+++ b/core/events/events_comment_base.ts
@@ -12,8 +12,7 @@
  * Base class for comment events.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.CommentBase');
+
 
 import * as utilsXml from '../utils/xml';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_change.ts b/core/events/events_comment_change.ts
index 78e1ddce9..33e5bb7ba 100644
--- a/core/events/events_comment_change.ts
+++ b/core/events/events_comment_change.ts
@@ -12,8 +12,7 @@
  * Class for comment change event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.CommentChange');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_create.ts b/core/events/events_comment_create.ts
index f642e308e..735148d3d 100644
--- a/core/events/events_comment_create.ts
+++ b/core/events/events_comment_create.ts
@@ -12,8 +12,7 @@
  * Class for comment creation event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.CommentCreate');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_delete.ts b/core/events/events_comment_delete.ts
index 92a33d0c4..f7b471d7d 100644
--- a/core/events/events_comment_delete.ts
+++ b/core/events/events_comment_delete.ts
@@ -12,8 +12,7 @@
  * Class for comment deletion event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.CommentDelete');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_move.ts b/core/events/events_comment_move.ts
index 522b1473d..7ad759bef 100644
--- a/core/events/events_comment_move.ts
+++ b/core/events/events_comment_move.ts
@@ -12,8 +12,7 @@
  * Class for comment move event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.CommentMove');
+
 
 import * as registry from '../registry';
 import {Coordinate} from '../utils/coordinate';
diff --git a/core/events/events_marker_move.ts b/core/events/events_marker_move.ts
index 8751d2032..9e712c609 100644
--- a/core/events/events_marker_move.ts
+++ b/core/events/events_marker_move.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of a marker move.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.MarkerMove');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_selected.ts b/core/events/events_selected.ts
index 8d7502337..d4fc25673 100644
--- a/core/events/events_selected.ts
+++ b/core/events/events_selected.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of element select action.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.Selected');
+
 
 import * as registry from '../registry';
 
diff --git a/core/events/events_theme_change.ts b/core/events/events_theme_change.ts
index 988fa1889..5e15273c6 100644
--- a/core/events/events_theme_change.ts
+++ b/core/events/events_theme_change.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of a theme update.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.ThemeChange');
+
 
 import * as registry from '../registry';
 
diff --git a/core/events/events_toolbox_item_select.ts b/core/events/events_toolbox_item_select.ts
index a854d7969..449f66941 100644
--- a/core/events/events_toolbox_item_select.ts
+++ b/core/events/events_toolbox_item_select.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of selecting an item on the toolbox.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.ToolboxItemSelect');
+
 
 import * as registry from '../registry';
 
diff --git a/core/events/events_trashcan_open.ts b/core/events/events_trashcan_open.ts
index 2cac5ea5e..84c3245d1 100644
--- a/core/events/events_trashcan_open.ts
+++ b/core/events/events_trashcan_open.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of trashcan flyout open and close.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.TrashcanOpen');
+
 
 import * as registry from '../registry';
 
diff --git a/core/events/events_ui.ts b/core/events/events_ui.ts
index a95857ae3..755c3b6d6 100644
--- a/core/events/events_ui.ts
+++ b/core/events/events_ui.ts
@@ -14,8 +14,7 @@
  * Blockly's editor.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.Ui');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/events_ui_base.ts b/core/events/events_ui_base.ts
index 34e368812..bba1c99b1 100644
--- a/core/events/events_ui_base.ts
+++ b/core/events/events_ui_base.ts
@@ -14,8 +14,7 @@
  * Blockly's editor.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.UiBase');
+
 
 import {Abstract as AbstractEvent} from './events_abstract';
 
diff --git a/core/events/events_var_base.ts b/core/events/events_var_base.ts
index c6671e721..1edc934ea 100644
--- a/core/events/events_var_base.ts
+++ b/core/events/events_var_base.ts
@@ -12,8 +12,7 @@
  * Abstract class for a variable event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.VarBase');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {VariableModel} from '../variable_model';
diff --git a/core/events/events_var_create.ts b/core/events/events_var_create.ts
index 07ce98d02..7eccf05e5 100644
--- a/core/events/events_var_create.ts
+++ b/core/events/events_var_create.ts
@@ -12,8 +12,7 @@
  * Class for a variable creation event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.VarCreate');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts
index 15eab9aff..735012356 100644
--- a/core/events/events_var_delete.ts
+++ b/core/events/events_var_delete.ts
@@ -12,8 +12,7 @@
  * Classes for all types of variable events.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.VarDelete');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts
index 9c02b4dfb..a82488d39 100644
--- a/core/events/events_var_rename.ts
+++ b/core/events/events_var_rename.ts
@@ -12,8 +12,7 @@
  * Class for a variable rename event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.VarRename');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_viewport.ts b/core/events/events_viewport.ts
index 5b9690c8e..2f8ba1025 100644
--- a/core/events/events_viewport.ts
+++ b/core/events/events_viewport.ts
@@ -12,8 +12,7 @@
  * Events fired as a result of a viewport change.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.ViewportChange');
+
 
 import * as registry from '../registry';
 
diff --git a/core/events/utils.ts b/core/events/utils.ts
index 9f65abc2d..125c2c878 100644
--- a/core/events/utils.ts
+++ b/core/events/utils.ts
@@ -14,8 +14,7 @@
  * actions in Blockly's editor.
  * @namespace Blockly.Events.utils
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.utils');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/events/workspace_events.ts b/core/events/workspace_events.ts
index 7f271b539..7bfe73633 100644
--- a/core/events/workspace_events.ts
+++ b/core/events/workspace_events.ts
@@ -12,8 +12,7 @@
  * Class for a finished loading workspace event.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Events.FinishedLoading');
+
 
 import * as registry from '../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/extensions.ts b/core/extensions.ts
index 22122c851..45f5e4795 100644
--- a/core/extensions.ts
+++ b/core/extensions.ts
@@ -18,8 +18,7 @@
  *      array attribute.
  * @namespace Blockly.Extensions
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Extensions');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './mutator';
diff --git a/core/field.ts b/core/field.ts
index 658f25b5c..71023f222 100644
--- a/core/field.ts
+++ b/core/field.ts
@@ -16,8 +16,7 @@
  * instances would be FieldTextInput, FieldDropdown, etc.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Field');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/field_angle.ts b/core/field_angle.ts
index 00a4730d9..f89cc9f4a 100644
--- a/core/field_angle.ts
+++ b/core/field_angle.ts
@@ -12,8 +12,7 @@
  * Angle input field.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldAngle');
+
 
 import {BlockSvg} from './block_svg';
 import * as browserEvents from './browser_events';
diff --git a/core/field_checkbox.ts b/core/field_checkbox.ts
index 0558e111f..e028ae2b3 100644
--- a/core/field_checkbox.ts
+++ b/core/field_checkbox.ts
@@ -12,8 +12,7 @@
  * Checkbox field.  Checked or not checked.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldCheckbox');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_colour.ts b/core/field_colour.ts
index 8abc3e408..9e5ab566d 100644
--- a/core/field_colour.ts
+++ b/core/field_colour.ts
@@ -12,8 +12,7 @@
  * Colour input field.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldColour');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_dropdown.ts b/core/field_dropdown.ts
index 5e9f5ba81..c4fb28cad 100644
--- a/core/field_dropdown.ts
+++ b/core/field_dropdown.ts
@@ -16,8 +16,7 @@
  * properties with the context menu.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldDropdown');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/field_image.ts b/core/field_image.ts
index ab86a363a..80cabec57 100644
--- a/core/field_image.ts
+++ b/core/field_image.ts
@@ -12,8 +12,7 @@
  * Image field.  Used for pictures, icons, etc.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldImage');
+
 
 import {Field} from './field';
 import * as fieldRegistry from './field_registry';
diff --git a/core/field_label.ts b/core/field_label.ts
index 52cddafb8..a66aa66a7 100644
--- a/core/field_label.ts
+++ b/core/field_label.ts
@@ -14,8 +14,7 @@
  *    labels, etc.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldLabel');
+
 
 import {Field} from './field';
 import * as fieldRegistry from './field_registry';
diff --git a/core/field_label_serializable.ts b/core/field_label_serializable.ts
index 9d10c7929..21c42d91b 100644
--- a/core/field_label_serializable.ts
+++ b/core/field_label_serializable.ts
@@ -16,8 +16,7 @@
  *    edited programmatically.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldLabelSerializable');
+
 
 import {FieldLabel} from './field_label';
 import * as fieldRegistry from './field_registry';
diff --git a/core/field_multilineinput.ts b/core/field_multilineinput.ts
index 51f28c07a..e8badf853 100644
--- a/core/field_multilineinput.ts
+++ b/core/field_multilineinput.ts
@@ -12,8 +12,7 @@
  * Text Area field.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldMultilineInput');
+
 
 import * as Css from './css';
 import {Field} from './field';
diff --git a/core/field_number.ts b/core/field_number.ts
index 6747c52da..d3913f2dc 100644
--- a/core/field_number.ts
+++ b/core/field_number.ts
@@ -12,8 +12,7 @@
  * Number input field
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldNumber');
+
 
 import {Field} from './field';
 import * as fieldRegistry from './field_registry';
diff --git a/core/field_registry.ts b/core/field_registry.ts
index bbac7fbfd..ae50931d6 100644
--- a/core/field_registry.ts
+++ b/core/field_registry.ts
@@ -16,8 +16,7 @@
  *    fields based on JSON.
  * @namespace Blockly.fieldRegistry
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.fieldRegistry');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from './field';
diff --git a/core/field_textinput.ts b/core/field_textinput.ts
index f629076bd..f9e7b4288 100644
--- a/core/field_textinput.ts
+++ b/core/field_textinput.ts
@@ -12,8 +12,7 @@
  * Text input field.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldTextInput');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/field_variable.ts b/core/field_variable.ts
index fb7728963..94ac7d20d 100644
--- a/core/field_variable.ts
+++ b/core/field_variable.ts
@@ -12,8 +12,7 @@
  * Variable input field.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FieldVariable');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/flyout_base.ts b/core/flyout_base.ts
index b6dc5586f..3c2c246fc 100644
--- a/core/flyout_base.ts
+++ b/core/flyout_base.ts
@@ -12,8 +12,7 @@
  * Flyout tray containing blocks which may be created.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Flyout');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block';
diff --git a/core/flyout_button.ts b/core/flyout_button.ts
index 898fd83da..b5858e446 100644
--- a/core/flyout_button.ts
+++ b/core/flyout_button.ts
@@ -12,8 +12,7 @@
  * Class for a button in the flyout.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FlyoutButton');
+
 
 import * as browserEvents from './browser_events';
 import * as Css from './css';
diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts
index bd8bd494b..f3de1acf8 100644
--- a/core/flyout_horizontal.ts
+++ b/core/flyout_horizontal.ts
@@ -12,8 +12,7 @@
  * Horizontal flyout tray containing blocks which may be created.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.HorizontalFlyout');
+
 
 import * as browserEvents from './browser_events';
 import * as dropDownDiv from './dropdowndiv';
diff --git a/core/flyout_metrics_manager.ts b/core/flyout_metrics_manager.ts
index d1e64cda2..3ed551d1b 100644
--- a/core/flyout_metrics_manager.ts
+++ b/core/flyout_metrics_manager.ts
@@ -12,8 +12,7 @@
  * Calculates and reports flyout workspace metrics.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.FlyoutMetricsManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IFlyout} from './interfaces/i_flyout';
diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts
index 80b7176f5..01a525421 100644
--- a/core/flyout_vertical.ts
+++ b/core/flyout_vertical.ts
@@ -12,8 +12,7 @@
  * Layout code for a vertical variant of the flyout.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.VerticalFlyout');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './block';
diff --git a/core/generator.ts b/core/generator.ts
index 568b039da..7367b7a0a 100644
--- a/core/generator.ts
+++ b/core/generator.ts
@@ -14,8 +14,7 @@
  * Blockly code.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Generator');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block';
diff --git a/core/gesture.ts b/core/gesture.ts
index 70c4c3835..ce2d63a9a 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -14,8 +14,7 @@
  * or a tap.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Gesture');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './block_dragger';
diff --git a/core/grid.ts b/core/grid.ts
index c176dff57..51a17192a 100644
--- a/core/grid.ts
+++ b/core/grid.ts
@@ -14,8 +14,7 @@
  * Blockly.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Grid');
+
 
 import * as dom from './utils/dom';
 import {Svg} from './utils/svg';
diff --git a/core/icon.ts b/core/icon.ts
index 262c11485..246ceb443 100644
--- a/core/icon.ts
+++ b/core/icon.ts
@@ -12,8 +12,7 @@
  * Object representing an icon on a block.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Icon');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from './block_svg';
diff --git a/core/inject.ts b/core/inject.ts
index b2111fadd..dc34189c1 100644
--- a/core/inject.ts
+++ b/core/inject.ts
@@ -12,8 +12,7 @@
  * Functions for injecting Blockly into a web page.
  * @namespace Blockly.inject
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.inject');
+
 
 import {BlockDragSurfaceSvg} from './block_drag_surface';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/input.ts b/core/input.ts
index a8ee2eaba..6f8df96f4 100644
--- a/core/input.ts
+++ b/core/input.ts
@@ -12,8 +12,7 @@
  * Object representing an input (value, statement, or dummy).
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Input');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './field_label';
diff --git a/core/input_types.ts b/core/input_types.ts
index 609b6c932..a59794a97 100644
--- a/core/input_types.ts
+++ b/core/input_types.ts
@@ -12,8 +12,7 @@
  * An enum for the possible types of inputs.
  * @namespace Blockly.inputTypes
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.inputTypes');
+
 
 import {ConnectionType} from './connection_type';
 
diff --git a/core/insertion_marker_manager.ts b/core/insertion_marker_manager.ts
index 48df450a0..67bfc01f5 100644
--- a/core/insertion_marker_manager.ts
+++ b/core/insertion_marker_manager.ts
@@ -12,8 +12,7 @@
  * Class that controls updates to connections during drags.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.InsertionMarkerManager');
+
 
 import * as blockAnimations from './block_animations';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_ast_node_location.ts b/core/interfaces/i_ast_node_location.ts
index 2842ef0bf..24c644dd0 100644
--- a/core/interfaces/i_ast_node_location.ts
+++ b/core/interfaces/i_ast_node_location.ts
@@ -12,8 +12,7 @@
  * The interface for an AST node location.
  * @namespace Blockly.IASTNodeLocation
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IASTNodeLocation');
+
 
 
 /**
diff --git a/core/interfaces/i_ast_node_location_svg.ts b/core/interfaces/i_ast_node_location_svg.ts
index 291e28884..5b9949737 100644
--- a/core/interfaces/i_ast_node_location_svg.ts
+++ b/core/interfaces/i_ast_node_location_svg.ts
@@ -12,8 +12,7 @@
  * The interface for an AST node location SVG.
  * @namespace Blockly.IASTNodeLocationSvg
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IASTNodeLocationSvg');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IASTNodeLocation} from './i_ast_node_location';
diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts
index a8966180a..bd11bc191 100644
--- a/core/interfaces/i_ast_node_location_with_block.ts
+++ b/core/interfaces/i_ast_node_location_with_block.ts
@@ -14,8 +14,7 @@
  * block.
  * @namespace Blockly.IASTNodeLocationWithBlock
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IASTNodeLocationWithBlock');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_autohideable.ts b/core/interfaces/i_autohideable.ts
index 7a25be7bb..6f08b2846 100644
--- a/core/interfaces/i_autohideable.ts
+++ b/core/interfaces/i_autohideable.ts
@@ -14,8 +14,7 @@
  * when WorkspaceSvg.hideChaff is called.
  * @namespace Blockly.IAutoHideable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IAutoHideable');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IComponent} from './i_component';
diff --git a/core/interfaces/i_block_dragger.ts b/core/interfaces/i_block_dragger.ts
index 0cb712aed..d742464c9 100644
--- a/core/interfaces/i_block_dragger.ts
+++ b/core/interfaces/i_block_dragger.ts
@@ -12,8 +12,7 @@
  * The interface for a block dragger.
  * @namespace Blockly.IBlockDragger
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IBlockDragger');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_bounded_element.ts b/core/interfaces/i_bounded_element.ts
index 5d9e2a54f..aa6c22ea7 100644
--- a/core/interfaces/i_bounded_element.ts
+++ b/core/interfaces/i_bounded_element.ts
@@ -12,8 +12,7 @@
  * The interface for a bounded element.
  * @namespace Blockly.IBoundedElement
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IBoundedElement');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts
index 6470e61bd..652fbd881 100644
--- a/core/interfaces/i_bubble.ts
+++ b/core/interfaces/i_bubble.ts
@@ -12,8 +12,7 @@
  * The interface for a bubble.
  * @namespace Blockly.IBubble
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IBubble');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_collapsible_toolbox_item.ts b/core/interfaces/i_collapsible_toolbox_item.ts
index f05bdf1ea..26a6d099b 100644
--- a/core/interfaces/i_collapsible_toolbox_item.ts
+++ b/core/interfaces/i_collapsible_toolbox_item.ts
@@ -12,8 +12,7 @@
  * The interface for a collapsible toolbox item.
  * @namespace Blockly.ICollapsibleToolboxItem
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ICollapsibleToolboxItem');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_component.ts b/core/interfaces/i_component.ts
index df80fed08..d4d4a721c 100644
--- a/core/interfaces/i_component.ts
+++ b/core/interfaces/i_component.ts
@@ -14,8 +14,7 @@
  * the ComponentManager.
  * @namespace Blockly.IComponent
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IComponent');
+
 
 
 /**
diff --git a/core/interfaces/i_connection_checker.ts b/core/interfaces/i_connection_checker.ts
index 19ad9f3d9..534a9da8f 100644
--- a/core/interfaces/i_connection_checker.ts
+++ b/core/interfaces/i_connection_checker.ts
@@ -14,8 +14,7 @@
  * checking whether a potential connection is safe and valid.
  * @namespace Blockly.IConnectionChecker
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IConnectionChecker');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_contextmenu.ts b/core/interfaces/i_contextmenu.ts
index 0d04a2545..27d8c2ad2 100644
--- a/core/interfaces/i_contextmenu.ts
+++ b/core/interfaces/i_contextmenu.ts
@@ -12,8 +12,7 @@
  * The interface for an object that supports a right-click.
  * @namespace Blockly.IContextMenu
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IContextMenu');
+
 
 
 /** @alias Blockly.IContextMenu */
diff --git a/core/interfaces/i_copyable.ts b/core/interfaces/i_copyable.ts
index 5c1a776db..d6c0e9be5 100644
--- a/core/interfaces/i_copyable.ts
+++ b/core/interfaces/i_copyable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that is copyable.
  * @namespace Blockly.ICopyable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ICopyable');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_deletable.ts b/core/interfaces/i_deletable.ts
index 5e061ee35..e4eda4c32 100644
--- a/core/interfaces/i_deletable.ts
+++ b/core/interfaces/i_deletable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that is deletable.
  * @namespace Blockly.IDeletable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IDeletable');
+
 
 
 /**
diff --git a/core/interfaces/i_delete_area.ts b/core/interfaces/i_delete_area.ts
index b60239596..2c7a71fb2 100644
--- a/core/interfaces/i_delete_area.ts
+++ b/core/interfaces/i_delete_area.ts
@@ -14,8 +14,7 @@
  * that is dropped on top of it.
  * @namespace Blockly.IDeleteArea
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IDeleteArea');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_drag_target.ts b/core/interfaces/i_drag_target.ts
index ebf1fe4ac..239cd7a81 100644
--- a/core/interfaces/i_drag_target.ts
+++ b/core/interfaces/i_drag_target.ts
@@ -14,8 +14,7 @@
  * block is dropped on top of it.
  * @namespace Blockly.IDragTarget
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IDragTarget');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_draggable.ts b/core/interfaces/i_draggable.ts
index e09d8c3a5..d209c9a44 100644
--- a/core/interfaces/i_draggable.ts
+++ b/core/interfaces/i_draggable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that is draggable.
  * @namespace Blockly.IDraggable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IDraggable');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IDeletable} from './i_deletable';
diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts
index f9838b999..95a7adff4 100644
--- a/core/interfaces/i_flyout.ts
+++ b/core/interfaces/i_flyout.ts
@@ -12,8 +12,7 @@
  * The interface for a flyout.
  * @namespace Blockly.IFlyout
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IFlyout');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_keyboard_accessible.ts b/core/interfaces/i_keyboard_accessible.ts
index b8c238ed6..13d380ce3 100644
--- a/core/interfaces/i_keyboard_accessible.ts
+++ b/core/interfaces/i_keyboard_accessible.ts
@@ -12,8 +12,7 @@
  * The interface for objects that handle keyboard shortcuts.
  * @namespace Blockly.IKeyboardAccessible
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IKeyboardAccessible');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts
index 107e8179b..51c13207e 100644
--- a/core/interfaces/i_metrics_manager.ts
+++ b/core/interfaces/i_metrics_manager.ts
@@ -12,8 +12,7 @@
  * The interface for a metrics manager.
  * @namespace Blockly.IMetricsManager
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IMetricsManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_movable.ts b/core/interfaces/i_movable.ts
index baecf783e..67c67c262 100644
--- a/core/interfaces/i_movable.ts
+++ b/core/interfaces/i_movable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that is movable.
  * @namespace Blockly.IMovable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IMovable');
+
 
 
 /**
diff --git a/core/interfaces/i_positionable.ts b/core/interfaces/i_positionable.ts
index a304fce90..b4683f570 100644
--- a/core/interfaces/i_positionable.ts
+++ b/core/interfaces/i_positionable.ts
@@ -12,8 +12,7 @@
  * The interface for a positionable UI element.
  * @namespace Blockly.IPositionable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IPositionable');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_registrable.ts b/core/interfaces/i_registrable.ts
index a12fd2b5a..b673122e3 100644
--- a/core/interfaces/i_registrable.ts
+++ b/core/interfaces/i_registrable.ts
@@ -14,8 +14,7 @@
  *    (Ex. Toolbox, Fields, Renderers)
  * @namespace Blockly.IRegistrable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IRegistrable');
+
 
 
 /**
diff --git a/core/interfaces/i_registrable_field.ts b/core/interfaces/i_registrable_field.ts
index 4b35ed3c0..64e9bc6d7 100644
--- a/core/interfaces/i_registrable_field.ts
+++ b/core/interfaces/i_registrable_field.ts
@@ -12,8 +12,7 @@
  * The interface for a Blockly field that can be registered.
  * @namespace Blockly.IRegistrableField
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IRegistrableField');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from '../field';
diff --git a/core/interfaces/i_selectable.ts b/core/interfaces/i_selectable.ts
index 3f15f51e9..c17095eca 100644
--- a/core/interfaces/i_selectable.ts
+++ b/core/interfaces/i_selectable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that is selectable.
  * @namespace Blockly.ISelectable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ISelectable');
+
 
 // eslint-disable-next-line no-unused-vars
 import {IDeletable} from './i_deletable';
diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts
index f9990b765..bce18972b 100644
--- a/core/interfaces/i_selectable_toolbox_item.ts
+++ b/core/interfaces/i_selectable_toolbox_item.ts
@@ -12,8 +12,7 @@
  * The interface for a selectable toolbox item.
  * @namespace Blockly.ISelectableToolboxItem
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ISelectableToolboxItem');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_serializer.ts b/core/interfaces/i_serializer.ts
index 7ea3f734a..3291bc8c8 100644
--- a/core/interfaces/i_serializer.ts
+++ b/core/interfaces/i_serializer.ts
@@ -14,8 +14,7 @@
  *     serializing part of the workspace.
  * @namespace Blockly.serialization.ISerializer
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.ISerializer');
+
 
 // eslint-disable-next-line no-unused-vars
 import {Workspace} from '../workspace';
diff --git a/core/interfaces/i_styleable.ts b/core/interfaces/i_styleable.ts
index 7e03a28f9..291f4c093 100644
--- a/core/interfaces/i_styleable.ts
+++ b/core/interfaces/i_styleable.ts
@@ -12,8 +12,7 @@
  * The interface for an object that a style can be added to.
  * @namespace Blockly.IStyleable
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IStyleable');
+
 
 
 /**
diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts
index 03460c38a..8e2459103 100644
--- a/core/interfaces/i_toolbox.ts
+++ b/core/interfaces/i_toolbox.ts
@@ -12,8 +12,7 @@
  * The interface for a toolbox.
  * @namespace Blockly.IToolbox
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IToolbox');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/interfaces/i_toolbox_item.ts b/core/interfaces/i_toolbox_item.ts
index f1d40ef08..9c44456e3 100644
--- a/core/interfaces/i_toolbox_item.ts
+++ b/core/interfaces/i_toolbox_item.ts
@@ -12,8 +12,7 @@
  * The interface for a toolbox item.
  * @namespace Blockly.IToolboxItem
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.IToolboxItem');
+
 
 
 /**
diff --git a/core/internal_constants.ts b/core/internal_constants.ts
index 91d7e782e..b89bb7289 100644
--- a/core/internal_constants.ts
+++ b/core/internal_constants.ts
@@ -14,8 +14,7 @@
  * use these constants outside of the core library.
  * @namespace Blockly.internalConstants
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.internalConstants');
+
 
 import {ConnectionType} from './connection_type';
 
diff --git a/core/keyboard_nav/ast_node.ts b/core/keyboard_nav/ast_node.ts
index d79981ff4..54875d91f 100644
--- a/core/keyboard_nav/ast_node.ts
+++ b/core/keyboard_nav/ast_node.ts
@@ -14,8 +14,7 @@
  * Used to traverse the Blockly AST.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ASTNode');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/keyboard_nav/basic_cursor.ts b/core/keyboard_nav/basic_cursor.ts
index b46e5ebfd..2f3ee8db9 100644
--- a/core/keyboard_nav/basic_cursor.ts
+++ b/core/keyboard_nav/basic_cursor.ts
@@ -14,8 +14,7 @@
  * Used to demo switching between different cursors.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.BasicCursor');
+
 
 import * as registry from '../registry';
 
diff --git a/core/keyboard_nav/cursor.ts b/core/keyboard_nav/cursor.ts
index 3119f9fc0..facf97880 100644
--- a/core/keyboard_nav/cursor.ts
+++ b/core/keyboard_nav/cursor.ts
@@ -14,8 +14,7 @@
  * Used primarily for keyboard navigation.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Cursor');
+
 
 import * as registry from '../registry';
 
diff --git a/core/keyboard_nav/marker.ts b/core/keyboard_nav/marker.ts
index 20f7e24c1..2b32fdb31 100644
--- a/core/keyboard_nav/marker.ts
+++ b/core/keyboard_nav/marker.ts
@@ -14,8 +14,7 @@
  * Used primarily for keyboard navigation to show a marked location.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Marker');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/keyboard_nav/tab_navigate_cursor.ts b/core/keyboard_nav/tab_navigate_cursor.ts
index fd8e74db6..28c1cc4d6 100644
--- a/core/keyboard_nav/tab_navigate_cursor.ts
+++ b/core/keyboard_nav/tab_navigate_cursor.ts
@@ -14,8 +14,7 @@
  * between tab navigable fields.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.TabNavigateCursor');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Field} from '../field';
diff --git a/core/marker_manager.ts b/core/marker_manager.ts
index 61776d124..07312de04 100644
--- a/core/marker_manager.ts
+++ b/core/marker_manager.ts
@@ -12,8 +12,7 @@
  * Object in charge of managing markers and the cursor.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.MarkerManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Cursor} from './keyboard_nav/cursor';
diff --git a/core/menu.ts b/core/menu.ts
index c2f830347..749ab9123 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -12,8 +12,7 @@
  * Blockly menu similar to Closure's goog.ui.Menu
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Menu');
+
 
 import * as browserEvents from './browser_events';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/menuitem.ts b/core/menuitem.ts
index b495d1cee..4cf9b19a1 100644
--- a/core/menuitem.ts
+++ b/core/menuitem.ts
@@ -12,8 +12,7 @@
  * Blockly menu item similar to Closure's goog.ui.MenuItem
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.MenuItem');
+
 
 import * as aria from './utils/aria';
 import * as dom from './utils/dom';
diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts
index 8ee2692ce..a8f252884 100644
--- a/core/metrics_manager.ts
+++ b/core/metrics_manager.ts
@@ -12,8 +12,7 @@
  * Calculates and reports workspace metrics.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.MetricsManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {IFlyout} from './interfaces/i_flyout';
diff --git a/core/msg.ts b/core/msg.ts
index d928248bb..bfbf40ca0 100644
--- a/core/msg.ts
+++ b/core/msg.ts
@@ -12,8 +12,7 @@
  * Empty name space for the Message singleton.
  * @namespace Blockly.Msg
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Msg');
+
 
 
 /** A dictionary of localised messages. */
diff --git a/core/mutator.ts b/core/mutator.ts
index 5cb63c925..a56152f3f 100644
--- a/core/mutator.ts
+++ b/core/mutator.ts
@@ -14,8 +14,7 @@
  * user to change the shape of a block using a nested blocks editor.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Mutator');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
diff --git a/core/names.ts b/core/names.ts
index 17737456e..590251b0f 100644
--- a/core/names.ts
+++ b/core/names.ts
@@ -12,8 +12,7 @@
  * Utility functions for handling variable and procedure names.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Names');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './procedures';
diff --git a/core/options.ts b/core/options.ts
index 08c2e25bd..b5d808b6f 100644
--- a/core/options.ts
+++ b/core/options.ts
@@ -12,8 +12,7 @@
  * Object that controls settings for the workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Options');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlocklyOptions} from './blockly_options';
diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts
index c540cd4e7..085c20cfe 100644
--- a/core/positionable_helpers.ts
+++ b/core/positionable_helpers.ts
@@ -12,8 +12,7 @@
  * Utility functions for positioning UI elements.
  * @namespace Blockly.uiPosition
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.uiPosition');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/procedures.ts b/core/procedures.ts
index 537e0ea03..b2005d5b5 100644
--- a/core/procedures.ts
+++ b/core/procedures.ts
@@ -12,8 +12,7 @@
  * Utility functions for handling procedures.
  * @namespace Blockly.Procedures
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Procedures');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_block_change';
diff --git a/core/registry.ts b/core/registry.ts
index 4aa61e3a6..dfe92f6ff 100644
--- a/core/registry.ts
+++ b/core/registry.ts
@@ -14,8 +14,7 @@
  *    for registering and unregistering different types of classes.
  * @namespace Blockly.registry
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.registry');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Abstract} from './events/events_abstract';
diff --git a/core/rendered_connection.ts b/core/rendered_connection.ts
index 429067f8f..feba8519b 100644
--- a/core/rendered_connection.ts
+++ b/core/rendered_connection.ts
@@ -12,8 +12,7 @@
  * Components for creating connections between blocks.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.RenderedConnection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block';
diff --git a/core/renderers/common/block_rendering.ts b/core/renderers/common/block_rendering.ts
index c914976f4..3a7743e62 100644
--- a/core/renderers/common/block_rendering.ts
+++ b/core/renderers/common/block_rendering.ts
@@ -12,8 +12,7 @@
  * Namespace for block rendering functionality.
  * @namespace Blockly.blockRendering
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering');
+
 
 import * as registry from '../../registry';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/constants.ts b/core/renderers/common/constants.ts
index 98cab9f52..f0047736b 100644
--- a/core/renderers/common/constants.ts
+++ b/core/renderers/common/constants.ts
@@ -12,8 +12,7 @@
  * An object that provides constants for rendering blocks.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.ConstantProvider');
+
 
 import {ConnectionType} from '../../connection_type';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/debug.ts b/core/renderers/common/debug.ts
index fa1d0635d..a85a08c1d 100644
--- a/core/renderers/common/debug.ts
+++ b/core/renderers/common/debug.ts
@@ -12,8 +12,7 @@
  * Block rendering debugging functionality.
  * @namespace Blockly.blockRendering.debug
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.debug');
+
 
 import * as deprecation from '../../utils/deprecation';
 
diff --git a/core/renderers/common/debugger.ts b/core/renderers/common/debugger.ts
index fcd4d0cff..d4acd0a0c 100644
--- a/core/renderers/common/debugger.ts
+++ b/core/renderers/common/debugger.ts
@@ -12,8 +12,7 @@
  * Methods for rendering debug graphics.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Debug');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/common/drawer.ts b/core/renderers/common/drawer.ts
index 0278794ac..1bf20aabd 100644
--- a/core/renderers/common/drawer.ts
+++ b/core/renderers/common/drawer.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Drawer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
index f454e9347..841324e24 100644
--- a/core/renderers/common/i_path_object.ts
+++ b/core/renderers/common/i_path_object.ts
@@ -14,8 +14,7 @@
  * elements.
  * @namespace Blockly.blockRendering.IPathObject
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.IPathObject');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/common/info.ts b/core/renderers/common/info.ts
index 77e36de89..28aef83df 100644
--- a/core/renderers/common/info.ts
+++ b/core/renderers/common/info.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.RenderInfo');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/common/marker_svg.ts b/core/renderers/common/marker_svg.ts
index 4797c3838..0dde99382 100644
--- a/core/renderers/common/marker_svg.ts
+++ b/core/renderers/common/marker_svg.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a marker as SVG.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.MarkerSvg');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import '../../events/events_marker_move';
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
index 79fb6f71f..185e6e1e3 100644
--- a/core/renderers/common/path_object.ts
+++ b/core/renderers/common/path_object.ts
@@ -12,8 +12,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.PathObject');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts
index 86e9639e8..7020d2ada 100644
--- a/core/renderers/common/renderer.ts
+++ b/core/renderers/common/renderer.ts
@@ -12,8 +12,7 @@
  * Base renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Renderer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../../block';
diff --git a/core/renderers/geras/constants.ts b/core/renderers/geras/constants.ts
index 77869cfa5..0147d4782 100644
--- a/core/renderers/geras/constants.ts
+++ b/core/renderers/geras/constants.ts
@@ -14,8 +14,7 @@
  * mode.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.ConstantProvider');
+
 
 import {ConstantProvider as BaseConstantProvider} from '../common/constants';
 
diff --git a/core/renderers/geras/drawer.ts b/core/renderers/geras/drawer.ts
index c80bb684d..3b0a1efa7 100644
--- a/core/renderers/geras/drawer.ts
+++ b/core/renderers/geras/drawer.ts
@@ -12,8 +12,7 @@
  * Renderer that preserves the look and feel of Blockly pre-2019.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.Drawer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/geras/geras.ts b/core/renderers/geras/geras.ts
index 41e85ae9c..66a1f2798 100644
--- a/core/renderers/geras/geras.ts
+++ b/core/renderers/geras/geras.ts
@@ -10,8 +10,7 @@
  * Re-exports of Blockly.geras.* modules.
  * @namespace Blockly.geras
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras');
+
 
 import {ConstantProvider} from './constants';
 import {Drawer} from './drawer';
diff --git a/core/renderers/geras/highlight_constants.ts b/core/renderers/geras/highlight_constants.ts
index 0e6c88d51..fb8ff69f8 100644
--- a/core/renderers/geras/highlight_constants.ts
+++ b/core/renderers/geras/highlight_constants.ts
@@ -12,8 +12,7 @@
  * Objects for rendering highlights on blocks.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.HighlightConstantProvider');
+
 
 import * as svgPaths from '../../utils/svg_paths';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts
index 2afc20f42..6b74c6e0c 100644
--- a/core/renderers/geras/highlighter.ts
+++ b/core/renderers/geras/highlighter.ts
@@ -14,8 +14,7 @@
  * compatibility mode.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.Highlighter');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/geras/info.ts b/core/renderers/geras/info.ts
index 1a3cf4f00..d8832b278 100644
--- a/core/renderers/geras/info.ts
+++ b/core/renderers/geras/info.ts
@@ -14,8 +14,7 @@
  * Geras: spirit of old age.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.RenderInfo');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/geras/measurables/inline_input.ts b/core/renderers/geras/measurables/inline_input.ts
index 072dca1f6..a2e8e46b3 100644
--- a/core/renderers/geras/measurables/inline_input.ts
+++ b/core/renderers/geras/measurables/inline_input.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.InlineInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/measurables/statement_input.ts b/core/renderers/geras/measurables/statement_input.ts
index f609f048e..77bd9e2a9 100644
--- a/core/renderers/geras/measurables/statement_input.ts
+++ b/core/renderers/geras/measurables/statement_input.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.StatementInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts
index cbada8735..7b21ab090 100644
--- a/core/renderers/geras/path_object.ts
+++ b/core/renderers/geras/path_object.ts
@@ -12,8 +12,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.PathObject');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts
index b8e217b87..f98bfe43c 100644
--- a/core/renderers/geras/renderer.ts
+++ b/core/renderers/geras/renderer.ts
@@ -12,8 +12,7 @@
  * Geras renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.geras.Renderer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/measurables/base.ts b/core/renderers/measurables/base.ts
index 80a53e5e3..78173d81a 100644
--- a/core/renderers/measurables/base.ts
+++ b/core/renderers/measurables/base.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Measurable');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/bottom_row.ts b/core/renderers/measurables/bottom_row.ts
index d196499f4..abb1827cc 100644
--- a/core/renderers/measurables/bottom_row.ts
+++ b/core/renderers/measurables/bottom_row.ts
@@ -14,8 +14,7 @@
  * of its subcomponents.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.BottomRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/measurables/connection.ts b/core/renderers/measurables/connection.ts
index 77016a263..776f4a565 100644
--- a/core/renderers/measurables/connection.ts
+++ b/core/renderers/measurables/connection.ts
@@ -14,8 +14,7 @@
  * rendering.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Connection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/external_value_input.ts b/core/renderers/measurables/external_value_input.ts
index d2af6862d..dda30b09b 100644
--- a/core/renderers/measurables/external_value_input.ts
+++ b/core/renderers/measurables/external_value_input.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.ExternalValueInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/field.ts b/core/renderers/measurables/field.ts
index a287591a6..fb265a4d6 100644
--- a/core/renderers/measurables/field.ts
+++ b/core/renderers/measurables/field.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Field');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/hat.ts b/core/renderers/measurables/hat.ts
index 7795413d6..5bd924b43 100644
--- a/core/renderers/measurables/hat.ts
+++ b/core/renderers/measurables/hat.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Hat');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/icon.ts b/core/renderers/measurables/icon.ts
index ac8dfdb2b..45c329550 100644
--- a/core/renderers/measurables/icon.ts
+++ b/core/renderers/measurables/icon.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Icon');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/in_row_spacer.ts b/core/renderers/measurables/in_row_spacer.ts
index 3c9ce50f6..dabe4c14b 100644
--- a/core/renderers/measurables/in_row_spacer.ts
+++ b/core/renderers/measurables/in_row_spacer.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.InRowSpacer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/inline_input.ts b/core/renderers/measurables/inline_input.ts
index 5bba08125..9285718d4 100644
--- a/core/renderers/measurables/inline_input.ts
+++ b/core/renderers/measurables/inline_input.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.InlineInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/input_connection.ts b/core/renderers/measurables/input_connection.ts
index e85ef3596..8a2c23e33 100644
--- a/core/renderers/measurables/input_connection.ts
+++ b/core/renderers/measurables/input_connection.ts
@@ -12,8 +12,7 @@
  * Class representing inputs with connections on a rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.InputConnection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/measurables/input_row.ts b/core/renderers/measurables/input_row.ts
index 8a726654c..8e37e0ab9 100644
--- a/core/renderers/measurables/input_row.ts
+++ b/core/renderers/measurables/input_row.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.InputRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/jagged_edge.ts b/core/renderers/measurables/jagged_edge.ts
index 99df7e373..1bc9e71f7 100644
--- a/core/renderers/measurables/jagged_edge.ts
+++ b/core/renderers/measurables/jagged_edge.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.JaggedEdge');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/next_connection.ts b/core/renderers/measurables/next_connection.ts
index 131ee075e..d8f870a29 100644
--- a/core/renderers/measurables/next_connection.ts
+++ b/core/renderers/measurables/next_connection.ts
@@ -14,8 +14,7 @@
  * rendering.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.NextConnection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection';
diff --git a/core/renderers/measurables/output_connection.ts b/core/renderers/measurables/output_connection.ts
index 7e4f25745..a411798e9 100644
--- a/core/renderers/measurables/output_connection.ts
+++ b/core/renderers/measurables/output_connection.ts
@@ -14,8 +14,7 @@
  * during rendering.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.OutputConnection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection';
diff --git a/core/renderers/measurables/previous_connection.ts b/core/renderers/measurables/previous_connection.ts
index 0fa048a28..c2c6a1224 100644
--- a/core/renderers/measurables/previous_connection.ts
+++ b/core/renderers/measurables/previous_connection.ts
@@ -14,8 +14,7 @@
  * during rendering.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.PreviousConnection');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {RenderedConnection} from '../../rendered_connection';
diff --git a/core/renderers/measurables/round_corner.ts b/core/renderers/measurables/round_corner.ts
index 4cb3b9bb0..6e2978f38 100644
--- a/core/renderers/measurables/round_corner.ts
+++ b/core/renderers/measurables/round_corner.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.RoundCorner');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/row.ts b/core/renderers/measurables/row.ts
index e3e367043..9f5c9d561 100644
--- a/core/renderers/measurables/row.ts
+++ b/core/renderers/measurables/row.ts
@@ -12,8 +12,7 @@
  * Object representing a single row on a rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Row');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/spacer_row.ts b/core/renderers/measurables/spacer_row.ts
index e4812cba2..ed7b134c9 100644
--- a/core/renderers/measurables/spacer_row.ts
+++ b/core/renderers/measurables/spacer_row.ts
@@ -12,8 +12,7 @@
  * Object representing a spacer between two rows.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.SpacerRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/square_corner.ts b/core/renderers/measurables/square_corner.ts
index 212c65b1c..53ce03364 100644
--- a/core/renderers/measurables/square_corner.ts
+++ b/core/renderers/measurables/square_corner.ts
@@ -14,8 +14,7 @@
  * block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.SquareCorner');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../common/constants';
diff --git a/core/renderers/measurables/statement_input.ts b/core/renderers/measurables/statement_input.ts
index 09c523cc2..08079ac69 100644
--- a/core/renderers/measurables/statement_input.ts
+++ b/core/renderers/measurables/statement_input.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.StatementInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/top_row.ts b/core/renderers/measurables/top_row.ts
index 9895b0775..6a4fb45d1 100644
--- a/core/renderers/measurables/top_row.ts
+++ b/core/renderers/measurables/top_row.ts
@@ -12,8 +12,7 @@
  * Object representing a top row on a rendered block.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.TopRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/measurables/types.ts b/core/renderers/measurables/types.ts
index ef1f5406e..807ccdc31 100644
--- a/core/renderers/measurables/types.ts
+++ b/core/renderers/measurables/types.ts
@@ -12,8 +12,7 @@
  * Measurable types.
  * @namespace Blockly.blockRendering.Types
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.blockRendering.Types');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Measurable} from './base';
diff --git a/core/renderers/minimalist/constants.ts b/core/renderers/minimalist/constants.ts
index 4fb1c2d46..7747d6749 100644
--- a/core/renderers/minimalist/constants.ts
+++ b/core/renderers/minimalist/constants.ts
@@ -14,8 +14,7 @@
  * minimalist renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.minimalist.ConstantProvider');
+
 
 import {ConstantProvider as BaseConstantProvider} from '../common/constants';
 
diff --git a/core/renderers/minimalist/drawer.ts b/core/renderers/minimalist/drawer.ts
index 8bc408895..dc261baae 100644
--- a/core/renderers/minimalist/drawer.ts
+++ b/core/renderers/minimalist/drawer.ts
@@ -12,8 +12,7 @@
  * Minimalist rendering drawer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.minimalist.Drawer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/minimalist/info.ts b/core/renderers/minimalist/info.ts
index d8bc72d30..c76312f1e 100644
--- a/core/renderers/minimalist/info.ts
+++ b/core/renderers/minimalist/info.ts
@@ -12,8 +12,7 @@
  * Minimalist render info object.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.minimalist.RenderInfo');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/minimalist/minimalist.ts b/core/renderers/minimalist/minimalist.ts
index bce4687d2..1555020a6 100644
--- a/core/renderers/minimalist/minimalist.ts
+++ b/core/renderers/minimalist/minimalist.ts
@@ -10,8 +10,7 @@
  * Re-exports of Blockly.minimalist.* modules.
  * @namespace Blockly.minimalist
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.minimalist');
+
 
 import {ConstantProvider} from './constants';
 import {Drawer} from './drawer';
diff --git a/core/renderers/minimalist/renderer.ts b/core/renderers/minimalist/renderer.ts
index 4379f347d..ed8451a2d 100644
--- a/core/renderers/minimalist/renderer.ts
+++ b/core/renderers/minimalist/renderer.ts
@@ -12,8 +12,7 @@
  * Minimalist renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.minimalist.Renderer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/thrasos/info.ts b/core/renderers/thrasos/info.ts
index b2aadb6de..87e77298f 100644
--- a/core/renderers/thrasos/info.ts
+++ b/core/renderers/thrasos/info.ts
@@ -14,8 +14,7 @@
  * Thrasos: spirit of boldness.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.thrasos.RenderInfo');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/thrasos/renderer.ts b/core/renderers/thrasos/renderer.ts
index 52704920e..48b3a50d7 100644
--- a/core/renderers/thrasos/renderer.ts
+++ b/core/renderers/thrasos/renderer.ts
@@ -12,8 +12,7 @@
  * Thrasos renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.thrasos.Renderer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/thrasos/thrasos.ts b/core/renderers/thrasos/thrasos.ts
index ac30db11c..478f3ab28 100644
--- a/core/renderers/thrasos/thrasos.ts
+++ b/core/renderers/thrasos/thrasos.ts
@@ -10,8 +10,7 @@
  * Re-exports of Blockly.thrasos.* modules.
  * @namespace Blockly.thrasos
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.thrasos');
+
 
 import {RenderInfo} from './info';
 import {Renderer} from './renderer';
diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts
index 2ff47ef4b..b6d685bb4 100644
--- a/core/renderers/zelos/constants.ts
+++ b/core/renderers/zelos/constants.ts
@@ -14,8 +14,7 @@
  * mode.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.ConstantProvider');
+
 
 import {ConnectionType} from '../../connection_type';
 import {RenderedConnection} from '../../rendered_connection';
diff --git a/core/renderers/zelos/drawer.ts b/core/renderers/zelos/drawer.ts
index 557b2226a..ac281a608 100644
--- a/core/renderers/zelos/drawer.ts
+++ b/core/renderers/zelos/drawer.ts
@@ -12,8 +12,7 @@
  * Zelos renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.Drawer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts
index 82e300ab8..42fad5e9d 100644
--- a/core/renderers/zelos/info.ts
+++ b/core/renderers/zelos/info.ts
@@ -13,8 +13,7 @@
  * Makecode/scratch-style renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.RenderInfo');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/zelos/marker_svg.ts b/core/renderers/zelos/marker_svg.ts
index 9ca77e719..52a2c43b0 100644
--- a/core/renderers/zelos/marker_svg.ts
+++ b/core/renderers/zelos/marker_svg.ts
@@ -12,8 +12,7 @@
  * Methods for graphically rendering a marker as SVG.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.MarkerSvg');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../block_svg';
diff --git a/core/renderers/zelos/measurables/bottom_row.ts b/core/renderers/zelos/measurables/bottom_row.ts
index 94d9adb89..d5b8135e8 100644
--- a/core/renderers/zelos/measurables/bottom_row.ts
+++ b/core/renderers/zelos/measurables/bottom_row.ts
@@ -12,8 +12,7 @@
  * An object representing the bottom row of a rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.BottomRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../../block_svg';
diff --git a/core/renderers/zelos/measurables/inputs.ts b/core/renderers/zelos/measurables/inputs.ts
index e0c8cc376..abda1523b 100644
--- a/core/renderers/zelos/measurables/inputs.ts
+++ b/core/renderers/zelos/measurables/inputs.ts
@@ -14,8 +14,7 @@
  * a rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.StatementInput');
+
 
 /* eslint-disable-next-line no-unused-vars */
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/row_elements.ts b/core/renderers/zelos/measurables/row_elements.ts
index f054d75ea..f436567ff 100644
--- a/core/renderers/zelos/measurables/row_elements.ts
+++ b/core/renderers/zelos/measurables/row_elements.ts
@@ -14,8 +14,7 @@
  * rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.RightConnectionShape');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ConstantProvider} from '../../../renderers/common/constants';
diff --git a/core/renderers/zelos/measurables/top_row.ts b/core/renderers/zelos/measurables/top_row.ts
index 9f1186216..a578aef03 100644
--- a/core/renderers/zelos/measurables/top_row.ts
+++ b/core/renderers/zelos/measurables/top_row.ts
@@ -12,8 +12,7 @@
  * An object representing the top row of a rendered block.
  * @class
  */
-import * as goog from '../../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.TopRow');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {BlockSvg} from '../../../block_svg';
diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts
index 1c8cb39bf..ac8a3bec2 100644
--- a/core/renderers/zelos/path_object.ts
+++ b/core/renderers/zelos/path_object.ts
@@ -12,8 +12,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.PathObject');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts
index ff6381dff..ec4058e85 100644
--- a/core/renderers/zelos/renderer.ts
+++ b/core/renderers/zelos/renderer.ts
@@ -12,8 +12,7 @@
  * Zelos renderer.
  * @class
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos.Renderer');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/zelos/zelos.ts b/core/renderers/zelos/zelos.ts
index 97963ce8f..3f5313c2c 100644
--- a/core/renderers/zelos/zelos.ts
+++ b/core/renderers/zelos/zelos.ts
@@ -10,8 +10,7 @@
  * Re-exports of Blockly.zelos.* modules.
  * @namespace Blockly.zelos
  */
-import * as goog from '../../../closure/goog/goog';
-goog.declareModuleId('Blockly.zelos');
+
 
 import {ConstantProvider} from './constants';
 import {Drawer} from './drawer';
diff --git a/core/scrollbar.ts b/core/scrollbar.ts
index c71cc801d..76faeadc0 100644
--- a/core/scrollbar.ts
+++ b/core/scrollbar.ts
@@ -12,8 +12,7 @@
  * Object representing a scrollbar.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Scrollbar');
+
 
 import * as browserEvents from './browser_events';
 import * as Touch from './touch';
diff --git a/core/scrollbar_pair.ts b/core/scrollbar_pair.ts
index b061a81df..21ec6e73c 100644
--- a/core/scrollbar_pair.ts
+++ b/core/scrollbar_pair.ts
@@ -12,8 +12,7 @@
  * Object representing a pair of scrollbars.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ScrollbarPair');
+
 
 import * as eventUtils from './events/utils';
 import {Scrollbar} from './scrollbar';
diff --git a/core/serialization/blocks.ts b/core/serialization/blocks.ts
index 00aad2c20..fd4441343 100644
--- a/core/serialization/blocks.ts
+++ b/core/serialization/blocks.ts
@@ -13,8 +13,7 @@
  * Handles serializing blocks to plain JavaScript objects only containing state.
  * @namespace Blockly.serialization.blocks
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.blocks');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/serialization/exceptions.ts b/core/serialization/exceptions.ts
index 6cc7333d7..164035c87 100644
--- a/core/serialization/exceptions.ts
+++ b/core/serialization/exceptions.ts
@@ -12,8 +12,7 @@
  * Contains custom errors thrown by the serialization system.
  * @namespace Blockly.serialization.exceptions
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.exceptions');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from '../block';
diff --git a/core/serialization/priorities.ts b/core/serialization/priorities.ts
index 68a66813a..adc597ccf 100644
--- a/core/serialization/priorities.ts
+++ b/core/serialization/priorities.ts
@@ -16,8 +16,7 @@
  * priorities are deserialized first.
  * @namespace Blockly.serialization.priorities
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.priorities');
+
 
 
 /**
diff --git a/core/serialization/registry.ts b/core/serialization/registry.ts
index 61dc3b0dc..fb1136107 100644
--- a/core/serialization/registry.ts
+++ b/core/serialization/registry.ts
@@ -14,8 +14,7 @@
  * etc).
  * @namespace Blockly.serialization.registry
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.registry');
+
 
 // eslint-disable-next-line no-unused-vars
 import {ISerializer} from '../interfaces/i_serializer';
diff --git a/core/serialization/variables.ts b/core/serialization/variables.ts
index 48799902d..1cd0f3c17 100644
--- a/core/serialization/variables.ts
+++ b/core/serialization/variables.ts
@@ -14,8 +14,7 @@
  * state.
  * @namespace Blockly.serialization.variables
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.variables');
+
 
 // eslint-disable-next-line no-unused-vars
 import {ISerializer} from '../interfaces/i_serializer';
diff --git a/core/serialization/workspaces.ts b/core/serialization/workspaces.ts
index 12dc688cc..d26b2d7b1 100644
--- a/core/serialization/workspaces.ts
+++ b/core/serialization/workspaces.ts
@@ -14,8 +14,7 @@
  * objects.
  * @namespace Blockly.serialization.workspaces
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.serialization.workspaces');
+
 
 import * as eventUtils from '../events/utils';
 import {ISerializer} from '../interfaces/i_serializer';
diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts
index ff07fcaaf..c1ee785ed 100644
--- a/core/shortcut_items.ts
+++ b/core/shortcut_items.ts
@@ -12,8 +12,7 @@
  * Registers default keyboard shortcuts.
  * @namespace Blockly.ShortcutItems
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ShortcutItems');
+
 
 import {BlockSvg} from './block_svg';
 import * as clipboard from './clipboard';
diff --git a/core/shortcut_registry.ts b/core/shortcut_registry.ts
index 75c811164..60032ec9a 100644
--- a/core/shortcut_registry.ts
+++ b/core/shortcut_registry.ts
@@ -14,8 +14,7 @@
  * key codes used to execute those shortcuts.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ShortcutRegistry');
+
 
 import {KeyCodes} from './utils/keycodes';
 import * as object from './utils/object';
diff --git a/core/sprites.ts b/core/sprites.ts
index 8f8150745..23eede0b2 100644
--- a/core/sprites.ts
+++ b/core/sprites.ts
@@ -8,8 +8,7 @@
  * @fileoverview Holds constants that have to do with the sprites that create
  * the trashcan and zoom controls.
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.sprite');
+
 
 
 /**
diff --git a/core/theme.ts b/core/theme.ts
index 34778ec1b..77b12bbc8 100644
--- a/core/theme.ts
+++ b/core/theme.ts
@@ -12,8 +12,7 @@
  * The class representing a theme.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Theme');
+
 
 import * as registry from './registry';
 import * as object from './utils/object';
diff --git a/core/theme/classic.ts b/core/theme/classic.ts
index e20bfe72a..9bb0f3d96 100644
--- a/core/theme/classic.ts
+++ b/core/theme/classic.ts
@@ -14,8 +14,7 @@
  * Contains multi-coloured border to create shadow effect.
  * @namespace Blockly.Themes.Classic
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Themes.Classic');
+
 
 import {Theme} from '../theme';
 
diff --git a/core/theme/themes.ts b/core/theme/themes.ts
index 19f397ea5..522649d18 100644
--- a/core/theme/themes.ts
+++ b/core/theme/themes.ts
@@ -12,8 +12,7 @@
  * Namespace for themes.
  * @namespace Blockly.Themes
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Themes');
+
 
 import {Classic} from './classic';
 import {Zelos} from './zelos';
diff --git a/core/theme/zelos.ts b/core/theme/zelos.ts
index e297d0e77..535b51c4b 100644
--- a/core/theme/zelos.ts
+++ b/core/theme/zelos.ts
@@ -12,8 +12,7 @@
  * Zelos theme.
  * @namespace Blockly.Themes.Zelos
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Themes.Zelos');
+
 
 import {Theme} from '../theme';
 
diff --git a/core/theme_manager.ts b/core/theme_manager.ts
index cf3f5a1b1..afa83bd97 100644
--- a/core/theme_manager.ts
+++ b/core/theme_manager.ts
@@ -14,8 +14,7 @@
  *     and UI components.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ThemeManager');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Theme} from './theme';
diff --git a/core/toolbox/category.ts b/core/toolbox/category.ts
index 87eb1b630..fbdc62380 100644
--- a/core/toolbox/category.ts
+++ b/core/toolbox/category.ts
@@ -12,8 +12,7 @@
  * A toolbox category used to organize blocks in the toolbox.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ToolboxCategory');
+
 
 import * as Css from '../css';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/collapsible_category.ts b/core/toolbox/collapsible_category.ts
index 2dbd46b0a..fd0860430 100644
--- a/core/toolbox/collapsible_category.ts
+++ b/core/toolbox/collapsible_category.ts
@@ -12,8 +12,7 @@
  * A toolbox category used to organize blocks in the toolbox.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.CollapsibleToolboxCategory');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
diff --git a/core/toolbox/separator.ts b/core/toolbox/separator.ts
index 17ccefce8..5cf0fc048 100644
--- a/core/toolbox/separator.ts
+++ b/core/toolbox/separator.ts
@@ -12,8 +12,7 @@
  * A separator used for separating toolbox categories.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ToolboxSeparator');
+
 
 import * as Css from '../css';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts
index d863385b4..70892dc9a 100644
--- a/core/toolbox/toolbox.ts
+++ b/core/toolbox/toolbox.ts
@@ -12,8 +12,7 @@
  * Toolbox from whence to create blocks.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.Toolbox');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/toolbox/toolbox_item.ts b/core/toolbox/toolbox_item.ts
index 929ee8b42..2cbaf8614 100644
--- a/core/toolbox/toolbox_item.ts
+++ b/core/toolbox/toolbox_item.ts
@@ -12,8 +12,7 @@
  * An item in the toolbox.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.ToolboxItem');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item';
diff --git a/core/tooltip.ts b/core/tooltip.ts
index 0e8ca61c6..872fd2010 100644
--- a/core/tooltip.ts
+++ b/core/tooltip.ts
@@ -13,8 +13,7 @@
  * tooltip will be used. Third, call bindMouseEvents(e) passing the SVG element.
  * @namespace Blockly.Tooltip
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Tooltip');
+
 
 import * as browserEvents from './browser_events';
 import * as common from './common';
diff --git a/core/touch.ts b/core/touch.ts
index 39256ab6f..4bf1047ad 100644
--- a/core/touch.ts
+++ b/core/touch.ts
@@ -12,8 +12,7 @@
  * Touch handling for Blockly.
  * @namespace Blockly.Touch
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Touch');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Gesture} from './gesture';
diff --git a/core/touch_gesture.ts b/core/touch_gesture.ts
index 8305ec795..6a5263fc0 100644
--- a/core/touch_gesture.ts
+++ b/core/touch_gesture.ts
@@ -14,8 +14,7 @@
  * for both pointer and touch events.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.TouchGesture');
+
 
 import * as browserEvents from './browser_events';
 import {Gesture} from './gesture';
diff --git a/core/trashcan.ts b/core/trashcan.ts
index 5b2bb9619..91bd68765 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -12,8 +12,7 @@
  * Object representing a trash can icon.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Trashcan');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/utils.ts b/core/utils.ts
index f90a6d845..028d24f0d 100644
--- a/core/utils.ts
+++ b/core/utils.ts
@@ -12,8 +12,7 @@
  * Utility methods.
  * @namespace Blockly.utils
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.utils');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Block} from './block';
diff --git a/core/utils/aria.ts b/core/utils/aria.ts
index abd597ddc..91d2df1b6 100644
--- a/core/utils/aria.ts
+++ b/core/utils/aria.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.aria
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.aria');
+
 
 
 /** ARIA states/properties prefix. */
diff --git a/core/utils/array.ts b/core/utils/array.ts
index 58a78d79c..82e8da1e0 100644
--- a/core/utils/array.ts
+++ b/core/utils/array.ts
@@ -9,8 +9,7 @@
  */
 
 /** @namespace Blockly.utils.array */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.array');
+
 
 
 /**
diff --git a/core/utils/colour.ts b/core/utils/colour.ts
index 10b04f8f7..a7977f13b 100644
--- a/core/utils/colour.ts
+++ b/core/utils/colour.ts
@@ -12,8 +12,7 @@
  * Utility methods for colour manipulation.
  * @namespace Blockly.utils.colour
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.colour');
+
 
 
 /**
diff --git a/core/utils/coordinate.ts b/core/utils/coordinate.ts
index 79a9cc0d8..500a6bb18 100644
--- a/core/utils/coordinate.ts
+++ b/core/utils/coordinate.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Coordinate');
+
 
 
 /**
diff --git a/core/utils/deprecation.ts b/core/utils/deprecation.ts
index 6f86dd54c..3fdf1be6f 100644
--- a/core/utils/deprecation.ts
+++ b/core/utils/deprecation.ts
@@ -14,8 +14,7 @@
  * This method is not specific to Blockly.
  * @namespace Blockly.utils.deprecation
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.deprecation');
+
 
 
 /**
diff --git a/core/utils/dom.ts b/core/utils/dom.ts
index 28d404be4..80b3691cc 100644
--- a/core/utils/dom.ts
+++ b/core/utils/dom.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.dom
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.dom');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Svg} from './svg';
diff --git a/core/utils/idgenerator.ts b/core/utils/idgenerator.ts
index f24c098df..276ad0e57 100644
--- a/core/utils/idgenerator.ts
+++ b/core/utils/idgenerator.ts
@@ -12,8 +12,7 @@
  * Generators for unique IDs.
  * @namespace Blockly.utils.idGenerator
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.idGenerator');
+
 
 
 /**
diff --git a/core/utils/keycodes.ts b/core/utils/keycodes.ts
index b2097eab5..feaa89b1c 100644
--- a/core/utils/keycodes.ts
+++ b/core/utils/keycodes.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.KeyCodes
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.KeyCodes');
+
 
 
 /**
diff --git a/core/utils/math.ts b/core/utils/math.ts
index a81054642..a5db2be00 100644
--- a/core/utils/math.ts
+++ b/core/utils/math.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.math
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.math');
+
 
 
 /**
diff --git a/core/utils/metrics.ts b/core/utils/metrics.ts
index 84aef136e..8eff76d63 100644
--- a/core/utils/metrics.ts
+++ b/core/utils/metrics.ts
@@ -12,8 +12,7 @@
  * Workspace metrics definitions.
  * @namespace Blockly.utils.Metrics
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Metrics');
+
 
 
 /** @alias Blockly.utils.Metrics */
diff --git a/core/utils/object.ts b/core/utils/object.ts
index 01b20fb12..474910073 100644
--- a/core/utils/object.ts
+++ b/core/utils/object.ts
@@ -12,8 +12,7 @@
  * Utility methods for objects.
  * @namespace Blockly.utils.object
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.object');
+
 
 import * as deprecation from './deprecation';
 
diff --git a/core/utils/parsing.ts b/core/utils/parsing.ts
index f1375811f..7c0d7f370 100644
--- a/core/utils/parsing.ts
+++ b/core/utils/parsing.ts
@@ -11,8 +11,7 @@
 /**
  * @namespace Blockly.utils.parsing
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.parsing');
+
 
 import {Msg} from '../msg';
 
diff --git a/core/utils/rect.ts b/core/utils/rect.ts
index 52e340e2e..6641027b6 100644
--- a/core/utils/rect.ts
+++ b/core/utils/rect.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Rect');
+
 
 
 /**
diff --git a/core/utils/sentinel.ts b/core/utils/sentinel.ts
index e978f2279..56f536ebc 100644
--- a/core/utils/sentinel.ts
+++ b/core/utils/sentinel.ts
@@ -12,8 +12,7 @@
  * A type used to create flag values.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Sentinel');
+
 
 
 /**
diff --git a/core/utils/size.ts b/core/utils/size.ts
index 0eea2c235..f379b6833 100644
--- a/core/utils/size.ts
+++ b/core/utils/size.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Size');
+
 
 
 /**
diff --git a/core/utils/string.ts b/core/utils/string.ts
index 474b10ac2..27f087493 100644
--- a/core/utils/string.ts
+++ b/core/utils/string.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.string
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.string');
+
 
 import * as deprecation from './deprecation';
 
diff --git a/core/utils/style.ts b/core/utils/style.ts
index 67207059b..44c2975c7 100644
--- a/core/utils/style.ts
+++ b/core/utils/style.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.style
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.style');
+
 
 import {Coordinate} from './coordinate';
 import {Rect} from './rect';
diff --git a/core/utils/svg.ts b/core/utils/svg.ts
index b973ac506..34b309dc3 100644
--- a/core/utils/svg.ts
+++ b/core/utils/svg.ts
@@ -14,8 +14,7 @@
  * all SVG tag names used by Blockly.
  * @class
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.Svg');
+
 
 
 /**
diff --git a/core/utils/svg_math.ts b/core/utils/svg_math.ts
index 1e3285168..68fcfdcc7 100644
--- a/core/utils/svg_math.ts
+++ b/core/utils/svg_math.ts
@@ -12,8 +12,7 @@
  * Utility methods realted to figuring out positions of SVG elements.
  * @namespace Blockly.utils.svgMath
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.svgMath');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {WorkspaceSvg} from '../workspace_svg';
diff --git a/core/utils/svg_paths.ts b/core/utils/svg_paths.ts
index c8384b2ea..fcac0bd1f 100644
--- a/core/utils/svg_paths.ts
+++ b/core/utils/svg_paths.ts
@@ -13,8 +13,7 @@
  * Methods for creating parts of SVG path strings.  See
  * @namespace Blockly.utils.svgPaths
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.svgPaths');
+
 
 
 /**
diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts
index b51fcba50..882c09e64 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -12,8 +12,7 @@
  * Utility functions for the toolbox and flyout.
  * @namespace Blockly.utils.toolbox
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.toolbox');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/utils/useragent.ts b/core/utils/useragent.ts
index fa80eafce..c7578134f 100644
--- a/core/utils/useragent.ts
+++ b/core/utils/useragent.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.userAgent
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.userAgent');
+
 
 
 /** The raw useragent string. */
diff --git a/core/utils/xml.ts b/core/utils/xml.ts
index 7b5ce603e..790aa5400 100644
--- a/core/utils/xml.ts
+++ b/core/utils/xml.ts
@@ -16,8 +16,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.xml
  */
-import * as goog from '../../closure/goog/goog';
-goog.declareModuleId('Blockly.utils.xml');
+
 
 
 /**
diff --git a/core/variable_map.ts b/core/variable_map.ts
index 6c52872df..0f0206f15 100644
--- a/core/variable_map.ts
+++ b/core/variable_map.ts
@@ -12,8 +12,7 @@
  * Object representing a map of variables and their types.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.VariableMap');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_var_delete';
diff --git a/core/variable_model.ts b/core/variable_model.ts
index 43522b701..663fa39a2 100644
--- a/core/variable_model.ts
+++ b/core/variable_model.ts
@@ -12,8 +12,7 @@
  * Components for the variable model.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.VariableModel');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_var_create';
diff --git a/core/variables.ts b/core/variables.ts
index 717fa31fb..e1bde181b 100644
--- a/core/variables.ts
+++ b/core/variables.ts
@@ -12,8 +12,7 @@
  * Utility functions for handling variables.
  * @namespace Blockly.Variables
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Variables');
+
 
 import {Blocks} from './blocks';
 import * as dialog from './dialog';
diff --git a/core/variables_dynamic.ts b/core/variables_dynamic.ts
index 6bc91e170..5c22bdb68 100644
--- a/core/variables_dynamic.ts
+++ b/core/variables_dynamic.ts
@@ -13,8 +13,7 @@
  *
  * @namespace Blockly.VariablesDynamic
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.VariablesDynamic');
+
 
 import {Blocks} from './blocks';
 import {Msg} from './msg';
diff --git a/core/warning.ts b/core/warning.ts
index 81c855b87..6c63e75c5 100644
--- a/core/warning.ts
+++ b/core/warning.ts
@@ -12,8 +12,7 @@
  * Object representing a warning.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Warning');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_bubble_open';
diff --git a/core/widgetdiv.ts b/core/widgetdiv.ts
index 07552619b..7a9310bd9 100644
--- a/core/widgetdiv.ts
+++ b/core/widgetdiv.ts
@@ -16,8 +16,7 @@
  *     E.g. text input areas, colour pickers, context menus.
  * @namespace Blockly.WidgetDiv
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WidgetDiv');
+
 
 import * as common from './common';
 import * as dom from './utils/dom';
diff --git a/core/workspace.ts b/core/workspace.ts
index 638be707b..938503af4 100644
--- a/core/workspace.ts
+++ b/core/workspace.ts
@@ -12,8 +12,7 @@
  * Object representing a workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Workspace');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './connection_checker';
diff --git a/core/workspace_audio.ts b/core/workspace_audio.ts
index 32a3854a2..f20c28ca5 100644
--- a/core/workspace_audio.ts
+++ b/core/workspace_audio.ts
@@ -14,8 +14,7 @@
  *     workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceAudio');
+
 
 import * as userAgent from './utils/useragent';
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts
index 99d13f260..0ad757e63 100644
--- a/core/workspace_comment.ts
+++ b/core/workspace_comment.ts
@@ -12,8 +12,7 @@
  * Object representing a code comment on the workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceComment');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_comment_change';
diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts
index 3d2a8d5aa..1d8357e17 100644
--- a/core/workspace_comment_svg.ts
+++ b/core/workspace_comment_svg.ts
@@ -12,8 +12,7 @@
  * Object representing a code comment on a rendered workspace.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceCommentSvg');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './events/events_comment_create';
diff --git a/core/workspace_drag_surface_svg.ts b/core/workspace_drag_surface_svg.ts
index e6a07554c..959dd16e9 100644
--- a/core/workspace_drag_surface_svg.ts
+++ b/core/workspace_drag_surface_svg.ts
@@ -18,8 +18,7 @@
  * blocks are never repainted during drag improving performance.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceDragSurfaceSvg');
+
 
 /* eslint-disable-next-line no-unused-vars */
 import {Coordinate} from './utils/coordinate';
diff --git a/core/workspace_dragger.ts b/core/workspace_dragger.ts
index 96ea613f9..bc9095e44 100644
--- a/core/workspace_dragger.ts
+++ b/core/workspace_dragger.ts
@@ -12,8 +12,7 @@
  * Methods for dragging a workspace visually.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceDragger');
+
 
 import * as common from './common';
 import {Coordinate} from './utils/coordinate';
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 6e745cbb1..94dbdc6d0 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -12,8 +12,7 @@
  * Object representing a workspace rendered as SVG.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.WorkspaceSvg');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/xml.ts b/core/xml.ts
index a3a974c60..703abba20 100644
--- a/core/xml.ts
+++ b/core/xml.ts
@@ -12,8 +12,7 @@
  * XML reader and writer.
  * @namespace Blockly.Xml
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.Xml');
+
 
 // Unused import preserved for side-effects. Remove if unneeded.
 import './comment';
diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts
index 1c1ed0990..3b3947c5e 100644
--- a/core/zoom_controls.ts
+++ b/core/zoom_controls.ts
@@ -12,8 +12,7 @@
  * Object representing a zoom icons.
  * @class
  */
-import * as goog from '../closure/goog/goog';
-goog.declareModuleId('Blockly.ZoomControls');
+
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.