diff --git a/core/block.ts b/core/block.ts
index c802a5d3ce5..6c131a4eb4e 100644
--- a/core/block.ts
+++ b/core/block.ts
@@ -13,6 +13,7 @@
  * The class representing one block.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Block');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/block_animations.ts b/core/block_animations.ts
index 737b57d786b..e1891c43559 100644
--- a/core/block_animations.ts
+++ b/core/block_animations.ts
@@ -13,6 +13,7 @@
  * Methods animating a block on connection and disconnection.
  * @namespace Blockly.blockAnimations
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockAnimations');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/block_drag_surface.ts b/core/block_drag_surface.ts
index 173662ff255..d02880ca794 100644
--- a/core/block_drag_surface.ts
+++ b/core/block_drag_surface.ts
@@ -23,6 +23,7 @@
  * while dragging blocks.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlockDragSurfaceSvg');
 
 import {Coordinate} from './utils/coordinate.js';
diff --git a/core/block_dragger.ts b/core/block_dragger.ts
index c83d877cbce..67144bfb9cf 100644
--- a/core/block_dragger.ts
+++ b/core/block_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a block visually.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlockDragger');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/block_svg.ts b/core/block_svg.ts
index 5ae6b9e7951..b21cb87bfab 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlockSvg');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/blockly.ts b/core/blockly.ts
index 31e00b621e6..8d2a3bc720f 100644
--- a/core/blockly.ts
+++ b/core/blockly.ts
@@ -13,6 +13,7 @@
  * The top level namespace used to access the Blockly library.
  * @namespace Blockly
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/blockly_options.ts b/core/blockly_options.ts
index f90a326bd3a..f2f59564da4 100644
--- a/core/blockly_options.ts
+++ b/core/blockly_options.ts
@@ -13,6 +13,7 @@
  * Object that defines user-specified options for the workspace.
  * @namespace Blockly.BlocklyOptions
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlocklyOptions');
 
 
diff --git a/core/blocks.ts b/core/blocks.ts
index bca44e58dfa..30fca303af2 100644
--- a/core/blocks.ts
+++ b/core/blocks.ts
@@ -13,6 +13,7 @@
  * A mapping of block type names to block prototype objects.
  * @namespace Blockly.blocks
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blocks');
 
 
diff --git a/core/browser_events.ts b/core/browser_events.ts
index c373aaf58e4..3ee02842f22 100644
--- a/core/browser_events.ts
+++ b/core/browser_events.ts
@@ -13,6 +13,7 @@
  * Browser event handling.
  * @namespace Blockly.browserEvents
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.browserEvents');
 
 import * as Touch from './touch.js';
diff --git a/core/bubble.ts b/core/bubble.ts
index 64884d49da0..f163c0aac5e 100644
--- a/core/bubble.ts
+++ b/core/bubble.ts
@@ -13,6 +13,7 @@
  * Object representing a UI bubble.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Bubble');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts
index 8b6ef70be10..33f56a3131a 100644
--- a/core/bubble_dragger.ts
+++ b/core/bubble_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a bubble visually.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BubbleDragger');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/bump_objects.ts b/core/bump_objects.ts
index ae0ea0864de..2417ec6acd9 100644
--- a/core/bump_objects.ts
+++ b/core/bump_objects.ts
@@ -13,6 +13,7 @@
  * Utilities for bumping objects back into worksapce bounds.
  * @namespace Blockly.bumpObjects
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.bumpObjects');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/clipboard.ts b/core/clipboard.ts
index 6bfcf23b767..12eddbff62f 100644
--- a/core/clipboard.ts
+++ b/core/clipboard.ts
@@ -13,6 +13,7 @@
  * Blockly's internal clipboard for managing copy-paste.
  * @namespace Blockly.clipboard
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.clipboard');
 
 import {CopyData, ICopyable} from './interfaces/i_copyable.js';
diff --git a/core/comment.ts b/core/comment.ts
index 1532ea1ff6d..9d87971ad28 100644
--- a/core/comment.ts
+++ b/core/comment.ts
@@ -13,6 +13,7 @@
  * Object representing a code comment.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Comment');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/common.ts b/core/common.ts
index 36a3eb26a64..167c835185f 100644
--- a/core/common.ts
+++ b/core/common.ts
@@ -15,6 +15,7 @@
  * must not be at the top level to avoid circular dependencies.
  * @namespace Blockly.common
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.common');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/component_manager.ts b/core/component_manager.ts
index 0fe4d873d5b..a47a5885037 100644
--- a/core/component_manager.ts
+++ b/core/component_manager.ts
@@ -13,6 +13,7 @@
  * Manager for all items registered with the workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ComponentManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/config.ts b/core/config.ts
index de953ff5487..dad5426708f 100644
--- a/core/config.ts
+++ b/core/config.ts
@@ -17,6 +17,7 @@
  * generally recommended.
  * @namespace Blockly.config
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.config');
 
 /**
diff --git a/core/connection.ts b/core/connection.ts
index 67d8c2403c2..bba7a2fe88c 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -13,6 +13,7 @@
  * Components for creating connections between blocks.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Connection');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/connection_checker.ts b/core/connection_checker.ts
index ef06f8eaec4..d81216cea20 100644
--- a/core/connection_checker.ts
+++ b/core/connection_checker.ts
@@ -15,6 +15,7 @@
  * potential connection is safe and valid.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ConnectionChecker');
 
 import * as common from './common.js';
diff --git a/core/connection_db.ts b/core/connection_db.ts
index 36585c0d922..d84ccaf9d4b 100644
--- a/core/connection_db.ts
+++ b/core/connection_db.ts
@@ -17,6 +17,7 @@
  *    Sorted by y coordinate.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ConnectionDB');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/connection_type.ts b/core/connection_type.ts
index c58d2742ea1..b9e21f0db6e 100644
--- a/core/connection_type.ts
+++ b/core/connection_type.ts
@@ -13,6 +13,7 @@
  * An enum for the possible types of connections.
  * @namespace Blockly.ConnectionType
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ConnectionType');
 
 
diff --git a/core/constants.ts b/core/constants.ts
index bacad44086a..26aac3619dd 100644
--- a/core/constants.ts
+++ b/core/constants.ts
@@ -13,6 +13,7 @@
  * Blockly constants.
  * @namespace Blockly.constants
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.constants');
 
 
diff --git a/core/contextmenu.ts b/core/contextmenu.ts
index e1720432d77..6c9a67cea96 100644
--- a/core/contextmenu.ts
+++ b/core/contextmenu.ts
@@ -13,6 +13,7 @@
  * Functionality for the right-click context menus.
  * @namespace Blockly.ContextMenu
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ContextMenu');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/contextmenu_items.ts b/core/contextmenu_items.ts
index 5a1bfe34287..62342eef467 100644
--- a/core/contextmenu_items.ts
+++ b/core/contextmenu_items.ts
@@ -13,6 +13,7 @@
  * Registers default context menu items.
  * @namespace Blockly.ContextMenuItems
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ContextMenuItems');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/contextmenu_registry.ts b/core/contextmenu_registry.ts
index 073006a511e..ae23362d079 100644
--- a/core/contextmenu_registry.ts
+++ b/core/contextmenu_registry.ts
@@ -13,6 +13,7 @@
  * Registry for context menu option items.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ContextMenuRegistry');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/css.ts b/core/css.ts
index afd54a6b74a..08c43500031 100644
--- a/core/css.ts
+++ b/core/css.ts
@@ -13,6 +13,7 @@
  * Inject Blockly's CSS synchronously.
  * @namespace Blockly.Css
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Css');
 
 import * as deprecation from './utils/deprecation.js';
diff --git a/core/delete_area.ts b/core/delete_area.ts
index 7a13c5d2c4b..17aced846b3 100644
--- a/core/delete_area.ts
+++ b/core/delete_area.ts
@@ -16,6 +16,7 @@
  * bubble that is dropped on top of it.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.DeleteArea');
 
 import {BlockSvg} from './block_svg.js';
diff --git a/core/dialog.ts b/core/dialog.ts
index 917a2f5fce3..1bf8dae8ecf 100644
--- a/core/dialog.ts
+++ b/core/dialog.ts
@@ -14,6 +14,7 @@
  * Wrapper functions around JS functions for showing alert/confirmation dialogs.
  * @namespace Blockly.dialog
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.dialog');
 
 let alertImplementation = function(
diff --git a/core/drag_target.ts b/core/drag_target.ts
index edfe7cf4d12..cb116755671 100644
--- a/core/drag_target.ts
+++ b/core/drag_target.ts
@@ -16,6 +16,7 @@
  * block or bubble is dragged over or dropped on top of it.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.DragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts
index bc6b32eacca..ce9d3727678 100644
--- a/core/dropdowndiv.ts
+++ b/core/dropdowndiv.ts
@@ -15,6 +15,7 @@
  * A div that floats on top of the workspace, for drop-down menus.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.dropDownDiv');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events.ts b/core/events/events.ts
index b0aa9f26818..db5338d2438 100644
--- a/core/events/events.ts
+++ b/core/events/events.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of actions in Blockly's editor.
  * @namespace Blockly.Events
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events');
 
 import * as deprecation from '../utils/deprecation.js';
diff --git a/core/events/events_abstract.ts b/core/events/events_abstract.ts
index 04bf17ed059..755107a658a 100644
--- a/core/events/events_abstract.ts
+++ b/core/events/events_abstract.ts
@@ -15,6 +15,7 @@
  * Blockly's editor.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.Abstract');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_base.ts b/core/events/events_block_base.ts
index 60cb6367b02..8b7189335bc 100644
--- a/core/events/events_block_base.ts
+++ b/core/events/events_block_base.ts
@@ -13,6 +13,7 @@
  * Base class for all types of block events.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockBase');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_change.ts b/core/events/events_block_change.ts
index 62f9ab27ca4..7a683e09769 100644
--- a/core/events/events_block_change.ts
+++ b/core/events/events_block_change.ts
@@ -13,6 +13,7 @@
  * Class for a block change event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockChange');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_create.ts b/core/events/events_block_create.ts
index d11f3d1b044..62d8ee81629 100644
--- a/core/events/events_block_create.ts
+++ b/core/events/events_block_create.ts
@@ -13,6 +13,7 @@
  * Class for a block creation event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockCreate');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_delete.ts b/core/events/events_block_delete.ts
index 8ff18b21df1..3e947c795ac 100644
--- a/core/events/events_block_delete.ts
+++ b/core/events/events_block_delete.ts
@@ -13,6 +13,7 @@
  * Class for a block delete event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockDelete');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_drag.ts b/core/events/events_block_drag.ts
index c1f32f9a391..3c571b8cd5a 100644
--- a/core/events/events_block_drag.ts
+++ b/core/events/events_block_drag.ts
@@ -13,6 +13,7 @@
  * Events fired as a block drag.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockDrag');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_block_move.ts b/core/events/events_block_move.ts
index c990162cdd5..c8c8d444af9 100644
--- a/core/events/events_block_move.ts
+++ b/core/events/events_block_move.ts
@@ -13,6 +13,7 @@
  * Class for a block move event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BlockMove');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_bubble_open.ts b/core/events/events_bubble_open.ts
index cb24d062ad7..32fec5a8789 100644
--- a/core/events/events_bubble_open.ts
+++ b/core/events/events_bubble_open.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of bubble open.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.BubbleOpen');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_click.ts b/core/events/events_click.ts
index e0ecba06404..117aaaf7e21 100644
--- a/core/events/events_click.ts
+++ b/core/events/events_click.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of UI click in Blockly's editor.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.Click');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_comment_base.ts b/core/events/events_comment_base.ts
index 3fcdcd10f07..2c512607a98 100644
--- a/core/events/events_comment_base.ts
+++ b/core/events/events_comment_base.ts
@@ -13,6 +13,7 @@
  * Base class for comment events.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.CommentBase');
 
 import * as utilsXml from '../utils/xml.js';
diff --git a/core/events/events_comment_change.ts b/core/events/events_comment_change.ts
index 576be980562..748504f7e59 100644
--- a/core/events/events_comment_change.ts
+++ b/core/events/events_comment_change.ts
@@ -13,6 +13,7 @@
  * Class for comment change event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.CommentChange');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_comment_create.ts b/core/events/events_comment_create.ts
index 46a01273281..f053da77df0 100644
--- a/core/events/events_comment_create.ts
+++ b/core/events/events_comment_create.ts
@@ -13,6 +13,7 @@
  * Class for comment creation event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.CommentCreate');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_comment_delete.ts b/core/events/events_comment_delete.ts
index 6f51b569ff8..b4ffdbd7cd0 100644
--- a/core/events/events_comment_delete.ts
+++ b/core/events/events_comment_delete.ts
@@ -13,6 +13,7 @@
  * Class for comment deletion event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.CommentDelete');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_comment_move.ts b/core/events/events_comment_move.ts
index 91ca0cebf70..5dc53fe3a51 100644
--- a/core/events/events_comment_move.ts
+++ b/core/events/events_comment_move.ts
@@ -13,6 +13,7 @@
  * Class for comment move event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.CommentMove');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_marker_move.ts b/core/events/events_marker_move.ts
index 8df9460bc87..c587e87acc8 100644
--- a/core/events/events_marker_move.ts
+++ b/core/events/events_marker_move.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of a marker move.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.MarkerMove');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_selected.ts b/core/events/events_selected.ts
index d53ab436ee3..0bd5eeb4a75 100644
--- a/core/events/events_selected.ts
+++ b/core/events/events_selected.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of element select action.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.Selected');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_theme_change.ts b/core/events/events_theme_change.ts
index f6a0199b2ac..5c0a577e4f2 100644
--- a/core/events/events_theme_change.ts
+++ b/core/events/events_theme_change.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of a theme update.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.ThemeChange');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_toolbox_item_select.ts b/core/events/events_toolbox_item_select.ts
index 0e86d4965f4..fbb13e32cd0 100644
--- a/core/events/events_toolbox_item_select.ts
+++ b/core/events/events_toolbox_item_select.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of selecting an item on the toolbox.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.ToolboxItemSelect');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_trashcan_open.ts b/core/events/events_trashcan_open.ts
index 262a1291ca6..5774bbf9765 100644
--- a/core/events/events_trashcan_open.ts
+++ b/core/events/events_trashcan_open.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of trashcan flyout open and close.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.TrashcanOpen');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_ui.ts b/core/events/events_ui.ts
index ceb6707fa8f..cc3ca3aba36 100644
--- a/core/events/events_ui.ts
+++ b/core/events/events_ui.ts
@@ -15,6 +15,7 @@
  * Blockly's editor.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.Ui');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_ui_base.ts b/core/events/events_ui_base.ts
index 2efd4f1034e..b6bee2e9884 100644
--- a/core/events/events_ui_base.ts
+++ b/core/events/events_ui_base.ts
@@ -15,6 +15,7 @@
  * Blockly's editor.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.UiBase');
 
 import {Abstract as AbstractEvent} from './events_abstract.js';
diff --git a/core/events/events_var_base.ts b/core/events/events_var_base.ts
index bf70096ff1f..976870cd183 100644
--- a/core/events/events_var_base.ts
+++ b/core/events/events_var_base.ts
@@ -13,6 +13,7 @@
  * Abstract class for a variable event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.VarBase');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_create.ts b/core/events/events_var_create.ts
index 2bb5d23e21f..088621670c4 100644
--- a/core/events/events_var_create.ts
+++ b/core/events/events_var_create.ts
@@ -13,6 +13,7 @@
  * Class for a variable creation event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.VarCreate');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts
index 06cfc04ffbd..de4f4de0af7 100644
--- a/core/events/events_var_delete.ts
+++ b/core/events/events_var_delete.ts
@@ -13,6 +13,7 @@
  * Classes for all types of variable events.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.VarDelete');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts
index 4f1b05ebe89..0c53ccd6a92 100644
--- a/core/events/events_var_rename.ts
+++ b/core/events/events_var_rename.ts
@@ -13,6 +13,7 @@
  * Class for a variable rename event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.VarRename');
 
 import * as registry from '../registry.js';
diff --git a/core/events/events_viewport.ts b/core/events/events_viewport.ts
index 7fdd3ebbe19..fa712c3a06d 100644
--- a/core/events/events_viewport.ts
+++ b/core/events/events_viewport.ts
@@ -13,6 +13,7 @@
  * Events fired as a result of a viewport change.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.ViewportChange');
 
 import * as registry from '../registry.js';
diff --git a/core/events/utils.ts b/core/events/utils.ts
index 8fae8a1df0d..26727a767db 100644
--- a/core/events/utils.ts
+++ b/core/events/utils.ts
@@ -15,6 +15,7 @@
  * actions in Blockly's editor.
  * @namespace Blockly.Events.utils
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.utils');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/workspace_events.ts b/core/events/workspace_events.ts
index 1b961189c12..0b0b942b8c7 100644
--- a/core/events/workspace_events.ts
+++ b/core/events/workspace_events.ts
@@ -13,6 +13,7 @@
  * Class for a finished loading workspace event.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Events.FinishedLoading');
 
 import * as registry from '../registry.js';
diff --git a/core/extensions.ts b/core/extensions.ts
index ad02a8a28fe..8a33250714e 100644
--- a/core/extensions.ts
+++ b/core/extensions.ts
@@ -19,6 +19,7 @@
  *      array attribute.
  * @namespace Blockly.Extensions
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Extensions');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/field.ts b/core/field.ts
index 9b2c123881f..fedc1fb5031 100644
--- a/core/field.ts
+++ b/core/field.ts
@@ -17,6 +17,7 @@
  * instances would be FieldTextInput, FieldDropdown, etc.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Field');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field_angle.ts b/core/field_angle.ts
index ad7b1458b40..d9b0d2578ee 100644
--- a/core/field_angle.ts
+++ b/core/field_angle.ts
@@ -13,6 +13,7 @@
  * Angle input field.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldAngle');
 
 import {BlockSvg} from './block_svg.js';
diff --git a/core/field_checkbox.ts b/core/field_checkbox.ts
index b6ae2742d64..b425ffef04c 100644
--- a/core/field_checkbox.ts
+++ b/core/field_checkbox.ts
@@ -13,6 +13,7 @@
  * Checkbox field.  Checked or not checked.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldCheckbox');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/field_colour.ts b/core/field_colour.ts
index 15c03b80ec3..615aa8ede14 100644
--- a/core/field_colour.ts
+++ b/core/field_colour.ts
@@ -13,6 +13,7 @@
  * Colour input field.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldColour');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/field_dropdown.ts b/core/field_dropdown.ts
index c518dc8802a..13111d61997 100644
--- a/core/field_dropdown.ts
+++ b/core/field_dropdown.ts
@@ -17,6 +17,7 @@
  * properties with the context menu.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldDropdown');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field_image.ts b/core/field_image.ts
index 10c14befa52..ed09e74ff51 100644
--- a/core/field_image.ts
+++ b/core/field_image.ts
@@ -13,6 +13,7 @@
  * Image field.  Used for pictures, icons, etc.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldImage');
 
 import {Field} from './field.js';
diff --git a/core/field_label.ts b/core/field_label.ts
index 21ffabaa739..4aba8749943 100644
--- a/core/field_label.ts
+++ b/core/field_label.ts
@@ -15,6 +15,7 @@
  *    labels, etc.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldLabel');
 
 import {Field} from './field.js';
diff --git a/core/field_label_serializable.ts b/core/field_label_serializable.ts
index ce03b45a541..d8293bc06d3 100644
--- a/core/field_label_serializable.ts
+++ b/core/field_label_serializable.ts
@@ -17,6 +17,7 @@
  *    edited programmatically.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldLabelSerializable');
 
 import {FieldLabel} from './field_label.js';
diff --git a/core/field_multilineinput.ts b/core/field_multilineinput.ts
index 0441269fa3d..f7e913657f5 100644
--- a/core/field_multilineinput.ts
+++ b/core/field_multilineinput.ts
@@ -13,6 +13,7 @@
  * Text Area field.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldMultilineInput');
 
 import * as Css from './css.js';
diff --git a/core/field_number.ts b/core/field_number.ts
index fdba25c6058..3da1b9dd78a 100644
--- a/core/field_number.ts
+++ b/core/field_number.ts
@@ -13,6 +13,7 @@
  * Number input field
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldNumber');
 
 import {Field} from './field.js';
diff --git a/core/field_registry.ts b/core/field_registry.ts
index e035191e307..a3229f6119b 100644
--- a/core/field_registry.ts
+++ b/core/field_registry.ts
@@ -17,6 +17,7 @@
  *    fields based on JSON.
  * @namespace Blockly.fieldRegistry
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.fieldRegistry');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field_textinput.ts b/core/field_textinput.ts
index ae3904c75d2..c4da00fa6e9 100644
--- a/core/field_textinput.ts
+++ b/core/field_textinput.ts
@@ -13,6 +13,7 @@
  * Text input field.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldTextInput');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/field_variable.ts b/core/field_variable.ts
index accf33ddba2..8aa7fd2a070 100644
--- a/core/field_variable.ts
+++ b/core/field_variable.ts
@@ -13,6 +13,7 @@
  * Variable input field.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FieldVariable');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/flyout_base.ts b/core/flyout_base.ts
index 9197bedccdd..33c9232e5e8 100644
--- a/core/flyout_base.ts
+++ b/core/flyout_base.ts
@@ -13,6 +13,7 @@
  * Flyout tray containing blocks which may be created.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Flyout');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/flyout_button.ts b/core/flyout_button.ts
index 639aa3ad881..4456465204e 100644
--- a/core/flyout_button.ts
+++ b/core/flyout_button.ts
@@ -13,6 +13,7 @@
  * Class for a button in the flyout.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FlyoutButton');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts
index 44476d59e9d..569464242ca 100644
--- a/core/flyout_horizontal.ts
+++ b/core/flyout_horizontal.ts
@@ -13,6 +13,7 @@
  * Horizontal flyout tray containing blocks which may be created.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.HorizontalFlyout');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/flyout_metrics_manager.ts b/core/flyout_metrics_manager.ts
index cadffe402b0..60747e8c3c8 100644
--- a/core/flyout_metrics_manager.ts
+++ b/core/flyout_metrics_manager.ts
@@ -13,6 +13,7 @@
  * Calculates and reports flyout workspace metrics.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.FlyoutMetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts
index 0711d4d6886..23c720083be 100644
--- a/core/flyout_vertical.ts
+++ b/core/flyout_vertical.ts
@@ -13,6 +13,7 @@
  * Layout code for a vertical variant of the flyout.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.VerticalFlyout');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/generator.ts b/core/generator.ts
index 7b46e5b0b7a..e2c5d9c31a3 100644
--- a/core/generator.ts
+++ b/core/generator.ts
@@ -15,6 +15,7 @@
  * Blockly code.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Generator');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/gesture.ts b/core/gesture.ts
index e25b2fe171e..665e647e5b2 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -15,6 +15,7 @@
  * or a tap.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Gesture');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/grid.ts b/core/grid.ts
index 3f37e7fc98d..5107d3705ed 100644
--- a/core/grid.ts
+++ b/core/grid.ts
@@ -15,6 +15,7 @@
  * Blockly.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Grid');
 
 import * as dom from './utils/dom.js';
diff --git a/core/icon.ts b/core/icon.ts
index e81eb175f33..5e5c177246a 100644
--- a/core/icon.ts
+++ b/core/icon.ts
@@ -13,6 +13,7 @@
  * Object representing an icon on a block.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Icon');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/inject.ts b/core/inject.ts
index 5e4d17a7e1a..4bd643d7abf 100644
--- a/core/inject.ts
+++ b/core/inject.ts
@@ -13,6 +13,7 @@
  * Functions for injecting Blockly into a web page.
  * @namespace Blockly.inject
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.inject');
 
 import 'angular-mocks';
diff --git a/core/input.ts b/core/input.ts
index 71adfb345fc..739a23ad821 100644
--- a/core/input.ts
+++ b/core/input.ts
@@ -13,6 +13,7 @@
  * Object representing an input (value, statement, or dummy).
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Input');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/input_types.ts b/core/input_types.ts
index 9e1cf99d9f6..c0602263142 100644
--- a/core/input_types.ts
+++ b/core/input_types.ts
@@ -13,6 +13,7 @@
  * An enum for the possible types of inputs.
  * @namespace Blockly.inputTypes
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.inputTypes');
 
 import {ConnectionType} from './connection_type.js';
diff --git a/core/insertion_marker_manager.ts b/core/insertion_marker_manager.ts
index 91e00b786ae..835840f852b 100644
--- a/core/insertion_marker_manager.ts
+++ b/core/insertion_marker_manager.ts
@@ -13,6 +13,7 @@
  * Class that controls updates to connections during drags.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.InsertionMarkerManager');
 
 import * as blockAnimations from './block_animations.js';
diff --git a/core/interfaces/i_ast_node_location.ts b/core/interfaces/i_ast_node_location.ts
index df28c978774..9924bd3a6f1 100644
--- a/core/interfaces/i_ast_node_location.ts
+++ b/core/interfaces/i_ast_node_location.ts
@@ -13,6 +13,7 @@
  * The interface for an AST node location.
  * @namespace Blockly.IASTNodeLocation
  */
+import * as goog from '../../closure/goog/goog.js';
 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 031481b8d96..f28d062be76 100644
--- a/core/interfaces/i_ast_node_location_svg.ts
+++ b/core/interfaces/i_ast_node_location_svg.ts
@@ -13,6 +13,7 @@
  * The interface for an AST node location SVG.
  * @namespace Blockly.IASTNodeLocationSvg
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IASTNodeLocationSvg');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts
index 9783290358e..c42c6e7824e 100644
--- a/core/interfaces/i_ast_node_location_with_block.ts
+++ b/core/interfaces/i_ast_node_location_with_block.ts
@@ -16,6 +16,7 @@
  * block.
  * @namespace Blockly.IASTNodeLocationWithBlock
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IASTNodeLocationWithBlock');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_autohideable.ts b/core/interfaces/i_autohideable.ts
index afb6a96cd12..5ec93eb04ca 100644
--- a/core/interfaces/i_autohideable.ts
+++ b/core/interfaces/i_autohideable.ts
@@ -16,6 +16,7 @@
  * when WorkspaceSvg.hideChaff is called.
  * @namespace Blockly.IAutoHideable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IAutoHideable');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_block_dragger.ts b/core/interfaces/i_block_dragger.ts
index a9bb177dba5..2a2711c5b44 100644
--- a/core/interfaces/i_block_dragger.ts
+++ b/core/interfaces/i_block_dragger.ts
@@ -13,6 +13,7 @@
  * The interface for a block dragger.
  * @namespace Blockly.IBlockDragger
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IBlockDragger');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_bounded_element.ts b/core/interfaces/i_bounded_element.ts
index 6f6a76b8cad..e2925e4b60e 100644
--- a/core/interfaces/i_bounded_element.ts
+++ b/core/interfaces/i_bounded_element.ts
@@ -13,6 +13,7 @@
  * The interface for a bounded element.
  * @namespace Blockly.IBoundedElement
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IBoundedElement');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts
index 0158d39bd8b..a653829327e 100644
--- a/core/interfaces/i_bubble.ts
+++ b/core/interfaces/i_bubble.ts
@@ -13,6 +13,7 @@
  * The interface for a bubble.
  * @namespace Blockly.IBubble
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IBubble');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_collapsible_toolbox_item.ts b/core/interfaces/i_collapsible_toolbox_item.ts
index 68c055de428..6cb4f117d05 100644
--- a/core/interfaces/i_collapsible_toolbox_item.ts
+++ b/core/interfaces/i_collapsible_toolbox_item.ts
@@ -13,6 +13,7 @@
  * The interface for a collapsible toolbox item.
  * @namespace Blockly.ICollapsibleToolboxItem
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ICollapsibleToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_component.ts b/core/interfaces/i_component.ts
index b677b3cd71f..6dc09205c2e 100644
--- a/core/interfaces/i_component.ts
+++ b/core/interfaces/i_component.ts
@@ -16,6 +16,7 @@
  * the ComponentManager.
  * @namespace Blockly.IComponent
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IComponent');
 
 
diff --git a/core/interfaces/i_connection_checker.ts b/core/interfaces/i_connection_checker.ts
index d769dea349e..f6ee5695dea 100644
--- a/core/interfaces/i_connection_checker.ts
+++ b/core/interfaces/i_connection_checker.ts
@@ -15,6 +15,7 @@
  * checking whether a potential connection is safe and valid.
  * @namespace Blockly.IConnectionChecker
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IConnectionChecker');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_contextmenu.ts b/core/interfaces/i_contextmenu.ts
index e1eac2e5cca..abc4a6487e7 100644
--- a/core/interfaces/i_contextmenu.ts
+++ b/core/interfaces/i_contextmenu.ts
@@ -13,6 +13,7 @@
  * The interface for an object that supports a right-click.
  * @namespace Blockly.IContextMenu
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IContextMenu');
 
 
diff --git a/core/interfaces/i_copyable.ts b/core/interfaces/i_copyable.ts
index 739e0e2b17e..60986b06279 100644
--- a/core/interfaces/i_copyable.ts
+++ b/core/interfaces/i_copyable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that is copyable.
  * @namespace Blockly.ICopyable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ICopyable');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_deletable.ts b/core/interfaces/i_deletable.ts
index 602c518ea6f..50087de30f5 100644
--- a/core/interfaces/i_deletable.ts
+++ b/core/interfaces/i_deletable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that is deletable.
  * @namespace Blockly.IDeletable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IDeletable');
 
 
diff --git a/core/interfaces/i_delete_area.ts b/core/interfaces/i_delete_area.ts
index 5b2870d5c92..e8d473ebc07 100644
--- a/core/interfaces/i_delete_area.ts
+++ b/core/interfaces/i_delete_area.ts
@@ -16,6 +16,7 @@
  * that is dropped on top of it.
  * @namespace Blockly.IDeleteArea
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IDeleteArea');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_drag_target.ts b/core/interfaces/i_drag_target.ts
index 1e678dcc17b..9adb41aa31c 100644
--- a/core/interfaces/i_drag_target.ts
+++ b/core/interfaces/i_drag_target.ts
@@ -16,6 +16,7 @@
  * block is dropped on top of it.
  * @namespace Blockly.IDragTarget
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IDragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_draggable.ts b/core/interfaces/i_draggable.ts
index e39cdad2980..3482ff226e7 100644
--- a/core/interfaces/i_draggable.ts
+++ b/core/interfaces/i_draggable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that is draggable.
  * @namespace Blockly.IDraggable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IDraggable');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts
index 373297afdc7..2d135bd966f 100644
--- a/core/interfaces/i_flyout.ts
+++ b/core/interfaces/i_flyout.ts
@@ -13,6 +13,7 @@
  * The interface for a flyout.
  * @namespace Blockly.IFlyout
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IFlyout');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_keyboard_accessible.ts b/core/interfaces/i_keyboard_accessible.ts
index 1246f4d6527..02f0184dda8 100644
--- a/core/interfaces/i_keyboard_accessible.ts
+++ b/core/interfaces/i_keyboard_accessible.ts
@@ -13,6 +13,7 @@
  * The interface for objects that handle keyboard shortcuts.
  * @namespace Blockly.IKeyboardAccessible
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IKeyboardAccessible');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts
index f155ef4940b..8ab503a8d4a 100644
--- a/core/interfaces/i_metrics_manager.ts
+++ b/core/interfaces/i_metrics_manager.ts
@@ -13,6 +13,7 @@
  * The interface for a metrics manager.
  * @namespace Blockly.IMetricsManager
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IMetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_movable.ts b/core/interfaces/i_movable.ts
index fc569239076..02452c71d7b 100644
--- a/core/interfaces/i_movable.ts
+++ b/core/interfaces/i_movable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that is movable.
  * @namespace Blockly.IMovable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IMovable');
 
 
diff --git a/core/interfaces/i_positionable.ts b/core/interfaces/i_positionable.ts
index 36a3eb9986c..b8c205d0b86 100644
--- a/core/interfaces/i_positionable.ts
+++ b/core/interfaces/i_positionable.ts
@@ -13,6 +13,7 @@
  * The interface for a positionable UI element.
  * @namespace Blockly.IPositionable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IPositionable');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_registrable.ts b/core/interfaces/i_registrable.ts
index 2f65dbdf44a..dc8850690aa 100644
--- a/core/interfaces/i_registrable.ts
+++ b/core/interfaces/i_registrable.ts
@@ -16,6 +16,7 @@
  *    (Ex. Toolbox, Fields, Renderers)
  * @namespace Blockly.IRegistrable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IRegistrable');
 
 
diff --git a/core/interfaces/i_registrable_field.ts b/core/interfaces/i_registrable_field.ts
index 01e770dbbaa..9feb479d779 100644
--- a/core/interfaces/i_registrable_field.ts
+++ b/core/interfaces/i_registrable_field.ts
@@ -13,6 +13,7 @@
  * The interface for a Blockly field that can be registered.
  * @namespace Blockly.IRegistrableField
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IRegistrableField');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_selectable.ts b/core/interfaces/i_selectable.ts
index 434485df126..cf7e945a4df 100644
--- a/core/interfaces/i_selectable.ts
+++ b/core/interfaces/i_selectable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that is selectable.
  * @namespace Blockly.ISelectable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ISelectable');
 
 // eslint-disable-next-line no-unused-vars
diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts
index 682fc26301f..01af0d45b09 100644
--- a/core/interfaces/i_selectable_toolbox_item.ts
+++ b/core/interfaces/i_selectable_toolbox_item.ts
@@ -13,6 +13,7 @@
  * The interface for a selectable toolbox item.
  * @namespace Blockly.ISelectableToolboxItem
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ISelectableToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_serializer.ts b/core/interfaces/i_serializer.ts
index a6dd291f8fb..86bd9ef612f 100644
--- a/core/interfaces/i_serializer.ts
+++ b/core/interfaces/i_serializer.ts
@@ -16,6 +16,7 @@
  *     serializing part of the workspace.
  * @namespace Blockly.serialization.ISerializer
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.ISerializer');
 
 // eslint-disable-next-line no-unused-vars
diff --git a/core/interfaces/i_styleable.ts b/core/interfaces/i_styleable.ts
index 5bbc13d480d..1439a937a13 100644
--- a/core/interfaces/i_styleable.ts
+++ b/core/interfaces/i_styleable.ts
@@ -13,6 +13,7 @@
  * The interface for an object that a style can be added to.
  * @namespace Blockly.IStyleable
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IStyleable');
 
 
diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts
index 4f6eae98ab4..12bf4397a0a 100644
--- a/core/interfaces/i_toolbox.ts
+++ b/core/interfaces/i_toolbox.ts
@@ -13,6 +13,7 @@
  * The interface for a toolbox.
  * @namespace Blockly.IToolbox
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IToolbox');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_toolbox_item.ts b/core/interfaces/i_toolbox_item.ts
index d23590f28cc..303481dad73 100644
--- a/core/interfaces/i_toolbox_item.ts
+++ b/core/interfaces/i_toolbox_item.ts
@@ -13,6 +13,7 @@
  * The interface for a toolbox item.
  * @namespace Blockly.IToolboxItem
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.IToolboxItem');
 
 
diff --git a/core/internal_constants.ts b/core/internal_constants.ts
index a3fe75cb934..1d4e4b364c8 100644
--- a/core/internal_constants.ts
+++ b/core/internal_constants.ts
@@ -15,6 +15,7 @@
  * use these constants outside of the core library.
  * @namespace Blockly.internalConstants
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.internalConstants');
 
 import {ConnectionType} from './connection_type.js';
diff --git a/core/keyboard_nav/ast_node.ts b/core/keyboard_nav/ast_node.ts
index 5cf422955a4..735f843ffc4 100644
--- a/core/keyboard_nav/ast_node.ts
+++ b/core/keyboard_nav/ast_node.ts
@@ -15,6 +15,7 @@
  * Used to traverse the Blockly AST.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ASTNode');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/keyboard_nav/basic_cursor.ts b/core/keyboard_nav/basic_cursor.ts
index 2be84881ddd..b6fbc784dcf 100644
--- a/core/keyboard_nav/basic_cursor.ts
+++ b/core/keyboard_nav/basic_cursor.ts
@@ -15,6 +15,7 @@
  * Used to demo switching between different cursors.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BasicCursor');
 
 import * as registry from '../registry.js';
diff --git a/core/keyboard_nav/cursor.ts b/core/keyboard_nav/cursor.ts
index b6eb51ceb7b..520bc78ec52 100644
--- a/core/keyboard_nav/cursor.ts
+++ b/core/keyboard_nav/cursor.ts
@@ -15,6 +15,7 @@
  * Used primarily for keyboard navigation.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Cursor');
 
 import * as registry from '../registry.js';
diff --git a/core/keyboard_nav/marker.ts b/core/keyboard_nav/marker.ts
index 9907c65f3e5..5c1fbda2a71 100644
--- a/core/keyboard_nav/marker.ts
+++ b/core/keyboard_nav/marker.ts
@@ -15,6 +15,7 @@
  * Used primarily for keyboard navigation to show a marked location.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Marker');
 
 /* 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 c19a5a69561..8b77cb9aba9 100644
--- a/core/keyboard_nav/tab_navigate_cursor.ts
+++ b/core/keyboard_nav/tab_navigate_cursor.ts
@@ -15,6 +15,7 @@
  * between tab navigable fields.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.TabNavigateCursor');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/marker_manager.ts b/core/marker_manager.ts
index 2997911ed4f..6d04c0ab2e8 100644
--- a/core/marker_manager.ts
+++ b/core/marker_manager.ts
@@ -13,6 +13,7 @@
  * Object in charge of managing markers and the cursor.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.MarkerManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/menu.ts b/core/menu.ts
index 6606128808a..b9618851352 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -13,6 +13,7 @@
  * Blockly menu similar to Closure's goog.ui.Menu
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Menu');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/menuitem.ts b/core/menuitem.ts
index 96707fdf75d..586e9d8418a 100644
--- a/core/menuitem.ts
+++ b/core/menuitem.ts
@@ -13,6 +13,7 @@
  * Blockly menu item similar to Closure's goog.ui.MenuItem
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.MenuItem');
 
 import * as aria from './utils/aria.js';
diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts
index c3c0ef182eb..b23b471140e 100644
--- a/core/metrics_manager.ts
+++ b/core/metrics_manager.ts
@@ -13,6 +13,7 @@
  * Calculates and reports workspace metrics.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.MetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/msg.ts b/core/msg.ts
index 59cfa053cd2..e0a3981984f 100644
--- a/core/msg.ts
+++ b/core/msg.ts
@@ -13,6 +13,7 @@
  * Empty name space for the Message singleton.
  * @namespace Blockly.Msg
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Msg');
 
 
diff --git a/core/mutator.ts b/core/mutator.ts
index c1be8bfe819..a1a2904dd43 100644
--- a/core/mutator.ts
+++ b/core/mutator.ts
@@ -15,6 +15,7 @@
  * user to change the shape of a block using a nested blocks editor.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Mutator');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/names.ts b/core/names.ts
index 899a1b27470..78f4998552e 100644
--- a/core/names.ts
+++ b/core/names.ts
@@ -13,6 +13,7 @@
  * Utility functions for handling variable and procedure names.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Names');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/options.ts b/core/options.ts
index df1e2a275d4..28356ab116c 100644
--- a/core/options.ts
+++ b/core/options.ts
@@ -13,6 +13,7 @@
  * Object that controls settings for the workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Options');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts
index af5b4b532ef..e796203b272 100644
--- a/core/positionable_helpers.ts
+++ b/core/positionable_helpers.ts
@@ -13,6 +13,7 @@
  * Utility functions for positioning UI elements.
  * @namespace Blockly.uiPosition
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.uiPosition');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/procedures.ts b/core/procedures.ts
index ba4de680ba5..058a1f85808 100644
--- a/core/procedures.ts
+++ b/core/procedures.ts
@@ -13,6 +13,7 @@
  * Utility functions for handling procedures.
  * @namespace Blockly.Procedures
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Procedures');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/registry.ts b/core/registry.ts
index 6e573a20ff9..956430b2439 100644
--- a/core/registry.ts
+++ b/core/registry.ts
@@ -15,6 +15,7 @@
  *    for registering and unregistering different types of classes.
  * @namespace Blockly.registry
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.registry');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/rendered_connection.ts b/core/rendered_connection.ts
index 08e5339ee9b..ae352d971ff 100644
--- a/core/rendered_connection.ts
+++ b/core/rendered_connection.ts
@@ -13,6 +13,7 @@
  * Components for creating connections between blocks.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.RenderedConnection');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/block_rendering.ts b/core/renderers/common/block_rendering.ts
index 09cb546b336..240632b45c3 100644
--- a/core/renderers/common/block_rendering.ts
+++ b/core/renderers/common/block_rendering.ts
@@ -13,6 +13,7 @@
  * Namespace for block rendering functionality.
  * @namespace Blockly.blockRendering
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering');
 
 import * as registry from '../../registry.js';
diff --git a/core/renderers/common/constants.ts b/core/renderers/common/constants.ts
index 65be90d8eb8..efc1c0d57a2 100644
--- a/core/renderers/common/constants.ts
+++ b/core/renderers/common/constants.ts
@@ -13,6 +13,7 @@
  * An object that provides constants for rendering blocks.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.ConstantProvider');
 
 import {ConnectionType} from '../../connection_type.js';
diff --git a/core/renderers/common/debug.ts b/core/renderers/common/debug.ts
index 9d57f841aac..9a59d6563ba 100644
--- a/core/renderers/common/debug.ts
+++ b/core/renderers/common/debug.ts
@@ -13,6 +13,7 @@
  * Block rendering debugging functionality.
  * @namespace Blockly.blockRendering.debug
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.debug');
 
 import * as deprecation from '../../utils/deprecation.js';
diff --git a/core/renderers/common/debugger.ts b/core/renderers/common/debugger.ts
index 486f3da3afc..316f0f84e52 100644
--- a/core/renderers/common/debugger.ts
+++ b/core/renderers/common/debugger.ts
@@ -13,6 +13,7 @@
  * Methods for rendering debug graphics.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Debug');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/drawer.ts b/core/renderers/common/drawer.ts
index 698b274d5b1..d1a328783fd 100644
--- a/core/renderers/common/drawer.ts
+++ b/core/renderers/common/drawer.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
index 2ac4458908b..d3bae3042f0 100644
--- a/core/renderers/common/i_path_object.ts
+++ b/core/renderers/common/i_path_object.ts
@@ -16,6 +16,7 @@
  * elements.
  * @namespace Blockly.blockRendering.IPathObject
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.IPathObject');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/info.ts b/core/renderers/common/info.ts
index 11b4aba6e46..8d2b6ded0ad 100644
--- a/core/renderers/common/info.ts
+++ b/core/renderers/common/info.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/marker_svg.ts b/core/renderers/common/marker_svg.ts
index 76c4942d7ff..52d139c6820 100644
--- a/core/renderers/common/marker_svg.ts
+++ b/core/renderers/common/marker_svg.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a marker as SVG.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.MarkerSvg');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
index a34838818ee..857b9b21b8a 100644
--- a/core/renderers/common/path_object.ts
+++ b/core/renderers/common/path_object.ts
@@ -13,6 +13,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.PathObject');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts
index bf065b84d3e..f4d7bdaf19f 100644
--- a/core/renderers/common/renderer.ts
+++ b/core/renderers/common/renderer.ts
@@ -13,6 +13,7 @@
  * Base renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/constants.ts b/core/renderers/geras/constants.ts
index 088f6a18289..762c4f71b82 100644
--- a/core/renderers/geras/constants.ts
+++ b/core/renderers/geras/constants.ts
@@ -15,6 +15,7 @@
  * mode.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.ConstantProvider');
 
 import {ConstantProvider as BaseConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/geras/drawer.ts b/core/renderers/geras/drawer.ts
index 280194bc4e5..e389b50ecc7 100644
--- a/core/renderers/geras/drawer.ts
+++ b/core/renderers/geras/drawer.ts
@@ -13,6 +13,7 @@
  * Renderer that preserves the look and feel of Blockly pre-2019.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/geras.ts b/core/renderers/geras/geras.ts
index 30fcd8ea66d..296f53ebb0a 100644
--- a/core/renderers/geras/geras.ts
+++ b/core/renderers/geras/geras.ts
@@ -11,6 +11,7 @@
  * Re-exports of Blockly.geras.* modules.
  * @namespace Blockly.geras
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras');
 
 import {ConstantProvider} from './constants.js';
diff --git a/core/renderers/geras/highlight_constants.ts b/core/renderers/geras/highlight_constants.ts
index 156daaf0267..85553b8ae38 100644
--- a/core/renderers/geras/highlight_constants.ts
+++ b/core/renderers/geras/highlight_constants.ts
@@ -13,6 +13,7 @@
  * Objects for rendering highlights on blocks.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.HighlightConstantProvider');
 
 import * as svgPaths from '../../utils/svg_paths.js';
diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts
index bb6620e2400..1b3a84c1474 100644
--- a/core/renderers/geras/highlighter.ts
+++ b/core/renderers/geras/highlighter.ts
@@ -15,6 +15,7 @@
  * compatibility mode.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.Highlighter');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/info.ts b/core/renderers/geras/info.ts
index ec810b72e4b..d94700ffb11 100644
--- a/core/renderers/geras/info.ts
+++ b/core/renderers/geras/info.ts
@@ -15,6 +15,7 @@
  * Geras: spirit of old age.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/measurables/inline_input.ts b/core/renderers/geras/measurables/inline_input.ts
index f8988ddead7..09bbca32cba 100644
--- a/core/renderers/geras/measurables/inline_input.ts
+++ b/core/renderers/geras/measurables/inline_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.InlineInput');
 
 /* 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 6b703a9ba16..bbe322c3a1c 100644
--- a/core/renderers/geras/measurables/statement_input.ts
+++ b/core/renderers/geras/measurables/statement_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.StatementInput');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts
index ec93113df7c..7e109e39ddb 100644
--- a/core/renderers/geras/path_object.ts
+++ b/core/renderers/geras/path_object.ts
@@ -13,6 +13,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.PathObject');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts
index 81b82e47d03..88be51bebef 100644
--- a/core/renderers/geras/renderer.ts
+++ b/core/renderers/geras/renderer.ts
@@ -13,6 +13,7 @@
  * Geras renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.geras.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/base.ts b/core/renderers/measurables/base.ts
index f31c6f62493..28475e73a68 100644
--- a/core/renderers/measurables/base.ts
+++ b/core/renderers/measurables/base.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a block as SVG.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Measurable');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/bottom_row.ts b/core/renderers/measurables/bottom_row.ts
index 9810b7f276d..9ad5579e0da 100644
--- a/core/renderers/measurables/bottom_row.ts
+++ b/core/renderers/measurables/bottom_row.ts
@@ -15,6 +15,7 @@
  * of its subcomponents.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.BottomRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/connection.ts b/core/renderers/measurables/connection.ts
index ba3887f54d0..aafe24b8343 100644
--- a/core/renderers/measurables/connection.ts
+++ b/core/renderers/measurables/connection.ts
@@ -15,6 +15,7 @@
  * rendering.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Connection');
 
 /* 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 abd5a311030..3713890904d 100644
--- a/core/renderers/measurables/external_value_input.ts
+++ b/core/renderers/measurables/external_value_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.ExternalValueInput');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/field.ts b/core/renderers/measurables/field.ts
index 4e5f09aefe7..4a6e2a0e44f 100644
--- a/core/renderers/measurables/field.ts
+++ b/core/renderers/measurables/field.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Field');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/hat.ts b/core/renderers/measurables/hat.ts
index 885e4b9af04..230690329ff 100644
--- a/core/renderers/measurables/hat.ts
+++ b/core/renderers/measurables/hat.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Hat');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/icon.ts b/core/renderers/measurables/icon.ts
index bbdd806d181..05c623ca2ef 100644
--- a/core/renderers/measurables/icon.ts
+++ b/core/renderers/measurables/icon.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Icon');
 
 /* 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 86800ae74bf..e65cd88f631 100644
--- a/core/renderers/measurables/in_row_spacer.ts
+++ b/core/renderers/measurables/in_row_spacer.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.InRowSpacer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/inline_input.ts b/core/renderers/measurables/inline_input.ts
index f486c5b26df..5d8bd0fe20e 100644
--- a/core/renderers/measurables/inline_input.ts
+++ b/core/renderers/measurables/inline_input.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.InlineInput');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/input_connection.ts b/core/renderers/measurables/input_connection.ts
index 22629ce7c38..99818ed88b7 100644
--- a/core/renderers/measurables/input_connection.ts
+++ b/core/renderers/measurables/input_connection.ts
@@ -13,6 +13,7 @@
  * Class representing inputs with connections on a rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.InputConnection');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/input_row.ts b/core/renderers/measurables/input_row.ts
index 0d8027e034d..0a265fc0b6c 100644
--- a/core/renderers/measurables/input_row.ts
+++ b/core/renderers/measurables/input_row.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.InputRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/jagged_edge.ts b/core/renderers/measurables/jagged_edge.ts
index 0fd33da13f6..e2429ab8bf4 100644
--- a/core/renderers/measurables/jagged_edge.ts
+++ b/core/renderers/measurables/jagged_edge.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.JaggedEdge');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/next_connection.ts b/core/renderers/measurables/next_connection.ts
index eefc2f2445a..fdfea7984dd 100644
--- a/core/renderers/measurables/next_connection.ts
+++ b/core/renderers/measurables/next_connection.ts
@@ -15,6 +15,7 @@
  * rendering.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.NextConnection');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/output_connection.ts b/core/renderers/measurables/output_connection.ts
index 7693239bbbc..2bea581ceef 100644
--- a/core/renderers/measurables/output_connection.ts
+++ b/core/renderers/measurables/output_connection.ts
@@ -15,6 +15,7 @@
  * during rendering.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.OutputConnection');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/previous_connection.ts b/core/renderers/measurables/previous_connection.ts
index b8381435410..6314b7b623a 100644
--- a/core/renderers/measurables/previous_connection.ts
+++ b/core/renderers/measurables/previous_connection.ts
@@ -15,6 +15,7 @@
  * during rendering.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.PreviousConnection');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/round_corner.ts b/core/renderers/measurables/round_corner.ts
index 12c1c918e06..f64ac31b3ca 100644
--- a/core/renderers/measurables/round_corner.ts
+++ b/core/renderers/measurables/round_corner.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.RoundCorner');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/row.ts b/core/renderers/measurables/row.ts
index 80257001151..884a7fc3d2e 100644
--- a/core/renderers/measurables/row.ts
+++ b/core/renderers/measurables/row.ts
@@ -13,6 +13,7 @@
  * Object representing a single row on a rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Row');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/spacer_row.ts b/core/renderers/measurables/spacer_row.ts
index f85e360f8d4..6648aa1de3e 100644
--- a/core/renderers/measurables/spacer_row.ts
+++ b/core/renderers/measurables/spacer_row.ts
@@ -13,6 +13,7 @@
  * Object representing a spacer between two rows.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.SpacerRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/square_corner.ts b/core/renderers/measurables/square_corner.ts
index ce3b3771e95..f5161a761b5 100644
--- a/core/renderers/measurables/square_corner.ts
+++ b/core/renderers/measurables/square_corner.ts
@@ -15,6 +15,7 @@
  * block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.SquareCorner');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/statement_input.ts b/core/renderers/measurables/statement_input.ts
index 0c536a3fa70..ecb3764667e 100644
--- a/core/renderers/measurables/statement_input.ts
+++ b/core/renderers/measurables/statement_input.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.StatementInput');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/top_row.ts b/core/renderers/measurables/top_row.ts
index 16fb97cc3a8..0fd63397730 100644
--- a/core/renderers/measurables/top_row.ts
+++ b/core/renderers/measurables/top_row.ts
@@ -13,6 +13,7 @@
  * Object representing a top row on a rendered block.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.TopRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/types.ts b/core/renderers/measurables/types.ts
index 2fe131a53ea..f1fa6588bba 100644
--- a/core/renderers/measurables/types.ts
+++ b/core/renderers/measurables/types.ts
@@ -13,6 +13,7 @@
  * Measurable types.
  * @namespace Blockly.blockRendering.Types
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.blockRendering.Types');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/constants.ts b/core/renderers/minimalist/constants.ts
index c56502c85e1..a9ef7e89c9c 100644
--- a/core/renderers/minimalist/constants.ts
+++ b/core/renderers/minimalist/constants.ts
@@ -15,6 +15,7 @@
  * minimalist renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.minimalist.ConstantProvider');
 
 import {ConstantProvider as BaseConstantProvider} from '../common/constants.js';
diff --git a/core/renderers/minimalist/drawer.ts b/core/renderers/minimalist/drawer.ts
index 11c50e076c0..09d90f3e930 100644
--- a/core/renderers/minimalist/drawer.ts
+++ b/core/renderers/minimalist/drawer.ts
@@ -13,6 +13,7 @@
  * Minimalist rendering drawer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.minimalist.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/info.ts b/core/renderers/minimalist/info.ts
index 9e8560366ad..e24d4a2288c 100644
--- a/core/renderers/minimalist/info.ts
+++ b/core/renderers/minimalist/info.ts
@@ -13,6 +13,7 @@
  * Minimalist render info object.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.minimalist.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/minimalist.ts b/core/renderers/minimalist/minimalist.ts
index 7a38cc27a0f..4218e30a580 100644
--- a/core/renderers/minimalist/minimalist.ts
+++ b/core/renderers/minimalist/minimalist.ts
@@ -11,6 +11,7 @@
  * Re-exports of Blockly.minimalist.* modules.
  * @namespace Blockly.minimalist
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.minimalist');
 
 import {ConstantProvider} from './constants.js';
diff --git a/core/renderers/minimalist/renderer.ts b/core/renderers/minimalist/renderer.ts
index 2774a78dde7..518ed332161 100644
--- a/core/renderers/minimalist/renderer.ts
+++ b/core/renderers/minimalist/renderer.ts
@@ -13,6 +13,7 @@
  * Minimalist renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.minimalist.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/thrasos/info.ts b/core/renderers/thrasos/info.ts
index 57d31c9c967..d14cbbbf7e9 100644
--- a/core/renderers/thrasos/info.ts
+++ b/core/renderers/thrasos/info.ts
@@ -15,6 +15,7 @@
  * Thrasos: spirit of boldness.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.thrasos.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/thrasos/renderer.ts b/core/renderers/thrasos/renderer.ts
index 765e048fe01..643607eb741 100644
--- a/core/renderers/thrasos/renderer.ts
+++ b/core/renderers/thrasos/renderer.ts
@@ -13,6 +13,7 @@
  * Thrasos renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.thrasos.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/thrasos/thrasos.ts b/core/renderers/thrasos/thrasos.ts
index 28b7e112a0d..38a008e66dc 100644
--- a/core/renderers/thrasos/thrasos.ts
+++ b/core/renderers/thrasos/thrasos.ts
@@ -11,6 +11,7 @@
  * Re-exports of Blockly.thrasos.* modules.
  * @namespace Blockly.thrasos
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.thrasos');
 
 import {RenderInfo} from './info.js';
diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts
index 4af302399f2..43d94d67db1 100644
--- a/core/renderers/zelos/constants.ts
+++ b/core/renderers/zelos/constants.ts
@@ -15,6 +15,7 @@
  * mode.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.ConstantProvider');
 
 import {ConnectionType} from '../../connection_type.js';
diff --git a/core/renderers/zelos/drawer.ts b/core/renderers/zelos/drawer.ts
index 93db949b6ba..ba8583c1760 100644
--- a/core/renderers/zelos/drawer.ts
+++ b/core/renderers/zelos/drawer.ts
@@ -13,6 +13,7 @@
  * Zelos renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.Drawer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts
index 295d7424313..bdf6e7fe223 100644
--- a/core/renderers/zelos/info.ts
+++ b/core/renderers/zelos/info.ts
@@ -14,6 +14,7 @@
  * Makecode/scratch-style renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.RenderInfo');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/marker_svg.ts b/core/renderers/zelos/marker_svg.ts
index 9de798c4b7b..2eec1c73f71 100644
--- a/core/renderers/zelos/marker_svg.ts
+++ b/core/renderers/zelos/marker_svg.ts
@@ -13,6 +13,7 @@
  * Methods for graphically rendering a marker as SVG.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.MarkerSvg');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/bottom_row.ts b/core/renderers/zelos/measurables/bottom_row.ts
index 97f72e47e84..1cbc870c87a 100644
--- a/core/renderers/zelos/measurables/bottom_row.ts
+++ b/core/renderers/zelos/measurables/bottom_row.ts
@@ -13,6 +13,7 @@
  * An object representing the bottom row of a rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.BottomRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/inputs.ts b/core/renderers/zelos/measurables/inputs.ts
index e741238aa9b..cc3c338a010 100644
--- a/core/renderers/zelos/measurables/inputs.ts
+++ b/core/renderers/zelos/measurables/inputs.ts
@@ -15,6 +15,7 @@
  * a rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.StatementInput');
 
 /* 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 e121af56c2d..d820180b411 100644
--- a/core/renderers/zelos/measurables/row_elements.ts
+++ b/core/renderers/zelos/measurables/row_elements.ts
@@ -15,6 +15,7 @@
  * rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.RightConnectionShape');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/top_row.ts b/core/renderers/zelos/measurables/top_row.ts
index b751c0d75f4..f926d8cf095 100644
--- a/core/renderers/zelos/measurables/top_row.ts
+++ b/core/renderers/zelos/measurables/top_row.ts
@@ -13,6 +13,7 @@
  * An object representing the top row of a rendered block.
  * @class
  */
+import * as goog from '../../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.TopRow');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts
index e475ee9424d..ec8daed82de 100644
--- a/core/renderers/zelos/path_object.ts
+++ b/core/renderers/zelos/path_object.ts
@@ -13,6 +13,7 @@
  * An object that owns a block's rendering SVG elements.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.PathObject');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts
index 9378e83108a..ec23794eecb 100644
--- a/core/renderers/zelos/renderer.ts
+++ b/core/renderers/zelos/renderer.ts
@@ -13,6 +13,7 @@
  * Zelos renderer.
  * @class
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos.Renderer');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/zelos.ts b/core/renderers/zelos/zelos.ts
index 9b3e82807a2..6eff5491af0 100644
--- a/core/renderers/zelos/zelos.ts
+++ b/core/renderers/zelos/zelos.ts
@@ -11,6 +11,7 @@
  * Re-exports of Blockly.zelos.* modules.
  * @namespace Blockly.zelos
  */
+import * as goog from '../../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.zelos');
 
 import {ConstantProvider} from './constants.js';
diff --git a/core/scrollbar.ts b/core/scrollbar.ts
index b82ed74e820..6c41f243f99 100644
--- a/core/scrollbar.ts
+++ b/core/scrollbar.ts
@@ -13,6 +13,7 @@
  * Object representing a scrollbar.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Scrollbar');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/scrollbar_pair.ts b/core/scrollbar_pair.ts
index b58a5f9032c..1ca47e49663 100644
--- a/core/scrollbar_pair.ts
+++ b/core/scrollbar_pair.ts
@@ -13,6 +13,7 @@
  * Object representing a pair of scrollbars.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ScrollbarPair');
 
 import * as eventUtils from './events/utils.js';
diff --git a/core/serialization/blocks.ts b/core/serialization/blocks.ts
index 9cbbfb2dac1..83d56655d15 100644
--- a/core/serialization/blocks.ts
+++ b/core/serialization/blocks.ts
@@ -14,6 +14,7 @@
  * Handles serializing blocks to plain JavaScript objects only containing state.
  * @namespace Blockly.serialization.blocks
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.blocks');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/serialization/exceptions.ts b/core/serialization/exceptions.ts
index c5e3f9bf37d..520fdcd874b 100644
--- a/core/serialization/exceptions.ts
+++ b/core/serialization/exceptions.ts
@@ -13,6 +13,7 @@
  * Contains custom errors thrown by the serialization system.
  * @namespace Blockly.serialization.exceptions
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.exceptions');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/serialization/priorities.ts b/core/serialization/priorities.ts
index d1b7ce67f7c..9ef857fb81c 100644
--- a/core/serialization/priorities.ts
+++ b/core/serialization/priorities.ts
@@ -18,6 +18,7 @@
  * priorities are deserialized first.
  * @namespace Blockly.serialization.priorities
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.priorities');
 
 
diff --git a/core/serialization/registry.ts b/core/serialization/registry.ts
index fe036b0827b..3845fd094d7 100644
--- a/core/serialization/registry.ts
+++ b/core/serialization/registry.ts
@@ -15,6 +15,7 @@
  * etc).
  * @namespace Blockly.serialization.registry
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.registry');
 
 // eslint-disable-next-line no-unused-vars
diff --git a/core/serialization/variables.ts b/core/serialization/variables.ts
index 191f26912f3..539aac16cf2 100644
--- a/core/serialization/variables.ts
+++ b/core/serialization/variables.ts
@@ -15,6 +15,7 @@
  * state.
  * @namespace Blockly.serialization.variables
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.variables');
 
 // eslint-disable-next-line no-unused-vars
diff --git a/core/serialization/workspaces.ts b/core/serialization/workspaces.ts
index dc4399d1ee1..ff21f4bd523 100644
--- a/core/serialization/workspaces.ts
+++ b/core/serialization/workspaces.ts
@@ -15,6 +15,7 @@
  * objects.
  * @namespace Blockly.serialization.workspaces
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.serialization.workspaces');
 
 import * as eventUtils from '../events/utils.js';
diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts
index 23d33861b2c..6fde435ed8b 100644
--- a/core/shortcut_items.ts
+++ b/core/shortcut_items.ts
@@ -13,6 +13,7 @@
  * Registers default keyboard shortcuts.
  * @namespace Blockly.ShortcutItems
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ShortcutItems');
 
 import {BlockSvg} from './block_svg.js';
diff --git a/core/shortcut_registry.ts b/core/shortcut_registry.ts
index ad16b58d1be..ddc5321e241 100644
--- a/core/shortcut_registry.ts
+++ b/core/shortcut_registry.ts
@@ -15,6 +15,7 @@
  * key codes used to execute those shortcuts.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ShortcutRegistry');
 
 import {KeyCodes} from './utils/keycodes.js';
diff --git a/core/sprites.ts b/core/sprites.ts
index f3b25d072dd..059d12e9756 100644
--- a/core/sprites.ts
+++ b/core/sprites.ts
@@ -8,6 +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.js';
 goog.declareModuleId('Blockly.sprite');
 
 
diff --git a/core/theme.ts b/core/theme.ts
index 460cd9a86fa..a64b80358a6 100644
--- a/core/theme.ts
+++ b/core/theme.ts
@@ -13,6 +13,7 @@
  * The class representing a theme.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Theme');
 
 import * as registry from './registry.js';
diff --git a/core/theme/classic.ts b/core/theme/classic.ts
index d69094d4451..55780eb8425 100644
--- a/core/theme/classic.ts
+++ b/core/theme/classic.ts
@@ -15,6 +15,7 @@
  * Contains multi-coloured border to create shadow effect.
  * @namespace Blockly.Themes.Classic
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Themes.Classic');
 
 import {Theme} from '../theme.js';
diff --git a/core/theme/themes.ts b/core/theme/themes.ts
index 0d6a0b9f519..caa316ed52b 100644
--- a/core/theme/themes.ts
+++ b/core/theme/themes.ts
@@ -13,6 +13,7 @@
  * Namespace for themes.
  * @namespace Blockly.Themes
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Themes');
 
 import {Classic} from './classic.js';
diff --git a/core/theme/zelos.ts b/core/theme/zelos.ts
index 45a629e8e4d..ae42a860136 100644
--- a/core/theme/zelos.ts
+++ b/core/theme/zelos.ts
@@ -13,6 +13,7 @@
  * Zelos theme.
  * @namespace Blockly.Themes.Zelos
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Themes.Zelos');
 
 import {Theme} from '../theme.js';
diff --git a/core/theme_manager.ts b/core/theme_manager.ts
index 7396e7e7c9b..4fcfaf4665d 100644
--- a/core/theme_manager.ts
+++ b/core/theme_manager.ts
@@ -15,6 +15,7 @@
  *     and UI components.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ThemeManager');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/category.ts b/core/toolbox/category.ts
index 834925e93fd..52d3274346b 100644
--- a/core/toolbox/category.ts
+++ b/core/toolbox/category.ts
@@ -13,6 +13,7 @@
  * A toolbox category used to organize blocks in the toolbox.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ToolboxCategory');
 
 import * as Css from '../css.js';
diff --git a/core/toolbox/collapsible_category.ts b/core/toolbox/collapsible_category.ts
index 6aee5d049ab..b3d37b919ad 100644
--- a/core/toolbox/collapsible_category.ts
+++ b/core/toolbox/collapsible_category.ts
@@ -13,6 +13,7 @@
  * A toolbox category used to organize blocks in the toolbox.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.CollapsibleToolboxCategory');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/separator.ts b/core/toolbox/separator.ts
index 1e48eb5674e..808fae9b2af 100644
--- a/core/toolbox/separator.ts
+++ b/core/toolbox/separator.ts
@@ -13,6 +13,7 @@
  * A separator used for separating toolbox categories.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ToolboxSeparator');
 
 import * as Css from '../css.js';
diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts
index 58a493d4b27..01509d2f264 100644
--- a/core/toolbox/toolbox.ts
+++ b/core/toolbox/toolbox.ts
@@ -13,6 +13,7 @@
  * Toolbox from whence to create blocks.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Toolbox');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox_item.ts b/core/toolbox/toolbox_item.ts
index 0be62cf73a1..e4650a1ef3c 100644
--- a/core/toolbox/toolbox_item.ts
+++ b/core/toolbox/toolbox_item.ts
@@ -13,6 +13,7 @@
  * An item in the toolbox.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/tooltip.ts b/core/tooltip.ts
index 1bf9f5c2315..dd5c21a3c38 100644
--- a/core/tooltip.ts
+++ b/core/tooltip.ts
@@ -14,6 +14,7 @@
  * tooltip will be used. Third, call bindMouseEvents(e) passing the SVG element.
  * @namespace Blockly.Tooltip
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Tooltip');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/touch.ts b/core/touch.ts
index b5bb6ffd6bb..de7391b9f3f 100644
--- a/core/touch.ts
+++ b/core/touch.ts
@@ -13,6 +13,7 @@
  * Touch handling for Blockly.
  * @namespace Blockly.Touch
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Touch');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/touch_gesture.ts b/core/touch_gesture.ts
index 37fdaf13c91..ad5a2cc137c 100644
--- a/core/touch_gesture.ts
+++ b/core/touch_gesture.ts
@@ -15,6 +15,7 @@
  * for both pointer and touch events.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.TouchGesture');
 
 import * as browserEvents from './browser_events.js';
diff --git a/core/trashcan.ts b/core/trashcan.ts
index 41840229b0b..5dd2ae48496 100644
--- a/core/trashcan.ts
+++ b/core/trashcan.ts
@@ -13,6 +13,7 @@
  * Object representing a trash can icon.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Trashcan');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/utils.ts b/core/utils.ts
index 20a23932ac4..67bd7cda905 100644
--- a/core/utils.ts
+++ b/core/utils.ts
@@ -13,6 +13,7 @@
  * Utility methods.
  * @namespace Blockly.utils
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/utils/aria.ts b/core/utils/aria.ts
index ef8f9356981..cea6a173549 100644
--- a/core/utils/aria.ts
+++ b/core/utils/aria.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.aria
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.aria');
 
 
diff --git a/core/utils/array.ts b/core/utils/array.ts
index 73cd4b8bb8d..e2643670f3a 100644
--- a/core/utils/array.ts
+++ b/core/utils/array.ts
@@ -19,6 +19,7 @@
  * @return True if an element was removed.
  * @alias Blockly.array.removeElem
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.array');
 
 export function removeElem(
diff --git a/core/utils/colour.ts b/core/utils/colour.ts
index 195d07b1de5..d3f6b445d96 100644
--- a/core/utils/colour.ts
+++ b/core/utils/colour.ts
@@ -13,6 +13,7 @@
  * Utility methods for colour manipulation.
  * @namespace Blockly.utils.colour
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.colour');
 
 /**
diff --git a/core/utils/coordinate.ts b/core/utils/coordinate.ts
index 7d171fa5bdf..9528a7feb62 100644
--- a/core/utils/coordinate.ts
+++ b/core/utils/coordinate.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Coordinate');
 
 /**
diff --git a/core/utils/deprecation.ts b/core/utils/deprecation.ts
index 947237f7ca9..1130dcd40e7 100644
--- a/core/utils/deprecation.ts
+++ b/core/utils/deprecation.ts
@@ -15,6 +15,7 @@
  * This method is not specific to Blockly.
  * @namespace Blockly.utils.deprecation
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.deprecation');
 
 
diff --git a/core/utils/dom.ts b/core/utils/dom.ts
index 237a96d9a76..f9cbdab746f 100644
--- a/core/utils/dom.ts
+++ b/core/utils/dom.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.dom
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.dom');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/utils/idgenerator.ts b/core/utils/idgenerator.ts
index 475710b9b34..2294ba09c2e 100644
--- a/core/utils/idgenerator.ts
+++ b/core/utils/idgenerator.ts
@@ -13,6 +13,7 @@
  * Generators for unique IDs.
  * @namespace Blockly.utils.idGenerator
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.idGenerator');
 
 
diff --git a/core/utils/keycodes.ts b/core/utils/keycodes.ts
index c590ee3b478..87c8ac9dce3 100644
--- a/core/utils/keycodes.ts
+++ b/core/utils/keycodes.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.KeyCodes
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.KeyCodes');
 
 
diff --git a/core/utils/math.ts b/core/utils/math.ts
index 77b801a4b7b..44645ab4587 100644
--- a/core/utils/math.ts
+++ b/core/utils/math.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.math
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.math');
 
 
diff --git a/core/utils/metrics.ts b/core/utils/metrics.ts
index 1fc4d9fbad3..60c0c69dfe2 100644
--- a/core/utils/metrics.ts
+++ b/core/utils/metrics.ts
@@ -13,6 +13,7 @@
  * Workspace metrics definitions.
  * @namespace Blockly.utils.Metrics
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Metrics');
 
 
diff --git a/core/utils/object.ts b/core/utils/object.ts
index ab0fd523a70..69696dcd80c 100644
--- a/core/utils/object.ts
+++ b/core/utils/object.ts
@@ -13,6 +13,7 @@
  * Utility methods for objects.
  * @namespace Blockly.utils.object
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.object');
 
 import * as deprecation from './utils/deprecation.js';
diff --git a/core/utils/parsing.ts b/core/utils/parsing.ts
index d6f9e120694..a6a04430cf1 100644
--- a/core/utils/parsing.ts
+++ b/core/utils/parsing.ts
@@ -12,6 +12,7 @@
 /**
  * @namespace Blockly.utils.parsing
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.parsing');
 
 import {Msg} from '../msg.js';
diff --git a/core/utils/rect.ts b/core/utils/rect.ts
index b533ec62c48..d31e3b2af8b 100644
--- a/core/utils/rect.ts
+++ b/core/utils/rect.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Rect');
 
 
diff --git a/core/utils/sentinel.ts b/core/utils/sentinel.ts
index 8f46a440b22..6016dd8e450 100644
--- a/core/utils/sentinel.ts
+++ b/core/utils/sentinel.ts
@@ -13,6 +13,7 @@
  * A type used to create flag values.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Sentinel');
 
 
diff --git a/core/utils/size.ts b/core/utils/size.ts
index b7c775b4dd5..082e4ba528b 100644
--- a/core/utils/size.ts
+++ b/core/utils/size.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Size');
 
 
diff --git a/core/utils/string.ts b/core/utils/string.ts
index 8d9c6a300da..a3d6d94cdae 100644
--- a/core/utils/string.ts
+++ b/core/utils/string.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.string
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.string');
 
 import * as deprecation from './utils/deprecation.js';
diff --git a/core/utils/style.ts b/core/utils/style.ts
index c0354193ab3..3482bfe8547 100644
--- a/core/utils/style.ts
+++ b/core/utils/style.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.style
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.style');
 
 import {Coordinate} from './coordinate.js';
diff --git a/core/utils/svg.ts b/core/utils/svg.ts
index f734ee52bd5..3c40a96e8be 100644
--- a/core/utils/svg.ts
+++ b/core/utils/svg.ts
@@ -15,6 +15,7 @@
  * all SVG tag names used by Blockly.
  * @class
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.Svg');
 
 
diff --git a/core/utils/svg_math.ts b/core/utils/svg_math.ts
index 59055b42da5..f792528b388 100644
--- a/core/utils/svg_math.ts
+++ b/core/utils/svg_math.ts
@@ -13,6 +13,7 @@
  * Utility methods realted to figuring out positions of SVG elements.
  * @namespace Blockly.utils.svgMath
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.svgMath');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/utils/svg_paths.ts b/core/utils/svg_paths.ts
index 50791a7195d..bdfe964bcd7 100644
--- a/core/utils/svg_paths.ts
+++ b/core/utils/svg_paths.ts
@@ -14,6 +14,7 @@
  * Methods for creating parts of SVG path strings.  See
  * @namespace Blockly.utils.svgPaths
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.svgPaths');
 
 
diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts
index c3d6bedda7b..decb344a7b7 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -13,6 +13,7 @@
  * Utility functions for the toolbox and flyout.
  * @namespace Blockly.utils.toolbox
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.toolbox');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/utils/useragent.ts b/core/utils/useragent.ts
index 2f406a665a6..717d646cb69 100644
--- a/core/utils/useragent.ts
+++ b/core/utils/useragent.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.userAgent
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.userAgent');
 
 /** The raw useragent string. */
diff --git a/core/utils/xml.ts b/core/utils/xml.ts
index 663c4924d75..77963131815 100644
--- a/core/utils/xml.ts
+++ b/core/utils/xml.ts
@@ -17,6 +17,7 @@
  * a JavaScript framework such as Closure.
  * @namespace Blockly.utils.xml
  */
+import * as goog from '../../closure/goog/goog.js';
 goog.declareModuleId('Blockly.utils.xml');
 
 /**
diff --git a/core/variable_map.ts b/core/variable_map.ts
index b93d7c37af2..918a998ea90 100644
--- a/core/variable_map.ts
+++ b/core/variable_map.ts
@@ -13,6 +13,7 @@
  * Object representing a map of variables and their types.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.VariableMap');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/variable_model.ts b/core/variable_model.ts
index 9076eb353aa..d92c16b1e31 100644
--- a/core/variable_model.ts
+++ b/core/variable_model.ts
@@ -13,6 +13,7 @@
  * Components for the variable model.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.VariableModel');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/variables.ts b/core/variables.ts
index f1f38d7c0a4..3cf8cd0e1f6 100644
--- a/core/variables.ts
+++ b/core/variables.ts
@@ -13,6 +13,7 @@
  * Utility functions for handling variables.
  * @namespace Blockly.Variables
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Variables');
 
 import {Blocks} from './blocks.js';
diff --git a/core/variables_dynamic.ts b/core/variables_dynamic.ts
index 35dba869cb6..f1e08b74b1c 100644
--- a/core/variables_dynamic.ts
+++ b/core/variables_dynamic.ts
@@ -14,6 +14,7 @@
  *
  * @namespace Blockly.VariablesDynamic
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.VariablesDynamic');
 
 import {Blocks} from './blocks.js';
diff --git a/core/warning.ts b/core/warning.ts
index fdf5e31faaa..069944c1d38 100644
--- a/core/warning.ts
+++ b/core/warning.ts
@@ -13,6 +13,7 @@
  * Object representing a warning.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Warning');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/widgetdiv.ts b/core/widgetdiv.ts
index 101f8430956..b32ef8e80fc 100644
--- a/core/widgetdiv.ts
+++ b/core/widgetdiv.ts
@@ -17,6 +17,7 @@
  *     E.g. text input areas, colour pickers, context menus.
  * @namespace Blockly.WidgetDiv
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WidgetDiv');
 
 import * as common from './common.js';
diff --git a/core/workspace.ts b/core/workspace.ts
index 20497f2707e..9cefa4155ae 100644
--- a/core/workspace.ts
+++ b/core/workspace.ts
@@ -13,6 +13,7 @@
  * Object representing a workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Workspace');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/workspace_audio.ts b/core/workspace_audio.ts
index 5814ed9e1be..f4895c60163 100644
--- a/core/workspace_audio.ts
+++ b/core/workspace_audio.ts
@@ -15,6 +15,7 @@
  *     workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceAudio');
 
 import * as userAgent from './utils/useragent.js';
diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts
index 7d3ee7c8386..c6293ed09ee 100644
--- a/core/workspace_comment.ts
+++ b/core/workspace_comment.ts
@@ -13,6 +13,7 @@
  * Object representing a code comment on the workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceComment');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts
index 95604579ca3..0ee49268517 100644
--- a/core/workspace_comment_svg.ts
+++ b/core/workspace_comment_svg.ts
@@ -13,6 +13,7 @@
  * Object representing a code comment on a rendered workspace.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceCommentSvg');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/workspace_drag_surface_svg.ts b/core/workspace_drag_surface_svg.ts
index 50bb536c56d..2456e1dae45 100644
--- a/core/workspace_drag_surface_svg.ts
+++ b/core/workspace_drag_surface_svg.ts
@@ -20,6 +20,7 @@
  * blocks are never repainted during drag improving performance.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceDragSurfaceSvg');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/workspace_dragger.ts b/core/workspace_dragger.ts
index be9efd1ca11..b6ce899ba71 100644
--- a/core/workspace_dragger.ts
+++ b/core/workspace_dragger.ts
@@ -13,6 +13,7 @@
  * Methods for dragging a workspace visually.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceDragger');
 
 import * as common from './common.js';
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 8a60de5470e..2c4d10ed4ce 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -13,6 +13,7 @@
  * Object representing a workspace rendered as SVG.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.WorkspaceSvg');
 
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/xml.ts b/core/xml.ts
index 1351c24bd13..537104880f9 100644
--- a/core/xml.ts
+++ b/core/xml.ts
@@ -13,6 +13,7 @@
  * XML reader and writer.
  * @namespace Blockly.Xml
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Xml');
 
 // Unused import preserved for side-effects. Remove if unneeded.
diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts
index feaf5c92d46..feee88517b0 100644
--- a/core/zoom_controls.ts
+++ b/core/zoom_controls.ts
@@ -13,6 +13,7 @@
  * Object representing a zoom icons.
  * @class
  */
+import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.ZoomControls');
 
 /* eslint-disable-next-line no-unused-vars */